refactor: rename and adapt specs from *Assertions* to *Expectations*

angellee177 · Jan 10, 2021 · 45b69cd · 45b69cd
1 parent 623158a
commit 45b69cd
Show file tree

Hide file tree

Showing 205 changed files with 405 additions and 413 deletions.
diff --git 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<T>` (see yzAssertions.kt as a guideline)
 - [ ] provide a fun which expects an `assertionCreator`-lambda and returns `Expect<AB>` (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<T>` (see yzAssertions.kt as a guideline)
 - [ ] provide a fun which expects an `assertionCreator`-lambda and returns `Expect<AB>` (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/...en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/charSequenceAssertions.kt b/...en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/charSequenceAssertions.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 <T : CharSequence> Expect<T>.contains: CharSequenceContains.EntryPointStep<T, NoOpSearchBehaviour>
     get() = _logic.containsBuilder()
@@ -30,7 +30,7 @@ val <T : CharSequence> Expect<T>.contains: CharSequenceContains.EntryPointStep<T
  *
  * @return The newly created builder.
  *
- * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.containsNotBuilder
+ * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.containsNotBuilder
  */
 val <T : CharSequence> Expect<T>.containsNot: NotCheckerStep<T, NotSearchBehaviour>
     get() = _logic.containsNotBuilder()
@@ -61,7 +61,7 @@ val <T : CharSequence> Expect<T>.containsNot: NotCheckerStep<T, NotSearchBehavio
  * @throws IllegalArgumentException in case [expected] or one of the [otherExpected] is not a
  *   [CharSequence], [Number] or [Char].
  *
- * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.contains
+ * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.contains
  */
 fun <T : CharSequence> Expect<T>.contains(
     expected: CharSequenceOrNumberOrChar,
@@ -80,7 +80,7 @@ fun <T : CharSequence> Expect<T>.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 <T : CharSequence> Expect<T>.containsNot(
     expected: CharSequenceOrNumberOrChar,
@@ -109,7 +109,7 @@ fun <T : CharSequence> Expect<T>.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 <T : CharSequence> Expect<T>.containsRegex(pattern: String, vararg otherPatterns: String): Expect<T> =
     contains.atLeast(1).regex(pattern, *otherPatterns)
@@ -138,7 +138,7 @@ fun <T : CharSequence> Expect<T>.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 <T : CharSequence> Expect<T>.containsRegex(pattern: Regex, vararg otherPatterns: Regex): Expect<T> =
     contains.atLeast(1).regex(pattern, *otherPatterns)
@@ -148,7 +148,7 @@ fun <T : CharSequence> Expect<T>.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 <T : CharSequence> Expect<T>.startsWith(expected: CharSequence): Expect<T> =
     _logicAppend { startsWith(expected) }
@@ -158,7 +158,7 @@ fun <T : CharSequence> Expect<T>.startsWith(expected: CharSequence): Expect<T> =
  *
  * @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 <T : CharSequence> Expect<T>.startsWith(expected: Char): Expect<T> =
  *
  * @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 <T : CharSequence> Expect<T>.startsNotWith(expected: CharSequence): Expect<T> =
     _logicAppend { startsNotWith(expected) }
@@ -182,7 +182,7 @@ fun <T : CharSequence> Expect<T>.startsNotWith(expected: CharSequence): Expect<T
  *
  * @since 0.9.0
  *
- * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.startsNotWithChar
+ * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.startsNotWithChar
  */
 fun <T : CharSequence> Expect<T>.startsNotWith(expected: Char): Expect<T> =
     startsNotWith(expected.toString())
@@ -193,7 +193,7 @@ fun <T : CharSequence> Expect<T>.startsNotWith(expected: Char): Expect<T> =
  *
  * @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 <T : CharSequence> Expect<T>.endsWith(expected: CharSequence): Expect<T> =
     _logicAppend { endsWith(expected) }
@@ -205,7 +205,7 @@ fun <T : CharSequence> Expect<T>.endsWith(expected: CharSequence): Expect<T> =
  *
  * @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 <T : CharSequence> Expect<T>.endsWith(expected: Char): Expect<T> =
     endsWith(expected.toString())
@@ -215,7 +215,7 @@ fun <T : CharSequence> Expect<T>.endsWith(expected: Char): Expect<T> =
  *
  * @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 <T : CharSequence> Expect<T>.endsNotWith(expected: CharSequence): Expect<T> =
     _logicAppend { endsNotWith(expected) }
@@ -226,7 +226,7 @@ fun <T : CharSequence> Expect<T>.endsNotWith(expected: CharSequence): Expect<T>
  * @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 <T : CharSequence> Expect<T>.endsNotWith(expected: Char): Expect<T> =
     endsNotWith(expected.toString())
@@ -237,7 +237,7 @@ fun <T : CharSequence> Expect<T>.endsNotWith(expected: Char): Expect<T> =
  *
  * @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 <T : CharSequence> Expect<T>.isEmpty(): Expect<T> =
     _logicAppend { isEmpty() }
@@ -247,7 +247,7 @@ fun <T : CharSequence> Expect<T>.isEmpty(): Expect<T> =
  *
  * @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 <T : CharSequence> Expect<T>.isNotEmpty(): Expect<T> =
     _logicAppend { isNotEmpty() }
@@ -257,7 +257,7 @@ fun <T : CharSequence> Expect<T>.isNotEmpty(): Expect<T> =
  *
  * @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 <T : CharSequence> Expect<T>.isNotBlank(): Expect<T> =
     _logicAppend { isNotBlank() }
@@ -271,7 +271,7 @@ fun <T : CharSequence> Expect<T>.isNotBlank(): Expect<T> =
  *
  * @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 <T : CharSequence> Expect<T>.matches(expected: Regex): Expect<T> =
     _logicAppend { matches(expected) }
@@ -285,7 +285,7 @@ fun <T : CharSequence> Expect<T>.matches(expected: Regex): Expect<T> =
  *
  * @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 <T : CharSequence> Expect<T>.mismatches(expected: Regex): Expect<T> =
     _logicAppend { mismatches(expected) }
diff --git a/...ium/api/fluent/en_GB/AnyAssertionsSpec.kt → ...m/api/fluent/en_GB/AnyExpectationsSpec.kt b/...ium/api/fluent/en_GB/AnyAssertionsSpec.kt → ...m/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<Int, Int>(Expect<Int>::toBe),
     fun1<DataClass, DataClass>(Expect<DataClass>::toBe),
     fun1<Int?, Int?>(Expect<Int?>::toBe).withNullableSuffix(),

diff --git a/...fluent/en_GB/ArrayAsListAssertionsSpec.kt → ...uent/en_GB/ArrayAsListExpectationsSpec.kt b/...fluent/en_GB/ArrayAsListAssertionsSpec.kt → ...uent/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<Array<Int>>::asList,
     Expect<ByteArray>::asList,

diff --git a/...rSequenceContainsAtLeastAssertionsSpec.kt → ...equenceContainsAtLeastExpectationsSpec.kt b/...rSequenceContainsAtLeastAssertionsSpec.kt → ...equenceContainsAtLeastExpectationsSpec.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/...arSequenceContainsAtMostAssertionsSpec.kt → ...SequenceContainsAtMostExpectationsSpec.kt b/...arSequenceContainsAtMostAssertionsSpec.kt → ...SequenceContainsAtMostExpectationsSpec.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/...uenceContainsContainsNotAssertionsSpec.kt → ...nceContainsContainsNotExpectationsSpec.kt b/...uenceContainsContainsNotAssertionsSpec.kt → ...nceContainsContainsNotExpectationsSpec.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/...rSequenceContainsExactlyAssertionsSpec.kt → ...equenceContainsExactlyExpectationsSpec.kt b/...rSequenceContainsExactlyAssertionsSpec.kt → ...equenceContainsExactlyExpectationsSpec.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/.../CharSequenceContainsNotAssertionsSpec.kt → ...harSequenceContainsNotExpectationsSpec.kt b/.../CharSequenceContainsNotAssertionsSpec.kt → ...harSequenceContainsNotExpectationsSpec.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/...uenceContainsNotOrAtMostAssertionsSpec.kt → ...nceContainsNotOrAtMostExpectationsSpec.kt b/...uenceContainsNotOrAtMostAssertionsSpec.kt → ...nceContainsNotOrAtMostExpectationsSpec.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/...harSequenceContainsRegexAssertionsSpec.kt → ...rSequenceContainsRegexExpectationsSpec.kt b/...harSequenceContainsRegexAssertionsSpec.kt → ...rSequenceContainsRegexExpectationsSpec.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/...luent/en_GB/CharSequenceAssertionsSpec.kt → ...ent/en_GB/CharSequenceExpectationsSpec.kt b/...luent/en_GB/CharSequenceAssertionsSpec.kt → ...ent/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<CharSequence>::isEmpty),
     fun0(Expect<CharSequence>::isNotEmpty),
     fun0(Expect<CharSequence>::isNotBlank),

diff --git a/.../fluent/en_GB/CollectionAssertionsSpec.kt → ...luent/en_GB/CollectionExpectationsSpec.kt b/.../fluent/en_GB/CollectionAssertionsSpec.kt → ...luent/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<Collection<Int>>::isEmpty),
     fun0(Expect<Collection<Int>>::isNotEmpty),
     property<Collection<Int>, Int>(Expect<Collection<Int>>::size),

diff --git a/.../fluent/en_GB/ComparableAssertionsSpec.kt → ...luent/en_GB/ComparableExpectationsSpec.kt b/.../fluent/en_GB/ComparableAssertionsSpec.kt → ...luent/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<Int>::isLessThan),
     fun1(Expect<Int>::isLessThanOrEqual),
     fun1(Expect<Int>::isGreaterThan),

diff --git a/...ertionsBoundedReferenceAlternativeSpec.kt → ...tationsBoundedReferenceAlternativeSpec.kt b/...ertionsBoundedReferenceAlternativeSpec.kt → ...tationsBoundedReferenceAlternativeSpec.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/.../FeatureAssertionsBoundedReferenceSpec.kt → ...eatureExpectationsBoundedReferenceSpec.kt b/.../FeatureAssertionsBoundedReferenceSpec.kt → ...eatureExpectationsBoundedReferenceSpec.kt
@@ -6,7 +6,7 @@ import ch.tutteli.atrium.specs.notImplemented
 
 internal typealias F = Expect<TestData>.() -> Unit
 
-class FeatureAssertionsBoundedReferenceSpec : ch.tutteli.atrium.specs.integration.FeatureAssertionsSpec(
+class FeatureExpectationsBoundedReferenceSpec : ch.tutteli.atrium.specs.integration.FeatureExpectationsSpec(
     propertyImmediate,
     propertyLazy,
     f0Immediate,

diff --git a/...GB/FeatureAssertionsClassReferenceSpec.kt → .../FeatureExpectationsClassReferenceSpec.kt b/...GB/FeatureAssertionsClassReferenceSpec.kt → .../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,