Streamline test a bit

Author: cowtowncoder

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

@@ -282,6 +282,19 @@ protected AvroSchema getStringMapSchema() throws IOException {
         return getMapper().schemaFrom(STRING_MAP_SCHEMA_JSON);
     }
 
+    protected AvroSchema parseSchema(String schemaAsJson) {
+        return parseSchema(getMapper(), schemaAsJson);
+    }
+
+    protected AvroSchema parseSchema(AvroMapper mapper, String schemaAsJson) {
+        try {
+            return getMapper().schemaFrom(aposToQuotes(schemaAsJson));
+        } catch (IOException e) {
+            fail("Could not parse Avro Schema from: "+schemaAsJson+", problem: "+e);
+            return null;
+        }
+    }
+    
     protected AvroMapper getMapper() {
         if (_sharedMapper == null) {
             _sharedMapper = newMapper();

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/failing/EmptyRecordRead177Test.java

@@ -1,8 +1,5 @@
 package com.fasterxml.jackson.dataformat.avro.failing;
 
-import org.apache.avro.Schema;
-import org.apache.avro.SchemaBuilder;
-
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 
 import com.fasterxml.jackson.dataformat.avro.AvroMapper;
@@ -13,11 +10,8 @@ public class EmptyRecordRead177Test extends AvroTestBase
 {
     private final AvroMapper MAPPER = getMapper();
 
-    private Schema SCHEMA = SchemaBuilder
-            .builder(EmptyRecordRead177Test.class.getName() + "$")
-            .record(Empty.class.getSimpleName())
-                .fields()
-            .endRecord();
+    private final AvroSchema SCHEMA = parseSchema(MAPPER,
+"{'type':'record', 'name':'Empty','namespace':'something','fields':[]}");
 
     @JsonAutoDetect // just a marker to avoid "no properties found" exception
     static final class Empty {
@@ -29,11 +23,11 @@ public boolean equals(Object o) {
 
     public void testEmptyRecord() throws Exception {
         final Empty empty = new Empty();
-        
-        byte[] ser = MAPPER.writer().with(new AvroSchema(SCHEMA)).writeValueAsBytes(empty);
+
+        byte[] ser = MAPPER.writer().with(SCHEMA).writeValueAsBytes(empty);
 
         final Empty result = MAPPER.readerFor(Empty.class)
-                .with(new AvroSchema(SCHEMA))
+                .with(SCHEMA)
                 .readValue(ser);
 
         assertEquals(empty, result);