X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=tests%2Fcheck_session.c;h=d6895af8f4ec174ee19c785f3ac0f2876f263741;hp=53b874b370bd44fd453576debdd8a09efa531b48;hb=2590c098bb44f660a9668db66deaf59f3a7a651b;hpb=98e0b79b9fd2abf076054abc5f25c184b436cb87

diff --git a/tests/check_session.c b/tests/check_session.c
index 53b874b..d6895af 100644
--- a/tests/check_session.c
+++ b/tests/check_session.c
@@ -18,20 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "../libsigrokdecode.h" /* First, to avoid compiler warning. */
-#include "../libsigrokdecode-internal.h"
+#include "../libsigrokdecode-internal.h" /* First, to avoid compiler warning. */
+#include "../libsigrokdecode.h"
+#include <stdint.h>
 #include <stdlib.h>
 #include <check.h>
-
-static void setup(void)
-{
-	/* Silence libsigrokdecode while the unit tests run. */
-	srd_log_loglevel_set(SRD_LOG_NONE);
-}
-
-static void teardown(void)
-{
-}
+#include "lib.h"
 
 /*
  * Check whether srd_session_new() works.
@@ -192,11 +184,10 @@ START_TEST(test_session_metadata_set)
 	srd_init(NULL);
 	srd_session_new(&sess);
 	/* Try a bunch of values. */
-	for (i = 0; i < 1000; i++) {
+	for (i = 0; i < 1000; i++)
 		conf_check_ok(sess, SRD_CONF_SAMPLERATE, i);
-	}
 	/* Try the max. possible value. */
-	conf_check_ok(sess, SRD_CONF_SAMPLERATE, 18446744073709551615ULL);
+	conf_check_ok(sess, SRD_CONF_SAMPLERATE, UINT64_MAX);
 	srd_session_destroy(sess);
 	srd_exit();
 }
@@ -241,7 +232,7 @@ Suite *suite_session(void)
 	s = suite_create("session");
 
 	tc = tcase_create("new_destroy");
-	tcase_add_checked_fixture(tc, setup, teardown);
+	tcase_add_checked_fixture(tc, srdtest_setup, srdtest_teardown);
 	tcase_add_test(tc, test_session_new);
 	tcase_add_test(tc, test_session_new_bogus);
 	tcase_add_test(tc, test_session_new_multiple);
@@ -250,7 +241,7 @@ Suite *suite_session(void)
 	suite_add_tcase(s, tc);
 
 	tc = tcase_create("config");
-	tcase_add_checked_fixture(tc, setup, teardown);
+	tcase_add_checked_fixture(tc, srdtest_setup, srdtest_teardown);
 	tcase_add_test(tc, test_session_metadata_set);
 	tcase_add_test(tc, test_session_metadata_set_bogus);
 	suite_add_tcase(s, tc);