JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Refactoring head_list and tail_list

Browse Source 
Simplifying head and tail list. Adding delete_node() to list API.
This commit is contained in:
Michael Tryby
2019-04-11 10:45:22 -04:00
parent af87edbafe
commit 3f37fdbff4
3 changed files with 34 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/util/test_list.cpp
View File

@@ -116,25 +116,21 @@ BOOST_FIXTURE_TEST_CASE(test_string_list, FixtureStrings) {
BOOST_FIXTURE_TEST_CASE(test_head_list, FixtureStrings) {
void *temp = head_list(list, true);
BOOST_CHECK(check_string(get_string_data(head_list(list, false)), "David"));
BOOST_CHECK(size_list(list) == 5);
BOOST_CHECK(check_string(*(char **)temp, "David"));
list_node_t *lnode = head_list(list, true);
BOOST_CHECK(check_string(get_string_data(lnode), "David"));
BOOST_CHECK(size_list(list) == 4);
// To free a node, free both the data and reference to data
free_string(temp);
free(temp);
delete_node(list, lnode);
}
BOOST_FIXTURE_TEST_CASE(test_tail_list, FixtureStrings) {
void *temp = tail_list(list);
BOOST_CHECK(check_string(*(char **)temp, "Jimi"));
BOOST_CHECK(check_string(get_string_data(tail_list(list)), "Jimi"));
BOOST_CHECK(size_list(list) == 5);
free(temp);
}
@@ -198,7 +194,8 @@ BOOST_AUTO_TEST_CASE(test_struct_list){
BOOST_CHECK(size_list(list) == 3);
//for_each_list(list, iterate_test_data);
for_each_list(list, iterate_test_data);
list_node_t *lnode;
// Iterate over list while maintaining containment of abstraction
@@ -207,6 +204,9 @@ BOOST_AUTO_TEST_CASE(test_struct_list){
printf("Found number: %i name: %s\n", test_data->num, test_data->name);
}
lnode = head_list(list, true);
delete_node(list, lnode);
delete_list(list);
}