From 141d508138430054a8be7251c27f84d0c5355418 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Mon, 18 Sep 2017 20:23:01 +0100 Subject: [PATCH 1/3] {Address,Customer,TypeAliasTest}: use explicit scoping --- src/test/java/net/kemitix/mon/Address.java | 2 +- src/test/java/net/kemitix/mon/Customer.java | 2 +- src/test/java/net/kemitix/mon/TypeAliasTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/net/kemitix/mon/Address.java b/src/test/java/net/kemitix/mon/Address.java index 8bfbd37..5e8b0cb 100644 --- a/src/test/java/net/kemitix/mon/Address.java +++ b/src/test/java/net/kemitix/mon/Address.java @@ -33,7 +33,7 @@ class Address { private final String street; - String getStreet() { + protected String getStreet() { return street; } } diff --git a/src/test/java/net/kemitix/mon/Customer.java b/src/test/java/net/kemitix/mon/Customer.java index 594abd7..f96f133 100644 --- a/src/test/java/net/kemitix/mon/Customer.java +++ b/src/test/java/net/kemitix/mon/Customer.java @@ -33,7 +33,7 @@ class Customer { private final Address address; - Address getAddress() { + protected Address getAddress() { return address; } diff --git a/src/test/java/net/kemitix/mon/TypeAliasTest.java b/src/test/java/net/kemitix/mon/TypeAliasTest.java index 91687c3..1d07c80 100644 --- a/src/test/java/net/kemitix/mon/TypeAliasTest.java +++ b/src/test/java/net/kemitix/mon/TypeAliasTest.java @@ -74,7 +74,7 @@ public class TypeAliasTest { super(value); } - static AnAlias of(final String value) { + protected static AnAlias of(final String value) { return new AnAlias(value); } } From b3c652006715f23ea5d1e5489c34fd82f4407444 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Mon, 18 Sep 2017 20:40:53 +0100 Subject: [PATCH 2/3] {Identity,Mon}Test: JUnit tests should include asserts --- src/test/java/net/kemitix/mon/IdentityTest.java | 8 ++++++-- src/test/java/net/kemitix/mon/MonTest.java | 14 +++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/test/java/net/kemitix/mon/IdentityTest.java b/src/test/java/net/kemitix/mon/IdentityTest.java index c93a2e9..5a1b3f3 100644 --- a/src/test/java/net/kemitix/mon/IdentityTest.java +++ b/src/test/java/net/kemitix/mon/IdentityTest.java @@ -17,7 +17,7 @@ public class IdentityTest implements WithAssertions { //when final Identity idInt = idString.map(String::length); //then - idInt.map(id -> assertThat(id).isEqualTo(3)); + assertIdentityContains(idInt, 3); } @Test @@ -31,7 +31,11 @@ public class IdentityTest implements WithAssertions { .map(String::toLowerCase) .map(String::getBytes); //then - idBytes.map(bytes -> assertThat(bytes).isEqualTo("par".getBytes())); + assertIdentityContains(idBytes, "par".getBytes()); + } + + private void assertIdentityContains(final Identity identity, final T expected) { + identity.map(id -> assertThat(id).isEqualTo(expected)); } } diff --git a/src/test/java/net/kemitix/mon/MonTest.java b/src/test/java/net/kemitix/mon/MonTest.java index 91b51f0..96272c3 100644 --- a/src/test/java/net/kemitix/mon/MonTest.java +++ b/src/test/java/net/kemitix/mon/MonTest.java @@ -15,7 +15,7 @@ public class MonTest { //when final Mon wrap = Mon.of("test"); //then - wrap.map(value -> assertThat(value).isEqualTo("test")); + assertMonContains(wrap, "test"); } @Test @@ -25,7 +25,7 @@ public class MonTest { //when final Mon updated = wrap.map(a -> a + " more"); //then - updated.map(value -> assertThat(value).isEqualTo("test more")); + assertMonContains(updated, "test more"); } @Test @@ -35,7 +35,7 @@ public class MonTest { //when final Mon result = wrap.map(String::length); //then - result.map(value -> assertThat(value).isEqualTo(4)); + assertMonContains(result, 4); } @Test @@ -52,7 +52,7 @@ public class MonTest { final Optional> longAndInvalid = factory.apply("value is too long"); //then assertThat(shortAndValid).isNotEmpty(); - shortAndValid.ifPresent(valid -> valid.map(value -> assertThat(value).contains("value okay"))); + shortAndValid.ifPresent(valid -> assertMonContains(valid, "value okay")); assertThat(longAndInvalid).isEmpty(); } @@ -76,7 +76,7 @@ public class MonTest { final Mon> nonFlatMapped = wrap.map(Mon::of); final Mon result = wrap.flatMap(Mon::of); //then - result.map(value -> assertThat(value).isEqualTo("test")); + assertMonContains(result, "test"); nonFlatMapped.map(inner -> assertThat(result).isEqualTo(inner)); } @@ -144,4 +144,8 @@ public class MonTest { assertThat(one).isNotEqualTo(notAMon); assertThat(one).isNotEqualTo(null); } + + private void assertMonContains(final Mon wrap, final T expected) { + wrap.map(value -> assertThat(value).isEqualTo(expected)); + } } From c93ec60a31598a435760dc461fe5b1564c3b0739 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Mon, 18 Sep 2017 22:46:12 +0100 Subject: [PATCH 3/3] TypeAliasTest: Avoid calling toString() on String objects --- src/test/java/net/kemitix/mon/TypeAliasTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/net/kemitix/mon/TypeAliasTest.java b/src/test/java/net/kemitix/mon/TypeAliasTest.java index 1d07c80..069c6ab 100644 --- a/src/test/java/net/kemitix/mon/TypeAliasTest.java +++ b/src/test/java/net/kemitix/mon/TypeAliasTest.java @@ -60,7 +60,7 @@ public class TypeAliasTest { //given final String value = "value"; final AnAlias anAlias = AnAlias.of(value); - assertThat(anAlias.toString()).isEqualTo(value.toString()); + assertThat(anAlias.toString()).isEqualTo(value); } private static class AnAlias extends TypeAlias {