minor test refactoring

2 files changed, 0 insertions, 177 deletions

diff --git a/src/test/java/com/fasterxml/jackson/databind/struct/EnumFormatShapeTest.java b/src/test/java/com/fasterxml/jackson/databind/struct/EnumFormatShapeTest.java
deleted file mode 100644
index 8e7f13bee..000000000
--- a/src/test/java/com/fasterxml/jackson/databind/struct/EnumFormatShapeTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.fasterxml.jackson.databind.struct;
-
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
-
-import com.fasterxml.jackson.databind.*;
-
-/**
- * Unit tests for verifying serialization of simple basic non-structured
- * types; primitives (and/or their wrappers), Strings.
- */
-public class EnumFormatShapeTest
-    extends BaseMapTest
-{
-    @JsonFormat(shape=JsonFormat.Shape.OBJECT)
-    static enum PoNUM {
-        A("a1"), B("b2");
-
-        @JsonProperty
-        protected final String value;
-        
-        private PoNUM(String v) { value = v; }
-
-        public String getValue() { return value; }
-    }
-
-    static enum OK {
-        V1("v1");
-        protected String key;
-        OK(String key) { this.key = key; }
-    }
-
-    static class PoNUMContainer {
-        @JsonFormat(shape=Shape.NUMBER)
-        public OK text = OK.V1;
-    }
-    
-    @JsonFormat(shape=JsonFormat.Shape.ARRAY) // alias for 'number', as of 2.5
-    static enum PoAsArray
-    {
-        A, B;
-    }
-
-    // for [databind#572]
-    static class PoOverrideAsString
-    {
-        @JsonFormat(shape=Shape.STRING)
-        public PoNUM value = PoNUM.B;
-    }
-
-    static class PoOverrideAsNumber
-    {
-        @JsonFormat(shape=Shape.NUMBER)
-        public PoNUM value = PoNUM.B;
-    }
-
-    // for [databind#1543]
-    @JsonFormat(shape = JsonFormat.Shape.NUMBER_INT)
-    enum Color {
-        RED,
-        YELLOW,
-        GREEN
-    }
-
-    static class ColorWrapper {
-        public final Color color;
-
-        ColorWrapper(Color color) {
-            this.color = color;
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Tests
-    /**********************************************************
-     */
-
-    private final ObjectMapper MAPPER = new ObjectMapper();
-
-    // Tests for JsonFormat.shape
-
-    public void testEnumAsObjectValid() throws Exception {
-        assertEquals("{\"value\":\"a1\"}", MAPPER.writeValueAsString(PoNUM.A));
-    }
-
-    public void testEnumAsIndexViaAnnotations() throws Exception {
-        assertEquals("{\"text\":0}", MAPPER.writeValueAsString(new PoNUMContainer()));
-    }
-
-    // As of 2.5, use of Shape.ARRAY is legal alias for "write as number"
-    public void testEnumAsObjectBroken() throws Exception
-    {
-        assertEquals("0", MAPPER.writeValueAsString(PoAsArray.A));
-    }
-
-    // [databind#572]
-    public void testOverrideEnumAsString() throws Exception {
-        assertEquals("{\"value\":\"B\"}", MAPPER.writeValueAsString(new PoOverrideAsString()));
-    }
-
-    public void testOverrideEnumAsNumber() throws Exception {
-        assertEquals("{\"value\":1}", MAPPER.writeValueAsString(new PoOverrideAsNumber()));
-    }
-
-    // for [databind#1543]
-    public void testEnumValueAsNumber() throws Exception {
-        assertEquals(String.valueOf(Color.GREEN.ordinal()),
-                MAPPER.writeValueAsString(Color.GREEN));
-    }
-
-    public void testEnumPropertyAsNumber() throws Exception {
-        assertEquals(String.format(aposToQuotes("{'color':%s}"), Color.GREEN.ordinal()),
-                MAPPER.writeValueAsString(new ColorWrapper(Color.GREEN)));
-    }
-}
diff --git a/src/test/java/com/fasterxml/jackson/databind/struct/TestFormatForCollections.java b/src/test/java/com/fasterxml/jackson/databind/struct/TestFormatForCollections.java
deleted file mode 100644
index bd308b3e7..000000000
--- a/src/test/java/com/fasterxml/jackson/databind/struct/TestFormatForCollections.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.fasterxml.jackson.databind.struct;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
-
-import com.fasterxml.jackson.databind.*;
-
-public class TestFormatForCollections extends BaseMapTest
-{
-    // [databind#40]: Allow serialization 'as POJO' (resulting in JSON Object) 
-    @JsonPropertyOrder({ "size", "value" })
-    @JsonFormat(shape=Shape.OBJECT)
-    @JsonIgnoreProperties({ "empty" }) // from 'isEmpty()'
-    static class CollectionAsPOJO
-        extends ArrayList<String>
-    {
-        private static final long serialVersionUID = 1L;
-
-        @JsonProperty("size")
-        public int foo() { return size(); }
-        
-        public List<String> getValues() {
-            return new ArrayList<String>(this);
-        }
-
-        public void setValues(List<String> v) {
-            addAll(v);
-        }
-        
-        // bogus setter to handle "size" property
-        public void setSize(int i) { }
-    }
-
-    /*
-    /**********************************************************
-    /* Test methods
-    /**********************************************************
-     */
-
-    private final static ObjectMapper MAPPER = new ObjectMapper();    
-
-
-    // [Issue#40]
-    public void testListAsObject() throws Exception
-    {
-        // First, serialize a "POJO-List"
-        CollectionAsPOJO list = new CollectionAsPOJO();
-        list.add("a");
-        list.add("b");
-        String json = MAPPER.writeValueAsString(list);
-        assertEquals("{\"size\":2,\"values\":[\"a\",\"b\"]}", json);
-
-        // and then bring it back!
-        CollectionAsPOJO result = MAPPER.readValue(json, CollectionAsPOJO.class);
-        assertEquals(2, result.size());
-    }
-
-}