Imagelibrary/Containers
1
0
Fork 0
mirror of https://github.com/bkthomps/Containers.git synced 2025-11-16 04:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test warnings (#62)

Browse Source
This commit is contained in:
Bailey Thompson
2020-08-06 23:18:24 -04:00
committed by GitHub
parent c22b4da660
commit eb4f8fb1ae
14 changed files with 87 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -51,4 +51,3 @@ Data structures which adapt other containers to enhance functionality.
* stack - adapts a container to provide stack (last-in first-out)
* queue - adapts a container to provide queue (first-in first-out)
* priority_queue - adapts a container to provide priority queue

16
tst/array.c
View File

@@ -9,14 +9,14 @@ static void test_invalid_init(void)
static void test_empty_array(void)
{
int get = 0xdeadbeef;
int arr[2] = {0xdeadbeef, 0xdeadbeef};
int get = 0xfacade;
int arr[2] = {0xfacade, 0xfacade};
array me = array_init(0, sizeof(int));
assert(me);
assert(array_size(me) == 0);
array_copy_to_array(arr, me);
assert(arr[0] == 0xdeadbeef);
assert(arr[1] == 0xdeadbeef);
assert(arr[0] == 0xfacade);
assert(arr[1] == 0xfacade);
assert(!array_get_data(me));
assert(array_set(me, 0, &get) == -EINVAL);
assert(array_get(&get, me, 0) == -EINVAL);
@@ -27,18 +27,18 @@ static void test_individual_operations(array me)
{
int i;
for (i = 0; i < 10; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
array_get(&get, me, i);
assert(get == 0);
}
for (i = 0; i < 10; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
array_set(me, i, &i);
array_get(&get, me, i);
assert(get == i);
}
for (i = 0; i < 10; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
array_get(&get, me, i);
assert(get == i);
}
@@ -61,7 +61,7 @@ static void test_array_copying(array me)
static void test_out_of_bounds(array me)
{
int get = 0xdeadbeef;
int get = 0xfacade;
assert(array_set(me, -1, &get) == -EINVAL);
assert(array_get(&get, me, -1) == -EINVAL);
}

20
tst/deque.c
View File

@@ -53,10 +53,10 @@ static void test_linear_operations(deque me)
add = -1;
deque_push_back(me, &add);
assert(deque_size(me) == 6);
get = 0xdeadbeef;
get = 0xfacade;
deque_get_first(&get, me);
assert(get == 10);
get = 0xdeadbeef;
get = 0xfacade;
deque_get_at(&get, me, 0);
assert(get == 10);
deque_get_at(&get, me, 1);
@@ -69,7 +69,7 @@ static void test_linear_operations(deque me)
assert(get == -2);
deque_get_at(&get, me, 5);
assert(get == -1);
get = 0xdeadbeef;
get = 0xfacade;
deque_get_last(&get, me);
assert(get == -1);
deque_pop_front(&get, me);
@@ -167,7 +167,7 @@ static void test_trim_out_of_memory(void)
fail_malloc = 1;
assert(deque_trim(me) == -ENOMEM);
for (i = 0; i < 32; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
deque_get_at(&get, me, i);
assert(get == i);
}
@@ -187,14 +187,14 @@ static void test_push_front_out_of_memory(void)
assert(deque_push_front(me, &i) == -ENOMEM);
assert(deque_size(me) == 5);
for (i = 0; i < 5; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
deque_get_at(&get, me, i);
}
fail_malloc = 1;
assert(deque_push_front(me, &i) == -ENOMEM);
assert(deque_size(me) == 5);
for (i = 0; i < 5; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
deque_get_at(&get, me, i);
}
assert(!deque_destroy(me));
@@ -212,14 +212,14 @@ static void test_push_back_out_of_memory(void)
assert(deque_push_back(me, &i) == -ENOMEM);
assert(deque_size(me) == 3);
for (i = 0; i < 3; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
deque_get_at(&get, me, i);
}
fail_malloc = 1;
assert(deque_push_back(me, &i) == -ENOMEM);
assert(deque_size(me) == 3);
for (i = 0; i < 3; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
deque_get_at(&get, me, i);
}
assert(!deque_destroy(me));
@@ -236,7 +236,7 @@ static void test_clear_out_of_memory(void)
fail_malloc = 1;
assert(deque_clear(me) == -ENOMEM);
for (i = 0; i < 32; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
deque_get_at(&get, me, i);
assert(get == i);
}
@@ -245,7 +245,7 @@ static void test_clear_out_of_memory(void)
delay_fail_malloc = 1;
assert(deque_clear(me) == -ENOMEM);
for (i = 0; i < 32; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
deque_get_at(&get, me, i);
assert(get == i);
}

32
tst/forward_list.c
View File

@@ -57,10 +57,10 @@ static void test_linear_operations(forward_list me)
add = -2;
forward_list_add_last(me, &add);
assert(forward_list_size(me) == 6);
get = 0xdeadbeef;
get = 0xfacade;
forward_list_get_first(&get, me);
assert(get == 10);
get = 0xdeadbeef;
get = 0xfacade;
forward_list_get_at(&get, me, 0);
assert(get == 10);
forward_list_get_at(&get, me, 1);
@@ -73,7 +73,7 @@ static void test_linear_operations(forward_list me)
assert(get == 3);
forward_list_get_at(&get, me, 5);
assert(get == -2);
get = 0xdeadbeef;
get = 0xfacade;
forward_list_get_last(&get, me);
assert(get == -2);
forward_list_remove_first(me);
@@ -81,7 +81,7 @@ static void test_linear_operations(forward_list me)
forward_list_remove_last(me);
get = 34;
forward_list_add_at(me, 0, &get);
first = 0xdeadbeef;
first = 0xfacade;
forward_list_get_first(&first, me);
assert(first == get);
forward_list_remove_first(me);
@@ -123,7 +123,7 @@ static void test_array_copy(forward_list me)
static void test_invalid_index(forward_list me)
{
int set = 0xdeadbeef;
int set = 0xfacade;
assert(forward_list_set_at(me, 4, &set) == -EINVAL);
assert(forward_list_get_at(&set, me, 4) == -EINVAL);
assert(forward_list_remove_at(me, 4) == -EINVAL);
@@ -156,7 +156,7 @@ static void test_add_back(void)
forward_list me = forward_list_init(sizeof(int));
assert(me);
for (i = 1; i < 10000; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
forward_list_add_last(me, &i);
forward_list_get_last(&get, me);
assert(get == i);
@@ -188,7 +188,7 @@ static void test_add_first_out_of_memory(void)
assert(forward_list_add_first(me, &i) == -ENOMEM);
assert(forward_list_size(me) == 16);
for (i = 0; i < 16; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
assert(forward_list_get_at(&get, me, i) == 0);
assert(get == 15 - i);
}
@@ -197,7 +197,7 @@ static void test_add_first_out_of_memory(void)
assert(forward_list_add_first(me, &i) == -ENOMEM);
assert(forward_list_size(me) == 16);
for (i = 0; i < 16; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
assert(forward_list_get_at(&get, me, i) == 0);
assert(get == 15 - i);
}
@@ -221,30 +221,30 @@ static void test_add_at_out_of_memory(void)
fail_malloc = 1;
assert(forward_list_add_at(me, 5, &i) == -ENOMEM);
assert(forward_list_size(me) == 16);
get = 0xdeadbeef;
get = 0xfacade;
assert(forward_list_get_at(&get, me, 0) == 0);
assert(get == 157);
for (i = 1; i < 15; i++) {
get = 0xdeadbeef;
get = 0xfacade;
assert(forward_list_get_at(&get, me, i) == 0);
assert(get == i);
}
get = 0xdeadbeef;
get = 0xfacade;
assert(forward_list_get_at(&get, me, 15) == 0);
assert(get == 982);
fail_malloc = 1;
delay_fail_malloc = 1;
assert(forward_list_add_at(me, 5, &i) == -ENOMEM);
assert(forward_list_size(me) == 16);
get = 0xdeadbeef;
get = 0xfacade;
assert(forward_list_get_at(&get, me, 0) == 0);
assert(get == 157);
for (i = 1; i < 15; i++) {
get = 0xdeadbeef;
get = 0xfacade;
assert(forward_list_get_at(&get, me, i) == 0);
assert(get == i);
}
get = 0xdeadbeef;
get = 0xfacade;
assert(forward_list_get_at(&get, me, 15) == 0);
assert(get == 982);
assert(!forward_list_destroy(me));
@@ -263,7 +263,7 @@ static void test_add_last_out_of_memory(void)
assert(forward_list_add_last(me, &i) == -ENOMEM);
assert(forward_list_size(me) == 16);
for (i = 0; i < 16; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
assert(forward_list_get_at(&get, me, i) == 0);
assert(get == i);
}
@@ -272,7 +272,7 @@ static void test_add_last_out_of_memory(void)
assert(forward_list_add_last(me, &i) == -ENOMEM);
assert(forward_list_size(me) == 16);
for (i = 0; i < 16; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
assert(forward_list_get_at(&get, me, i) == 0);
assert(get == i);
}

30
tst/list.c
View File

@@ -57,10 +57,10 @@ static void test_linear_operations(list me)
add = -2;
list_add_last(me, &add);
assert(list_size(me) == 6);
get = 0xdeadbeef;
get = 0xfacade;
list_get_first(&get, me);
assert(get == 10);
get = 0xdeadbeef;
get = 0xfacade;
list_get_at(&get, me, 0);
assert(get == 10);
list_get_at(&get, me, 1);
@@ -73,7 +73,7 @@ static void test_linear_operations(list me)
assert(get == 3);
list_get_at(&get, me, 5);
assert(get == -2);
get = 0xdeadbeef;
get = 0xfacade;
list_get_last(&get, me);
assert(get == -2);
list_remove_first(me);
@@ -81,7 +81,7 @@ static void test_linear_operations(list me)
list_remove_last(me);
get = 34;
list_add_at(me, 0, &get);
first = 0xdeadbeef;
first = 0xfacade;
list_get_first(&first, me);
assert(first == get);
list_remove_first(me);
@@ -123,7 +123,7 @@ static void test_array_copy(list me)
static void test_invalid_index(list me)
{
int set = 0xdeadbeef;
int set = 0xfacade;
assert(list_set_at(me, 4, &set) == -EINVAL);
assert(list_get_at(&set, me, 4) == -EINVAL);
assert(list_remove_at(me, 4) == -EINVAL);
@@ -169,7 +169,7 @@ static void test_add_first_out_of_memory(void)
assert(list_add_first(me, &i) == -ENOMEM);
assert(list_size(me) == 16);
for (i = 0; i < 16; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
assert(list_get_at(&get, me, i) == 0);
assert(get == 15 - i);
}
@@ -178,7 +178,7 @@ static void test_add_first_out_of_memory(void)
assert(list_add_first(me, &i) == -ENOMEM);
assert(list_size(me) == 16);
for (i = 0; i < 16; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
assert(list_get_at(&get, me, i) == 0);
assert(get == 15 - i);
}
@@ -202,30 +202,30 @@ static void test_add_at_out_of_memory(void)
fail_malloc = 1;
assert(list_add_at(me, 5, &i) == -ENOMEM);
assert(list_size(me) == 16);
get = 0xdeadbeef;
get = 0xfacade;
assert(list_get_at(&get, me, 0) == 0);
assert(get == 157);
for (i = 1; i < 15; i++) {
get = 0xdeadbeef;
get = 0xfacade;
assert(list_get_at(&get, me, i) == 0);
assert(get == i);
}
get = 0xdeadbeef;
get = 0xfacade;
assert(list_get_at(&get, me, 15) == 0);
assert(get == 982);
fail_malloc = 1;
delay_fail_malloc = 1;
assert(list_add_at(me, 5, &i) == -ENOMEM);
assert(list_size(me) == 16);
get = 0xdeadbeef;
get = 0xfacade;
assert(list_get_at(&get, me, 0) == 0);
assert(get == 157);
for (i = 1; i < 15; i++) {
get = 0xdeadbeef;
get = 0xfacade;
assert(list_get_at(&get, me, i) == 0);
assert(get == i);
}
get = 0xdeadbeef;
get = 0xfacade;
assert(list_get_at(&get, me, 15) == 0);
assert(get == 982);
assert(!list_destroy(me));
@@ -244,7 +244,7 @@ static void test_add_last_out_of_memory(void)
assert(list_add_last(me, &i) == -ENOMEM);
assert(list_size(me) == 16);
for (i = 0; i < 16; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
assert(list_get_at(&get, me, i) == 0);
assert(get == i);
}
@@ -253,7 +253,7 @@ static void test_add_last_out_of_memory(void)
assert(list_add_last(me, &i) == -ENOMEM);
assert(list_size(me) == 16);
for (i = 0; i < 16; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
assert(list_get_at(&get, me, i) == 0);
assert(get == i);
}

4
tst/map.c
View File

@@ -476,14 +476,14 @@ static void test_override_value(void)
assert(value == 17);
map_put(me, &key, &value);
key = 5;
value = 0xdeafbeef;
value = 0xfacade;
map_get(&value, me, &key);
assert(key == 5);
assert(value == 17);
value = 97;
map_put(me, &key, &value);
key = 5;
value = 0xdeafbeef;
value = 0xfacade;
map_get(&value, me, &key);
assert(key == 5);
assert(value != 17);

16
tst/multimap.c
View File

@@ -478,33 +478,33 @@ static void test_unique_deletion_patterns(void)
static void test_override_value(void)
{
int key = 5;
int value = 0xdeadbeef;
int value = 0xfacade;
multimap me = multimap_init(sizeof(int), sizeof(int), compare_int,
compare_int);
assert(me);
multimap_get_start(me, &key);
assert(!multimap_get_next(&value, me));
assert(value == 0xdeadbeef);
assert(value == 0xfacade);
value = 17;
multimap_put(me, &key, &value);
value = 0xdeadbeef;
value = 0xfacade;
multimap_get_start(me, &key);
assert(multimap_get_next(&value, me));
assert(value == 17);
value = 0xdeadbeef;
value = 0xfacade;
assert(!multimap_get_next(&value, me));
assert(value == 0xdeadbeef);
assert(value == 0xfacade);
value = 97;
multimap_put(me, &key, &value);
value = 0xdeadbeef;
value = 0xfacade;
multimap_get_start(me, &key);
assert(multimap_get_next(&value, me));
assert(value == 17);
assert(multimap_get_next(&value, me));
assert(value == 97);
value = 0xdeadbeef;
value = 0xfacade;
assert(!multimap_get_next(&value, me));
assert(value == 0xdeadbeef);
assert(value == 0xfacade);
assert(multimap_size(me) == 2);
assert(!multimap_destroy(me));
}

20
tst/priority_queue.c
View File

@@ -71,9 +71,9 @@ static void test_basic(void)
assert(me);
assert(priority_queue_size(me) == 0);
assert(priority_queue_is_empty(me));
item = 0xdeadbeef;
item = 0xfacade;
assert(!priority_queue_pop(&item, me));
assert(item == 0xdeadbeef);
assert(item == 0xfacade);
item = 5;
stub_priority_queue_push(me, &item);
item = 2;
@@ -108,14 +108,14 @@ static void test_basic(void)
stub_priority_queue_push(me, &item);
assert(priority_queue_size(me) == 16);
assert(!priority_queue_is_empty(me));
item = 0xdeadbeef;
item = 0xfacade;
priority_queue_front(&item, me);
assert(item == 11);
item = 0xdeadbeef;
item = 0xfacade;
stub_priority_queue_pop(&item, me);
assert(item == 11);
assert(priority_queue_size(me) == 15);
item = 0xdeadbeef;
item = 0xfacade;
priority_queue_front(&item, me);
assert(item == 9);
latest = item;
@@ -127,9 +127,9 @@ static void test_basic(void)
}
priority_queue_clear(me);
assert(priority_queue_is_empty(me));
item = 0xdeadbeef;
item = 0xfacade;
assert(!priority_queue_front(&item, me));
assert(item == 0xdeadbeef);
assert(item == 0xfacade);
assert(priority_queue_is_empty(me));
assert(!priority_queue_destroy(me));
}
@@ -149,7 +149,7 @@ static void test_init_out_of_memory(void)
static void test_push_out_of_memory(void)
{
int i;
int get = 0xdeadbeef;
int get = 0xfacade;
priority_queue me = priority_queue_init(sizeof(int), compare_int);
for (i = 0; i < 16; i++) {
assert(priority_queue_push(me, &i) == 0);
@@ -158,7 +158,7 @@ static void test_push_out_of_memory(void)
fail_malloc = 1;
assert(priority_queue_push(me, &get) == -ENOMEM);
for (i = 0; i < 16; i++) {
get = 0xdeadbeef;
get = 0xfacade;
assert(priority_queue_pop(&get, me));
assert(get == 15 - i);
}
@@ -171,7 +171,7 @@ static void test_push_out_of_memory(void)
fail_realloc = 1;
assert(priority_queue_push(me, &get) == -ENOMEM);
for (i = 0; i < 11; i++) {
get = 0xdeadbeef;
get = 0xfacade;
assert(priority_queue_pop(&get, me));
assert(get == 10 - i);
}

6
tst/test.c
View File

@@ -23,7 +23,7 @@ static void *(*real_realloc)(void *, size_t);
void *malloc(size_t size)
{
if (!real_malloc) {
real_malloc = dlsym(RTLD_NEXT, "malloc");
*(void **) (&real_malloc) = dlsym(RTLD_NEXT, "malloc");
}
if (delay_fail_malloc == 0 && fail_malloc == 1) {
fail_malloc = 0;
@@ -38,7 +38,7 @@ void *malloc(size_t size)
void *calloc(size_t count, size_t size)
{
if (!real_calloc) {
real_calloc = dlsym(RTLD_NEXT, "calloc");
*(void **) (&real_calloc) = dlsym(RTLD_NEXT, "calloc");
}
if (delay_fail_calloc == 0 && fail_calloc == 1) {
fail_calloc = 0;
@@ -53,7 +53,7 @@ void *calloc(size_t count, size_t size)
void *realloc(void *ptr, size_t new_size)
{
if (!real_realloc) {
real_realloc = dlsym(RTLD_NEXT, "realloc");
*(void **) (&real_realloc) = dlsym(RTLD_NEXT, "realloc");
}
if (delay_fail_realloc == 0 && fail_realloc == 1) {
fail_realloc = 0;

8
tst/unordered_map.c
View File

@@ -49,7 +49,7 @@ static void test_put(unordered_map me)
assert(unordered_map_size(me) == 1);
assert(!unordered_map_is_empty(me));
assert(unordered_map_contains(me, &key));
value = 0xdeadbeef;
value = 0xfacade;
unordered_map_get(&value, me, &key);
assert(value == 5);
key = 7;
@@ -154,7 +154,7 @@ static void test_stress_clear(unordered_map me)
unordered_map_rehash(me);
assert(hash_count == 1000);
unordered_map_clear(me);
key = 0xdeadbeef;
key = 0xfacade;
assert(!unordered_map_remove(me, &key));
assert(unordered_map_size(me) == 0);
assert(unordered_map_is_empty(me));
@@ -196,9 +196,9 @@ static void test_bad_hash(void)
unordered_map_rehash(me);
assert(unordered_map_size(me) == 3);
key = 5;
value = 0xdeadbeef;
value = 0xfacade;
assert(!unordered_map_get(&value, me, &key));
assert(value == 0xdeadbeef);
assert(value == 0xfacade);
assert(!unordered_map_destroy(me));
}

6
tst/unordered_multimap.c
View File

@@ -131,11 +131,11 @@ static void test_multiple_values_one_key(unordered_multimap me)
assert(unordered_multimap_count(me, &num) == 2);
unordered_multimap_get_start(me, &num);
count = 0;
val = 0xdeadbeef;
val = 0xfacade;
while (unordered_multimap_get_next(&val, me)) {
count++;
assert(val == 123);
val = 0xdeadbeef;
val = 0xfacade;
}
assert(count == 2);
assert(unordered_multimap_remove(me, &num, &value));
@@ -185,7 +185,7 @@ static void test_stress_clear(unordered_multimap me)
unordered_multimap_rehash(me);
assert(hash_count == 1000);
unordered_multimap_clear(me);
key = 0xdeadbeef;
key = 0xfacade;
assert(!unordered_multimap_remove(me, &key, &value));
assert(unordered_multimap_size(me) == 0);
assert(unordered_multimap_is_empty(me));

2
tst/unordered_multiset.c
View File

@@ -157,7 +157,7 @@ static void test_stress_clear(unordered_multiset me)
unordered_multiset_rehash(me);
assert(hash_count == 1000);
unordered_multiset_clear(me);
key = 0xdeadbeef;
key = 0xfacade;
assert(!unordered_multiset_remove(me, &key));
assert(unordered_multiset_size(me) == 0);
assert(unordered_multiset_is_empty(me));

2
tst/unordered_set.c
View File

@@ -135,7 +135,7 @@ static void test_stress_remove(unordered_set me)
static void test_stress_clear(unordered_set me)
{
int i;
int p = 0xdeadbeef;
int p = 0xfacade;
for (i = 5000; i < 6000; i++) {
unordered_set_put(me, &i);
assert(unordered_set_contains(me, &i));

12
tst/vector.c
View File

@@ -65,10 +65,10 @@ static void test_linear_operations(vector me)
add = -2;
vector_add_last(me, &add);
assert(vector_size(me) == 6);
get = 0xdeadbeef;
get = 0xfacade;
vector_get_first(&get, me);
assert(get == 10);
get = 0xdeadbeef;
get = 0xfacade;
vector_get_at(&get, me, 0);
assert(get == 10);
vector_get_at(&get, me, 1);
@@ -81,7 +81,7 @@ static void test_linear_operations(vector me)
assert(get == 3);
vector_get_at(&get, me, 5);
assert(get == -2);
get = 0xdeadbeef;
get = 0xfacade;
vector_get_last(&get, me);
assert(get == -2);
vector_remove_first(me);
@@ -176,7 +176,7 @@ static void test_vector_of_vectors(void)
vector inner = NULL;
vector_get_first(&inner, outer);
for (j = 0; j < 10; j++) {
int num = 0xdeadbeef;
int num = 0xfacade;
vector_get_at(&num, inner, j);
assert(num == j + 1);
}
@@ -239,7 +239,7 @@ static void test_set_space_out_of_memory(void)
assert(vector_size(me) == 7);
assert(vector_capacity(me) == 8);
for (i = 0; i < 7; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
vector_get_at(&get, me, i);
assert(get == i);
}
@@ -259,7 +259,7 @@ static void test_add_out_of_memory(void)
assert(vector_size(me) == 7);
assert(vector_capacity(me) == 8);
for (i = 0; i < 7; i++) {
int get = 0xdeadbeef;
int get = 0xfacade;
vector_get_at(&get, me, i);
assert(get == i);
}