Refactoring tests for #171, as they are failing, and may not be fixed…

… immediately

src/test/java/com/fasterxml/jackson/databind/struct/TestUnwrappedWithPrefix.java

@@ -1,8 +1,5 @@
 package com.fasterxml.jackson.databind.struct;
 
-import java.util.Collections;
-import java.util.Map;
-
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -124,17 +121,6 @@ static class ConfigMisc {
         public int value;
     }
 
-    static class MapUnwrap {
-
-        public MapUnwrap() { }
-        public MapUnwrap(String key, Object value) {
-            map = Collections.singletonMap(key, value);
-        }
-
-        @JsonUnwrapped(prefix="map.")
-        public Map<String, Object> map;
-    }
-
     // // // Reuse mapper to keep tests bit faster
 
     private final ObjectMapper mapper = new ObjectMapper();
@@ -163,12 +149,6 @@ public void testHierarchicConfigSerialize() throws Exception
         assertEquals("{\"general.names.name\":\"Fred\",\"misc.value\":25}", json);
     }
 
-    public void testMapUnwrapSerialize() throws Exception
-    {
-        String json = mapper.writeValueAsString(new MapUnwrap("test", 6));
-        assertEquals("{\"map.test\": 6}", json);
-    }
-
     /*
     /**********************************************************
     /* Tests, deserialization
@@ -226,12 +206,4 @@ public void testHierarchicConfigRoundTrip() throws Exception
         assertEquals("Joe", root.general.names.name);
         assertEquals(42, root.misc.value);
     }
-
-    public void testMapUnwrapDeserialize() throws Exception
-    {
-        MapUnwrap root = mapper.readValue("{\"map.test\": 6}", MapUnwrap.class);
-
-        assertEquals(1, root.map.size());
-        assertEquals(6, ((Number)root.map.get("test")).intValue());
-    }
 }

src/test/java/com/fasterxml/jackson/failing/TestUnwrappedWithPrefix.java

@@ -0,0 +1,53 @@
+package com.fasterxml.jackson.failing;
+
+import java.util.Collections;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import com.fasterxml.jackson.databind.BaseMapTest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+// Tests for [#171]
+public class TestUnwrappedWithPrefix extends BaseMapTest
+{
+    static class MapUnwrap {
+
+        public MapUnwrap() { }
+        public MapUnwrap(String key, Object value) {
+            map = Collections.singletonMap(key, value);
+        }
+
+        @JsonUnwrapped(prefix="map.")
+        public Map<String, Object> map;
+    }
+
+    // // // Reuse mapper to keep tests bit faster
+
+    private final ObjectMapper mapper = new ObjectMapper();
+
+    /*
+    /**********************************************************
+    /* Tests, serialization
+    /**********************************************************
+     */
+
+    public void testMapUnwrapSerialize() throws Exception
+    {
+        String json = mapper.writeValueAsString(new MapUnwrap("test", 6));
+        assertEquals("{\"map.test\": 6}", json);
+    }
+
+    /*
+    /**********************************************************
+    /* Tests, deserialization
+    /**********************************************************
+     */
+
+    public void testMapUnwrapDeserialize() throws Exception
+    {
+        MapUnwrap root = mapper.readValue("{\"map.test\": 6}", MapUnwrap.class);
+
+        assertEquals(1, root.map.size());
+        assertEquals(6, ((Number)root.map.get("test")).intValue());
+    }
+}