linked-list: Don't require an argument for the item when enumerating

This commit is contained in:
Tobias Brunner
2013-07-17 17:42:53 +02:00
parent cf4172637a
commit 1a9528f916
2 changed files with 21 additions and 1 deletions
+4 -1
View File
@@ -138,7 +138,10 @@ METHOD(enumerator_t, enumerate, bool,
this->finished = TRUE; this->finished = TRUE;
return FALSE; return FALSE;
} }
*item = this->current->value; if (item)
{
*item = this->current->value;
}
return TRUE; return TRUE;
} }
@@ -59,6 +59,22 @@ START_TEST(test_enumerate)
} }
END_TEST END_TEST
START_TEST(test_enumerate_null)
{
enumerator_t *enumerator;
int round;
round = 1;
enumerator = list->create_enumerator(list);
while (enumerator->enumerate(enumerator, NULL))
{
round++;
}
ck_assert_int_eq(round, 6);
enumerator->destroy(enumerator);
}
END_TEST
START_TEST(test_reset_enumerator) START_TEST(test_reset_enumerator)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
@@ -364,6 +380,7 @@ Suite *linked_list_enumerator_suite_create()
tc = tcase_create("enumerate"); tc = tcase_create("enumerate");
tcase_add_checked_fixture(tc, setup_list, teardown_list); tcase_add_checked_fixture(tc, setup_list, teardown_list);
tcase_add_test(tc, test_enumerate); tcase_add_test(tc, test_enumerate);
tcase_add_test(tc, test_enumerate_null);
tcase_add_test(tc, test_reset_enumerator); tcase_add_test(tc, test_reset_enumerator);
tcase_add_test(tc, test_has_more_empty); tcase_add_test(tc, test_has_more_empty);
tcase_add_test(tc, test_has_more); tcase_add_test(tc, test_has_more);