1 files changed, 13 insertions, 11 deletions

diff --git a/mempool/test/mempool_test.c b/mempool/test/mempool_test.c
index 843f7e7..6d904bc 100644
--- a/mempool/test/mempool_test.c
+++ b/mempool/test/mempool_test.c
@@ -39,7 +39,7 @@ TEST_CASE(mempool_allocate_until_full) {
 
   for (int i = 0; i < NUM_BLOCKS; ++i) {
     const int* block = mempool_alloc(&pool);
-    TEST_TRUE(block != 0);
+    TEST_TRUE(block != nullptr);
   }
 
   TEST_TRUE(mempool_size(&pool) == NUM_BLOCKS);
@@ -50,10 +50,10 @@ TEST_CASE(mempool_fill_then_free) {
   test_pool pool;
   mempool_make(&pool);
 
-  int* blocks[NUM_BLOCKS] = {0};
+  int* blocks[NUM_BLOCKS] = {nullptr};
   for (int i = 0; i < NUM_BLOCKS; ++i) {
     blocks[i] = mempool_alloc(&pool);
-    TEST_TRUE(blocks[i] != 0);
+    TEST_TRUE(blocks[i] != nullptr);
   }
 
   for (int i = 0; i < NUM_BLOCKS; ++i) {
@@ -74,7 +74,7 @@ TEST_CASE(mempool_allocate_beyond_max_size) {
 
   // Fully allocate the pool.
   for (int i = 0; i < NUM_BLOCKS; ++i) {
-    TEST_TRUE(mempool_alloc(&pool) != 0);
+    TEST_TRUE(mempool_alloc(&pool) != nullptr);
   }
 
   // Past the end.
@@ -105,7 +105,7 @@ TEST_CASE(mempool_zero_free_block_after_free) {
   mempool_make(&pool);
 
   int* val = mempool_alloc(&pool);
-  TEST_TRUE(val != 0);
+  TEST_TRUE(val != nullptr);
   *val = 177;
 
   int* old_val = val;
@@ -131,7 +131,7 @@ TEST_CASE(mempool_traverse_partially_full) {
 
   for (int i = 0; i < N; ++i) {
     int* val = mempool_alloc(&pool);
-    TEST_TRUE(val != 0);
+    TEST_TRUE(val != nullptr);
     *val = i + 1;
   }
 
@@ -146,7 +146,7 @@ TEST_CASE(mempool_traverse_full) {
 
   for (int i = 0; i < NUM_BLOCKS; ++i) {
     int* val = mempool_alloc(&pool);
-    TEST_TRUE(val != 0);
+    TEST_TRUE(val != nullptr);
     *val = i + 1;
   }
 
@@ -161,7 +161,7 @@ TEST_CASE(mempool_get_block) {
 
   for (int i = 0; i < NUM_BLOCKS; ++i) {
     int* block = mempool_alloc(&pool);
-    TEST_TRUE(block != 0);
+    TEST_TRUE(block != nullptr);
     *block = i;
     TEST_EQUAL(mempool_get_block_index(&pool, block), (size_t)i);
   }
@@ -178,16 +178,18 @@ TEST_CASE(mem_clear_then_reuse) {
 
   // Allocate chunks, contents not important.
   for (int i = 0; i < NUM_BLOCKS; ++i) {
-    int* chunk = mempool_alloc(&mem);
-    TEST_TRUE(chunk != 0);
+    const int* chunk = mempool_alloc(&mem);
+    TEST_TRUE(chunk != nullptr);
   }
 
   mempool_clear(&mem);
+  TEST_EQUAL(mempool_size(&mem), 0);
+  TEST_EQUAL(mempool_capacity(&mem), NUM_BLOCKS);
 
   // Allocate chunks and assign values 0..N.
   for (int i = 0; i < NUM_BLOCKS; ++i) {
     int* chunk = mempool_alloc(&mem);
-    TEST_TRUE(chunk != 0);
+    TEST_TRUE(chunk != nullptr);
     *chunk = i + 1;
   }