DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Fix memory func test

Browse Source 
Summary: Reset gNodeInstanceCount before memory func test.

Reviewed By: emilsjolander

Differential Revision: D4193712

fbshipit-source-id: a4aba84d054d98a7baf438e213a90bd7ef34e979
This commit is contained in:
Kazuki Sakamoto
2016-11-17 07:38:39 -08:00
committed by Facebook Github Bot
parent 56aa279fef
commit b9c4c403a9
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CSSLayout/CSSLayout.c
View File

@@ -180,7 +180,7 @@ static inline float computedEdgeValue(const float edges[CSSEdgeCount],
return defaultValue; return defaultValue;
} }
static int32_t gNodeInstanceCount = 0; int32_t gNodeInstanceCount = 0;
CSSNodeRef CSSNodeNew(void) { CSSNodeRef CSSNodeNew(void) {
const CSSNodeRef node = gCSSCalloc(1, sizeof(CSSNode)); const CSSNodeRef node = gCSSCalloc(1, sizeof(CSSNode));

6
tests/CSSLayoutMemoryFuncTest.cpp
View File

@@ -10,6 +10,8 @@
#include <CSSLayout/CSSLayout.h> #include <CSSLayout/CSSLayout.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
extern int32_t gNodeInstanceCount;
static int testMallocCount; static int testMallocCount;
static int testCallocCount; static int testCallocCount;
static int testReallocCount; static int testReallocCount;
@@ -36,6 +38,7 @@ static void testFree(void *ptr) {
} }
TEST(CSSLayoutTest, memory_func_default) { TEST(CSSLayoutTest, memory_func_default) {
gNodeInstanceCount = 0; // Reset CSSNode instance count for memory func test
CSSLayoutSetMemoryFuncs(NULL, NULL, NULL, NULL); CSSLayoutSetMemoryFuncs(NULL, NULL, NULL, NULL);
const CSSNodeRef root = CSSNodeNew(); const CSSNodeRef root = CSSNodeNew();
const CSSNodeRef root_child0 = CSSNodeNew(); const CSSNodeRef root_child0 = CSSNodeNew();
@@ -44,6 +47,7 @@ TEST(CSSLayoutTest, memory_func_default) {
} }
TEST(CSSLayoutTest, memory_func_test_funcs) { TEST(CSSLayoutTest, memory_func_test_funcs) {
gNodeInstanceCount = 0; // Reset CSSNode instance count for memory func test
CSSLayoutSetMemoryFuncs(&testMalloc, &testCalloc, &testRealloc, &testFree); CSSLayoutSetMemoryFuncs(&testMalloc, &testCalloc, &testRealloc, &testFree);
const CSSNodeRef root = CSSNodeNew(); const CSSNodeRef root = CSSNodeNew();
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
@@ -60,12 +64,14 @@ TEST(CSSLayoutTest, memory_func_test_funcs) {
#if GTEST_HAS_DEATH_TEST #if GTEST_HAS_DEATH_TEST
TEST(CSSLayoutTest, memory_func_assert_zero_nodes) { TEST(CSSLayoutTest, memory_func_assert_zero_nodes) {
gNodeInstanceCount = 0; // Reset CSSNode instance count for memory func test
const CSSNodeRef root = CSSNodeNew(); const CSSNodeRef root = CSSNodeNew();
ASSERT_DEATH(CSSLayoutSetMemoryFuncs(&testMalloc, &testCalloc, &testRealloc, &testFree), "Cannot set memory functions: all node must be freed first"); ASSERT_DEATH(CSSLayoutSetMemoryFuncs(&testMalloc, &testCalloc, &testRealloc, &testFree), "Cannot set memory functions: all node must be freed first");
CSSNodeFreeRecursive(root); CSSNodeFreeRecursive(root);
} }
TEST(CSSLayoutTest, memory_func_assert_all_non_null) { TEST(CSSLayoutTest, memory_func_assert_all_non_null) {
gNodeInstanceCount = 0; // Reset CSSNode instance count for memory func test
ASSERT_DEATH(CSSLayoutSetMemoryFuncs(NULL, &testCalloc, &testRealloc, &testFree), "Cannot set memory functions: functions must be all NULL or Non-NULL"); ASSERT_DEATH(CSSLayoutSetMemoryFuncs(NULL, &testCalloc, &testRealloc, &testFree), "Cannot set memory functions: functions must be all NULL or Non-NULL");
} }
#endif #endif