X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=tests%2Fcheck_decoder.c;h=fe1b92f21765ac8e3b39a61b763e990c865a80e0;hb=de556baee957a019ac5c16caf1305f5441adf30c;hp=0b46348b70dc60419ebb50bea10d3a6469cf5876;hpb=9b9ff99983bba5f06093002e6cafd5bfd632b65d;p=libsigrokdecode.git

diff --git a/tests/check_decoder.c b/tests/check_decoder.c
index 0b46348..fe1b92f 100644
--- a/tests/check_decoder.c
+++ b/tests/check_decoder.c
@@ -57,7 +57,7 @@ START_TEST(test_load_all_no_init)
 	int ret;
 
 	ret = srd_decoder_load_all();
-	fail_unless(ret == SRD_OK, "srd_decoder_load_all() failed: %d.", ret);
+	fail_unless(ret != SRD_OK, "srd_decoder_load_all() didn't fail properly.");
 }
 END_TEST
 
@@ -131,7 +131,6 @@ START_TEST(test_load_multiple)
 	int ret;
 
 	srd_init(NULL);
-	srd_log_loglevel_set(SRD_LOG_SPEW);
 	ret = srd_decoder_load("uart");
 	fail_unless(ret == SRD_OK, "Loading uart PD 1x failed: %d", ret);
 	ret = srd_decoder_load("uart");
@@ -307,25 +306,7 @@ END_TEST
 START_TEST(test_doc_get_null)
 {
 	srd_init(NULL);
-	fail_unless(srd_decoder_doc_get(NULL) != NULL);
-	srd_exit();
-}
-END_TEST
-
-/*
- * Check whether srd_decoder_doc_get() fails with an "empty" argument.
- * If it returns a value != NULL (or segfaults) this test will fail.
- * See also: http://sigrok.org/bugzilla/show_bug.cgi?id=180
- */
-START_TEST(test_doc_get_empty)
-{
-	struct srd_decoder dec;
-
-	srd_init(NULL);
-
-	memset(&dec, 0, sizeof(struct srd_decoder));
-	fail_unless(srd_decoder_doc_get(&dec) == NULL);
-
+	fail_unless(srd_decoder_doc_get(NULL) == NULL);
 	srd_exit();
 }
 END_TEST
@@ -366,7 +347,6 @@ Suite *suite_decoder(void)
 	tc = tcase_create("doc_get");
 	tcase_add_test(tc, test_doc_get);
 	tcase_add_test(tc, test_doc_get_null);
-	tcase_add_test(tc, test_doc_get_empty);
 	suite_add_tcase(s, tc);
 
 	return s;