tests: Factor out srtest_setup() and srtest_teardown().

[libsigrok.git] / tests / check_input_binary.c

diff --git a/tests/check_input_binary.c b/tests/check_input_binary.c
index f69c73743fdcf9698884f465d60cfdb693aefe3b..cd2e777704f9e4062a9755dd22809fd36a1def95 100644 (file)
--- a/tests/check_input_binary.c
+++ b/tests/check_input_binary.c
@@ -20,7 +20,7 @@
 
 #include <check.h>
 #include <glib/gstdio.h>
-#include "../libsigrok.h"
+#include "../include/libsigrok/libsigrok.h"
 #include "lib.h"
 
 #define FILENAME               "foo.dat"
@@ -30,31 +30,13 @@
 #define CHECK_ALL_HIGH         1
 #define CHECK_HELLO_WORLD      2
 
-static struct sr_context *sr_ctx;
-
 static uint64_t df_packet_counter = 0, sample_counter = 0;
 static gboolean have_seen_df_end = FALSE;
-static GArray *logic_probelist = NULL;
+static GArray *logic_channellist = NULL;
 static int check_to_perform;
 static uint64_t expected_samples;
 static uint64_t *expected_samplerate;
 
-static void setup(void)
-{
-       int ret;
-
-       ret = sr_init(&sr_ctx);
-       fail_unless(ret == SR_OK, "sr_init() failed: %d.", ret);
-}
-
-static void teardown(void)
-{
-       int ret;
-
-       ret = sr_exit(sr_ctx);
-       fail_unless(ret == SR_OK, "sr_exit() failed: %d.", ret);
-}
-
 static void check_all_low(const struct sr_datafeed_logic *logic)
 {
        uint64_t i;
@@ -123,10 +105,10 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
                // g_debug("Received SR_DF_HEADER.");
                // fail_unless(p != NULL, "SR_DF_HEADER payload was NULL.");
 
-               logic_probelist = srtest_get_enabled_logic_probes(sdi);
-               fail_unless(logic_probelist != NULL);
-               fail_unless(logic_probelist->len != 0);
-               // g_debug("Enabled probes: %d.", logic_probelist->len);
+               logic_channellist = srtest_get_enabled_logic_channels(sdi);
+               fail_unless(logic_channellist != NULL);
+               fail_unless(logic_channellist->len != 0);
+               // g_debug("Enabled channels: %d.", logic_channellist->len);
                break;
        case SR_DF_META:
                // g_debug("Received SR_DF_META.");
@@ -204,11 +186,12 @@ static void check_buf(const char *filename, GHashTable *param,
        int ret;
        struct sr_input *in;
        struct sr_input_format *in_format;
+       struct sr_session *session;
 
        /* Initialize global variables for this run. */
        df_packet_counter = sample_counter = 0;
        have_seen_df_end = FALSE;
-       logic_probelist = NULL;
+       logic_channellist = NULL;
        check_to_perform = check;
        expected_samples = samples;
        expected_samplerate = samplerate;
@@ -226,11 +209,11 @@ static void check_buf(const char *filename, GHashTable *param,
        ret = in->format->init(in, filename);
        fail_unless(ret == SR_OK, "Input format init error: %d", ret);
        
-       sr_session_new();
-       sr_session_datafeed_callback_add(datafeed_in, NULL);
-       sr_session_dev_add(in->sdi);
+       sr_session_new(&session);
+       sr_session_datafeed_callback_add(session, datafeed_in, NULL);
+       sr_session_dev_add(session, in->sdi);
        in_format->loadfile(in, filename);
-       sr_session_destroy();
+       sr_session_destroy(session);
 
        g_unlink(filename); /* Delete file again. */
 }
@@ -324,7 +307,7 @@ Suite *suite_input_binary(void)
        s = suite_create("input-binary");
 
        tc = tcase_create("basic");
-       tcase_add_checked_fixture(tc, setup, teardown);
+       tcase_add_checked_fixture(tc, srtest_setup, srtest_teardown);
        tcase_add_test(tc, test_input_binary_all_low);
        tcase_add_test(tc, test_input_binary_all_high);
        tcase_add_loop_test(tc, test_input_binary_all_high_loop, 0, 10);