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

Add unittests for kParserErrorTermination; Fix bugs in last merge.

Browse Source
This commit is contained in:
thebusytypist
2014-07-15 00:51:34 +08:00
parent d4da07c5fb
commit 46e89dad0d
2 changed files with 87 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
test/unittest/readertest.cpp
View File

@@ -707,7 +707,7 @@ TEST(Reader, Parse_IStreamWrapper_StringStream) {
EXPECT_FALSE(reader.HasParseError());
}
#define TESTERRORHANDLING(text, errorCode)\
#define TESTERRORHANDLING(text, errorCode, offset)\
{\
StringStream json(text);\
BaseReaderHandler<> handler;\
@@ -715,20 +715,21 @@ TEST(Reader, Parse_IStreamWrapper_StringStream) {
reader.IterativeParse<kParseDefaultFlags>(json, handler);\
EXPECT_TRUE(reader.HasParseError());\
EXPECT_EQ(errorCode, reader.GetParseErrorCode());\
EXPECT_EQ(offset, reader.GetErrorOffset());\
}
TEST(Reader, IterativeParsing_ErrorHandling) {
TESTERRORHANDLING("{\"a\": a}", kParseErrorValueInvalid);
TESTERRORHANDLING("{\"a\": a}", kParseErrorValueInvalid, 6);
TESTERRORHANDLING("", kParseErrorDocumentEmpty);
TESTERRORHANDLING("1", kParseErrorDocumentRootNotObjectOrArray);
TESTERRORHANDLING("{}{}", kParseErrorDocumentRootNotSingular);
TESTERRORHANDLING("", kParseErrorDocumentEmpty, 0);
TESTERRORHANDLING("1", kParseErrorDocumentRootNotObjectOrArray, 0);
TESTERRORHANDLING("{}{}", kParseErrorDocumentRootNotSingular, 2);
TESTERRORHANDLING("{1}", kParseErrorObjectMissName);
TESTERRORHANDLING("{\"a\", 1}", kParseErrorObjectMissColon);
TESTERRORHANDLING("{\"a\"}", kParseErrorObjectMissColon);
TESTERRORHANDLING("{\"a\": 1", kParseErrorObjectMissCommaOrCurlyBracket);
TESTERRORHANDLING("[1 2 3]", kParseErrorArrayMissCommaOrSquareBracket);
TESTERRORHANDLING("{1}", kParseErrorObjectMissName, 1);
TESTERRORHANDLING("{\"a\", 1}", kParseErrorObjectMissColon, 4);
TESTERRORHANDLING("{\"a\"}", kParseErrorObjectMissColon, 4);
TESTERRORHANDLING("{\"a\": 1", kParseErrorObjectMissCommaOrCurlyBracket, 7);
TESTERRORHANDLING("[1 2 3]", kParseErrorArrayMissCommaOrSquareBracket, 3);
}
// Test iterative parsing.
@@ -1220,6 +1221,73 @@ TEST(Reader, IterativeParsing_StateTransition_ElementDelimiter) {
}
}
// Test iterative parsing on kParseErrorTermination.
struct HandlerTerminateAtStartObject : public IterativeParsingReaderHandler<> {
bool StartObject() { return false; }
};
struct HandlerTerminateAtStartArray : public IterativeParsingReaderHandler<> {
bool StartArray() { return false; }
};
struct HandlerTerminateAtEndObject : public IterativeParsingReaderHandler<> {
bool EndObject(SizeType) { return false; }
};
struct HandlerTerminateAtEndArray : public IterativeParsingReaderHandler<> {
bool EndArray(SizeType) { return false; }
};
TEST(Reader, IterativeParsing_ShortCircuit) {
{
HandlerTerminateAtStartObject handler;
Reader reader;
StringStream is("[1, {}]");
ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
EXPECT_TRUE(reader.HasParseError());
EXPECT_EQ(kParseErrorTermination, r.Code());
EXPECT_EQ(4, r.Offset());
}
{
HandlerTerminateAtStartArray handler;
Reader reader;
StringStream is("{\"a\": []}");
ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
EXPECT_TRUE(reader.HasParseError());
EXPECT_EQ(kParseErrorTermination, r.Code());
EXPECT_EQ(6, r.Offset());
}
{
HandlerTerminateAtEndObject handler;
Reader reader;
StringStream is("[1, {}]");
ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
EXPECT_TRUE(reader.HasParseError());
EXPECT_EQ(kParseErrorTermination, r.Code());
EXPECT_EQ(5, r.Offset());
}
{
HandlerTerminateAtEndArray handler;
Reader reader;
StringStream is("{\"a\": []}");
ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
EXPECT_TRUE(reader.HasParseError());
EXPECT_EQ(kParseErrorTermination, r.Code());
EXPECT_EQ(7, r.Offset());
}
}
#ifdef __GNUC__
RAPIDJSON_DIAG_POP
#endif