Upgrade JUnit4 dependency to version 4.13.1. (#426)

Replacing deprecated methods with designated replacements.

Author: blackwinter

build.gradle

@@ -46,7 +46,7 @@ subprojects {
       'jquery':           '3.3.1-1',
       'jsonpath':         '2.10.0',
       'jsoup':            '1.15.4',
-      'junit':            '4.12',
+      'junit':            '4.13.1',
       'junit_jupiter':    '5.8.2',
       'junit_platform':   '1.4.2',
       'mockito':          '2.27.0',

metafacture-json/src/test/java/org/metafacture/json/JsonDecoderTest.java

@@ -23,7 +23,6 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -41,9 +40,6 @@ public final class JsonDecoderTest {
     @Rule
     public MockitoRule mockitoRule = MockitoJUnit.rule();
 
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-
     @Mock
     private StreamReceiver receiver;
 
@@ -322,44 +318,33 @@ public void testShouldProcessMultipleRecords() {
 
     @Test
     public void testShouldOnlyParseObjects() {
-        exception.expect(MetafactureException.class);
-        exception.expectMessage("Unexpected token 'VALUE_NULL'");
-
-        jsonDecoder.process("null");
+        Assert.assertThrows("Unexpected token 'VALUE_NULL'", MetafactureException.class, () ->
+                jsonDecoder.process("null"));
     }
 
     @Test
     public void testShouldNotParseIncompleteObjects() {
-        exception.expect(MetafactureException.class);
-        exception.expectMessage("Unexpected end-of-input");
-
-        jsonDecoder.process("{");
+        Assert.assertThrows("Unexpected end-of-input", MetafactureException.class, () ->
+                jsonDecoder.process("{"));
     }
 
     @Test
     public void testShouldNotParseTrailingContent() {
-        exception.expect(MetafactureException.class);
-        exception.expectMessage("Unexpected token 'VALUE_NULL'");
-
-        jsonDecoder.process("{\"lit\":\"value\"}null");
+        Assert.assertThrows("Unexpected token 'VALUE_NULL'", MetafactureException.class, () ->
+                jsonDecoder.process("{\"lit\":\"value\"}null"));
     }
 
     @Test
     public void testShouldNotParseTrailingGarbage() {
-        exception.expect(MetafactureException.class);
-        exception.expectMessage("Unrecognized token 'XXX'");
-
-        jsonDecoder.process("{\"lit\":\"value\"}XXX");
+        Assert.assertThrows("Unrecognized token 'XXX'", MetafactureException.class, () ->
+                jsonDecoder.process("{\"lit\":\"value\"}XXX"));
     }
 
     @Test
     public void testShouldNotParseComments() {
-        exception.expect(MetafactureException.class);
-        exception.expectMessage("Unexpected character ('/' (code 47))");
-
         Assert.assertFalse(jsonDecoder.getAllowComments());
-
-        jsonDecoder.process("//{\"lit\":\"value\"}");
+        Assert.assertThrows("Unexpected character ('/' (code 47))", MetafactureException.class, () ->
+                jsonDecoder.process("//{\"lit\":\"value\"}"));
     }
 
     @Test
@@ -374,12 +359,9 @@ public void testShouldParseCommentsIfEnabled() {
 
     @Test
     public void testShouldNotParseInlineComments() {
-        exception.expect(MetafactureException.class);
-        exception.expectMessage("Unexpected character ('/' (code 47))");
-
         Assert.assertFalse(jsonDecoder.getAllowComments());
-
-        jsonDecoder.process("{\"lit\":/*comment*/\"value\"}");
+        Assert.assertThrows("Unexpected character ('/' (code 47))", MetafactureException.class, () ->
+                jsonDecoder.process("{\"lit\":/*comment*/\"value\"}"));
     }
 
     @Test

metafacture-json/src/test/java/org/metafacture/json/JsonValidatorTest.java

@@ -23,8 +23,8 @@
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -114,7 +114,7 @@ private String readToString(final URL url) throws IOException {
     @Test
     public void callWireMockSchema() throws MalformedURLException, IOException {
         final String schemaContent = readToString(new URL(wireMockRule.baseUrl() + MAIN_SCHEMA));
-        Assert.assertThat(schemaContent, CoreMatchers.both(CoreMatchers.containsString("$schema")).and(CoreMatchers.containsString("$ref")));
+        MatcherAssert.assertThat(schemaContent, CoreMatchers.both(CoreMatchers.containsString("$schema")).and(CoreMatchers.containsString("$ref")));
     }
 
     @Test

metafacture-yaml/src/test/java/org/metafacture/yaml/YamlDecoderTest.java

@@ -19,9 +19,9 @@
 import org.metafacture.framework.MetafactureException;
 import org.metafacture.framework.StreamReceiver;
 
+import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -45,9 +45,6 @@ public final class YamlDecoderTest {
     @Rule
     public MockitoRule mockitoRule = MockitoJUnit.rule();
 
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-
     @Mock
     private StreamReceiver receiver;
 
@@ -300,10 +297,7 @@ public void testShouldParseInlineShellStyleComments() {
     }
 
     private void assertException(final String message, final Consumer<YamlDecoder> in) {
-        exception.expect(MetafactureException.class);
-        exception.expectMessage(message);
-
-        assertDecode(in, o -> { });
+        Assert.assertThrows(message, MetafactureException.class, () -> assertDecode(in, o -> { }));
     }
 
     private void assertDecode(final Consumer<YamlDecoder> in, final Consumer<Supplier<StreamReceiver>> out) {