GODRIVER-611 Fix extJSONParser.advanceState() for string in array

Change-Id: Iab003ef689dab676c15353e93b747c1d75fd2d12

Author: Isabella Siu

bson/bsonrw/extjson_parser.go

@@ -468,7 +468,14 @@ func (ejp *extJSONParser) advanceState() {
 		}
 	case jttString:
 		switch ejp.s {
-		case jpsSawBeginObject, jpsSawComma:
+		case jpsSawComma:
+			if ejp.peekMode() == jpmArrayMode {
+				ejp.s = jpsSawValue
+				ejp.v = extendJSONToken(jt)
+				return
+			}
+			fallthrough
+		case jpsSawBeginObject:
 			ejp.s = jpsSawKey
 			ejp.k = jt.v.(string)
 			return

bson/bsonrw/extjson_parser_test.go

@@ -451,7 +451,7 @@ func TestExtJSONParserAllTypes(t *testing.T) {
 			, "CodeWithScope"		: { "$code": "function() {}", "$scope": { "x": 1 } }
 			, "EmptySubdocument"    : {}
 			, "Subdocument"			: { "foo": "bar", "baz": { "$numberInt": "42" } }
-			, "Array"				: [{"$numberInt": "1"}, {"$numberLong": "2"}, {"$numberDouble": "3"}, 4, 5.0]
+			, "Array"				: [{"$numberInt": "1"}, {"$numberLong": "2"}, {"$numberDouble": "3"}, 4, "string", 5.0]
 			, "Timestamp"			: { "$timestamp": { "t": 42, "i": 1 } }
 			, "RegularExpression"	: { "$regularExpression": { "pattern": "foo*", "options": "ix" } }
 			, "DatetimeEpoch"		: { "$date": { "$numberLong": "0" } }
@@ -572,6 +572,7 @@ func TestExtJSONParserAllTypes(t *testing.T) {
 				{typ: bsontype.Int64, val: &extJSONValue{t: bsontype.String, v: "2"}},
 				{typ: bsontype.Double, val: &extJSONValue{t: bsontype.String, v: "3"}},
 				{typ: bsontype.Int32, val: &extJSONValue{t: bsontype.Int32, v: int32(4)}},
+				{typ: bsontype.String, val: &extJSONValue{t: bsontype.String, v: "string"}},
 				{typ: bsontype.Double, val: &extJSONValue{t: bsontype.Double, v: 5.0}},
 			},
 		},