--- a/test/mpool_tests.c Sat Feb 18 18:36:30 2012 +0100
+++ b/test/mpool_tests.c Mon Feb 20 15:30:45 2012 +0100
@@ -2,82 +2,169 @@
*
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
#include "mpool_tests.h"
-int cmp_value = 2;
+UCX_TEST_BEGIN(test_ucx_mempool_new) {
+ UcxMempool *pool = ucx_mempool_new(16);
+
+ UCX_TEST_ASSERT(pool->size == 16, "wrong size")
+ UCX_TEST_ASSERT(pool->ndata == 0, "uninitialized counter")
+ UCX_TEST_ASSERT(pool->data != NULL, "no memory addressed")
+
+ ucx_mempool_free(pool);
+
+ UCX_TEST_END
+}
-void int_destructor(int *ptr) {
- if(*ptr != cmp_value) {
- fprintf(stderr, "ucx_mempool_free failed: wrong order\n");
- return;
- }
- cmp_value += 2;
+UCX_TEST_BEGIN(test_ucx_mempool_malloc) {
+
+ UcxMempool *pool = ucx_mempool_new(1);
+
+ int *test = (int*) ucx_mempool_malloc(pool, sizeof(int));
+
+ UCX_TEST_ASSERT(pool->ndata == 1, "counter not incremented")
+ UCX_TEST_ASSERT(pool->size == 1, "chcap called")
+
+ int *pooladdr = (int*)((char*)pool->data[0] + sizeof(ucx_destructor));
+ *pooladdr = 5;
+
+ UCX_TEST_ASSERT(*test == 5, "wrong pointer")
+
+ ucx_mempool_free(pool);
+
+ UCX_TEST_END
}
-void hello_destructor(char *str) {
- if(strcmp(str, "Hello World!") != 0) {
- fprintf(stderr, "ucx_mempool_reg_destr failed\n");
- }
+UCX_TEST_BEGIN(test_ucx_mempool_malloc_with_chcap) {
+
+ UcxMempool *pool = ucx_mempool_new(1);
+
+ ucx_mempool_malloc(pool, sizeof(int));
+ int *test = (int*) ucx_mempool_malloc(pool, sizeof(int));
+
+ UCX_TEST_ASSERT(pool->ndata == 2, "counter not incremented")
+ UCX_TEST_ASSERT(pool->size == 17, "chcap not called")
+
+ int *pooladdr = (int*)((char*)pool->data[1] + sizeof(ucx_destructor));
+ *pooladdr = 5;
+
+ UCX_TEST_ASSERT(*test == 5, "wrong pointer")
+
+ ucx_mempool_free(pool);
+
+ UCX_TEST_END
+}
+
+UCX_TEST_BEGIN(test_ucx_mempool_calloc) {
+
+ UcxMempool *pool = ucx_mempool_new(1);
+
+ int *test = (int*) ucx_mempool_calloc(pool, 2, sizeof(int));
+
+ UCX_TEST_ASSERT(test != NULL, "no memory for test data")
+ UCX_TEST_ASSERT(test[0] == 0 && test[1] == 0, "failed")
+
+ ucx_mempool_free(pool);
+
+ UCX_TEST_END
+}
+
+void test_setdestr(void* elem) {
+ int *cb = (int*) ((int*) elem)[1];
+ *cb = 42;
}
-int mpool_tests() {
- int r = 0;
-
- printf(" Test ucx_mempool_new\n");
- UcxMempool *pool = ucx_mempool_new(16);
+UCX_TEST_BEGIN(test_ucx_mempool_set_destr) {
+
+ UcxMempool *pool = ucx_mempool_new(2);
+
+ ucx_mempool_malloc(pool, sizeof(int));
+ int *test = (int*) ucx_mempool_calloc(pool, 2, sizeof(int));
+
+ int *cb = (int*) malloc(sizeof(int));
+ UCX_TEST_ASSERT(cb != NULL && test != NULL, "no memory for test data")
+
+ test[0] = 5; test[1] = (int) cb;
+ *cb = 13;
+
+ ucx_mempool_set_destr(test, test_setdestr);
+
+ UCX_TEST_ASSERT(
+ *(ucx_destructor*)(pool->data[1]) == test_setdestr, "failed")
+ UCX_TEST_ASSERT(
+ test[0] == 5 && test[1] == (int) cb, "setdestr destroyed data")
+
+ ucx_mempool_free(pool);
+
+ UCX_TEST_ASSERT(*cb == 42, "destructor not called")
- printf(" Test ucx_mempool_malloc\n");
- int *ptr1 = (int*)ucx_mempool_malloc(pool, sizeof(int));
- for(int i=0;i<256;i++) {
- ucx_mempool_malloc(pool, i+1);
- }
- int *ptr2 = (int*)ucx_mempool_malloc(pool, sizeof(int));
- int *ptr3 = (int*)ucx_mempool_malloc(pool, sizeof(int));
- for(int i=0;i<256;i++) {
- ucx_mempool_malloc(pool, i+1);
- }
- int *ptr4 = (int*)ucx_mempool_malloc(pool, sizeof(int));
+ free(cb);
+
+ UCX_TEST_END
+}
- *ptr1 = 2;
- *ptr2 = 4;
- *ptr3 = 6;
- *ptr4 = 8;
-
- printf(" Test ucx_mempool_set_destr\n");
- ucx_mempool_set_destr(ptr1, (ucx_destructor)int_destructor);
- ucx_mempool_set_destr(ptr2, (ucx_destructor)int_destructor);
- ucx_mempool_set_destr(ptr3, (ucx_destructor)int_destructor);
- ucx_mempool_set_destr(ptr4, (ucx_destructor)int_destructor);
- printf(" Test ucx_mempool_calloc\n");
- char *str = ucx_mempool_calloc(pool, 1, 3);
- if(str[0] != 0 || str[1] != 0 || str[2] != 0) {
- fprintf(stderr, "ucx_mempool_calloc failed\n");
- r--;
- }
- str[0] = 'O';
- str[1] = 'K';
+UCX_TEST_BEGIN(test_ucx_mempool_reg_destr) {
+
+ UcxMempool *pool = ucx_mempool_new(1);
+
+ int *test = (int*) ucx_mempool_calloc(pool, 2, sizeof(int));
+
+ int *cb = (int*) malloc(sizeof(int));
+ UCX_TEST_ASSERT(cb != NULL && test != NULL, "no memory for test data")
+
+ test[0] = 5; test[1] = (int) cb;
+ *cb = 13;
+
+ ucx_mempool_reg_destr(pool, test, test_setdestr);
+
+ ucx_destructor *pooladdr = (ucx_destructor*)
+ ((char*)pool->data[1] + sizeof(ucx_destructor));
+
+ UCX_TEST_ASSERT(*pooladdr == test_setdestr, "failed")
+
+ ucx_mempool_free(pool);
+
+ UCX_TEST_ASSERT(*cb == 42, "destructor not called")
+
+ free(cb);
+
+ UCX_TEST_END
+}
- printf(" Test ucx_mempool_realloc\n");
- str = ucx_mempool_realloc(pool, str, 4);
- str[2] = '!';
- str[3] = 0;
- if(strcmp(str, "OK!") != 0) {
- fprintf(stderr, "Test ucx_mempool_realloc failed!\n");
- r--;
- }
+UCX_TEST_BEGIN(test_ucx_mempool_realloc) {
+
+ UcxMempool *pool = ucx_mempool_new(2);
+
+ ucx_mempool_malloc(pool, sizeof(int));
+ int *test = (int*) ucx_mempool_calloc(pool, 2, sizeof(int));
+
+ int *cb = (int*) malloc(sizeof(int));
+ UCX_TEST_ASSERT(cb != NULL && test != NULL, "no memory for test data")
+
+ test[0] = 5; test[1] = (int) cb;
+ *cb = 13;
+
+ ucx_mempool_set_destr(test, test_setdestr);
- printf(" Test ucx_mempool_reg_destr\n");
- char *hello = "Hello World!";
- ucx_mempool_reg_destr(pool, hello, (ucx_destructor)hello_destructor);
+ int *rtest, n = 2;
+ do {
+ n *= 2;
+ UCX_TEST_ASSERT(n < 65536, "test corrupt - no movement for realloc")
+ rtest = ucx_mempool_realloc(pool, test, n*sizeof(int));
+ } while (rtest == test);
+ test = rtest;
+
+ UCX_TEST_ASSERT(*(ucx_destructor*)(pool->data[1]) == test_setdestr,
+ "realloc killed destructor")
+ UCX_TEST_ASSERT(
+ test[0] == 5 && test[1] == (int) cb, "realloc destroyed data")
+
+ ucx_mempool_free(pool);
+
+ UCX_TEST_ASSERT(*cb == 42, "destructor not called")
- printf(" Test ucx_mempool_free\n");
- //ucx_mempool_free(pool);
+ free(cb);
-
- return r;
+ UCX_TEST_END
}