[Avro] Re-Enable ignored namespace unit tests in 2.9

Author: baharclerode

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/InteropTestBase.java

@@ -5,18 +5,10 @@
 import java.lang.reflect.Type;
 
 import org.apache.avro.Schema;
-import org.junit.Assume;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.apacheDeserializer;
-import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.apacheSerializer;
-import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.jacksonDeserializer;
-import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.jacksonSerializer;
-import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.getApacheSchema;
-import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.getJacksonSchema;
-import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.Function;
-import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.BiFunction;
+import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.*;
 
 /**
  * Parameterized base class for tests that populates {@link #schemaFunctor}, {@link #serializeFunctor}, and
@@ -30,20 +22,6 @@ public enum DummyEnum {
         NORTH, SOUTH, EAST, WEST
     }
 
-    // To work around 2.8/2.9 difference wrt namespaces for enums
-    // See [dataformats-binary#58] for details
-    protected void assumeCompatibleNsForDeser() {
-        Assume.assumeTrue(deserializeFunctor != apacheDeserializer
-                || schemaFunctor != ApacheAvroInteropUtil.getJacksonSchema);
-    }
-
-    // To work around 2.8/2.9 difference wrt namespaces for enums
-    // See [dataformats-binary#58] for details
-    protected void assumeCompatibleNsForSer() {
-        Assume.assumeTrue(serializeFunctor != apacheSerializer
-                || schemaFunctor != ApacheAvroInteropUtil.getJacksonSchema);
-    }
-
     /**
      * Helper method for building a {@link ParameterizedType} for use with {@link #roundTrip(Type, Object)}
      *

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

@@ -1,17 +1,18 @@
 package com.fasterxml.jackson.dataformat.avro.interop.annotations;
 
+import java.io.IOException;
+
 import org.apache.avro.reflect.AvroIgnore;
-import org.junit.Before;
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.*;
+import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
 
+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.junit.Assert.assertThat;
 
-import java.io.IOException;
-
-import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
-
 public class AvroIgnoreTest extends InteropTestBase
 {
     static class RecordWithIgnoredField {
@@ -22,12 +23,6 @@ public RecordWithIgnoredField() {}
         public String notIgnoredField;
     }
 
-    @Before
-    public void setup() {
-        // 2.8 doesn't generate schemas with compatible namespaces for Apache deserializer
-        assumeCompatibleNsForDeser();
-    }
-
     @Test
     public void testFieldIgnored() throws IOException {
         RecordWithIgnoredField r = new RecordWithIgnoredField();

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

@@ -1,17 +1,16 @@
 package com.fasterxml.jackson.dataformat.avro.interop.annotations;
 
-import com.fasterxml.jackson.dataformat.avro.AvroTestBase;
-import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
+import java.io.IOException;
 
 import org.apache.avro.reflect.AvroName;
-import org.junit.Before;
 import org.junit.Test;
 
+import com.fasterxml.jackson.dataformat.avro.AvroTestBase;
+import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 
-import java.io.IOException;
-
 /**
  * Tests the {@link AvroName @AvroName} annotation
  */
@@ -34,12 +33,6 @@ public static class RecordWithNameCollision {
         public String otherField;
     }
 
