From e90901406e132ee79f16e5331639b61a3b226a5d Mon Sep 17 00:00:00 2001 From: Abdelrahman Date: Wed, 17 Dec 2025 02:52:29 +0000 Subject: [PATCH] Update dbl list C tests --- tests/cpath/test_cpath.c | 34 ++-- tests/shell_commander/test_shell_commander.c | 22 +- tests/str8/test_str8.c | 12 +- tests/str8/test_str8_list.c | 202 +++++++++---------- 4 files changed, 135 insertions(+), 135 deletions(-) diff --git a/tests/cpath/test_cpath.c b/tests/cpath/test_cpath.c index 9c031c8..916d669 100644 --- a/tests/cpath/test_cpath.c +++ b/tests/cpath/test_cpath.c @@ -16,16 +16,16 @@ TestFuncResult test_cpath_join_path(void) { wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP); wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP); - Str8List parts = {0}; - wapp_str8_list_push_back(&parts, &wapp_str8_node_from_str8(tmp)); - wapp_str8_list_push_back(&parts, &wapp_str8_node_from_cstr("home")); - wapp_str8_list_push_back(&parts, &wapp_str8_node_from_cstr("abdelrahman")); - wapp_str8_list_push_back(&parts, &wapp_str8_node_from_cstr("Documents")); + Str8List parts = wapp_dbl_list(Str8, Str8List); + wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_str8(tmp)); + wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("home")); + wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("abdelrahman")); + wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("Documents")); wapp_cpath_join_path(&out, &parts); result = wapp_str8_equal(&out, &expected); - wapp_str8_list_pop_front(&parts); + wapp_dbl_list_pop_front(Str8, Str8Node, &parts); wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP); @@ -33,8 +33,8 @@ TestFuncResult test_cpath_join_path(void) { result = result && wapp_str8_equal(&out, &expected); wapp_str8_concat_capped(&tmp, &wapp_str8_lit_ro("home")); - wapp_str8_list_pop_front(&parts); - wapp_str8_list_push_front(&parts, &wapp_str8_node_from_str8(tmp)); + wapp_dbl_list_pop_front(Str8, Str8Node, &parts); + wapp_dbl_list_push_front(Str8, &parts, &wapp_str8_node_from_str8(tmp)); wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP); @@ -42,35 +42,35 @@ TestFuncResult test_cpath_join_path(void) { result = result && wapp_str8_equal(&out, &expected); wapp_str8_format(&tmp, "home%c", WAPP_PATH_SEP); - wapp_str8_list_pop_front(&parts); - wapp_str8_list_push_front(&parts, &wapp_str8_node_from_cstr("home")); + wapp_dbl_list_pop_front(Str8, Str8Node, &parts); + wapp_dbl_list_push_front(Str8, &parts, &wapp_str8_node_from_cstr("home")); wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP); wapp_cpath_join_path(&out, &parts); result = result && wapp_str8_equal(&out, &expected); - wapp_str8_list_empty(&parts); + wapp_dbl_list_empty(Str8, &parts); wapp_str8_format(&tmp, "%chome", WAPP_PATH_SEP); - wapp_str8_list_push_back(&parts, &wapp_str8_node_from_str8(tmp)); - wapp_str8_list_push_back(&parts, &wapp_str8_node_from_cstr("")); + wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_str8(tmp)); + wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("")); wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP); wapp_cpath_join_path(&out, &parts); result = result && wapp_str8_equal(&out, &expected); - wapp_str8_list_pop_front(&parts); - wapp_str8_list_push_back(&parts, &wapp_str8_node_from_cstr("")); + wapp_dbl_list_pop_front(Str8, Str8Node, &parts); + wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("")); wapp_str8_format(&expected, "%s", ""); wapp_cpath_join_path(&out, &parts); result = result && wapp_str8_equal(&out, &expected); - wapp_str8_list_pop_back(&parts); - wapp_str8_list_push_back(&parts, &wapp_str8_node_from_cstr("home")); + wapp_dbl_list_pop_back(Str8, Str8Node, &parts); + wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("home")); wapp_str8_copy_cstr_capped(&expected, "home"); diff --git a/tests/shell_commander/test_shell_commander.c b/tests/shell_commander/test_shell_commander.c index be242bc..c14fd2a 100644 --- a/tests/shell_commander/test_shell_commander.c +++ b/tests/shell_commander/test_shell_commander.c @@ -5,9 +5,9 @@ #include TestFuncResult test_commander_cmd_success(void) { - Str8List cmd = {0}; - wapp_str8_list_push_back(&cmd, &wapp_str8_node_from_cstr("echo")); - wapp_str8_list_push_back(&cmd, &wapp_str8_node_from_cstr("hello world")); + Str8List cmd = wapp_dbl_list(Str8, Str8List); + wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("echo")); + wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("hello world")); CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, NULL, &cmd); b8 succeeded = result.exited && result.exit_code == EXIT_SUCCESS && @@ -17,8 +17,8 @@ TestFuncResult test_commander_cmd_success(void) { } TestFuncResult test_commander_cmd_failure(void) { - Str8List cmd = {0}; - wapp_str8_list_push_back(&cmd, &wapp_str8_node_from_cstr("grep")); + Str8List cmd = wapp_dbl_list(Str8, Str8List); + wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("grep")); CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, NULL, &cmd); b8 failed = result.exited && result.exit_code != EXIT_SUCCESS && @@ -33,9 +33,9 @@ TestFuncResult test_commander_cmd_out_buf_success(void) { char msg[] = "hello world"; wapp_str8_copy_cstr_capped(&expected, msg); - Str8List cmd = {0}; - wapp_str8_list_push_back(&cmd, &wapp_str8_node_from_cstr("echo")); - wapp_str8_list_push_back(&cmd, &wapp_str8_node_from_cstr(msg)); + Str8List cmd = wapp_dbl_list(Str8, Str8List); + wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("echo")); + wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr(msg)); CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, &buf, &cmd); b8 succeeded = result.exited && result.exit_code == EXIT_SUCCESS && @@ -50,9 +50,9 @@ TestFuncResult test_commander_cmd_out_buf_failure(void) { char msg[] = "hello world"; wapp_str8_copy_cstr_capped(&expected, msg); - Str8List cmd = {0}; - wapp_str8_list_push_back(&cmd, &wapp_str8_node_from_cstr("echo")); - wapp_str8_list_push_back(&cmd, &wapp_str8_node_from_cstr(msg)); + Str8List cmd = wapp_dbl_list(Str8, Str8List); + wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("echo")); + wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr(msg)); CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, &buf, &cmd); b8 failed = !result.exited && result.exit_code != EXIT_SUCCESS && diff --git a/tests/str8/test_str8.c b/tests/str8/test_str8.c index f55a94f..62e5032 100644 --- a/tests/str8/test_str8.c +++ b/tests/str8/test_str8.c @@ -443,7 +443,7 @@ TestFuncResult test_str8_split(void) { // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of // MSVC Spectre mitigation warnings while (running1) { - Str8Node *node = wapp_str8_list_get(list1, index1); + Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list1, index1); result = result && wapp_str8_equal(node->item, &(splits1[index1])); ++index1; @@ -453,7 +453,7 @@ TestFuncResult test_str8_split(void) { // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of // MSVC Spectre mitigation warnings while (running2) { - Str8Node *node = wapp_str8_list_get(list2, index2); + Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list2, index2); result = result && wapp_str8_equal(node->item, &(splits2[index2])); ++index2; @@ -488,7 +488,7 @@ TestFuncResult test_str8_split_with_max(void) { // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of // MSVC Spectre mitigation warnings while (running) { - Str8Node *node = wapp_str8_list_get(list, index); + Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list, index); result = result && wapp_str8_equal(node->item, &(splits[index])); ++index; @@ -535,7 +535,7 @@ TestFuncResult test_str8_rsplit(void) { // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of // MSVC Spectre mitigation warnings while (running1) { - Str8Node *node = wapp_str8_list_get(list1, index1); + Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list1, index1); result = result && wapp_str8_equal(node->item, &(splits1[index1])); ++index1; @@ -545,7 +545,7 @@ TestFuncResult test_str8_rsplit(void) { // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of // MSVC Spectre mitigation warnings while (running2) { - Str8Node *node = wapp_str8_list_get(list2, index2); + Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list2, index2); result = result && wapp_str8_equal(node->item, &(splits2[index2])); ++index2; @@ -580,7 +580,7 @@ TestFuncResult test_str8_rsplit_with_max(void) { // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of // MSVC Spectre mitigation warnings while (running) { - Str8Node *node = wapp_str8_list_get(list, index); + Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list, index); result = result && wapp_str8_equal(node->item, &(splits[index])); ++index; diff --git a/tests/str8/test_str8_list.c b/tests/str8/test_str8_list.c index 238e7a6..2797b26 100644 --- a/tests/str8/test_str8_list.c +++ b/tests/str8/test_str8_list.c @@ -10,32 +10,32 @@ TestFuncResult test_str8_list_get(void) { Str8 s4 = wapp_str8_lit("4"); Str8 s5 = wapp_str8_lit("5"); - Str8List list = {0}; - Str8Node n1 = { .item = &s1 }; - Str8Node n2 = { .item = &s2 }; - Str8Node n3 = { .item = &s3 }; - Str8Node n4 = { .item = &s4 }; - Str8Node n5 = { .item = &s5 }; + Str8List list = wapp_dbl_list(Str8, Str8List); + Str8Node n1 = wapp_str8_node_from_str8(s1); + Str8Node n2 = wapp_str8_node_from_str8(s2); + Str8Node n3 = wapp_str8_node_from_str8(s3); + Str8Node n4 = wapp_str8_node_from_str8(s4); + Str8Node n5 = wapp_str8_node_from_str8(s5); - wapp_str8_list_push_back(&list, &n1); - wapp_str8_list_push_back(&list, &n2); - wapp_str8_list_push_back(&list, &n3); - wapp_str8_list_push_back(&list, &n4); - wapp_str8_list_push_back(&list, &n5); + wapp_dbl_list_push_back(Str8, &list, &n1); + wapp_dbl_list_push_back(Str8, &list, &n2); + wapp_dbl_list_push_back(Str8, &list, &n3); + wapp_dbl_list_push_back(Str8, &list, &n4); + wapp_dbl_list_push_back(Str8, &list, &n5); - Str8Node *node = wapp_str8_list_get(&list, 0); + Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, &list, 0); result = node->item == &s1 && wapp_str8_equal(node->item, &s1); - node = wapp_str8_list_get(&list, 1); + node = wapp_dbl_list_get(Str8, Str8Node, &list, 1); result = result && node->item == &s2 && wapp_str8_equal(node->item, &s2); - node = wapp_str8_list_get(&list, 2); + node = wapp_dbl_list_get(Str8, Str8Node, &list, 2); result = result && node->item == &s3 && wapp_str8_equal(node->item, &s3); - node = wapp_str8_list_get(&list, 3); + node = wapp_dbl_list_get(Str8, Str8Node, &list, 3); result = result && node->item == &s4 && wapp_str8_equal(node->item, &s4); - node = wapp_str8_list_get(&list, 4); + node = wapp_dbl_list_get(Str8, Str8Node, &list, 4); result = result && node->item == &s5 && wapp_str8_equal(node->item, &s5); return wapp_tester_result(result); @@ -48,18 +48,18 @@ TestFuncResult test_str8_list_push_front(void) { Str8 s2 = wapp_str8_lit("2"); Str8 s3 = wapp_str8_lit("3"); - Str8List list = {0}; - Str8Node n1 = { .item = &s1 }; - Str8Node n2 = { .item = &s2 }; - Str8Node n3 = { .item = &s3 }; + Str8List list = wapp_dbl_list(Str8, Str8List); + Str8Node n1 = wapp_str8_node_from_str8(s1); + Str8Node n2 = wapp_str8_node_from_str8(s2); + Str8Node n3 = wapp_str8_node_from_str8(s3); - wapp_str8_list_push_front(&list, &n1); + wapp_dbl_list_push_front(Str8, &list, &n1); result = list.first == list.last && list.first == &n1 && list.first->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1; - wapp_str8_list_push_front(&list, &n2); + wapp_dbl_list_push_front(Str8, &list, &n2); result = result && list.first == &n2 && list.first->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2; - wapp_str8_list_push_front(&list, &n3); + wapp_dbl_list_push_front(Str8, &list, &n3); result = result && list.first == &n3 && list.first->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3; return wapp_tester_result(result); @@ -72,18 +72,18 @@ TestFuncResult test_str8_list_push_back(void) { Str8 s2 = wapp_str8_lit("2"); Str8 s3 = wapp_str8_lit("3"); - Str8List list = {0}; - Str8Node n1 = { .item = &s1 }; - Str8Node n2 = { .item = &s2 }; - Str8Node n3 = { .item = &s3 }; + Str8List list = wapp_dbl_list(Str8, Str8List); + Str8Node n1 = wapp_str8_node_from_str8(s1); + Str8Node n2 = wapp_str8_node_from_str8(s2); + Str8Node n3 = wapp_str8_node_from_str8(s3); - wapp_str8_list_push_back(&list, &n1); + wapp_dbl_list_push_back(Str8, &list, &n1); result = list.first == list.last && list.last == &n1 && list.last->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1; - wapp_str8_list_push_back(&list, &n2); + wapp_dbl_list_push_back(Str8, &list, &n2); result = result && list.last == &n2 && list.last->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2; - wapp_str8_list_push_back(&list, &n3); + wapp_dbl_list_push_back(Str8, &list, &n3); result = result && list.last == &n3 && list.last->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3; return wapp_tester_result(result); @@ -100,27 +100,27 @@ TestFuncResult test_str8_list_insert(void) { Str8 s6 = wapp_str8_lit("6"); Str8 s7 = wapp_str8_lit("7"); - Str8List list = {0}; - Str8Node n1 = { .item = &s1 }; - Str8Node n2 = { .item = &s2 }; - Str8Node n3 = { .item = &s3 }; - Str8Node n4 = { .item = &s4 }; - Str8Node n5 = { .item = &s5 }; - Str8Node n6 = { .item = &s6 }; - Str8Node n7 = { .item = &s7 }; + Str8List list = wapp_dbl_list(Str8, Str8List); + Str8Node n1 = wapp_str8_node_from_str8(s1); + Str8Node n2 = wapp_str8_node_from_str8(s2); + Str8Node n3 = wapp_str8_node_from_str8(s3); + Str8Node n4 = wapp_str8_node_from_str8(s4); + Str8Node n5 = wapp_str8_node_from_str8(s5); + Str8Node n6 = wapp_str8_node_from_str8(s6); + Str8Node n7 = wapp_str8_node_from_str8(s7); - wapp_str8_list_push_back(&list, &n1); - wapp_str8_list_push_back(&list, &n2); - wapp_str8_list_push_back(&list, &n3); - wapp_str8_list_push_back(&list, &n4); - wapp_str8_list_push_back(&list, &n5); + wapp_dbl_list_push_back(Str8, &list, &n1); + wapp_dbl_list_push_back(Str8, &list, &n2); + wapp_dbl_list_push_back(Str8, &list, &n3); + wapp_dbl_list_push_back(Str8, &list, &n4); + wapp_dbl_list_push_back(Str8, &list, &n5); Str8Node *node; - wapp_str8_list_insert(&list, &n6, 2); - node = wapp_str8_list_get(&list, 2); + wapp_dbl_list_insert(Str8, &list, &n6, 2); + node = wapp_dbl_list_get(Str8, Str8Node, &list, 2); result = node != NULL && node->item == &s6 && wapp_str8_list_total_size(&list) == 6 && list.node_count == 6; - wapp_str8_list_insert(&list, &n7, 5); - node = wapp_str8_list_get(&list, 5); + wapp_dbl_list_insert(Str8, &list, &n7, 5); + node = wapp_dbl_list_get(Str8, Str8Node, &list, 5); result = result && node != NULL && node->item == &s7 && wapp_str8_list_total_size(&list) == 7 && list.node_count == 7; return wapp_tester_result(result); @@ -135,32 +135,32 @@ TestFuncResult test_str8_list_pop_front(void) { Str8 s4 = wapp_str8_lit("4"); Str8 s5 = wapp_str8_lit("5"); - Str8List list = {0}; - Str8Node n1 = { .item = &s1 }; - Str8Node n2 = { .item = &s2 }; - Str8Node n3 = { .item = &s3 }; - Str8Node n4 = { .item = &s4 }; - Str8Node n5 = { .item = &s5 }; + Str8List list = wapp_dbl_list(Str8, Str8List); + Str8Node n1 = wapp_str8_node_from_str8(s1); + Str8Node n2 = wapp_str8_node_from_str8(s2); + Str8Node n3 = wapp_str8_node_from_str8(s3); + Str8Node n4 = wapp_str8_node_from_str8(s4); + Str8Node n5 = wapp_str8_node_from_str8(s5); - wapp_str8_list_push_back(&list, &n1); - wapp_str8_list_push_back(&list, &n2); - wapp_str8_list_push_back(&list, &n3); - wapp_str8_list_push_back(&list, &n4); - wapp_str8_list_push_back(&list, &n5); + wapp_dbl_list_push_back(Str8, &list, &n1); + wapp_dbl_list_push_back(Str8, &list, &n2); + wapp_dbl_list_push_back(Str8, &list, &n3); + wapp_dbl_list_push_back(Str8, &list, &n4); + wapp_dbl_list_push_back(Str8, &list, &n5); - Str8Node *node = wapp_str8_list_pop_front(&list); + Str8Node *node = wapp_dbl_list_pop_front(Str8, Str8Node, &list); result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4; - node = wapp_str8_list_pop_front(&list); + node = wapp_dbl_list_pop_front(Str8, Str8Node, &list); result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3; - node = wapp_str8_list_pop_front(&list); + node = wapp_dbl_list_pop_front(Str8, Str8Node, &list); result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2; - node = wapp_str8_list_pop_front(&list); + node = wapp_dbl_list_pop_front(Str8, Str8Node, &list); result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1; - node = wapp_str8_list_pop_front(&list); + node = wapp_dbl_list_pop_front(Str8, Str8Node, &list); result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0; return wapp_tester_result(result); @@ -175,32 +175,32 @@ TestFuncResult test_str8_list_pop_back(void) { Str8 s4 = wapp_str8_lit("4"); Str8 s5 = wapp_str8_lit("5"); - Str8List list = {0}; - Str8Node n1 = { .item = &s1 }; - Str8Node n2 = { .item = &s2 }; - Str8Node n3 = { .item = &s3 }; - Str8Node n4 = { .item = &s4 }; - Str8Node n5 = { .item = &s5 }; + Str8List list = wapp_dbl_list(Str8, Str8List); + Str8Node n1 = wapp_str8_node_from_str8(s1); + Str8Node n2 = wapp_str8_node_from_str8(s2); + Str8Node n3 = wapp_str8_node_from_str8(s3); + Str8Node n4 = wapp_str8_node_from_str8(s4); + Str8Node n5 = wapp_str8_node_from_str8(s5); - wapp_str8_list_push_front(&list, &n1); - wapp_str8_list_push_front(&list, &n2); - wapp_str8_list_push_front(&list, &n3); - wapp_str8_list_push_front(&list, &n4); - wapp_str8_list_push_front(&list, &n5); + wapp_dbl_list_push_front(Str8, &list, &n1); + wapp_dbl_list_push_front(Str8, &list, &n2); + wapp_dbl_list_push_front(Str8, &list, &n3); + wapp_dbl_list_push_front(Str8, &list, &n4); + wapp_dbl_list_push_front(Str8, &list, &n5); - Str8Node *node = wapp_str8_list_pop_back(&list); + Str8Node *node = wapp_dbl_list_pop_back(Str8, Str8Node, &list); result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4; - node = wapp_str8_list_pop_back(&list); + node = wapp_dbl_list_pop_back(Str8, Str8Node, &list); result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3; - node = wapp_str8_list_pop_back(&list); + node = wapp_dbl_list_pop_back(Str8, Str8Node, &list); result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2; - node = wapp_str8_list_pop_back(&list); + node = wapp_dbl_list_pop_back(Str8, Str8Node, &list); result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1; - node = wapp_str8_list_pop_back(&list); + node = wapp_dbl_list_pop_back(Str8, Str8Node, &list); result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0; return wapp_tester_result(result); @@ -215,32 +215,32 @@ TestFuncResult test_str8_list_remove(void) { Str8 s4 = wapp_str8_lit("4"); Str8 s5 = wapp_str8_lit("5"); - Str8List list = {0}; - Str8Node n1 = { .item = &s1 }; - Str8Node n2 = { .item = &s2 }; - Str8Node n3 = { .item = &s3 }; - Str8Node n4 = { .item = &s4 }; - Str8Node n5 = { .item = &s5 }; + Str8List list = wapp_dbl_list(Str8, Str8List); + Str8Node n1 = wapp_str8_node_from_str8(s1); + Str8Node n2 = wapp_str8_node_from_str8(s2); + Str8Node n3 = wapp_str8_node_from_str8(s3); + Str8Node n4 = wapp_str8_node_from_str8(s4); + Str8Node n5 = wapp_str8_node_from_str8(s5); - wapp_str8_list_push_back(&list, &n1); - wapp_str8_list_push_back(&list, &n2); - wapp_str8_list_push_back(&list, &n3); - wapp_str8_list_push_back(&list, &n4); - wapp_str8_list_push_back(&list, &n5); + wapp_dbl_list_push_back(Str8, &list, &n1); + wapp_dbl_list_push_back(Str8, &list, &n2); + wapp_dbl_list_push_back(Str8, &list, &n3); + wapp_dbl_list_push_back(Str8, &list, &n4); + wapp_dbl_list_push_back(Str8, &list, &n5); - Str8Node *node = wapp_str8_list_remove(&list, 0); + Str8Node *node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0); result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4; - node = wapp_str8_list_remove(&list, 0); + node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0); result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3; - node = wapp_str8_list_remove(&list, 0); + node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0); result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2; - node = wapp_str8_list_remove(&list, 0); + node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0); result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1; - node = wapp_str8_list_remove(&list, 0); + node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0); result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0; return wapp_tester_result(result); @@ -249,13 +249,13 @@ TestFuncResult test_str8_list_remove(void) { TestFuncResult test_str8_list_empty(void) { b8 result; - Str8List list = {0}; - wapp_str8_list_push_back(&list, &wapp_str8_node_from_cstr("Hello")); - wapp_str8_list_push_back(&list, &wapp_str8_node_from_cstr("from")); - wapp_str8_list_push_back(&list, &wapp_str8_node_from_cstr("wizapp")); - wapp_str8_list_push_back(&list, &wapp_str8_node_from_cstr("stdlib")); + Str8List list = wapp_dbl_list(Str8, Str8List); + wapp_dbl_list_push_back(Str8, &list, &wapp_str8_node_from_cstr("Hello")); + wapp_dbl_list_push_back(Str8, &list, &wapp_str8_node_from_cstr("from")); + wapp_dbl_list_push_back(Str8, &list, &wapp_str8_node_from_cstr("wizapp")); + wapp_dbl_list_push_back(Str8, &list, &wapp_str8_node_from_cstr("stdlib")); - wapp_str8_list_empty(&list); + wapp_dbl_list_empty(Str8, &list); result = list.first == NULL && list.last == NULL && list.node_count == 0 && wapp_str8_list_total_size(&list) == 0;