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

Merge branch 'movetestleak'

Browse Source
This commit is contained in:
Milo Yip
2015-01-14 23:03:04 +08:00
parent ff4251968e 7c47cd3498
commit 24dd7ef839
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/unittest/documenttest.cpp
View File

@@ -348,6 +348,10 @@ TYPED_TEST(DocumentMove, MoveConstructorParseError) {
EXPECT_EQ(c.GetErrorOffset(), error.Offset()); EXPECT_EQ(c.GetErrorOffset(), error.Offset());
} }
// This test does not properly use parsing, just for testing.
// It must call ClearStack() explicitly to prevent memory leak.
// But here we cannot as ClearStack() is private.
#if 0
TYPED_TEST(DocumentMove, MoveConstructorStack) { TYPED_TEST(DocumentMove, MoveConstructorStack) {
typedef TypeParam Allocator; typedef TypeParam Allocator;
typedef UTF8<> Encoding; typedef UTF8<> Encoding;
@@ -372,6 +376,7 @@ TYPED_TEST(DocumentMove, MoveConstructorStack) {
EXPECT_EQ(b.GetStackCapacity(), defaultCapacity); EXPECT_EQ(b.GetStackCapacity(), defaultCapacity);
EXPECT_EQ(c.GetStackCapacity(), capacity); EXPECT_EQ(c.GetStackCapacity(), capacity);
} }
#endif
TYPED_TEST(DocumentMove, MoveAssignment) { TYPED_TEST(DocumentMove, MoveAssignment) {
typedef TypeParam Allocator; typedef TypeParam Allocator;
@@ -440,6 +445,10 @@ TYPED_TEST(DocumentMove, MoveAssignmentParseError) {
EXPECT_EQ(c.GetErrorOffset(), error.Offset()); EXPECT_EQ(c.GetErrorOffset(), error.Offset());
} }
// This test does not properly use parsing, just for testing.
// It must call ClearStack() explicitly to prevent memory leak.
// But here we cannot as ClearStack() is private.
#if 0
TYPED_TEST(DocumentMove, MoveAssignmentStack) { TYPED_TEST(DocumentMove, MoveAssignmentStack) {
typedef TypeParam Allocator; typedef TypeParam Allocator;
typedef UTF8<> Encoding; typedef UTF8<> Encoding;
@@ -466,6 +475,7 @@ TYPED_TEST(DocumentMove, MoveAssignmentStack) {
EXPECT_EQ(b.GetStackCapacity(), defaultCapacity); EXPECT_EQ(b.GetStackCapacity(), defaultCapacity);
EXPECT_EQ(c.GetStackCapacity(), capacity); EXPECT_EQ(c.GetStackCapacity(), capacity);
} }
#endif
#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS #endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS

16
test/unittest/unittest.cpp
View File

@@ -21,10 +21,20 @@
#include "unittest.h" #include "unittest.h"
int main(int argc, char **argv) { int main(int argc, char **argv) {
::testing::InitGoogleTest(&argc, argv);
#if _MSC_VER #if _MSC_VER
_CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF ); _CrtMemState memoryState = { 0 };
_CrtMemCheckpoint(&memoryState);
//_CrtSetBreakAlloc(X);
//void *testWhetherMemoryLeakDetectionWorks = malloc(1); //void *testWhetherMemoryLeakDetectionWorks = malloc(1);
#endif #endif
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS(); int ret = RUN_ALL_TESTS();
#if _MSC_VER
// Current gtest constantly leak 2 blocks at exit
_CrtMemDumpAllObjectsSince(&memoryState);
#endif
return ret;
} }