Merge pull request #1252 from mohitchugh/mohitchugh-writeContext-unittest

Added a unit test to illustrate the issue with the JsonWriteContext i…

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/filter/TestJsonFilter.java

@@ -2,8 +2,12 @@
 
 import com.fasterxml.jackson.annotation.*;
 
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonStreamContext;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.ser.FilterProvider;
+import com.fasterxml.jackson.databind.ser.PropertyWriter;
 import com.fasterxml.jackson.databind.ser.impl.*;
 
 /**
@@ -19,6 +23,46 @@ static class Bean {
         public String b = "b";
     }
 
+    @JsonFilter("checkSiblingContextFilter")
+    static class CheckSiblingContextBean {
+        public A a = new A();
+        public B b = new B();
+        @JsonFilter("checkSiblingContextFilter")
+        static class A {
+        }
+        @JsonFilter("checkSiblingContextFilter")
+        static class B {
+            public C c = new C();
+            @JsonFilter("checkSiblingContextFilter")
+            static class C {
+            }
+        }
+    }
+
+    static class CheckSiblingContextFilter extends SimpleBeanPropertyFilter {
+        @Override
+        public void serializeAsField(Object bean, JsonGenerator jgen, SerializerProvider prov, PropertyWriter writer) throws Exception {
+            JsonStreamContext sc = jgen.getOutputContext();
+
+            if (writer.getName() != null && writer.getName().equals("c")) {
+                //This assertion is failing as sc.getParent() incorrectly returns 'a'. If you comment out the member 'a'
+                // in the CheckSiblingContextBean, you'll see that the sc.getParent() correctly returns 'b'
+                assertEquals("b", sc.getParent().getCurrentName());
+            }
+            writer.serializeAsField(bean, jgen, prov);
+        }
+    }
+
+    public void testCheckSiblingContextFilter() {
+        FilterProvider prov = new SimpleFilterProvider().addFilter("checkSiblingContextFilter",
+                new CheckSiblingContextFilter());
+
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.setFilterProvider(prov);
+        mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+        mapper.valueToTree(new CheckSiblingContextBean());
+    }
+
     // [Issue#89]
     static class Pod
     {

src/test/java/com/fasterxml/jackson/databind/util/TestTokenBuffer.java

@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.core.util.JsonParserSequence;
 import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.internet.HeaderTokenizer;
 
 public class TestTokenBuffer extends BaseMapTest
 {
@@ -54,6 +55,41 @@ public void testSimpleWrites() throws IOException
         buf.close();
     }
 
+    public void testParentContext() throws IOException
+    {
+        TokenBuffer buf = new TokenBuffer(null, false); // no ObjectCodec
+        buf.writeStartObject();
+        buf.writeFieldName("b");
+        buf.writeStartObject();
+        buf.writeFieldName("c");
+        //This assertion succeeds as expected
+        assertEquals("b", buf.getOutputContext().getParent().getCurrentName());
+        buf.writeString("cval");
+        buf.writeEndObject();
+        buf.writeEndObject();
+        buf.close();
+    }
+
+    public void testParentSiblingContext() throws IOException
+    {
+        TokenBuffer buf = new TokenBuffer(null, false); // no ObjectCodec
+
+        buf.writeStartObject();
+        buf.writeFieldName("a");
+        buf.writeStartObject();
+        buf.writeEndObject();
+
+        buf.writeFieldName("b");
+        buf.writeStartObject();
+        buf.writeFieldName("c");
+        //This assertion fails (because of 'a')
+        assertEquals("b", buf.getOutputContext().getParent().getCurrentName());
+        buf.writeString("cval");
+        buf.writeEndObject();
+        buf.writeEndObject();
+        buf.close();
+    }
+
     public void testSimpleArray() throws IOException
     {
         TokenBuffer buf = new TokenBuffer(null, false); // no ObjectCodec