-    @Before
-    public void setup() {
-        // 2.8 doesn't generate schemas with compatible namespaces for Apache deserializer
-        assumeCompatibleNsForDeser();
-    }
-
     @Test
     public void testRecordWithRenamedField() throws IOException{
         RecordWithRenamed original = new RecordWithRenamed();

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

@@ -20,11 +20,6 @@
  */
 public class ListWithComplexTest extends InteropTestBase
 {
-    @Before
-    public void setup() {
-        // 2.8 doesn't generate schemas with compatible namespaces for Apache deserializer
-        assumeCompatibleNsForDeser();
-    }
 
     @Test
     public void testEmptyListWithRecordElements() throws IOException {

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/maps/MapWithComplexTest.java

@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.util.*;
 
-import org.junit.Before;
 import org.junit.Test;
 
 import com.fasterxml.jackson.dataformat.avro.interop.DummyRecord;
@@ -17,11 +16,6 @@
  */
 public class MapWithComplexTest extends InteropTestBase
 {
-    @Before
-    public void setup() {
-        // 2.8 doesn't generate schemas with compatible namespaces for Apache deserializer
-        assumeCompatibleNsForDeser();
-    }
 
     @Test
     public void testMapWithRecordValues() throws IOException {

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/records/RecordWithComplexTest.java

@@ -5,8 +5,6 @@
 import java.util.Map;
 
 import org.apache.avro.AvroTypeException;
-
-import org.junit.Before;
 import org.junit.Test;
 
 import com.fasterxml.jackson.databind.JsonMappingException;
@@ -21,12 +19,6 @@
  */
 public class RecordWithComplexTest extends InteropTestBase
 {
-    @Before
-    public void setup() {
-        // 2.8 doesn't generate schemas with compatible namespaces for Apache deserializer
-        assumeCompatibleNsForDeser();
-        assumeCompatibleNsForSer();
-    }
 
     @Test
     public void testEmptyRecordWithRecordValues() throws IOException {

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/records/RecordWithPrimitiveArrayTest.java

@@ -1,26 +1,19 @@
 package com.fasterxml.jackson.dataformat.avro.interop.records;
 
-import lombok.Data;
+import java.io.IOException;
 
-import org.junit.Before;
+import lombok.Data;
 import org.junit.Test;
 
 import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.IOException;
-
 /**
  * Tests serializing primitive array fields on records
  */
 public class RecordWithPrimitiveArrayTest extends InteropTestBase
 {
-    @Before
-    public void setup() {
-        // 2.8 doesn't generate schemas with compatible namespaces for Apache deserializer
-        assumeCompatibleNsForDeser();
-    }
 
     @Data
     public static class TestRecord {

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/records/RecordWithPrimitiveTest.java

@@ -1,16 +1,14 @@
 package com.fasterxml.jackson.dataformat.avro.interop.records;
 
-import lombok.Data;
+import java.io.IOException;
 
-import org.junit.Before;
+import lombok.Data;
 import org.junit.Test;
 
 import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.IOException;
-
 /**
  * Tests serializing primitive fields on records
  */
@@ -26,12 +24,6 @@ public static class TestRecord {
         private float  floatField;
         private double doubleField;
     }
-
-    @Before
-    public void setup() {
-        // 2.8 doesn't generate schemas with compatible namespaces for Apache deserializer
-        assumeCompatibleNsForDeser();
-    }
 
     @Test
     public void testByteField() throws IOException {

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/records/RecordWithPrimitiveWrapperArrayTest.java

@@ -1,16 +1,14 @@
 package com.fasterxml.jackson.dataformat.avro.interop.records;
 
-import lombok.Data;
+import java.io.IOException;
 
-import org.junit.Before;
+import lombok.Data;
 import org.junit.Test;
 
 import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.IOException;
-
 /**
  * Tests serializing primitive array fields on records
  */
@@ -28,12 +26,6 @@ public static class TestRecord {
         private String[]    stringArrayField    = new String[0];
     }
 
-    @Before
-    public void setup() {
-        // 2.8 doesn't generate schemas with compatible namespaces for Apache deserializer
-        assumeCompatibleNsForDeser();
-    }
-
     @Test
     public void testByteField() throws IOException {
         TestRecord record = new TestRecord();

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/records/RecordWithPrimitiveWrapperTest.java

@@ -1,15 +1,13 @@
 package com.fasterxml.jackson.dataformat.avro.interop.records;
 
-import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
+import java.io.IOException;
 
 import lombok.Data;
-
-import org.junit.Before;
 import org.junit.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
 
-import java.io.IOException;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests serializing wrapper types for primitives on records
@@ -27,12 +25,6 @@ public static class TestRecord {
         private Double    doubleField    = 0D;
         private String    stringField    = "";
     }
-
-    @Before
-    public void setup() {
-        // 2.8 doesn't generate schemas with compatible namespaces for Apache deserializer
-        assumeCompatibleNsForDeser();
-    }
 
     @Test
     public void testByteField() throws IOException {