Skip to content

Commit

Permalink
Nits
Browse files Browse the repository at this point in the history
  • Loading branch information
pakoito committed Mar 24, 2018
1 parent 64aa8e0 commit 29384ab
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions modules/core/arrow-data/src/test/kotlin/arrow/data/ValidatedTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ class ValidatedTest : UnitSpec() {
val VAL_SGK = Validated.semigroupK<String>(StringMonoidInstance)

testLaws(
EqLaws.laws(EQ) { Valid(it) },
ShowLaws.laws(Validated.show(), EQ) { Valid(it) },
ApplicativeLaws.laws(Validated.applicative(StringMonoidInstance), Eq.any()),
TraverseLaws.laws(Validated.traverse(), Validated.applicative(StringMonoidInstance), ::Valid, Eq.any()),
SemigroupKLaws.laws(
Validated.semigroupK(IntMonoidInstance),
Validated.applicative(IntMonoidInstance),
Eq.any())
EqLaws.laws(EQ) { Valid(it) },
ShowLaws.laws(Validated.show(), EQ) { Valid(it) },
ApplicativeLaws.laws(Validated.applicative(StringMonoidInstance), Eq.any()),
TraverseLaws.laws(Validated.traverse(), Validated.applicative(StringMonoidInstance), ::Valid, Eq.any()),
SemigroupKLaws.laws(
Validated.semigroupK(IntMonoidInstance),
Validated.applicative(IntMonoidInstance),
Eq.any())
)


Expand All @@ -48,8 +48,8 @@ class ValidatedTest : UnitSpec() {
val result: Validated<Throwable, String> = Valid(value)
result.fold(
{ fail("None should not be called") },
{ a -> a + " processed"}
) shouldBe value + " processed"
{ a -> "$a processed" }
) shouldBe "$value processed"
}

"leftMap should modify error" {
Expand Down Expand Up @@ -78,7 +78,7 @@ class ValidatedTest : UnitSpec() {

"valueOr should return value if is Valid or the the result of f in otherwise" {
Valid(13).valueOr { fail("None should not be called") } shouldBe 13
Invalid(13).valueOr { e -> e.toString() + " is the defaultValue" } shouldBe "13 is the defaultValue"
Invalid(13).valueOr { e -> e.toString() + " is the defaultValue" } shouldBe "13 is the defaultValue"
}

"orElse should return Valid(value) if is Valid or the result of default in otherwise" {
Expand Down Expand Up @@ -169,71 +169,71 @@ class ValidatedTest : UnitSpec() {
Invalid(10).withEither { it } shouldBe Invalid(10)
}

with (VAL_AP) {
with(VAL_AP) {

"Cartesian builder should build products over homogeneous Validated" {
VAL_AP.map(
map(
Valid("11th"),
Valid("Doctor"),
Valid("Who"),
{ (a, b, c) -> "$a $b $c" }) shouldBe Valid("11th Doctor Who")
}

"Cartesian builder should build products over heterogeneous Validated" {
VAL_AP.map(
map(
Valid(13),
Valid("Doctor"),
Valid(false),
{ (a, b, c) -> "${a}th $b is $c" }) shouldBe Valid("13th Doctor is false")
}

"Cartesian builder should build products over Invalid Validated" {
VAL_AP.map(
map(
Invalid("fail1"),
Invalid("fail2"),
Valid("Who"),
{ "success!" }) shouldBe Invalid("fail1fail2")
}
}

with (VAL_SGK) {
with(VAL_SGK) {
"CombineK should combine Valid Validated" {
val valid = Valid("Who")

VAL_SGK.combineK(valid, valid) shouldBe (Valid("Who"))
combineK(valid, valid) shouldBe (Valid("Who"))
}

"CombineK should combine Valid and Invalid Validated" {
val valid = Valid("Who")
val invalid = Invalid("Nope")

VAL_SGK.combineK(valid, invalid) shouldBe (Valid("Who"))
combineK(valid, invalid) shouldBe (Valid("Who"))
}

"CombineK should combine Invalid Validated" {
val invalid = Invalid("Nope")

VAL_SGK.combineK(invalid, invalid) shouldBe (Invalid("NopeNope"))
combineK(invalid, invalid) shouldBe (Invalid("NopeNope"))
}
}

"Combine should combine Valid Validated" {
val valid: Validated<String, String> = Valid("Who")

valid.combine(StringMonoidInstance, StringMonoidInstance, valid) shouldBe(Valid("WhoWho"))
valid.combine(StringMonoidInstance, StringMonoidInstance, valid) shouldBe (Valid("WhoWho"))
}

"Combine should combine Valid and Invalid Validated" {
val valid = Valid("Who")
val invalid = Invalid("Nope")

valid.combine(StringMonoidInstance, StringMonoidInstance, invalid) shouldBe(Invalid("Nope"))
valid.combine(StringMonoidInstance, StringMonoidInstance, invalid) shouldBe (Invalid("Nope"))
}

"Combine should combine Invalid Validated" {
val invalid: Validated<String, String> = Invalid("Nope")

invalid.combine(StringMonoidInstance, StringMonoidInstance, invalid) shouldBe(Invalid("NopeNope"))
invalid.combine(StringMonoidInstance, StringMonoidInstance, invalid) shouldBe (Invalid("NopeNope"))
}
}
}

0 comments on commit 29384ab

Please sign in to comment.