Minor test consolidation

Author: cowtowncoder

src/test/java/tools/jackson/dataformat/xml/tofix/EnumIssue9Test.java

@@ -8,10 +8,10 @@
 import tools.jackson.dataformat.xml.XmlTestUtil;
 import tools.jackson.dataformat.xml.testutil.failure.JacksonTestFailureExpected;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
 
-// for:
+
+// Tests for lack of support for {@code JsonTypeInfo.As.WRAPPER_ARRAY}.
 //
 // [dataformat-xml#4]
 // [dataformat-xml#9] (enums)
@@ -35,6 +35,19 @@ public SubTypeWithClassProperty() { }
     }
     */
 
+    static enum TestEnum { A, B, C; }
+
+    static class UntypedEnumBean
+    {
+       @JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.PROPERTY, property="__type")
+// this would actually work:
+//        @JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.WRAPPER_OBJECT)
+        public Object value;
+
+        public UntypedEnumBean() { }
+        public UntypedEnumBean(TestEnum v) { value = v; }
+    }
+
     @JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.WRAPPER_ARRAY)
     static class BaseTypeWithClassArray { }
 
@@ -101,4 +114,23 @@ public void testAsWrappedClassArray() throws Exception
         assertEquals(SubTypeWithClassArray.class, result.wrapped.getClass());
         assertEquals("Foobar", ((SubTypeWithClassArray) result.wrapped).name);
     }
+
+    // [dataformat-xml#9]
+    @JacksonTestFailureExpected
+    @Test
+    public void testUntypedEnum() throws Exception
+    {
+        String xml = MAPPER.writeValueAsString(new UntypedEnumBean(TestEnum.B));
+
+        UntypedEnumBean result = MAPPER.readValue(xml, UntypedEnumBean.class);
+        assertNotNull(result);
+        assertNotNull(result.value);
+        Object ob = result.value;
+
+        if (TestEnum.class != ob.getClass()) {
+            fail("Failed to deserialize TestEnum (got "+ob.getClass().getName()+") from: "+xml);
+        }
+
+        assertEquals(TestEnum.B, result.value);
+    }
 }