1 files changed, 56 insertions, 38 deletions

diff --git a/src/irmd/reg/tests/name_test.c b/src/irmd/reg/tests/name_test.c
index 48f132e9..9071364b 100644
--- a/src/irmd/reg/tests/name_test.c
+++ b/src/irmd/reg/tests/name_test.c
@@ -20,8 +20,11 @@
  * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
+
 #include "../name.c"
 
+#include <ouroboros/test.h>
+
 #define TEST_PID  65534
 #define TEST_PROG "/usr/bin/testprog"
 #define TEST_NAME "testservicename"
@@ -34,6 +37,8 @@ static int test_reg_name_create(void)
                 .pol_lb = LB_RR,
         };
 
+        TEST_START();
+
         n = reg_name_create(&info);
         if (n == NULL) {
                 printf("Failed to create name %s.\n", info.name);
@@ -42,9 +47,12 @@ static int test_reg_name_create(void)
 
         reg_name_destroy(n);
 
-        return 0;
+        TEST_SUCCESS();
+
+        return TEST_RC_SUCCESS;
  fail:
-        return -1;
+        TEST_FAIL();
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_name_add_proc(void)
@@ -55,6 +63,8 @@ static int test_reg_name_add_proc(void)
                 .pol_lb = LB_RR,
         };
 
+        TEST_START();
+
         n = reg_name_create(&info);
         if (n == NULL) {
                 printf("Failed to create name %s.\n", info.name);
@@ -66,8 +76,8 @@ static int test_reg_name_add_proc(void)
                 goto fail;
         }
 
-        if (n->n_procs != 1) {
-                printf("n_procs not updated.\n");
+        if (n->procs.len != 1) {
+                printf("Proc not added to list.\n");
                 goto fail;
         }
 
@@ -78,16 +88,19 @@ static int test_reg_name_add_proc(void)
 
         reg_name_del_proc(n, TEST_PID);
 
-        if (n->n_procs != 0) {
-                printf("n_procs not updated.\n");
+        if (n->procs.len != 0) {
+                printf("Proc not removed from list.\n");
                 goto fail;
         }
 
         reg_name_destroy(n);
 
-        return 0;
+        TEST_SUCCESS();
+
+        return TEST_RC_SUCCESS;
  fail:
-        return -1;
+        TEST_FAIL();
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_name_add_prog(void)
@@ -100,6 +113,8 @@ static int test_reg_name_add_prog(void)
 
         char * exec[] = { TEST_PROG, "--argswitch", "argvalue", NULL};
 
+        TEST_START();
+
         n = reg_name_create(&info);
         if (n == NULL) {
                 printf("Failed to create name %s.\n", info.name);
@@ -111,8 +126,8 @@ static int test_reg_name_add_prog(void)
                 goto fail;
         }
 
-        if (n->n_progs != 1) {
-                printf("n_progs not updated.\n");
+        if (n->progs.len != 1) {
+                printf("Prog not added to list.\n");
                 goto fail;
         }
 
@@ -123,16 +138,19 @@ static int test_reg_name_add_prog(void)
 
         reg_name_del_prog(n, TEST_PROG);
 
-        if (n->n_progs != 0) {
-                printf("n_progs not updated.\n");
+        if (n->progs.len != 0) {
+                printf("Prog not removed from list.\n");
                 goto fail;
         }
 
         reg_name_destroy(n);
 
-        return 0;
+        TEST_SUCCESS();
+
+        return TEST_RC_SUCCESS;
  fail:
-        return -1;
+        TEST_FAIL();
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_name_add_active(enum pol_balance lb)
@@ -144,6 +162,8 @@ static int test_reg_name_add_active(enum pol_balance lb)
                 .pol_lb = lb,
         };
 
+        TEST_START();
+
         n = reg_name_create(&info);
         if (n == NULL) {
                 printf("Failed to create name %s.\n", info.name);
@@ -175,8 +195,8 @@ static int test_reg_name_add_active(enum pol_balance lb)
                 goto fail;
         }
 
-        if (n->n_active != 1) {
-                printf("n_active not updated.\n");
+        if (n->active.len != 1) {
+                printf("Active list not updated.\n");
                 goto fail;
         }
 
@@ -206,13 +226,13 @@ static int test_reg_name_add_active(enum pol_balance lb)
                 goto fail;
         }
 
-        if (n->n_procs != 3) {
-                printf("n_procs not updated.\n");
+        if (n->procs.len != 3) {
+                printf("Procs list not updated.\n");
                 goto fail;
         }
 
-        if (n->n_active != 4) {
-                printf("n_active not updated.\n");
+        if (n->active.len != 4) {
+                printf("Active list not updated.\n");
                 goto fail;
         }
 
@@ -243,41 +263,39 @@ static int test_reg_name_add_active(enum pol_balance lb)
 
         reg_name_del_proc(n, TEST_PID);
 
-        if (n->n_procs != 0) {
-                printf("n_procs not updated.\n");
+        if (n->procs.len != 0) {
+                printf("Procs list not cleared.\n");
                 goto fail;
         }
 
-        if (n->n_active != 0) {
-                printf("n_active not updated.\n");
+        if (n->active.len != 0) {
+                printf("Active list not cleared.\n");
                 goto fail;
         }
 
         reg_name_destroy(n);
 
-        return 0;
+        TEST_SUCCESS();
+
+        return TEST_RC_SUCCESS;
  fail:
-        return -1;
+        TEST_FAIL();
+        return TEST_RC_FAIL;
 }
 
-
 int name_test(int     argc,
               char ** argv)
 {
-        int res = 0;
+        int rc = 0;
 
         (void) argc;
         (void) argv;
 
-        res |= test_reg_name_create();
-
-        res |= test_reg_name_add_proc();
-
-        res |= test_reg_name_add_prog();
-
-        res |= test_reg_name_add_active(LB_RR);
-
-        res |= test_reg_name_add_active(LB_SPILL);
+        rc |= test_reg_name_create();
+        rc |= test_reg_name_add_proc();
+        rc |= test_reg_name_add_prog();
+        rc |= test_reg_name_add_active(LB_RR);
+        rc |= test_reg_name_add_active(LB_SPILL);
 
-        return res;
+        return rc;
 }