espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-10-16 19:52:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move free() calls before test asserts, add comments to ReallocFail test

Browse Source
This commit is contained in:
jsalling
2016-08-21 11:45:54 -05:00
parent 03ac71b8c9
commit d837342b15
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extras/fixture/test/unity_fixture_Test.c
View File

@ -488,9 +488,9 @@ TEST(InternalMalloc, MallocPastBufferFails)
#ifdef UNITY_EXCLUDE_STDLIB_MALLOC #ifdef UNITY_EXCLUDE_STDLIB_MALLOC
void* m = malloc(UNITY_INTERNAL_HEAP_SIZE_BYTES/2 + 1); void* m = malloc(UNITY_INTERNAL_HEAP_SIZE_BYTES/2 + 1);
void* n = malloc(UNITY_INTERNAL_HEAP_SIZE_BYTES/2); void* n = malloc(UNITY_INTERNAL_HEAP_SIZE_BYTES/2);
free(m);
TEST_ASSERT_NOT_NULL(m); TEST_ASSERT_NOT_NULL(m);
TEST_ASSERT_NULL(n); TEST_ASSERT_NULL(n);
free(m);
#endif #endif
} }
@ -499,9 +499,9 @@ TEST(InternalMalloc, CallocPastBufferFails)
#ifdef UNITY_EXCLUDE_STDLIB_MALLOC #ifdef UNITY_EXCLUDE_STDLIB_MALLOC
void* m = calloc(1, UNITY_INTERNAL_HEAP_SIZE_BYTES/2 + 1); void* m = calloc(1, UNITY_INTERNAL_HEAP_SIZE_BYTES/2 + 1);
void* n = calloc(1, UNITY_INTERNAL_HEAP_SIZE_BYTES/2); void* n = calloc(1, UNITY_INTERNAL_HEAP_SIZE_BYTES/2);
free(m);
TEST_ASSERT_NOT_NULL(m); TEST_ASSERT_NOT_NULL(m);
TEST_ASSERT_NULL(n); TEST_ASSERT_NULL(n);
free(m);
#endif #endif
} }
@ -510,9 +510,9 @@ TEST(InternalMalloc, MallocThenReallocGrowsMemoryInPlace)
#ifdef UNITY_EXCLUDE_STDLIB_MALLOC #ifdef UNITY_EXCLUDE_STDLIB_MALLOC
void* m = malloc(UNITY_INTERNAL_HEAP_SIZE_BYTES/2 + 1); void* m = malloc(UNITY_INTERNAL_HEAP_SIZE_BYTES/2 + 1);
void* n = realloc(m, UNITY_INTERNAL_HEAP_SIZE_BYTES/2 + 9); void* n = realloc(m, UNITY_INTERNAL_HEAP_SIZE_BYTES/2 + 9);
free(n);
TEST_ASSERT_NOT_NULL(m); TEST_ASSERT_NOT_NULL(m);
TEST_ASSERT_EQUAL(m, n); TEST_ASSERT_EQUAL(m, n);
free(n);
#endif #endif
} }
@ -526,8 +526,9 @@ TEST(InternalMalloc, ReallocFailDoesNotFreeMem)
free(n2); free(n2);
if (out_of_mem == NULL) free(n1); if (out_of_mem == NULL) free(n1);
free(m); free(m);
TEST_ASSERT_NOT_NULL(m);
TEST_ASSERT_NULL(out_of_mem); TEST_ASSERT_NOT_NULL(m); // Got a real memory location
TEST_ASSERT_NOT_EQUAL(n2, n1); TEST_ASSERT_NULL(out_of_mem); // The realloc should have failed
TEST_ASSERT_NOT_EQUAL(n2, n1); // If n1 != n2 then realloc did not free n1
#endif #endif
} }