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

Adding key and search to list

Browse Source
This commit is contained in:
Michael Tryby
2019-04-24 13:15:43 -04:00
parent cf97cf8c9c
commit 9b3173f9be
3 changed files with 85 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/util/test_list.cpp
View File

@@ -13,7 +13,9 @@
******************************************************************************
*/
#include <stdlib.h>
#include <string.h>
#include <time.h>
#define BOOST_TEST_MODULE list
#include <boost/test/unit_test.hpp>
@@ -35,7 +37,7 @@ int *get_int_data(list_node_t *lnode) {
bool iterate_int(list_node_t *lnode)
{
printf("Found value: %d\n", *get_int_data(lnode));
printf("At Key: %d Found value: %d\n", get_key(lnode), *get_int_data(lnode));
return true;
}
@@ -57,16 +59,23 @@ BOOST_AUTO_TEST_CASE(test_int_list){
int i, numbers = 10;
list_t *list = NULL;
int key[10 + 1];
srand((unsigned int)time(0));
list = create_list(sizeof(int), NULL);
for(i = 1; i <= numbers; i++) {
append_list(list, &i);
key[i] = append_list(list, &i);
}
BOOST_CHECK(size_list(list) == 10);
listIterator iterator = (listIterator)iterate_int;
for_each_list(list, iterator);
list_node_t *lnode = search_list(list, key[5]);
BOOST_CHECK(get_key(lnode) == key[5]);
delete_list(list);
}
@@ -179,9 +188,15 @@ bool iterate_test_data(list_node_t *lnode)
}
char *get_name(list_node_t *lnode)
{
return get_test_data(lnode)->name;
}
BOOST_AUTO_TEST_CASE(test_struct_list){
int key;
list_t *list = NULL;
list = create_list(sizeof(test_data_t *), delete_test_data);
@@ -190,7 +205,7 @@ BOOST_AUTO_TEST_CASE(test_struct_list){
append_list(list, &data);
data = create_test_data(2, "Kevin");
append_list(list, &data);
key = append_list(list, &data);
data = create_test_data(3, "Michael");
append_list(list, &data);
@@ -202,16 +217,11 @@ BOOST_AUTO_TEST_CASE(test_struct_list){
for_each_list(list, iterator);
list_node_t *lnode;
// Iterate over list while maintaining containment of list abstraction
for (lnode = first_list(list); done_list(lnode); lnode = next_list(lnode)) {
test_data_t *test_data = get_test_data(lnode);
// locate a list node by a key
printf("Found %s!\n", get_name(search_list(list, key)));
if (test_data->num == 2)
printf("Found %s!\n", test_data->name);
}
lnode = head_list(list, true);
list_node_t *lnode = head_list(list, true);
delete_node(list, lnode);
delete_list(list);