duplicate AssertJ's describedAt, work around backwards incompatible c…

…hange see #181
xmlunit · May 4, 2020 · 67ca135 · 67ca135
1 parent ba9d639
commit 67ca135
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,7 @@ script:
   - (cd compat-tests && ./hamcrest-test.sh ${VERSION} 2.2)
   - test "openjdk7" == "${TRAVIS_JDK_VERSION}" || (cd compat-tests && ./assertj-test.sh ${VERSION} 3.9.1)
   - test "openjdk7" == "${TRAVIS_JDK_VERSION}" || (cd compat-tests && ./assertj-test.sh ${VERSION} 3.13.2)
-#  - test "openjdk7" == "${TRAVIS_JDK_VERSION}" || (cd compat-tests && ./assertj-test.sh ${VERSION} 3.15.0)
+  - test "openjdk7" == "${TRAVIS_JDK_VERSION}" || (cd compat-tests && ./assertj-test.sh ${VERSION} 3.15.0)
 notifications:
   email:
     - xmlunit-commits@lists.sourceforge.net

diff --git a/xmlunit-assertj/src/main/java/org/xmlunit/assertj/ValueAssert.java b/xmlunit-assertj/src/main/java/org/xmlunit/assertj/ValueAssert.java
@@ -17,6 +17,7 @@
 import org.assertj.core.api.AbstractCharSequenceAssert;
 import org.assertj.core.api.AbstractDoubleAssert;
 import org.assertj.core.api.AbstractIntegerAssert;
+import org.assertj.core.util.CheckReturnValue;
 import org.w3c.dom.Node;
 import org.xmlunit.builder.Input;
 import org.xmlunit.util.Convert;
@@ -197,4 +198,13 @@ public ValueAssert isEqualTo(boolean expected) {
 
         return this;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    @CheckReturnValue
+    // deal with binary incompatible change in AssertJ 3.15.0, see https://github.com/xmlunit/xmlunit/issues/181
+    public ValueAssert describedAs(final String description, final Object... args) {
+        getWritableAssertionInfo().description(description, args);
+        return myself;
+    }
 }