Move new Enum-related test into EnumTest

Author: cowtowncoder

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/EnumTest.java

@@ -1,5 +1,13 @@
 package com.fasterxml.jackson.dataformat.avro;
 
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.avro.Schema;
+import org.apache.avro.Schema.Type;
+
+import com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaGenerator;
+
 public class EnumTest extends AvroTestBase
 {
     // gender as Avro enum
@@ -118,4 +126,34 @@ public void test_avroSchemaWithString_fromStringValueToEnumValue() throws Except
         assertEquals(Gender.F, output.gender);
     }
 
+    // [dataformats-binary#388]: Default value for enums with class
+    public void testClassEnumWithDefault() throws Exception
+    {
+        AvroSchemaGenerator gen = new AvroSchemaGenerator();
+
+        MAPPER.acceptJsonFormatVisitor(ABCDefaultClass.class, gen);
+        AvroSchema schema = gen.getGeneratedSchema();
+        assertNotNull(schema);
+
+        String json = schema.getAvroSchema().toString(true);
+        assertNotNull(json);
+
+        // And read it back too just for fun
+        AvroSchema s2 = MAPPER.schemaFrom(json);
+        assertNotNull(s2);
+
+        Schema avroSchema = s2.getAvroSchema();
+
+        // String name, int value
+        assertEquals(Type.RECORD, avroSchema.getType());
+        Schema.Field f = avroSchema.getField("abc");
+        assertNotNull(f);
+        assertEquals("abc", f.name());
+
+        assertEquals(Type.ENUM, f.schema().getType());
+        assertEquals(ABC.C.toString(), f.schema().getEnumDefault());
+        assertEquals(Stream.of(ABC.values())
+                               .map(ABC::name)
+                               .collect(Collectors.toList()), f.schema().getEnumSymbols());
+    }   
 }

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/schema/AvroSchemaGenerationTest.java

@@ -2,8 +2,6 @@
 
 import java.nio.ByteBuffer;
 import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -13,7 +11,6 @@
 import com.fasterxml.jackson.dataformat.avro.*;
 
 import org.apache.avro.Schema;
-import org.apache.avro.Schema.Type;
 
 public class AvroSchemaGenerationTest extends AvroTestBase
 {
@@ -172,38 +169,4 @@ public void testSchemaForUntypedMap() throws Exception
             verifyException(e, "Maps with non-stringable keys are not supported (yet?)");
         }
     }
-
-    // Issue 388 Default value for enums with class
-    public void testClassEnumWithDefault() throws Exception
-    {
-        AvroSchemaGenerator gen = new AvroSchemaGenerator();
-
-        MAPPER.acceptJsonFormatVisitor(ABCDefaultClass.class, gen);
-        AvroSchema schema = gen.getGeneratedSchema();
-        assertNotNull(schema);
-
-        String json = schema.getAvroSchema().toString(true);
-        assertNotNull(json);
-
-
-        // And read it back too just for fun
-        AvroSchema s2 = MAPPER.schemaFrom(json);
-        assertNotNull(s2);
-
-        Schema avroSchema = s2.getAvroSchema();
-
-        // String name, int value
-        assertEquals(Type.RECORD, avroSchema.getType());
-        Schema.Field f = avroSchema.getField("abc");
-        assertNotNull(f);
-        assertEquals("abc", f.name());
-
-        assertEquals(Type.ENUM, f.schema().getType());
-        assertEquals(ABC.C.toString(), f.schema().getEnumDefault());
-        assertEquals(Stream.of(ABC.values())
-                               .map(ABC::name)
-                               .collect(Collectors.toList()), f.schema().getEnumSymbols());
-
-
-    }
 }