Skip to content

tests: Replace deprecated fail_unless calls #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

tests: Replace deprecated fail_unless calls #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions tests/core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down
151 changes: 81 additions & 70 deletions tests/decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
}
Expand All @@ -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
Expand All @@ -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

Expand All @@ -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();
}
Expand All @@ -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();
}
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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

Expand All @@ -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

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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();
}
Expand All @@ -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
Expand Down
Loading