Merge branch '2.x' into 3.x

Author: cowtowncoder

cbor/src/test/java/tools/jackson/dataformat/cbor/tofix/StringRef599Test.java

@@ -1,12 +1,11 @@
 package tools.jackson.dataformat.cbor.tofix;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import java.util.Arrays;
 
+import tools.jackson.core.JsonToken;
 import tools.jackson.databind.ObjectMapper;
 
-import tools.jackson.dataformat.cbor.CBORGenerator;
-import tools.jackson.dataformat.cbor.CBORTestBase;
-import tools.jackson.dataformat.cbor.CBORWriteFeature;
+import tools.jackson.dataformat.cbor.*;
 import tools.jackson.dataformat.cbor.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -15,31 +14,37 @@
 
 public class StringRef599Test extends CBORTestBase
 {
-    static class AB599 {
-        public String a;
-        public String b;
-    }
-
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    static class B599 {
-        public String b;
-    }
-    
-    private final ObjectMapper MAPPER = cborMapper(cborFactoryBuilder()
+    private final ObjectMapper VANILLA_MAPPER = cborMapper();
+    private final ObjectMapper REF_MAPPER = cborMapper(cborFactoryBuilder()
             .enable(CBORWriteFeature.STRINGREF)
             .build());
 
+    // [dataformats-binary#599]
+    @Test
+    public void testDupsNoStringRef() throws Exception
+    {
+        _testStringRef(VANILLA_MAPPER);
+    }
+
     // [dataformats-binary#599]
     @JacksonTestFailureExpected
     @Test
-    public void testStringRef() throws Exception
+    public void testDupsWithStringRef() throws Exception
+    {
+        _testStringRef(REF_MAPPER);
+    }
+
+    private void _testStringRef(ObjectMapper mapper) throws Exception
     {
-        AB599 ab = new AB599();
-        ab.a = "foo";
-        // important: has to be same String value to use StringRef
-        ab.b = ab.a;
-        byte[] cbor = MAPPER.writeValueAsBytes(ab);
-        B599 b = MAPPER.readValue(cbor, B599.class);
-        assertEquals(ab.b, b.b);
-    }    
+        byte[] cbor = mapper.writeValueAsBytes(Arrays.asList("foo", "foo"));
+        try (CBORParser p = cborParser(cbor)) {
+             assertToken(JsonToken.START_ARRAY, p.nextToken());
+             assertToken(JsonToken.VALUE_STRING, p.nextToken());
+             // important! Skip String value
+             assertToken(JsonToken.VALUE_STRING, p.nextToken());
+             // equally important; try to check second instance
+             assertEquals("foo", p.getString());
+             assertToken(JsonToken.END_ARRAY, p.nextToken());
+        }
+    }
 }