jlengrand/atrium
1
0
Fork 0
mirror of https://github.com/jlengrand/atrium.git synced 2026-03-10 08:01:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

move assertions from Map to MapLikeAssertions (remove Map..)

Browse Source 
moreover:
- introduce Map.size based on CollectionLike
- deprecated DescriptionMapAssertion and duplicate in
  DescriptionMapLikeAssertion
This commit is contained in:
Robert Stoll
2020-12-22 21:41:51 +01:00
parent d1fa72c59f
commit 5309870b70
29 changed files with 312 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapAssertionsSpec.kt
View File

@@ -5,11 +5,9 @@ import ch.tutteli.atrium.api.verbs.internal.expect
import ch.tutteli.atrium.creating.Expect
import ch.tutteli.atrium.specs.*
import ch.tutteli.atrium.translations.DescriptionCollectionAssertion
import ch.tutteli.atrium.translations.DescriptionComparableAssertion
import ch.tutteli.atrium.translations.DescriptionMapAssertion
import ch.tutteli.atrium.translations.DescriptionMapLikeAssertion
import org.spekframework.spek2.Spek
import org.spekframework.spek2.style.specification.Suite
import kotlin.reflect.KFunction3
abstract class MapAssertionsSpec(
containsKey: Fun1<Map<out String, *>, String>,
@@ -78,9 +76,9 @@ abstract class MapAssertionsSpec(
val nullableFluent = expect(nullableMap)
val empty = DescriptionCollectionAssertion.EMPTY.getDefault()
val containsKeyDescr = DescriptionMapAssertion.CONTAINS_KEY.getDefault()
val containsNotKeyDescr = DescriptionMapAssertion.CONTAINS_NOT_KEY.getDefault()
val keyDoesNotExist = DescriptionMapAssertion.KEY_DOES_NOT_EXIST.getDefault()
val containsKeyDescr = DescriptionMapLikeAssertion.CONTAINS_KEY.getDefault()
val containsNotKeyDescr = DescriptionMapLikeAssertion.CONTAINS_NOT_KEY.getDefault()
val keyDoesNotExist = DescriptionMapLikeAssertion.KEY_DOES_NOT_EXIST.getDefault()
describeFun(containsKey, containsKeyNullable, containsNotKey, containsNotKeyNullable) {
val containsKeyFunctions = uncheckedToNonNullable(containsKey, containsKeyNullable)

1
misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValuePairsAssertionsSpec.kt
View File

@@ -4,7 +4,6 @@ import ch.tutteli.atrium.api.fluent.en_GB.*
import ch.tutteli.atrium.api.verbs.internal.expect
import ch.tutteli.atrium.creating.Expect
import ch.tutteli.atrium.specs.*
import ch.tutteli.atrium.translations.DescriptionMapAssertion
import org.spekframework.spek2.style.specification.Suite
import kotlin.reflect.KFunction3

4
misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapLikeContainsFormatSpecBase.kt
View File

@@ -4,7 +4,7 @@ import ch.tutteli.atrium.api.fluent.en_GB.*
import ch.tutteli.atrium.core.polyfills.format
import ch.tutteli.atrium.creating.Expect
import ch.tutteli.atrium.translations.DescriptionAnyAssertion
import ch.tutteli.atrium.translations.DescriptionMapAssertion
import ch.tutteli.atrium.translations.DescriptionCollectionAssertion
import ch.tutteli.atrium.translations.DescriptionMapLikeAssertion
import org.spekframework.spek2.dsl.Root
@@ -57,7 +57,7 @@ abstract class MapLikeContainsFormatSpecBase(
var indentFeatureArrow = ""
var indentFeatureBulletPoint = ""
val sizeDescr = DescriptionMapAssertion.SIZE.getDefault()
val sizeDescr = DescriptionCollectionAssertion.SIZE.getDefault()
val additionalEntriesDescr = DescriptionMapLikeAssertion.WARNING_ADDITIONAL_ENTRIES.getDefault()
fun Expect<String>.containsSize(actual: Int, expected: Int) =

6
misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapLikeContainsSpecBase.kt
View File

@@ -6,7 +6,7 @@ import ch.tutteli.atrium.specs.Fun2
import ch.tutteli.atrium.specs.fun2
import ch.tutteli.atrium.specs.lineSeperator
import ch.tutteli.atrium.translations.DescriptionComparableAssertion
import ch.tutteli.atrium.translations.DescriptionMapAssertion
import ch.tutteli.atrium.translations.DescriptionMapLikeAssertion
import org.spekframework.spek2.Spek
import org.spekframework.spek2.dsl.Root
import kotlin.reflect.KFunction3
@@ -20,7 +20,7 @@ fun <K, V, T> mfun2(
abstract class MapLikeContainsSpecBase(spec: Root.() -> Unit) : Spek(spec) {
companion object {
val keyDoesNotExist = DescriptionMapAssertion.KEY_DOES_NOT_EXIST.getDefault()
val keyDoesNotExist = DescriptionMapLikeAssertion.KEY_DOES_NOT_EXIST.getDefault()
val lessThanDescr = DescriptionComparableAssertion.IS_LESS_THAN.getDefault()
val separator = lineSeperator
@@ -29,7 +29,7 @@ abstract class MapLikeContainsSpecBase(spec: Root.() -> Unit) : Spek(spec) {
val nullableMap: Map<out String?, Int?> = mapOf("a" to null, null to 1, "b" to 2)
val emptyMap: Map<out String, Int> = mapOf()
fun entry(key: String?) = DescriptionMapAssertion.ENTRY_WITH_KEY.getDefault().format(if(key == null) "null" else "\"$key\"")
fun entry(key: String?) = DescriptionMapLikeAssertion.ENTRY_WITH_KEY.getDefault().format(if(key == null) "null" else "\"$key\"")
fun entry(key: String?, value: Any): String = entry(key) + ": " + value
}
}