Merge pull request #233 from sullis/assertj-3.16.1

assertj 3.16.1
lukas-krecan · Jun 19, 2020 · e49e44c · e49e44c
2 parents fba4c65 + 0468ee9
commit e49e44c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
         <geronimo.jsonp.version>1.3</geronimo.jsonp.version>
         <jsonorg.version>20180130</jsonorg.version>
         <slf4j.version>1.7.30</slf4j.version>
-        <assertj.version>3.15.0</assertj.version>
+        <assertj.version>3.16.1</assertj.version>
         <target.java.version>1.8</target.java.version>
         <junit-jupiter.version>5.6.0</junit-jupiter.version>
         <json-path.version>2.4.0</json-path.version>

diff --git a/tests/test-base/src/main/java/net/javacrumbs/jsonunit/test/base/AbstractAssertJTest.java b/tests/test-base/src/main/java/net/javacrumbs/jsonunit/test/base/AbstractAssertJTest.java
@@ -280,11 +280,11 @@ void shouldAssertContainsEntry() {
     void shouldAssertContainsJsonError() {
         assertThatThrownBy(() -> assertThatJson("{\"a\":{\"b\": 1}}").node("a").isObject().contains(entry("b", valueOf(2))))
             .hasMessage("[Different value found in node \"a\"] \n" +
-                "Expecting:\n" +
+                "Expecting map:\n" +
                 " <{\"b\":1}>\n" +
                 "to contain:\n" +
                 " <[MapEntry[key=\"b\", value=2]]>\n" +
-                "but could not find:\n" +
+                "but could not find the following map entries:\n" +
                 " <[MapEntry[key=\"b\", value=2]]>\n");
     }
 
@@ -314,11 +314,11 @@ void shouldAssertContainsAllEntries() {
     void shouldAssertContainsAllEntriesError() {
         assertThatThrownBy(() -> assertThatJson("{\"a\":{\"b\": 1, \"c\": true}}").node("a").isObject().containsAllEntriesOf(singletonMap("c", false)))
             .hasMessage("[Different value found in node \"a\"] \n" +
-                "Expecting:\n" +
+                "Expecting map:\n" +
                 " <{\"b\":1,\"c\":true}>\n" +
                 "to contain:\n" +
                 " <[c=false]>\n" +
-                "but could not find:\n" +
+                "but could not find the following map entries:\n" +
                 " <[c=false]>\n");
     }
 
@@ -1001,11 +1001,11 @@ void positiveArrayIndexOutOfBounds() {
     void arrayThatContainsShouldFailOnMissingNode() {
         assertThatThrownBy(() -> assertThatJson("{\"test\":[{\"id\":36},{\"id\":37},{\"id\":38}]}").node("test").isArray().contains("{\"id\":42}"))
             .hasMessage("[Different value found in node \"test\"] \n" +
-                "Expecting:\n" +
+                "Expecting JsonList:\n" +
                 " <[{\"id\":36}, {\"id\":37}, {\"id\":38}]>\n" +
                 "to contain:\n" +
                 " <[\"{\"id\":42}\"]>\n" +
-                "but could not find:\n" +
+                "but could not find the following element(s):\n" +
                 " <[\"{\"id\":42}\"]>\n" +
                 "when comparing values using JsonComparator");
     }
@@ -1383,14 +1383,14 @@ protected void jsonPathShouldBeAbleToUseArrays() {
                     "            }"
             )))
             .hasMessage("[Different value found in node \"$.store.book\"] \n" +
-                "Expecting:\n" +
+                "Expecting JsonList:\n" +
                 " <[{\"author\":\"Nigel Rees\",\"category\":\"reference\",\"price\":8.95,\"title\":\"Sayings of the Century\"},\n" +
                 "    {\"author\":\"Evelyn Waugh\",\"category\":\"fiction\",\"price\":12.99,\"title\":\"Sword of Honour\"},\n" +
                 "    {\"author\":\"Herman Melville\",\"category\":\"fiction\",\"isbn\":\"0-553-21311-3\",\"price\":8.99,\"title\":\"Moby Dick\"},\n" +
                 "    {\"author\":\"J. R. R. Tolkien\",\"category\":\"fiction\",\"isbn\":\"0-395-19395-8\",\"price\":22.99,\"title\":\"The Lord of the Rings\"}]>\n" +
                 "to contain:\n" +
                 " <[{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings of the Century\",\"price\":8.96}]>\n" +
-                "but could not find:\n" +
+                "but could not find the following element(s):\n" +
                 " <[{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings of the Century\",\"price\":8.96}]>\n" +
                 "when comparing values using JsonComparator");
     }