From 6863033652ff720551dbf01db66c639dc693e7b9 Mon Sep 17 00:00:00 2001 From: "Philipp A. Hartmann" Date: Mon, 11 Aug 2014 17:27:38 +0200 Subject: [PATCH] readertest.cpp: remove remaining use of private functions --- test/unittest/readertest.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/unittest/readertest.cpp b/test/unittest/readertest.cpp index 9a19f967..09560d82 100644 --- a/test/unittest/readertest.cpp +++ b/test/unittest/readertest.cpp @@ -20,7 +20,6 @@ #include "unittest.h" -#define private public // For testing private members #include "rapidjson/reader.h" using namespace rapidjson; @@ -733,7 +732,7 @@ TEST(Reader, CustomStringStream) { CustomStringStream > s(json); ParseObjectHandler h; Reader reader; - reader.ParseObject<0>(s, h); + reader.Parse(s, h); EXPECT_EQ(20u, h.step_); } @@ -777,7 +776,7 @@ TEST(Reader, Parse_IStreamWrapper_StringStream) { Reader reader; ParseArrayHandler<4> h; - reader.ParseArray<0>(is, h); + reader.Parse(is, h); EXPECT_FALSE(reader.HasParseError()); } @@ -788,7 +787,7 @@ TEST(Reader, Parse_IStreamWrapper_StringStream) { StringStream json(text); \ BaseReaderHandler<> handler; \ Reader reader; \ - reader.IterativeParse(json, handler); \ + reader.Parse(json, handler); \ EXPECT_TRUE(reader.HasParseError()); \ EXPECT_EQ(errorCode, reader.GetParseErrorCode()); \ EXPECT_EQ(offset, reader.GetErrorOffset()); \ @@ -872,7 +871,7 @@ TEST(Reader, IterativeParsing_General) { Reader reader; IterativeParsingReaderHandler<> handler; - ParseResult r = reader.IterativeParse(is, handler); + ParseResult r = reader.Parse(is, handler); EXPECT_FALSE(r.IsError()); EXPECT_FALSE(reader.HasParseError()); @@ -909,7 +908,7 @@ TEST(Reader, IterativeParsing_Count) { Reader reader; IterativeParsingReaderHandler<> handler; - ParseResult r = reader.IterativeParse(is, handler); + ParseResult r = reader.Parse(is, handler); EXPECT_FALSE(r.IsError()); EXPECT_FALSE(reader.HasParseError());