Fix Junit 4 tests to use JUnit 5

Author: cowtowncoder

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/InstantDeser291Test.java

@@ -3,7 +3,7 @@
 import java.time.Instant;
 import java.util.Locale;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.json.JsonReadFeature;
 import com.fasterxml.jackson.databind.ObjectReader;
@@ -13,8 +13,7 @@
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.datatype.jsr310.ModuleTestBase;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 
 // [modules-java8#291] InstantDeserializer fails to parse negative numeric timestamp strings for
 //   pre-1970 values.

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/OffsetTimeDeserTest.java

@@ -194,7 +194,8 @@ public void testDeserializationFromString01() throws Exception
         value = READER.readValue('"' + time.toString() + '"');
         assertEquals(time, value, "The value is not correct.");
 
-        expectSuccess(OffsetTime.of(12, 0, 0, 0, ZoneOffset.UTC), "'12:00Z'");
+        assertEquals(OffsetTime.of(12, 0, 0, 0, ZoneOffset.UTC),
+                read("'12:00Z'"));
     }
 
     @Test
@@ -286,7 +287,7 @@ public void testDeserializationAsArrayEnabled() throws Throwable
     {
         OffsetTime value = READER.with(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)
     			.readValue(a2q("['12:00Z']"));
-        expect(OffsetTime.of(12, 0, 0, 0, ZoneOffset.UTC), value);
+        assertEquals(OffsetTime.of(12, 0, 0, 0, ZoneOffset.UTC), value);
     }
 
     @Test
@@ -354,21 +355,7 @@ private void expectFailure(String json) throws Throwable {
         }
     }
 
-    private void expectSuccess(Object exp, String json) throws IOException {
-        final OffsetTime value = read(json);
-        assertNotNull(value, "The value should not be null.");
-        assertEquals(exp, value, "The value is not correct.");
-    }
-
     private OffsetTime read(final String json) throws IOException {
         return READER.readValue(a2q(json));
     }
-
-    private static void notNull(Object value) {
-        assertNotNull(value, "The value should not be null.");
-    }
-
-    private static void expect(Object exp, Object value) {
-        assertEquals(exp, value, "The value is not correct.");
-    }
 }