--- a/test/map_tests.c Fri Aug 09 10:24:02 2013 +0200 +++ b/test/map_tests.c Fri Aug 09 11:32:10 2013 +0200 @@ -28,7 +28,7 @@ #include "map_tests.h" -UCX_TEST_IMPLEMENT(test_ucx_map_new) { +UCX_TEST(test_ucx_map_new) { UcxMap *map = ucx_map_new(16); UCX_TEST_BEGIN UCX_TEST_ASSERT(map->size == 16, "wrong size"); @@ -38,7 +38,7 @@ ucx_map_free(map); } -UCX_TEST_IMPLEMENT(test_ucx_key) { +UCX_TEST(test_ucx_key) { UcxKey key = ucx_key((void*)"This is a text.", 15); UCX_TEST_BEGIN UCX_TEST_ASSERT(strncmp((const char*)key.data, "This is a text.", 15) == 0, @@ -49,7 +49,7 @@ UCX_TEST_END } -UCX_TEST_IMPLEMENT(test_ucx_map_put) { +UCX_TEST(test_ucx_map_put) { UcxMap *map = ucx_map_new(4); @@ -94,7 +94,7 @@ ucx_map_free(map); } -UCX_TEST_IMPLEMENT(test_ucx_map_get) { +UCX_TEST(test_ucx_map_get) { UcxMap *map = ucx_map_new(4); int td[5]; @@ -125,7 +125,7 @@ ucx_map_free(map); } -UCX_TEST_IMPLEMENT(test_ucx_map_remove) { +UCX_TEST(test_ucx_map_remove) { UcxMap *map = ucx_map_new(4); int td[5]; @@ -188,7 +188,7 @@ UCX_TEST_ASSERT(check == v1+v2+v3+v4, "test1: wrong result"); } -UCX_TEST_IMPLEMENT(test_ucx_map_iterator) { +UCX_TEST(test_ucx_map_iterator) { UcxMap *map = ucx_map_new(16); UCX_TEST_BEGIN UCX_TEST_CALL_SUBROUTINE(test_ucx_map_itersrt, map) @@ -196,7 +196,7 @@ ucx_map_free(map); } -UCX_TEST_IMPLEMENT(test_ucx_map_iterator_chain) { +UCX_TEST(test_ucx_map_iterator_chain) { UcxMap *map = ucx_map_new(1); UCX_TEST_BEGIN UCX_TEST_CALL_SUBROUTINE(test_ucx_map_itersrt, map) @@ -204,7 +204,7 @@ ucx_map_free(map); } -UCX_TEST_IMPLEMENT(test_ucx_map_clone) { +UCX_TEST(test_ucx_map_clone) { UcxMap *map = ucx_map_new(4); ucx_map_cstr_put(map, "key1", (void*)"value1"); @@ -241,7 +241,7 @@ ucx_map_free(clone); } -UCX_TEST_IMPLEMENT(test_ucx_map_rehash) { +UCX_TEST(test_ucx_map_rehash) { UcxMap *map = ucx_map_new(4); char keys[10][5];