diff --git a/tests/core.c b/tests/core.c index f09a6e87..6bab0d2d 100644 --- a/tests/core.c +++ b/tests/core.c @@ -37,9 +37,9 @@ START_TEST(test_init_exit) int ret; ret = srd_init(NULL); - fail_unless(ret == SRD_OK, "srd_init() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_init() failed: %d.", ret); ret = srd_exit(); - fail_unless(ret == SRD_OK, "srd_exit() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_exit() failed: %d.", ret); } END_TEST @@ -54,13 +54,13 @@ START_TEST(test_init_exit_2) int ret; ret = srd_init(NULL); - fail_unless(ret == SRD_OK, "srd_init() 1 failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_init() 1 failed: %d.", ret); ret = srd_init(NULL); - fail_unless(ret != SRD_OK, "srd_init() 2 didn't fail: %d.", ret); + ck_assert_msg(ret != SRD_OK, "srd_init() 2 didn't fail: %d.", ret); ret = srd_exit(); - fail_unless(ret == SRD_OK, "srd_exit() 2 failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_exit() 2 failed: %d.", ret); ret = srd_exit(); - fail_unless(ret == SRD_OK, "srd_exit() 1 failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_exit() 1 failed: %d.", ret); } END_TEST @@ -72,17 +72,17 @@ START_TEST(test_init_exit_3) int ret; ret = srd_init(NULL); - fail_unless(ret == SRD_OK, "srd_init() 1 failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_init() 1 failed: %d.", ret); ret = srd_init(NULL); - fail_unless(ret != SRD_OK, "srd_init() 2 didn't fail: %d.", ret); + ck_assert_msg(ret != SRD_OK, "srd_init() 2 didn't fail: %d.", ret); ret = srd_init(NULL); - fail_unless(ret != SRD_OK, "srd_init() 3 didn't fail: %d.", ret); + ck_assert_msg(ret != SRD_OK, "srd_init() 3 didn't fail: %d.", ret); ret = srd_exit(); - fail_unless(ret == SRD_OK, "srd_exit() 3 failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_exit() 3 failed: %d.", ret); ret = srd_exit(); - fail_unless(ret == SRD_OK, "srd_exit() 2 failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_exit() 2 failed: %d.", ret); ret = srd_exit(); - fail_unless(ret == SRD_OK, "srd_exit() 1 failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_exit() 1 failed: %d.", ret); } END_TEST diff --git a/tests/decoder.c b/tests/decoder.c index 3acabaec..fa3a059e 100644 --- a/tests/decoder.c +++ b/tests/decoder.c @@ -33,7 +33,8 @@ START_TEST(test_load_all) srd_init(DECODERS_TESTDIR); ret = srd_decoder_load_all(); - fail_unless(ret == SRD_OK, "srd_decoder_load_all() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_decoder_load_all() failed: %d.", + ret); srd_exit(); } END_TEST @@ -48,7 +49,8 @@ START_TEST(test_load_all_no_init) int ret; ret = srd_decoder_load_all(); - fail_unless(ret != SRD_OK, "srd_decoder_load_all() didn't fail properly."); + ck_assert_msg(ret != SRD_OK, + "srd_decoder_load_all() didn't fail properly."); } END_TEST @@ -62,11 +64,13 @@ START_TEST(test_load) srd_init(DECODERS_TESTDIR); ret = srd_decoder_load("uart"); - fail_unless(ret == SRD_OK, "srd_decoder_load(uart) failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_decoder_load(uart) failed: %d.", + ret); ret = srd_decoder_load("spi"); - fail_unless(ret == SRD_OK, "srd_decoder_load(spi) failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_decoder_load(spi) failed: %d.", ret); ret = srd_decoder_load("usb_signalling"); - fail_unless(ret == SRD_OK, "srd_decoder_load(usb_signalling) failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, + "srd_decoder_load(usb_signalling) failed: %d.", ret); srd_exit(); } END_TEST @@ -79,17 +83,17 @@ START_TEST(test_load_bogus) { srd_init(DECODERS_TESTDIR); /* http://sigrok.org/bugzilla/show_bug.cgi?id=176 */ - fail_unless(srd_decoder_load(NULL) != SRD_OK); - fail_unless(srd_decoder_load("") != SRD_OK); - fail_unless(srd_decoder_load(" ") != SRD_OK); - fail_unless(srd_decoder_load("nonexisting") != SRD_OK); - fail_unless(srd_decoder_load("UART") != SRD_OK); - fail_unless(srd_decoder_load("UaRt") != SRD_OK); - fail_unless(srd_decoder_load("u a r t") != SRD_OK); - fail_unless(srd_decoder_load("uart ") != SRD_OK); - fail_unless(srd_decoder_load(" uart") != SRD_OK); - fail_unless(srd_decoder_load(" uart ") != SRD_OK); - fail_unless(srd_decoder_load("uart spi") != SRD_OK); + ck_assert(srd_decoder_load(NULL) != SRD_OK); + ck_assert(srd_decoder_load("") != SRD_OK); + ck_assert(srd_decoder_load(" ") != SRD_OK); + ck_assert(srd_decoder_load("nonexisting") != SRD_OK); + ck_assert(srd_decoder_load("UART") != SRD_OK); + ck_assert(srd_decoder_load("UaRt") != SRD_OK); + ck_assert(srd_decoder_load("u a r t") != SRD_OK); + ck_assert(srd_decoder_load("uart ") != SRD_OK); + ck_assert(srd_decoder_load(" uart") != SRD_OK); + ck_assert(srd_decoder_load(" uart ") != SRD_OK); + ck_assert(srd_decoder_load("uart spi") != SRD_OK); srd_exit(); } END_TEST @@ -101,13 +105,13 @@ END_TEST START_TEST(test_load_valid_and_bogus) { srd_init(DECODERS_TESTDIR); - fail_unless(srd_decoder_load("") != SRD_OK); - fail_unless(srd_decoder_load("uart") == SRD_OK); - fail_unless(srd_decoder_load("") != SRD_OK); - fail_unless(srd_decoder_load("spi") == SRD_OK); - fail_unless(srd_decoder_load("") != SRD_OK); - fail_unless(srd_decoder_load("can") == SRD_OK); - fail_unless(srd_decoder_load("") != SRD_OK); + ck_assert(srd_decoder_load("") != SRD_OK); + ck_assert(srd_decoder_load("uart") == SRD_OK); + ck_assert(srd_decoder_load("") != SRD_OK); + ck_assert(srd_decoder_load("spi") == SRD_OK); + ck_assert(srd_decoder_load("") != SRD_OK); + ck_assert(srd_decoder_load("can") == SRD_OK); + ck_assert(srd_decoder_load("") != SRD_OK); srd_exit(); } END_TEST @@ -123,11 +127,11 @@ START_TEST(test_load_multiple) srd_init(DECODERS_TESTDIR); ret = srd_decoder_load("uart"); - fail_unless(ret == SRD_OK, "Loading uart PD 1x failed: %d", ret); + ck_assert_msg(ret == SRD_OK, "Loading uart PD 1x failed: %d", ret); ret = srd_decoder_load("uart"); - fail_unless(ret == SRD_OK, "Loading uart PD 2x failed: %d", ret); + ck_assert_msg(ret == SRD_OK, "Loading uart PD 2x failed: %d", ret); ret = srd_decoder_load("uart"); - fail_unless(ret == SRD_OK, "Loading uart PD 3x failed: %d", ret); + ck_assert_msg(ret == SRD_OK, "Loading uart PD 3x failed: %d", ret); srd_exit(); } END_TEST @@ -141,8 +145,8 @@ START_TEST(test_load_nonexisting_pd_dir) #if 0 /* TODO: Build libsigrokdecode with no default PD dir. */ srd_init("/nonexisting_dir"); - fail_unless(srd_decoder_load("spi") != SRD_OK); - fail_unless(g_slist_length((GSList *)srd_decoder_list()) == 0); + ck_assert(srd_decoder_load("spi") != SRD_OK); + ck_assert(g_slist_length((GSList *)srd_decoder_list()) == 0); srd_exit(); #endif } @@ -158,9 +162,11 @@ START_TEST(test_unload_all) srd_init(DECODERS_TESTDIR); ret = srd_decoder_load_all(); - fail_unless(ret == SRD_OK, "srd_decoder_load_all() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_decoder_load_all() failed: %d.", + ret); ret = srd_decoder_unload_all(); - fail_unless(ret == SRD_OK, "srd_decoder_unload_all() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_decoder_unload_all() failed: %d.", + ret); srd_exit(); } END_TEST @@ -174,7 +180,8 @@ START_TEST(test_unload_all_no_init) int ret; ret = srd_decoder_unload_all(); - fail_unless(ret == SRD_OK, "srd_decoder_unload_all() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_decoder_unload_all() failed: %d.", + ret); } END_TEST @@ -189,9 +196,11 @@ START_TEST(test_unload_all_multiple) srd_init(DECODERS_TESTDIR); for (i = 0; i < 10; i++) { ret = srd_decoder_load_all(); - fail_unless(ret == SRD_OK, "srd_decoder_load_all() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, + "srd_decoder_load_all() failed: %d.", ret); ret = srd_decoder_unload_all(); - fail_unless(ret == SRD_OK, "srd_decoder_unload_all() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, + "srd_decoder_unload_all() failed: %d.", ret); } srd_exit(); } @@ -208,7 +217,8 @@ START_TEST(test_unload_all_multiple_noload) srd_init(DECODERS_TESTDIR); for (i = 0; i < 10; i++) { ret = srd_decoder_unload_all(); - fail_unless(ret == SRD_OK, "srd_decoder_unload_all() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, + "srd_decoder_unload_all() failed: %d.", ret); } srd_exit(); } @@ -225,11 +235,12 @@ START_TEST(test_unload) srd_init(DECODERS_TESTDIR); ret = srd_decoder_load("uart"); - fail_unless(ret == SRD_OK, "srd_decoder_load(uart) failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_decoder_load(uart) failed: %d.", + ret); dec = srd_decoder_get_by_id("uart"); - fail_unless(dec != NULL); + ck_assert(dec != NULL); ret = srd_decoder_unload(dec); - fail_unless(ret == SRD_OK, "srd_decoder_unload() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_decoder_unload() failed: %d.", ret); srd_exit(); } END_TEST @@ -241,7 +252,7 @@ END_TEST START_TEST(test_unload_null) { srd_init(DECODERS_TESTDIR); - fail_unless(srd_decoder_unload(NULL) != SRD_OK); + ck_assert(srd_decoder_unload(NULL) != SRD_OK); srd_exit(); } END_TEST @@ -252,7 +263,7 @@ END_TEST */ START_TEST(test_unload_null_no_init) { - fail_unless(srd_decoder_unload(NULL) != SRD_OK); + ck_assert(srd_decoder_unload(NULL) != SRD_OK); } END_TEST @@ -264,7 +275,7 @@ START_TEST(test_decoder_list) { srd_init(DECODERS_TESTDIR); srd_decoder_load_all(); - fail_unless(srd_decoder_list() != NULL); + ck_assert(srd_decoder_list() != NULL); srd_exit(); } END_TEST @@ -277,7 +288,7 @@ END_TEST START_TEST(test_decoder_list_no_load) { srd_init(DECODERS_TESTDIR); - fail_unless(srd_decoder_list() == NULL); + ck_assert(srd_decoder_list() == NULL); srd_exit(); } END_TEST @@ -291,7 +302,7 @@ END_TEST START_TEST(test_decoder_list_no_init) { srd_decoder_load_all(); - fail_unless(srd_decoder_list() == NULL); + ck_assert(srd_decoder_list() == NULL); } END_TEST @@ -302,7 +313,7 @@ END_TEST */ START_TEST(test_decoder_list_no_init_no_load) { - fail_unless(srd_decoder_list() == NULL); + ck_assert(srd_decoder_list() == NULL); } END_TEST @@ -313,15 +324,15 @@ END_TEST START_TEST(test_decoder_list_correct_numbers) { srd_init(DECODERS_TESTDIR); - fail_unless(g_slist_length((GSList *)srd_decoder_list()) == 0); + ck_assert(g_slist_length((GSList *)srd_decoder_list()) == 0); srd_decoder_load("spi"); - fail_unless(g_slist_length((GSList *)srd_decoder_list()) == 1); + ck_assert(g_slist_length((GSList *)srd_decoder_list()) == 1); srd_decoder_load("uart"); - fail_unless(g_slist_length((GSList *)srd_decoder_list()) == 2); + ck_assert(g_slist_length((GSList *)srd_decoder_list()) == 2); srd_decoder_load("can"); - fail_unless(g_slist_length((GSList *)srd_decoder_list()) == 3); + ck_assert(g_slist_length((GSList *)srd_decoder_list()) == 3); srd_decoder_load("can"); /* Load same PD twice. */ - fail_unless(g_slist_length((GSList *)srd_decoder_list()) == 3); + ck_assert(g_slist_length((GSList *)srd_decoder_list()) == 3); srd_exit(); } END_TEST @@ -334,11 +345,11 @@ START_TEST(test_get_by_id) { srd_init(DECODERS_TESTDIR); srd_decoder_load("uart"); - fail_unless(srd_decoder_get_by_id("uart") != NULL); - fail_unless(srd_decoder_get_by_id("can") == NULL); + ck_assert(srd_decoder_get_by_id("uart") != NULL); + ck_assert(srd_decoder_get_by_id("can") == NULL); srd_decoder_load("can"); - fail_unless(srd_decoder_get_by_id("uart") != NULL); - fail_unless(srd_decoder_get_by_id("can") != NULL); + ck_assert(srd_decoder_get_by_id("uart") != NULL); + ck_assert(srd_decoder_get_by_id("can") != NULL); srd_exit(); } END_TEST @@ -351,10 +362,10 @@ START_TEST(test_get_by_id_multiple) { srd_init(DECODERS_TESTDIR); srd_decoder_load("uart"); - fail_unless(srd_decoder_get_by_id("uart") != NULL); - fail_unless(srd_decoder_get_by_id("uart") != NULL); - fail_unless(srd_decoder_get_by_id("uart") != NULL); - fail_unless(srd_decoder_get_by_id("uart") != NULL); + ck_assert(srd_decoder_get_by_id("uart") != NULL); + ck_assert(srd_decoder_get_by_id("uart") != NULL); + ck_assert(srd_decoder_get_by_id("uart") != NULL); + ck_assert(srd_decoder_get_by_id("uart") != NULL); srd_exit(); } END_TEST @@ -366,17 +377,17 @@ END_TEST START_TEST(test_get_by_id_bogus) { srd_init(DECODERS_TESTDIR); - fail_unless(srd_decoder_get_by_id(NULL) == NULL); - fail_unless(srd_decoder_get_by_id("") == NULL); - fail_unless(srd_decoder_get_by_id(" ") == NULL); - fail_unless(srd_decoder_get_by_id("nonexisting") == NULL); - fail_unless(srd_decoder_get_by_id("sPi") == NULL); - fail_unless(srd_decoder_get_by_id("SPI") == NULL); - fail_unless(srd_decoder_get_by_id("s p i") == NULL); - fail_unless(srd_decoder_get_by_id(" spi") == NULL); - fail_unless(srd_decoder_get_by_id("spi ") == NULL); - fail_unless(srd_decoder_get_by_id(" spi ") == NULL); - fail_unless(srd_decoder_get_by_id("spi uart") == NULL); + ck_assert(srd_decoder_get_by_id(NULL) == NULL); + ck_assert(srd_decoder_get_by_id("") == NULL); + ck_assert(srd_decoder_get_by_id(" ") == NULL); + ck_assert(srd_decoder_get_by_id("nonexisting") == NULL); + ck_assert(srd_decoder_get_by_id("sPi") == NULL); + ck_assert(srd_decoder_get_by_id("SPI") == NULL); + ck_assert(srd_decoder_get_by_id("s p i") == NULL); + ck_assert(srd_decoder_get_by_id(" spi") == NULL); + ck_assert(srd_decoder_get_by_id("spi ") == NULL); + ck_assert(srd_decoder_get_by_id(" spi ") == NULL); + ck_assert(srd_decoder_get_by_id("spi uart") == NULL); srd_exit(); } END_TEST @@ -394,7 +405,7 @@ START_TEST(test_doc_get) srd_decoder_load("uart"); dec = srd_decoder_get_by_id("uart"); doc = srd_decoder_doc_get(dec); - fail_unless(doc != NULL); + ck_assert(doc != NULL); g_free(doc); srd_exit(); } @@ -415,8 +426,8 @@ START_TEST(test_doc_get_null) dec.py_mod = NULL; srd_init(DECODERS_TESTDIR); - fail_unless(srd_decoder_doc_get(NULL) == NULL); - fail_unless(srd_decoder_doc_get(&dec) == NULL); + ck_assert(srd_decoder_doc_get(NULL) == NULL); + ck_assert(srd_decoder_doc_get(&dec) == NULL); srd_exit(); } END_TEST diff --git a/tests/inst.c b/tests/inst.c index fd8f709a..6cfe2564 100644 --- a/tests/inst.c +++ b/tests/inst.c @@ -36,7 +36,7 @@ START_TEST(test_inst_new) srd_decoder_load("uart"); srd_session_new(&sess); inst = srd_inst_new(sess, "uart", NULL); - fail_unless(inst != NULL, "srd_inst_new() failed."); + ck_assert_msg(inst != NULL, "srd_inst_new() failed."); srd_exit(); } END_TEST @@ -58,21 +58,21 @@ START_TEST(test_inst_new_multiple) /* Multiple srd_inst_new() calls must work. */ inst1 = srd_inst_new(sess, "uart", NULL); - fail_unless(inst1 != NULL, "srd_inst_new() 1 failed."); + ck_assert_msg(inst1 != NULL, "srd_inst_new() 1 failed."); inst2 = srd_inst_new(sess, "spi", NULL); - fail_unless(inst2 != NULL, "srd_inst_new() 2 failed."); + ck_assert_msg(inst2 != NULL, "srd_inst_new() 2 failed."); inst3 = srd_inst_new(sess, "can", NULL); - fail_unless(inst3 != NULL, "srd_inst_new() 3 failed."); + ck_assert_msg(inst3 != NULL, "srd_inst_new() 3 failed."); /* The returned instance pointers must not be the same. */ - fail_unless(inst1 != inst2); - fail_unless(inst1 != inst3); - fail_unless(inst2 != inst3); + ck_assert(inst1 != inst2); + ck_assert(inst1 != inst3); + ck_assert(inst2 != inst3); /* Each instance must have another py_inst than any of the others. */ - fail_unless(inst1->py_inst != inst2->py_inst); - fail_unless(inst1->py_inst != inst3->py_inst); - fail_unless(inst2->py_inst != inst3->py_inst); + ck_assert(inst1->py_inst != inst2->py_inst); + ck_assert(inst1->py_inst != inst3->py_inst); + ck_assert(inst2->py_inst != inst3->py_inst); srd_exit(); } @@ -96,8 +96,9 @@ START_TEST(test_inst_option_set_empty) options = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)g_variant_unref); ret = srd_inst_option_set(inst, options); - fail_unless(ret == SRD_OK, "srd_inst_option_set() with empty options " - "hash failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, + "srd_inst_option_set() with empty options " + "hash failed: %d.", ret); srd_exit(); } END_TEST @@ -123,18 +124,18 @@ START_TEST(test_inst_option_set_bogus) /* NULL instance. */ ret = srd_inst_option_set(NULL, options); - fail_unless(ret != SRD_OK, "srd_inst_option_set() with NULL " - "instance failed: %d.", ret); + ck_assert_msg(ret != SRD_OK, "srd_inst_option_set() with NULL " + "instance failed: %d.", ret); /* NULL 'options' GHashTable. */ ret = srd_inst_option_set(inst, NULL); - fail_unless(ret != SRD_OK, "srd_inst_option_set() with NULL " - "options hash failed: %d.", ret); + ck_assert_msg(ret != SRD_OK, "srd_inst_option_set() with NULL " + "options hash failed: %d.", ret); /* NULL instance and NULL 'options' GHashTable. */ ret = srd_inst_option_set(NULL, NULL); - fail_unless(ret != SRD_OK, "srd_inst_option_set() with NULL " - "instance and NULL options hash failed: %d.", ret); + ck_assert_msg(ret != SRD_OK, "srd_inst_option_set() with NULL " + "instance and NULL options hash failed: %d.", ret); srd_exit(); } diff --git a/tests/session.c b/tests/session.c index 73b7669e..ff3dc380 100644 --- a/tests/session.c +++ b/tests/session.c @@ -36,7 +36,7 @@ START_TEST(test_session_new) srd_init(NULL); ret = srd_session_new(&sess); - fail_unless(ret == SRD_OK, "srd_session_new() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_session_new() failed: %d.", ret); srd_exit(); } END_TEST @@ -51,7 +51,7 @@ START_TEST(test_session_new_bogus) srd_init(NULL); ret = srd_session_new(NULL); - fail_unless(ret != SRD_OK, "srd_session_new(NULL) worked."); + ck_assert_msg(ret != SRD_OK, "srd_session_new(NULL) worked."); srd_exit(); } END_TEST @@ -71,34 +71,37 @@ START_TEST(test_session_new_multiple) /* Multiple srd_session_new() calls must work. */ ret = srd_session_new(&sess1); - fail_unless(ret == SRD_OK, "srd_session_new() 1 failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_session_new() 1 failed: %d.", ret); ret = srd_session_new(&sess2); - fail_unless(ret == SRD_OK, "srd_session_new() 2 failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_session_new() 2 failed: %d.", ret); ret = srd_session_new(&sess3); - fail_unless(ret == SRD_OK, "srd_session_new() 3 failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_session_new() 3 failed: %d.", ret); /* The returned session pointers must all be non-NULL. */ - fail_unless(sess1 != NULL); - fail_unless(sess2 != NULL); - fail_unless(sess3 != NULL); + ck_assert(sess1 != NULL); + ck_assert(sess2 != NULL); + ck_assert(sess3 != NULL); /* The returned session pointers must not be the same. */ - fail_unless(sess1 != sess2); - fail_unless(sess1 != sess3); - fail_unless(sess2 != sess3); + ck_assert(sess1 != sess2); + ck_assert(sess1 != sess3); + ck_assert(sess2 != sess3); /* Each session must have another ID than any other session. */ - fail_unless(sess1->session_id != sess2->session_id); - fail_unless(sess1->session_id != sess3->session_id); - fail_unless(sess2->session_id != sess3->session_id); + ck_assert(sess1->session_id != sess2->session_id); + ck_assert(sess1->session_id != sess3->session_id); + ck_assert(sess2->session_id != sess3->session_id); /* Destroying any of the sessions must work. */ ret = srd_session_destroy(sess1); - fail_unless(ret == SRD_OK, "srd_session_destroy() 1 failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_session_destroy() 1 failed: %d.", + ret); ret = srd_session_destroy(sess2); - fail_unless(ret == SRD_OK, "srd_session_destroy() 2 failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_session_destroy() 2 failed: %d.", + ret); ret = srd_session_destroy(sess3); - fail_unless(ret == SRD_OK, "srd_session_destroy() 3 failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_session_destroy() 3 failed: %d.", + ret); srd_exit(); } @@ -116,7 +119,7 @@ START_TEST(test_session_destroy) srd_init(NULL); srd_session_new(&sess); ret = srd_session_destroy(sess); - fail_unless(ret == SRD_OK, "srd_session_destroy() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_session_destroy() failed: %d.", ret); srd_exit(); } END_TEST @@ -131,7 +134,7 @@ START_TEST(test_session_destroy_bogus) srd_init(NULL); ret = srd_session_destroy(NULL); - fail_unless(ret != SRD_OK, "srd_session_destroy() failed: %d.", ret); + ck_assert_msg(ret != SRD_OK, "srd_session_destroy() failed: %d.", ret); srd_exit(); } END_TEST @@ -141,8 +144,9 @@ static void conf_check_ok(struct srd_session *sess, int key, uint64_t x) int ret; ret = srd_session_metadata_set(sess, key, g_variant_new_uint64(x)); - fail_unless(ret == SRD_OK, "srd_session_metadata_set(%p, %d, %" - PRIu64 ") failed: %d.", sess, key, x, ret); + ck_assert_msg(ret == SRD_OK, + "srd_session_metadata_set(%p, %d, %" PRIu64 ") failed: %d.", + sess, key, x, ret); } static void conf_check_fail(struct srd_session *sess, int key, uint64_t x) @@ -151,8 +155,9 @@ static void conf_check_fail(struct srd_session *sess, int key, uint64_t x) GVariant *value = g_variant_new_uint64(x); ret = srd_session_metadata_set(sess, key, value); - fail_unless(ret != SRD_OK, "srd_session_metadata_set(%p, %d, %" - PRIu64 ") worked.", sess, key, x); + ck_assert_msg(ret != SRD_OK, + "srd_session_metadata_set(%p, %d, %" PRIu64 ") worked.", + sess, key, x); if (ret != SRD_OK) g_variant_unref(value); } @@ -162,8 +167,9 @@ static void conf_check_fail_null(struct srd_session *sess, int key) int ret; ret = srd_session_metadata_set(sess, key, NULL); - fail_unless(ret != SRD_OK, - "srd_session_metadata_set(NULL) for key %d worked.", key); + ck_assert_msg(ret != SRD_OK, + "srd_session_metadata_set(NULL) for key %d worked.", + key); } static void conf_check_fail_str(struct srd_session *sess, int key, const char *s) @@ -172,8 +178,8 @@ static void conf_check_fail_str(struct srd_session *sess, int key, const char *s GVariant *value = g_variant_new_string(s); ret = srd_session_metadata_set(sess, key, value); - fail_unless(ret != SRD_OK, "srd_session_metadata_set() for key %d " - "failed: %d.", key, ret); + ck_assert_msg(ret != SRD_OK, "srd_session_metadata_set() for key %d " + "failed: %d.", key, ret); if (ret != SRD_OK) g_variant_unref(value); } @@ -244,18 +250,22 @@ START_TEST(test_session_reset_nodata) srd_init(NULL); srd_session_new(&sess); ret = srd_session_terminate_reset(sess); - fail_unless(ret == SRD_OK, "srd_session_terminate_reset() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, + "srd_session_terminate_reset() failed: %d.", ret); ret = srd_session_start(sess); - fail_unless(ret == SRD_OK, "srd_session_start() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_session_start() failed: %d.", ret); ret = srd_session_terminate_reset(sess); - fail_unless(ret == SRD_OK, "srd_session_terminate_reset() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, + "srd_session_terminate_reset() failed: %d.", ret); data = g_variant_new_uint64(1000000); ret = srd_session_metadata_set(sess, SRD_CONF_SAMPLERATE, data); - fail_unless(ret == SRD_OK, "srd_session_metadata_set() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_session_metadata_set() failed: %d.", + ret); ret = srd_session_terminate_reset(sess); - fail_unless(ret == SRD_OK, "srd_session_terminate_reset() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, + "srd_session_terminate_reset() failed: %d.", ret); ret = srd_session_destroy(sess); - fail_unless(ret == SRD_OK, "srd_session_destroy() failed: %d.", ret); + ck_assert_msg(ret == SRD_OK, "srd_session_destroy() failed: %d.", ret); srd_exit(); } END_TEST