Revert back /interop tests to JUnit 4

Author: JooHyukKim

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/annotations/AvroIgnoreTest.java

@@ -3,11 +3,14 @@
 import java.io.IOException;
 
 import org.apache.avro.reflect.AvroIgnore;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 public class AvroIgnoreTest extends InteropTestBase

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/annotations/AvroMetaTest.java

@@ -1,16 +1,17 @@
 package com.fasterxml.jackson.dataformat.avro.interop.annotations;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
+import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
+
 import org.apache.avro.Schema;
 import org.apache.avro.reflect.AvroMeta;
 import org.apache.avro.reflect.AvroSchema;
-import org.junit.jupiter.api.Test;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
-import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.fail;
 
 public class AvroMetaTest extends InteropTestBase
 {
@@ -64,17 +65,17 @@ public void testClassMetaProperty() throws Exception {
         assertThat(schema.getProp("class-meta")).isEqualTo("class value");
     }
 
-//    @Test(expected = AvroRuntimeException.class)
     @Test
+//    @Test(expected = AvroRuntimeException.class)
     public void testCollidingMeta() throws Exception {
         try {
             schemaFunctor.apply(BadMetaTest.class);
-            fail("Should not pass");
+            Assert.fail("Should not pass");
         // 27-May-2021, tatu: was at some point "AvroRuntimeException", not so with 2.13:
         } catch (InvalidDefinitionException e) {
             String msg = e.getMessage();
             if (!msg.startsWith("Failed to generate")) {
-                fail("Excepted exception message to start with 'Failed to generate', got: ["+msg+"]");
+                Assert.fail("Excepted exception message to start with 'Failed to generate', got: ["+msg+"]");
             }
         }
     }

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/annotations/AvroNameTest.java

@@ -1,14 +1,14 @@
 package com.fasterxml.jackson.dataformat.avro.interop.annotations;
 
 import org.apache.avro.reflect.AvroName;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.DatabindException;
 import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.Assert.fail;
 
 /**
  * Tests the {@link AvroName @AvroName} annotation

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/annotations/AvroSchemaTest.java

@@ -1,19 +1,19 @@
 package com.fasterxml.jackson.dataformat.avro.interop.annotations;
 
-import java.io.IOException;
-
-import org.apache.avro.Schema;
-import org.apache.avro.reflect.AvroSchema;
-import org.apache.avro.reflect.Nullable;
-import org.junit.jupiter.api.Test;
-
 import com.fasterxml.jackson.annotation.JsonClassDescription;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 import com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil;
 import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
 
+import org.apache.avro.Schema;
+import org.apache.avro.reflect.AvroSchema;
+import org.apache.avro.reflect.Nullable;
+import org.junit.Test;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.io.IOException;
+
 /**
  * Tests that {@code @AvroSchema} is handled correctly. Specifically:
  * <ul>

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/annotations/StringableTest.java

@@ -4,18 +4,23 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.net.*;
-import java.util.*;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
 
 import org.apache.avro.reflect.AvroSchema;
 import org.apache.avro.reflect.Stringable;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil;
 import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static org.junit.Assume.assumeTrue;
 
 /**
  * Tests support for using classes marked {@link Stringable @Stringable} as map keys. These classes must have a constructor which accepts a

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/annotations/UnionTest.java

@@ -1,18 +1,21 @@
 package com.fasterxml.jackson.dataformat.avro.interop.annotations;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.avro.UnresolvedUnionException;
 import org.apache.avro.reflect.Nullable;
 import org.apache.avro.reflect.Union;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.Assert.fail;
 
 /**
  * Tests for @Union

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/arrays/CollectionSubtypeTest.java

@@ -2,15 +2,17 @@
 
 import java.io.IOException;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CopyOnWriteArraySet;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Assume;
+import org.junit.Test;
 
 import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
 
 import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.apacheDeserializer;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 /**
  * Tests collection subtypes such as {@link ArrayList}, {@link LinkedList}, {@link Stack}, {@link Set}, {@link HashSet}, {@link TreeSet},
@@ -65,7 +67,7 @@ public void testCopyOnWriteArraySet() throws IOException{
     @Test
     public void testEnumSet() throws IOException {
         // Bug in apache deserializer, can't handle EnumSet
-        assumeTrue(deserializeFunctor != apacheDeserializer);
+        Assume.assumeTrue(deserializeFunctor != apacheDeserializer);
         EnumSet<DummyEnum> original = EnumSet.of(DummyEnum.EAST, DummyEnum.NORTH);
         //
         EnumSet<DummyEnum> result = roundTrip(type(EnumSet.class, DummyEnum.class), original);
@@ -109,7 +111,7 @@ public void testList() throws IOException {
     @Test
     public void testSet() throws IOException {
         // Bug in apache deserializer, can't handle Set
-        assumeTrue(deserializeFunctor != apacheDeserializer);
+        Assume.assumeTrue(deserializeFunctor != apacheDeserializer);
         Set<Integer> original = new HashSet<>();
         original.add(1234);
         original.add(98768234);

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/arrays/ListWithComplexTest.java

@@ -1,9 +1,12 @@
 package com.fasterxml.jackson.dataformat.avro.interop.arrays;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import com.fasterxml.jackson.dataformat.avro.interop.DummyRecord;
 import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/arrays/ListWithPrimitiveArrayTest.java

@@ -4,7 +4,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
 

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/arrays/ListWithPrimitiveWrapperArrayTest.java

@@ -4,7 +4,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;