michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: net: lib: lwm2m: content_raw_cbor: move to new ztest API

Browse source 
Move net content_raw_cbor tests to use new ztest API
Split all the test cases into 3 test suites, each test suite has
its own before function.

Signed-off-by: Hu Zhenyu <zhenyu.hu@intel.com>
This commit is contained in:
Hu Zhenyu 2022-08-25 00:19:50 +08:00 • committed by Fabio Baltieri
commit 4e7ec5eb87
2 changed files with 48 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/net/lib/lwm2m/content_raw_cbor/prj.conf
View file

@ -1,6 +1,7 @@
CONFIG_NETWORKING=y CONFIG_NETWORKING=y
CONFIG_NET_TEST=y CONFIG_NET_TEST=y
CONFIG_ZTEST=y CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_ENTROPY_GENERATOR=y CONFIG_ENTROPY_GENERATOR=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y

143
tests/net/lib/lwm2m/content_raw_cbor/src/main.c
View file

@ -39,20 +39,25 @@ static void context_reset(void)
test_packet.max_len = sizeof(test_payload); test_packet.max_len = sizeof(test_payload);
} }
static void test_prepare(void) static void test_prepare(void *dummy)
{ {
ARG_UNUSED(dummy);
context_reset(); context_reset();
} }
static void test_prepare_nomem(void) static void test_prepare_nomem(void *dummy)
{ {
ARG_UNUSED(dummy);
context_reset(); context_reset();
test_packet.offset = sizeof(test_payload); test_packet.offset = sizeof(test_payload);
} }
static void test_prepare_nodata(void) static void test_prepare_nodata(void *dummy)
{ {
ARG_UNUSED(dummy);
context_reset(); context_reset();
test_packet.offset = sizeof(test_payload); test_packet.offset = sizeof(test_payload);
@ -66,7 +71,7 @@ static void test_payload_set(const uint8_t *payload, size_t len)
test_in.offset = 1; /* Payload marker */ test_in.offset = 1; /* Payload marker */
} }
static void test_put_s8(void) ZTEST(net_content_raw_cbor, test_put_s8)
{ {
int ret; int ret;
int i; int i;
@ -116,7 +121,7 @@ static void test_put_s8(void)
} }
} }
static void test_put_s8_nomem(void) ZTEST(net_content_raw_cbor_nomem, test_put_s8_nomem)
{ {
int ret; int ret;
@ -124,7 +129,7 @@ static void test_put_s8_nomem(void)
zassert_equal(ret, -ENOMEM, "Invalid error code returned"); zassert_equal(ret, -ENOMEM, "Invalid error code returned");
} }
static void test_put_s16(void) ZTEST(net_content_raw_cbor, test_put_s16)
{ {
int ret; int ret;
int i; int i;
@ -174,7 +179,7 @@ static void test_put_s16(void)
} }
} }
static void test_put_s16_nomem(void) ZTEST(net_content_raw_cbor_nomem, test_put_s16_nomem)
{ {
int ret; int ret;
@ -182,7 +187,7 @@ static void test_put_s16_nomem(void)
zassert_equal(ret, -ENOMEM, "Invalid error code returned"); zassert_equal(ret, -ENOMEM, "Invalid error code returned");
} }
static void test_put_s32(void) ZTEST(net_content_raw_cbor, test_put_s32)
{ {
int ret; int ret;
int i; int i;
@ -232,7 +237,7 @@ static void test_put_s32(void)
} }
} }
static void test_put_s32_nomem(void) ZTEST(net_content_raw_cbor_nomem, test_put_s32_nomem)
{ {
int ret; int ret;
@ -240,7 +245,7 @@ static void test_put_s32_nomem(void)
zassert_equal(ret, -ENOMEM, "Invalid error code returned"); zassert_equal(ret, -ENOMEM, "Invalid error code returned");
} }
static void test_put_s64(void) ZTEST(net_content_raw_cbor, test_put_s64)
{ {
int ret; int ret;
int i; int i;
@ -292,7 +297,7 @@ static void test_put_s64(void)
} }
} }
static void test_put_s64_nomem(void) ZTEST(net_content_raw_cbor_nomem, test_put_s64_nomem)
{ {
int ret; int ret;
@ -302,7 +307,7 @@ static void test_put_s64_nomem(void)
#define DOUBLE_CMP_EPSILON 0.000000001 #define DOUBLE_CMP_EPSILON 0.000000001
static void test_put_float(void) ZTEST(net_content_raw_cbor, test_put_float)
{ {
int ret; int ret;
int i; int i;
@ -383,7 +388,7 @@ static void test_put_float(void)
} }
} }
static void test_put_float_nomem(void) ZTEST(net_content_raw_cbor_nomem, test_put_float_nomem)
{ {
int ret; int ret;
double value = 1.2; double value = 1.2;
@ -392,7 +397,7 @@ static void test_put_float_nomem(void)
zassert_equal(ret, -ENOMEM, "Invalid error code returned"); zassert_equal(ret, -ENOMEM, "Invalid error code returned");
} }
static void test_put_string(void) ZTEST(net_content_raw_cbor, test_put_string)
{ {
int ret; int ret;
const char *test_string = "test_string"; const char *test_string = "test_string";
@ -418,6 +423,7 @@ static void test_put_string(void)
}, },
.len = sizeof("test_string_that_is_a_bit_longer") - 1 + 2 .len = sizeof("test_string_that_is_a_bit_longer") - 1 + 2
}; };
ret = cbor_writer.put_string(&test_out, &test_path, ret = cbor_writer.put_string(&test_out, &test_path,
(char *)test_string, strlen(test_string)); (char *)test_string, strlen(test_string));
zassert_equal(ret, expected_payload.len, "Invalid length returned"); zassert_equal(ret, expected_payload.len, "Invalid length returned");
@ -437,7 +443,7 @@ static void test_put_string(void)
"Invalid packet offset"); "Invalid packet offset");
} }
static void test_put_string_nomem(void) ZTEST(net_content_raw_cbor_nomem, test_put_string_nomem)
{ {
int ret; int ret;
const char *test_string = "test_string"; const char *test_string = "test_string";
@ -448,7 +454,7 @@ static void test_put_string_nomem(void)
zassert_equal(ret, -ENOMEM, "Invalid error code returned"); zassert_equal(ret, -ENOMEM, "Invalid error code returned");
} }
static void test_put_time(void) ZTEST(net_content_raw_cbor, test_put_time)
{ {
int ret; int ret;
int64_t timestamp = 1; int64_t timestamp = 1;
@ -472,7 +478,7 @@ static void test_put_time(void)
"Invalid packet offset"); "Invalid packet offset");
} }
static void test_put_time_nomem(void) ZTEST(net_content_raw_cbor_nomem, test_put_time_nomem)
{ {
int ret; int ret;
@ -480,7 +486,7 @@ static void test_put_time_nomem(void)
zassert_equal(ret, -ENOMEM, "Invalid error code returned"); zassert_equal(ret, -ENOMEM, "Invalid error code returned");
} }
static void test_put_bool(void) ZTEST(net_content_raw_cbor, test_put_bool)
{ {
int ret; int ret;
int i; int i;
@ -516,7 +522,7 @@ static void test_put_bool(void)
} }
} }
static void test_put_bool_nomem(void) ZTEST(net_content_raw_cbor_nomem, test_put_bool_nomem)
{ {
int ret; int ret;
@ -524,7 +530,7 @@ static void test_put_bool_nomem(void)
zassert_equal(ret, -ENOMEM, "Invalid error code returned"); zassert_equal(ret, -ENOMEM, "Invalid error code returned");
} }
static void test_put_opaque(void) ZTEST(net_content_raw_cbor, test_put_opaque)
{ {
int ret; int ret;
const char *test_opaque = "test_opaque"; const char *test_opaque = "test_opaque";
@ -550,6 +556,7 @@ static void test_put_opaque(void)
}, },
.len = sizeof("test_opaque_that_is_a_bit_longer") - 1 + 2 .len = sizeof("test_opaque_that_is_a_bit_longer") - 1 + 2
}; };
ret = cbor_writer.put_opaque(&test_out, &test_path, ret = cbor_writer.put_opaque(&test_out, &test_path,
(char *)test_opaque, strlen(test_opaque)); (char *)test_opaque, strlen(test_opaque));
zassert_equal(ret, expected_payload.len, "Invalid length returned"); zassert_equal(ret, expected_payload.len, "Invalid length returned");
@ -569,7 +576,7 @@ static void test_put_opaque(void)
"Invalid packet offset"); "Invalid packet offset");
} }
static void test_put_opaque_nomem(void) ZTEST(net_content_raw_cbor_nomem, test_put_opaque_nomem)
{ {
int ret; int ret;
const char *test_opaque = "test_opaque"; const char *test_opaque = "test_opaque";
@ -580,7 +587,7 @@ static void test_put_opaque_nomem(void)
zassert_equal(ret, -ENOMEM, "Invalid error code returned"); zassert_equal(ret, -ENOMEM, "Invalid error code returned");
} }
static void test_put_objlnk(void) ZTEST(net_content_raw_cbor, test_put_objlnk)
{ {
int ret; int ret;
int i; int i;
@ -628,7 +635,7 @@ static void test_put_objlnk(void)
} }
} }
static void test_put_objlnk_nomem(void) ZTEST(net_content_raw_cbor_nomem, test_put_objlnk_nomem)
{ {
int ret; int ret;
struct lwm2m_objlnk value = { 0, 0 }; struct lwm2m_objlnk value = { 0, 0 };
@ -637,7 +644,7 @@ static void test_put_objlnk_nomem(void)
zassert_equal(ret, -ENOMEM, "Invalid error code returned"); zassert_equal(ret, -ENOMEM, "Invalid error code returned");
} }
static void test_get_s32(void) ZTEST(net_content_raw_cbor, test_get_s32)
{ {
int ret; int ret;
int i; int i;
@ -683,7 +690,7 @@ static void test_get_s32(void)
} }
} }
static void test_get_s32_nodata(void) ZTEST(net_content_raw_cbor_nodata, test_get_s32_nodata)
{ {
int ret; int ret;
int32_t value; int32_t value;
@ -692,7 +699,7 @@ static void test_get_s32_nodata(void)
zassert_equal(ret, -EBADMSG, "Invalid error code returned"); zassert_equal(ret, -EBADMSG, "Invalid error code returned");
} }
static void test_get_s64(void) ZTEST(net_content_raw_cbor, test_get_s64)
{ {
int ret; int ret;
int i; int i;
@ -740,7 +747,7 @@ static void test_get_s64(void)
} }
} }
static void test_get_s64_nodata(void) ZTEST(net_content_raw_cbor_nodata, test_get_s64_nodata)
{ {
int ret; int ret;
int64_t value; int64_t value;
@ -751,7 +758,7 @@ static void test_get_s64_nodata(void)
#define DOUBLE_CMP_EPSILON 0.000000001 #define DOUBLE_CMP_EPSILON 0.000000001
static void test_get_float(void) ZTEST(net_content_raw_cbor, test_get_float)
{ {
int ret; int ret;
int i; int i;
@ -825,7 +832,7 @@ static void test_get_float(void)
} }
} }
static void test_get_float_nodata(void) ZTEST(net_content_raw_cbor_nodata, test_get_float_nodata)
{ {
int ret; int ret;
double value; double value;
@ -834,7 +841,7 @@ static void test_get_float_nodata(void)
zassert_equal(ret, -EBADMSG, "Invalid error code returned"); zassert_equal(ret, -EBADMSG, "Invalid error code returned");
} }
static void test_get_string(void) ZTEST(net_content_raw_cbor, test_get_string)
{ {
int ret; int ret;
const char *short_string = "test_string"; const char *short_string = "test_string";
@ -881,7 +888,7 @@ static void test_get_string(void)
"Invalid packet offset"); "Invalid packet offset");
} }
static void test_get_string_nodata(void) ZTEST(net_content_raw_cbor_nodata, test_get_string_nodata)
{ {
int ret; int ret;
uint8_t buf[16]; uint8_t buf[16];
@ -890,7 +897,7 @@ static void test_get_string_nodata(void)
zassert_equal(ret, -EBADMSG, "Invalid error code returned"); zassert_equal(ret, -EBADMSG, "Invalid error code returned");
} }
static void test_get_bool(void) ZTEST(net_content_raw_cbor, test_get_bool)
{ {
int ret; int ret;
int i; int i;
@ -923,7 +930,7 @@ static void test_get_bool(void)
} }
} }
static void test_get_bool_nodata(void) ZTEST(net_content_raw_cbor_nodata, test_get_bool_nodata)
{ {
int ret; int ret;
bool value; bool value;
@ -932,7 +939,7 @@ static void test_get_bool_nodata(void)
zassert_equal(ret, -EBADMSG, "Invalid error code returned"); zassert_equal(ret, -EBADMSG, "Invalid error code returned");
} }
static void test_get_opaque(void) ZTEST(net_content_raw_cbor, test_get_opaque)
{ {
int ret; int ret;
const char *short_opaque = "test_opaque"; const char *short_opaque = "test_opaque";
@ -980,7 +987,7 @@ static void test_get_opaque(void)
"Invalid packet offset"); "Invalid packet offset");
} }
static void test_get_opaque_nodata(void) ZTEST(net_content_raw_cbor_nodata, test_get_opaque_nodata)
{ {
int ret; int ret;
uint8_t value[4]; uint8_t value[4];
@ -991,7 +998,7 @@ static void test_get_opaque_nodata(void)
zassert_equal(ret, -EBADMSG, "Invalid error code returned %d"); zassert_equal(ret, -EBADMSG, "Invalid error code returned %d");
} }
static void test_get_objlnk(void) ZTEST(net_content_raw_cbor, test_get_objlnk)
{ {
int ret; int ret;
int i; int i;
@ -1037,7 +1044,7 @@ static void test_get_objlnk(void)
} }
} }
static void test_get_objlnk_nodata(void) ZTEST(net_content_raw_cbor_nodata, test_get_objlnk_nodata)
{ {
int ret; int ret;
struct lwm2m_objlnk value; struct lwm2m_objlnk value;
@ -1046,62 +1053,6 @@ static void test_get_objlnk_nodata(void)
zassert_equal(ret, -EBADMSG, "Invalid error code returned"); zassert_equal(ret, -EBADMSG, "Invalid error code returned");
} }
void test_main(void) ZTEST_SUITE(net_content_raw_cbor, NULL, NULL, test_prepare, NULL, NULL);
{ ZTEST_SUITE(net_content_raw_cbor_nomem, NULL, NULL, test_prepare_nomem, NULL, NULL);
ztest_test_suite( ZTEST_SUITE(net_content_raw_cbor_nodata, NULL, NULL, test_prepare_nodata, NULL, NULL);
lwm2m_content_raw_cbor,
ztest_unit_test_setup_teardown(test_put_s8, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_s8_nomem,
test_prepare_nomem, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_s16, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_s16_nomem,
test_prepare_nomem, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_s32, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_s32_nomem,
test_prepare_nomem, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_s64, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_s64_nomem,
test_prepare_nomem, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_float, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_float_nomem,
test_prepare_nomem, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_string, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_string_nomem,
test_prepare_nomem, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_time, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_time_nomem,
test_prepare_nomem, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_bool, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_bool_nomem,
test_prepare_nomem, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_opaque, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_opaque_nomem,
test_prepare_nomem, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_objlnk, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_put_objlnk_nomem,
test_prepare_nomem, unit_test_noop),
ztest_unit_test_setup_teardown(test_get_s32, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_get_s32_nodata,
test_prepare_nodata, unit_test_noop),
ztest_unit_test_setup_teardown(test_get_s64, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_get_s64_nodata,
test_prepare_nodata, unit_test_noop),
ztest_unit_test_setup_teardown(test_get_float, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_get_float_nodata,
test_prepare_nodata, unit_test_noop),
ztest_unit_test_setup_teardown(test_get_string, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_get_string_nodata,
test_prepare_nodata, unit_test_noop),
ztest_unit_test_setup_teardown(test_get_bool, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_get_bool_nodata,
test_prepare_nodata, unit_test_noop),
ztest_unit_test_setup_teardown(test_get_opaque, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_get_opaque_nodata,
test_prepare_nodata, unit_test_noop),
ztest_unit_test_setup_teardown(test_get_objlnk, test_prepare, unit_test_noop),
ztest_unit_test_setup_teardown(test_get_objlnk_nodata,
test_prepare_nodata, unit_test_noop)
);
ztest_run_test_suite(lwm2m_content_raw_cbor);
}