Add test & fix for CBOR too

Author: cowtowncoder

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java

@@ -1702,6 +1702,9 @@ public String getValueAsString() throws IOException
         if (_currToken == JsonToken.VALUE_STRING) {
             return _sharedString == null ? _textBuffer.contentsAsString() : _sharedString;
         }
+        if (_currToken == JsonToken.FIELD_NAME) {
+            return currentName();
+        }
         if (_currToken == null || _currToken == JsonToken.VALUE_NULL || !_currToken.isScalarValue()) {
             return null;
         }
@@ -1712,6 +1715,9 @@ public String getValueAsString() throws IOException
     public String getValueAsString(String defaultValue) throws IOException
     {
         if (_currToken != JsonToken.VALUE_STRING) {
+            if (_currToken == JsonToken.FIELD_NAME) {
+                return currentName();
+            }
             if (_currToken == null || _currToken == JsonToken.VALUE_NULL || !_currToken.isScalarValue()) {
                 return defaultValue;
             }

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/parse/BasicParserTest.java

@@ -248,9 +248,14 @@ public void testStringField() throws IOException {
         assertEquals(JsonToken.START_OBJECT, parser.nextToken());
         assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
         assertEquals("a", parser.currentName());
+        assertEquals("a", parser.getText());
+        assertEquals("a", parser.getValueAsString());
+        assertEquals("a", parser.getValueAsString("x"));
         assertEquals(JsonToken.VALUE_STRING, parser.nextToken());
         assertEquals("a", parser.currentName());
         assertEquals("b", parser.getText());
+        assertEquals("b", parser.getValueAsString());
+        assertEquals("b", parser.getValueAsString("x"));
         assertEquals(1, parser.getTextLength());
         assertEquals(JsonToken.END_OBJECT, parser.nextToken());
 
@@ -281,14 +286,23 @@ public void testNestedObject() throws IOException
 
         assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
         assertEquals("ob", parser.currentName());
+        assertEquals("ob", parser.getText());
+        assertEquals("ob", parser.getValueAsString());
+        assertEquals("ob", parser.getValueAsString("x"));
         assertEquals(JsonToken.START_OBJECT, parser.nextToken());
         assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
         assertEquals("num", parser.currentName());
+        assertEquals("num", parser.getText());
+        assertEquals("num", parser.getValueAsString());
+        assertEquals("num", parser.getValueAsString("y"));
         assertEquals(JsonToken.VALUE_NUMBER_INT, parser.nextToken());
         assertEquals(JsonToken.END_OBJECT, parser.nextToken());
 
         assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
         assertEquals("arr", parser.currentName());
+        assertEquals("arr", parser.getText());
+        assertEquals("arr", parser.getValueAsString());
+        assertEquals("arr", parser.getValueAsString("z"));
         assertEquals(JsonToken.START_ARRAY, parser.nextToken());
         assertEquals(JsonToken.END_ARRAY, parser.nextToken());