Commit 62982432 authored by Sebastian Ramacher's avatar Sebastian Ramacher

Print glib CRITICALs with a note that they are expected

parent a2d37b8e
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#include <glib.h> #include <glib.h>
#include <stdint.h> #include <stdint.h>
#include <datastructures.h> #include <datastructures.h>
#include <macros.h>
#include <log.h>
#include "tests.h" #include "tests.h"
...@@ -361,13 +363,28 @@ START_TEST(test_datastructures_list_prepend) { ...@@ -361,13 +363,28 @@ START_TEST(test_datastructures_list_prepend) {
girara_list_free(list); girara_list_free(list);
} END_TEST } END_TEST
static Suite* suite_datastructures(void) static void
critical_print(const gchar* GIRARA_UNUSED(log_domain), GLogLevelFlags GIRARA_UNUSED(log_level),
const gchar* message, gpointer GIRARA_UNUSED(user_data))
{
girara_debug("expected glib critical: %s", message);
}
static void
setup_logger(void)
{
g_log_set_handler(NULL, G_LOG_LEVEL_CRITICAL, critical_print, NULL);
}
static Suite*
suite_datastructures(void)
{ {
TCase* tcase = NULL; TCase* tcase = NULL;
Suite* suite = suite_create("Datastructures"); Suite* suite = suite_create("Datastructures");
/* list free */ /* list free */
tcase = tcase_create("list_free_function"); tcase = tcase_create("list_free_function");
tcase_add_checked_fixture(tcase, setup_logger, NULL);
tcase_add_test(tcase, test_datastructures_list_free_empty); tcase_add_test(tcase, test_datastructures_list_free_empty);
tcase_add_test(tcase, test_datastructures_list_free_already_cleared); tcase_add_test(tcase, test_datastructures_list_free_already_cleared);
tcase_add_test(tcase, test_datastructures_list_free_free_function); tcase_add_test(tcase, test_datastructures_list_free_free_function);
...@@ -376,48 +393,57 @@ static Suite* suite_datastructures(void) ...@@ -376,48 +393,57 @@ static Suite* suite_datastructures(void)
/* list create */ /* list create */
tcase = tcase_create("list_basics"); tcase = tcase_create("list_basics");
tcase_add_checked_fixture(tcase, setup_logger, NULL);
tcase_add_test(tcase, test_datastructures_list); tcase_add_test(tcase, test_datastructures_list);
suite_add_tcase(suite, tcase); suite_add_tcase(suite, tcase);
/* sorted list */ /* sorted list */
tcase = tcase_create("list_sorted"); tcase = tcase_create("list_sorted");
tcase_add_checked_fixture(tcase, setup_logger, NULL);
tcase_add_test(tcase, test_datastructures_sorted_list_basic); tcase_add_test(tcase, test_datastructures_sorted_list_basic);
tcase_add_test(tcase, test_datastructures_sorted_list); tcase_add_test(tcase, test_datastructures_sorted_list);
suite_add_tcase(suite, tcase); suite_add_tcase(suite, tcase);
/* merge lists */ /* merge lists */
tcase = tcase_create("list_merge"); tcase = tcase_create("list_merge");
tcase_add_checked_fixture(tcase, setup_logger, NULL);
tcase_add_test(tcase, test_datastructures_list_merge); tcase_add_test(tcase, test_datastructures_list_merge);
suite_add_tcase(suite, tcase); suite_add_tcase(suite, tcase);
/* search lists */ /* search lists */
tcase = tcase_create("list_find"); tcase = tcase_create("list_find");
tcase_add_checked_fixture(tcase, setup_logger, NULL);
tcase_add_test(tcase, test_datastructures_list_find); tcase_add_test(tcase, test_datastructures_list_find);
suite_add_tcase(suite, tcase); suite_add_tcase(suite, tcase);
/* prepend lists */ /* prepend lists */
tcase = tcase_create("list_prepend"); tcase = tcase_create("list_prepend");
tcase_add_checked_fixture(tcase, setup_logger, NULL);
tcase_add_test(tcase, test_datastructures_list_prepend); tcase_add_test(tcase, test_datastructures_list_prepend);
suite_add_tcase(suite, tcase); suite_add_tcase(suite, tcase);
/* list iterators */ /* list iterators */
tcase = tcase_create("list_iterators"); tcase = tcase_create("list_iterators");
tcase_add_checked_fixture(tcase, setup_logger, NULL);
suite_add_tcase(suite, tcase); suite_add_tcase(suite, tcase);
/* node free */ /* node free */
tcase = tcase_create("node_free"); tcase = tcase_create("node_free");
tcase_add_checked_fixture(tcase, setup_logger, NULL);
tcase_add_test(tcase, test_datastructures_sorted_list); tcase_add_test(tcase, test_datastructures_sorted_list);
suite_add_tcase(suite, tcase); suite_add_tcase(suite, tcase);
/* node basics */ /* node basics */
tcase = tcase_create("node_basics"); tcase = tcase_create("node_basics");
tcase_add_checked_fixture(tcase, setup_logger, NULL);
tcase_add_test(tcase, test_datastructures_node); tcase_add_test(tcase, test_datastructures_node);
suite_add_tcase(suite, tcase); suite_add_tcase(suite, tcase);
return suite; return suite;
} }
int main() int
main()
{ {
return run_suite(suite_datastructures()); return run_suite(suite_datastructures());
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment