fix tests

Author: garethpotter

tests/cpp/src/init.cpp

@@ -15,8 +15,8 @@
 
 ZTEST(thingset_init_cpp, test_init_data_objects)
 {
-    struct thingset_context ts_local;
-    struct thingset_context ts_global;
+    struct thingset_global_context ts_local;
+    struct thingset_global_context ts_global;
 
     /* initialized with array declared in data.c */
     thingset_init(&ts_local, data_objects, data_objects_size);

tests/protocol/src/bin.c

@@ -13,7 +13,7 @@
 #include "data.h"
 #include "test_utils.h"
 
-static struct thingset_context ts;
+static struct thingset_global_context ts;
 
 ZTEST(thingset_bin, test_get_root_ids)
 {
@@ -910,17 +910,19 @@ ZTEST(thingset_bin, test_export_subsets_progressively)
     int data_exp_len = hex2bin_spaced(data_exp_hex, data_exp, sizeof(data_exp));
 
     index = 0;
+    struct thingset_context req_ctx;
     ret = thingset_export_subsets_progressively(&ts, buf_large, sizeof(buf_large), SUBSET_LIVE,
-                                                THINGSET_BIN_IDS_VALUES, &index, &len);
+                                                THINGSET_BIN_IDS_VALUES, &req_ctx, &index, &len);
     zassert_true(ret >= 0);
     zassert_equal(len, data_exp_len);
     zassert_mem_equal(data_exp, buf_large, data_exp_len);
 
     index = 0;
     size_t pos = 0;
     do {
-        ret = thingset_export_subsets_progressively(&ts, buf_small, sizeof(buf_small), SUBSET_LIVE,
-                                                    THINGSET_BIN_IDS_VALUES, &index, &len);
+        ret =
+            thingset_export_subsets_progressively(&ts, buf_small, sizeof(buf_small), SUBSET_LIVE,
+                                                  THINGSET_BIN_IDS_VALUES, &req_ctx, &index, &len);
         zassert_true(ret >= 0);
         zassert_mem_equal(data_exp + pos, buf_small, len);
         pos += len;

tests/protocol/src/common.c

@@ -12,7 +12,7 @@
 
 #include "test_utils.h"
 
-static struct thingset_context ts;
+static struct thingset_global_context ts;
 
 ZTEST(thingset_common, test_endpoint_from_path)
 {

tests/protocol/src/init.c

@@ -13,8 +13,8 @@ extern size_t data_objects_size;
 
 ZTEST(thingset_init, test_init_data_objects)
 {
-    struct thingset_context ts_local;
-    struct thingset_context ts_global;
+    struct thingset_global_context ts_local;
+    struct thingset_global_context ts_global;
 
     /* initialized with array declared in data.c */
     thingset_init(&ts_local, data_objects, data_objects_size);

tests/protocol/src/txt.c

@@ -13,7 +13,7 @@
 #include "data.h"
 #include "test_utils.h"
 
-static struct thingset_context ts;
+static struct thingset_global_context ts;
 
 bool update_callback_called;
 

tests/report/src/report.c

@@ -12,7 +12,7 @@
 #include "test_utils.h"
 
 #ifdef CONFIG_THINGSET_REPORT_RECORD_SERIALIZATION
-static struct thingset_context ts;
+static struct thingset_global_context ts;
 
 ZTEST(thingset_report, test_report_bin)
 {

tests/serde/src/main.c

@@ -11,7 +11,7 @@
 
 #include "test_utils.h"
 
-static struct thingset_context ts;
+static struct thingset_global_context ts;
 
 static void patch_json_get_cbor(const char *name, const char *json_value,
                                 const char *cbor_value_hex)