(#162) bump dependencies and use junit 5

pom.xml

@@ -30,7 +30,7 @@
   <parent>
     <groupId>com.jcabi</groupId>
     <artifactId>parent</artifactId>
-    <version>0.49.4</version>
+    <version>0.50.5</version>
   </parent>
   <groupId>org.llorllale</groupId>
   <artifactId>cactoos-matchers</artifactId>
@@ -71,28 +71,32 @@
     <dependency>
       <groupId>org.cactoos</groupId>
       <artifactId>cactoos</artifactId>
-      <version>0.44</version>
+      <version>0.45</version>
       <scope>provided</scope>
     </dependency>
+    <!--
+     @todo #1411:30min Migrate existing tests to JUnit 5. It mainly means
+      changing the imports and move from Ignore to Disabled annotation as
+      well as replace rules with corresponding annotations. Once this is done
+      remove the dependency for junit 4 and junit-vintage-engine below.
+    -->
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
+      <version>1.3</version>
     </dependency>
   </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.7.0</version>
-          <configuration>
-            <source>1.8</source>
-            <target>1.8</target>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
   <profiles>
     <profile>
       <id>qulice</id>
@@ -106,6 +110,7 @@
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
+            <version>0.8.5</version>
             <configuration>
               <output>file</output>
             </configuration>
@@ -179,6 +184,9 @@
               <signaturesFiles>
                 <signaturesFile>src/test/resources/forbidden-apis.txt</signaturesFile>
               </signaturesFiles>
+              <excludes>
+                <exclude>org/llorllale/cactoos/matchers/AssertionTest.class</exclude>
+              </excludes>
             </configuration>
             <executions>
               <execution>

src/main/java/org/llorllale/cactoos/matchers/HasEntry.java

@@ -34,15 +34,16 @@
  * Matcher to check that {@link Map} has particular elements.
  *
  * <p>Here is an example how {@link HasEntry} can be used:</p>
- * <pre>
+ * <pre>{@code
  *  new Assertion<>(
  *     "must match",
  *     () -> new MapOf<>(
  *         new MapEntry<>("a", 1),
  *         new MapEntry<>("b", 2)
  *     ),
  *     new HasEntry<>("a", 1)
- * ).affirm();</pre>
+ * ).affirm();
+ * }</pre>
  *
  * @param <K> Type of key.
  * @param <V> Type of value.

src/main/java/org/llorllale/cactoos/matchers/HasProperty.java

@@ -37,12 +37,13 @@
  * Matcher to check that {@link Properties} has particular entry.
  *
  * <p>Here is an example how {@link HasProperty} can be used:</p>
- * <pre>
+ * <pre>{@code
  *  new Assertion<>(
  *     "must have an entry",
  *     new PropertiesOf<>(...),
  *     new HasProperty<>("foo", "bar")
- * );</pre>
+ *  ).affirm();
+ * }</pre>
  *
  * @since 1.0.0
  */

src/main/java/org/llorllale/cactoos/matchers/HasValues.java

@@ -34,11 +34,13 @@
  * Matcher to check that {@link Iterable} has particular elements.
  *
  * <p>Here is an example how {@link HasValues} can be used:</p>
- * <pre>
- *  MatcherAssert.assertThat(
+ * <pre>{@code
+ *  new Assertion<>(
+ *     "must match",
  *     new ListOf<>(1, 2, 3),
  *     new HasValues<>(2)
- * );</pre>
+ *  ).affirm();
+ * }</pre>
  *
  * @param <X> Type of item.
  * @since 1.0.0

src/main/java/org/llorllale/cactoos/matchers/HasValuesMatching.java

@@ -36,11 +36,13 @@
  *  function.
  *
  * <p>Here is an example how {@link HasValuesMatching} can be used:</p>
- * <pre>
- *  MatcherAssert.assertThat(
+ * <pre>{@code
+ *  new Assertion<>(
+ *     "must match",
  *     new ListOf<>(1, 2, 3),
  *     new HasValuesMatching<>(value -> value > 2 || value == 3)
- * );</pre>
+ *  ).affirm();
+ * }</pre>
  *
  * @param <X> Type of item.
  * @since 1.0.0

src/main/java/org/llorllale/cactoos/matchers/Matches.java

@@ -34,15 +34,18 @@
  * Matcher to test {@link org.hamcrest.Matcher} objects.
  *
  * <p>Here is an example:</p>
- * <pre>{@code
- *  @Test
+ * <pre>
+ * <code>
+ *  &#64;Test
  *  public void matches() {
- *      MatcherAssert.assertThat(
+ *      new Assertion&#60;&#62;(
+ *          "must match",
  *          new TextIs("abc"),
- *          new Matches<>(new TextOf("abc"))
- *      );
+ *          new Matches&#60;&#62;(new TextOf("abc"))
+ *      ).affirm();
  *  }
- * }</pre>
+ * </code>
+ * </pre>
  *
  * @param <X> Type of item.
  * @param <M> Type of tested matcher.

src/main/java/org/llorllale/cactoos/matchers/MatchesBefore.java

