1 files changed, 19 insertions, 24 deletions

diff --git a/test/bad_inputs_test.c b/test/bad_inputs_test.c
index 6ca5270aa248..de7bdab95231 100644
--- a/test/bad_inputs_test.c
+++ b/test/bad_inputs_test.c
@@ -5,12 +5,7 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
-#include <setjmp.h>
-#include <stdarg.h>
-#include <stddef.h>
-
-#include <cmocka.h>
-
+#include "assertions.h"
 #include "cbor.h"
 
 /* These tests verify behavior on interesting randomly generated inputs from the
@@ -21,54 +16,54 @@ struct cbor_load_result res;
 
 /* Map start + array with embedded length */
 unsigned char data1[] = {0xA9, 0x85};
-static void test_1(void **state) {
+static void test_1(void **_CBOR_UNUSED(_state)) {
   item = cbor_load(data1, 2, &res);
   assert_null(item);
   assert_true(res.error.code == CBOR_ERR_NOTENOUGHDATA);
-  assert_int_equal(res.error.position, 2);
+  assert_size_equal(res.error.position, 2);
 }
 
 unsigned char data2[] = {0x9D};
-static void test_2(void **state) {
+static void test_2(void **_CBOR_UNUSED(_state)) {
   item = cbor_load(data2, 1, &res);
   assert_null(item);
   assert_true(res.error.code == CBOR_ERR_MALFORMATED);
-  assert_int_equal(res.error.position, 0);
+  assert_size_equal(res.error.position, 0);
 }
 
 unsigned char data3[] = {0xD6};
-static void test_3(void **state) {
+static void test_3(void **_CBOR_UNUSED(_state)) {
   item = cbor_load(data3, 1, &res);
   assert_null(item);
   assert_true(res.error.code == CBOR_ERR_NOTENOUGHDATA);
-  assert_int_equal(res.error.position, 1);
+  assert_size_equal(res.error.position, 1);
 }
 
 #ifdef SANE_MALLOC
 unsigned char data4[] = {0xBA, 0xC1, 0xE8, 0x3E, 0xE7, 0x20, 0xA8};
-static void test_4(void **state) {
+static void test_4(void **_CBOR_UNUSED(_state)) {
   item = cbor_load(data4, 7, &res);
   assert_null(item);
   assert_true(res.error.code == CBOR_ERR_MEMERROR);
-  assert_int_equal(res.error.position, 5);
+  assert_size_equal(res.error.position, 5);
 }
 
 unsigned char data5[] = {0x9A, 0xDA, 0x3A, 0xB2, 0x7F, 0x29};
-static void test_5(void **state) {
+static void test_5(void **_CBOR_UNUSED(_state)) {
   assert_true(res.error.code == CBOR_ERR_MEMERROR);
   item = cbor_load(data5, 6, &res);
   assert_null(item);
-  assert_int_equal(res.error.position, 5);
+  assert_size_equal(res.error.position, 5);
   /* Indef string expectation mismatch */
 }
 #endif
 
 unsigned char data6[] = {0x7F, 0x21, 0x4C, 0x02, 0x40};
-static void test_6(void **state) {
+static void test_6(void **_CBOR_UNUSED(_state)) {
   item = cbor_load(data6, 5, &res);
   assert_null(item);
   assert_true(res.error.code == CBOR_ERR_SYNTAXERROR);
-  assert_int_equal(res.error.position, 2);
+  assert_size_equal(res.error.position, 2);
 }
 
 #ifdef EIGHT_BYTE_SIZE_T
@@ -76,11 +71,11 @@ static void test_6(void **state) {
  * works with 64b sizes */
 unsigned char data7[] = {0xA2, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
                          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static void test_7(void **state) {
+static void test_7(void **_CBOR_UNUSED(_state)) {
   item = cbor_load(data7, 16, &res);
   assert_null(item);
   assert_true(res.error.code == CBOR_ERR_MEMERROR);
-  assert_int_equal(res.error.position, 10);
+  assert_size_equal(res.error.position, 10);
 }
 #endif
 
@@ -89,19 +84,19 @@ unsigned char data8[] = {0xA3, 0x64, 0x68, 0x61, 0x6C, 0x66, 0xFF, 0x00,
                          0xFA, 0x7F, 0x7F, 0xFF, 0xFF, 0x6D, 0x73, 0x69,
                          0x6D, 0x70, 0x6C, 0x65, 0x20, 0x76, 0x61, 0x6C,
                          0x75, 0x65, 0x73, 0x83, 0xF5, 0xF4, 0xF6};
-static void test_8(void **state) {
+static void test_8(void **_CBOR_UNUSED(_state)) {
   item = cbor_load(data8, 39, &res);
   assert_null(item);
   assert_true(res.error.code == CBOR_ERR_SYNTAXERROR);
-  assert_int_equal(res.error.position, 7);
+  assert_size_equal(res.error.position, 7);
 }
 
 unsigned char data9[] = {0xBF, 0x05, 0xFF, 0x00, 0x00, 0x00, 0x10, 0x04};
-static void test_9(void **state) {
+static void test_9(void **_CBOR_UNUSED(_state)) {
   item = cbor_load(data9, 8, &res);
   assert_null(item);
   assert_true(res.error.code == CBOR_ERR_SYNTAXERROR);
-  assert_int_equal(res.error.position, 3);
+  assert_size_equal(res.error.position, 3);
 }
 
 int main(void) {