Mercurial > hg > ucx / changeset

     1.1 --- a/test/test_config.h	Sun Oct 03 15:40:38 2021 +0200
     1.2 +++ b/test/test_config.h	Sun Oct 03 16:02:53 2021 +0200
     1.3 @@ -33,4 +33,6 @@
     1.4  
     1.5  #define UCX_CU_BRM CU_BRM_NORMAL
     1.6  
     1.7 +#define cu_add_test(suite, name) CU_add_test(suite, #name, name)
     1.8 +
     1.9  #endif /* UCX_TEST_CONFIG_H */

     2.1 --- a/test/test_list.c	Sun Oct 03 15:40:38 2021 +0200
     2.2 +++ b/test/test_list.c	Sun Oct 03 16:02:53 2021 +0200
     2.3 @@ -35,33 +35,6 @@
     2.4      return left == right ? 0 : (left < right ? -1 : 1);
     2.5  }
     2.6  
     2.7 -void test_linked_list_create(void) {
     2.8 -    cxTestingAllocatorReset();
     2.9 -
    2.10 -    CxList list = cxLinkedListCreate(cxTestingAllocator, (CxListComparator) cmp_int, sizeof(int));
    2.11 -
    2.12 -    CU_ASSERT_EQUAL(list->size, 0)
    2.13 -    CU_ASSERT_EQUAL(list->capacity, (size_t) -1)
    2.14 -    CU_ASSERT_PTR_EQUAL(list->allocator, cxTestingAllocator)
    2.15 -    CU_ASSERT_EQUAL(list->itemsize, sizeof(int))
    2.16 -    CU_ASSERT_PTR_EQUAL(list->cmpfunc, cmp_int)
    2.17 -
    2.18 -    // assume this structure for a linked list
    2.19 -    struct ll_check {
    2.20 -        cx_list_s base;
    2.21 -        void *begin;
    2.22 -        void *end;
    2.23 -    };
    2.24 -
    2.25 -    struct ll_check *actual = (struct ll_check *) list;
    2.26 -    CU_ASSERT_PTR_NULL(actual->begin)
    2.27 -    CU_ASSERT_PTR_NULL(actual->end)
    2.28 -
    2.29 -    cxLinkedListDestroy(list);
    2.30 -
    2.31 -    CU_ASSERT_TRUE(cxTestingAllocatorVerify())
    2.32 -}
    2.33 -
    2.34  void test_linked_list_at(void) {
    2.35      struct node {
    2.36          void *next;
    2.37 @@ -154,6 +127,34 @@
    2.38      CU_ASSERT_PTR_NULL(nodes[1].prev)
    2.39  }
    2.40  
    2.41 +
    2.42 +void test_linked_list_create(void) {
    2.43 +    cxTestingAllocatorReset();
    2.44 +
    2.45 +    CxList list = cxLinkedListCreate(cxTestingAllocator, (CxListComparator) cmp_int, sizeof(int));
    2.46 +
    2.47 +    CU_ASSERT_EQUAL(list->size, 0)
    2.48 +    CU_ASSERT_EQUAL(list->capacity, (size_t) -1)
    2.49 +    CU_ASSERT_PTR_EQUAL(list->allocator, cxTestingAllocator)
    2.50 +    CU_ASSERT_EQUAL(list->itemsize, sizeof(int))
    2.51 +    CU_ASSERT_PTR_EQUAL(list->cmpfunc, cmp_int)
    2.52 +
    2.53 +    // assume this structure for a linked list
    2.54 +    struct ll_check {
    2.55 +        cx_list_s base;
    2.56 +        void *begin;
    2.57 +        void *end;
    2.58 +    };
    2.59 +
    2.60 +    struct ll_check *actual = (struct ll_check *) list;
    2.61 +    CU_ASSERT_PTR_NULL(actual->begin)
    2.62 +    CU_ASSERT_PTR_NULL(actual->end)
    2.63 +
    2.64 +    cxLinkedListDestroy(list);
    2.65 +
    2.66 +    CU_ASSERT_TRUE(cxTestingAllocatorVerify())
    2.67 +}
    2.68 +
    2.69  int main() {
    2.70      CU_pSuite suite = NULL;
    2.71  
    2.72 @@ -161,11 +162,14 @@
    2.73          return CU_get_error();
    2.74      }
    2.75  
    2.76 -    suite = CU_add_suite("linked list suite", NULL, NULL);
    2.77 +    suite = CU_add_suite("low level linked list suite", NULL, NULL);
    2.78  
    2.79 -    CU_add_test(suite, "linked list: create and destroy", test_linked_list_create);
    2.80 -    CU_add_test(suite, "linked list: get node at index", test_linked_list_at);
    2.81 -    CU_add_test(suite, "linked list: add", test_linked_list_add);
    2.82 +    cu_add_test(suite, test_linked_list_at);
    2.83 +    cu_add_test(suite, test_linked_list_add);
    2.84 +
    2.85 +    suite = CU_add_suite("high level linked list suite", NULL, NULL);
    2.86 +
    2.87 +    cu_add_test(suite, test_linked_list_create);
    2.88  
    2.89      CU_basic_set_mode(UCX_CU_BRM);
    2.90  

     3.1 --- a/test/test_tree.c	Sun Oct 03 15:40:38 2021 +0200
     3.2 +++ b/test/test_tree.c	Sun Oct 03 16:02:53 2021 +0200
     3.3 @@ -42,7 +42,7 @@
     3.4      TestNode *children_end;
     3.5  };
     3.6  
     3.7 -void test_cx_tree_add_node(void) {
     3.8 +void test_tree_add_sibling(void) {
     3.9      // prepare test tree
    3.10      TestNode root;
    3.11      memset(&root, 0, sizeof(TestNode));
    3.12 @@ -73,7 +73,7 @@
    3.13      CU_ASSERT_PTR_EQUAL(b.next, &c)
    3.14  }
    3.15  
    3.16 -void test_cx_tree_add_child_node(void) {
    3.17 +void test_tree_add_child(void) {
    3.18      // prepare test tree
    3.19      TestNode root;
    3.20      memset(&root, 0, sizeof(TestNode));
    3.21 @@ -153,10 +153,9 @@
    3.22  
    3.23      suite = CU_add_suite("tree suite", NULL, NULL);
    3.24  
    3.25 -    CU_add_test(suite, "ll add tree node", test_cx_tree_add_node);
    3.26 -    CU_add_test(suite, "ll add tree child node", test_cx_tree_add_child_node);
    3.27 -    
    3.28 -    
    3.29 +    cu_add_test(suite, test_tree_add_sibling);
    3.30 +    cu_add_test(suite, test_tree_add_child);
    3.31 +
    3.32      CU_basic_set_mode(UCX_CU_BRM);
    3.33  
    3.34      int exitcode;