gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

readertest.cpp: remove remaining use of private functions

Browse Source
This commit is contained in:
Philipp A. Hartmann 2014-08-11 17:27:38 +02:00
parent 453eda5f94
commit 6863033652
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/unittest/readertest.cpp
View File

@ -20,7 +20,6 @@
#include "unittest.h" #include "unittest.h"
#define private public // For testing private members
#include "rapidjson/reader.h" #include "rapidjson/reader.h"
using namespace rapidjson; using namespace rapidjson;
@ -733,7 +732,7 @@ TEST(Reader, CustomStringStream) {
CustomStringStream<UTF8<char> > s(json); CustomStringStream<UTF8<char> > s(json);
ParseObjectHandler h; ParseObjectHandler h;
Reader reader; Reader reader;
reader.ParseObject<0>(s, h); reader.Parse(s, h);
EXPECT_EQ(20u, h.step_); EXPECT_EQ(20u, h.step_);
} }
@ -777,7 +776,7 @@ TEST(Reader, Parse_IStreamWrapper_StringStream) {
Reader reader; Reader reader;
ParseArrayHandler<4> h; ParseArrayHandler<4> h;
reader.ParseArray<0>(is, h); reader.Parse(is, h);
EXPECT_FALSE(reader.HasParseError()); EXPECT_FALSE(reader.HasParseError());
} }
@ -788,7 +787,7 @@ TEST(Reader, Parse_IStreamWrapper_StringStream) {
StringStream json(text); \ StringStream json(text); \
BaseReaderHandler<> handler; \ BaseReaderHandler<> handler; \
Reader reader; \ Reader reader; \
reader.IterativeParse<kParseDefaultFlags>(json, handler); \ reader.Parse<kParseIterativeFlag>(json, handler); \
EXPECT_TRUE(reader.HasParseError()); \ EXPECT_TRUE(reader.HasParseError()); \
EXPECT_EQ(errorCode, reader.GetParseErrorCode()); \ EXPECT_EQ(errorCode, reader.GetParseErrorCode()); \
EXPECT_EQ(offset, reader.GetErrorOffset()); \ EXPECT_EQ(offset, reader.GetErrorOffset()); \
@ -872,7 +871,7 @@ TEST(Reader, IterativeParsing_General) {
Reader reader; Reader reader;
IterativeParsingReaderHandler<> handler; IterativeParsingReaderHandler<> handler;
ParseResult r = reader.IterativeParse<kParseIterativeFlag>(is, handler); ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
EXPECT_FALSE(r.IsError()); EXPECT_FALSE(r.IsError());
EXPECT_FALSE(reader.HasParseError()); EXPECT_FALSE(reader.HasParseError());
@ -909,7 +908,7 @@ TEST(Reader, IterativeParsing_Count) {
Reader reader; Reader reader;
IterativeParsingReaderHandler<> handler; IterativeParsingReaderHandler<> handler;
ParseResult r = reader.IterativeParse<kParseIterativeFlag>(is, handler); ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
EXPECT_FALSE(r.IsError()); EXPECT_FALSE(r.IsError());
EXPECT_FALSE(reader.HasParseError()); EXPECT_FALSE(reader.HasParseError());