generic-library/rapidjson
1
0
Fork 0
mirror of https://github.com/Tencent/rapidjson.git synced 2025-10-28 03:20:15 +01:00
Code Issues Projects Releases Wiki Activity

Manually merge the segfault fix from main branch and fix several unit tests about error code

Browse Source
This commit is contained in:
Milo Yip
2014-06-27 22:27:18 +08:00
parent b0059483c8
commit 69ca7487bc
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/unittest/readertest.cpp
View File

@@ -335,8 +335,8 @@ TEST(Reader, ParseString_Error) {
TEST_STRING_ERROR(kParseErrorStringUnicodeEscapeInvalidHex, "[\"\\uABCG\"]");
// The surrogate pair in string is invalid.
TEST_STRING_ERROR(kParseErrorStringUnicodeEscapeInvalidHex, "[\"\\uD800X\"]");
TEST_STRING_ERROR(kParseErrorStringUnicodeEscapeInvalidHex, "[\"\\uD800\\uFFFF\"]");
TEST_STRING_ERROR(kParseErrorStringUnicodeSurrogateInvalid, "[\"\\uD800X\"]");
TEST_STRING_ERROR(kParseErrorStringUnicodeSurrogateInvalid, "[\"\\uD800\\uFFFF\"]");
// Missing a closing quotation mark in string.
TEST_STRING_ERROR(kParseErrorStringMissQuotationMark, "[\"Test]");
@@ -352,7 +352,7 @@ TEST(Reader, ParseString_Error) {
e[2] = c;
ParseErrorCode error = TestString(e);
EXPECT_EQ(kParseErrorStringInvalidEncoding, error);
if (error != kParseErrorNone)
if (error != kParseErrorStringInvalidEncoding)
std::cout << (unsigned)(unsigned char)c << std::endl;
}
}
@@ -443,8 +443,8 @@ TEST(Reader, ParseArray_Error) {
}
// Missing a comma or ']' after an array element.
TEST_ARRAY_ERROR(kParseErrorArrayMissCommaOrSquareBracket, "[");
TEST_ARRAY_ERROR(kParseErrorArrayMissCommaOrSquareBracket, "[}");
TEST_ARRAY_ERROR(kParseErrorArrayMissCommaOrSquareBracket, "[1");
TEST_ARRAY_ERROR(kParseErrorArrayMissCommaOrSquareBracket, "[1}");
TEST_ARRAY_ERROR(kParseErrorArrayMissCommaOrSquareBracket, "[1 2]");
#undef TEST_ARRAY_ERROR
@@ -590,8 +590,6 @@ TEST(Reader, ParseObject_Error) {
TEST_ERROR(kParseErrorObjectMissColon, "{\"a\",1}");
// Must be a comma or '}' after an object member
TEST_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, "{");
TEST_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, "{]");
TEST_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, "{\"a\":1]");
}