@@ -5,33 +5,36 @@ #define ADD_SUITE(x) suites[i++] = x void kfree(void *x){ - free(x); + free(x); } void *kmalloc(size_t n){ - return malloc(n); + return malloc(n); } int main(void){ - CU_pSuite suites[TESTS]; - int i = 0; + CU_pSuite suites[TESTS]; + int i = 0; - if(CU_initialize_registry() != CUE_SUCCESS) - return CU_get_error(); + if(CU_initialize_registry() != CUE_SUCCESS) + return CU_get_error(); - ADD_SUITE(string_tests()); - ADD_SUITE(ringbuffer_tests()); - ADD_SUITE(typeconv_tests()); - ADD_SUITE(linked_list_tests()); - ADD_SUITE(sstack_tests()); - ADD_SUITE(stack_tests()); + ADD_SUITE(string_tests()); + ADD_SUITE(ringbuffer_tests()); + ADD_SUITE(typeconv_tests()); + ADD_SUITE(linked_list_tests()); + ADD_SUITE(sstack_tests()); + ADD_SUITE(stack_tests()); - CU_basic_set_mode(CU_BRM_VERBOSE); - CU_basic_run_tests(); + CU_basic_set_mode(CU_BRM_VERBOSE); + CU_basic_run_tests(); - int n = CU_get_number_of_tests_failed(); + int n = CU_get_number_of_tests_failed(); + if(n > 254) + /* Special case, give them 255 */ + n = 255; - CU_cleanup_registry(); + CU_cleanup_registry(); - return n; + return n; } tests/main.c @@ -6,24 +6,24 @@ static ll_t *list; static int create(void){ - list = ll_create(); - return list == NULL; + list = ll_create(); + return list == NULL; } static int destroy(void){ - ll_destroy(list); - return 0; + ll_destroy(list); + return 0; } static void test_add(void){ - CU_ASSERT(ll_add(list, (void *)5) == 0); - CU_ASSERT(ll_add(list, (void *)1) == 0); - CU_ASSERT(ll_add(list, (void *)12) == 0); + CU_ASSERT(ll_add(list, (void *)5) == 0); + CU_ASSERT(ll_add(list, (void *)1) == 0); + CU_ASSERT(ll_add(list, (void *)12) == 0); } static void test_find(void){ - CU_ASSERT(ll_find(list, (void *)5) != NULL); - CU_ASSERT(ll_find(list, (void *)12) != NULL); - CU_ASSERT(ll_find(list, (void *)123) == NULL); + CU_ASSERT(ll_find(list, (void *)5) != NULL); + CU_ASSERT(ll_find(list, (void *)12) != NULL); + CU_ASSERT(ll_find(list, (void *)123) == NULL); } static void test_iterate(void){ @@ -50,15 +50,15 @@ static void test_iterate(void){ } static void test_remove(void){ - CU_ASSERT(ll_remove(list, (void *)5) == 0); - CU_ASSERT(ll_remove(list, (void *)1) == 0); - CU_ASSERT(ll_remove(list, (void *)500) != 0); - CU_ASSERT(ll_remove(list, (void *)12) == 0); - CU_ASSERT(ll_remove(list, (void *)10) != 0); + CU_ASSERT(ll_remove(list, (void *)5) == 0); + CU_ASSERT(ll_remove(list, (void *)1) == 0); + CU_ASSERT(ll_remove(list, (void *)500) != 0); + CU_ASSERT(ll_remove(list, (void *)12) == 0); + CU_ASSERT(ll_remove(list, (void *)10) != 0); } static void test_find_removed(void){ - CU_ASSERT(ll_find(list, (void *)5) == NULL); + CU_ASSERT(ll_find(list, (void *)5) == NULL); } static void test_iterate2(void){ @@ -68,15 +68,15 @@ static void test_iterate2(void){ } CU_pSuite linked_list_tests(void){ - CU_pSuite s = CU_add_suite("lib/linked_list.c", create, destroy); + CU_pSuite s = CU_add_suite("lib/linked_list.c", create, destroy); - CU_add_test(s, "Test add", test_add); - CU_add_test(s, "Test find", test_find); + CU_add_test(s, "Test add", test_add); + CU_add_test(s, "Test find", test_find); CU_add_test(s, "Test iterate", test_iterate); - CU_add_test(s, "Test remove", test_remove); - CU_add_test(s, "Test finding deleted node", test_find_removed); + CU_add_test(s, "Test remove", test_remove); + CU_add_test(s, "Test finding deleted node", test_find_removed); CU_add_test(s, "Test iterate with no nodes", test_iterate2); - return s; + return s; } tests/tests/lib_linked_list.c @@ -12,23 +12,23 @@ static int create(void){ ringbuffer = ringbuf_create(SIZE); return ringbuffer == static int destroy(void){ ringbuf_delete(ringbuffer); return 0;} static void test_write(void){ - int x = ringbuf_write(ringbuffer, data, sizeof(data)); - CU_ASSERT(x == sizeof(data)); + int x = ringbuf_write(ringbuffer, data, sizeof(data)); + CU_ASSERT(x == sizeof(data)); } static void test_read(void){ - int *y = malloc(sizeof(data)); - int x = ringbuf_read(ringbuffer, y, sizeof(data)); - CU_ASSERT(x == sizeof(data)); - CU_ASSERT(y[0] == 1 && y[1] == 2 && y[2] == 3 && y[3] == 4 && y[4] == 5); + int *y = malloc(sizeof(data)); + int x = ringbuf_read(ringbuffer, y, sizeof(data)); + CU_ASSERT(x == sizeof(data)); + CU_ASSERT(y[0] == 1 && y[1] == 2 && y[2] == 3 && y[3] == 4 && y[4] == 5); } CU_pSuite ringbuffer_tests(void){ - CU_pSuite s = CU_add_suite("lib/ringbuffer.c", create, destroy); + CU_pSuite s = CU_add_suite("lib/ringbuffer.c", create, destroy); - CU_add_test(s, "Test write", test_write); - CU_add_test(s, "Test read", test_read); + CU_add_test(s, "Test write", test_write); + CU_add_test(s, "Test read", test_read); - return s; + return s; } tests/tests/lib_ringbuffer.c @@ -12,51 +12,51 @@ static int create(void){ stack = sstack_create(SIZE); return stack == NULL; } static int destroy(void){ sstack_destroy(stack); return 0; } static void test_size_push(void){ - CU_ASSERT(sstack_size(stack) == 0); + CU_ASSERT(sstack_size(stack) == 0); - for(int i = 0; i < SIZE; i++) - sstack_push(stack, (void *)data[i]); + for(int i = 0; i < SIZE; i++) + sstack_push(stack, (void *)data[i]); - CU_ASSERT(sstack_size(stack) == 5); + CU_ASSERT(sstack_size(stack) == 5); - sstack_push(stack, (void *)0); + sstack_push(stack, (void *)0); - CU_ASSERT(sstack_size(stack) == 5); + CU_ASSERT(sstack_size(stack) == 5); } static void test_pop(void){ - CU_ASSERT((int)sstack_pop(stack) == data[4]); - CU_ASSERT((int)sstack_pop(stack) == data[3]); + CU_ASSERT((int)sstack_pop(stack) == data[4]); + CU_ASSERT((int)sstack_pop(stack) == data[3]); - CU_ASSERT(sstack_size(stack) == 3); + CU_ASSERT(sstack_size(stack) == 3); - sstack_push(stack, (void *)data[3]); - sstack_push(stack, (void *)data[4]); + sstack_push(stack, (void *)data[3]); + sstack_push(stack, (void *)data[4]); } static void test_peek(void){ - CU_ASSERT((int)sstack_peek(stack) == data[4]); - CU_ASSERT(sstack_size(stack) == 5); + CU_ASSERT((int)sstack_peek(stack) == data[4]); + CU_ASSERT(sstack_size(stack) == 5); } static void test_empty_pop(void){ - sstack_pop(stack); - sstack_pop(stack); - sstack_pop(stack); - sstack_pop(stack); - sstack_pop(stack); + sstack_pop(stack); + sstack_pop(stack); + sstack_pop(stack); + sstack_pop(stack); + sstack_pop(stack); - CU_ASSERT(sstack_pop(stack) == NULL); + CU_ASSERT(sstack_pop(stack) == NULL); } CU_pSuite sstack_tests(void){ - CU_pSuite s = CU_add_suite("lib/sstack.c", create, destroy); + CU_pSuite s = CU_add_suite("lib/sstack.c", create, destroy); - CU_add_test(s, "Test size and push", test_size_push); - CU_add_test(s, "Test pop", test_pop); - CU_add_test(s, "Test peek", test_peek); - CU_add_test(s, "Test empty pop", test_empty_pop); + CU_add_test(s, "Test size and push", test_size_push); + CU_add_test(s, "Test pop", test_pop); + CU_add_test(s, "Test peek", test_peek); + CU_add_test(s, "Test empty pop", test_empty_pop); - return s; + return s; } tests/tests/lib_sstack.c @@ -12,47 +12,47 @@ static int create(void){ stack = stack_create(); return stack == NULL; } static int destroy(void){ stack_destroy(stack); return 0; } static void test_size_push(void){ - CU_ASSERT(stack_size(stack) == 0); + CU_ASSERT(stack_size(stack) == 0); - for(int i = 0; i < SIZE; i++) - stack_push(stack, (void *)data[i]); + for(int i = 0; i < SIZE; i++) + stack_push(stack, (void *)data[i]); - CU_ASSERT(stack_size(stack) == 5); + CU_ASSERT(stack_size(stack) == 5); } static void test_pop(void){ - CU_ASSERT((int)stack_pop(stack) == data[4]); - CU_ASSERT((int)stack_pop(stack) == data[3]); + CU_ASSERT((int)stack_pop(stack) == data[4]); + CU_ASSERT((int)stack_pop(stack) == data[3]); - CU_ASSERT(stack_size(stack) == 3); + CU_ASSERT(stack_size(stack) == 3); - stack_push(stack, (void *)data[3]); - stack_push(stack, (void *)data[4]); + stack_push(stack, (void *)data[3]); + stack_push(stack, (void *)data[4]); } static void test_peek(void){ - CU_ASSERT((int)stack_peek(stack) == data[4]); - CU_ASSERT(stack_size(stack) == 5); + CU_ASSERT((int)stack_peek(stack) == data[4]); + CU_ASSERT(stack_size(stack) == 5); } static void test_empty_pop(void){ - stack_pop(stack); - stack_pop(stack); - stack_pop(stack); - stack_pop(stack); - stack_pop(stack); + stack_pop(stack); + stack_pop(stack); + stack_pop(stack); + stack_pop(stack); + stack_pop(stack); - CU_ASSERT(stack_pop(stack) == NULL); + CU_ASSERT(stack_pop(stack) == NULL); } CU_pSuite stack_tests(void){ - CU_pSuite s = CU_add_suite("lib/stack.c", create, destroy); + CU_pSuite s = CU_add_suite("lib/stack.c", create, destroy); - CU_add_test(s, "Test size and push", test_size_push); - CU_add_test(s, "Test pop", test_pop); - CU_add_test(s, "Test peek", test_peek); - CU_add_test(s, "Test empty pop", test_empty_pop); + CU_add_test(s, "Test size and push", test_size_push); + CU_add_test(s, "Test pop", test_pop); + CU_add_test(s, "Test peek", test_peek); + CU_add_test(s, "Test empty pop", test_empty_pop); - return s; + return s; } tests/tests/lib_stack.c @@ -4,38 +4,38 @@ #include "../../src/include/lib/typeconv.h" static void test_itoa(void){ - int x = 20; - int y = 123; + int x = 20; + int y = 123; - char *a = malloc(3); // storing x as base 10 - char *b = malloc(3); // storing y as base 16 + char *a = malloc(3); // storing x as base 10 + char *b = malloc(3); // storing y as base 16 - CU_ASSERT(int_to_ascii(a, 3, 10, x) == 0); - CU_ASSERT(int_to_ascii(b, 3, 16, y) == 0); + CU_ASSERT(int_to_ascii(a, 3, 10, x) == 0); + CU_ASSERT(int_to_ascii(b, 3, 16, y) == 0); - CU_ASSERT(a[0] == '2' && a[1] == '0' && a[2] == '\0'); - CU_ASSERT(b[0] == '7' && b[1] == 'b' && b[2] == '\0'); + CU_ASSERT(a[0] == '2' && a[1] == '0' && a[2] == '\0'); + CU_ASSERT(b[0] == '7' && b[1] == 'b' && b[2] == '\0'); } static void test_int_to_hex(void){ - int x = 123; - int y = 12; + int x = 123; + int y = 12; - char *a = int_to_hex(x); - CU_ASSERT(a != NULL); - CU_ASSERT(a[0] == '7' && a[1] == 'B' && a[2] == '\0'); + char *a = int_to_hex(x); + CU_ASSERT(a != NULL); + CU_ASSERT(a[0] == '7' && a[1] == 'B' && a[2] == '\0'); - a = int_to_hex(y); - CU_ASSERT(a != NULL); - CU_ASSERT(a[0] == 'C' && a[1] == '\0'); + a = int_to_hex(y); + CU_ASSERT(a != NULL); + CU_ASSERT(a[0] == 'C' && a[1] == '\0'); } CU_pSuite typeconv_tests(void){ - CU_pSuite pSuite = CU_add_suite("lib/typeconv.c", NULL, NULL); + CU_pSuite pSuite = CU_add_suite("lib/typeconv.c", NULL, NULL); - CU_add_test(pSuite, "Test itoa", test_itoa); - CU_add_test(pSuite, "Test int->hex", test_int_to_hex); + CU_add_test(pSuite, "Test itoa", test_itoa); + CU_add_test(pSuite, "Test int->hex", test_int_to_hex); - return pSuite; + return pSuite; } tests/tests/lib_typeconv.c 7d5a007e33febbd3195f65baf3d082368af3a661 Andrew Etches andrew.etches@dur.ac.uk http://github.com/seadog/kaiser/commit/0b9760fa73ca3938698feb3438104878e867f45e 0b9760fa73ca3938698feb3438104878e867f45e 2009-08-08T10:14:27-07:00 2009-08-08T10:14:27-07:00 Fixed tabbing in the tests subdir e24f54f59cb1575ee1f7417becca5403b35c5ecc Andrew Etches andrew.etches@dur.ac.uk