From 5babae98e5c75f6a34f425be9f1f436ec761d3c7 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Sun, 13 Jul 2014 13:21:25 +0800 Subject: [PATCH] Add Writer::IsComplete() --- include/rapidjson/writer.h | 4 ++++ test/unittest/writertest.cpp | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/include/rapidjson/writer.h b/include/rapidjson/writer.h index c312b74..22630c4 100644 --- a/include/rapidjson/writer.h +++ b/include/rapidjson/writer.h @@ -51,6 +51,10 @@ public: level_stack_.Clear(); } + bool IsComplete() const { + return hasRoot_ && level_stack_.Empty(); + } + //! Set the number of significant digits for \c double values /*! When writing a \c double value to the \c OutputStream, the number of significant digits is limited to 6 by default. diff --git a/test/unittest/writertest.cpp b/test/unittest/writertest.cpp index c0e83f5..64dbf24 100644 --- a/test/unittest/writertest.cpp +++ b/test/unittest/writertest.cpp @@ -15,6 +15,7 @@ TEST(Writer, Compact) { reader.Parse<0>(s, writer); EXPECT_STREQ("{\"hello\":\"world\",\"t\":true,\"f\":false,\"n\":null,\"i\":123,\"pi\":3.1416,\"a\":[1,2,3]}", buffer.GetString()); EXPECT_EQ(77u, buffer.GetSize()); + EXPECT_TRUE(writer.IsComplete()); } // json -> parse -> writer -> json @@ -26,6 +27,7 @@ TEST(Writer, Compact) { Reader reader; \ reader.Parse<0>(s, writer); \ EXPECT_STREQ(json, buffer.GetString()); \ + EXPECT_TRUE(writer.IsComplete()); \ } TEST(Writer, Int) { @@ -121,6 +123,7 @@ TEST(Writer, Transcode) { Writer, UTF8<> > writer(buffer); GenericReader, UTF16<> > reader; reader.Parse<0>(s, writer); + EXPECT_TRUE(writer.IsComplete()); EXPECT_STREQ("{\"hello\":\"world\",\"t\":true,\"f\":false,\"n\":null,\"i\":123,\"pi\":3.1416,\"a\":[1,2,3],\"dollar\":\"\x24\",\"cents\":\"\xC2\xA2\",\"euro\":\"\xE2\x82\xAC\",\"gclef\":\"\xF0\x9D\x84\x9E\"}", buffer.GetString()); } @@ -240,3 +243,31 @@ TEST(Writer, AssertMultipleRoot) { writer.EndObject(); ASSERT_THROW(writer.StartObject(), AssertException); } + +TEST(Writer, RootObjectIsComplete) { + StringBuffer buffer; + Writer writer(buffer); + EXPECT_FALSE(writer.IsComplete()); + writer.StartObject(); + EXPECT_FALSE(writer.IsComplete()); + writer.String("foo"); + EXPECT_FALSE(writer.IsComplete()); + writer.Int(1); + EXPECT_FALSE(writer.IsComplete()); + writer.EndObject(); + EXPECT_TRUE(writer.IsComplete()); +} + +TEST(Writer, RootArrayIsComplete) { + StringBuffer buffer; + Writer writer(buffer); + EXPECT_FALSE(writer.IsComplete()); + writer.StartArray(); + EXPECT_FALSE(writer.IsComplete()); + writer.String("foo"); + EXPECT_FALSE(writer.IsComplete()); + writer.Int(1); + EXPECT_FALSE(writer.IsComplete()); + writer.EndArray(); + EXPECT_TRUE(writer.IsComplete()); +} \ No newline at end of file