aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFeng Xiao <xiaofeng@google.com>2016-09-23 16:50:42 -0700
committerGitHub <noreply@github.com>2016-09-23 16:50:42 -0700
commitc454b4433597bbce706138cb83a1aaa722ed544d (patch)
tree7a63233cb07785330054307a40fc6f0d9bad0579 /src
parent18f336b98aa21e7f735cff9186c6c1fc347ad7a6 (diff)
parent73c8723266875edccb2e006774751ebec2864626 (diff)
downloadprotobuf-c454b4433597bbce706138cb83a1aaa722ed544d.tar.gz
protobuf-c454b4433597bbce706138cb83a1aaa722ed544d.tar.bz2
protobuf-c454b4433597bbce706138cb83a1aaa722ed544d.zip
Merge pull request #2171 from xfxyjwf/fix_json
Reduce test length to avoid stack overflow on VS.
Diffstat (limited to 'src')
-rw-r--r--src/google/protobuf/util/internal/json_stream_parser_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/util/internal/json_stream_parser_test.cc b/src/google/protobuf/util/internal/json_stream_parser_test.cc
index b30d529f..d162667a 100644
--- a/src/google/protobuf/util/internal/json_stream_parser_test.cc
+++ b/src/google/protobuf/util/internal/json_stream_parser_test.cc
@@ -318,15 +318,15 @@ TEST_F(JsonStreamParserTest, ObjectKeyTypes) {
// - array containing array, object, values (true, false, null, num, string)
TEST_F(JsonStreamParserTest, ArrayValues) {
StringPiece str =
- "[true, false, null, 'a string', \"another string\", [22, -127, 45.3, "
+ "[true, false, null, 'a', \"an\", [22, -127, 45.3, "
"-1056.4, 11779497823553162765], {'key': true}]";
for (int i = 0; i <= str.length(); ++i) {
ow_.StartList("")
->RenderBool("", true)
->RenderBool("", false)
->RenderNull("")
- ->RenderString("", "a string")
- ->RenderString("", "another string")
+ ->RenderString("", "a")
+ ->RenderString("", "an")
->StartList("")
->RenderUint64("", 22)
->RenderInt64("", -127)