@@ -32,18 +32,19 @@
 /**
  * Matcher to check that scalar finishes before some timeout.
  *
- * This is a {@link Matcher} alternative to JUnit's {@link Test#timeout}.
+ * This is a {@link Matcher} alternative to JUnit's {@code Timeout} annotation.
  *
  * <p>Here is an example how {@link MatchesBefore} can be used:</p>
- * <pre>
+ * <pre>{@code
  *  new Assertion<>(
  *       "must run in 5 seconds maximum",
  *       new TextOf("test"),
  *       new MatchesBefore(
  *           5000,
  *           new TextIs("test")
  *       )
- *  ).affirm();</pre>
+ *  ).affirm();
+ * }</pre>
  *
  * @param <T> Type of the scalar's value
  * @since 1.0.0

src/main/java/org/llorllale/cactoos/matchers/Throws.java

@@ -37,14 +37,15 @@
  * Matcher to check that scalar throw the expected exception.
  *
  * <p>Here is an example how {@link Throws} can be used:</p>
- * <pre>
- *  MatcherAssert.assertThat(
+ * <pre>{@code
+ *  new Assertion<>(
  *       "The matcher check that [1,2,3] contains [2]",
  *       () -> {
  *            throw new IllegalArgumentException("No object(s) found.");
  *       },
  *       new Throws("No object(s) found.", IllegalArgumentException.class)
- *  );</pre>
+ *  ).affirm();
+ * }</pre>
  *
  * @param <T> Type of the scalar's value
  * @since 1.0.0

src/test/java/org/llorllale/cactoos/matchers/AssertionTest.java

@@ -28,26 +28,20 @@
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
+import org.cactoos.Scalar;
 import org.cactoos.text.Joined;
 import org.cactoos.text.TextOf;
 import org.hamcrest.core.IsEqual;
-import org.hamcrest.core.IsInstanceOf;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Assertions;
 
 /**
  * Tests for {@link Assertion}.
  * @since 1.0.0
+ * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
 public final class AssertionTest {
-    /**
-     * A rule for handling an exception.
-     */
-    @Rule
-    public final ExpectedException exception = ExpectedException.none();
-
     /**
      * Assertion can be affirmed if the operation being tested matches.
      */
@@ -69,19 +63,20 @@ public void affirmIfResultMatches() {
      */
     @Test
     public void refuteIfResultDoesNotMatch() throws IOException {
-        this.exception.expect(AssertionError.class);
-        this.exception.expectMessage(
+        Assertions.assertThrows(
+            AssertionError.class,
+            () -> new Assertion<>(
+                "must refute the assertion if the test's result is not as expected",
+                new TextOf("test"),
+                new TextIs("no match")
+            ).affirm(),
             new Joined(
                 System.lineSeparator(),
-                "Text with value \"no match\"",
+                "must refute the assertion if the test's result is not as expected",
+                "Expected: Text with value \"no match\"",
                 " but was: Text is \"test\""
             ).asString()
         );
-        new Assertion<>(
-            "must refute the assertion if the test's result is not as expected",
-            new TextOf("test"),
-            new TextIs("no match")
-        ).affirm();
     }
 
     /**
@@ -90,16 +85,16 @@ public void refuteIfResultDoesNotMatch() throws IOException {
      */
     @Test
     public void refuteIfErrorDoesNotMatch() {
-        this.exception.expectCause(
-            IsInstanceOf.instanceOf(IllegalStateException.class)
+        Assertions.assertThrows(
+            IllegalStateException.class,
+            () -> new Assertion<Scalar<String>>(
+                "must fail if the test throws an unexpected error",
+                () -> {
+                    throw new IllegalStateException();
+                },
+                new ScalarHasValue<>("no match")
+            ).affirm()
         );
-        new Assertion<>(
-            "must fail if the test throws an unexpected error",
-            () -> {
-                throw new IllegalStateException();
-            },
-            new TextIs("no match")
-        ).affirm();
     }
 
     /**

src/test/java/org/llorllale/cactoos/matchers/MatcherOfTest.java

@@ -26,14 +26,9 @@
  */
 package org.llorllale.cactoos.matchers;
 
-import org.cactoos.text.FormattedText;
 import org.cactoos.text.Joined;
 import org.cactoos.text.TextOf;
-import org.cactoos.text.UncheckedText;
-import org.hamcrest.core.IsNot;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 /**
  * Test case for {@link MatcherOf}.
@@ -45,12 +40,6 @@
  */
 public final class MatcherOfTest {
 
-    /**
-     * A rule for handling an exception.
-     */
-    @Rule
-    public final ExpectedException exception = ExpectedException.none();
-
     @Test
     public void matchesFunc() {
         new Assertion<>(
@@ -64,26 +53,15 @@ public void matchesFunc() {
     public void mismatchesFunc() {
         new Assertion<>(
             "mismatches when arg does not satisfy the predicate",
-            new MatcherOf<>(x -> x > 5),
-            new IsNot<>(new Matches<>(1))
-        ).affirm();
-    }
-
-    @Test
-    public void describesMismatch() {
-        this.exception.expect(AssertionError.class);
-        this.exception.expectMessage(
-            new UncheckedText(
-                new FormattedText(
-                    // @checkstyle LineLength (1 line)
-                    "describes mismatch%nExpected: \"Must be > 5\"%n but was: <1>"
-                )
-            ).asString()
-        );
-        new Assertion<>(
-            "describes mismatch",
-            1,
-            new MatcherOf<>(x -> x > 5, new TextOf("Must be > 5"))
+            new MatcherOf<>(
+                x -> x > 5,
+                new TextOf("Must be > 5")
+            ),
+            new Mismatches<>(
+                1,
+                "\"Must be > 5\"",
+                "<1>"
+            )
         ).affirm();
     }
 

src/test/resources/forbidden-apis.txt

@@ -3,6 +3,7 @@ org.hamcrest.Matchers
 
 @defaultMessage Please do not use org.junit.Assert class. Use org.llorllale.cactoos.matchers.Assertion instead.
 org.junit.Assert
+org.junit.jupiter.api.Assertions
 
 @defaultMessage Please do not use org.hamcrest.MatcherAssert class. Use org.llorllale.cactoos.matchers.Assertion instead.
 org.hamcrest.MatcherAssert