minor test refactoring

3 files changed, 7 insertions, 8 deletions

diff --git a/src/test/java/com/fasterxml/jackson/databind/struct/TestFormatForCollections.java b/src/test/java/com/fasterxml/jackson/databind/format/ColletionFormatShapeTest.java
index bd308b3e7..f37b2d707 100644
--- a/src/test/java/com/fasterxml/jackson/databind/struct/TestFormatForCollections.java
+++ b/src/test/java/com/fasterxml/jackson/databind/format/ColletionFormatShapeTest.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.struct;
+package com.fasterxml.jackson.databind.format;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
 import com.fasterxml.jackson.databind.*;
 
-public class TestFormatForCollections extends BaseMapTest
+public class ColletionFormatShapeTest extends BaseMapTest
 {
     // [databind#40]: Allow serialization 'as POJO' (resulting in JSON Object) 
     @JsonPropertyOrder({ "size", "value" })
@@ -42,9 +42,7 @@ public class TestFormatForCollections extends BaseMapTest
 
     private final static ObjectMapper MAPPER = new ObjectMapper();    
 
-
-    // [Issue#40]
-    public void testListAsObject() throws Exception
+    public void testListAsObjectRoundtrip() throws Exception
     {
         // First, serialize a "POJO-List"
         CollectionAsPOJO list = new CollectionAsPOJO();
diff --git a/src/test/java/com/fasterxml/jackson/databind/struct/EnumFormatShapeTest.java b/src/test/java/com/fasterxml/jackson/databind/format/EnumFormatShapeTest.java
index 8e7f13bee..dd80c0622 100644
--- a/src/test/java/com/fasterxml/jackson/databind/struct/EnumFormatShapeTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/format/EnumFormatShapeTest.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.struct;
+package com.fasterxml.jackson.databind.format;
 
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
diff --git a/src/test/java/com/fasterxml/jackson/databind/format/MapFormat476Test.java b/src/test/java/com/fasterxml/jackson/databind/format/MapFormat476Test.java
index 1e6014ee6..348e98072 100644
--- a/src/test/java/com/fasterxml/jackson/databind/format/MapFormat476Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/format/MapFormat476Test.java
@@ -70,9 +70,9 @@ public class MapFormat476Test extends BaseMapTest
                 result);
     }
 
-    // Can't yet use per-property overrides at all
-    /*
+    // Can't yet use per-property overrides at all, see [databind#1419]
     
+    /*
     public void testAsPOJOViaProperty() throws Exception
     {
         String result = MAPPER.writeValueAsString(new Bean476Container(1,0,3));
@@ -87,4 +87,5 @@ public class MapFormat476Test extends BaseMapTest
                 result);
     }
     */
+
 }