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

documenttest.cpp: EXPECT_THROW when checking empty allocator (closes #469)

Browse Source 
In the MoveConstructor/MoveAssignment tests, a check for a `NULL` allocator
return has been used to check for the correct moved-from state of a Document.
After the merge of #426, the GetAllocator call fails with an assertion,
if the allocator of a GenericDocument is NULL.

Check for the throw, instead of NULL in the move-related tests.
Tested with GCC 4.9 on Linux with C++11 enabled.

Reported-by: @woldendans
This commit is contained in:
Philipp A. Hartmann 2015-11-16 21:32:09 +01:00
parent b39a898269
commit c8d298bc9e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/unittest/documenttest.cpp
View File

@ -381,7 +381,7 @@ TYPED_TEST(DocumentMove, MoveConstructor) {
EXPECT_TRUE(a.IsNull()); EXPECT_TRUE(a.IsNull());
EXPECT_TRUE(b.IsArray()); EXPECT_TRUE(b.IsArray());
EXPECT_EQ(3u, b.Size()); EXPECT_EQ(3u, b.Size());
EXPECT_EQ(&a.GetAllocator(), (void*)0); EXPECT_THROW(a.GetAllocator(), AssertException);
EXPECT_EQ(&b.GetAllocator(), &allocator); EXPECT_EQ(&b.GetAllocator(), &allocator);
b.Parse("{\"Foo\": \"Bar\", \"Baz\": 42}"); b.Parse("{\"Foo\": \"Bar\", \"Baz\": 42}");
@ -394,7 +394,7 @@ TYPED_TEST(DocumentMove, MoveConstructor) {
EXPECT_TRUE(b.IsNull()); EXPECT_TRUE(b.IsNull());
EXPECT_TRUE(c.IsObject()); EXPECT_TRUE(c.IsObject());
EXPECT_EQ(2u, c.MemberCount()); EXPECT_EQ(2u, c.MemberCount());
EXPECT_EQ(&b.GetAllocator(), (void*)0); EXPECT_THROW(b.GetAllocator(), AssertException);
EXPECT_EQ(&c.GetAllocator(), &allocator); EXPECT_EQ(&c.GetAllocator(), &allocator);
} }
@ -475,7 +475,7 @@ TYPED_TEST(DocumentMove, MoveAssignment) {
EXPECT_TRUE(a.IsNull()); EXPECT_TRUE(a.IsNull());
EXPECT_TRUE(b.IsArray()); EXPECT_TRUE(b.IsArray());
EXPECT_EQ(3u, b.Size()); EXPECT_EQ(3u, b.Size());
EXPECT_EQ(&a.GetAllocator(), (void*)0); EXPECT_THROW(a.GetAllocator(), AssertException);
EXPECT_EQ(&b.GetAllocator(), &allocator); EXPECT_EQ(&b.GetAllocator(), &allocator);
b.Parse("{\"Foo\": \"Bar\", \"Baz\": 42}"); b.Parse("{\"Foo\": \"Bar\", \"Baz\": 42}");
@ -489,7 +489,7 @@ TYPED_TEST(DocumentMove, MoveAssignment) {
EXPECT_TRUE(b.IsNull()); EXPECT_TRUE(b.IsNull());
EXPECT_TRUE(c.IsObject()); EXPECT_TRUE(c.IsObject());
EXPECT_EQ(2u, c.MemberCount()); EXPECT_EQ(2u, c.MemberCount());
EXPECT_EQ(&b.GetAllocator(), (void*)0); EXPECT_THROW(b.GetAllocator(), AssertException);
EXPECT_EQ(&c.GetAllocator(), &allocator); EXPECT_EQ(&c.GetAllocator(), &allocator);
} }