From 00a3c62b0200a355b780a194709001164308c50e Mon Sep 17 00:00:00 2001 From: "Sean C. Sullivan" Date: Sun, 28 Jun 2020 12:28:39 -0700 Subject: [PATCH] upgrade to assertj-core 3.17.2 --- pom.xml | 2 +- .../assertj/vavr/api/AbstractMapAssert.java | 49 +++++++++++++++++- .../vavr/api/AbstractMultimapAssert.java | 50 ++++++++++++++++++- .../MapAssert_containsAllEntriesOf_Test.java | 2 +- .../api/MapAssert_containsEntry_Test.java | 2 +- .../api/MapAssert_containsExactly_Test.java | 14 +++--- .../vavr/api/MapAssert_containsKey_Test.java | 4 +- .../vavr/api/MapAssert_containsKeys_Test.java | 2 +- .../api/MapAssert_containsOnlyKeys_Test.java | 16 +++--- .../vavr/api/MapAssert_containsOnly_Test.java | 24 ++++----- .../api/MapAssert_containsValue_Test.java | 2 +- .../api/MapAssert_containsValues_Test.java | 2 +- ...MapAssert_contains_anyOf_entries_Test.java | 2 +- .../api/MapAssert_contains_entries_Test.java | 2 +- .../MapAssert_doesNotContainEntry_Test.java | 2 +- .../api/MapAssert_doesNotContainKey_Test.java | 4 +- .../MapAssert_doesNotContainKeys_Test.java | 2 +- .../MapAssert_doesNotContainValue_Test.java | 2 +- .../MapAssert_doesNotContainValues_Test.java | 2 +- ...MapAssert_doesNotContain_entries_Test.java | 2 +- .../MapAssert_hasEntrySatisfying_Test.java | 6 +-- .../MapAssert_hasSameSizeAs_Array_Test.java | 2 +- ...MapAssert_hasSameSizeAs_Iterable_Test.java | 2 +- ...timapAssert_containsAllEntriesOf_Test.java | 2 +- .../MultimapAssert_containsEntry_Test.java | 2 +- .../MultimapAssert_containsExactly_Test.java | 14 +++--- .../api/MultimapAssert_containsKey_Test.java | 4 +- .../api/MultimapAssert_containsKeys_Test.java | 2 +- .../MultimapAssert_containsOnlyKeys_Test.java | 16 +++--- .../api/MultimapAssert_containsOnly_Test.java | 24 ++++----- .../MultimapAssert_containsValue_Test.java | 2 +- .../MultimapAssert_containsValues_Test.java | 2 +- ...mapAssert_contains_anyOf_entries_Test.java | 2 +- .../MultimapAssert_contains_entries_Test.java | 2 +- ...ltimapAssert_doesNotContainEntry_Test.java | 2 +- ...MultimapAssert_doesNotContainKey_Test.java | 4 +- ...ultimapAssert_doesNotContainKeys_Test.java | 2 +- ...ltimapAssert_doesNotContainValue_Test.java | 2 +- ...timapAssert_doesNotContainValues_Test.java | 2 +- ...mapAssert_doesNotContain_entries_Test.java | 2 +- ...ultimapAssert_hasEntrySatisfying_Test.java | 6 +-- ...ltimapAssert_hasSameSizeAs_Array_Test.java | 2 +- ...mapAssert_hasSameSizeAs_Iterable_Test.java | 2 +- .../vavr/api/SetAssert_allSatisfy_Test.java | 4 +- .../vavr/api/TryAssert_containsSame_Test.java | 6 +-- .../vavr/api/TryAssert_contains_Test.java | 2 +- ...usingFieldByFieldValueComparator_Test.java | 2 +- 47 files changed, 202 insertions(+), 105 deletions(-) diff --git a/pom.xml b/pom.xml index c362c32..3d915ae 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ org.assertj assertj-core - 3.11.1 + 3.17.2 io.vavr diff --git a/src/main/java/org/assertj/vavr/api/AbstractMapAssert.java b/src/main/java/org/assertj/vavr/api/AbstractMapAssert.java index c045618..ac345bf 100644 --- a/src/main/java/org/assertj/vavr/api/AbstractMapAssert.java +++ b/src/main/java/org/assertj/vavr/api/AbstractMapAssert.java @@ -31,6 +31,11 @@ import static org.assertj.core.error.ShouldBeNullOrEmpty.shouldBeNullOrEmpty; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; import static org.assertj.core.error.ShouldHaveSize.shouldHaveSize; +import static org.assertj.core.error.ShouldHaveSizeBetween.shouldHaveSizeBetween; +import static org.assertj.core.error.ShouldHaveSizeGreaterThan.shouldHaveSizeGreaterThan; +import static org.assertj.core.error.ShouldHaveSizeGreaterThanOrEqualTo.shouldHaveSizeGreaterThanOrEqualTo; +import static org.assertj.core.error.ShouldHaveSizeLessThan.shouldHaveSizeLessThan; +import static org.assertj.core.error.ShouldHaveSizeLessThanOrEqualTo.shouldHaveSizeLessThanOrEqualTo; import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.IterableUtil.sizeOf; @@ -357,13 +362,54 @@ public SELF hasSize(int expectedSize) { return myself; } + @Override + public SELF hasSizeGreaterThan(int boundary) { + isNotNull(); + if (actual.size() <= boundary) + throwAssertionError(shouldHaveSizeGreaterThan(actual, actual.size(), boundary)); + return myself; + } + + @Override + public SELF hasSizeGreaterThanOrEqualTo(int boundary) { + isNotNull(); + if (actual.size() < boundary) + throwAssertionError(shouldHaveSizeGreaterThanOrEqualTo(actual, actual.size(), boundary)); + return myself; + } + + @Override + public SELF hasSizeLessThan(int boundary) { + isNotNull(); + if (actual.size() >= boundary) + throwAssertionError(shouldHaveSizeLessThan(actual, actual.size(), boundary)); + return myself; + } + + @Override + public SELF hasSizeLessThanOrEqualTo(int boundary) { + isNotNull(); + if (actual.size() > boundary) + throwAssertionError(shouldHaveSizeLessThanOrEqualTo(actual, actual.size(), boundary)); + return myself; + } + + @Override + public SELF hasSizeBetween(int lowerBoundary, int higherBoundary) { + isNotNull(); + if ((actual.size() > higherBoundary) || (actual.size() < lowerBoundary)) { + throwAssertionError(shouldHaveSizeBetween(actual, actual.size(), lowerBoundary, higherBoundary)); + } + return myself; + } + @Override public SELF hasSameSizeAs(Iterable other) { isNotNull(); checkNotNull(other, "The other Iterable to compare actual size with should not be null"); final long expectedSize = sizeOf(other); if (actual.size() != expectedSize) - throwAssertionError(shouldHaveSameSizeAs(actual, actual.size(), expectedSize)); + throwAssertionError(shouldHaveSameSizeAs(actual, other, actual.size(), expectedSize)); return myself; } @@ -384,4 +430,5 @@ public SELF usingDefaultElementComparator() { elementComparisonStrategy = StandardComparisonStrategy.instance(); return myself; } + } diff --git a/src/main/java/org/assertj/vavr/api/AbstractMultimapAssert.java b/src/main/java/org/assertj/vavr/api/AbstractMultimapAssert.java index e5fbd69..8202f36 100644 --- a/src/main/java/org/assertj/vavr/api/AbstractMultimapAssert.java +++ b/src/main/java/org/assertj/vavr/api/AbstractMultimapAssert.java @@ -18,12 +18,17 @@ import static org.assertj.core.error.ShouldBeNullOrEmpty.shouldBeNullOrEmpty; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; import static org.assertj.core.error.ShouldHaveSize.shouldHaveSize; +import static org.assertj.core.error.ShouldHaveSizeBetween.shouldHaveSizeBetween; +import static org.assertj.core.error.ShouldHaveSizeGreaterThan.shouldHaveSizeGreaterThan; +import static org.assertj.core.error.ShouldHaveSizeGreaterThanOrEqualTo.shouldHaveSizeGreaterThanOrEqualTo; +import static org.assertj.core.error.ShouldHaveSizeLessThan.shouldHaveSizeLessThan; +import static org.assertj.core.error.ShouldHaveSizeLessThanOrEqualTo.shouldHaveSizeLessThanOrEqualTo; import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.IterableUtil.sizeOf; import static org.assertj.core.util.Preconditions.checkNotNull; -class AbstractMultimapAssert, ACTUAL extends Multimap, KEY, VALUE> +abstract class AbstractMultimapAssert, ACTUAL extends Multimap, KEY, VALUE> extends AbstractValueAssert implements EnumerableAssert> { private final Multimaps multimaps = Multimaps.instance(); @@ -338,13 +343,54 @@ public SELF hasSize(int expectedSize) { return myself; } + @Override + public SELF hasSizeGreaterThan(int boundary) { + isNotNull(); + if (actual.size() <= boundary) + throwAssertionError(shouldHaveSizeGreaterThan(actual, actual.size(), boundary)); + return myself; + } + + @Override + public SELF hasSizeGreaterThanOrEqualTo(int boundary) { + isNotNull(); + if (actual.size() < boundary) + throwAssertionError(shouldHaveSizeGreaterThanOrEqualTo(actual, actual.size(), boundary)); + return myself; + } + + @Override + public SELF hasSizeLessThan(int boundary) { + isNotNull(); + if (actual.size() >= boundary) + throwAssertionError(shouldHaveSizeLessThan(actual, actual.size(), boundary)); + return myself; + } + + @Override + public SELF hasSizeLessThanOrEqualTo(int boundary) { + isNotNull(); + if (actual.size() > boundary) + throwAssertionError(shouldHaveSizeLessThanOrEqualTo(actual, actual.size(), boundary)); + return myself; + } + + @Override + public SELF hasSizeBetween(int lowerBoundary, int higherBoundary) { + isNotNull(); + if ((actual.size() > higherBoundary) || (actual.size() < lowerBoundary)) { + throwAssertionError(shouldHaveSizeBetween(actual, actual.size(), lowerBoundary, higherBoundary)); + } + return myself; + } + @Override public SELF hasSameSizeAs(Iterable other) { isNotNull(); checkNotNull(other, "The other Iterable to compare actual size with should not be null"); final long expectedSize = sizeOf(other); if (actual.size() != expectedSize) - throwAssertionError(shouldHaveSameSizeAs(actual, actual.size(), expectedSize)); + throwAssertionError(shouldHaveSameSizeAs(actual, other, actual.size(), expectedSize)); return myself; } diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_containsAllEntriesOf_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_containsAllEntriesOf_Test.java index c7a65f9..ee042a8 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_containsAllEntriesOf_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_containsAllEntriesOf_Test.java @@ -89,6 +89,6 @@ void should_fail_if_Map_does_not_contain_all_entries() { () -> assertThat(actual).containsAllEntriesOf(List.of(ENTRY1, ENTRY2)) ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting:\n \nto contain:\n <[(key1, value1), (key2, value2)]>\nbut could not find:\n \n"); + .hasMessage("\nExpecting HashMap:\n <[(key1, value1), (key3, value3)]>\nto contain:\n <[(key1, value1), (key2, value2)]>\nbut could not find the following element(s):\n <[(key2, value2)]>\n"); } } diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_containsEntry_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_containsEntry_Test.java index bdef39c..b974685 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_containsEntry_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_containsEntry_Test.java @@ -50,6 +50,6 @@ void should_fail_if_Map_does_not_contain_the_given_entry() { () -> assertThat(actual).containsEntry("key2", "value2") ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting:\n \nto contain:\n <[(key2, value2)]>\nbut could not find:\n \n"); + .hasMessage("\nExpecting HashMap:\n <[(key1, value1), (key3, value3)]>\nto contain:\n <[(key2, value2)]>\nbut could not find the following element(s):\n <[(key2, value2)]>\n"); } } diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_containsExactly_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_containsExactly_Test.java index f87f718..cb959f3 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_containsExactly_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_containsExactly_Test.java @@ -75,10 +75,12 @@ void should_fail_if_Map_and_entries_have_different_sizes() { .hasMessage( "\nActual and expected should have same size but actual size is:\n" + " <0>\n" + - "while expected is:\n" + + "while expected size is:\n" + " <1>\n" + "Actual was:\n" + - "" + " []\n" + + "Expected was:\n" + + " [(key1, value1)]" ); } @@ -112,13 +114,13 @@ void should_fail_if_Map_does_not_contain_all_entries() { .isInstanceOf(AssertionError.class) .hasMessage( "\nExpecting:\n" + - " \n" + + " <[(key1, value1), (key3, value3)]>\n" + "to contain exactly (and in same order):\n" + - " \n" + + " <[(key1, value1), (key2, value2)]>\n" + "but some elements were not found:\n" + - " \n" + + " <[(key2, value2)]>\n" + "and others were not expected:\n" + - " \n" + " <[(key3, value3)]>\n" ); } diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_containsKey_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_containsKey_Test.java index dbda208..913a7e8 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_containsKey_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_containsKey_Test.java @@ -50,7 +50,7 @@ void should_fail_if_Map_does_not_contain_given_key() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain key:\n" + " <\"key-3\">" ); @@ -67,7 +67,7 @@ void should_fail_if_Map_does_not_contain_key_as_null() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain key:\n" + " " ); diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_containsKeys_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_containsKeys_Test.java index 66205e6..39f06de 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_containsKeys_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_containsKeys_Test.java @@ -72,7 +72,7 @@ void should_fail_if_Map_contains_different_keys() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain key:\n" + " <\"key-3\">" ); diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_containsOnlyKeys_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_containsOnlyKeys_Test.java index cdf0518..860c17f 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_containsOnlyKeys_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_containsOnlyKeys_Test.java @@ -73,13 +73,13 @@ void should_fail_if_Map_contains_more_than_given_keys() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain only following keys:\n" + - " \n" + + " <[\"key-1\"]>\n" + "keys not found:\n" + - " \n" + + " <[]>\n" + "and keys not expected:\n" + - " \n" + " <[\"key-2\"]>\n" ); } @@ -94,13 +94,13 @@ void should_fail_if_Map_has_same_size_but_contains_different_keys() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain only following keys:\n" + - " \n" + + " <[\"key-1\", \"key-3\"]>\n" + "keys not found:\n" + - " \n" + + " <[\"key-3\"]>\n" + "and keys not expected:\n" + - " \n" + " <[\"key-2\"]>\n" ); } } diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_containsOnly_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_containsOnly_Test.java index 050fda7..2ab5613 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_containsOnly_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_containsOnly_Test.java @@ -85,12 +85,12 @@ void should_fail_if_Map_contains_more_than_given_entries() { .isInstanceOf(AssertionError.class) .hasMessage( "\n" + - "Expecting:\n" + - " \n" + + "Expecting HashMap:\n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain only:\n" + - " \n" + - "but the following elements were unexpected:\n" + - " \n" + " <[(key-1, value-1)]>\n" + + "but the following element(s) were unexpected:\n" + + " <[(key-2, value-2)]>\n" ); } @@ -104,14 +104,14 @@ void should_fail_if_Map_has_same_size_but_contains_different_entries() { .isInstanceOf(AssertionError.class) .hasMessage( "\n" + - "Expecting:\n" + - " \n" + + "Expecting HashMap:\n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain only:\n" + - " \n" + - "elements not found:\n" + - " \n" + - "and elements not expected:\n" + - " \n" + " <[(key-1, value-1), (key-3, value-3)]>\n" + + "element(s) not found:\n" + + " <[(key-3, value-3)]>\n" + + "and element(s) not expected:\n" + + " <[(key-2, value-2)]>\n" ); } } diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_containsValue_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_containsValue_Test.java index 4f78b17..2ded0d8 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_containsValue_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_containsValue_Test.java @@ -57,7 +57,7 @@ void should_fail_if_Map_does_not_contain_given_values() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain value:\n" + " <\"value-3\">" ); diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_containsValues_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_containsValues_Test.java index 3b8d2c9..6b0844a 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_containsValues_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_containsValues_Test.java @@ -61,7 +61,7 @@ void should_fail_if_Map_does_not_contain_all_given_values() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain value:\n" + " <\"value-3\">" ); diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_contains_anyOf_entries_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_contains_anyOf_entries_Test.java index 284b730..085db19 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_contains_anyOf_entries_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_contains_anyOf_entries_Test.java @@ -92,6 +92,6 @@ void should_fail_if_Map_does_not_contain_any_of_entries() { () -> assertThat(actual).containsAnyOf(ENTRY2) ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting:\n \nto contain at least one of the following elements:\n <[(key2, value2)]>\nbut none were found "); + .hasMessage("\nExpecting:\n <[(key1, value1), (key3, value3)]>\nto contain at least one of the following elements:\n <[(key2, value2)]>\nbut none were found "); } } diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_contains_entries_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_contains_entries_Test.java index c101451..a4d3b50 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_contains_entries_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_contains_entries_Test.java @@ -90,6 +90,6 @@ void should_fail_if_Map_does_not_contain_all_entries() { () -> assertThat(actual).contains(ENTRY1, ENTRY2) ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting:\n \nto contain:\n <[(key1, value1), (key2, value2)]>\nbut could not find:\n \n"); + .hasMessage("\nExpecting HashMap:\n <[(key1, value1), (key3, value3)]>\nto contain:\n <[(key1, value1), (key2, value2)]>\nbut could not find the following element(s):\n <[(key2, value2)]>\n"); } } diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainEntry_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainEntry_Test.java index d82a8ae..1ed4222 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainEntry_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainEntry_Test.java @@ -56,6 +56,6 @@ void should_fail_if_Map_contains_the_given_entry() { () -> assertThat(actual).doesNotContainEntry("key1", "value1") ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting\n \nnot to contain\n <[(key1, value1)]>\nbut found\n \n"); + .hasMessage("\nExpecting\n <[(key1, value1), (key3, value3)]>\nnot to contain\n <[(key1, value1)]>\nbut found\n <[(key1, value1)]>\n"); } } diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainKey_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainKey_Test.java index c5e50fd..88a29b2 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainKey_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainKey_Test.java @@ -50,7 +50,7 @@ void should_fail_if_Map_contains_given_key() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "not to contain key:\n" + " <\"key-1\">" ); @@ -74,7 +74,7 @@ void should_fail_if_Map_contains_null_as_key() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(null, value-1), (key-2, value-2)]>\n" + "not to contain key:\n" + " " ); diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainKeys_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainKeys_Test.java index c58513c..965b138 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainKeys_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainKeys_Test.java @@ -72,7 +72,7 @@ void should_fail_if_Map_contains_different_keys() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "not to contain key:\n" + " <\"key-1\">" ); diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainValue_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainValue_Test.java index 5cc4d52..5a56e98 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainValue_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainValue_Test.java @@ -57,7 +57,7 @@ void should_fail_if_Map_contains_a_given_value() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "not to contain value:\n" + " <\"value-1\">" ); diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainValues_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainValues_Test.java index e95c0b2..00f530f 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainValues_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContainValues_Test.java @@ -61,7 +61,7 @@ void should_fail_if_Map_contains_some_of_given_values() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "not to contain values:\n" + " <[\"value-1\"]>" ); diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContain_entries_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContain_entries_Test.java index 15a39fc..55c3319 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContain_entries_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_doesNotContain_entries_Test.java @@ -80,6 +80,6 @@ void should_fail_if_Map_contains_all_entries() { () -> assertThat(actual).doesNotContain(ENTRY1, ENTRY2) ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting\n \nnot to contain\n <[(key1, value1), (key2, value2)]>\nbut found\n \n"); + .hasMessage("\nExpecting\n <[(key1, value1), (key2, value2)]>\nnot to contain\n <[(key1, value1), (key2, value2)]>\nbut found\n <[(key1, value1), (key2, value2)]>\n"); } } diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_hasEntrySatisfying_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_hasEntrySatisfying_Test.java index 94717e7..43460ef 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_hasEntrySatisfying_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_hasEntrySatisfying_Test.java @@ -46,7 +46,7 @@ void should_fail_if_Map_is_empty() { ) .isInstanceOf(AssertionError.class) .hasMessage("\nExpecting:\n" + - " \n" + + " <[]>\n" + "to contain key:\n" + " <\"key1\">"); } @@ -71,7 +71,7 @@ void should_fail_when_Map_does_not_contain_given_key() { ) .isInstanceOf(AssertionError.class) .hasMessage("\nExpecting:\n" + - " \n" + + " <[(key1, value1), (key2, value2)]>\n" + "to contain key:\n" + " <\"key3\">"); } @@ -97,6 +97,6 @@ void should_fail_if_Map_does_not_contain_entry_satisfying_condition() { () -> assertThat(actual).hasEntrySatisfying("key1", notPassingCondition) ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting elements:\n\n of \n\n to be "); + .hasMessage("\nExpecting elements:\n<[\"value1\"]>\n of \n<[(key1, value1), (key3, value3)]>\n to be "); } } diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_hasSameSizeAs_Array_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_hasSameSizeAs_Array_Test.java index 7107822..d720f68 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_hasSameSizeAs_Array_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_hasSameSizeAs_Array_Test.java @@ -49,7 +49,7 @@ void should_fail_if_Map_is_not_of_expected_size() { () -> assertThat(actual).hasSameSizeAs(array) ) .isInstanceOf(AssertionError.class) - .hasMessage(shouldHaveSameSizeAs(actual, 0, 1).create()); + .hasMessage(shouldHaveSameSizeAs(actual, array, 0, 1).create()); } @Test diff --git a/src/test/java/org/assertj/vavr/api/MapAssert_hasSameSizeAs_Iterable_Test.java b/src/test/java/org/assertj/vavr/api/MapAssert_hasSameSizeAs_Iterable_Test.java index dad6957..9c80a47 100644 --- a/src/test/java/org/assertj/vavr/api/MapAssert_hasSameSizeAs_Iterable_Test.java +++ b/src/test/java/org/assertj/vavr/api/MapAssert_hasSameSizeAs_Iterable_Test.java @@ -51,7 +51,7 @@ void should_fail_if_Map_is_not_of_expected_size() { () -> assertThat(actual).hasSameSizeAs(iterable) ) .isInstanceOf(AssertionError.class) - .hasMessage(shouldHaveSameSizeAs(actual, 0, 1).create()); + .hasMessage(shouldHaveSameSizeAs(actual, iterable, 0, 1).create()); } @Test diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsAllEntriesOf_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsAllEntriesOf_Test.java index b86bb57..c90c5f0 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsAllEntriesOf_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsAllEntriesOf_Test.java @@ -87,6 +87,6 @@ void should_fail_if_Multimap_does_not_contain_all_entries() { () -> assertThat(actual).containsAllEntriesOf(List.of(ENTRY1, ENTRY2)) ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting:\n \nto contain:\n <[(key1, value1), (key2, value2)]>\nbut could not find:\n \n"); + .hasMessage("\nExpecting HashMultimap:\n <[(key1, value1), (key3, value3)]>\nto contain:\n <[(key1, value1), (key2, value2)]>\nbut could not find the following element(s):\n <[(key2, value2)]>\n"); } } diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsEntry_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsEntry_Test.java index 493e1af..40beba7 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsEntry_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsEntry_Test.java @@ -50,6 +50,6 @@ void should_fail_if_Multimap_does_not_contain_the_given_entry() { () -> assertThat(actual).containsEntry("key2", "value2") ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting:\n \nto contain:\n <[(key2, value2)]>\nbut could not find:\n \n"); + .hasMessage("\nExpecting HashMultimap:\n <[(key1, value1), (key3, value3)]>\nto contain:\n <[(key2, value2)]>\nbut could not find the following element(s):\n <[(key2, value2)]>\n"); } } diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsExactly_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsExactly_Test.java index 4e2d5a6..f62d66d 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsExactly_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsExactly_Test.java @@ -75,10 +75,12 @@ void should_fail_if_Multimap_and_entries_have_different_sizes() { .hasMessage( "\nActual and expected should have same size but actual size is:\n" + " <0>\n" + - "while expected is:\n" + + "while expected size is:\n" + " <1>\n" + "Actual was:\n" + - "" + " []\n" + + "Expected was:\n" + + " [(key1, value1)]" ); } @@ -112,13 +114,13 @@ void should_fail_if_Multimap_does_not_contain_all_entries() { .isInstanceOf(AssertionError.class) .hasMessage( "\nExpecting:\n" + - " \n" + + " <[(key1, value1), (key3, value3)]>\n" + "to contain exactly (and in same order):\n" + - " \n" + + " <[(key1, value1), (key2, value2)]>\n" + "but some elements were not found:\n" + - " \n" + + " <[(key2, value2)]>\n" + "and others were not expected:\n" + - " \n" + " <[(key3, value3)]>\n" ); } diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsKey_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsKey_Test.java index f3a0568..bcdc859 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsKey_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsKey_Test.java @@ -50,7 +50,7 @@ void should_fail_if_Multimap_does_not_contain_given_key() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain key:\n" + " <\"key-3\">" ); @@ -67,7 +67,7 @@ void should_fail_if_Multimap_does_not_contain_key_as_null() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain key:\n" + " " ); diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsKeys_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsKeys_Test.java index 5dd9deb..7873163 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsKeys_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsKeys_Test.java @@ -72,7 +72,7 @@ void should_fail_if_Multimap_contains_different_keys() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain key:\n" + " <\"key-3\">" ); diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsOnlyKeys_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsOnlyKeys_Test.java index 7c95a8d..f262d17 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsOnlyKeys_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsOnlyKeys_Test.java @@ -73,13 +73,13 @@ void should_fail_if_Multimap_contains_more_than_given_keys() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain only following keys:\n" + - " \n" + + " <[\"key-1\"]>\n" + "keys not found:\n" + - " \n" + + " <[]>\n" + "and keys not expected:\n" + - " \n" + " <[\"key-2\"]>\n" ); } @@ -94,13 +94,13 @@ void should_fail_if_Multimap_has_same_size_but_contains_different_keys() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain only following keys:\n" + - " \n" + + " <[\"key-1\", \"key-3\"]>\n" + "keys not found:\n" + - " \n" + + " <[\"key-3\"]>\n" + "and keys not expected:\n" + - " \n" + " <[\"key-2\"]>\n" ); } } diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsOnly_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsOnly_Test.java index e802d58..63694fb 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsOnly_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsOnly_Test.java @@ -84,12 +84,12 @@ void should_fail_if_Multimap_contains_more_than_given_entries() { .isInstanceOf(AssertionError.class) .hasMessage( "\n" + - "Expecting:\n" + - " \n" + + "Expecting HashMultimap:\n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain only:\n" + - " \n" + - "but the following elements were unexpected:\n" + - " \n" + " <[(key-1, value-1)]>\n" + + "but the following element(s) were unexpected:\n" + + " <[(key-2, value-2)]>\n" ); } @@ -103,14 +103,14 @@ void should_fail_if_Multimap_has_same_size_but_contains_different_entries() { .isInstanceOf(AssertionError.class) .hasMessage( "\n" + - "Expecting:\n" + - " \n" + + "Expecting HashMultimap:\n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain only:\n" + - " \n" + - "elements not found:\n" + - " \n" + - "and elements not expected:\n" + - " \n" + " <[(key-1, value-1), (key-3, value-3)]>\n" + + "element(s) not found:\n" + + " <[(key-3, value-3)]>\n" + + "and element(s) not expected:\n" + + " <[(key-2, value-2)]>\n" ); } } diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsValue_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsValue_Test.java index 50aa296..39dec66 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsValue_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsValue_Test.java @@ -57,7 +57,7 @@ void should_fail_if_Multimap_does_not_contain_given_values() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain value:\n" + " <\"value-3\">" ); diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsValues_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsValues_Test.java index af4bff9..e4f3701 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_containsValues_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_containsValues_Test.java @@ -61,7 +61,7 @@ void should_fail_if_Multimap_does_not_contain_all_given_values() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "to contain value:\n" + " <\"value-3\">" ); diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_contains_anyOf_entries_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_contains_anyOf_entries_Test.java index 87247fa..fa218bd 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_contains_anyOf_entries_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_contains_anyOf_entries_Test.java @@ -92,6 +92,6 @@ void should_fail_if_Multimap_does_not_contain_any_of_entries() { () -> assertThat(actual).containsAnyOf(ENTRY2) ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting:\n \nto contain at least one of the following elements:\n <[(key2, value2)]>\nbut none were found "); + .hasMessage("\nExpecting:\n <[(key1, value1), (key3, value3)]>\nto contain at least one of the following elements:\n <[(key2, value2)]>\nbut none were found "); } } diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_contains_entries_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_contains_entries_Test.java index fb3e338..825d818 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_contains_entries_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_contains_entries_Test.java @@ -90,6 +90,6 @@ void should_fail_if_Multimap_does_not_contain_all_entries() { () -> assertThat(actual).contains(ENTRY1, ENTRY2) ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting:\n \nto contain:\n <[(key1, value1), (key2, value2)]>\nbut could not find:\n \n"); + .hasMessage("\nExpecting HashMultimap:\n <[(key1, value1), (key3, value3)]>\nto contain:\n <[(key1, value1), (key2, value2)]>\nbut could not find the following element(s):\n <[(key2, value2)]>\n"); } } diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainEntry_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainEntry_Test.java index 1c64942..4123347 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainEntry_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainEntry_Test.java @@ -56,6 +56,6 @@ void should_fail_if_Multimap_contains_the_given_entry() { () -> assertThat(actual).doesNotContainEntry("key1", "value1") ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting\n \nnot to contain\n <[(key1, value1)]>\nbut found\n \n"); + .hasMessage("\nExpecting\n <[(key1, value1), (key3, value3)]>\nnot to contain\n <[(key1, value1)]>\nbut found\n <[(key1, value1)]>\n"); } } diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainKey_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainKey_Test.java index 16de087..0c42b35 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainKey_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainKey_Test.java @@ -50,7 +50,7 @@ void should_fail_if_Multimap_contains_given_key() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "not to contain key:\n" + " <\"key-1\">" ); @@ -74,7 +74,7 @@ void should_fail_if_Multimap_contains_null_as_key() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(null, value-1), (key-2, value-2)]>\n" + "not to contain key:\n" + " " ); diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainKeys_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainKeys_Test.java index 7702116..faf93ce 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainKeys_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainKeys_Test.java @@ -72,7 +72,7 @@ void should_fail_if_Multimap_contains_different_keys() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "not to contain key:\n" + " <\"key-1\">" ); diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainValue_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainValue_Test.java index 391f0f0..c8856fd 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainValue_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainValue_Test.java @@ -57,7 +57,7 @@ void should_fail_if_Multimap_contains_a_given_value() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "not to contain value:\n" + " <\"value-1\">" ); diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainValues_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainValues_Test.java index 1a179d1..3ab4add 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainValues_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContainValues_Test.java @@ -63,7 +63,7 @@ void should_fail_if_Multimap_contains_some_of_given_values() { .hasMessage( "\n" + "Expecting:\n" + - " \n" + + " <[(key-1, value-1), (key-2, value-2)]>\n" + "not to contain values:\n" + " <[\"value-1\"]>" ); diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContain_entries_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContain_entries_Test.java index 1c4ac3d..2a4e925 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContain_entries_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_doesNotContain_entries_Test.java @@ -81,6 +81,6 @@ void should_fail_if_Multimap_contains_all_entries() { () -> assertThat(actual).doesNotContain(ENTRY1, ENTRY2) ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting\n \nnot to contain\n <[(key1, value1), (key2, value2)]>\nbut found\n \n"); + .hasMessage("\nExpecting\n <[(key1, value1), (key2, value2)]>\nnot to contain\n <[(key1, value1), (key2, value2)]>\nbut found\n <[(key1, value1), (key2, value2)]>\n"); } } diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_hasEntrySatisfying_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_hasEntrySatisfying_Test.java index c1582d5..71c8829 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_hasEntrySatisfying_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_hasEntrySatisfying_Test.java @@ -46,7 +46,7 @@ void should_fail_if_Multimap_is_empty() { ) .isInstanceOf(AssertionError.class) .hasMessage("\nExpecting:\n" + - " \n" + + " <[]>\n" + "to contain key:\n" + " <\"key1\">"); } @@ -71,7 +71,7 @@ void should_fail_when_Multimap_does_not_contain_given_key() { ) .isInstanceOf(AssertionError.class) .hasMessage("\nExpecting:\n" + - " \n" + + " <[(key1, value1), (key2, value2)]>\n" + "to contain key:\n" + " <\"key3\">"); } @@ -97,6 +97,6 @@ void should_fail_if_Multimap_does_not_contain_entry_satisfying_condition() { () -> assertThat(actual).hasEntrySatisfying("key1", notPassingCondition) ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting elements:\n\n of \n\n to be "); + .hasMessage("\nExpecting elements:\n<[[\"value1\"]]>\n of \n<[(key1, value1), (key3, value3)]>\n to be "); } } diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_hasSameSizeAs_Array_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_hasSameSizeAs_Array_Test.java index 330b3ea..457b508 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_hasSameSizeAs_Array_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_hasSameSizeAs_Array_Test.java @@ -49,7 +49,7 @@ void should_fail_if_Multimap_is_not_of_expected_size() { () -> assertThat(actual).hasSameSizeAs(array) ) .isInstanceOf(AssertionError.class) - .hasMessage(shouldHaveSameSizeAs(actual, 0, 1).create()); + .hasMessage(shouldHaveSameSizeAs(actual, array, 0, 1).create()); } @Test diff --git a/src/test/java/org/assertj/vavr/api/MultimapAssert_hasSameSizeAs_Iterable_Test.java b/src/test/java/org/assertj/vavr/api/MultimapAssert_hasSameSizeAs_Iterable_Test.java index df93787..e5e7909 100644 --- a/src/test/java/org/assertj/vavr/api/MultimapAssert_hasSameSizeAs_Iterable_Test.java +++ b/src/test/java/org/assertj/vavr/api/MultimapAssert_hasSameSizeAs_Iterable_Test.java @@ -51,7 +51,7 @@ void should_fail_if_Multimap_is_not_of_expected_size() { () -> assertThat(actual).hasSameSizeAs(iterable) ) .isInstanceOf(AssertionError.class) - .hasMessage(shouldHaveSameSizeAs(actual, 0, 1).create()); + .hasMessage(shouldHaveSameSizeAs(actual, iterable, 0, 1).create()); } @Test diff --git a/src/test/java/org/assertj/vavr/api/SetAssert_allSatisfy_Test.java b/src/test/java/org/assertj/vavr/api/SetAssert_allSatisfy_Test.java index 081d7da..7ae95d3 100644 --- a/src/test/java/org/assertj/vavr/api/SetAssert_allSatisfy_Test.java +++ b/src/test/java/org/assertj/vavr/api/SetAssert_allSatisfy_Test.java @@ -59,10 +59,10 @@ void should_fail_if_all_Set_elements_do_not_satisfy_consumer() { .isInstanceOf(AssertionError.class) .hasMessage("\n" + "Expecting all elements of:\n" + - " \n" + + " <[\"value1\", \"value2\"]>\n" + "to satisfy given requirements, but these elements did not:\n" + "\n" + - " \n" + + " <\"value2\"> error: \n" + "Expecting:\n" + " <\"value2\">\n" + "to be equal to:\n" + diff --git a/src/test/java/org/assertj/vavr/api/TryAssert_containsSame_Test.java b/src/test/java/org/assertj/vavr/api/TryAssert_containsSame_Test.java index 74a03c0..9de4af6 100644 --- a/src/test/java/org/assertj/vavr/api/TryAssert_containsSame_Test.java +++ b/src/test/java/org/assertj/vavr/api/TryAssert_containsSame_Test.java @@ -24,7 +24,7 @@ void should_fail_when_expected_value_is_null() { () -> assertThat(Try.success("some value")).containsSame(null) ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting:\n \nto contain the instance (i.e. compared with ==):\n \nbut did not."); + .hasMessage("\nExpecting:\n <[\"some value\"]>\nto contain the instance (i.e. compared with ==):\n \nbut did not."); } @Test @@ -40,7 +40,7 @@ void should_fail_when_success_try_contains_not_the_same_value() { () -> assertThat(Try.success(actual)).containsSame(expected) ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting:\n \nto contain the instance (i.e. compared with ==):\n <\"OK\">\nbut did not."); + .hasMessage("\nExpecting:\n <[\"OK\"]>\nto contain the instance (i.e. compared with ==):\n <\"OK\">\nbut did not."); } @Test @@ -51,7 +51,7 @@ void should_fail_when_success_try_contains_different_value() { () -> assertThat(Try.success(actual)).containsSame(expected) ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting:\n \nto contain the instance (i.e. compared with ==):\n <\"different\">\nbut did not."); + .hasMessage("\nExpecting:\n <[\"OK\"]>\nto contain the instance (i.e. compared with ==):\n <\"different\">\nbut did not."); } @Test diff --git a/src/test/java/org/assertj/vavr/api/TryAssert_contains_Test.java b/src/test/java/org/assertj/vavr/api/TryAssert_contains_Test.java index 1d1afc1..9a01e8d 100644 --- a/src/test/java/org/assertj/vavr/api/TryAssert_contains_Test.java +++ b/src/test/java/org/assertj/vavr/api/TryAssert_contains_Test.java @@ -39,7 +39,7 @@ void should_fail_when_success_try_contains_different_value() { () -> assertThat(Try.success(actual)).contains(expected) ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting:\n \nto contain:\n <\"different\">\nbut did not."); + .hasMessage("\nExpecting:\n <[\"OK\"]>\nto contain:\n <\"different\">\nbut did not."); } @Test diff --git a/src/test/java/org/assertj/vavr/api/TryAssert_contains_usingFieldByFieldValueComparator_Test.java b/src/test/java/org/assertj/vavr/api/TryAssert_contains_usingFieldByFieldValueComparator_Test.java index 68ae5c8..39b5f04 100644 --- a/src/test/java/org/assertj/vavr/api/TryAssert_contains_usingFieldByFieldValueComparator_Test.java +++ b/src/test/java/org/assertj/vavr/api/TryAssert_contains_usingFieldByFieldValueComparator_Test.java @@ -42,7 +42,7 @@ void should_fail_if_expected_value_is_null() { .contains(null) ) .isInstanceOf(AssertionError.class) - .hasMessage("\nExpecting:\n \nto contain:\n \nbut did not."); + .hasMessage("\nExpecting:\n <[Foo{value='something'}]>\nto contain:\n \nbut did not."); } @Test