Add more Smile tests, extend fix

Author: cowtowncoder

smile/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java

@@ -1186,6 +1186,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;
             }

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

@@ -217,31 +217,39 @@ public void testTrivialObject() throws IOException
         assertToken(JsonToken.FIELD_NAME, p.nextToken());
         assertEquals("abc", p.currentName());
         assertEquals("abc", p.getText());
+        assertEquals("abc", p.getValueAsString());
+        assertEquals("abc", p.getValueAsString("xyz"));
         assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
         assertEquals(13, p.getIntValue());
-    	    assertToken(JsonToken.END_OBJECT, p.nextToken());
-    	    p.close();
+        assertToken(JsonToken.END_OBJECT, p.nextToken());
+        p.close();
     }
 
     public void testSimpleObject() throws IOException
     {
-    	byte[] data = _smileDoc("{\"a\":8, \"b\" : [ true ], \"c\" : { }, \"d\":{\"e\":null}}");
-    	SmileParser p = _smileParser(data);
-    	assertNull(p.getCurrentToken());
-    	assertToken(JsonToken.START_OBJECT, p.nextToken());
+        byte[] data = _smileDoc("{\"a\":8, \"b\" : [ true ], \"c\" : { }, \"d\":{\"e\":null}}");
+        SmileParser p = _smileParser(data);
+        assertNull(p.currentToken());
+        assertToken(JsonToken.START_OBJECT, p.nextToken());
 
-    	assertToken(JsonToken.FIELD_NAME, p.nextToken());
+        assertToken(JsonToken.FIELD_NAME, p.nextToken());
         assertEquals("a", p.currentName());
-    	assertEquals("a", p.getText());
+        assertEquals("a", p.getText());
         assertEquals("a", p.getValueAsString());
-    	assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
-    	assertEquals(8, p.getIntValue());
+        assertEquals("a", p.getValueAsString("x"));
 
-    	assertToken(JsonToken.FIELD_NAME, p.nextToken());
-    	assertEquals("b", p.currentName());
-    	assertToken(JsonToken.START_ARRAY, p.nextToken());
-    	assertToken(JsonToken.VALUE_TRUE, p.nextToken());
-    	assertToken(JsonToken.END_ARRAY, p.nextToken());
+        assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
+        assertEquals(8, p.getIntValue());
+
+        assertToken(JsonToken.FIELD_NAME, p.nextToken());
+        assertEquals("b", p.currentName());
+        assertEquals("b", p.getText());
+        assertEquals("b", p.getValueAsString());
+        assertEquals("b", p.getValueAsString("y"));
+
+        assertToken(JsonToken.START_ARRAY, p.nextToken());
+        assertToken(JsonToken.VALUE_TRUE, p.nextToken());
+        assertToken(JsonToken.END_ARRAY, p.nextToken());
 
     	assertToken(JsonToken.FIELD_NAME, p.nextToken());
     	assertEquals("c", p.currentName());
@@ -286,8 +294,8 @@ public void testNestedObject() throws IOException
 
     public void testJsonSampleDoc() throws IOException
     {
-    	byte[] data = _smileDoc(SAMPLE_DOC_JSON_SPEC);
-    	verifyJsonSpecSampleDoc(_smileParser(data), true);
+        byte[] data = _smileDoc(SAMPLE_DOC_JSON_SPEC);
+        verifyJsonSpecSampleDoc(_smileParser(data), true);
     }
 
     public void testUnicodeStringValues() throws IOException