Move 4961 test out of tofix (#4965)

Author: JooHyukKim

src/test/java/com/fasterxml/jackson/databind/tofix/ShapeArrayWithAnyGetter4961Test.java renamed to src/test/java/com/fasterxml/jackson/databind/struct/ShapeArrayWithAnyGetter4961Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.tofix;
+package com.fasterxml.jackson.databind.struct;
 
 import java.util.Map;
 import java.util.TreeMap;
@@ -8,7 +8,6 @@
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
-import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -21,7 +20,6 @@ static class WrapperForAnyGetter {
         public BeanWithAnyGetter value;
     }
 
-    @JsonPropertyOrder({ "firstProperty", "secondProperties", "anyProperty", "forthProperty" })
     @JsonFormat(shape = JsonFormat.Shape.ARRAY)
     static class BeanWithAnyGetter {
         public String firstProperty = "first";
@@ -38,47 +36,22 @@ public Map<String, String> getAnyProperty() {
 
     final ObjectMapper MAPPER = newJsonMapper();
 
-    @JacksonTestFailureExpected
     @Test
     public void testSerializeArrayWithAnyGetterWithWrapper() throws Exception {
         WrapperForAnyGetter wrapper = new WrapperForAnyGetter();
         wrapper.value = new BeanWithAnyGetter();
 
         String json = MAPPER.writeValueAsString(wrapper);
 
-        // In 2.19, Fails Actual
-        //     : {"value":{"firstProperty":"first","secondProperties":"second","forthProperty":"forth","third_A":"third_A","third_B":"third_B"}}
-        // Getting better, after #4775 in 2.19, fails Actual
-        //     : {"value":["first","second",{"third_A":"third_A","third_B":"third_B"},"forth"]}
-        assertEquals(a2q("{'value':" +
-                "[" +
-                "'first'," +
-                "'second'," +
-                "'forth'," +
-                "'third_A'," +
-                "'third_B'" +
-                "]" +
-                "}"), json);
+        assertEquals(a2q("{\"value\":[\"first\",\"second\",\"forth\",{\"third_A\":\"third_A\",\"third_B\":\"third_B\"}]}"), json);
     }
 
-    @JacksonTestFailureExpected
     @Test
     public void testSerializeArrayWithAnyGetterAsRoot() throws Exception {
         BeanWithAnyGetter bean = new BeanWithAnyGetter();
 
         String json = MAPPER.writeValueAsString(bean);
 
-        // In 2.19, Fails Actual
-        //     : {"firstProperty":"first","secondProperties":"second","forthProperty":"forth","third_A":"third_A","third_B":"third_B"}
-
-        // Getting better, after #4775 in 2.19, fails Actual
-        //     : ["first","second",{"third_A":"third_A","third_B":"third_B"},"forth"]
-        assertEquals(a2q("[" +
-                "'first'," +
-                "'second'," +
-                "'forth'," +
-                "'third_A'," +
-                "'third_B'" +
-                "]"), json);
+        assertEquals(a2q("[\"first\",\"second\",\"forth\",{\"third_A\":\"third_A\",\"third_B\":\"third_B\"}]"), json);
     }
 }