From 06dc848fe3d06f078871ba9649e391b80d3bf509 Mon Sep 17 00:00:00 2001 From: Joshua Gleitze Date: Wed, 23 Dec 2020 21:59:36 +0100 Subject: [PATCH 1/9] refactor: rename the API files from *Assertions.kt to *Expectations.kt --- .../{anyAssertions.kt => anyExpectations.kt} | 0 ...rrayAssertions.kt => arrayExpectations.kt} | 0 ...ertions.kt => charSequenceExpectations.kt} | 0 ...ssertions.kt => collectionExpectations.kt} | 0 ...ssertions.kt => comparableExpectations.kt} | 0 ...reAssertions.kt => featureExpectations.kt} | 0 ...rtions.kt => floatingPointExpectations.kt} | 0 ...{fun0Assertions.kt => fun0Expectations.kt} | 0 ...eAssertions.kt => iterableExpectations.kt} | 0 ...rAssertions.kt => iteratorExpectations.kt} | 0 ...{listAssertions.kt => listExpectations.kt} | 0 ...ns.kt => mapCollectionLikeExpectations.kt} | 0 ...yAssertions.kt => mapEntryExpectations.kt} | 0 .../{mapAssertions.kt => mapExpectations.kt} | 0 ...{pairAssertions.kt => pairExpectations.kt} | 0 ...eAssertions.kt => sequenceExpectations.kt} | 0 ...Assertions.kt => throwableExpectations.kt} | 0 ...ssertions.kt => bigDecimalExpectations.kt} | 0 ...ions.kt => chronoLocalDateExpectations.kt} | 0 ....kt => chronoLocalDateTimeExpectations.kt} | 0 ....kt => chronoZonedDateTimeExpectations.kt} | 0 ...{fileAssertions.kt => fileExpectations.kt} | 0 ...ons.kt => floatingPointJvmExpectations.kt} | 0 ...Assertions.kt => localDateExpectations.kt} | 0 ...rtions.kt => localDateTimeExpectations.kt} | 0 ...lAssertions.kt => optionalExpectations.kt} | 0 ...{pathAssertions.kt => pathExpectations.kt} | 0 ...rtions.kt => zonedDateTimeExpectations.kt} | 0 ...ultAssertions.kt => resultExpectations.kt} | 0 .../{anyAssertions.kt => anyExpectations.kt} | 0 ...rrayAssertions.kt => arrayExpectations.kt} | 0 ...ertions.kt => charSequenceExpectations.kt} | 0 ...ssertions.kt => collectionExpectations.kt} | 0 ...ssertions.kt => comparableExpectations.kt} | 0 ...reAssertions.kt => featureExpectations.kt} | 0 ...{fun0Assertions.kt => fun0Expectations.kt} | 0 ...eAssertions.kt => iterableExpectations.kt} | 0 ...rAssertions.kt => iteratorExpectations.kt} | 0 ...{listAssertions.kt => listExpectations.kt} | 0 ...ns.kt => mapCollectionLikeExpectations.kt} | 0 ...yAssertions.kt => mapEntryExpectations.kt} | 0 .../{mapAssertions.kt => mapExpectations.kt} | 0 ...{pairAssertions.kt => pairExpectations.kt} | 0 ...eAssertions.kt => sequenceExpectations.kt} | 0 ...Assertions.kt => throwableExpectations.kt} | 0 .../{anyAssertions.kt => anyExpectations.kt} | 0 ...ssertions.kt => bigDecimalExpectations.kt} | 0 ...ions.kt => chronoLocalDateExpectations.kt} | 0 ....kt => chronoLocalDateTimeExpectations.kt} | 0 ....kt => chronoZonedDateTimeExpectations.kt} | 0 ...{fileAssertions.kt => fileExpectations.kt} | 0 ...Assertions.kt => localDateExpectations.kt} | 0 ...rtions.kt => localDateTimeExpectations.kt} | 0 ...lAssertions.kt => optionalExpectations.kt} | 0 ...{pathAssertions.kt => pathExpectations.kt} | 0 ...rtions.kt => zonedDateTimeExpectations.kt} | 0 ...ultAssertions.kt => resultExpectations.kt} | 0 .../api/fluent/en_GB/BaseExpectations.scala | 12 ------- ...bleLikeElementComparableExpectations.scala | 33 ------------------- 59 files changed, 45 deletions(-) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{anyAssertions.kt => anyExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{arrayAssertions.kt => arrayExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{charSequenceAssertions.kt => charSequenceExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{collectionAssertions.kt => collectionExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{comparableAssertions.kt => comparableExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{featureAssertions.kt => featureExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{floatingPointAssertions.kt => floatingPointExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{fun0Assertions.kt => fun0Expectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{iterableAssertions.kt => iterableExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{iteratorAssertions.kt => iteratorExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{listAssertions.kt => listExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{mapCollectionLikeAssertions.kt => mapCollectionLikeExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{mapEntryAssertions.kt => mapEntryExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{mapAssertions.kt => mapExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{pairAssertions.kt => pairExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{sequenceAssertions.kt => sequenceExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{throwableAssertions.kt => throwableExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{bigDecimalAssertions.kt => bigDecimalExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{chronoLocalDateAssertions.kt => chronoLocalDateExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{chronoLocalDateTimeAssertions.kt => chronoLocalDateTimeExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{chronoZonedDateTimeAssertions.kt => chronoZonedDateTimeExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{fileAssertions.kt => fileExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{floatingPointJvmAssertions.kt => floatingPointJvmExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{localDateAssertions.kt => localDateExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{localDateTimeAssertions.kt => localDateTimeExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{optionalAssertions.kt => optionalExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{pathAssertions.kt => pathExpectations.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{zonedDateTimeAssertions.kt => zonedDateTimeExpectations.kt} (100%) rename apis/fluent-en_GB/extensions/kotlin_1_3/atrium-api-fluent-en_GB-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/kotlin_1_3/{resultAssertions.kt => resultExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{anyAssertions.kt => anyExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{arrayAssertions.kt => arrayExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{charSequenceAssertions.kt => charSequenceExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{collectionAssertions.kt => collectionExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{comparableAssertions.kt => comparableExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{featureAssertions.kt => featureExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{fun0Assertions.kt => fun0Expectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{iterableAssertions.kt => iterableExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{iteratorAssertions.kt => iteratorExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{listAssertions.kt => listExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{mapCollectionLikeAssertions.kt => mapCollectionLikeExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{mapEntryAssertions.kt => mapEntryExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{mapAssertions.kt => mapExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{pairAssertions.kt => pairExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{sequenceAssertions.kt => sequenceExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{throwableAssertions.kt => throwableExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/workaround/{anyAssertions.kt => anyExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{bigDecimalAssertions.kt => bigDecimalExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{chronoLocalDateAssertions.kt => chronoLocalDateExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{chronoLocalDateTimeAssertions.kt => chronoLocalDateTimeExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{chronoZonedDateTimeAssertions.kt => chronoZonedDateTimeExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{fileAssertions.kt => fileExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{localDateAssertions.kt => localDateExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{localDateTimeAssertions.kt => localDateTimeExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{optionalAssertions.kt => optionalExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{pathAssertions.kt => pathExpectations.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/{zonedDateTimeAssertions.kt => zonedDateTimeExpectations.kt} (100%) rename apis/infix-en_GB/extensions/kotlin_1_3/atrium-api-infix-en_GB-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/kotlin_1_3/{resultAssertions.kt => resultExpectations.kt} (100%) delete mode 100644 atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/BaseExpectations.scala delete mode 100644 atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IterableLikeElementComparableExpectations.scala diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/anyAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/anyExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/anyAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/anyExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/arrayAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/arrayExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/arrayAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/arrayExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/charSequenceAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/charSequenceExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/charSequenceAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/charSequenceExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/collectionAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/collectionExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/collectionAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/collectionExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/comparableAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/comparableExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/comparableAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/comparableExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/featureAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/featureExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/featureAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/featureExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/floatingPointAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/floatingPointExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/floatingPointAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/floatingPointExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/fun0Assertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/fun0Expectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/fun0Assertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/fun0Expectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/iterableAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/iterableExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/iterableAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/iterableExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/iteratorAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/iteratorExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/iteratorAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/iteratorExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/listAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/listExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/listAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/listExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/mapCollectionLikeAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/mapCollectionLikeExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/mapCollectionLikeAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/mapCollectionLikeExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/mapEntryAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/mapEntryExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/mapEntryAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/mapEntryExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/mapAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/mapExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/mapAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/mapExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/pairAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/pairExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/pairAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/pairExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/sequenceAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/sequenceExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/sequenceAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/sequenceExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/throwableAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/throwableExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/throwableAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/throwableExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/bigDecimalAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/bigDecimalExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/bigDecimalAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/bigDecimalExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/chronoLocalDateAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/chronoLocalDateExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/chronoLocalDateAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/chronoLocalDateExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/chronoLocalDateTimeAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/chronoLocalDateTimeExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/chronoLocalDateTimeAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/chronoLocalDateTimeExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/chronoZonedDateTimeAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/chronoZonedDateTimeExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/chronoZonedDateTimeAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/chronoZonedDateTimeExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/fileAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/fileExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/fileAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/fileExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/floatingPointJvmAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/floatingPointJvmExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/floatingPointJvmAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/floatingPointJvmExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/localDateAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/localDateExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/localDateAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/localDateExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/localDateTimeAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/localDateTimeExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/localDateTimeAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/localDateTimeExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/optionalAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/optionalExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/optionalAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/optionalExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/pathAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/pathExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/pathAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/pathExpectations.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/zonedDateTimeAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/zonedDateTimeExpectations.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/zonedDateTimeAssertions.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/zonedDateTimeExpectations.kt diff --git a/apis/fluent-en_GB/extensions/kotlin_1_3/atrium-api-fluent-en_GB-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/kotlin_1_3/resultAssertions.kt b/apis/fluent-en_GB/extensions/kotlin_1_3/atrium-api-fluent-en_GB-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/kotlin_1_3/resultExpectations.kt similarity index 100% rename from apis/fluent-en_GB/extensions/kotlin_1_3/atrium-api-fluent-en_GB-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/kotlin_1_3/resultAssertions.kt rename to apis/fluent-en_GB/extensions/kotlin_1_3/atrium-api-fluent-en_GB-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/kotlin_1_3/resultExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/anyAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/anyExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/anyAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/anyExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/arrayAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/arrayExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/arrayAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/arrayExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/charSequenceAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/charSequenceExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/charSequenceAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/charSequenceExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/collectionAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/collectionExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/collectionAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/collectionExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/comparableAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/comparableExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/comparableAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/comparableExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/featureAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/featureExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/featureAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/featureExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/fun0Assertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/fun0Expectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/fun0Assertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/fun0Expectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/iterableAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/iterableExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/iterableAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/iterableExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/iteratorAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/iteratorExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/iteratorAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/iteratorExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/listAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/listExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/listAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/listExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/mapCollectionLikeAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/mapCollectionLikeExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/mapCollectionLikeAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/mapCollectionLikeExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/mapEntryAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/mapEntryExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/mapEntryAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/mapEntryExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/mapAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/mapExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/mapAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/mapExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/pairAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/pairExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/pairAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/pairExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/sequenceAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/sequenceExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/sequenceAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/sequenceExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/throwableAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/throwableExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/throwableAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/throwableExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/workaround/anyAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/workaround/anyExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/workaround/anyAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/workaround/anyExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/bigDecimalAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/bigDecimalExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/bigDecimalAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/bigDecimalExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/chronoLocalDateAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/chronoLocalDateExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/chronoLocalDateAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/chronoLocalDateExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/chronoLocalDateTimeAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/chronoLocalDateTimeExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/chronoLocalDateTimeAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/chronoLocalDateTimeExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/chronoZonedDateTimeAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/chronoZonedDateTimeExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/chronoZonedDateTimeAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/chronoZonedDateTimeExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/fileAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/fileExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/fileAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/fileExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/localDateAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/localDateExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/localDateAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/localDateExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/localDateTimeAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/localDateTimeExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/localDateTimeAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/localDateTimeExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/optionalAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/optionalExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/optionalAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/optionalExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/pathAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/pathExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/pathAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/pathExpectations.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/zonedDateTimeAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/zonedDateTimeExpectations.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/zonedDateTimeAssertions.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/zonedDateTimeExpectations.kt diff --git a/apis/infix-en_GB/extensions/kotlin_1_3/atrium-api-infix-en_GB-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/kotlin_1_3/resultAssertions.kt b/apis/infix-en_GB/extensions/kotlin_1_3/atrium-api-infix-en_GB-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/kotlin_1_3/resultExpectations.kt similarity index 100% rename from apis/infix-en_GB/extensions/kotlin_1_3/atrium-api-infix-en_GB-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/kotlin_1_3/resultAssertions.kt rename to apis/infix-en_GB/extensions/kotlin_1_3/atrium-api-infix-en_GB-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/kotlin_1_3/resultExpectations.kt diff --git a/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/BaseExpectations.scala b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/BaseExpectations.scala deleted file mode 100644 index 6ae937115f..0000000000 --- a/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/BaseExpectations.scala +++ /dev/null @@ -1,12 +0,0 @@ -package ch.tutteli.atrium.scala2.api.fluent.en_GB - -import ch.tutteli.atrium.assertions.Assertion -import ch.tutteli.atrium.creating.{AssertionContainer, Expect} -import ch.tutteli.atrium.logic.LogicKt - -trait BaseExpectations[T] { - protected val expect: Expect[T] - - @inline protected def addAssertion(f: AssertionContainer[T] => Assertion): Expect[T] = - LogicKt._logicAppend(expect, f) -} diff --git a/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IterableLikeElementComparableExpectations.scala b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IterableLikeElementComparableExpectations.scala deleted file mode 100644 index e07a84b526..0000000000 --- a/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IterableLikeElementComparableExpectations.scala +++ /dev/null @@ -1,33 +0,0 @@ -package ch.tutteli.atrium.scala2.api.fluent.en_GB - -import java.lang.{Iterable => JIterable} -import IsIterableHelpers._ -import ch.tutteli.atrium.creating.Expect -import ch.tutteli.atrium.logic.{IterableLikeKt, LogicKt} - -class IterableLikeElementComparableExpectations[Repr, E <: Comparable[E]](override val expect: Expect[Repr])( - implicit isIterable: IsIterableFixA[Repr, E] -) extends BaseExpectations[Repr] { - import scala.jdk.CollectionConverters._ - - private def convertToJIterable(repr: Repr): JIterable[E] = { - val subject = isIterable.apply(repr) - subject match { - case l: List[E] => l.asJava - case i: Iterable[E] => i.asJava - case subject => subject.toList.asJava - } - } - - def min(): Expect[E] = - IterableLikeKt.min(LogicKt.get_logic(expect), convertToJIterable).transform() - - def max(): Expect[E] = - IterableLikeKt.max(LogicKt.get_logic(expect), convertToJIterable).transform() - - def min(assertionCreator: Expect[E] => Unit): Expect[Repr] = - IterableLikeKt.min(LogicKt.get_logic(expect), convertToJIterable).collectAndAppend(assertionCreator) - - def max(assertionCreator: Expect[E] => Unit): Expect[Repr] = - IterableLikeKt.max(LogicKt.get_logic(expect), convertToJIterable).collectAndAppend(assertionCreator) -} From aee1bdb9bb71ef229b13206226895b29ed759615 Mon Sep 17 00:00:00 2001 From: Joshua Gleitze Date: Wed, 23 Dec 2020 22:14:59 +0100 Subject: [PATCH 2/9] refactor: rename the logic types from *Assertions to *Expectations --- .../atrium/logic/{AnyAssertions.kt => AnyExpectations.kt} | 0 ...{CharSequenceAssertions.kt => CharSequenceExpectations.kt} | 0 ...lectionLikeAssertions.kt => CollectionLikeExpectations.kt} | 0 .../{ComparableAssertions.kt => ComparableExpectations.kt} | 0 .../logic/{FeatureAssertions.kt => FeatureExpectations.kt} | 2 +- ...loatingPointAssertions.kt => FloatingPointExpectations.kt} | 0 .../atrium/logic/{Fun0Assertions.kt => Fun0Expectations.kt} | 0 ...{IterableLikeAssertions.kt => IterableLikeExpectations.kt} | 0 .../logic/{IteratorAssertions.kt => IteratorExpectations.kt} | 0 .../atrium/logic/{ListAssertions.kt => ListExpectations.kt} | 0 .../logic/{MapEntryAssertions.kt => MapEntryExpectations.kt} | 0 .../logic/{MapLikeAssertions.kt => MapLikeExpectations.kt} | 0 .../atrium/logic/{PairAssertions.kt => PairExpectations.kt} | 0 .../{ThrowableAssertions.kt => ThrowableExpectations.kt} | 0 ...tainsAssertionCreator.kt => ContainsExpectationCreator.kt} | 0 ...sertionCreator.kt => ContainsObjectsExpectationCreator.kt} | 0 ...tainsAssertions.kt => CharSequenceContainsExpectations.kt} | 0 ...onCreator.kt => CharSequenceContainsExpectationCreator.kt} | 0 ...sertions.kt => DefaultCharSequenceContainsExpectations.kt} | 0 ...tainsAssertions.kt => IterableLikeContainsExpectations.kt} | 0 ...tions.kt => IterableLikeContainsInAnyOrderExpectations.kt} | 0 ...sertions.kt => DefaultIterableLikeContainsExpectations.kt} | 0 ...t => DefaultIterableLikeContainsInAnyOrderExpectations.kt} | 0 ...rtionCreator.kt => InAnyOrderEntriesExpectationCreator.kt} | 0 ...nCreator.kt => InAnyOrderOnlyEntriesExpectationCreator.kt} | 0 ...ssertionCreator.kt => InAnyOrderOnlyExpectationCreator.kt} | 0 ...onCreator.kt => InAnyOrderOnlyValuesExpectationCreator.kt} | 0 ...ertionCreator.kt => InAnyOrderValuesExpectationCreator.kt} | 0 ...sertionCreator.kt => InOrderOnlyBaseExpectationCreator.kt} | 0 ...tionCreator.kt => InOrderOnlyEntriesExpectationCreator.kt} | 0 ...lyAssertionCreator.kt => InOrderOnlyExpectationCreator.kt} | 0 ...ator.kt => InOrderOnlyGroupedEntriesExpectationCreator.kt} | 0 ...tionCreator.kt => InOrderOnlyGroupedExpectationCreator.kt} | 0 ...eator.kt => InOrderOnlyGroupedValuesExpectationCreator.kt} | 0 ...rtionCreator.kt => InOrderOnlyValuesExpectationCreator.kt} | 0 ...keContainsAssertions.kt => MapLikeContainsExpectations.kt} | 0 ...insAssertions.kt => DefaultMapLikeContainsExpectations.kt} | 0 .../{DefaultAnyAssertions.kt => DefaultAnyExpectations.kt} | 0 ...quenceAssertions.kt => DefaultCharSequenceExpectations.kt} | 0 ...LikeAssertions.kt => DefaultCollectionLikeExpectations.kt} | 0 ...mparableAssertions.kt => DefaultComparableExpectations.kt} | 0 ...aultFeatureAssertions.kt => DefaultFeatureExpectations.kt} | 4 ++-- ...PointAssertions.kt => DefaultFloatingPointExpectations.kt} | 0 .../{DefaultFun0Assertions.kt => DefaultFun0Expectations.kt} | 0 ...leLikeAssertions.kt => DefaultIterableLikeExpectations.kt} | 0 ...ltIteratorAssertions.kt => DefaultIteratorExpectations.kt} | 0 .../{DefaultListAssertions.kt => DefaultListExpectations.kt} | 0 ...ltMapEntryAssertions.kt => DefaultMapEntryExpectations.kt} | 0 ...aultMapLikeAssertions.kt => DefaultMapLikeExpectations.kt} | 0 .../{DefaultPairAssertions.kt => DefaultPairExpectations.kt} | 0 ...ThrowableAssertions.kt => DefaultThrowableExpectations.kt} | 0 .../{BigDecimalAssertions.kt => BigDecimalExpectations.kt} | 0 ...oLocalDateAssertions.kt => ChronoLocalDateExpectations.kt} | 0 ...teTimeAssertions.kt => ChronoLocalDateTimeExpectations.kt} | 0 ...teTimeAssertions.kt => ChronoZonedDateTimeExpectations.kt} | 0 ...gPointJvmAssertions.kt => FloatingPointJvmExpectations.kt} | 0 .../{LocalDateAssertions.kt => LocalDateExpectations.kt} | 0 ...ocalDateTimeAssertions.kt => LocalDateTimeExpectations.kt} | 0 .../logic/{OptionalAssertions.kt => OptionalExpectations.kt} | 0 .../atrium/logic/{PathAssertions.kt => PathExpectations.kt} | 0 ...onedDateTimeAssertions.kt => ZonedDateTimeExpectations.kt} | 0 ...gDecimalAssertions.kt => DefaultBigDecimalExpectations.kt} | 0 ...ateAssertions.kt => DefaultChronoLocalDateExpectations.kt} | 0 ...ssertions.kt => DefaultChronoLocalDateTimeExpectations.kt} | 0 ...ssertions.kt => DefaultChronoZonedDateTimeExpectations.kt} | 0 ...vmAssertions.kt => DefaultFloatingPointJvmExpectations.kt} | 0 ...LocalDateAssertions.kt => DefaultLocalDateExpectations.kt} | 0 ...eTimeAssertions.kt => DefaultLocalDateTimeExpectations.kt} | 0 ...ltOptionalAssertions.kt => DefaultOptionalExpectations.kt} | 0 .../{DefaultPathAssertions.kt => DefaultPathExpectations.kt} | 0 ...eTimeAssertions.kt => DefaultZonedDateTimeExpectations.kt} | 0 .../kotlin_1_3/{ResultAssertions.kt => ResultExpectations.kt} | 0 ...efaultResultAssertions.kt => DefaultResultExpectations.kt} | 0 73 files changed, 3 insertions(+), 3 deletions(-) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/{AnyAssertions.kt => AnyExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/{CharSequenceAssertions.kt => CharSequenceExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/{CollectionLikeAssertions.kt => CollectionLikeExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/{ComparableAssertions.kt => ComparableExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/{FeatureAssertions.kt => FeatureExpectations.kt} (98%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/{FloatingPointAssertions.kt => FloatingPointExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/{Fun0Assertions.kt => Fun0Expectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/{IterableLikeAssertions.kt => IterableLikeExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/{IteratorAssertions.kt => IteratorExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/{ListAssertions.kt => ListExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/{MapEntryAssertions.kt => MapEntryExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/{MapLikeAssertions.kt => MapLikeExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/{PairAssertions.kt => PairExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/{ThrowableAssertions.kt => ThrowableExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/{ContainsAssertionCreator.kt => ContainsExpectationCreator.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/{ContainsObjectsAssertionCreator.kt => ContainsObjectsExpectationCreator.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/{CharSequenceContainsAssertions.kt => CharSequenceContainsExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/{CharSequenceContainsAssertionCreator.kt => CharSequenceContainsExpectationCreator.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/{DefaultCharSequenceContainsAssertions.kt => DefaultCharSequenceContainsExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/{IterableLikeContainsAssertions.kt => IterableLikeContainsExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/{IterableLikeContainsInAnyOrderAssertions.kt => IterableLikeContainsInAnyOrderExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/{DefaultIterableLikeContainsAssertions.kt => DefaultIterableLikeContainsExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/{DefaultIterableLikeContainsInAnyOrderAssertions.kt => DefaultIterableLikeContainsInAnyOrderExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/{InAnyOrderEntriesAssertionCreator.kt => InAnyOrderEntriesExpectationCreator.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/{InAnyOrderOnlyEntriesAssertionCreator.kt => InAnyOrderOnlyEntriesExpectationCreator.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/{InAnyOrderOnlyAssertionCreator.kt => InAnyOrderOnlyExpectationCreator.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/{InAnyOrderOnlyValuesAssertionCreator.kt => InAnyOrderOnlyValuesExpectationCreator.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/{InAnyOrderValuesAssertionCreator.kt => InAnyOrderValuesExpectationCreator.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/{InOrderOnlyBaseAssertionCreator.kt => InOrderOnlyBaseExpectationCreator.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/{InOrderOnlyEntriesAssertionCreator.kt => InOrderOnlyEntriesExpectationCreator.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/{InOrderOnlyAssertionCreator.kt => InOrderOnlyExpectationCreator.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/{InOrderOnlyGroupedEntriesAssertionCreator.kt => InOrderOnlyGroupedEntriesExpectationCreator.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/{InOrderOnlyGroupedAssertionCreator.kt => InOrderOnlyGroupedExpectationCreator.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/{InOrderOnlyGroupedValuesAssertionCreator.kt => InOrderOnlyGroupedValuesExpectationCreator.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/{InOrderOnlyValuesAssertionCreator.kt => InOrderOnlyValuesExpectationCreator.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/{MapLikeContainsAssertions.kt => MapLikeContainsExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/impl/{DefaultMapLikeContainsAssertions.kt => DefaultMapLikeContainsExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultAnyAssertions.kt => DefaultAnyExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultCharSequenceAssertions.kt => DefaultCharSequenceExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultCollectionLikeAssertions.kt => DefaultCollectionLikeExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultComparableAssertions.kt => DefaultComparableExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultFeatureAssertions.kt => DefaultFeatureExpectations.kt} (97%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultFloatingPointAssertions.kt => DefaultFloatingPointExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultFun0Assertions.kt => DefaultFun0Expectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultIterableLikeAssertions.kt => DefaultIterableLikeExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultIteratorAssertions.kt => DefaultIteratorExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultListAssertions.kt => DefaultListExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultMapEntryAssertions.kt => DefaultMapEntryExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultMapLikeAssertions.kt => DefaultMapLikeExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultPairAssertions.kt => DefaultPairExpectations.kt} (100%) rename logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultThrowableAssertions.kt => DefaultThrowableExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/{BigDecimalAssertions.kt => BigDecimalExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/{ChronoLocalDateAssertions.kt => ChronoLocalDateExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/{ChronoLocalDateTimeAssertions.kt => ChronoLocalDateTimeExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/{ChronoZonedDateTimeAssertions.kt => ChronoZonedDateTimeExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/{FloatingPointJvmAssertions.kt => FloatingPointJvmExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/{LocalDateAssertions.kt => LocalDateExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/{LocalDateTimeAssertions.kt => LocalDateTimeExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/{OptionalAssertions.kt => OptionalExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/{PathAssertions.kt => PathExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/{ZonedDateTimeAssertions.kt => ZonedDateTimeExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultBigDecimalAssertions.kt => DefaultBigDecimalExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultChronoLocalDateAssertions.kt => DefaultChronoLocalDateExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultChronoLocalDateTimeAssertions.kt => DefaultChronoLocalDateTimeExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultChronoZonedDateTimeAssertions.kt => DefaultChronoZonedDateTimeExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultFloatingPointJvmAssertions.kt => DefaultFloatingPointJvmExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultLocalDateAssertions.kt => DefaultLocalDateExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultLocalDateTimeAssertions.kt => DefaultLocalDateTimeExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultOptionalAssertions.kt => DefaultOptionalExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultPathAssertions.kt => DefaultPathExpectations.kt} (100%) rename logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/{DefaultZonedDateTimeAssertions.kt => DefaultZonedDateTimeExpectations.kt} (100%) rename logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/{ResultAssertions.kt => ResultExpectations.kt} (100%) rename logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/impl/{DefaultResultAssertions.kt => DefaultResultExpectations.kt} (100%) diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/AnyAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/AnyExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/AnyAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/AnyExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/CharSequenceAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/CharSequenceExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/CharSequenceAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/CharSequenceExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/CollectionLikeAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/CollectionLikeExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/CollectionLikeAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/CollectionLikeExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ComparableAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ComparableExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ComparableAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ComparableExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/FeatureAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/FeatureExpectations.kt similarity index 98% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/FeatureAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/FeatureExpectations.kt index bc053cd95c..28a7bdab8a 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/FeatureAssertions.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/FeatureExpectations.kt @@ -8,7 +8,7 @@ import kotlin.reflect.* /** * Collection of functions which help to create feature assertions by returning [FeatureExtractorBuilder.ExecutionStep]. */ -interface FeatureAssertions { +interface FeatureExpectations { //@formatter:off fun property(container: AssertionContainer, property: KProperty1): FeatureExtractorBuilder.ExecutionStep diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/FloatingPointAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/FloatingPointExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/FloatingPointAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/FloatingPointExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/Fun0Assertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/Fun0Expectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/Fun0Assertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/Fun0Expectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/IterableLikeAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/IterableLikeExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/IterableLikeAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/IterableLikeExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/IteratorAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/IteratorExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/IteratorAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/IteratorExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ListAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ListExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ListAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ListExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/MapEntryAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/MapEntryExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/MapEntryAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/MapEntryExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/MapLikeAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/MapLikeExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/MapLikeAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/MapLikeExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/PairAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/PairExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/PairAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/PairExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ThrowableAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ThrowableExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ThrowableAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ThrowableExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/ContainsAssertionCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/ContainsExpectationCreator.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/ContainsAssertionCreator.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/ContainsExpectationCreator.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/ContainsObjectsAssertionCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/ContainsObjectsExpectationCreator.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/ContainsObjectsAssertionCreator.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/ContainsObjectsExpectationCreator.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/CharSequenceContainsAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/CharSequenceContainsExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/CharSequenceContainsAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/CharSequenceContainsExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/CharSequenceContainsAssertionCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/CharSequenceContainsExpectationCreator.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/CharSequenceContainsAssertionCreator.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/CharSequenceContainsExpectationCreator.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/DefaultCharSequenceContainsAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/DefaultCharSequenceContainsExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/DefaultCharSequenceContainsAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/DefaultCharSequenceContainsExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/IterableLikeContainsAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/IterableLikeContainsExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/IterableLikeContainsAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/IterableLikeContainsExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/IterableLikeContainsInAnyOrderAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/IterableLikeContainsInAnyOrderExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/IterableLikeContainsInAnyOrderAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/IterableLikeContainsInAnyOrderExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/DefaultIterableLikeContainsAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/DefaultIterableLikeContainsExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/DefaultIterableLikeContainsAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/DefaultIterableLikeContainsExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/DefaultIterableLikeContainsInAnyOrderAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/DefaultIterableLikeContainsInAnyOrderExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/DefaultIterableLikeContainsInAnyOrderAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/DefaultIterableLikeContainsInAnyOrderExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderEntriesAssertionCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderEntriesExpectationCreator.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderEntriesAssertionCreator.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderEntriesExpectationCreator.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyEntriesAssertionCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyEntriesExpectationCreator.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyEntriesAssertionCreator.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyEntriesExpectationCreator.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyAssertionCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyExpectationCreator.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyAssertionCreator.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyExpectationCreator.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyValuesAssertionCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyValuesExpectationCreator.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyValuesAssertionCreator.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyValuesExpectationCreator.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderValuesAssertionCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderValuesExpectationCreator.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderValuesAssertionCreator.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderValuesExpectationCreator.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyBaseAssertionCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyBaseExpectationCreator.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyBaseAssertionCreator.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyBaseExpectationCreator.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyEntriesAssertionCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyEntriesExpectationCreator.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyEntriesAssertionCreator.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyEntriesExpectationCreator.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyAssertionCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyExpectationCreator.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyAssertionCreator.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyExpectationCreator.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedEntriesAssertionCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedEntriesExpectationCreator.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedEntriesAssertionCreator.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedEntriesExpectationCreator.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedAssertionCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedExpectationCreator.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedAssertionCreator.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedExpectationCreator.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedValuesAssertionCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedValuesExpectationCreator.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedValuesAssertionCreator.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedValuesExpectationCreator.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyValuesAssertionCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyValuesExpectationCreator.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyValuesAssertionCreator.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyValuesExpectationCreator.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/MapLikeContainsAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/MapLikeContainsExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/MapLikeContainsAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/MapLikeContainsExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/impl/DefaultMapLikeContainsAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/impl/DefaultMapLikeContainsExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/impl/DefaultMapLikeContainsAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/impl/DefaultMapLikeContainsExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultAnyAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultAnyExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultAnyAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultAnyExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultCharSequenceAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultCharSequenceExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultCharSequenceAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultCharSequenceExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultCollectionLikeAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultCollectionLikeExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultCollectionLikeAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultCollectionLikeExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultComparableAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultComparableExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultComparableAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultComparableExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFeatureAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFeatureExpectations.kt similarity index 97% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFeatureAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFeatureExpectations.kt index 2d648cde2e..54042afd35 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFeatureAssertions.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFeatureExpectations.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.core.ExperimentalNewExpectTypes import ch.tutteli.atrium.core.Some import ch.tutteli.atrium.core.coreFactory import ch.tutteli.atrium.creating.AssertionContainer -import ch.tutteli.atrium.logic.FeatureAssertions +import ch.tutteli.atrium.logic.FeatureExpectations import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import ch.tutteli.atrium.logic.extractFeature import ch.tutteli.atrium.reporting.translating.Translatable @@ -12,7 +12,7 @@ import ch.tutteli.atrium.reporting.translating.Untranslatable import ch.tutteli.atrium.translations.ErrorMessages import kotlin.reflect.* -class DefaultFeatureAssertions : FeatureAssertions { +class DefaultFeatureExpectations : FeatureExpectations { //@formatter:off override fun property(container: AssertionContainer, property: KProperty1): FeatureExtractorBuilder.ExecutionStep = diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFloatingPointAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFloatingPointExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFloatingPointAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFloatingPointExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFun0Assertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFun0Expectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFun0Assertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFun0Expectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultIterableLikeAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultIterableLikeExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultIterableLikeAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultIterableLikeExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultIteratorAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultIteratorExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultIteratorAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultIteratorExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultListAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultListExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultListAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultListExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapEntryAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapEntryExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapEntryAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapEntryExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapLikeAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapLikeExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapLikeAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapLikeExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultPairAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultPairExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultPairAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultPairExpectations.kt diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultThrowableAssertions.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultThrowableExpectations.kt similarity index 100% rename from logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultThrowableAssertions.kt rename to logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultThrowableExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/BigDecimalAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/BigDecimalExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/BigDecimalAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/BigDecimalExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoLocalDateAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoLocalDateExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoLocalDateAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoLocalDateExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoLocalDateTimeAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoLocalDateTimeExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoLocalDateTimeAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoLocalDateTimeExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoZonedDateTimeAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoZonedDateTimeExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoZonedDateTimeAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoZonedDateTimeExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/FloatingPointJvmAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/FloatingPointJvmExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/FloatingPointJvmAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/FloatingPointJvmExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/LocalDateAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/LocalDateExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/LocalDateAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/LocalDateExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/LocalDateTimeAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/LocalDateTimeExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/LocalDateTimeAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/LocalDateTimeExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/OptionalAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/OptionalExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/OptionalAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/OptionalExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/PathAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/PathExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/PathAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/PathExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ZonedDateTimeAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ZonedDateTimeExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ZonedDateTimeAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ZonedDateTimeExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultBigDecimalAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultBigDecimalExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultBigDecimalAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultBigDecimalExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoLocalDateAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoLocalDateExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoLocalDateAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoLocalDateExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoLocalDateTimeAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoLocalDateTimeExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoLocalDateTimeAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoLocalDateTimeExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoZonedDateTimeAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoZonedDateTimeExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoZonedDateTimeAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoZonedDateTimeExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFloatingPointJvmAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFloatingPointJvmExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFloatingPointJvmAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFloatingPointJvmExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultLocalDateAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultLocalDateExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultLocalDateAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultLocalDateExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultLocalDateTimeAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultLocalDateTimeExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultLocalDateTimeAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultLocalDateTimeExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultOptionalAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultOptionalExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultOptionalAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultOptionalExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultPathAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultPathExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultPathAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultPathExpectations.kt diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultZonedDateTimeAssertions.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultZonedDateTimeExpectations.kt similarity index 100% rename from logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultZonedDateTimeAssertions.kt rename to logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultZonedDateTimeExpectations.kt diff --git a/logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/ResultAssertions.kt b/logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/ResultExpectations.kt similarity index 100% rename from logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/ResultAssertions.kt rename to logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/ResultExpectations.kt diff --git a/logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/impl/DefaultResultAssertions.kt b/logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/impl/DefaultResultExpectations.kt similarity index 100% rename from logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/impl/DefaultResultAssertions.kt rename to logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/impl/DefaultResultExpectations.kt From 8fdee06001bba304bb2cfe7211215212a59b3058 Mon Sep 17 00:00:00 2001 From: Joshua Gleitze Date: Wed, 23 Dec 2020 22:15:17 +0100 Subject: [PATCH 3/9] refactor: adapt the logic files to new *Expectations naming --- .../ch/tutteli/atrium/logic/AnyExpectations.kt | 2 +- .../atrium/logic/CharSequenceExpectations.kt | 2 +- .../atrium/logic/CollectionLikeExpectations.kt | 2 +- .../atrium/logic/ComparableExpectations.kt | 2 +- .../atrium/logic/FloatingPointExpectations.kt | 2 +- .../ch/tutteli/atrium/logic/Fun0Expectations.kt | 2 +- .../atrium/logic/IterableLikeExpectations.kt | 2 +- .../tutteli/atrium/logic/IteratorExpectations.kt | 2 +- .../ch/tutteli/atrium/logic/ListExpectations.kt | 2 +- .../tutteli/atrium/logic/MapEntryExpectations.kt | 2 +- .../tutteli/atrium/logic/MapLikeExpectations.kt | 2 +- .../ch/tutteli/atrium/logic/PairExpectations.kt | 2 +- .../atrium/logic/ThrowableExpectations.kt | 2 +- .../creators/impl/ContainsExpectationCreator.kt | 2 +- .../impl/ContainsObjectsExpectationCreator.kt | 4 ++-- .../contains/CharSequenceContains.kt | 4 ++-- .../creators/CharSequenceContainsExpectations.kt | 2 +- .../CharSequenceContainsExpectationCreator.kt | 6 +++--- .../DefaultCharSequenceContainsExpectations.kt | 6 +++--- .../iterable/contains/IterableLikeContains.kt | 4 ++-- .../creators/IterableLikeContainsExpectations.kt | 2 +- ...IterableLikeContainsInAnyOrderExpectations.kt | 2 +- .../DefaultIterableLikeContainsExpectations.kt | 16 ++++++++-------- ...IterableLikeContainsInAnyOrderExpectations.kt | 8 ++++---- .../impl/InAnyOrderEntriesExpectationCreator.kt | 6 +++--- .../InAnyOrderOnlyEntriesExpectationCreator.kt | 4 ++-- .../impl/InAnyOrderOnlyExpectationCreator.kt | 2 +- .../InAnyOrderOnlyValuesExpectationCreator.kt | 4 ++-- .../impl/InAnyOrderValuesExpectationCreator.kt | 6 +++--- .../impl/InOrderOnlyBaseExpectationCreator.kt | 2 +- .../impl/InOrderOnlyEntriesExpectationCreator.kt | 4 ++-- .../impl/InOrderOnlyExpectationCreator.kt | 4 ++-- ...nOrderOnlyGroupedEntriesExpectationCreator.kt | 7 ++----- .../impl/InOrderOnlyGroupedExpectationCreator.kt | 4 ++-- ...InOrderOnlyGroupedValuesExpectationCreator.kt | 7 ++----- .../impl/InOrderOnlyValuesExpectationCreator.kt | 4 ++-- .../creating/maplike/contains/MapLikeContains.kt | 4 ++-- .../creators/MapLikeContainsExpectations.kt | 2 +- .../creating/transformers/FeatureExtractor.kt | 6 +++--- .../atrium/logic/impl/DefaultAnyExpectations.kt | 2 +- .../impl/DefaultCharSequenceExpectations.kt | 4 ++-- .../impl/DefaultCollectionLikeExpectations.kt | 4 ++-- .../logic/impl/DefaultComparableExpectations.kt | 4 ++-- .../impl/DefaultFloatingPointExpectations.kt | 4 ++-- .../atrium/logic/impl/DefaultFun0Expectations.kt | 4 ++-- .../impl/DefaultIterableLikeExpectations.kt | 4 ++-- .../logic/impl/DefaultIteratorExpectations.kt | 4 ++-- .../atrium/logic/impl/DefaultListExpectations.kt | 4 ++-- .../logic/impl/DefaultMapEntryExpectations.kt | 2 +- .../logic/impl/DefaultMapLikeExpectations.kt | 4 ++-- .../atrium/logic/impl/DefaultPairExpectations.kt | 4 ++-- .../logic/impl/DefaultThrowableExpectations.kt | 2 +- .../atrium/logic/BigDecimalExpectations.kt | 2 +- .../atrium/logic/ChronoLocalDateExpectations.kt | 2 +- .../logic/ChronoLocalDateTimeExpectations.kt | 2 +- .../logic/ChronoZonedDateTimeExpectations.kt | 2 +- .../atrium/logic/FloatingPointJvmExpectations.kt | 2 +- .../atrium/logic/LocalDateExpectations.kt | 2 +- .../atrium/logic/LocalDateTimeExpectations.kt | 2 +- .../tutteli/atrium/logic/OptionalExpectations.kt | 2 +- .../ch/tutteli/atrium/logic/PathExpectations.kt | 2 +- .../atrium/logic/ZonedDateTimeExpectations.kt | 2 +- .../logic/impl/DefaultBigDecimalExpectations.kt | 4 ++-- .../impl/DefaultChronoLocalDateExpectations.kt | 2 +- .../DefaultChronoLocalDateTimeExpectations.kt | 2 +- .../DefaultChronoZonedDateTimeExpectations.kt | 2 +- .../impl/DefaultFloatingPointJvmExpectations.kt | 4 ++-- .../logic/impl/DefaultLocalDateExpectations.kt | 4 ++-- .../impl/DefaultLocalDateTimeExpectations.kt | 4 ++-- .../logic/impl/DefaultOptionalExpectations.kt | 4 ++-- .../atrium/logic/impl/DefaultPathExpectations.kt | 2 +- .../impl/DefaultZonedDateTimeExpectations.kt | 4 ++-- .../ch/tutteli/atrium/logic/kotlin_1_3/result.kt | 6 +++--- .../logic/kotlin_1_3/ResultExpectations.kt | 2 +- .../kotlin_1_3/impl/DefaultResultExpectations.kt | 4 ++-- 75 files changed, 126 insertions(+), 132 deletions(-) diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/AnyExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/AnyExpectations.kt index 9b618c376e..55e414bc24 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/AnyExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/AnyExpectations.kt @@ -9,7 +9,7 @@ import kotlin.reflect.KClass /** * Collection of assertion functions and builders which are applicable to any type (sometimes `Any?` sometimes `Any`). */ -interface AnyAssertions { +interface AnyExpectations { fun toBe(container: AssertionContainer, expected: T): Assertion fun notToBe(container: AssertionContainer, expected: T): Assertion fun isSameAs(container: AssertionContainer, expected: T): Assertion diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/CharSequenceExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/CharSequenceExpectations.kt index b227b11338..44718728f6 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/CharSequenceExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/CharSequenceExpectations.kt @@ -10,7 +10,7 @@ import ch.tutteli.atrium.logic.creating.charsequence.contains.steps.NotCheckerSt /** * Collection of assertion functions and builders which are applicable to subjects with a [CharSequence] type. */ -interface CharSequenceAssertions { +interface CharSequenceExpectations { /** * Starts the building process of a sophisticated `contains` assertions. diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/CollectionLikeExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/CollectionLikeExpectations.kt index d2040a6e57..5da7b52f30 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/CollectionLikeExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/CollectionLikeExpectations.kt @@ -9,7 +9,7 @@ import ch.tutteli.atrium.logic.creating.typeutils.CollectionLike * Collection of assertion functions and builders which are applicable to subjects which can be transformed to a * [Collection] - intended for types which are Collection like such as [Map]. */ -interface CollectionLikeAssertions { +interface CollectionLikeExpectations { fun isEmpty(container: AssertionContainer, converter: (T) -> Collection<*>): Assertion fun isNotEmpty(container: AssertionContainer, converter: (T) -> Collection<*>): Assertion diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ComparableExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ComparableExpectations.kt index 808918f28d..cd8e8c5201 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ComparableExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ComparableExpectations.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.creating.AssertionContainer /** * Collection of assertion functions and builders which are applicable to subjects with a [Comparable] type. */ -interface ComparableAssertions { +interface ComparableExpectations { fun , T2 : Any?> isLessThan(container: AssertionContainer, expected: T2): Assertion fun , T2 : Any?> isLessThanOrEqual(container: AssertionContainer, expected: T2): Assertion diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/FloatingPointExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/FloatingPointExpectations.kt index 788ade08cc..f18cdd5181 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/FloatingPointExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/FloatingPointExpectations.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.creating.AssertionContainer * Collection of assertion functions and builders which are applicable to subjects with a floating point number like * type (currently [Float] and [Double]). */ -interface FloatingPointAssertions { +interface FloatingPointExpectations { fun toBeWithErrorTolerance(container: AssertionContainer, expected: Float, tolerance: Float): Assertion fun toBeWithErrorTolerance(container: AssertionContainer, expected: Double, tolerance: Double): Assertion } diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/Fun0Expectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/Fun0Expectations.kt index 3dc48f0393..7e557f5411 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/Fun0Expectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/Fun0Expectations.kt @@ -8,7 +8,7 @@ import kotlin.reflect.KClass /** * Collection of assertion functions and builders which are applicable to subjects with a [kotlin.Function0] type. */ -interface Fun0Assertions { +interface Fun0Expectations { fun toThrow( container: AssertionContainer Any?>, diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/IterableLikeExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/IterableLikeExpectations.kt index 1486b8bbf9..a2fbe8fd87 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/IterableLikeExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/IterableLikeExpectations.kt @@ -14,7 +14,7 @@ import ch.tutteli.atrium.logic.creating.typeutils.IterableLike * Collection of assertion functions and builders which are applicable to subjects which can be transformed to an * [Iterable] - intended for types which are Iterable like such as [Array] or [Sequence]. */ -interface IterableLikeAssertions { +interface IterableLikeExpectations { fun builderContainsInIterableLike( container: AssertionContainer, diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/IteratorExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/IteratorExpectations.kt index 247dc427f1..8ceb3724da 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/IteratorExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/IteratorExpectations.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.creating.AssertionContainer /** * Collection of assertion functions and builders which are applicable to subjects with an [Iterator] type. */ -interface IteratorAssertions { +interface IteratorExpectations { fun > hasNext(container: AssertionContainer): Assertion fun > hasNotNext(container: AssertionContainer): Assertion } diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ListExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ListExpectations.kt index a539443bff..1cefe17713 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ListExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ListExpectations.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder /** * Collection of assertion functions and builders which are applicable to subjects with a [List] type. */ -interface ListAssertions { +interface ListExpectations { fun > get(container: AssertionContainer, index: Int): FeatureExtractorBuilder.ExecutionStep } diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/MapEntryExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/MapEntryExpectations.kt index 22d5a3ba53..5e24652dcf 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/MapEntryExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/MapEntryExpectations.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder /** * Collection of assertion functions and builders which are applicable to subjects with a [Map.Entry] type. */ -interface MapEntryAssertions { +interface MapEntryExpectations { fun > isKeyValue(container: AssertionContainer, key: K, value: V): Assertion fun > key(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep fun > value(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/MapLikeExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/MapLikeExpectations.kt index 3b158798ca..478a2543d7 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/MapLikeExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/MapLikeExpectations.kt @@ -12,7 +12,7 @@ import ch.tutteli.atrium.logic.creating.typeutils.IterableLike * Collection of assertion functions and builders which are applicable to subjects which can be transformed to a * [Map] - intended for types which are Map like such as [IterableLike] with an element type [Pair]. */ -interface MapLikeAssertions { +interface MapLikeExpectations { fun builderContainsInMapLike( container: AssertionContainer, diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/PairExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/PairExpectations.kt index febe425dff..1deed0aca6 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/PairExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/PairExpectations.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder /** * Collection of assertion functions and builders which are applicable to subjects with a [Pair] type. */ -interface PairAssertions { +interface PairExpectations { fun > first(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep fun > second(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep } diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ThrowableExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ThrowableExpectations.kt index e128d6ea3c..2f4f42e9e3 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ThrowableExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/ThrowableExpectations.kt @@ -7,7 +7,7 @@ import kotlin.reflect.KClass /** * Collection of assertion functions and builders which are applicable to subjects with a [Throwable] type. */ -interface ThrowableAssertions { +interface ThrowableExpectations { fun causeIsA( container: AssertionContainer, diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/ContainsExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/ContainsExpectationCreator.kt index 83ba2dff9d..ef6473d3d4 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/ContainsExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/ContainsExpectationCreator.kt @@ -21,7 +21,7 @@ import ch.tutteli.atrium.reporting.translating.Translatable * @constructor Represents the base class for [Contains.Creator]s, providing a template to fulfill its job. * @param checkers The [Contains.Checker]s which shall be applied to the search result. */ -abstract class ContainsAssertionCreator( +abstract class ContainsExpectationCreator( protected val searchBehaviour: Contains.SearchBehaviour, private val checkers: List ) : Contains.Creator { diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/ContainsObjectsExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/ContainsObjectsExpectationCreator.kt index c9e974881d..9c5e3ab843 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/ContainsObjectsExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/basic/contains/creators/impl/ContainsObjectsExpectationCreator.kt @@ -27,10 +27,10 @@ import ch.tutteli.atrium.reporting.translating.Translatable * @param searchBehaviour The chosen search behaviour. * @param checkers The [Contains.Checker]s which shall be applied to the search result. */ -abstract class ContainsObjectsAssertionCreator( +abstract class ContainsObjectsExpectationCreator( searchBehaviour: S, checkers: List -) : ContainsAssertionCreator(searchBehaviour, checkers) { +) : ContainsExpectationCreator(searchBehaviour, checkers) { final override fun searchAndCreateAssertion( multiConsumableContainer: AssertionContainer, diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/CharSequenceContains.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/CharSequenceContains.kt index 15166eab78..7c809c99df 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/CharSequenceContains.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/CharSequenceContains.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.assertions.AssertionGroup import ch.tutteli.atrium.logic.creating.basic.contains.Contains import ch.tutteli.atrium.logic.creating.charsequence.contains.CharSequenceContains.* -import ch.tutteli.atrium.logic.creating.charsequence.contains.creators.CharSequenceContainsAssertions +import ch.tutteli.atrium.logic.creating.charsequence.contains.creators.CharSequenceContainsExpectations import ch.tutteli.atrium.reporting.translating.Translatable /** @@ -13,7 +13,7 @@ import ch.tutteli.atrium.reporting.translating.Translatable * The building process is typically started by the creation of a [EntryPointStep], * goes on by specifying a desired [SearchBehaviour], * defines which [Checker]s should be applied and - * is finalized by one of the [CharSequenceContainsAssertions] + * is finalized by one of the [CharSequenceContainsExpectations] * which usually use a [Creator] which in turn uses a [Searcher]. */ interface CharSequenceContains { diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/CharSequenceContainsExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/CharSequenceContainsExpectations.kt index 5ff7d1c932..15c7c16e6b 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/CharSequenceContainsExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/CharSequenceContainsExpectations.kt @@ -10,7 +10,7 @@ import ch.tutteli.atrium.logic.creating.typeutils.CharSequenceOrNumberOrChar * Collection of assertion functions which are intended to be used as part of the final step of a sophisticated * `contains`-building process for [CharSequence]. */ -interface CharSequenceContainsAssertions { +interface CharSequenceContainsExpectations { fun values( checkerStepLogic: CharSequenceContains.CheckerStepLogic, diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/CharSequenceContainsExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/CharSequenceContainsExpectationCreator.kt index 9c03b47160..c1ab15423c 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/CharSequenceContainsExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/CharSequenceContainsExpectationCreator.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.assertions.DefaultListAssertionGroupType import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.logic.changeSubject import ch.tutteli.atrium.logic.creating.charsequence.contains.CharSequenceContains.* -import ch.tutteli.atrium.logic.creating.basic.contains.creators.impl.ContainsObjectsAssertionCreator +import ch.tutteli.atrium.logic.creating.basic.contains.creators.impl.ContainsObjectsExpectationCreator import ch.tutteli.atrium.logic.toAssertionContainer import ch.tutteli.atrium.reporting.translating.Translatable import ch.tutteli.atrium.translations.DescriptionCharSequenceAssertion @@ -30,12 +30,12 @@ import ch.tutteli.atrium.translations.DescriptionCharSequenceAssertion * @param searcher The search method which is used to search for given objects. * @param checkers The checkers which create assertions based on the search result. */ -class CharSequenceContainsAssertionCreator( +class CharSequenceContainsExpectationCreator( searchBehaviour: S, private val searcher: Searcher, checkers: List, override val groupDescription: Translatable -) : ContainsObjectsAssertionCreator(searchBehaviour, checkers), Creator { +) : ContainsObjectsExpectationCreator(searchBehaviour, checkers), Creator { override val descriptionContains: Translatable = DescriptionCharSequenceAssertion.CONTAINS override val descriptionNumberOfOccurrences: Translatable = DescriptionCharSequenceAssertion.NUMBER_OF_OCCURRENCES diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/DefaultCharSequenceContainsExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/DefaultCharSequenceContainsExpectations.kt index 7b8840568f..252434cbb4 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/DefaultCharSequenceContainsExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/impl/DefaultCharSequenceContainsExpectations.kt @@ -2,7 +2,7 @@ package ch.tutteli.atrium.logic.creating.charsequence.contains.creators.impl import ch.tutteli.atrium.assertions.AssertionGroup import ch.tutteli.atrium.logic.creating.charsequence.contains.CharSequenceContains.* -import ch.tutteli.atrium.logic.creating.charsequence.contains.creators.CharSequenceContainsAssertions +import ch.tutteli.atrium.logic.creating.charsequence.contains.creators.CharSequenceContainsExpectations import ch.tutteli.atrium.logic.creating.charsequence.contains.searchbehaviours.IgnoringCaseSearchBehaviour import ch.tutteli.atrium.logic.creating.charsequence.contains.searchbehaviours.NoOpSearchBehaviour import ch.tutteli.atrium.logic.creating.charsequence.contains.searchers.impl.IgnoringCaseIndexSearcher @@ -13,7 +13,7 @@ import ch.tutteli.atrium.logic.creating.typeutils.CharSequenceOrNumberOrChar import ch.tutteli.atrium.reporting.translating.Translatable import ch.tutteli.atrium.translations.DescriptionCharSequenceAssertion -class DefaultCharSequenceContainsAssertions : CharSequenceContainsAssertions { +class DefaultCharSequenceContainsExpectations : CharSequenceContainsExpectations { override fun values( checkerStepLogic: CheckerStepLogic, expected: List @@ -76,7 +76,7 @@ class DefaultCharSequenceContainsAssertions : CharSequenceContainsAssertions { expected: List, groupDescription: Translatable ): AssertionGroup { - val creator = CharSequenceContainsAssertionCreator( + val creator = CharSequenceContainsExpectationCreator( checkerStepLogic.entryPointStepLogic.searchBehaviour, searcher, checkerStepLogic.checkers, diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/IterableLikeContains.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/IterableLikeContains.kt index 78e2ecea60..ea4f5566c7 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/IterableLikeContains.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/IterableLikeContains.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.assertions.AssertionGroup import ch.tutteli.atrium.logic.creating.basic.contains.Contains import ch.tutteli.atrium.logic.creating.iterable.contains.IterableLikeContains.* -import ch.tutteli.atrium.logic.creating.iterable.contains.creators.IterableLikeContainsAssertions +import ch.tutteli.atrium.logic.creating.iterable.contains.creators.IterableLikeContainsExpectations import ch.tutteli.atrium.logic.creating.iterable.contains.steps.impl.EntryPointStepImpl import ch.tutteli.atrium.logic.creating.typeutils.IterableLike import ch.tutteli.atrium.reporting.translating.Translatable @@ -16,7 +16,7 @@ import ch.tutteli.atrium.reporting.translating.Translatable * The building process is typically started by the creation of a [EntryPointStep], * goes on by specifying a desired [SearchBehaviour], * defines which [Checker]s should be applied and - * is finalized by one of the [IterableLikeContainsAssertions] which usually use a [Creator]. + * is finalized by one of the [IterableLikeContainsExpectations] which usually use a [Creator]. */ interface IterableLikeContains { diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/IterableLikeContainsExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/IterableLikeContainsExpectations.kt index e3d5cda672..11b7af8a65 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/IterableLikeContainsExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/IterableLikeContainsExpectations.kt @@ -14,7 +14,7 @@ import ch.tutteli.atrium.logic.creating.typeutils.IterableLike * Defines the minimum set of `contains` assertion functions for [Iterable], * which an implementation of the domain of Atrium has to provide. */ -interface IterableLikeContainsAssertions { +interface IterableLikeContainsExpectations { fun valuesInAnyOrderOnly( entryPointStepLogic: IterableLikeContains.EntryPointStepLogic, diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/IterableLikeContainsInAnyOrderExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/IterableLikeContainsInAnyOrderExpectations.kt index 7f9c6fe8b4..602baee0e1 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/IterableLikeContainsInAnyOrderExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/IterableLikeContainsInAnyOrderExpectations.kt @@ -12,7 +12,7 @@ import ch.tutteli.atrium.logic.creating.typeutils.IterableLike * Defines the minimum set of `contains` assertion functions for [Iterable], * which an implementation of the domain of Atrium has to provide. */ -interface IterableLikeContainsInAnyOrderAssertions { +interface IterableLikeContainsInAnyOrderExpectations { fun values( checkerStepLogic: IterableLikeContains.CheckerStepLogic, diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/DefaultIterableLikeContainsExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/DefaultIterableLikeContainsExpectations.kt index 0da078e3b2..427de7f932 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/DefaultIterableLikeContainsExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/DefaultIterableLikeContainsExpectations.kt @@ -4,24 +4,24 @@ import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.assertions.AssertionGroup import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.logic.creating.iterable.contains.IterableLikeContains -import ch.tutteli.atrium.logic.creating.iterable.contains.creators.IterableLikeContainsAssertions +import ch.tutteli.atrium.logic.creating.iterable.contains.creators.IterableLikeContainsExpectations import ch.tutteli.atrium.logic.creating.iterable.contains.searchbehaviours.InAnyOrderOnlySearchBehaviour import ch.tutteli.atrium.logic.creating.iterable.contains.searchbehaviours.InOrderOnlyGroupedSearchBehaviour import ch.tutteli.atrium.logic.creating.iterable.contains.searchbehaviours.InOrderOnlySearchBehaviour import ch.tutteli.atrium.logic.creating.typeutils.IterableLike -class DefaultIterableLikeContainsAssertions : IterableLikeContainsAssertions { +class DefaultIterableLikeContainsExpectations : IterableLikeContainsExpectations { override fun valuesInAnyOrderOnly( entryPointStepLogic: IterableLikeContains.EntryPointStepLogic, expected: List ): Assertion = - createAssertionGroupWithoutChecker(entryPointStepLogic, expected, ::InAnyOrderOnlyValuesAssertionCreator) + createAssertionGroupWithoutChecker(entryPointStepLogic, expected, ::InAnyOrderOnlyValuesExpectationCreator) override fun entriesInAnyOrderOnly( entryPointStepLogic: IterableLikeContains.EntryPointStepLogic, assertionCreators: List<(Expect.() -> Unit)?> ): Assertion = createAssertionGroupWithoutChecker( - entryPointStepLogic, assertionCreators, ::InAnyOrderOnlyEntriesAssertionCreator + entryPointStepLogic, assertionCreators, ::InAnyOrderOnlyEntriesExpectationCreator ) @@ -29,13 +29,13 @@ class DefaultIterableLikeContainsAssertions : IterableLikeContainsAssertions { entryPointStepLogic: IterableLikeContains.EntryPointStepLogic, expected: List ): Assertion = - createAssertionGroupWithoutChecker(entryPointStepLogic, expected, ::InOrderOnlyValuesAssertionCreator) + createAssertionGroupWithoutChecker(entryPointStepLogic, expected, ::InOrderOnlyValuesExpectationCreator) override fun entriesInOrderOnly( entryPointStepLogic: IterableLikeContains.EntryPointStepLogic, assertionCreators: List<(Expect.() -> Unit)?> ): Assertion = createAssertionGroupWithoutChecker( - entryPointStepLogic, assertionCreators, ::InOrderOnlyEntriesAssertionCreator + entryPointStepLogic, assertionCreators, ::InOrderOnlyEntriesExpectationCreator ) @@ -43,14 +43,14 @@ class DefaultIterableLikeContainsAssertions : IterableLikeContainsAssertions { entryPointStepLogic: IterableLikeContains.EntryPointStepLogic, groups: List> ): Assertion = createAssertionGroupWithoutChecker( - entryPointStepLogic, groups, ::InOrderOnlyGroupedValuesAssertionCreator + entryPointStepLogic, groups, ::InOrderOnlyGroupedValuesExpectationCreator ) override fun entriesInOrderOnlyGrouped( entryPointStepLogic: IterableLikeContains.EntryPointStepLogic, groups: List.() -> Unit)?>> ): Assertion = createAssertionGroupWithoutChecker( - entryPointStepLogic, groups, ::InOrderOnlyGroupedEntriesAssertionCreator + entryPointStepLogic, groups, ::InOrderOnlyGroupedEntriesExpectationCreator ) private fun createAssertionGroupWithoutChecker( diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/DefaultIterableLikeContainsInAnyOrderExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/DefaultIterableLikeContainsInAnyOrderExpectations.kt index 4c454a69a4..c89a533b0c 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/DefaultIterableLikeContainsInAnyOrderExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/DefaultIterableLikeContainsInAnyOrderExpectations.kt @@ -4,20 +4,20 @@ import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.assertions.AssertionGroup import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.logic.creating.iterable.contains.IterableLikeContains -import ch.tutteli.atrium.logic.creating.iterable.contains.creators.IterableLikeContainsInAnyOrderAssertions +import ch.tutteli.atrium.logic.creating.iterable.contains.creators.IterableLikeContainsInAnyOrderExpectations import ch.tutteli.atrium.logic.creating.iterable.contains.searchbehaviours.InAnyOrderSearchBehaviour import ch.tutteli.atrium.logic.creating.typeutils.IterableLike -class DefaultIterableLikeContainsInAnyOrderAssertions : IterableLikeContainsInAnyOrderAssertions { +class DefaultIterableLikeContainsInAnyOrderExpectations : IterableLikeContainsInAnyOrderExpectations { override fun values( checkerStepLogic: IterableLikeContains.CheckerStepLogic, expected: List - ): Assertion = createAssertionGroup(checkerStepLogic, expected, ::InAnyOrderValuesAssertionCreator) + ): Assertion = createAssertionGroup(checkerStepLogic, expected, ::InAnyOrderValuesExpectationCreator) override fun entries( checkerStepLogic: IterableLikeContains.CheckerStepLogic, assertionCreators: List<(Expect.() -> Unit)?> - ): Assertion = createAssertionGroup(checkerStepLogic, assertionCreators, ::InAnyOrderEntriesAssertionCreator) + ): Assertion = createAssertionGroup(checkerStepLogic, assertionCreators, ::InAnyOrderEntriesExpectationCreator) private fun createAssertionGroup( checkerStepLogic: IterableLikeContains.CheckerStepLogic, diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderEntriesExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderEntriesExpectationCreator.kt index cedc3ea0d0..fe2e768077 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderEntriesExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderEntriesExpectationCreator.kt @@ -8,7 +8,7 @@ import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.creating.CollectingExpect import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.domain.creating.collectors.assertionCollector -import ch.tutteli.atrium.logic.creating.basic.contains.creators.impl.ContainsAssertionCreator +import ch.tutteli.atrium.logic.creating.basic.contains.creators.impl.ContainsExpectationCreator import ch.tutteli.atrium.logic.creating.iterable.contains.IterableLikeContains import ch.tutteli.atrium.logic.creating.iterable.contains.searchbehaviours.InAnyOrderSearchBehaviour import ch.tutteli.atrium.logic.creating.iterable.contains.searchbehaviours.NotSearchBehaviour @@ -36,11 +36,11 @@ import ch.tutteli.atrium.translations.DescriptionIterableAssertion.AN_ELEMENT_WH * decorate the description (a [Translatable]) which is used for the [AssertionGroup]. * @param checkers The checkers which create assertions based on the search result. */ -class InAnyOrderEntriesAssertionCreator( +class InAnyOrderEntriesExpectationCreator( private val converter: (T) -> Iterable, searchBehaviour: InAnyOrderSearchBehaviour, checkers: List -) : ContainsAssertionCreator, (Expect.() -> Unit)?, IterableLikeContains.Checker>( +) : ContainsExpectationCreator, (Expect.() -> Unit)?, IterableLikeContains.Checker>( searchBehaviour, checkers ), diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyEntriesExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyEntriesExpectationCreator.kt index 9859f0f04f..d82183cb8f 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyEntriesExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyEntriesExpectationCreator.kt @@ -26,10 +26,10 @@ import ch.tutteli.atrium.translations.DescriptionIterableAssertion * @param searchBehaviour The search behaviour -- in this case representing `in any order only` which is used to * decorate the description (a [Translatable]) which is used for the [AssertionGroup]. */ -class InAnyOrderOnlyEntriesAssertionCreator( +class InAnyOrderOnlyEntriesExpectationCreator( converter: (T) -> Iterable, searchBehaviour: InAnyOrderOnlySearchBehaviour -) : InAnyOrderOnlyAssertionCreator.() -> Unit)?>(converter, searchBehaviour) { +) : InAnyOrderOnlyExpectationCreator.() -> Unit)?>(converter, searchBehaviour) { override fun createAssertionForSearchCriterionAndRemoveMatchFromList( searchCriterion: (Expect.() -> Unit)?, diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyExpectationCreator.kt index 14db5c4d88..6912cbc960 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyExpectationCreator.kt @@ -32,7 +32,7 @@ import ch.tutteli.atrium.translations.DescriptionIterableAssertion.* * @param searchBehaviour The search behaviour -- in this case representing `in any order only` which is used to * decorate the description (a [Translatable]) which is used for the [AssertionGroup]. */ -abstract class InAnyOrderOnlyAssertionCreator( +abstract class InAnyOrderOnlyExpectationCreator( private val converter: (T) -> Iterable, private val searchBehaviour: InAnyOrderOnlySearchBehaviour ) : IterableLikeContains.Creator { diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyValuesExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyValuesExpectationCreator.kt index aaa65e3d80..a310afad41 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyValuesExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderOnlyValuesExpectationCreator.kt @@ -20,10 +20,10 @@ import ch.tutteli.atrium.translations.DescriptionIterableAssertion.AN_ELEMENT_WH * @param searchBehaviour The search behaviour -- in this case representing `in any order only` which is used to * decorate the description (a [Translatable]) which is used for the [AssertionGroup]. */ -class InAnyOrderOnlyValuesAssertionCreator( +class InAnyOrderOnlyValuesExpectationCreator( converter: (T) -> Iterable, searchBehaviour: InAnyOrderOnlySearchBehaviour -) : InAnyOrderOnlyAssertionCreator(converter, searchBehaviour) { +) : InAnyOrderOnlyExpectationCreator(converter, searchBehaviour) { override fun createAssertionForSearchCriterionAndRemoveMatchFromList( searchCriterion: E, diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderValuesExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderValuesExpectationCreator.kt index 92ffccc458..b3873de613 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderValuesExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InAnyOrderValuesExpectationCreator.kt @@ -3,7 +3,7 @@ package ch.tutteli.atrium.logic.creating.iterable.contains.creators.impl import ch.tutteli.atrium.assertions.* import ch.tutteli.atrium.core.getOrElse import ch.tutteli.atrium.creating.AssertionContainer -import ch.tutteli.atrium.logic.creating.basic.contains.creators.impl.ContainsObjectsAssertionCreator +import ch.tutteli.atrium.logic.creating.basic.contains.creators.impl.ContainsObjectsExpectationCreator import ch.tutteli.atrium.logic.creating.iterable.contains.IterableLikeContains import ch.tutteli.atrium.logic.creating.iterable.contains.searchbehaviours.InAnyOrderSearchBehaviour import ch.tutteli.atrium.logic.creating.iterable.contains.searchbehaviours.NotSearchBehaviour @@ -25,11 +25,11 @@ import ch.tutteli.atrium.translations.DescriptionIterableAssertion * decorate the description (a [Translatable]) which is used for the [AssertionGroup]. * @param checkers The checkers which create assertions based on the search result. */ -class InAnyOrderValuesAssertionCreator( +class InAnyOrderValuesExpectationCreator( private val converter: (T) -> Iterable, searchBehaviour: InAnyOrderSearchBehaviour, checkers: List -) : ContainsObjectsAssertionCreator, SC, InAnyOrderSearchBehaviour, IterableLikeContains.Checker>( +) : ContainsObjectsExpectationCreator, SC, InAnyOrderSearchBehaviour, IterableLikeContains.Checker>( searchBehaviour, checkers ), IterableLikeContains.Creator { diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyBaseExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyBaseExpectationCreator.kt index da4cee0e80..1e21caa9e4 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyBaseExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyBaseExpectationCreator.kt @@ -21,7 +21,7 @@ import ch.tutteli.kbox.identity import ch.tutteli.kbox.ifWithinBound import ch.tutteli.kbox.mapRemainingWithCounter -abstract class InOrderOnlyBaseAssertionCreator( +abstract class InOrderOnlyBaseExpectationCreator( private val converter: (T) -> Iterable, private val searchBehaviour: IterableLikeContains.SearchBehaviour ) : IterableLikeContains.Creator { diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyEntriesExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyEntriesExpectationCreator.kt index 48ec501ce0..cef87182a4 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyEntriesExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyEntriesExpectationCreator.kt @@ -19,8 +19,8 @@ import ch.tutteli.atrium.reporting.translating.Translatable * @param searchBehaviour The search behaviour -- in this case representing `in any order only` which is used to * decorate the description (a [Translatable]) which is used for the [AssertionGroup]. */ -class InOrderOnlyEntriesAssertionCreator( +class InOrderOnlyEntriesExpectationCreator( converter: (T) -> Iterable, searchBehaviour: InOrderOnlySearchBehaviour -) : InOrderOnlyAssertionCreator.() -> Unit)?>(converter, searchBehaviour), +) : InOrderOnlyExpectationCreator.() -> Unit)?>(converter, searchBehaviour), InOrderOnlyMatcher.() -> Unit)?> by InOrderOnlyEntriesMatcher() diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyExpectationCreator.kt index d33ac4f1a0..cdec0cec10 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyExpectationCreator.kt @@ -22,10 +22,10 @@ import ch.tutteli.atrium.translations.DescriptionIterableAssertion.ELEMENT_WITH_ * @param searchBehaviour The search behaviour -- in this case representing `in order only` which is used to * decorate the description (a [Translatable]) which is used for the [AssertionGroup]. */ -abstract class InOrderOnlyAssertionCreator( +abstract class InOrderOnlyExpectationCreator( converter: (T) -> Iterable, searchBehaviour: InOrderOnlySearchBehaviour -) : InOrderOnlyBaseAssertionCreator(converter, searchBehaviour), +) : InOrderOnlyBaseExpectationCreator(converter, searchBehaviour), //TODO use protected visibility once https://youtrack.jetbrains.com/issue/KT-24328 is implemented InOrderOnlyMatcher { diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedEntriesExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedEntriesExpectationCreator.kt index 00265a8141..8edfac2118 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedEntriesExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedEntriesExpectationCreator.kt @@ -2,19 +2,16 @@ package ch.tutteli.atrium.logic.creating.iterable.contains.creators.impl import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.logic._logic -import ch.tutteli.atrium.logic._logicAppend import ch.tutteli.atrium.logic.builderContainsInIterableLike import ch.tutteli.atrium.logic.creating.iterable.contains.creators.entriesInAnyOrderOnly import ch.tutteli.atrium.logic.creating.iterable.contains.searchbehaviours.InOrderOnlyGroupedSearchBehaviour -import ch.tutteli.atrium.logic.creating.iterable.contains.steps.butOnly -import ch.tutteli.atrium.logic.creating.iterable.contains.steps.inAnyOrder import ch.tutteli.atrium.logic.creating.typeutils.IterableLike import ch.tutteli.kbox.identity -class InOrderOnlyGroupedEntriesAssertionCreator( +class InOrderOnlyGroupedEntriesExpectationCreator( converter: (T) -> Iterable, searchBehaviour: InOrderOnlyGroupedSearchBehaviour -) : InOrderOnlyGroupedAssertionCreator.() -> Unit)?>(converter, searchBehaviour), +) : InOrderOnlyGroupedExpectationCreator.() -> Unit)?>(converter, searchBehaviour), InOrderOnlyMatcher.() -> Unit)?> by InOrderOnlyEntriesMatcher() { override fun Expect>.addSublistAssertion(groupOfSearchCriteria: List<(Expect.() -> Unit)?>) { diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedExpectationCreator.kt index c9fff83140..e805a7836c 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedExpectationCreator.kt @@ -13,10 +13,10 @@ import ch.tutteli.atrium.logic.extractFeature import ch.tutteli.atrium.reporting.translating.TranslatableWithArgs import ch.tutteli.atrium.translations.DescriptionIterableAssertion -abstract class InOrderOnlyGroupedAssertionCreator( +abstract class InOrderOnlyGroupedExpectationCreator( converter: (T) -> Iterable, searchBehaviour: InOrderOnlyGroupedSearchBehaviour -) : InOrderOnlyBaseAssertionCreator>(converter, searchBehaviour), +) : InOrderOnlyBaseExpectationCreator>(converter, searchBehaviour), //TODO use protected visibility once https://youtrack.jetbrains.com/issue/KT-24328 is implemented InOrderOnlyMatcher { diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedValuesExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedValuesExpectationCreator.kt index a57bbc90eb..698ffab2f3 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedValuesExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedValuesExpectationCreator.kt @@ -2,19 +2,16 @@ package ch.tutteli.atrium.logic.creating.iterable.contains.creators.impl import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.logic._logic -import ch.tutteli.atrium.logic._logicAppend import ch.tutteli.atrium.logic.builderContainsInIterableLike import ch.tutteli.atrium.logic.creating.iterable.contains.creators.valuesInAnyOrderOnly import ch.tutteli.atrium.logic.creating.iterable.contains.searchbehaviours.InOrderOnlyGroupedSearchBehaviour -import ch.tutteli.atrium.logic.creating.iterable.contains.steps.butOnly -import ch.tutteli.atrium.logic.creating.iterable.contains.steps.inAnyOrder import ch.tutteli.atrium.logic.creating.typeutils.IterableLike import ch.tutteli.kbox.identity -class InOrderOnlyGroupedValuesAssertionCreator( +class InOrderOnlyGroupedValuesExpectationCreator( converter: (T) -> Iterable, searchBehaviour: InOrderOnlyGroupedSearchBehaviour -) : InOrderOnlyGroupedAssertionCreator(converter, searchBehaviour), +) : InOrderOnlyGroupedExpectationCreator(converter, searchBehaviour), InOrderOnlyMatcher by InOrderOnlyValueMatcher() { override fun Expect>.addSublistAssertion(groupOfSearchCriteria: List) { diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyValuesExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyValuesExpectationCreator.kt index fdd02441ac..523a5f04a3 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyValuesExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyValuesExpectationCreator.kt @@ -18,9 +18,9 @@ import ch.tutteli.atrium.reporting.translating.Translatable * @param searchBehaviour The search behaviour -- in this case representing `in any order only` which is used to * decorate the description (a [Translatable]) which is used for the [AssertionGroup]. */ -class InOrderOnlyValuesAssertionCreator( +class InOrderOnlyValuesExpectationCreator( converter: (T) -> Iterable, searchBehaviour: InOrderOnlySearchBehaviour -) : InOrderOnlyAssertionCreator(converter, searchBehaviour), +) : InOrderOnlyExpectationCreator(converter, searchBehaviour), //TODO use protected visibility once https://youtrack.jetbrains.com/issue/KT-24328 is implemented InOrderOnlyMatcher by InOrderOnlyValueMatcher() diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/MapLikeContains.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/MapLikeContains.kt index f397e820bf..c56cf5f670 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/MapLikeContains.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/MapLikeContains.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.assertions.AssertionGroup import ch.tutteli.atrium.logic.creating.basic.contains.Contains import ch.tutteli.atrium.logic.creating.maplike.contains.MapLikeContains.* -import ch.tutteli.atrium.logic.creating.maplike.contains.creators.MapLikeContainsAssertions +import ch.tutteli.atrium.logic.creating.maplike.contains.creators.MapLikeContainsExpectations import ch.tutteli.atrium.logic.creating.maplike.contains.steps.impl.EntryPointStepImpl import ch.tutteli.atrium.logic.creating.typeutils.MapLike import ch.tutteli.atrium.reporting.translating.Translatable @@ -15,7 +15,7 @@ import ch.tutteli.atrium.reporting.translating.Translatable * The building process is typically started by the creation of an [EntryPointStep], * goes on by specifying a desired [SearchBehaviour], * defines which [Checker]s should be applied and - * is finalized by one of the [MapLikeContainsAssertions] which usually use a [Creator]. + * is finalized by one of the [MapLikeContainsExpectations] which usually use a [Creator]. */ interface MapLikeContains { diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/MapLikeContainsExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/MapLikeContainsExpectations.kt index 6f8ac35171..bf40e271bf 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/MapLikeContainsExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/MapLikeContainsExpectations.kt @@ -15,7 +15,7 @@ import kotlin.reflect.KClass * Defines the minimum set of `contains` assertion functions for [Iterable], * which an implementation of the domain of Atrium has to provide. */ -interface MapLikeContainsAssertions { +interface MapLikeContainsExpectations { fun keyValuePairsInAnyOrder( entryPointStepLogic: MapLikeContains.EntryPointStepLogic, diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/transformers/FeatureExtractor.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/transformers/FeatureExtractor.kt index 7b47c07aa0..1d96eb6d66 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/transformers/FeatureExtractor.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/transformers/FeatureExtractor.kt @@ -10,14 +10,14 @@ import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.creating.FeatureExpect import ch.tutteli.atrium.creating.FeatureExpectOptions -import ch.tutteli.atrium.logic.FeatureAssertions +import ch.tutteli.atrium.logic.FeatureExtractors import ch.tutteli.atrium.reporting.translating.Translatable /** * Defines the contract for sophisticated `safe feature extractions` including assertion creation for the feature. * - * It is similar to [FeatureAssertions] but differs in the intended usage. - * [FeatureAssertions] are intended to make assertions about a return value of a method call or a property, + * It is similar to [FeatureExtractors] but differs in the intended usage. + * [FeatureExtractors] are intended to make assertions about a return value of a method call or a property, * assuming that the call as such always succeeds (no exception is thrown). * The [FeatureExtractor] on the other hand should be used if it is already known, * that the call/access fails depending on given arguments. diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultAnyExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultAnyExpectations.kt index 4c7d78fad7..2a093c5988 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultAnyExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultAnyExpectations.kt @@ -15,7 +15,7 @@ import ch.tutteli.atrium.reporting.Text import ch.tutteli.atrium.translations.DescriptionAnyAssertion.* import kotlin.reflect.KClass -class DefaultAnyAssertions : AnyAssertions { +class DefaultAnyExpectations : AnyExpectations { override fun toBe(container: AssertionContainer, expected: T): Assertion = container.createDescriptiveAssertion(TO_BE, expected) { it == expected } diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultCharSequenceExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultCharSequenceExpectations.kt index c8b7e993e4..45f65a39f9 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultCharSequenceExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultCharSequenceExpectations.kt @@ -3,7 +3,7 @@ package ch.tutteli.atrium.logic.impl import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.core.ExperimentalNewExpectTypes import ch.tutteli.atrium.creating.AssertionContainer -import ch.tutteli.atrium.logic.CharSequenceAssertions +import ch.tutteli.atrium.logic.CharSequenceExpectations import ch.tutteli.atrium.logic._logic import ch.tutteli.atrium.logic.createDescriptiveAssertion import ch.tutteli.atrium.logic.creating.charsequence.contains.CharSequenceContains @@ -18,7 +18,7 @@ import ch.tutteli.atrium.translations.DescriptionBasic.IS import ch.tutteli.atrium.translations.DescriptionBasic.IS_NOT import ch.tutteli.atrium.translations.DescriptionCharSequenceAssertion.* -class DefaultCharSequenceAssertions : CharSequenceAssertions { +class DefaultCharSequenceExpectations : CharSequenceExpectations { override fun containsBuilder( container: AssertionContainer ): CharSequenceContains.EntryPointStep = diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultCollectionLikeExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultCollectionLikeExpectations.kt index 4cc4bca95e..2551fa5336 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultCollectionLikeExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultCollectionLikeExpectations.kt @@ -3,7 +3,7 @@ package ch.tutteli.atrium.logic.impl import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder -import ch.tutteli.atrium.logic.CollectionLikeAssertions +import ch.tutteli.atrium.logic.CollectionLikeExpectations import ch.tutteli.atrium.logic.createDescriptiveAssertion import ch.tutteli.atrium.logic.creating.typeutils.CollectionLike import ch.tutteli.atrium.logic.manualFeature @@ -11,7 +11,7 @@ import ch.tutteli.atrium.translations.DescriptionBasic.IS import ch.tutteli.atrium.translations.DescriptionBasic.IS_NOT import ch.tutteli.atrium.translations.DescriptionCollectionAssertion.* -class DefaultCollectionLikeAssertions : CollectionLikeAssertions { +class DefaultCollectionLikeExpectations : CollectionLikeExpectations { override fun isEmpty(container: AssertionContainer, converter: (T) -> Collection<*>): Assertion = container.createDescriptiveAssertion(IS, EMPTY) { converter(it).isEmpty() } diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultComparableExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultComparableExpectations.kt index b838aa2e26..a20368b736 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultComparableExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultComparableExpectations.kt @@ -2,11 +2,11 @@ package ch.tutteli.atrium.logic.impl import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.creating.AssertionContainer -import ch.tutteli.atrium.logic.ComparableAssertions +import ch.tutteli.atrium.logic.ComparableExpectations import ch.tutteli.atrium.logic.createDescriptiveAssertion import ch.tutteli.atrium.translations.DescriptionComparableAssertion.* -class DefaultComparableAssertions : ComparableAssertions { +class DefaultComparableExpectations : ComparableExpectations { override fun , T2 : Any?> isLessThan( container: AssertionContainer, diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFloatingPointExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFloatingPointExpectations.kt index 5e5590f2ce..cac30bbf55 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFloatingPointExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFloatingPointExpectations.kt @@ -7,12 +7,12 @@ import ch.tutteli.atrium.assertions.builders.withFailureHintBasedOnDefinedSubjec import ch.tutteli.atrium.core.polyfills.formatFloatingPointNumber import ch.tutteli.atrium.core.polyfills.fullName import ch.tutteli.atrium.creating.AssertionContainer -import ch.tutteli.atrium.logic.FloatingPointAssertions +import ch.tutteli.atrium.logic.FloatingPointExpectations import ch.tutteli.atrium.reporting.translating.TranslatableWithArgs import ch.tutteli.atrium.translations.DescriptionFloatingPointAssertion.* import kotlin.math.absoluteValue -class DefaultFloatingPointAssertions : FloatingPointAssertions { +class DefaultFloatingPointExpectations : FloatingPointExpectations { override fun toBeWithErrorTolerance( container: AssertionContainer, expected: Float, diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFun0Expectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFun0Expectations.kt index 500983d1b7..e33e2920e3 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFun0Expectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFun0Expectations.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.core.Right import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.creating.FeatureExpect import ch.tutteli.atrium.creating.FeatureExpectOptions -import ch.tutteli.atrium.logic.Fun0Assertions +import ch.tutteli.atrium.logic.Fun0Expectations import ch.tutteli.atrium.logic.changeSubject import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import ch.tutteli.atrium.logic.creating.transformers.SubjectChangerBuilder @@ -18,7 +18,7 @@ import ch.tutteli.atrium.reporting.reporter import ch.tutteli.atrium.translations.DescriptionFunLikeAssertion.* import kotlin.reflect.KClass -class DefaultFun0Assertions : Fun0Assertions { +class DefaultFun0Expectations : Fun0Expectations { @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultIterableLikeExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultIterableLikeExpectations.kt index 175f84cbf1..516b60d542 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultIterableLikeExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultIterableLikeExpectations.kt @@ -8,7 +8,7 @@ import ch.tutteli.atrium.core.Option import ch.tutteli.atrium.core.falseProvider import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.creating.Expect -import ch.tutteli.atrium.logic.IterableLikeAssertions +import ch.tutteli.atrium.logic.IterableLikeExpectations import ch.tutteli.atrium.logic._logic import ch.tutteli.atrium.logic.assertions.impl.LazyThreadUnsafeAssertionGroup import ch.tutteli.atrium.logic.createDescriptiveAssertion @@ -32,7 +32,7 @@ import ch.tutteli.atrium.translations.DescriptionIterableAssertion.NEXT_ELEMENT import ch.tutteli.kbox.WithIndex import ch.tutteli.kbox.mapWithIndex -class DefaultIterableLikeAssertions : IterableLikeAssertions { +class DefaultIterableLikeExpectations : IterableLikeExpectations { override fun builderContainsInIterableLike( container: AssertionContainer, converter: (T) -> Iterable diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultIteratorExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultIteratorExpectations.kt index a64c8be405..a49c93508a 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultIteratorExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultIteratorExpectations.kt @@ -2,12 +2,12 @@ package ch.tutteli.atrium.logic.impl import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.creating.AssertionContainer -import ch.tutteli.atrium.logic.IteratorAssertions +import ch.tutteli.atrium.logic.IteratorExpectations import ch.tutteli.atrium.logic.createDescriptiveAssertion import ch.tutteli.atrium.translations.DescriptionBasic.* import ch.tutteli.atrium.translations.DescriptionIterableAssertion.NEXT_ELEMENT -class DefaultIteratorAssertions : IteratorAssertions { +class DefaultIteratorExpectations : IteratorExpectations { override fun > hasNext(container: AssertionContainer): Assertion = container.createDescriptiveAssertion(HAS, NEXT_ELEMENT) { it.hasNext() } diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultListExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultListExpectations.kt index 29d947cfb2..5a09464f0d 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultListExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultListExpectations.kt @@ -2,12 +2,12 @@ package ch.tutteli.atrium.logic.impl import ch.tutteli.atrium.core.Option import ch.tutteli.atrium.creating.AssertionContainer -import ch.tutteli.atrium.logic.ListAssertions +import ch.tutteli.atrium.logic.ListExpectations import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import ch.tutteli.atrium.logic.extractFeature import ch.tutteli.atrium.translations.DescriptionListAssertion.INDEX_OUT_OF_BOUNDS -class DefaultListAssertions : ListAssertions { +class DefaultListExpectations : ListExpectations { override fun > get(container: AssertionContainer, index: Int): FeatureExtractorBuilder.ExecutionStep = container.extractFeature diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapEntryExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapEntryExpectations.kt index 91c14f564e..4521264c18 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapEntryExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapEntryExpectations.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.logic.* import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder -class DefaultMapEntryAssertions : MapEntryAssertions { +class DefaultMapEntryExpectations : MapEntryExpectations { override fun > isKeyValue(container: AssertionContainer, key: K, value: V): Assertion = container.collect { diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapLikeExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapLikeExpectations.kt index 797b4872e9..4b98985985 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapLikeExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapLikeExpectations.kt @@ -3,7 +3,7 @@ package ch.tutteli.atrium.logic.impl import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.core.Option import ch.tutteli.atrium.creating.AssertionContainer -import ch.tutteli.atrium.logic.MapLikeAssertions +import ch.tutteli.atrium.logic.MapLikeExpectations import ch.tutteli.atrium.logic.createDescriptiveAssertion import ch.tutteli.atrium.logic.creating.maplike.contains.MapLikeContains import ch.tutteli.atrium.logic.creating.maplike.contains.searchbehaviours.NoOpSearchBehaviour @@ -14,7 +14,7 @@ import ch.tutteli.atrium.logic.creating.typeutils.MapLike import ch.tutteli.atrium.logic.extractFeature import ch.tutteli.atrium.translations.DescriptionMapLikeAssertion.* -class DefaultMapLikeAssertions : MapLikeAssertions { +class DefaultMapLikeExpectations : MapLikeExpectations { override fun builderContainsInMapLike( container: AssertionContainer, converter: (T) -> Map diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultPairExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultPairExpectations.kt index 2bd1b9c9a1..ada75424af 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultPairExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultPairExpectations.kt @@ -2,10 +2,10 @@ package ch.tutteli.atrium.logic.impl import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder -import ch.tutteli.atrium.logic.PairAssertions +import ch.tutteli.atrium.logic.PairExpectations import ch.tutteli.atrium.logic.property -class DefaultPairAssertions : PairAssertions { +class DefaultPairExpectations : PairExpectations { override fun > first(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep = container.property(Pair::first) diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultThrowableExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultThrowableExpectations.kt index ab6f657e1c..2e6b7c81d8 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultThrowableExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultThrowableExpectations.kt @@ -11,7 +11,7 @@ import ch.tutteli.atrium.translations.DescriptionThrowableAssertion import ch.tutteli.atrium.translations.DescriptionThrowableAssertion.OCCURRED_EXCEPTION_CAUSE import kotlin.reflect.KClass -class DefaultThrowableAssertions : ThrowableAssertions { +class DefaultThrowableExpectations : ThrowableExpectations { @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/BigDecimalExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/BigDecimalExpectations.kt index f7ad3d0404..8b34130852 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/BigDecimalExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/BigDecimalExpectations.kt @@ -12,7 +12,7 @@ import java.math.BigDecimal /** * Collection of assertion functions and builders which are applicable to subjects with a [BigDecimal] type. */ -interface BigDecimalAssertions { +interface BigDecimalExpectations { fun isNumericallyEqualTo(container: AssertionContainer, expected: T): Assertion fun isNotNumericallyEqualTo(container: AssertionContainer, expected: T): Assertion fun isEqualIncludingScale( diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoLocalDateExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoLocalDateExpectations.kt index bf67c3c99e..66af5a9b57 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoLocalDateExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoLocalDateExpectations.kt @@ -12,7 +12,7 @@ import java.time.chrono.ChronoLocalDate /** * Collection of assertion functions and builders which are applicable to subjects with a [ChronoLocalDate] type. */ -interface ChronoLocalDateAssertions { +interface ChronoLocalDateExpectations { fun isBefore(container: AssertionContainer, expected: ChronoLocalDate): Assertion fun isBeforeOrEqual(container: AssertionContainer, expected: ChronoLocalDate): Assertion fun isAfter(container: AssertionContainer, expected: ChronoLocalDate): Assertion diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoLocalDateTimeExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoLocalDateTimeExpectations.kt index 9b6c86fd0c..f96821a6ed 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoLocalDateTimeExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoLocalDateTimeExpectations.kt @@ -13,7 +13,7 @@ import java.time.chrono.ChronoLocalDateTime /** * Collection of assertion functions and builders which are applicable to subjects with a [ChronoLocalDateTime] type. */ -interface ChronoLocalDateTimeAssertions { +interface ChronoLocalDateTimeExpectations { fun > isBefore( container: AssertionContainer, expected: ChronoLocalDateTime<*> diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoZonedDateTimeExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoZonedDateTimeExpectations.kt index 4553654686..6441b9676f 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoZonedDateTimeExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ChronoZonedDateTimeExpectations.kt @@ -14,7 +14,7 @@ import java.time.chrono.ChronoZonedDateTime /** * Collection of assertion functions and builders which are applicable to subjects with a [ChronoZonedDateTime] type. */ -interface ChronoZonedDateTimeAssertions { +interface ChronoZonedDateTimeExpectations { fun > isBefore( container: AssertionContainer, expected: ChronoZonedDateTime<*> diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/FloatingPointJvmExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/FloatingPointJvmExpectations.kt index 6b10b8a533..0406037c82 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/FloatingPointJvmExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/FloatingPointJvmExpectations.kt @@ -13,7 +13,7 @@ import java.math.BigDecimal * Collection of assertion functions and builders which are applicable to floating point number like types which are * specific to the JVM platform (currently only for [BigDecimal]). */ -interface FloatingPointJvmAssertions { +interface FloatingPointJvmExpectations { fun toBeWithErrorTolerance( container: AssertionContainer, expected: BigDecimal, diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/LocalDateExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/LocalDateExpectations.kt index d753b9fe98..0c8700232b 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/LocalDateExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/LocalDateExpectations.kt @@ -13,7 +13,7 @@ import java.time.LocalDate /** * Collection of assertion functions and builders which are applicable to subjects with a [LocalDate] type. */ -interface LocalDateAssertions { +interface LocalDateExpectations { fun year(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep fun month(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/LocalDateTimeExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/LocalDateTimeExpectations.kt index b451d1fdf8..7df20c27da 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/LocalDateTimeExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/LocalDateTimeExpectations.kt @@ -13,7 +13,7 @@ import java.time.LocalDateTime /** * Collection of assertion functions and builders which are applicable to subjects with a [LocalDateTime] type. */ -interface LocalDateTimeAssertions { +interface LocalDateTimeExpectations { fun year(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep fun month(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/OptionalExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/OptionalExpectations.kt index fe2daa4cc5..c9ab1013c9 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/OptionalExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/OptionalExpectations.kt @@ -13,7 +13,7 @@ import java.util.* /** * Collection of assertion functions and builders which are applicable to subjects with an [Optional] type. */ -interface OptionalAssertions { +interface OptionalExpectations { fun > isEmpty(container: AssertionContainer): Assertion fun > isPresent(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep } diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/PathExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/PathExpectations.kt index 1e5e77675c..d1769689f8 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/PathExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/PathExpectations.kt @@ -15,7 +15,7 @@ import java.nio.file.Path /** * Collection of assertion functions and builders which are applicable to subjects with a [Path] type. */ -interface PathAssertions { +interface PathExpectations { fun startsWith(container: AssertionContainer, expected: Path): Assertion fun startsNotWith(container: AssertionContainer, expected: Path): Assertion fun endsWith(container: AssertionContainer, expected: Path): Assertion diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ZonedDateTimeExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ZonedDateTimeExpectations.kt index b6c243f59a..ed49765775 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ZonedDateTimeExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/ZonedDateTimeExpectations.kt @@ -13,7 +13,7 @@ import java.time.ZonedDateTime /** * Collection of assertion functions and builders which are applicable to subjects with a [ZonedDateTime] type. */ -interface ZonedDateTimeAssertions { +interface ZonedDateTimeExpectations { fun year(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep fun month(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultBigDecimalExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultBigDecimalExpectations.kt index 348bd5d1e4..63646b7a72 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultBigDecimalExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultBigDecimalExpectations.kt @@ -10,12 +10,12 @@ import ch.tutteli.atrium.assertions.builders.assertionBuilder import ch.tutteli.atrium.assertions.builders.withExplanatoryAssertion import ch.tutteli.atrium.assertions.builders.withFailureHint import ch.tutteli.atrium.creating.AssertionContainer -import ch.tutteli.atrium.logic.BigDecimalAssertions +import ch.tutteli.atrium.logic.BigDecimalExpectations import ch.tutteli.atrium.logic.createDescriptiveAssertion import ch.tutteli.atrium.translations.DescriptionBigDecimalAssertion.* import java.math.BigDecimal -class DefaultBigDecimalAssertions : BigDecimalAssertions { +class DefaultBigDecimalExpectations : BigDecimalExpectations { override fun isNumericallyEqualTo(container: AssertionContainer, expected: T): Assertion = container.createDescriptiveAssertion(IS_NUMERICALLY_EQUAL_TO, expected) { isNumericallyEqualTo(it, expected) diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoLocalDateExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoLocalDateExpectations.kt index bffd9fc861..f057f8399e 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoLocalDateExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoLocalDateExpectations.kt @@ -12,7 +12,7 @@ import ch.tutteli.atrium.translations.DescriptionDateTimeLikeAssertion.* import java.time.LocalDate import java.time.chrono.ChronoLocalDate -class DefaultChronoLocalDateAssertions : ChronoLocalDateAssertions { +class DefaultChronoLocalDateExpectations : ChronoLocalDateExpectations { override fun isBefore( container: AssertionContainer, diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoLocalDateTimeExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoLocalDateTimeExpectations.kt index 66350bd63c..1a2b0e5954 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoLocalDateTimeExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoLocalDateTimeExpectations.kt @@ -14,7 +14,7 @@ import java.time.LocalDateTime import java.time.chrono.ChronoLocalDate import java.time.chrono.ChronoLocalDateTime -class DefaultChronoLocalDateTimeAssertions : ChronoLocalDateTimeAssertions { +class DefaultChronoLocalDateTimeExpectations : ChronoLocalDateTimeExpectations { override fun > isBefore( container: AssertionContainer, expected: ChronoLocalDateTime<*> diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoZonedDateTimeExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoZonedDateTimeExpectations.kt index 0c134c06ad..d4ba566112 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoZonedDateTimeExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultChronoZonedDateTimeExpectations.kt @@ -16,7 +16,7 @@ import java.time.format.DateTimeFormatter import java.time.format.DateTimeFormatterBuilder import java.time.temporal.TemporalQuery -class DefaultChronoZonedDateTimeAssertions : ChronoZonedDateTimeAssertions { +class DefaultChronoZonedDateTimeExpectations : ChronoZonedDateTimeExpectations { override fun > isBefore( container: AssertionContainer, expected: ChronoZonedDateTime<*> diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFloatingPointJvmExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFloatingPointJvmExpectations.kt index 1e1c8b4d14..94e59f0852 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFloatingPointJvmExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultFloatingPointJvmExpectations.kt @@ -7,10 +7,10 @@ package ch.tutteli.atrium.logic.impl import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.creating.AssertionContainer -import ch.tutteli.atrium.logic.FloatingPointJvmAssertions +import ch.tutteli.atrium.logic.FloatingPointJvmExpectations import java.math.BigDecimal -class DefaultFloatingPointJvmAssertions : FloatingPointJvmAssertions { +class DefaultFloatingPointJvmExpectations : FloatingPointJvmExpectations { override fun toBeWithErrorTolerance( container: AssertionContainer, expected: BigDecimal, diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultLocalDateExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultLocalDateExpectations.kt index 8c0d74e91e..c7d0ba677b 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultLocalDateExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultLocalDateExpectations.kt @@ -6,14 +6,14 @@ package ch.tutteli.atrium.logic.impl import ch.tutteli.atrium.creating.AssertionContainer -import ch.tutteli.atrium.logic.LocalDateAssertions +import ch.tutteli.atrium.logic.LocalDateExpectations import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import ch.tutteli.atrium.logic.manualFeature import ch.tutteli.atrium.translations.DescriptionDateTimeLikeAssertion.* import java.time.DayOfWeek import java.time.LocalDate -class DefaultLocalDateAssertions : LocalDateAssertions { +class DefaultLocalDateExpectations : LocalDateExpectations { override fun year(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep = container.manualFeature(YEAR) { year } diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultLocalDateTimeExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultLocalDateTimeExpectations.kt index 715989a2dc..e024138d63 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultLocalDateTimeExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultLocalDateTimeExpectations.kt @@ -7,13 +7,13 @@ package ch.tutteli.atrium.logic.impl import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder -import ch.tutteli.atrium.logic.LocalDateTimeAssertions +import ch.tutteli.atrium.logic.LocalDateTimeExpectations import ch.tutteli.atrium.logic.manualFeature import ch.tutteli.atrium.translations.DescriptionDateTimeLikeAssertion.* import java.time.DayOfWeek import java.time.LocalDateTime -class DefaultLocalDateTimeAssertions : LocalDateTimeAssertions { +class DefaultLocalDateTimeExpectations : LocalDateTimeExpectations { override fun year(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep = container.manualFeature(YEAR) { year } diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultOptionalExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultOptionalExpectations.kt index 056f6618b9..ee4eb65783 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultOptionalExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultOptionalExpectations.kt @@ -8,7 +8,7 @@ package ch.tutteli.atrium.logic.impl import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.core.Option import ch.tutteli.atrium.creating.AssertionContainer -import ch.tutteli.atrium.logic.OptionalAssertions +import ch.tutteli.atrium.logic.OptionalExpectations import ch.tutteli.atrium.logic.createDescriptiveAssertion import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import ch.tutteli.atrium.logic.extractFeature @@ -16,7 +16,7 @@ import ch.tutteli.atrium.translations.DescriptionBasic.IS import ch.tutteli.atrium.translations.DescriptionOptionalAssertion.* import java.util.* -class DefaultOptionalAssertions : OptionalAssertions { +class DefaultOptionalExpectations : OptionalExpectations { override fun > isEmpty(container: AssertionContainer): Assertion = container.createDescriptiveAssertion(IS, EMPTY) { !it.isPresent } diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultPathExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultPathExpectations.kt index 10137ccc34..38cba3eb04 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultPathExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultPathExpectations.kt @@ -29,7 +29,7 @@ import java.nio.file.* import java.nio.file.LinkOption.NOFOLLOW_LINKS import java.nio.file.attribute.BasicFileAttributes -class DefaultPathAssertions : PathAssertions { +class DefaultPathExpectations : PathExpectations { override fun startsWith(container: AssertionContainer, expected: Path): Assertion = container.createDescriptiveAssertion(STARTS_WITH, expected) { it.startsWith(expected) } diff --git a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultZonedDateTimeExpectations.kt b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultZonedDateTimeExpectations.kt index 54be7ca77d..0fbb012377 100644 --- a/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultZonedDateTimeExpectations.kt +++ b/logic/atrium-logic-jvm/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultZonedDateTimeExpectations.kt @@ -7,14 +7,14 @@ package ch.tutteli.atrium.logic.impl import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder -import ch.tutteli.atrium.logic.ZonedDateTimeAssertions +import ch.tutteli.atrium.logic.ZonedDateTimeExpectations import ch.tutteli.atrium.logic.manualFeature import ch.tutteli.atrium.translations.DescriptionDateTimeLikeAssertion import java.time.DayOfWeek import java.time.ZonedDateTime -class DefaultZonedDateTimeAssertions : ZonedDateTimeAssertions { +class DefaultZonedDateTimeExpectations : ZonedDateTimeExpectations { override fun year(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep = container.manualFeature(DescriptionDateTimeLikeAssertion.YEAR) { year } diff --git a/logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/generated/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/result.kt b/logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/generated/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/result.kt index 1259c4f3b0..72c1363e1b 100644 --- a/logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/generated/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/result.kt +++ b/logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/generated/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/result.kt @@ -12,7 +12,7 @@ import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import ch.tutteli.atrium.logic.creating.transformers.SubjectChangerBuilder import kotlin.reflect.KClass import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.kotlin_1_3.impl.DefaultResultAssertions +import ch.tutteli.atrium.logic.kotlin_1_3.impl.DefaultResultExpectations fun > AssertionContainer.isSuccess(): FeatureExtractorBuilder.ExecutionStep = impl.isSuccess(this) @@ -20,5 +20,5 @@ fun AssertionContainer>.isFailureOfType(ex @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: ResultAssertions - get() = getImpl(ResultAssertions::class) { DefaultResultAssertions() } +private inline val AssertionContainer.impl: ResultExpectations + get() = getImpl(ResultExpectations::class) { DefaultResultExpectations() } diff --git a/logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/ResultExpectations.kt b/logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/ResultExpectations.kt index 5c3540abbd..a84e442c3b 100644 --- a/logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/ResultExpectations.kt +++ b/logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/ResultExpectations.kt @@ -8,7 +8,7 @@ import kotlin.reflect.KClass /** * Collection of assertion functions and builders which are applicable to subjects with a [Result] type. */ -interface ResultAssertions { +interface ResultExpectations { fun > isSuccess(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep fun isFailureOfType( diff --git a/logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/impl/DefaultResultExpectations.kt b/logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/impl/DefaultResultExpectations.kt index cb880e408b..f005d50615 100644 --- a/logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/impl/DefaultResultExpectations.kt +++ b/logic/extensions/kotlin_1_3/atrium-logic-kotlin_1_3-common/src/main/kotlin/ch/tutteli/atrium/logic/kotlin_1_3/impl/DefaultResultExpectations.kt @@ -10,13 +10,13 @@ import ch.tutteli.atrium.logic.changeSubject import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import ch.tutteli.atrium.logic.creating.transformers.impl.ThrowableThrownFailureHandler import ch.tutteli.atrium.logic.extractFeature -import ch.tutteli.atrium.logic.kotlin_1_3.ResultAssertions +import ch.tutteli.atrium.logic.kotlin_1_3.ResultExpectations import ch.tutteli.atrium.logic.manualFeature import ch.tutteli.atrium.logic.toAssertionContainer import ch.tutteli.atrium.translations.DescriptionResultAssertion.* import kotlin.reflect.KClass -class DefaultResultAssertions : ResultAssertions { +class DefaultResultExpectations : ResultExpectations { override fun > isSuccess(container: AssertionContainer): FeatureExtractorBuilder.ExecutionStep = container.extractFeature .withDescription(VALUE) From f3c91a60665651fd8a3d8801c6146abd61c6ca55 Mon Sep 17 00:00:00 2001 From: Joshua Gleitze Date: Wed, 23 Dec 2020 22:39:51 +0100 Subject: [PATCH 4/9] build: adapt the logic generation to new *Expectations names of the logic types --- logic/atrium-logic-common/build.gradle | 6 +++--- .../InOrderOnlyGroupedEntriesExpectationCreator.kt | 3 +++ .../InOrderOnlyGroupedValuesExpectationCreator.kt | 3 +++ .../impl/DefaultMapLikeContainsExpectations.kt | 4 ++-- .../logic/creating/transformers/FeatureExtractor.kt | 6 +++--- logic/generateLogic.gradle | 12 ++++++------ 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/logic/atrium-logic-common/build.gradle b/logic/atrium-logic-common/build.gradle index 9b851ede2c..a012a37907 100644 --- a/logic/atrium-logic-common/build.gradle +++ b/logic/atrium-logic-common/build.gradle @@ -23,13 +23,13 @@ Map>> map = [ }, '/creating/iterable/contains/creators' : { java.nio.file.Path path -> def fileNameAsString = path.fileName.toString() - if (fileNameAsString == 'IterableLikeContainsInAnyOrderAssertions.kt') { + if (fileNameAsString == 'IterableLikeContainsInAnyOrderExpectations.kt') { return new Tuple3( 'import ch.tutteli.atrium.logic.creating.iterable.contains.IterableLikeContains\nimport ch.tutteli.atrium.logic.creating.iterable.contains.searchbehaviours.InAnyOrderSearchBehaviour', ' IterableLikeContains.CheckerStepLogic', 'entryPointStepLogic.container.getImpl' ) - } else if (fileNameAsString == 'IterableLikeContainsAssertions.kt') { + } else if (fileNameAsString == 'IterableLikeContainsExpectations.kt') { return new Tuple3( '', ' IterableLikeContains.EntryPointStepLogic', @@ -41,7 +41,7 @@ Map>> map = [ }, '/creating/maplike/contains/creators' : { java.nio.file.Path path -> def fileNameAsString = path.fileName.toString() - if (fileNameAsString == 'MapLikeContainsAssertions.kt') { + if (fileNameAsString == 'MapLikeContainsExpectations.kt') { return new Tuple3( '', ' MapLikeContains.EntryPointStepLogic', diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedEntriesExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedEntriesExpectationCreator.kt index 8edfac2118..11bab3051e 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedEntriesExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedEntriesExpectationCreator.kt @@ -2,9 +2,12 @@ package ch.tutteli.atrium.logic.creating.iterable.contains.creators.impl import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.logic._logic +import ch.tutteli.atrium.logic._logicAppend import ch.tutteli.atrium.logic.builderContainsInIterableLike import ch.tutteli.atrium.logic.creating.iterable.contains.creators.entriesInAnyOrderOnly import ch.tutteli.atrium.logic.creating.iterable.contains.searchbehaviours.InOrderOnlyGroupedSearchBehaviour +import ch.tutteli.atrium.logic.creating.iterable.contains.steps.butOnly +import ch.tutteli.atrium.logic.creating.iterable.contains.steps.inAnyOrder import ch.tutteli.atrium.logic.creating.typeutils.IterableLike import ch.tutteli.kbox.identity diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedValuesExpectationCreator.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedValuesExpectationCreator.kt index 698ffab2f3..388d464101 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedValuesExpectationCreator.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/impl/InOrderOnlyGroupedValuesExpectationCreator.kt @@ -2,9 +2,12 @@ package ch.tutteli.atrium.logic.creating.iterable.contains.creators.impl import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.logic._logic +import ch.tutteli.atrium.logic._logicAppend import ch.tutteli.atrium.logic.builderContainsInIterableLike import ch.tutteli.atrium.logic.creating.iterable.contains.creators.valuesInAnyOrderOnly import ch.tutteli.atrium.logic.creating.iterable.contains.searchbehaviours.InOrderOnlyGroupedSearchBehaviour +import ch.tutteli.atrium.logic.creating.iterable.contains.steps.butOnly +import ch.tutteli.atrium.logic.creating.iterable.contains.steps.inAnyOrder import ch.tutteli.atrium.logic.creating.typeutils.IterableLike import ch.tutteli.kbox.identity diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/impl/DefaultMapLikeContainsExpectations.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/impl/DefaultMapLikeContainsExpectations.kt index db831811bc..c4ed9c514d 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/impl/DefaultMapLikeContainsExpectations.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/impl/DefaultMapLikeContainsExpectations.kt @@ -14,7 +14,7 @@ import ch.tutteli.atrium.logic.creating.iterable.contains.creators.entriesInOrde import ch.tutteli.atrium.logic.creating.iterable.contains.steps.andOnly import ch.tutteli.atrium.logic.creating.iterable.contains.steps.inOrder import ch.tutteli.atrium.logic.creating.maplike.contains.MapLikeContains -import ch.tutteli.atrium.logic.creating.maplike.contains.creators.MapLikeContainsAssertions +import ch.tutteli.atrium.logic.creating.maplike.contains.creators.MapLikeContainsExpectations import ch.tutteli.atrium.logic.creating.maplike.contains.searchbehaviours.InAnyOrderOnlySearchBehaviour import ch.tutteli.atrium.logic.creating.maplike.contains.searchbehaviours.InAnyOrderSearchBehaviour import ch.tutteli.atrium.logic.creating.maplike.contains.searchbehaviours.InOrderOnlySearchBehaviour @@ -25,7 +25,7 @@ import ch.tutteli.atrium.reporting.translating.TranslatableWithArgs import ch.tutteli.atrium.translations.DescriptionMapLikeAssertion.* import kotlin.reflect.KClass -class DefaultMapLikeContainsAssertions : MapLikeContainsAssertions { +class DefaultMapLikeContainsExpectations : MapLikeContainsExpectations { override fun keyValuePairsInAnyOrder( entryPointStepLogic: MapLikeContains.EntryPointStepLogic, diff --git a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/transformers/FeatureExtractor.kt b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/transformers/FeatureExtractor.kt index 1d96eb6d66..cb4b6012ce 100644 --- a/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/transformers/FeatureExtractor.kt +++ b/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/creating/transformers/FeatureExtractor.kt @@ -10,14 +10,14 @@ import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.creating.FeatureExpect import ch.tutteli.atrium.creating.FeatureExpectOptions -import ch.tutteli.atrium.logic.FeatureExtractors +import ch.tutteli.atrium.logic.FeatureExpectations import ch.tutteli.atrium.reporting.translating.Translatable /** * Defines the contract for sophisticated `safe feature extractions` including assertion creation for the feature. * - * It is similar to [FeatureExtractors] but differs in the intended usage. - * [FeatureExtractors] are intended to make assertions about a return value of a method call or a property, + * It is similar to [FeatureExpectations] but differs in the intended usage. + * [FeatureExpectations] are intended to make assertions about a return value of a method call or a property, * assuming that the call as such always succeeds (no exception is thrown). * The [FeatureExtractor] on the other hand should be used if it is already known, * that the call/access fails depending on given arguments. diff --git a/logic/generateLogic.gradle b/logic/generateLogic.gradle index 3cf1b54f8f..54a03979df 100644 --- a/logic/generateLogic.gradle +++ b/logic/generateLogic.gradle @@ -7,7 +7,7 @@ import java.util.stream.Collectors static List getInterfaces(String path) { Files.walk(Paths.get(path), 1).withCloseable { stream -> return stream - .filter { file -> file.fileName.toString().endsWith("Assertions.kt") } + .filter { file -> file.fileName.toString().endsWith("Expectations.kt") } .sorted(new Comparator() { @Override int compare(Path a, Path b) { @@ -41,7 +41,7 @@ def createGenerateLogicTask( static String getType(Path input) { def fileName = input.getFileName().toString() - return fileName.substring(0, fileName.length() - "Assertions.kt".length()) + return fileName.substring(0, fileName.length() - "Expectations.kt".length()) } def createGenerateLogicTaskForPackage( @@ -107,13 +107,13 @@ def createGenerateLogicTaskForPackage( def uncapitalized = type.uncapitalize() def output = new File("$generatedPath/${uncapitalized}.kt") def content = interfacePath.text - def interfaceName = "${type}Assertions" + def interfaceName = "${type}Expectations" def implValName = "impl" String tmp = content.replaceAll(/($newLine\/\*\*[\S\s]+?\*\/)?${newLine}interface $interfaceName \{/, """\ import ch.tutteli.atrium.core.ExperimentalNewExpectTypes - import ${fullPackage}.impl.Default${type}Assertions + import ${fullPackage}.impl.Default${type}Expectations """.stripIndent().replace("\n", ln)) patterns.forEach { triple -> tmp = tmp.replaceAll(triple.first, triple.second + implValName + triple.third) @@ -127,8 +127,8 @@ def createGenerateLogicTaskForPackage( @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) - private inline val ${extensionTypeSignature}.impl: ${type}Assertions - get() = $getImpl(${type}Assertions::class) { Default${type}Assertions() } + private inline val ${extensionTypeSignature}.impl: ${type}Expectations + get() = $getImpl(${type}Expectations::class) { Default${type}Expectations() } """.stripIndent().replace("\n", ln) } } From 9817492e8f3fa3ace97068013122fc436f2ca1a7 Mon Sep 17 00:00:00 2001 From: Joshua Gleitze Date: Wed, 23 Dec 2020 22:43:45 +0100 Subject: [PATCH 5/9] chore: regenerate logic files for new *Expectations types --- .../src/generated/kotlin/ch/tutteli/atrium/logic/any.kt | 6 +++--- .../kotlin/ch/tutteli/atrium/logic/charSequence.kt | 6 +++--- .../kotlin/ch/tutteli/atrium/logic/collectionLike.kt | 6 +++--- .../generated/kotlin/ch/tutteli/atrium/logic/comparable.kt | 6 +++--- .../charsequence/contains/creators/charSequenceContains.kt | 6 +++--- .../iterable/contains/creators/iterableLikeContains.kt | 6 +++--- .../contains/creators/iterableLikeContainsInAnyOrder.kt | 6 +++--- .../creating/maplike/contains/creators/mapLikeContains.kt | 6 +++--- .../src/generated/kotlin/ch/tutteli/atrium/logic/feature.kt | 6 +++--- .../kotlin/ch/tutteli/atrium/logic/floatingPoint.kt | 6 +++--- .../src/generated/kotlin/ch/tutteli/atrium/logic/fun0.kt | 6 +++--- .../kotlin/ch/tutteli/atrium/logic/iterableLike.kt | 6 +++--- .../generated/kotlin/ch/tutteli/atrium/logic/iterator.kt | 6 +++--- .../src/generated/kotlin/ch/tutteli/atrium/logic/list.kt | 6 +++--- .../generated/kotlin/ch/tutteli/atrium/logic/mapEntry.kt | 6 +++--- .../src/generated/kotlin/ch/tutteli/atrium/logic/mapLike.kt | 6 +++--- .../src/generated/kotlin/ch/tutteli/atrium/logic/pair.kt | 6 +++--- .../generated/kotlin/ch/tutteli/atrium/logic/throwable.kt | 6 +++--- .../generated/kotlin/ch/tutteli/atrium/logic/bigDecimal.kt | 6 +++--- .../kotlin/ch/tutteli/atrium/logic/chronoLocalDate.kt | 6 +++--- .../kotlin/ch/tutteli/atrium/logic/chronoLocalDateTime.kt | 6 +++--- .../kotlin/ch/tutteli/atrium/logic/chronoZonedDateTime.kt | 6 +++--- .../kotlin/ch/tutteli/atrium/logic/floatingPointJvm.kt | 6 +++--- .../generated/kotlin/ch/tutteli/atrium/logic/localDate.kt | 6 +++--- .../kotlin/ch/tutteli/atrium/logic/localDateTime.kt | 6 +++--- .../generated/kotlin/ch/tutteli/atrium/logic/optional.kt | 6 +++--- .../src/generated/kotlin/ch/tutteli/atrium/logic/path.kt | 6 +++--- .../kotlin/ch/tutteli/atrium/logic/zonedDateTime.kt | 6 +++--- 28 files changed, 84 insertions(+), 84 deletions(-) diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/any.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/any.kt index 7d625da177..fcb3563bc3 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/any.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/any.kt @@ -13,7 +13,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.logic.creating.transformers.SubjectChangerBuilder import kotlin.reflect.KClass import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultAnyAssertions +import ch.tutteli.atrium.logic.impl.DefaultAnyExpectations fun AssertionContainer.toBe(expected: T): Assertion = impl.toBe(this, expected) fun AssertionContainer.notToBe(expected: T): Assertion = impl.notToBe(this, expected) @@ -50,5 +50,5 @@ fun AssertionContainer.because(reason: String, assertionCreator: (Expect< @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: AnyAssertions - get() = getImpl(AnyAssertions::class) { DefaultAnyAssertions() } +private inline val AssertionContainer.impl: AnyExpectations + get() = getImpl(AnyExpectations::class) { DefaultAnyExpectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/charSequence.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/charSequence.kt index 96201c21c5..0081055496 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/charSequence.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/charSequence.kt @@ -14,7 +14,7 @@ import ch.tutteli.atrium.logic.creating.charsequence.contains.searchbehaviours.N import ch.tutteli.atrium.logic.creating.charsequence.contains.searchbehaviours.NotSearchBehaviour import ch.tutteli.atrium.logic.creating.charsequence.contains.steps.NotCheckerStep import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultCharSequenceAssertions +import ch.tutteli.atrium.logic.impl.DefaultCharSequenceExpectations /** @@ -41,5 +41,5 @@ fun AssertionContainer.mismatches(expected: Regex): Assert @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: CharSequenceAssertions - get() = getImpl(CharSequenceAssertions::class) { DefaultCharSequenceAssertions() } +private inline val AssertionContainer.impl: CharSequenceExpectations + get() = getImpl(CharSequenceExpectations::class) { DefaultCharSequenceExpectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/collectionLike.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/collectionLike.kt index 3af69168df..12e935d74e 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/collectionLike.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/collectionLike.kt @@ -12,7 +12,7 @@ import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import ch.tutteli.atrium.logic.creating.typeutils.CollectionLike import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultCollectionLikeAssertions +import ch.tutteli.atrium.logic.impl.DefaultCollectionLikeExpectations fun AssertionContainer.isEmpty(converter: (T) -> Collection<*>): Assertion = impl.isEmpty(this, converter) @@ -22,5 +22,5 @@ fun AssertionContainer.size(converter: (T) -> Collection @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: CollectionLikeAssertions - get() = getImpl(CollectionLikeAssertions::class) { DefaultCollectionLikeAssertions() } +private inline val AssertionContainer.impl: CollectionLikeExpectations + get() = getImpl(CollectionLikeExpectations::class) { DefaultCollectionLikeExpectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/comparable.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/comparable.kt index cef7d5dec7..3d9bdcecaa 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/comparable.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/comparable.kt @@ -10,7 +10,7 @@ package ch.tutteli.atrium.logic import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultComparableAssertions +import ch.tutteli.atrium.logic.impl.DefaultComparableExpectations fun , T2 : Any?> AssertionContainer.isLessThan(expected: T2): Assertion = impl.isLessThan(this, expected) @@ -24,5 +24,5 @@ fun , T2 : Any?> AssertionContainer.isEqualComparingTo(e @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: ComparableAssertions - get() = getImpl(ComparableAssertions::class) { DefaultComparableAssertions() } +private inline val AssertionContainer.impl: ComparableExpectations + get() = getImpl(ComparableExpectations::class) { DefaultComparableExpectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/charSequenceContains.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/charSequenceContains.kt index f7ed374fcf..b6283e3ab7 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/charSequenceContains.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/creating/charsequence/contains/creators/charSequenceContains.kt @@ -13,7 +13,7 @@ import ch.tutteli.atrium.logic.creating.charsequence.contains.searchbehaviours.I import ch.tutteli.atrium.logic.creating.charsequence.contains.searchbehaviours.NoOpSearchBehaviour import ch.tutteli.atrium.logic.creating.typeutils.CharSequenceOrNumberOrChar import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.creating.charsequence.contains.creators.impl.DefaultCharSequenceContainsAssertions +import ch.tutteli.atrium.logic.creating.charsequence.contains.creators.impl.DefaultCharSequenceContainsExpectations fun CharSequenceContains.CheckerStepLogic.values(expected: List): AssertionGroup = impl.values(this, expected) @@ -26,5 +26,5 @@ fun CharSequenceContains.CheckerStepLogic CharSequenceContains.CheckerStepLogic.impl: CharSequenceContainsAssertions - get() = entryPointStepLogic.container.getImpl(CharSequenceContainsAssertions::class) { DefaultCharSequenceContainsAssertions() } +private inline val CharSequenceContains.CheckerStepLogic.impl: CharSequenceContainsExpectations + get() = entryPointStepLogic.container.getImpl(CharSequenceContainsExpectations::class) { DefaultCharSequenceContainsExpectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/iterableLikeContains.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/iterableLikeContains.kt index c3eeb059da..5235f711a8 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/iterableLikeContains.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/iterableLikeContains.kt @@ -17,7 +17,7 @@ import ch.tutteli.atrium.logic.creating.iterable.contains.searchbehaviours.InOrd import ch.tutteli.atrium.logic.creating.iterable.contains.searchbehaviours.InOrderOnlySearchBehaviour import ch.tutteli.atrium.logic.creating.typeutils.IterableLike import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.creating.iterable.contains.creators.impl.DefaultIterableLikeContainsAssertions +import ch.tutteli.atrium.logic.creating.iterable.contains.creators.impl.DefaultIterableLikeContainsExpectations fun IterableLikeContains.EntryPointStepLogic.valuesInAnyOrderOnly(expected: List): Assertion = impl.valuesInAnyOrderOnly(this, expected) @@ -36,5 +36,5 @@ fun IterableLikeContains.EntryPointStepLogic IterableLikeContains.EntryPointStepLogic.impl: IterableLikeContainsAssertions - get() = container.getImpl(IterableLikeContainsAssertions::class) { DefaultIterableLikeContainsAssertions() } +private inline val IterableLikeContains.EntryPointStepLogic.impl: IterableLikeContainsExpectations + get() = container.getImpl(IterableLikeContainsExpectations::class) { DefaultIterableLikeContainsExpectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/iterableLikeContainsInAnyOrder.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/iterableLikeContainsInAnyOrder.kt index 6343c8003b..2bfe893ea2 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/iterableLikeContainsInAnyOrder.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/creating/iterable/contains/creators/iterableLikeContainsInAnyOrder.kt @@ -15,7 +15,7 @@ import ch.tutteli.atrium.logic.creating.iterable.contains.IterableLikeContains import ch.tutteli.atrium.logic.creating.iterable.contains.searchbehaviours.InAnyOrderSearchBehaviour import ch.tutteli.atrium.logic.creating.typeutils.IterableLike import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.creating.iterable.contains.creators.impl.DefaultIterableLikeContainsInAnyOrderAssertions +import ch.tutteli.atrium.logic.creating.iterable.contains.creators.impl.DefaultIterableLikeContainsInAnyOrderExpectations fun IterableLikeContains.CheckerStepLogic.values(expected: List): Assertion = impl.values(this, expected) @@ -24,5 +24,5 @@ fun IterableLikeContains.CheckerStepLogic IterableLikeContains.CheckerStepLogic.impl: IterableLikeContainsInAnyOrderAssertions - get() = entryPointStepLogic.container.getImpl(IterableLikeContainsInAnyOrderAssertions::class) { DefaultIterableLikeContainsInAnyOrderAssertions() } +private inline val IterableLikeContains.CheckerStepLogic.impl: IterableLikeContainsInAnyOrderExpectations + get() = entryPointStepLogic.container.getImpl(IterableLikeContainsInAnyOrderExpectations::class) { DefaultIterableLikeContainsInAnyOrderExpectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/mapLikeContains.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/mapLikeContains.kt index 27e362e828..d2b303283e 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/mapLikeContains.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/creating/maplike/contains/creators/mapLikeContains.kt @@ -18,7 +18,7 @@ import ch.tutteli.atrium.logic.creating.maplike.contains.searchbehaviours.InOrde import ch.tutteli.atrium.logic.creating.typeutils.MapLike import kotlin.reflect.KClass import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.creating.maplike.contains.creators.impl.DefaultMapLikeContainsAssertions +import ch.tutteli.atrium.logic.creating.maplike.contains.creators.impl.DefaultMapLikeContainsExpectations fun MapLikeContains.EntryPointStepLogic.keyValuePairsInAnyOrder(keyValuePairs: List>): Assertion = impl.keyValuePairsInAnyOrder(this, keyValuePairs) @@ -40,5 +40,5 @@ fun MapLikeContains.EntryPointStepLogic MapLikeContains.EntryPointStepLogic.impl: MapLikeContainsAssertions - get() = container.getImpl(MapLikeContainsAssertions::class) { DefaultMapLikeContainsAssertions() } +private inline val MapLikeContains.EntryPointStepLogic.impl: MapLikeContainsExpectations + get() = container.getImpl(MapLikeContainsExpectations::class) { DefaultMapLikeContainsExpectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/feature.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/feature.kt index 07ce8c6bed..b49bd54963 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/feature.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/feature.kt @@ -12,7 +12,7 @@ import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import ch.tutteli.atrium.reporting.translating.Translatable import kotlin.reflect.* import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultFeatureAssertions +import ch.tutteli.atrium.logic.impl.DefaultFeatureExpectations //@formatter:off fun AssertionContainer.property(property: KProperty1): FeatureExtractorBuilder.ExecutionStep = impl.property(this, property) @@ -40,5 +40,5 @@ fun AssertionContainer.manualFeature(description: Translatable, provid @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: FeatureAssertions - get() = getImpl(FeatureAssertions::class) { DefaultFeatureAssertions() } +private inline val AssertionContainer.impl: FeatureExpectations + get() = getImpl(FeatureExpectations::class) { DefaultFeatureExpectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/floatingPoint.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/floatingPoint.kt index f0e6d16ed3..3773c020cd 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/floatingPoint.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/floatingPoint.kt @@ -10,7 +10,7 @@ package ch.tutteli.atrium.logic import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultFloatingPointAssertions +import ch.tutteli.atrium.logic.impl.DefaultFloatingPointExpectations fun AssertionContainer.toBeWithErrorTolerance(expected: Float, tolerance: Float): Assertion = impl.toBeWithErrorTolerance(this, expected, tolerance) @@ -19,5 +19,5 @@ fun AssertionContainer.toBeWithErrorTolerance(expected: Double, toleranc @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: FloatingPointAssertions - get() = getImpl(FloatingPointAssertions::class) { DefaultFloatingPointAssertions() } +private inline val AssertionContainer.impl: FloatingPointExpectations + get() = getImpl(FloatingPointExpectations::class) { DefaultFloatingPointExpectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/fun0.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/fun0.kt index 9cffb9803d..028fe8f016 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/fun0.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/fun0.kt @@ -12,7 +12,7 @@ import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import ch.tutteli.atrium.logic.creating.transformers.SubjectChangerBuilder import kotlin.reflect.KClass import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultFun0Assertions +import ch.tutteli.atrium.logic.impl.DefaultFun0Expectations fun AssertionContainer Any?>.toThrow(expectedType: KClass): SubjectChangerBuilder.ExecutionStep<*, TExpected> = impl.toThrow(this, expectedType) @@ -21,5 +21,5 @@ fun R> AssertionContainer.notToThrow(): FeatureExtractorBuilder @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: Fun0Assertions - get() = getImpl(Fun0Assertions::class) { DefaultFun0Assertions() } +private inline val AssertionContainer.impl: Fun0Expectations + get() = getImpl(Fun0Expectations::class) { DefaultFun0Expectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/iterableLike.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/iterableLike.kt index c0d729b507..9401a9fff0 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/iterableLike.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/iterableLike.kt @@ -17,7 +17,7 @@ import ch.tutteli.atrium.logic.creating.iterable.contains.steps.NotCheckerStep import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import ch.tutteli.atrium.logic.creating.typeutils.IterableLike import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultIterableLikeAssertions +import ch.tutteli.atrium.logic.impl.DefaultIterableLikeExpectations fun AssertionContainer.builderContainsInIterableLike(converter: (T) -> Iterable): IterableLikeContains.EntryPointStep = impl.builderContainsInIterableLike(this, converter) @@ -39,5 +39,5 @@ fun AssertionContainer.containsNoDuplicates(converter: @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: IterableLikeAssertions - get() = getImpl(IterableLikeAssertions::class) { DefaultIterableLikeAssertions() } +private inline val AssertionContainer.impl: IterableLikeExpectations + get() = getImpl(IterableLikeExpectations::class) { DefaultIterableLikeExpectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/iterator.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/iterator.kt index 09fe9c3929..fd4565f1ad 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/iterator.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/iterator.kt @@ -10,12 +10,12 @@ package ch.tutteli.atrium.logic import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultIteratorAssertions +import ch.tutteli.atrium.logic.impl.DefaultIteratorExpectations fun > AssertionContainer.hasNext(): Assertion = impl.hasNext(this) fun > AssertionContainer.hasNotNext(): Assertion = impl.hasNotNext(this) @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: IteratorAssertions - get() = getImpl(IteratorAssertions::class) { DefaultIteratorAssertions() } +private inline val AssertionContainer.impl: IteratorExpectations + get() = getImpl(IteratorExpectations::class) { DefaultIteratorExpectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/list.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/list.kt index fbf04d779d..4ed45009a5 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/list.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/list.kt @@ -10,12 +10,12 @@ package ch.tutteli.atrium.logic import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultListAssertions +import ch.tutteli.atrium.logic.impl.DefaultListExpectations fun > AssertionContainer.get(index: Int): FeatureExtractorBuilder.ExecutionStep = impl.get(this, index) @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: ListAssertions - get() = getImpl(ListAssertions::class) { DefaultListAssertions() } +private inline val AssertionContainer.impl: ListExpectations + get() = getImpl(ListExpectations::class) { DefaultListExpectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/mapEntry.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/mapEntry.kt index 9ce3b71e62..651b4b2185 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/mapEntry.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/mapEntry.kt @@ -11,7 +11,7 @@ import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultMapEntryAssertions +import ch.tutteli.atrium.logic.impl.DefaultMapEntryExpectations fun > AssertionContainer.isKeyValue(key: K, value: V): Assertion = impl.isKeyValue(this, key, value) @@ -20,5 +20,5 @@ fun > AssertionContainer.value(): FeatureExtractorBuil @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: MapEntryAssertions - get() = getImpl(MapEntryAssertions::class) { DefaultMapEntryAssertions() } +private inline val AssertionContainer.impl: MapEntryExpectations + get() = getImpl(MapEntryExpectations::class) { DefaultMapEntryExpectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/mapLike.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/mapLike.kt index 24dc40717a..c0c56d9cad 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/mapLike.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/mapLike.kt @@ -15,7 +15,7 @@ import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import ch.tutteli.atrium.logic.creating.typeutils.MapLike import ch.tutteli.atrium.logic.creating.typeutils.IterableLike import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultMapLikeAssertions +import ch.tutteli.atrium.logic.impl.DefaultMapLikeExpectations fun AssertionContainer.builderContainsInMapLike(converter: (T) -> Map): MapLikeContains.EntryPointStep = impl.builderContainsInMapLike(this, converter) @@ -31,5 +31,5 @@ fun AssertionContainer.getExisting(converter: (T) -> Map AssertionContainer.impl: MapLikeAssertions - get() = getImpl(MapLikeAssertions::class) { DefaultMapLikeAssertions() } +private inline val AssertionContainer.impl: MapLikeExpectations + get() = getImpl(MapLikeExpectations::class) { DefaultMapLikeExpectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/pair.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/pair.kt index 256075306d..3ba89cc088 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/pair.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/pair.kt @@ -10,12 +10,12 @@ package ch.tutteli.atrium.logic import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultPairAssertions +import ch.tutteli.atrium.logic.impl.DefaultPairExpectations fun > AssertionContainer.first(): FeatureExtractorBuilder.ExecutionStep = impl.first(this) fun > AssertionContainer.second(): FeatureExtractorBuilder.ExecutionStep = impl.second(this) @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: PairAssertions - get() = getImpl(PairAssertions::class) { DefaultPairAssertions() } +private inline val AssertionContainer.impl: PairExpectations + get() = getImpl(PairExpectations::class) { DefaultPairExpectations() } diff --git a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/throwable.kt b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/throwable.kt index 806827c70a..c274e038e1 100644 --- a/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/throwable.kt +++ b/logic/atrium-logic-common/src/generated/kotlin/ch/tutteli/atrium/logic/throwable.kt @@ -11,12 +11,12 @@ import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.logic.creating.transformers.SubjectChangerBuilder import kotlin.reflect.KClass import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultThrowableAssertions +import ch.tutteli.atrium.logic.impl.DefaultThrowableExpectations fun AssertionContainer.causeIsA(expectedType: KClass): SubjectChangerBuilder.ExecutionStep = impl.causeIsA(this, expectedType) @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: ThrowableAssertions - get() = getImpl(ThrowableAssertions::class) { DefaultThrowableAssertions() } +private inline val AssertionContainer.impl: ThrowableExpectations + get() = getImpl(ThrowableExpectations::class) { DefaultThrowableExpectations() } diff --git a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/bigDecimal.kt b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/bigDecimal.kt index cd70efe03a..41162db6a9 100644 --- a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/bigDecimal.kt +++ b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/bigDecimal.kt @@ -16,7 +16,7 @@ import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.creating.AssertionContainer import java.math.BigDecimal import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultBigDecimalAssertions +import ch.tutteli.atrium.logic.impl.DefaultBigDecimalExpectations fun AssertionContainer.isNumericallyEqualTo(expected: T): Assertion = impl.isNumericallyEqualTo(this, expected) fun AssertionContainer.isNotNumericallyEqualTo(expected: T): Assertion = impl.isNotNumericallyEqualTo(this, expected) @@ -27,5 +27,5 @@ fun AssertionContainer.isNotEqualIncludingScale(expected: T) @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: BigDecimalAssertions - get() = getImpl(BigDecimalAssertions::class) { DefaultBigDecimalAssertions() } +private inline val AssertionContainer.impl: BigDecimalExpectations + get() = getImpl(BigDecimalExpectations::class) { DefaultBigDecimalExpectations() } diff --git a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/chronoLocalDate.kt b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/chronoLocalDate.kt index 24651340a3..31dcb346e7 100644 --- a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/chronoLocalDate.kt +++ b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/chronoLocalDate.kt @@ -16,7 +16,7 @@ import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.creating.AssertionContainer import java.time.chrono.ChronoLocalDate import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultChronoLocalDateAssertions +import ch.tutteli.atrium.logic.impl.DefaultChronoLocalDateExpectations fun AssertionContainer.isBefore(expected: ChronoLocalDate): Assertion = impl.isBefore(this, expected) fun AssertionContainer.isBeforeOrEqual(expected: ChronoLocalDate): Assertion = impl.isBeforeOrEqual(this, expected) @@ -31,5 +31,5 @@ fun AssertionContainer.isEqual(expected: String): Asser @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: ChronoLocalDateAssertions - get() = getImpl(ChronoLocalDateAssertions::class) { DefaultChronoLocalDateAssertions() } +private inline val AssertionContainer.impl: ChronoLocalDateExpectations + get() = getImpl(ChronoLocalDateExpectations::class) { DefaultChronoLocalDateExpectations() } diff --git a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/chronoLocalDateTime.kt b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/chronoLocalDateTime.kt index 4204e632a2..90ab4855f2 100644 --- a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/chronoLocalDateTime.kt +++ b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/chronoLocalDateTime.kt @@ -17,7 +17,7 @@ import ch.tutteli.atrium.creating.AssertionContainer import java.time.chrono.ChronoLocalDate import java.time.chrono.ChronoLocalDateTime import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultChronoLocalDateTimeAssertions +import ch.tutteli.atrium.logic.impl.DefaultChronoLocalDateTimeExpectations fun > AssertionContainer.isBefore(expected: ChronoLocalDateTime<*>): Assertion = impl.isBefore(this, expected) @@ -42,5 +42,5 @@ fun > AssertionContainer.isEqual @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: ChronoLocalDateTimeAssertions - get() = getImpl(ChronoLocalDateTimeAssertions::class) { DefaultChronoLocalDateTimeAssertions() } +private inline val AssertionContainer.impl: ChronoLocalDateTimeExpectations + get() = getImpl(ChronoLocalDateTimeExpectations::class) { DefaultChronoLocalDateTimeExpectations() } diff --git a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/chronoZonedDateTime.kt b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/chronoZonedDateTime.kt index f85d5c3e44..4f861a82ad 100644 --- a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/chronoZonedDateTime.kt +++ b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/chronoZonedDateTime.kt @@ -18,7 +18,7 @@ import java.time.chrono.ChronoLocalDate import java.time.chrono.ChronoLocalDateTime import java.time.chrono.ChronoZonedDateTime import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultChronoZonedDateTimeAssertions +import ch.tutteli.atrium.logic.impl.DefaultChronoZonedDateTimeExpectations fun > AssertionContainer.isBefore(expected: ChronoZonedDateTime<*>): Assertion = impl.isBefore(this, expected) @@ -42,5 +42,5 @@ fun > AssertionContainer.isEqual @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: ChronoZonedDateTimeAssertions - get() = getImpl(ChronoZonedDateTimeAssertions::class) { DefaultChronoZonedDateTimeAssertions() } +private inline val AssertionContainer.impl: ChronoZonedDateTimeExpectations + get() = getImpl(ChronoZonedDateTimeExpectations::class) { DefaultChronoZonedDateTimeExpectations() } diff --git a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/floatingPointJvm.kt b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/floatingPointJvm.kt index 64b6a084a4..f69c2f7552 100644 --- a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/floatingPointJvm.kt +++ b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/floatingPointJvm.kt @@ -16,12 +16,12 @@ import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.creating.AssertionContainer import java.math.BigDecimal import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultFloatingPointJvmAssertions +import ch.tutteli.atrium.logic.impl.DefaultFloatingPointJvmExpectations fun AssertionContainer.toBeWithErrorTolerance(expected: BigDecimal, tolerance: BigDecimal): Assertion = impl.toBeWithErrorTolerance(this, expected, tolerance) @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: FloatingPointJvmAssertions - get() = getImpl(FloatingPointJvmAssertions::class) { DefaultFloatingPointJvmAssertions() } +private inline val AssertionContainer.impl: FloatingPointJvmExpectations + get() = getImpl(FloatingPointJvmExpectations::class) { DefaultFloatingPointJvmExpectations() } diff --git a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/localDate.kt b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/localDate.kt index c060b9baf7..19f8547871 100644 --- a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/localDate.kt +++ b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/localDate.kt @@ -17,7 +17,7 @@ import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import java.time.DayOfWeek import java.time.LocalDate import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultLocalDateAssertions +import ch.tutteli.atrium.logic.impl.DefaultLocalDateExpectations fun AssertionContainer.year(): FeatureExtractorBuilder.ExecutionStep = impl.year(this) @@ -29,5 +29,5 @@ fun AssertionContainer.dayOfWeek(): FeatureExtractorBuilder.Execution @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: LocalDateAssertions - get() = getImpl(LocalDateAssertions::class) { DefaultLocalDateAssertions() } +private inline val AssertionContainer.impl: LocalDateExpectations + get() = getImpl(LocalDateExpectations::class) { DefaultLocalDateExpectations() } diff --git a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/localDateTime.kt b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/localDateTime.kt index cc3c151a89..4afe4d9eba 100644 --- a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/localDateTime.kt +++ b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/localDateTime.kt @@ -17,7 +17,7 @@ import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import java.time.DayOfWeek import java.time.LocalDateTime import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultLocalDateTimeAssertions +import ch.tutteli.atrium.logic.impl.DefaultLocalDateTimeExpectations fun AssertionContainer.year(): FeatureExtractorBuilder.ExecutionStep = impl.year(this) @@ -29,5 +29,5 @@ fun AssertionContainer.dayOfWeek(): FeatureExtractorBuilder.Execu @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: LocalDateTimeAssertions - get() = getImpl(LocalDateTimeAssertions::class) { DefaultLocalDateTimeAssertions() } +private inline val AssertionContainer.impl: LocalDateTimeExpectations + get() = getImpl(LocalDateTimeExpectations::class) { DefaultLocalDateTimeExpectations() } diff --git a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/optional.kt b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/optional.kt index 1588f93a9c..09868618a1 100644 --- a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/optional.kt +++ b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/optional.kt @@ -17,12 +17,12 @@ import ch.tutteli.atrium.creating.AssertionContainer import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import java.util.* import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultOptionalAssertions +import ch.tutteli.atrium.logic.impl.DefaultOptionalExpectations fun > AssertionContainer.isEmpty(): Assertion = impl.isEmpty(this) fun > AssertionContainer.isPresent(): FeatureExtractorBuilder.ExecutionStep = impl.isPresent(this) @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: OptionalAssertions - get() = getImpl(OptionalAssertions::class) { DefaultOptionalAssertions() } +private inline val AssertionContainer.impl: OptionalExpectations + get() = getImpl(OptionalExpectations::class) { DefaultOptionalExpectations() } diff --git a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/path.kt b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/path.kt index 32d8c7d908..b0aa59b864 100644 --- a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/path.kt +++ b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/path.kt @@ -19,7 +19,7 @@ import java.nio.charset.Charset import java.nio.file.LinkOption import java.nio.file.Path import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultPathAssertions +import ch.tutteli.atrium.logic.impl.DefaultPathExpectations fun AssertionContainer.startsWith(expected: Path): Assertion = impl.startsWith(this, expected) fun AssertionContainer.startsNotWith(expected: Path): Assertion = impl.startsNotWith(this, expected) @@ -52,5 +52,5 @@ fun AssertionContainer.hasDirectoryEntry(entries: List): A @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: PathAssertions - get() = getImpl(PathAssertions::class) { DefaultPathAssertions() } +private inline val AssertionContainer.impl: PathExpectations + get() = getImpl(PathExpectations::class) { DefaultPathExpectations() } diff --git a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/zonedDateTime.kt b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/zonedDateTime.kt index 06ece5b319..772ef8d3bb 100644 --- a/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/zonedDateTime.kt +++ b/logic/atrium-logic-jvm/src/generated/kotlin/ch/tutteli/atrium/logic/zonedDateTime.kt @@ -17,7 +17,7 @@ import ch.tutteli.atrium.logic.creating.transformers.FeatureExtractorBuilder import java.time.DayOfWeek import java.time.ZonedDateTime import ch.tutteli.atrium.core.ExperimentalNewExpectTypes -import ch.tutteli.atrium.logic.impl.DefaultZonedDateTimeAssertions +import ch.tutteli.atrium.logic.impl.DefaultZonedDateTimeExpectations fun AssertionContainer.year(): FeatureExtractorBuilder.ExecutionStep = impl.year(this) @@ -29,5 +29,5 @@ fun AssertionContainer.dayOfWeek(): FeatureExtractorBuilder.Execu @Suppress("DEPRECATION" /* OptIn is only available since 1.3.70 which we cannot use if we want to support 1.2 */) @UseExperimental(ExperimentalNewExpectTypes::class) -private inline val AssertionContainer.impl: ZonedDateTimeAssertions - get() = getImpl(ZonedDateTimeAssertions::class) { DefaultZonedDateTimeAssertions() } +private inline val AssertionContainer.impl: ZonedDateTimeExpectations + get() = getImpl(ZonedDateTimeExpectations::class) { DefaultZonedDateTimeExpectations() } From 12af5929ac4de9eb82a1a9989b464d4ea7c6393e Mon Sep 17 00:00:00 2001 From: Joshua Gleitze Date: Wed, 23 Dec 2020 23:37:37 +0100 Subject: [PATCH 6/9] refactor: rename specs from *Assertions* to *Expectations* --- .../en_GB/{AnyAssertionsSpec.kt => AnyExpectationsSpec.kt} | 0 ...ListAssertionsSpec.kt => ArrayAsListExpectationsSpec.kt} | 0 ...ec.kt => CharSequenceContainsAtLeastExpectationsSpec.kt} | 0 ...pec.kt => CharSequenceContainsAtMostExpectationsSpec.kt} | 0 ...t => CharSequenceContainsContainsNotExpectationsSpec.kt} | 0 ...ec.kt => CharSequenceContainsExactlyExpectationsSpec.kt} | 0 ...nsSpec.kt => CharSequenceContainsNotExpectationsSpec.kt} | 0 ...t => CharSequenceContainsNotOrAtMostExpectationsSpec.kt} | 0 ...Spec.kt => CharSequenceContainsRegexExpectationsSpec.kt} | 0 ...nceAssertionsSpec.kt => CharSequenceExpectationsSpec.kt} | 0 ...ctionAssertionsSpec.kt => CollectionExpectationsSpec.kt} | 0 ...rableAssertionsSpec.kt => ComparableExpectationsSpec.kt} | 0 ...> FeatureExpectationsBoundedReferenceAlternativeSpec.kt} | 2 +- ...ceSpec.kt => FeatureExpectationsBoundedReferenceSpec.kt} | 2 +- ...enceSpec.kt => FeatureExpectationsClassReferenceSpec.kt} | 2 +- ...rtionsManualSpec.kt => FeatureExpectationsManualSpec.kt} | 2 +- ...t => FloatingPointWithErrorToleranceExpectationsSpec.kt} | 0 .../{Fun0AssertionsSpec.kt => Fun0ExpectationsSpec.kt} | 0 ...eAllAssertionsSpec.kt => IterableAllExpectationsSpec.kt} | 0 ...eAnyAssertionsSpec.kt => IterableAnyExpectationsSpec.kt} | 0 ...ContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.kt} | 0 ...bleContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt} | 0 ...ableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt} | 0 ...rableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt} | 4 ++-- ...erableContainsInAnyOrderAtMostValuesExpectationsSpec.kt} | 0 ...rableContainsInAnyOrderExactlyValuesExpectationsSpec.kt} | 0 ...eContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt} | 0 ...ableContainsInAnyOrderOnlyElementsOfExpectationsSpec.kt} | 0 ...terableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt} | 0 ...IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt} | 0 ...terableContainsInOrderOnlyElementsOfExpectationsSpec.kt} | 0 ...> IterableContainsInOrderOnlyEntriesExpectationsSpec.kt} | 0 ...bleContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt} | 0 ...ableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt} | 0 ...=> IterableContainsInOrderOnlyValuesExpectationsSpec.kt} | 0 ...pec.kt => IterableContainsNotEntriesExpectationsSpec.kt} | 0 ...Spec.kt => IterableContainsNotValuesExpectationsSpec.kt} | 0 ...terableAssertionsSpec.kt => IterableExpectationsSpec.kt} | 0 ...oneAssertionsSpec.kt => IterableNoneExpectationsSpec.kt} | 0 ...IteratorAssertionSpec.kt => IteratorExpectationsSpec.kt} | 0 .../{ListAssertionsSpec.kt => ListExpectationsSpec.kt} | 0 ...iesAssertionsSpec.kt => MapAsEntriesExpectationsSpec.kt} | 0 ...kt => MapContainsInAnyOrderEntriesOfExpectationsSpec.kt} | 0 ....kt => MapContainsInAnyOrderKeyValueExpectationsSpec.kt} | 0 ...> MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt} | 0 ...> MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.kt} | 0 ...=> MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt} | 0 ...pContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt} | 0 ...t => MapContainsInOrderOnlyEntriesOfExpectationsSpec.kt} | 0 ...kt => MapContainsInOrderOnlyKeyValueExpectationsSpec.kt} | 0 ... MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt} | 0 ...apEntryAssertionsSpec.kt => MapEntryExpectationsSpec.kt} | 0 .../en_GB/{MapAssertionsSpec.kt => MapExpectationsSpec.kt} | 0 .../{PairAssertionsSpec.kt => PairExpectationsSpec.kt} | 0 ...owableAssertionsSpec.kt => ThrowableExpectationsSpec.kt} | 0 ...nceAssertionsSpec.kt => CharSequenceExpectationsSpec.kt} | 0 ...cimalAssertionsSpec.kt => BigDecimalExpectationsSpec.kt} | 0 ...AssertionsSpec.kt => ChronoLocalDateExpectationsSpec.kt} | 0 ...ertionSpec.kt => ChronoLocalDateTimeExpectationsSpec.kt} | 0 ...ertionSpec.kt => ChronoZonedDateTimeExpectationsSpec.kt} | 0 ...sPathAssertionsSpec.kt => FileAsPathExpectationsSpec.kt} | 0 ...> FloatingPointWithErrorToleranceExpectationsJvmSpec.kt} | 0 ...{Fun0AssertionsJvmSpec.kt => Fun0ExpectationsJvmSpec.kt} | 0 ...alDateAssertionsSpec.kt => LocalDateExpectationsSpec.kt} | 0 ...meAssertionsSpec.kt => LocalDateTimeExpectationsSpec.kt} | 0 ...ptionalAssertionsSpec.kt => OptionalExpectationsSpec.kt} | 0 .../{PathAssertionsSpec.kt => PathExpectationsSpec.kt} | 0 ...tureAssertionsSpec.kt => PathFeatureExpectationsSpec.kt} | 0 ...meAssertionsSpec.kt => ZonedDateTimeExpectationsSpec.kt} | 0 .../{ResultAssertionsSpec.kt => ResultExpectationsSpec.kt} | 0 .../en_GB/{AnyAssertionsSpec.kt => AnyExpectationsSpec.kt} | 0 ...ListAssertionsSpec.kt => ArrayAsListExpectationsSpec.kt} | 0 ...ec.kt => CharSequenceContainsAtLeastExpectationsSpec.kt} | 0 ...pec.kt => CharSequenceContainsAtMostExpectationsSpec.kt} | 0 ...t => CharSequenceContainsContainsNotExpectationsSpec.kt} | 0 ...ec.kt => CharSequenceContainsExactlyExpectationsSpec.kt} | 0 ...nsSpec.kt => CharSequenceContainsNotExpectationsSpec.kt} | 0 ...t => CharSequenceContainsNotOrAtMostExpectationsSpec.kt} | 0 ...Spec.kt => CharSequenceContainsRegexExpectationsSpec.kt} | 0 ...nceAssertionsSpec.kt => CharSequenceExpectationsSpec.kt} | 0 ...ctionAssertionsSpec.kt => CollectionExpectationsSpec.kt} | 0 ...rableAssertionsSpec.kt => ComparableExpectationsSpec.kt} | 0 ...> FeatureExpectationsBoundedReferenceAlternativeSpec.kt} | 2 +- ...ceSpec.kt => FeatureExpectationsBoundedReferenceSpec.kt} | 2 +- ...enceSpec.kt => FeatureExpectationsClassReferenceSpec.kt} | 2 +- ...rtionsManualSpec.kt => FeatureExpectationsManualSpec.kt} | 2 +- .../{Fun0AssertionsSpec.kt => Fun0ExpectationsSpec.kt} | 0 ...eAllAssertionsSpec.kt => IterableAllExpectationsSpec.kt} | 0 ...eAnyAssertionsSpec.kt => IterableAnyExpectationsSpec.kt} | 0 ...ContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.kt} | 0 ...bleContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt} | 0 ...ableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt} | 0 ...rableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt} | 4 ++-- ...erableContainsInAnyOrderAtMostValuesExpectationsSpec.kt} | 4 ++-- ...rableContainsInAnyOrderExactlyValuesExpectationsSpec.kt} | 0 ...eContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt} | 0 ...ableContainsInAnyOrderOnlyElementsOfExpectationsSpec.kt} | 0 ...terableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt} | 0 ...IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt} | 0 ...terableContainsInOrderOnlyElementsOfExpectationsSpec.kt} | 2 +- ...> IterableContainsInOrderOnlyEntriesExpectationsSpec.kt} | 2 +- ...bleContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt} | 0 ...ableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt} | 0 ...=> IterableContainsInOrderOnlyValuesExpectationsSpec.kt} | 2 +- ...pec.kt => IterableContainsNotEntriesExpectationsSpec.kt} | 0 ...Spec.kt => IterableContainsNotValuesExpectationsSpec.kt} | 2 +- ...terableAssertionsSpec.kt => IterableExpectationsSpec.kt} | 0 ...oneAssertionsSpec.kt => IterableNoneExpectationsSpec.kt} | 0 ...IteratorAssertionSpec.kt => IteratorExpectationsSpec.kt} | 0 .../{ListAssertionsSpec.kt => ListExpectationsSpec.kt} | 0 ...iesAssertionsSpec.kt => MapAsEntriesExpectationsSpec.kt} | 0 ...kt => MapContainsInAnyOrderEntriesOfExpectationsSpec.kt} | 0 ....kt => MapContainsInAnyOrderKeyValueExpectationsSpec.kt} | 0 ...> MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt} | 0 ...> MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.kt} | 0 ...=> MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt} | 0 ...pContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt} | 0 ...t => MapContainsInOrderOnlyEntriesOfExpectationsSpec.kt} | 0 ...kt => MapContainsInOrderOnlyKeyValueExpectationsSpec.kt} | 0 ... MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt} | 0 ...apEntryAssertionsSpec.kt => MapEntryExpectationsSpec.kt} | 0 .../en_GB/{MapAssertionsSpec.kt => MapExpectationsSpec.kt} | 0 .../{PairAssertionsSpec.kt => PairExpectationsSpec.kt} | 0 ...owableAssertionsSpec.kt => ThrowableExpectationsSpec.kt} | 0 ...cimalAssertionsSpec.kt => BigDecimalExpectationsSpec.kt} | 6 +++--- ...AssertionsSpec.kt => ChronoLocalDateExpectationsSpec.kt} | 0 ...ertionSpec.kt => ChronoLocalDateTimeExpectationsSpec.kt} | 2 +- ...ertionSpec.kt => ChronoZonedDateTimeExpectationsSpec.kt} | 0 ...sPathAssertionsSpec.kt => FileAsPathExpectationsSpec.kt} | 0 ...{Fun0AssertionsJvmSpec.kt => Fun0ExpectationsJvmSpec.kt} | 0 ...alDateAssertionsSpec.kt => LocalDateExpectationsSpec.kt} | 0 ...meAssertionsSpec.kt => LocalDateTimeExpectationsSpec.kt} | 0 ...ptionalAssertionsSpec.kt => OptionalExpectationsSpec.kt} | 0 .../{PathAssertionsSpec.kt => PathExpectationsSpec.kt} | 0 ...tureAssertionsSpec.kt => PathFeatureExpectationsSpec.kt} | 0 ...meAssertionsSpec.kt => ZonedDateTimeExpectationsSpec.kt} | 0 .../{ResultAssertionsSpec.kt => ResultExpectationsSpec.kt} | 0 .../{AnyAssertionsSpec.scala => AnyExpectationsSpec.scala} | 0 .../{AnyAssertionsSpec.kt => AnyExpectationsSpec.kt} | 0 ...ListAssertionsSpec.kt => ArrayAsListExpectationsSpec.kt} | 0 ...ec.kt => CharSequenceContainsAtLeastExpectationsSpec.kt} | 0 ...pec.kt => CharSequenceContainsAtMostExpectationsSpec.kt} | 0 ...t => CharSequenceContainsContainsNotExpectationsSpec.kt} | 0 ...ec.kt => CharSequenceContainsExactlyExpectationsSpec.kt} | 0 ...nsSpec.kt => CharSequenceContainsNotExpectationsSpec.kt} | 0 ...t => CharSequenceContainsNotOrAtMostExpectationsSpec.kt} | 0 ...Spec.kt => CharSequenceContainsRegexExpectationsSpec.kt} | 0 ...nceAssertionsSpec.kt => CharSequenceExpectationsSpec.kt} | 0 ...ctionAssertionsSpec.kt => CollectionExpectationsSpec.kt} | 0 ...rableAssertionsSpec.kt => ComparableExpectationsSpec.kt} | 0 ...{FeatureAssertionsSpec.kt => FeatureExpectationsSpec.kt} | 0 ...t => FloatingPointWithErrorToleranceExpectationsSpec.kt} | 0 .../{Fun0AssertionsSpec.kt => Fun0ExpectationsSpec.kt} | 0 ...eAllAssertionsSpec.kt => IterableAllExpectationsSpec.kt} | 0 ...eAnyAssertionsSpec.kt => IterableAnyExpectationsSpec.kt} | 0 ...bleContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt} | 0 ...ableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt} | 0 ...rableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt} | 0 ...erableContainsInAnyOrderAtMostValuesExpectationsSpec.kt} | 0 ...rableContainsInAnyOrderExactlyValuesExpectationsSpec.kt} | 0 ...eContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt} | 0 ...terableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt} | 0 ...IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt} | 0 ...> IterableContainsInOrderOnlyEntriesExpectationsSpec.kt} | 0 ...bleContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt} | 0 ...ableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt} | 0 ...=> IterableContainsInOrderOnlyValuesExpectationsSpec.kt} | 0 ...pec.kt => IterableContainsNotEntriesExpectationsSpec.kt} | 0 ...Spec.kt => IterableContainsNotValuesExpectationsSpec.kt} | 0 ...terableAssertionsSpec.kt => IterableExpectationsSpec.kt} | 0 ...oneAssertionsSpec.kt => IterableNoneExpectationsSpec.kt} | 0 ...IteratorAssertionSpec.kt => IteratorExpectationsSpec.kt} | 0 ...ikeAssertionsSpec.kt => KeyValueLikeExpectationsSpec.kt} | 0 .../{ListAssertionsSpec.kt => ListExpectationsSpec.kt} | 0 ...iesAssertionsSpec.kt => MapAsEntriesExpectationsSpec.kt} | 0 ....kt => MapContainsInAnyOrderKeyValueExpectationsSpec.kt} | 0 ...> MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt} | 0 ...=> MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt} | 0 ...pContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt} | 0 ...kt => MapContainsInOrderOnlyKeyValueExpectationsSpec.kt} | 0 ... MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt} | 0 ...apEntryAssertionsSpec.kt => MapEntryExpectationsSpec.kt} | 0 .../{MapAssertionsSpec.kt => MapExpectationsSpec.kt} | 0 .../{PairAssertionsSpec.kt => PairExpectationsSpec.kt} | 0 .../{ResultAssertionsSpec.kt => ResultExpectationsSpec.kt} | 0 ...owableAssertionsSpec.kt => ThrowableExpectationsSpec.kt} | 0 ...cimalAssertionsSpec.kt => BigDecimalExpectationsSpec.kt} | 0 ...onSpec.kt => ChronoLocalDateAsStringExpectationsSpec.kt} | 2 +- ...eAssertionSpec.kt => ChronoLocalDateExpectationsSpec.kt} | 2 +- ...ec.kt => ChronoLocalDateTimeAsStringExpectationsSpec.kt} | 0 ...ertionSpec.kt => ChronoLocalDateTimeExpectationsSpec.kt} | 0 ...ec.kt => ChronoZonedDateTimeAsStringExpectationsSpec.kt} | 0 ...ertionSpec.kt => ChronoZonedDateTimeExpectationsSpec.kt} | 0 ...sPathAssertionsSpec.kt => FileAsPathExpectationsSpec.kt} | 0 ...> FloatingPointWithErrorToleranceExpectationsJvmSpec.kt} | 0 ...{Fun0AssertionsJvmSpec.kt => Fun0ExpectationsJvmSpec.kt} | 0 ...alDateAssertionsSpec.kt => LocalDateExpectationsSpec.kt} | 0 ...meAssertionsSpec.kt => LocalDateTimeExpectationsSpec.kt} | 0 ...ptionalAssertionsSpec.kt => OptionalExpectationsSpec.kt} | 0 .../{PathAssertionsSpec.kt => PathExpectationsSpec.kt} | 0 ...tureAssertionsSpec.kt => PathFeatureExpectationsSpec.kt} | 0 ...meAssertionsSpec.kt => ZonedDateTimeExpectationsSpec.kt} | 0 202 files changed, 24 insertions(+), 24 deletions(-) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{AnyAssertionsSpec.kt => AnyExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{ArrayAsListAssertionsSpec.kt => ArrayAsListExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{CharSequenceContainsAtLeastAssertionsSpec.kt => CharSequenceContainsAtLeastExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{CharSequenceContainsAtMostAssertionsSpec.kt => CharSequenceContainsAtMostExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{CharSequenceContainsContainsNotAssertionsSpec.kt => CharSequenceContainsContainsNotExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{CharSequenceContainsExactlyAssertionsSpec.kt => CharSequenceContainsExactlyExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{CharSequenceContainsNotAssertionsSpec.kt => CharSequenceContainsNotExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{CharSequenceContainsNotOrAtMostAssertionsSpec.kt => CharSequenceContainsNotOrAtMostExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{CharSequenceContainsRegexAssertionsSpec.kt => CharSequenceContainsRegexExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{CharSequenceAssertionsSpec.kt => CharSequenceExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{CollectionAssertionsSpec.kt => CollectionExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{ComparableAssertionsSpec.kt => ComparableExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{FeatureAssertionsBoundedReferenceAlternativeSpec.kt => FeatureExpectationsBoundedReferenceAlternativeSpec.kt} (97%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{FeatureAssertionsBoundedReferenceSpec.kt => FeatureExpectationsBoundedReferenceSpec.kt} (98%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{FeatureAssertionsClassReferenceSpec.kt => FeatureExpectationsClassReferenceSpec.kt} (98%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{FeatureAssertionsManualSpec.kt => FeatureExpectationsManualSpec.kt} (98%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{FloatingPointWithErrorToleranceAssertionsSpec.kt => FloatingPointWithErrorToleranceExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{Fun0AssertionsSpec.kt => Fun0ExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableAllAssertionsSpec.kt => IterableAllExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableAnyAssertionsSpec.kt => IterableAnyExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsInAnyOrderAtLeast1ElementsOfAssertionsSpec.kt => IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec.kt => IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec.kt => IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsInAnyOrderAtLeastValuesAssertionsSpec.kt => IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt} (95%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsInAnyOrderAtMostValuesAssertionsSpec.kt => IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsInAnyOrderExactlyValuesAssertionsSpec.kt => IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsInAnyOrderNotOrAtMostValuesAssertionsSpec.kt => IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsInAnyOrderOnlyElementsOfAssertionsSpec.kt => IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsInAnyOrderOnlyEntriesAssertionsSpec.kt => IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsInAnyOrderOnlyValuesAssertionsSpec.kt => IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsInOrderOnlyElementsOfAssertionsSpec.kt => IterableContainsInOrderOnlyElementsOfExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsInOrderOnlyEntriesAssertionsSpec.kt => IterableContainsInOrderOnlyEntriesExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsInOrderOnlyGroupedEntriesAssertionsSpec.kt => IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsInOrderOnlyGroupedValuesAssertionsSpec.kt => IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsInOrderOnlyValuesAssertionsSpec.kt => IterableContainsInOrderOnlyValuesExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsNotEntriesAssertionsSpec.kt => IterableContainsNotEntriesExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableContainsNotValuesAssertionsSpec.kt => IterableContainsNotValuesExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableAssertionsSpec.kt => IterableExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IterableNoneAssertionsSpec.kt => IterableNoneExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{IteratorAssertionSpec.kt => IteratorExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{ListAssertionsSpec.kt => ListExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{MapAsEntriesAssertionsSpec.kt => MapAsEntriesExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{MapContainsInAnyOrderEntriesOfAssertionsSpec.kt => MapContainsInAnyOrderEntriesOfExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{MapContainsInAnyOrderKeyValueAssertionsSpec.kt => MapContainsInAnyOrderKeyValueExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{MapContainsInAnyOrderKeyValuePairsAssertionsSpec.kt => MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{MapContainsInAnyOrderOnlyEntriesOfAssertionsSpec.kt => MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{MapContainsInAnyOrderOnlyKeyValueAssertionsSpec.kt => MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec.kt => MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{MapContainsInOrderOnlyEntriesOfAssertionsSpec.kt => MapContainsInOrderOnlyEntriesOfExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{MapContainsInOrderOnlyKeyValueAssertionsSpec.kt => MapContainsInOrderOnlyKeyValueExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{MapContainsInOrderOnlyKeyValuePairsAssertionsSpec.kt => MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{MapEntryAssertionsSpec.kt => MapEntryExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{MapAssertionsSpec.kt => MapExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{PairAssertionsSpec.kt => PairExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{ThrowableAssertionsSpec.kt => ThrowableExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/{CharSequenceAssertionsSpec.kt => CharSequenceExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{BigDecimalAssertionsSpec.kt => BigDecimalExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{ChronoLocalDateAssertionsSpec.kt => ChronoLocalDateExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{ChronoLocalDateTimeAssertionSpec.kt => ChronoLocalDateTimeExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{ChronoZonedDateTimeAssertionSpec.kt => ChronoZonedDateTimeExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{FileAsPathAssertionsSpec.kt => FileAsPathExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{FloatingPointWithErrorToleranceAssertionsJvmSpec.kt => FloatingPointWithErrorToleranceExpectationsJvmSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{Fun0AssertionsJvmSpec.kt => Fun0ExpectationsJvmSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{LocalDateAssertionsSpec.kt => LocalDateExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{LocalDateTimeAssertionsSpec.kt => LocalDateTimeExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{OptionalAssertionsSpec.kt => OptionalExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{PathAssertionsSpec.kt => PathExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{PathFeatureAssertionsSpec.kt => PathFeatureExpectationsSpec.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/{ZonedDateTimeAssertionsSpec.kt => ZonedDateTimeExpectationsSpec.kt} (100%) rename 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/{ResultAssertionsSpec.kt => ResultExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{AnyAssertionsSpec.kt => AnyExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{ArrayAsListAssertionsSpec.kt => ArrayAsListExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{CharSequenceContainsAtLeastAssertionsSpec.kt => CharSequenceContainsAtLeastExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{CharSequenceContainsAtMostAssertionsSpec.kt => CharSequenceContainsAtMostExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{CharSequenceContainsContainsNotAssertionsSpec.kt => CharSequenceContainsContainsNotExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{CharSequenceContainsExactlyAssertionsSpec.kt => CharSequenceContainsExactlyExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{CharSequenceContainsNotAssertionsSpec.kt => CharSequenceContainsNotExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{CharSequenceContainsNotOrAtMostAssertionsSpec.kt => CharSequenceContainsNotOrAtMostExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{CharSequenceContainsRegexAssertionsSpec.kt => CharSequenceContainsRegexExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{CharSequenceAssertionsSpec.kt => CharSequenceExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{CollectionAssertionsSpec.kt => CollectionExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{ComparableAssertionsSpec.kt => ComparableExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{FeatureAssertionsBoundedReferenceAlternativeSpec.kt => FeatureExpectationsBoundedReferenceAlternativeSpec.kt} (98%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{FeatureAssertionsBoundedReferenceSpec.kt => FeatureExpectationsBoundedReferenceSpec.kt} (98%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{FeatureAssertionsClassReferenceSpec.kt => FeatureExpectationsClassReferenceSpec.kt} (98%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{FeatureAssertionsManualSpec.kt => FeatureExpectationsManualSpec.kt} (98%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{Fun0AssertionsSpec.kt => Fun0ExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableAllAssertionsSpec.kt => IterableAllExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableAnyAssertionsSpec.kt => IterableAnyExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsInAnyOrderAtLeast1ElementsOfAssertionsSpec.kt => IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec.kt => IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec.kt => IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsInAnyOrderAtLeastValuesAssertionsSpec.kt => IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt} (95%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsInAnyOrderAtMostValuesAssertionsSpec.kt => IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt} (93%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsInAnyOrderExactlyValuesAssertionsSpec.kt => IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsInAnyOrderNotOrAtMostValuesAssertionsSpec.kt => IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsInAnyOrderOnlyElementsOfAssertionsSpec.kt => IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsInAnyOrderOnlyEntriesAssertionsSpec.kt => IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsInAnyOrderOnlyValuesAssertionsSpec.kt => IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsInOrderOnlyElementsOfAssertionsSpec.kt => IterableContainsInOrderOnlyElementsOfExpectationsSpec.kt} (98%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsInOrderOnlyEntriesAssertionsSpec.kt => IterableContainsInOrderOnlyEntriesExpectationsSpec.kt} (98%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsInOrderOnlyGroupedEntriesAssertionsSpec.kt => IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsInOrderOnlyGroupedValuesAssertionsSpec.kt => IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsInOrderOnlyValuesAssertionsSpec.kt => IterableContainsInOrderOnlyValuesExpectationsSpec.kt} (97%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsNotEntriesAssertionsSpec.kt => IterableContainsNotEntriesExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableContainsNotValuesAssertionsSpec.kt => IterableContainsNotValuesExpectationsSpec.kt} (97%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableAssertionsSpec.kt => IterableExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IterableNoneAssertionsSpec.kt => IterableNoneExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{IteratorAssertionSpec.kt => IteratorExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{ListAssertionsSpec.kt => ListExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{MapAsEntriesAssertionsSpec.kt => MapAsEntriesExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{MapContainsInAnyOrderEntriesOfAssertionsSpec.kt => MapContainsInAnyOrderEntriesOfExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{MapContainsInAnyOrderKeyValueAssertionsSpec.kt => MapContainsInAnyOrderKeyValueExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{MapContainsInAnyOrderKeyValuePairsAssertionsSpec.kt => MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{MapContainsInAnyOrderOnlyEntriesOfAssertionsSpec.kt => MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{MapContainsInAnyOrderOnlyKeyValueAssertionsSpec.kt => MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec.kt => MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{MapContainsInOrderOnlyEntriesOfAssertionsSpec.kt => MapContainsInOrderOnlyEntriesOfExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{MapContainsInOrderOnlyKeyValueAssertionsSpec.kt => MapContainsInOrderOnlyKeyValueExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{MapContainsInOrderOnlyKeyValuePairsAssertionsSpec.kt => MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{MapEntryAssertionsSpec.kt => MapEntryExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{MapAssertionsSpec.kt => MapExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{PairAssertionsSpec.kt => PairExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{ThrowableAssertionsSpec.kt => ThrowableExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{BigDecimalAssertionsSpec.kt => BigDecimalExpectationsSpec.kt} (92%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{ChronoLocalDateAssertionsSpec.kt => ChronoLocalDateExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{ChronoLocalDateTimeAssertionSpec.kt => ChronoLocalDateTimeExpectationsSpec.kt} (98%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{ChronoZonedDateTimeAssertionSpec.kt => ChronoZonedDateTimeExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{FileAsPathAssertionsSpec.kt => FileAsPathExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{Fun0AssertionsJvmSpec.kt => Fun0ExpectationsJvmSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{LocalDateAssertionsSpec.kt => LocalDateExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{LocalDateTimeAssertionsSpec.kt => LocalDateTimeExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{OptionalAssertionsSpec.kt => OptionalExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{PathAssertionsSpec.kt => PathExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{PathFeatureAssertionsSpec.kt => PathFeatureExpectationsSpec.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/{ZonedDateTimeAssertionsSpec.kt => ZonedDateTimeExpectationsSpec.kt} (100%) rename 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/{ResultAssertionsSpec.kt => ResultExpectationsSpec.kt} (100%) rename atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/{AnyAssertionsSpec.scala => AnyExpectationsSpec.scala} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{AnyAssertionsSpec.kt => AnyExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{ArrayAsListAssertionsSpec.kt => ArrayAsListExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{CharSequenceContainsAtLeastAssertionsSpec.kt => CharSequenceContainsAtLeastExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{CharSequenceContainsAtMostAssertionsSpec.kt => CharSequenceContainsAtMostExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{CharSequenceContainsContainsNotAssertionsSpec.kt => CharSequenceContainsContainsNotExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{CharSequenceContainsExactlyAssertionsSpec.kt => CharSequenceContainsExactlyExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{CharSequenceContainsNotAssertionsSpec.kt => CharSequenceContainsNotExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{CharSequenceContainsNotOrAtMostAssertionsSpec.kt => CharSequenceContainsNotOrAtMostExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{CharSequenceContainsRegexAssertionsSpec.kt => CharSequenceContainsRegexExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{CharSequenceAssertionsSpec.kt => CharSequenceExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{CollectionAssertionsSpec.kt => CollectionExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{ComparableAssertionsSpec.kt => ComparableExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{FeatureAssertionsSpec.kt => FeatureExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{FloatingPointWithErrorToleranceAssertionsSpec.kt => FloatingPointWithErrorToleranceExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{Fun0AssertionsSpec.kt => Fun0ExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableAllAssertionsSpec.kt => IterableAllExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableAnyAssertionsSpec.kt => IterableAnyExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec.kt => IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec.kt => IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableContainsInAnyOrderAtLeastValuesAssertionSpec.kt => IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableContainsInAnyOrderAtMostValuesAssertionSpec.kt => IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableContainsInAnyOrderExactlyValuesAssertionsSpec.kt => IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableContainsInAnyOrderNotOrAtMostValuesAssertionsSpec.kt => IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableContainsInAnyOrderOnlyEntriesAssertionsSpec.kt => IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableContainsInAnyOrderOnlyValuesAssertionsSpec.kt => IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableContainsInOrderOnlyEntriesAssertionsSpec.kt => IterableContainsInOrderOnlyEntriesExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableContainsInOrderOnlyGroupedEntriesAssertionsSpec.kt => IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableContainsInOrderOnlyGroupedValuesAssertionsSpec.kt => IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableContainsInOrderOnlyValuesAssertionsSpec.kt => IterableContainsInOrderOnlyValuesExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableContainsNotEntriesAssertionsSpec.kt => IterableContainsNotEntriesExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableContainsNotValuesAssertionsSpec.kt => IterableContainsNotValuesExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableAssertionsSpec.kt => IterableExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IterableNoneAssertionsSpec.kt => IterableNoneExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{IteratorAssertionSpec.kt => IteratorExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{KeyValueLikeAssertionsSpec.kt => KeyValueLikeExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{ListAssertionsSpec.kt => ListExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{MapAsEntriesAssertionsSpec.kt => MapAsEntriesExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{MapContainsInAnyOrderKeyValueAssertionsSpec.kt => MapContainsInAnyOrderKeyValueExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{MapContainsInAnyOrderKeyValuePairsAssertionsSpec.kt => MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{MapContainsInAnyOrderOnlyKeyValueAssertionsSpec.kt => MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec.kt => MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{MapContainsInOrderOnlyKeyValueAssertionsSpec.kt => MapContainsInOrderOnlyKeyValueExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{MapContainsInOrderOnlyKeyValuePairsAssertionsSpec.kt => MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{MapEntryAssertionsSpec.kt => MapEntryExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{MapAssertionsSpec.kt => MapExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{PairAssertionsSpec.kt => PairExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{ResultAssertionsSpec.kt => ResultExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/{ThrowableAssertionsSpec.kt => ThrowableExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/{BigDecimalAssertionsSpec.kt => BigDecimalExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/{ChronoLocalDateAsStringAssertionSpec.kt => ChronoLocalDateAsStringExpectationsSpec.kt} (98%) rename misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/{ChronoLocalDateAssertionSpec.kt => ChronoLocalDateExpectationsSpec.kt} (99%) rename misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/{ChronoLocalDateTimeAsStringAssertionSpec.kt => ChronoLocalDateTimeAsStringExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/{ChronoLocalDateTimeAssertionSpec.kt => ChronoLocalDateTimeExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/{ChronoZonedDateTimeAsStringAssertionSpec.kt => ChronoZonedDateTimeAsStringExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/{ChronoZonedDateTimeAssertionSpec.kt => ChronoZonedDateTimeExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/{FileAsPathAssertionsSpec.kt => FileAsPathExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/{FloatingPointWithErrorToleranceAssertionsJvmSpec.kt => FloatingPointWithErrorToleranceExpectationsJvmSpec.kt} (100%) rename misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/{Fun0AssertionsJvmSpec.kt => Fun0ExpectationsJvmSpec.kt} (100%) rename misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/{LocalDateAssertionsSpec.kt => LocalDateExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/{LocalDateTimeAssertionsSpec.kt => LocalDateTimeExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/{OptionalAssertionsSpec.kt => OptionalExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/{PathAssertionsSpec.kt => PathExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/{PathFeatureAssertionsSpec.kt => PathFeatureExpectationsSpec.kt} (100%) rename misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/{ZonedDateTimeAssertionsSpec.kt => ZonedDateTimeExpectationsSpec.kt} (100%) diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/AnyAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/AnyExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/AnyAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/AnyExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ArrayAsListAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ArrayAsListExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ArrayAsListAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ArrayAsListExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtLeastAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtLeastExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtLeastAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtLeastExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtMostAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtMostExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtMostAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtMostExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsContainsNotAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsContainsNotExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsContainsNotAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsContainsNotExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsExactlyAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsExactlyExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsExactlyAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsExactlyExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsNotAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsNotExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsNotAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsNotExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsNotOrAtMostAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsNotOrAtMostExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsNotOrAtMostAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsNotOrAtMostExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsRegexAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsRegexExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsRegexAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsRegexExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CollectionAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CollectionExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CollectionAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CollectionExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ComparableAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ComparableExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ComparableAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ComparableExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureAssertionsBoundedReferenceAlternativeSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureExpectationsBoundedReferenceAlternativeSpec.kt similarity index 97% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureAssertionsBoundedReferenceAlternativeSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureExpectationsBoundedReferenceAlternativeSpec.kt index ed1d678db2..d0aed290b7 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureAssertionsBoundedReferenceAlternativeSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureExpectationsBoundedReferenceAlternativeSpec.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 -class FeatureAssertionsBoundedReferenceAlternativeSpec : ch.tutteli.atrium.specs.integration.FeatureAssertionsSpec( +class FeatureExpectationsBoundedReferenceAlternativeSpec : ch.tutteli.atrium.specs.integration.FeatureExpectationsSpec( propertyImmediate, propertyLazy, f0Immediate, diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureAssertionsBoundedReferenceSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureExpectationsBoundedReferenceSpec.kt similarity index 98% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureAssertionsBoundedReferenceSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureExpectationsBoundedReferenceSpec.kt index ce3060768a..ed04935153 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureAssertionsBoundedReferenceSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureExpectationsBoundedReferenceSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.specs.notImplemented internal typealias F = Expect.() -> Unit -class FeatureAssertionsBoundedReferenceSpec : ch.tutteli.atrium.specs.integration.FeatureAssertionsSpec( +class FeatureExpectationsBoundedReferenceSpec : ch.tutteli.atrium.specs.integration.FeatureExpectationsSpec( propertyImmediate, propertyLazy, f0Immediate, diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureAssertionsClassReferenceSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureExpectationsClassReferenceSpec.kt similarity index 98% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureAssertionsClassReferenceSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureExpectationsClassReferenceSpec.kt index 9ab7a551b1..9fec18ac32 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureAssertionsClassReferenceSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureExpectationsClassReferenceSpec.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.integration.TestData import ch.tutteli.atrium.specs.notImplemented -class FeatureAssertionsClassReferenceSpec : ch.tutteli.atrium.specs.integration.FeatureAssertionsSpec( +class FeatureExpectationsClassReferenceSpec : ch.tutteli.atrium.specs.integration.FeatureExpectationsSpec( propertyImmediate, propertyLazy, return0ValueImmediate, diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureAssertionsManualSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureExpectationsManualSpec.kt similarity index 98% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureAssertionsManualSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureExpectationsManualSpec.kt index cfd9801337..a4af7bc99b 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureAssertionsManualSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureExpectationsManualSpec.kt @@ -1,7 +1,7 @@ package ch.tutteli.atrium.api.fluent.en_GB -class FeatureAssertionsManualSpec : ch.tutteli.atrium.specs.integration.FeatureAssertionsSpec( +class FeatureExpectationsManualSpec : ch.tutteli.atrium.specs.integration.FeatureExpectationsSpec( propertyImmediate, propertyLazy, f0Immediate, diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FloatingPointWithErrorToleranceAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FloatingPointWithErrorToleranceExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FloatingPointWithErrorToleranceAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FloatingPointWithErrorToleranceExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/Fun0AssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/Fun0ExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/Fun0AssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/Fun0ExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAllAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAllExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAllAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAllExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAnyAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAnyExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAnyAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAnyExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1ElementsOfAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1ElementsOfAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeastValuesAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt similarity index 95% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeastValuesAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt index 69071c7b61..16a1cd5083 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeastValuesAssertionsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt @@ -2,8 +2,8 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect -class IterableContainsInAnyOrderAtLeastValuesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeastValuesAssertionSpec( +class IterableContainsInAnyOrderAtLeastValuesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeastValuesExpectationsSpec( getAtLeastTriple(), getAtLeastButAtMostTriple(), getContainsNotPair(), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtMostValuesAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtMostValuesAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderExactlyValuesAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderExactlyValuesAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderNotOrAtMostValuesAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderNotOrAtMostValuesAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyElementsOfAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyElementsOfAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyEntriesAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyEntriesAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyValuesAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyValuesAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyElementsOfAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyElementsOfExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyElementsOfAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyElementsOfExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyEntriesAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyEntriesAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyGroupedEntriesAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyGroupedEntriesAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyGroupedValuesAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyGroupedValuesAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyValuesAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyValuesExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyValuesAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyValuesExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsNotEntriesAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsNotEntriesExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsNotEntriesAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsNotEntriesExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsNotValuesAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsNotValuesExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsNotValuesAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsNotValuesExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableNoneAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableNoneExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableNoneAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableNoneExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IteratorAssertionSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IteratorExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IteratorAssertionSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IteratorExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ListAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ListExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ListAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ListExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapAsEntriesAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapAsEntriesExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapAsEntriesAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapAsEntriesExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderEntriesOfAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderEntriesOfExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderEntriesOfAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderEntriesOfExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderKeyValueAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderKeyValueExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderKeyValueAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderKeyValueExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderKeyValuePairsAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderKeyValuePairsAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyEntriesOfAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyEntriesOfAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyKeyValueAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyKeyValueAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyEntriesOfAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyEntriesOfExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyEntriesOfAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyEntriesOfExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyKeyValueAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyKeyValueAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyKeyValuePairsAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyKeyValuePairsAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapEntryAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapEntryExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapEntryAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapEntryExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PairAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PairExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PairAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PairExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ThrowableAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ThrowableExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ThrowableAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ThrowableExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CharSequenceAssertionsSpec.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 similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CharSequenceAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CharSequenceExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/BigDecimalAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/BigDecimalExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/BigDecimalAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/BigDecimalExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoLocalDateAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoLocalDateExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoLocalDateAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoLocalDateExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoLocalDateTimeAssertionSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoLocalDateTimeExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoLocalDateTimeAssertionSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoLocalDateTimeExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoZonedDateTimeAssertionSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoZonedDateTimeExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoZonedDateTimeAssertionSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoZonedDateTimeExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FileAsPathAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FileAsPathExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FileAsPathAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FileAsPathExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FloatingPointWithErrorToleranceAssertionsJvmSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FloatingPointWithErrorToleranceExpectationsJvmSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FloatingPointWithErrorToleranceAssertionsJvmSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FloatingPointWithErrorToleranceExpectationsJvmSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/Fun0AssertionsJvmSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/Fun0ExpectationsJvmSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/Fun0AssertionsJvmSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/Fun0ExpectationsJvmSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/LocalDateAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/LocalDateExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/LocalDateAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/LocalDateExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/LocalDateTimeAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/LocalDateTimeExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/LocalDateTimeAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/LocalDateTimeExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/OptionalAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/OptionalExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/OptionalAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/OptionalExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PathAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PathExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PathAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PathExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PathFeatureAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PathFeatureExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PathFeatureAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PathFeatureExpectationsSpec.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ZonedDateTimeAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ZonedDateTimeExpectationsSpec.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ZonedDateTimeAssertionsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ZonedDateTimeExpectationsSpec.kt 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/ResultAssertionsSpec.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 similarity index 100% rename from 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/ResultAssertionsSpec.kt rename to 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 diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/AnyAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/AnyExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/AnyAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/AnyExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ArrayAsListAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ArrayAsListExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ArrayAsListAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ArrayAsListExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsAtLeastAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsAtLeastExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsAtLeastAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsAtLeastExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsAtMostAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsAtMostExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsAtMostAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsAtMostExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsContainsNotAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsContainsNotExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsContainsNotAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsContainsNotExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsExactlyAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsExactlyExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsExactlyAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsExactlyExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsNotAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsNotExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsNotAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsNotExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsNotOrAtMostAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsNotOrAtMostExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsNotOrAtMostAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsNotOrAtMostExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsRegexAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsRegexExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsRegexAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsRegexExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CollectionAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CollectionExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CollectionAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CollectionExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ComparableAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ComparableExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ComparableAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ComparableExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureAssertionsBoundedReferenceAlternativeSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureExpectationsBoundedReferenceAlternativeSpec.kt similarity index 98% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureAssertionsBoundedReferenceAlternativeSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureExpectationsBoundedReferenceAlternativeSpec.kt index f98a201805..83a276b916 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureAssertionsBoundedReferenceAlternativeSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureExpectationsBoundedReferenceAlternativeSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.specs.integration.TestData import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.testutils.WithAsciiReporter -class FeatureAssertionsBoundedReferenceAlternativeSpec : ch.tutteli.atrium.specs.integration.FeatureAssertionsSpec( +class FeatureExpectationsBoundedReferenceAlternativeSpec : ch.tutteli.atrium.specs.integration.FeatureExpectationsSpec( propertyImmediate, propertyLazy, f0Immediate, diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureAssertionsBoundedReferenceSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureExpectationsBoundedReferenceSpec.kt similarity index 98% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureAssertionsBoundedReferenceSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureExpectationsBoundedReferenceSpec.kt index c384f8abba..da9b03d94c 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureAssertionsBoundedReferenceSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureExpectationsBoundedReferenceSpec.kt @@ -8,7 +8,7 @@ import ch.tutteli.atrium.specs.testutils.WithAsciiReporter internal typealias F = Expect.() -> Unit -class FeatureAssertionsBoundedReferenceSpec : ch.tutteli.atrium.specs.integration.FeatureAssertionsSpec( +class FeatureExpectationsBoundedReferenceSpec : ch.tutteli.atrium.specs.integration.FeatureExpectationsSpec( propertyImmediate, propertyLazy, f0Immediate, diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureAssertionsClassReferenceSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureExpectationsClassReferenceSpec.kt similarity index 98% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureAssertionsClassReferenceSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureExpectationsClassReferenceSpec.kt index 5eb91a4627..90864b2a96 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureAssertionsClassReferenceSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureExpectationsClassReferenceSpec.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.specs.integration.TestData import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.testutils.WithAsciiReporter -class FeatureAssertionsClassReferenceSpec : ch.tutteli.atrium.specs.integration.FeatureAssertionsSpec( +class FeatureExpectationsClassReferenceSpec : ch.tutteli.atrium.specs.integration.FeatureExpectationsSpec( propertyImmediate, propertyLazy, return0ValueImmediate, diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureAssertionsManualSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureExpectationsManualSpec.kt similarity index 98% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureAssertionsManualSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureExpectationsManualSpec.kt index e2514dbdb7..5246874df6 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureAssertionsManualSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureExpectationsManualSpec.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.specs.integration.TestData import ch.tutteli.atrium.specs.testutils.WithAsciiReporter -class FeatureAssertionsManualSpec : ch.tutteli.atrium.specs.integration.FeatureAssertionsSpec( +class FeatureExpectationsManualSpec : ch.tutteli.atrium.specs.integration.FeatureExpectationsSpec( propertyImmediate, propertyLazy, f0Immediate, diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/Fun0AssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/Fun0ExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/Fun0AssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/Fun0ExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAllAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAllExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAllAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAllExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAnyAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAnyExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAnyAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAnyExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1ElementsOfAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1ElementsOfAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeastValuesAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt similarity index 95% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeastValuesAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt index 0368a99b3a..dad0847b58 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeastValuesAssertionsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt @@ -2,8 +2,8 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect -class IterableContainsInAnyOrderAtLeastValuesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeastValuesAssertionSpec( +class IterableContainsInAnyOrderAtLeastValuesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeastValuesExpectationsSpec( getAtLeastTriple(), getAtLeastButAtMostTriple(), getContainsNotPair(), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtMostValuesAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt similarity index 93% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtMostValuesAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt index b352121a4e..a971e564ae 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtMostValuesAssertionsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt @@ -2,8 +2,8 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect -class IterableContainsInAnyOrderAtMostValuesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtMostValuesAssertionSpec( +class IterableContainsInAnyOrderAtMostValuesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtMostValuesExpectationsSpec( getAtMostTriple(), getContainsNotPair(), getExactlyPair(), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderExactlyValuesAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderExactlyValuesAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderNotOrAtMostValuesAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderNotOrAtMostValuesAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyElementsOfAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyElementsOfAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyEntriesAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyEntriesAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyValuesAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyValuesAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyElementsOfAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyElementsOfExpectationsSpec.kt similarity index 98% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyElementsOfAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyElementsOfExpectationsSpec.kt index 7f42397cf4..5dc3fb8e80 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyElementsOfAssertionsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyElementsOfExpectationsSpec.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.creating.Expect import org.spekframework.spek2.Spek import kotlin.reflect.KFunction2 -class IterableContainsInOrderOnlyElementsOfAssertionsSpec : Spek({ +class IterableContainsInOrderOnlyElementsOfExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) include(BuilderIterableLikeToIterableSpec) diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyEntriesAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt similarity index 98% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyEntriesAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt index 77419490ba..e28d2a6a3e 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyEntriesAssertionsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.creating.Expect import org.spekframework.spek2.Spek import kotlin.reflect.KFunction2 -class IterableContainsInOrderOnlyEntriesAssertionsSpec : Spek({ +class IterableContainsInOrderOnlyEntriesExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyGroupedEntriesAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyGroupedEntriesAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyGroupedValuesAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyGroupedValuesAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyValuesAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyValuesExpectationsSpec.kt similarity index 97% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyValuesAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyValuesExpectationsSpec.kt index 84f690ed5a..6837cd40a4 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyValuesAssertionsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyValuesExpectationsSpec.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.creating.Expect import org.spekframework.spek2.Spek import kotlin.reflect.KFunction2 -class IterableContainsInOrderOnlyValuesAssertionsSpec : Spek({ +class IterableContainsInOrderOnlyValuesExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotEntriesAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotEntriesExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotEntriesAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotEntriesExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotValuesAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotValuesExpectationsSpec.kt similarity index 97% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotValuesAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotValuesExpectationsSpec.kt index 1ac89a1979..4dabd1650b 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotValuesAssertionsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotValuesExpectationsSpec.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.creating.Expect import org.spekframework.spek2.Spek import kotlin.reflect.KFunction2 -class IterableContainsNotValuesAssertionsSpec : Spek({ +class IterableContainsNotValuesExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableNoneAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableNoneExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableNoneAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableNoneExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IteratorAssertionSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IteratorExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IteratorAssertionSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IteratorExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ListAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ListExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ListAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ListExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapAsEntriesAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapAsEntriesExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapAsEntriesAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapAsEntriesExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderEntriesOfAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderEntriesOfExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderEntriesOfAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderEntriesOfExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderKeyValueAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderKeyValueExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderKeyValueAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderKeyValueExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderKeyValuePairsAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderKeyValuePairsAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyEntriesOfAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyEntriesOfAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyKeyValueAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyKeyValueAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyEntriesOfAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyEntriesOfExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyEntriesOfAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyEntriesOfExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyKeyValueAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyKeyValueAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyKeyValuePairsAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyKeyValuePairsAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapEntryAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapEntryExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapEntryAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapEntryExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PairAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PairExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PairAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PairExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ThrowableAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ThrowableExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ThrowableAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ThrowableExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/BigDecimalAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/BigDecimalExpectationsSpec.kt similarity index 92% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/BigDecimalAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/BigDecimalExpectationsSpec.kt index 561e278445..c47e3117d3 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/BigDecimalAssertionsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/BigDecimalExpectationsSpec.kt @@ -3,15 +3,15 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.api.verbs.internal.expect import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.fun1 -import ch.tutteli.atrium.specs.integration.BigDecimalAssertionsSpec +import ch.tutteli.atrium.specs.integration.BigDecimalExpectationsSpec import ch.tutteli.atrium.specs.testutils.WithAsciiReporter import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.describe import java.math.BigDecimal -class BigDecimalAssertionsSpec : Spek({ - include(object : BigDecimalAssertionsSpec( +class BigDecimalExpectationsSpec : Spek({ + include(object : BigDecimalExpectationsSpec( fun1(Companion::toBeBigDecimal), fun1(Companion::toBeNullable).withNullableSuffix(), fun1(Companion::toBeNull).withNullableSuffix(), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateTimeAssertionSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateTimeExpectationsSpec.kt similarity index 98% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateTimeAssertionSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateTimeExpectationsSpec.kt index cfc90494c6..a374141896 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateTimeAssertionSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateTimeExpectationsSpec.kt @@ -10,7 +10,7 @@ import java.time.LocalDateTime import java.time.chrono.ChronoLocalDate import java.time.chrono.ChronoLocalDateTime -class ChronoLocalDateTimeAssertionSpec : Spek({ +class ChronoLocalDateTimeExpectationsSpec : Spek({ include(ChronoLocalDateTimeSpec) include(ChronoLocalDateTimeAsStringSpec) }) { diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoZonedDateTimeAssertionSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoZonedDateTimeExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoZonedDateTimeAssertionSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoZonedDateTimeExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FileAsPathAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FileAsPathExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FileAsPathAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FileAsPathExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/Fun0AssertionsJvmSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/Fun0ExpectationsJvmSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/Fun0AssertionsJvmSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/Fun0ExpectationsJvmSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/LocalDateAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/LocalDateExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/LocalDateAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/LocalDateExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/LocalDateTimeAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/LocalDateTimeExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/LocalDateTimeAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/LocalDateTimeExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/OptionalAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/OptionalExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/OptionalAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/OptionalExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PathAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PathExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PathAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PathExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PathFeatureAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PathFeatureExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PathFeatureAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PathFeatureExpectationsSpec.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ZonedDateTimeAssertionsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ZonedDateTimeExpectationsSpec.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ZonedDateTimeAssertionsSpec.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ZonedDateTimeExpectationsSpec.kt 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/ResultAssertionsSpec.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 similarity index 100% rename from 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/ResultAssertionsSpec.kt rename to 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 diff --git a/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/AnyAssertionsSpec.scala b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/AnyExpectationsSpec.scala similarity index 100% rename from atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/AnyAssertionsSpec.scala rename to atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/AnyExpectationsSpec.scala diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/AnyAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/AnyExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/AnyAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/AnyExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ArrayAsListAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ArrayAsListExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ArrayAsListAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ArrayAsListExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsAtLeastAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsAtLeastExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsAtLeastAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsAtLeastExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsAtMostAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsAtMostExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsAtMostAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsAtMostExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsContainsNotAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsContainsNotExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsContainsNotAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsContainsNotExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsExactlyAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsExactlyExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsExactlyAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsExactlyExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsNotAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsNotExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsNotAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsNotExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsNotOrAtMostAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsNotOrAtMostExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsNotOrAtMostAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsNotOrAtMostExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsRegexAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsRegexExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsRegexAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsRegexExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CollectionAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CollectionExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CollectionAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CollectionExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ComparableAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ComparableExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ComparableAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ComparableExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/FeatureAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/FeatureExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/FeatureAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/FeatureExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/FloatingPointWithErrorToleranceAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/FloatingPointWithErrorToleranceExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/FloatingPointWithErrorToleranceAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/FloatingPointWithErrorToleranceExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/Fun0AssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/Fun0ExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/Fun0AssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/Fun0ExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAllAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAllExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAllAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAllExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAnyAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAnyExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAnyAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAnyExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeastValuesAssertionSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeastValuesAssertionSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtMostValuesAssertionSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtMostValuesAssertionSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderExactlyValuesAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderExactlyValuesAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderNotOrAtMostValuesAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderNotOrAtMostValuesAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderOnlyEntriesAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderOnlyEntriesAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderOnlyValuesAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderOnlyValuesAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyEntriesAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyEntriesAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyGroupedEntriesAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyGroupedEntriesAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyGroupedValuesAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyGroupedValuesAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyValuesAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyValuesExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyValuesAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyValuesExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotEntriesAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotEntriesExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotEntriesAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotEntriesExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotValuesAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotValuesExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotValuesAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotValuesExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableNoneAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableNoneExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableNoneAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableNoneExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IteratorAssertionSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IteratorExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IteratorAssertionSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IteratorExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/KeyValueLikeAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/KeyValueLikeExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/KeyValueLikeAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/KeyValueLikeExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ListAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ListExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ListAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ListExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapAsEntriesAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapAsEntriesExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapAsEntriesAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapAsEntriesExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValueAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValueExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValueAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValueExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValuePairsAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValuePairsAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderOnlyKeyValueAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderOnlyKeyValueAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInOrderOnlyKeyValueAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInOrderOnlyKeyValueAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInOrderOnlyKeyValuePairsAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInOrderOnlyKeyValuePairsAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapEntryAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapEntryExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapEntryAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapEntryExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/PairAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/PairExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/PairAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/PairExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ResultAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ResultExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ResultAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ResultExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ThrowableAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ThrowableExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ThrowableAssertionsSpec.kt rename to misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ThrowableExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/BigDecimalAssertionsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/BigDecimalExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/BigDecimalAssertionsSpec.kt rename to misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/BigDecimalExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateAsStringAssertionSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateAsStringExpectationsSpec.kt similarity index 98% rename from misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateAsStringAssertionSpec.kt rename to misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateAsStringExpectationsSpec.kt index d979e75b96..e1156ef91c 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateAsStringAssertionSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateAsStringExpectationsSpec.kt @@ -54,7 +54,7 @@ abstract class ChronoLocalDateAsStringAssertionSpec( ): Expect = expect.(isEqual.lambda)(expected.format(DateTimeFormatter.ISO_LOCAL_DATE)) - include(object : ChronoLocalDateAssertionSpec( + include(object : ChronoLocalDateExpectationsSpec( fun1(::isBefore), fun1(::isBeforeOrEqual), fun1(::isAfter), diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateAssertionSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateExpectationsSpec.kt similarity index 99% rename from misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateAssertionSpec.kt rename to misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateExpectationsSpec.kt index 8faf07e96d..436d037e58 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateAssertionSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateExpectationsSpec.kt @@ -11,7 +11,7 @@ import java.time.LocalDate import java.time.chrono.ChronoLocalDate import java.time.chrono.JapaneseDate -abstract class ChronoLocalDateAssertionSpec( +abstract class ChronoLocalDateExpectationsSpec( isBefore: Fun1, isBeforeOrEqual: Fun1, isAfter: Fun1, diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateTimeAsStringAssertionSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateTimeAsStringExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateTimeAsStringAssertionSpec.kt rename to misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateTimeAsStringExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateTimeAssertionSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateTimeExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateTimeAssertionSpec.kt rename to misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateTimeExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoZonedDateTimeAsStringAssertionSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoZonedDateTimeAsStringExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoZonedDateTimeAsStringAssertionSpec.kt rename to misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoZonedDateTimeAsStringExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoZonedDateTimeAssertionSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoZonedDateTimeExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoZonedDateTimeAssertionSpec.kt rename to misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoZonedDateTimeExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/FileAsPathAssertionsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/FileAsPathExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/FileAsPathAssertionsSpec.kt rename to misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/FileAsPathExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/FloatingPointWithErrorToleranceAssertionsJvmSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/FloatingPointWithErrorToleranceExpectationsJvmSpec.kt similarity index 100% rename from misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/FloatingPointWithErrorToleranceAssertionsJvmSpec.kt rename to misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/FloatingPointWithErrorToleranceExpectationsJvmSpec.kt diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/Fun0AssertionsJvmSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/Fun0ExpectationsJvmSpec.kt similarity index 100% rename from misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/Fun0AssertionsJvmSpec.kt rename to misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/Fun0ExpectationsJvmSpec.kt diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/LocalDateAssertionsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/LocalDateExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/LocalDateAssertionsSpec.kt rename to misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/LocalDateExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/LocalDateTimeAssertionsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/LocalDateTimeExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/LocalDateTimeAssertionsSpec.kt rename to misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/LocalDateTimeExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/OptionalAssertionsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/OptionalExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/OptionalAssertionsSpec.kt rename to misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/OptionalExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/PathAssertionsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/PathExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/PathAssertionsSpec.kt rename to misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/PathExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/PathFeatureAssertionsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/PathFeatureExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/PathFeatureAssertionsSpec.kt rename to misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/PathFeatureExpectationsSpec.kt diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ZonedDateTimeAssertionsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ZonedDateTimeExpectationsSpec.kt similarity index 100% rename from misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ZonedDateTimeAssertionsSpec.kt rename to misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ZonedDateTimeExpectationsSpec.kt From 7470c90f821b689380fc36c9130351233c2f018b Mon Sep 17 00:00:00 2001 From: Joshua Gleitze Date: Wed, 23 Dec 2020 23:37:50 +0100 Subject: [PATCH 7/9] 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 | 10 ++--- ...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 | 8 ++-- .../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 +- 194 files changed, 383 insertions(+), 391 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 337abe5e38..5fe7611a4e 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 @@ -5,7 +5,7 @@ import ch.tutteli.atrium.creating.Expect import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.describe -class CharSequenceContainsRegexAssertionsSpec : Spek({ +class CharSequenceContainsRegexExpectationsSpec : Spek({ include(StringSpec) include(RegexSpec) @@ -18,7 +18,7 @@ class CharSequenceContainsRegexAssertionsSpec : Spek({ } } }) { - object StringSpec : ch.tutteli.atrium.specs.integration.CharSequenceContainsRegexAssertionsSpec( + object StringSpec : ch.tutteli.atrium.specs.integration.CharSequenceContainsRegexExpectationsSpec( getNameContainsRegex(), getAtLeastTripleString(), getAtLeastIgnoringCaseTripleString(), @@ -29,7 +29,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 25ff78b506..a7391e576f 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 @@ -5,7 +5,7 @@ import ch.tutteli.atrium.creating.Expect import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.describe -class CharSequenceContainsRegexAssertionsSpec : Spek({ +class CharSequenceContainsRegexExpectationsSpec : Spek({ include(StringSpec) include(RegexSpec) @@ -19,7 +19,7 @@ class CharSequenceContainsRegexAssertionsSpec : Spek({ } } }) { - object StringSpec : ch.tutteli.atrium.specs.integration.CharSequenceContainsRegexAssertionsSpec( + object StringSpec : ch.tutteli.atrium.specs.integration.CharSequenceContainsRegexExpectationsSpec( getNameContainsRegex(), getAtLeastTripleString(), getAtLeastIgnoringCaseTripleString(), @@ -30,7 +30,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 8743b7db9c..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 @@ -9,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 98f71a5b69..4bb2cf96fd 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,12 +1,12 @@ package ch.tutteli.atrium.scala2.api.fluent.en_GB import TestUtils._ -import AnyAssertionsSpec._ +import AnyExpectationsSpec._ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.api.verbs.internal.AtriumVerbsKt.expect -class AnyAssertionsSpec - extends ch.tutteli.atrium.specs.integration.AnyAssertionsSpec( +class AnyExpectationsSpec + extends ch.tutteli.atrium.specs.integration.AnyExpectationsSpec( toBe, toBe, toBe.withNullableSuffix(), @@ -51,7 +51,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 8e6eb01356..ab97e40074 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 @@ -7,8 +7,8 @@ import java.lang.{Iterable => JIterable} import scala.reflect.ClassTag import IsIterableHelpers._ -// FIXME rewrite after fusing IterableFutureAssertionsSpec with IterableAssertionsSpecr -//class IterableFeatureAssertionsSpec +// FIXME rewrite after fusing IterableFutureExpectationsSpec with IterableExpectationsSpec +//class IterableFeatureExpectationsSpec // extends ch.tutteli.atrium.specs.integration.IterableFeatureAssertionsSpec( // feature0("min", changeToScalaIterable(_).min()), // fun1("min", changeToScalaIterable(_).min(_).asExpectJIterable), @@ -17,8 +17,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()), 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 9a9a826029..04fcdf197c 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 @@ -8,7 +8,7 @@ import ch.tutteli.atrium.translations.DescriptionCharSequenceAssertion.EXACTLY import org.spekframework.spek2.style.specification.Suite import org.spekframework.spek2.style.specification.describe -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 36a68ee77b..36b75eeb0f 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 @@ -6,7 +6,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 41fd43f341..3cb71cb202 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 @@ -6,7 +6,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.translations.DescriptionComparableAssertion -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 0421fd49fc..5aa82d805d 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 @@ -6,7 +6,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.logic.utils.expectLambda import ch.tutteli.atrium.specs.* -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 143abdb4c7..a40a23a6da 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 @@ -6,7 +6,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.logic.utils.expectLambda import ch.tutteli.atrium.specs.* -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 e23822eaee..bc105ec84d 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 @@ -7,7 +7,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.logic.utils.expectLambda import ch.tutteli.atrium.specs.* -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, From b8e9b47f0328742146a368c45ec79352b4864fdb Mon Sep 17 00:00:00 2001 From: Joshua Gleitze Date: Wed, 6 Jan 2021 19:31:09 +0100 Subject: [PATCH 8/9] refactor: rename samples to *Expectations* --- .../{AnyAssertionSamples.kt => AnyExpectationsSamples.kt} | 0 .../{ArrayAssertionSamples.kt => ArrayExpectationsSamples.kt} | 0 ...ceExpectationsSpec.kt => CharSequenceExpectationsSamples.kt} | 0 ...tionAssertionSamples.kt => CollectionExpectationsSamples.kt} | 0 ...ableAssertionSamples.kt => ComparableExpectationsSamples.kt} | 0 ...tAssertionSamples.kt => FloatingPointExpectationsSamples.kt} | 0 ...eratorAssertionSamples.kt => IteratorExpectationsSamples.kt} | 0 .../{ListAssertionSamples.kt => ListExpectationsSamples.kt} | 2 +- .../{PairAssertionSamples.kt => PairExpectationsSamples.kt} | 0 ...imalAssertionSamples.kt => BigDecimalExpectationsSamples.kt} | 0 .../{AnyAssertionSamples.kt => AnyExpectationsSamples.kt} | 0 ...eratorAssertionSamples.kt => IteratorExpectationsSamples.kt} | 0 .../{ListAssertionSamples.kt => ListExpectationsSamples.kt} | 0 ...imalAssertionSamples.kt => BigDecimalExpectationsSamples.kt} | 0 14 files changed, 1 insertion(+), 1 deletion(-) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/{AnyAssertionSamples.kt => AnyExpectationsSamples.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/{ArrayAssertionSamples.kt => ArrayExpectationsSamples.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/{CharSequenceExpectationsSpec.kt => CharSequenceExpectationsSamples.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/{CollectionAssertionSamples.kt => CollectionExpectationsSamples.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/{ComparableAssertionSamples.kt => ComparableExpectationsSamples.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/{FloatingPointAssertionSamples.kt => FloatingPointExpectationsSamples.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/{IteratorAssertionSamples.kt => IteratorExpectationsSamples.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/{ListAssertionSamples.kt => ListExpectationsSamples.kt} (98%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/{PairAssertionSamples.kt => PairExpectationsSamples.kt} (100%) rename apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/{BigDecimalAssertionSamples.kt => BigDecimalExpectationsSamples.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/{AnyAssertionSamples.kt => AnyExpectationsSamples.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/{IteratorAssertionSamples.kt => IteratorExpectationsSamples.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/{ListAssertionSamples.kt => ListExpectationsSamples.kt} (100%) rename apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/{BigDecimalAssertionSamples.kt => BigDecimalExpectationsSamples.kt} (100%) diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/AnyAssertionSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/AnyExpectationsSamples.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/AnyAssertionSamples.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/AnyExpectationsSamples.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ArrayAssertionSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ArrayExpectationsSamples.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ArrayAssertionSamples.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ArrayExpectationsSamples.kt 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/CharSequenceExpectationsSamples.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CharSequenceExpectationsSpec.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CharSequenceExpectationsSamples.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CollectionAssertionSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CollectionExpectationsSamples.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CollectionAssertionSamples.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CollectionExpectationsSamples.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ComparableAssertionSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ComparableExpectationsSamples.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ComparableAssertionSamples.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ComparableExpectationsSamples.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/FloatingPointAssertionSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/FloatingPointExpectationsSamples.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/FloatingPointAssertionSamples.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/FloatingPointExpectationsSamples.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/IteratorAssertionSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/IteratorExpectationsSamples.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/IteratorAssertionSamples.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/IteratorExpectationsSamples.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ListAssertionSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ListExpectationsSamples.kt similarity index 98% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ListAssertionSamples.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ListExpectationsSamples.kt index ee1c1481a4..54e8052537 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ListAssertionSamples.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ListExpectationsSamples.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 ListAssertionSamples { +class ListExpectationsSamples { @Test fun getFeature() { diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/PairAssertionSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/PairExpectationsSamples.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/PairAssertionSamples.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/PairExpectationsSamples.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/BigDecimalAssertionSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/BigDecimalExpectationsSamples.kt similarity index 100% rename from apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/BigDecimalAssertionSamples.kt rename to apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/BigDecimalExpectationsSamples.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/AnyAssertionSamples.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/AnyExpectationsSamples.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/AnyAssertionSamples.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/AnyExpectationsSamples.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/IteratorAssertionSamples.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/IteratorExpectationsSamples.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/IteratorAssertionSamples.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/IteratorExpectationsSamples.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/ListAssertionSamples.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/ListExpectationsSamples.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/ListAssertionSamples.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/ListExpectationsSamples.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/BigDecimalAssertionSamples.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/BigDecimalExpectationsSamples.kt similarity index 100% rename from apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/BigDecimalAssertionSamples.kt rename to apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/BigDecimalExpectationsSamples.kt From f85a8b3525ff66989d41614c58f9f123f1737da1 Mon Sep 17 00:00:00 2001 From: Joshua Gleitze Date: Wed, 6 Jan 2021 19:31:24 +0100 Subject: [PATCH 9/9] refactor: adapt sample references to *Expectations* naming --- .../api/fluent/en_GB/anyExpectations.kt | 28 +++++++------- .../api/fluent/en_GB/arrayExpectations.kt | 38 +++++++++---------- .../fluent/en_GB/charSequenceExpectations.kt | 38 +++++++++---------- .../fluent/en_GB/collectionExpectations.kt | 10 ++--- .../fluent/en_GB/comparableExpectations.kt | 10 ++--- .../fluent/en_GB/floatingPointExpectations.kt | 4 +- .../api/fluent/en_GB/iteratorExpectations.kt | 4 +- .../api/fluent/en_GB/listExpectations.kt | 4 +- .../api/fluent/en_GB/pairExpectations.kt | 8 ++-- .../en_GB/samples/AnyExpectationsSamples.kt | 2 +- .../en_GB/samples/ArrayExpectationsSamples.kt | 2 +- .../CharSequenceExpectationsSamples.kt | 2 +- .../samples/CollectionExpectationsSamples.kt | 2 +- .../samples/ComparableExpectationsSamples.kt | 2 +- .../FloatingPointExpectationsSamples.kt | 2 +- .../samples/IteratorExpectationsSamples.kt | 2 +- .../en_GB/samples/PairExpectationsSamples.kt | 2 +- .../fluent/en_GB/bigDecimalExpectations.kt | 2 +- .../samples/BigDecimalExpectationsSamples.kt | 2 +- .../atrium/api/infix/en_GB/anyExpectations.kt | 4 +- .../api/infix/en_GB/iteratorExpectations.kt | 4 +- .../api/infix/en_GB/listExpectations.kt | 4 +- .../en_GB/samples/AnyExpectationsSamples.kt | 2 +- .../samples/IteratorExpectationsSamples.kt | 2 +- .../en_GB/samples/ListExpectationsSamples.kt | 2 +- .../samples/BigDecimalExpectationsSamples.kt | 2 +- 26 files changed, 92 insertions(+), 92 deletions(-) diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/anyExpectations.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/anyExpectations.kt index 066a5d4964..5fbee7b24e 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/anyExpectations.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/anyExpectations.kt @@ -12,7 +12,7 @@ import ch.tutteli.kbox.glue * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyAssertionSamples.toBe + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyExpectationsSamples.toBe */ fun Expect.toBe(expected: T): Expect = _logicAppend { toBe(expected) } @@ -21,7 +21,7 @@ fun Expect.toBe(expected: T): Expect = _logicAppend { toBe(expected) } * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyAssertionSamples.notToBe + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyExpectationsSamples.notToBe */ fun Expect.notToBe(expected: T): Expect = _logicAppend { notToBe(expected) } @@ -30,7 +30,7 @@ fun Expect.notToBe(expected: T): Expect = _logicAppend { notToBe(expec * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyAssertionSamples.isSameAs + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyExpectationsSamples.isSameAs */ fun Expect.isSameAs(expected: T): Expect = _logicAppend { isSameAs(expected) } @@ -39,7 +39,7 @@ fun Expect.isSameAs(expected: T): Expect = _logicAppend { isSameAs(exp * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyAssertionSamples.isNotSameAs + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyExpectationsSamples.isNotSameAs */ fun Expect.isNotSameAs(expected: T): Expect = _logicAppend { isNotSameAs(expected) } @@ -53,7 +53,7 @@ fun Expect.isNotSameAs(expected: T): Expect = _logicAppend { isNotSame * * @since 0.15.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyAssertionSamples.because + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyExpectationsSamples.because */ fun Expect.because(reason: String, assertionCreator: Expect.() -> Unit): Expect = _logicAppend { because(reason, assertionCreator) } @@ -64,7 +64,7 @@ fun Expect.because(reason: String, assertionCreator: Expect.() -> Unit * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyAssertionSamples.toBeNullIfNullGivenElse + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyExpectationsSamples.toBeNullIfNullGivenElse */ fun Expect.toBeNullIfNullGivenElse( assertionCreatorOrNull: (Expect.() -> Unit)? @@ -75,7 +75,7 @@ fun Expect.toBeNullIfNullGivenElse( * * @return An [Expect] with the non-nullable type [T] (was `T?` before). * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyAssertionSamples.notToBeNullFeature + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyExpectationsSamples.notToBeNullFeature */ inline fun Expect.notToBeNull(): Expect = _logic.notToBeNullButOfType(T::class).transform() @@ -86,7 +86,7 @@ inline fun Expect.notToBeNull(): Expect = * * @return An [Expect] with the non-nullable type [T] (was `T?` before) * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyAssertionSamples.notToBeNull + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyExpectationsSamples.notToBeNull */ inline fun Expect.notToBeNull(noinline assertionCreator: Expect.() -> Unit): Expect = _logic.notToBeNullButOfType(T::class).transformAndAppend(assertionCreator) @@ -109,7 +109,7 @@ inline fun Expect.notToBeNull(noinline assertionCreator: E * * @return An [Expect] with the new type [TSub]. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyAssertionSamples.isAFeature + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyExpectationsSamples.isAFeature */ inline fun Expect<*>.isA(): Expect = _logic.isA(TSub::class).transform() @@ -154,7 +154,7 @@ inline fun Expect<*>.isA(): Expect = * * @return An [Expect] with the new type [TSub]. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyAssertionSamples.isA + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyExpectationsSamples.isA */ inline fun Expect<*>.isA(noinline assertionCreator: Expect.() -> Unit): Expect = _logic.isA(TSub::class).transformAndAppend(assertionCreator) @@ -168,7 +168,7 @@ inline fun Expect<*>.isA(noinline assertionCreator: Expect< * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyAssertionSamples.andFeature + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyExpectationsSamples.andFeature */ inline val Expect.and: Expect get() = this @@ -182,7 +182,7 @@ inline val Expect.and: Expect get() = this * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyAssertionSamples.and + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyExpectationsSamples.and */ infix fun Expect.and(assertionCreator: Expect.() -> Unit): Expect = addAssertionsCreatedBy(assertionCreator) @@ -194,7 +194,7 @@ infix fun Expect.and(assertionCreator: Expect.() -> Unit): Expect = * * @since 0.13.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyAssertionSamples.isNoneOf + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyExpectationsSamples.isNoneOf */ fun Expect.isNoneOf(expected: T, vararg otherValues: T): Expect = _logicAppend { isNotIn(expected glue otherValues) } @@ -210,7 +210,7 @@ fun Expect.isNoneOf(expected: T, vararg otherValues: T): Expect = * * @since 0.13.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyAssertionSamples.isNotIn + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.AnyExpectationsSamples.isNotIn */ inline fun Expect.isNotIn(expected: IterableLike): Expect = _logicAppend { isNotIn(iterableLikeToIterable(expected)) } diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/arrayExpectations.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/arrayExpectations.kt index c1c855dddf..1cd861bfdd 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/arrayExpectations.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/arrayExpectations.kt @@ -15,7 +15,7 @@ import kotlin.jvm.JvmName * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.asListFeature + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.asListFeature */ fun Expect>.asList(): Expect> = _logic.changeSubject.unreported { it.asList() } @@ -31,7 +31,7 @@ fun Expect>.asList(): Expect> = * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.asList + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.asList */ fun Expect>.asList(assertionCreator: Expect>.() -> Unit): Expect> = apply { asList().addAssertionsCreatedBy(assertionCreator) } @@ -47,7 +47,7 @@ fun Expect>.asList(assertionCreator: Expect>.() -> Unit): E * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.asListEOut + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.asListEOut */ @JvmName("asListEOut") fun Expect>.asList(assertionCreator: Expect>.() -> Unit): Expect> = @@ -63,7 +63,7 @@ fun Expect>.asList(assertionCreator: Expect>.() -> Unit * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.byteArrAsListFeature + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.byteArrAsListFeature */ @JvmName("byteArrAsList") fun Expect.asList(): Expect> = @@ -80,7 +80,7 @@ fun Expect.asList(): Expect> = * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.byteArrAsList + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.byteArrAsList */ @JvmName("byteArrAsList") fun Expect.asList(assertionCreator: Expect>.() -> Unit): Expect = @@ -97,7 +97,7 @@ fun Expect.asList(assertionCreator: Expect>.() -> Unit): E * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.charArrAsListFeature + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.charArrAsListFeature */ @JvmName("charArrAsList") fun Expect.asList(): Expect> = @@ -114,7 +114,7 @@ fun Expect.asList(): Expect> = * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.charArrAsList + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.charArrAsList */ @JvmName("charArrAsList") fun Expect.asList(assertionCreator: Expect>.() -> Unit): Expect = @@ -131,7 +131,7 @@ fun Expect.asList(assertionCreator: Expect>.() -> Unit): E * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.shortArrAsListFeature + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.shortArrAsListFeature */ @JvmName("shortArrAsList") fun Expect.asList(): Expect> = @@ -148,7 +148,7 @@ fun Expect.asList(): Expect> = * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.shortArrAsList + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.shortArrAsList */ @JvmName("shortArrAsList") fun Expect.asList(assertionCreator: Expect>.() -> Unit): Expect = @@ -165,7 +165,7 @@ fun Expect.asList(assertionCreator: Expect>.() -> Unit): * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.intArrAsListFeature + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.intArrAsListFeature */ @JvmName("intArrAsList") fun Expect.asList(): Expect> = @@ -182,7 +182,7 @@ fun Expect.asList(): Expect> = * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.intArrAsList + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.intArrAsList */ @JvmName("intArrAsList") fun Expect.asList(assertionCreator: Expect>.() -> Unit): Expect = @@ -199,7 +199,7 @@ fun Expect.asList(assertionCreator: Expect>.() -> Unit): Exp * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.longArrAsListFeature + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.longArrAsListFeature */ @JvmName("longArrAsList") fun Expect.asList(): Expect> = @@ -216,7 +216,7 @@ fun Expect.asList(): Expect> = * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.longArrAsList + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.longArrAsList */ @JvmName("longArrAsList") fun Expect.asList(assertionCreator: Expect>.() -> Unit): Expect = @@ -233,7 +233,7 @@ fun Expect.asList(assertionCreator: Expect>.() -> Unit): E * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.floatArrAsListFeature + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.floatArrAsListFeature */ @JvmName("floatArrAsList") fun Expect.asList(): Expect> = @@ -250,7 +250,7 @@ fun Expect.asList(): Expect> = * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.floatArrAsList + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.floatArrAsList */ @JvmName("floatArrAsList") fun Expect.asList(assertionCreator: Expect>.() -> Unit): Expect = @@ -267,7 +267,7 @@ fun Expect.asList(assertionCreator: Expect>.() -> Unit): * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.doubleArrAsListFeature + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.doubleArrAsListFeature */ @JvmName("doubleArrAsList") fun Expect.asList(): Expect> = @@ -284,7 +284,7 @@ fun Expect.asList(): Expect> = * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.doubleArrAsList + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.doubleArrAsList */ @JvmName("doubleArrAsList") fun Expect.asList(assertionCreator: Expect>.() -> Unit): Expect = @@ -301,7 +301,7 @@ fun Expect.asList(assertionCreator: Expect>.() -> Unit * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.booleanArrAsListFeature + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.booleanArrAsListFeature */ @JvmName("boolArrAsList") fun Expect.asList(): Expect> = @@ -317,7 +317,7 @@ fun Expect.asList(): Expect> = * @return The newly created [Expect] for the transformed subject. * * @since 0.9.0 - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayAssertionSamples.booleanArrAsList + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ArrayExpectationsSamples.booleanArrAsList */ @JvmName("boolArrAsList") fun Expect.asList(assertionCreator: Expect>.() -> Unit): Expect = 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 3bf8a727e6..c137460eb7 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 @@ -19,7 +19,7 @@ import kotlin.jvm.JvmName * * @return The newly created builder. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.containsBuilder + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSamples.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.CharSequenceExpectationsSpec.containsNot + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSamples.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.CharSequenceExpectationsSpec.containsRegexString + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSamples.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.CharSequenceExpectationsSpec.containsRegex + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSamples.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.CharSequenceExpectationsSpec.startsWith + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSamples.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.CharSequenceExpectationsSpec.startsWithChar + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSamples.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.CharSequenceExpectationsSpec.startsNotWith + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSamples.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.CharSequenceExpectationsSpec.endsWith + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSamples.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.CharSequenceExpectationsSpec.endsWithChar + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSamples.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.CharSequenceExpectationsSpec.endsNotWith + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSamples.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.CharSequenceExpectationsSpec.endsNotWithChar + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSamples.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.CharSequenceExpectationsSpec.isEmpty + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSamples.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.CharSequenceExpectationsSpec.isNotEmpty + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSamples.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.CharSequenceExpectationsSpec.isNotBlank + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSamples.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.CharSequenceExpectationsSpec.matches + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSamples.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.CharSequenceExpectationsSpec.mismatches + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSamples.mismatches */ fun Expect.mismatches(expected: Regex): Expect = _logicAppend { mismatches(expected) } diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/collectionExpectations.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/collectionExpectations.kt index 7937a1a3f9..b944cef8d2 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/collectionExpectations.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/collectionExpectations.kt @@ -13,7 +13,7 @@ import ch.tutteli.kbox.identity * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CollectionAssertionSamples.isEmpty + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CollectionExpectationsSamples.isEmpty */ fun > Expect.isEmpty(): Expect = _logicAppend { isEmpty(::identity) } @@ -23,7 +23,7 @@ fun > Expect.isEmpty(): Expect = * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CollectionAssertionSamples.isNotEmpty + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CollectionExpectationsSamples.isNotEmpty */ fun > Expect.isNotEmpty(): Expect = _logicAppend { isNotEmpty(::identity) } @@ -35,7 +35,7 @@ fun > Expect.isNotEmpty(): Expect = * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CollectionAssertionSamples.hasSize + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CollectionExpectationsSamples.hasSize */ fun > Expect.hasSize(expected: Int): Expect = size { toBe(expected) } @@ -46,7 +46,7 @@ fun > Expect.hasSize(expected: Int): Expect = * * @return The newly created [Expect] for the extracted feature. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CollectionAssertionSamples.sizeFeature + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CollectionExpectationsSamples.sizeFeature */ val > Expect.size: Expect get() = _logic.size(::identity).transform() @@ -58,7 +58,7 @@ val > Expect.size: Expect * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CollectionAssertionSamples.size + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CollectionExpectationsSamples.size */ fun > Expect.size(assertionCreator: Expect.() -> Unit): Expect = _logic.size(::identity).collectAndAppend(assertionCreator) diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/comparableExpectations.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/comparableExpectations.kt index b07c98d643..23df7329d7 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/comparableExpectations.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/comparableExpectations.kt @@ -9,7 +9,7 @@ import ch.tutteli.atrium.logic.* * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ComparableAssertionSamples.isLessThan + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ComparableExpectationsSamples.isLessThan */ fun > Expect.isLessThan(expected: T): Expect = _logicAppend { isLessThan(expected) } @@ -20,7 +20,7 @@ fun > Expect.isLessThan(expected: T): Expect = * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ComparableAssertionSamples.isLessThanOrEqual + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ComparableExpectationsSamples.isLessThanOrEqual */ fun > Expect.isLessThanOrEqual(expected: T): Expect = _logicAppend { isLessThanOrEqual(expected) } @@ -31,7 +31,7 @@ fun > Expect.isLessThanOrEqual(expected: T): Expect = * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ComparableAssertionSamples.isGreaterThan + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ComparableExpectationsSamples.isGreaterThan */ fun > Expect.isGreaterThan(expected: T): Expect = _logicAppend { isGreaterThan(expected) } @@ -42,7 +42,7 @@ fun > Expect.isGreaterThan(expected: T): Expect = * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ComparableAssertionSamples.isGreaterThanOrEqual + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ComparableExpectationsSamples.isGreaterThanOrEqual */ fun > Expect.isGreaterThanOrEqual(expected: T): Expect = _logicAppend { isGreaterThanOrEqual(expected) } @@ -55,7 +55,7 @@ fun > Expect.isGreaterThanOrEqual(expected: T): Expect = * * @since 0.13.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ComparableAssertionSamples.isEqualComparingTo + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ComparableExpectationsSamples.isEqualComparingTo */ fun > Expect.isEqualComparingTo(expected: T): Expect = _logicAppend { isEqualComparingTo(expected) } diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/floatingPointExpectations.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/floatingPointExpectations.kt index 61aa58a324..d78022e8e2 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/floatingPointExpectations.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/floatingPointExpectations.kt @@ -21,7 +21,7 @@ import kotlin.jvm.JvmName * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.FloatingPointAssertionSamples.toBeWithErrorToleranceFloat + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.FloatingPointExpectationsSamples.toBeWithErrorToleranceFloat */ fun Expect.toBeWithErrorTolerance(expected: Float, tolerance: Float): Expect = _logicAppend { toBeWithErrorTolerance(expected, tolerance) } @@ -38,7 +38,7 @@ fun Expect.toBeWithErrorTolerance(expected: Float, tolerance: Float): Exp * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.FloatingPointAssertionSamples.toBeWithErrorToleranceDouble + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.FloatingPointExpectationsSamples.toBeWithErrorToleranceDouble */ fun Expect.toBeWithErrorTolerance(expected: Double, tolerance: Double): Expect = _logicAppend { toBeWithErrorTolerance(expected, tolerance) } diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/iteratorExpectations.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/iteratorExpectations.kt index 013afe3023..5d7578d672 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/iteratorExpectations.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/iteratorExpectations.kt @@ -12,7 +12,7 @@ import ch.tutteli.atrium.logic.hasNotNext * * @since 0.13.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.IteratorAssertionSamples.hasNext + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.IteratorExpectationsSamples.hasNext */ fun > Expect.hasNext(): Expect = _logicAppend { hasNext() } @@ -24,7 +24,7 @@ fun > Expect.hasNext(): Expect = * * @since 0.13.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.IteratorAssertionSamples.hasNoNext + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.IteratorExpectationsSamples.hasNoNext */ fun > Expect.hasNotNext(): Expect = _logicAppend { hasNotNext() } diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/listExpectations.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/listExpectations.kt index e61fa23c35..6585be5bae 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/listExpectations.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/listExpectations.kt @@ -10,7 +10,7 @@ import ch.tutteli.atrium.logic.get * * @return The newly created [Expect] for the element at position [index]. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ListAssertionSamples.getFeature + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ListExpectationsSamples.getFeature */ fun > Expect.get(index: Int): Expect = _logic.get(index).transform() @@ -21,7 +21,7 @@ fun > Expect.get(index: Int): Expect = * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ListAssertionSamples.get + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.ListExpectationsSamples.get */ fun > Expect.get(index: Int, assertionCreator: Expect.() -> Unit): Expect = _logic.get(index).collectAndAppend(assertionCreator) diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/pairExpectations.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/pairExpectations.kt index a60795ea9e..b74073dc06 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/pairExpectations.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/pairExpectations.kt @@ -11,7 +11,7 @@ import ch.tutteli.atrium.logic.second * * @return The newly created [Expect] for the extracted feature. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.PairAssertionSamples.firstFeature + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.PairExpectationsSamples.firstFeature */ val > Expect.first: Expect get() : Expect = _logic.first().transform() @@ -23,7 +23,7 @@ val > Expect.first: Expect * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.PairAssertionSamples.first + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.PairExpectationsSamples.first */ fun > Expect.first(assertionCreator: Expect.() -> Unit): Expect = _logic.first().collectAndAppend(assertionCreator) @@ -34,7 +34,7 @@ fun > Expect.first(assertionCreator: Expect.() -> Uni * * @return The newly created [Expect] for the extracted feature. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.PairAssertionSamples.secondFeature + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.PairExpectationsSamples.secondFeature */ val > Expect.second: Expect get() : Expect = _logic.second().transform() @@ -46,7 +46,7 @@ val > Expect.second: Expect * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.PairAssertionSamples.second + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.PairExpectationsSamples.second */ fun > Expect.second(assertionCreator: Expect.() -> Unit): Expect = _logic.second().collectAndAppend(assertionCreator) diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/AnyExpectationsSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/AnyExpectationsSamples.kt index 5cb4eea7af..b73dec5233 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/AnyExpectationsSamples.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/AnyExpectationsSamples.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 AnyAssertionSamples { +class AnyExpectationsSamples { @Test fun toBe() { diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ArrayExpectationsSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ArrayExpectationsSamples.kt index 5d324242db..c01bceebb9 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ArrayExpectationsSamples.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ArrayExpectationsSamples.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 ArrayAssertionSamples { +class ArrayExpectationsSamples { @Test fun asListFeature() { diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CharSequenceExpectationsSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CharSequenceExpectationsSamples.kt index 2dce5db0da..3ce77770d5 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CharSequenceExpectationsSamples.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CharSequenceExpectationsSamples.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 CharSequenceExpectationsSpec { +class CharSequenceExpectationsSamples { @Test fun containsBuilder() { diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CollectionExpectationsSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CollectionExpectationsSamples.kt index d7fea2dc82..51887b4f0d 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CollectionExpectationsSamples.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CollectionExpectationsSamples.kt @@ -13,7 +13,7 @@ import ch.tutteli.atrium.api.fluent.en_GB.size import ch.tutteli.atrium.api.verbs.internal.expect import kotlin.test.Test -class CollectionAssertionSamples { +class CollectionExpectationsSamples { @Test fun isEmpty() { diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ComparableExpectationsSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ComparableExpectationsSamples.kt index b6b4a27ddb..b76be73e85 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ComparableExpectationsSamples.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/ComparableExpectationsSamples.kt @@ -8,7 +8,7 @@ import ch.tutteli.atrium.api.fluent.en_GB.isLessThanOrEqual import ch.tutteli.atrium.api.verbs.internal.expect import kotlin.test.Test -class ComparableAssertionSamples { +class ComparableExpectationsSamples { @Test fun isLessThan() { diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/FloatingPointExpectationsSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/FloatingPointExpectationsSamples.kt index ea58160e35..d5c528b43b 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/FloatingPointExpectationsSamples.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/FloatingPointExpectationsSamples.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.api.fluent.en_GB.toBeWithErrorTolerance import ch.tutteli.atrium.api.verbs.internal.expect import kotlin.test.Test -class FloatingPointAssertionSamples { +class FloatingPointExpectationsSamples { @Test fun toBeWithErrorToleranceFloat() { diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/IteratorExpectationsSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/IteratorExpectationsSamples.kt index f5d03bb181..50ee5bff82 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/IteratorExpectationsSamples.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/IteratorExpectationsSamples.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.api.fluent.en_GB.hasNotNext import ch.tutteli.atrium.api.verbs.internal.expect import kotlin.test.Test -class IteratorAssertionSamples { +class IteratorExpectationsSamples { @Test fun hasNext() { diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/PairExpectationsSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/PairExpectationsSamples.kt index 3213f7e1aa..238cd76e21 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/PairExpectationsSamples.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/PairExpectationsSamples.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 PairAssertionSamples { +class PairExpectationsSamples { @Test fun firstFeature() { diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/bigDecimalExpectations.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/bigDecimalExpectations.kt index 009d382579..471177f791 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/bigDecimalExpectations.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/bigDecimalExpectations.kt @@ -50,7 +50,7 @@ fun Expect.toBe(expected: T): Nothing = throw PleaseUseRepl * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.BigDecimalAssertionSamples.toBe + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.BigDecimalExpectationsSamples.toBe */ @JvmName("toBeNull") fun Expect.toBe(expected: Nothing?): Expect = diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/BigDecimalExpectationsSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/BigDecimalExpectationsSamples.kt index 6e6e61ff05..0f0dd220e2 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/BigDecimalExpectationsSamples.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/BigDecimalExpectationsSamples.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.api.verbs.internal.expect import java.math.BigDecimal import kotlin.test.Test -class BigDecimalAssertionSamples { +class BigDecimalExpectationsSamples { @Test fun toBe() { diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/anyExpectations.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/anyExpectations.kt index c0f62d368a..2a5905bf8f 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/anyExpectations.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/anyExpectations.kt @@ -13,7 +13,7 @@ import ch.tutteli.atrium.reporting.Reporter * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.infix.en_GB.samples.AnyAssertionSamples.toBe + * @sample ch.tutteli.atrium.api.infix.en_GB.samples.AnyExpectationsSamples.toBe */ infix fun Expect.toBe(expected: T): Expect = _logicAppend { toBe(expected) } @@ -47,7 +47,7 @@ infix fun Expect.isNotSameAs(expected: T): Expect = _logicAppend { isN * @return An [Expect] for the current subject of the assertion. * * @since 0.15.0 - * @sample ch.tutteli.atrium.api.infix.en_GB.samples.AnyAssertionSamples.because + * @sample ch.tutteli.atrium.api.infix.en_GB.samples.AnyExpectationsSamples.because */ infix fun Expect.because(keyWithCreator: KeyWithCreator): Expect = _logicAppend { because(keyWithCreator.key, keyWithCreator.assertionCreator) } diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/iteratorExpectations.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/iteratorExpectations.kt index d1d92a48f7..f61123a14d 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/iteratorExpectations.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/iteratorExpectations.kt @@ -13,7 +13,7 @@ import ch.tutteli.atrium.logic.hasNotNext * * @since 0.13.0 * - * @sample ch.tutteli.atrium.api.infix.en_GB.samples.IteratorAssertionSamples.has + * @sample ch.tutteli.atrium.api.infix.en_GB.samples.IteratorExpectationsSamples.has */ infix fun > Expect.has(@Suppress("UNUSED_PARAMETER") next: next): Expect = _logicAppend { hasNext() } @@ -25,7 +25,7 @@ infix fun > Expect.has(@Suppress("UNUSED_PARAMETER") next: * * @since 0.13.0 * - * @sample ch.tutteli.atrium.api.infix.en_GB.samples.IteratorAssertionSamples.hasNot + * @sample ch.tutteli.atrium.api.infix.en_GB.samples.IteratorExpectationsSamples.hasNot */ infix fun > Expect.hasNot(@Suppress("UNUSED_PARAMETER") next: next): Expect = _logicAppend { hasNotNext() } diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/listExpectations.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/listExpectations.kt index e45237cdd3..a9b161c236 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/listExpectations.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/listExpectations.kt @@ -11,7 +11,7 @@ import ch.tutteli.atrium.logic.get * * @return The newly created [Expect] for the element at position [index]. * - * @sample ch.tutteli.atrium.api.infix.en_GB.samples.ListAssertionSamples.getFeature + * @sample ch.tutteli.atrium.api.infix.en_GB.samples.ListExpectationsSamples.getFeature */ infix fun > Expect.get(index: Int): Expect = _logic.get(index).transform() @@ -25,7 +25,7 @@ infix fun > Expect.get(index: Int): Expect = * * @return This assertion container to support a fluent API. * - * @sample ch.tutteli.atrium.api.infix.en_GB.samples.ListAssertionSamples.get + * @sample ch.tutteli.atrium.api.infix.en_GB.samples.ListExpectationsSamples.get */ infix fun > Expect.get(index: IndexWithCreator): Expect = _logic.get(index.index).collectAndAppend(index.assertionCreator) diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/AnyExpectationsSamples.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/AnyExpectationsSamples.kt index a46fae0660..496bc28daf 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/AnyExpectationsSamples.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/AnyExpectationsSamples.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.api.infix.en_GB.* import ch.tutteli.atrium.api.verbs.internal.expect import kotlin.test.Test -class AnyAssertionSamples { +class AnyExpectationsSamples { @Test fun toBe() { diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/IteratorExpectationsSamples.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/IteratorExpectationsSamples.kt index 069e3026a6..473493d8d0 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/IteratorExpectationsSamples.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/IteratorExpectationsSamples.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.api.infix.en_GB.next import ch.tutteli.atrium.api.verbs.internal.expect import kotlin.test.Test -class IteratorAssertionSamples { +class IteratorExpectationsSamples { @Test fun has_next() { diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/ListExpectationsSamples.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/ListExpectationsSamples.kt index 22a77f2172..599a150a55 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/ListExpectationsSamples.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/ListExpectationsSamples.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.api.verbs.internal.expect import ch.tutteli.atrium.translations.DescriptionComparableAssertion import kotlin.test.Test -class ListAssertionSamples { +class ListExpectationsSamples { private val isLessThanDescr = DescriptionComparableAssertion.IS_LESS_THAN.getDefault() private val isGreaterThanDescr = DescriptionComparableAssertion.IS_GREATER_THAN.getDefault() diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/BigDecimalExpectationsSamples.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/BigDecimalExpectationsSamples.kt index 1abd4afbf0..054f09c30e 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/BigDecimalExpectationsSamples.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/BigDecimalExpectationsSamples.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.api.verbs.internal.expect import java.math.BigDecimal import kotlin.test.Test -class BigDecimalAssertionSamples { +class BigDecimalExpectationsSamples { @Test fun toBe() {