RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #1615 from authmillenon/cbor-unittests-warnings

Browse Source 
Fix unittests warnings
This commit is contained in:
Martine Lenders 2014-08-27 11:09:52 +02:00
commit 578030fc5f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/unittests/tests-cbor/tests-cbor.c
View File

@ -34,6 +34,7 @@ static void my_cbor_print(const cbor_stream_t *stream)
#ifndef CBOR_NO_PRINT #ifndef CBOR_NO_PRINT
cbor_stream_print(stream); cbor_stream_print(stream);
#else #else
(void)stream;
printf("<no print support>"); printf("<no print support>");
#endif #endif
} }
@ -46,11 +47,11 @@ static void my_cbor_print(const cbor_stream_t *stream)
printf(" Expected data : "); my_cbor_print(&tmp); printf("\n"); \ printf(" Expected data : "); my_cbor_print(&tmp); printf("\n"); \
TEST_FAIL("Test failed"); \ TEST_FAIL("Test failed"); \
} \ } \
} while(0) } while (0)
#define CBOR_CHECK_DESERIALIZED(expected_value, actual_value, comparator_function) do { \ #define CBOR_CHECK_DESERIALIZED(expected_value, actual_value, comparator_function) do { \
TEST_ASSERT(comparator_function(expected_value, actual_value)); \ TEST_ASSERT(comparator_function(expected_value, actual_value)); \
} while(0) } while (0)
/* Macro for checking PODs (int, float, ...) */ /* Macro for checking PODs (int, float, ...) */
#define CBOR_CHECK(type, function_suffix, stream, input, expected_value, comparator) do { \ #define CBOR_CHECK(type, function_suffix, stream, input, expected_value, comparator) do { \
@ -62,7 +63,7 @@ static void my_cbor_print(const cbor_stream_t *stream)
cbor_stream_t tmp = {data, sizeof(data), sizeof(data)}; \ cbor_stream_t tmp = {data, sizeof(data), sizeof(data)}; \
TEST_ASSERT(cbor_deserialize_##function_suffix(&tmp, 0, &buffer)); \ TEST_ASSERT(cbor_deserialize_##function_suffix(&tmp, 0, &buffer)); \
CBOR_CHECK_DESERIALIZED(input, buffer, comparator); \ CBOR_CHECK_DESERIALIZED(input, buffer, comparator); \
} while(0) } while (0)
#define HEX_LITERAL(...) {__VA_ARGS__} #define HEX_LITERAL(...) {__VA_ARGS__}
@ -372,7 +373,7 @@ static void test_array(void)
TEST_ASSERT_EQUAL_INT(1, i); TEST_ASSERT_EQUAL_INT(1, i);
char buffer[1024]; char buffer[1024];
offset += cbor_deserialize_byte_string(&stream, offset, buffer, sizeof(buffer)); offset += cbor_deserialize_byte_string(&stream, offset, buffer, sizeof(buffer));
TEST_ASSERT_EQUAL_STRING("a", buffer); TEST_ASSERT_EQUAL_STRING("a", &(buffer[0]));
} }
} }
@ -436,11 +437,11 @@ static void test_map(void)
offset += cbor_deserialize_int(&stream, offset, &key); offset += cbor_deserialize_int(&stream, offset, &key);
TEST_ASSERT_EQUAL_INT(1, key); TEST_ASSERT_EQUAL_INT(1, key);
offset += cbor_deserialize_byte_string(&stream, offset, value, sizeof(value)); offset += cbor_deserialize_byte_string(&stream, offset, value, sizeof(value));
TEST_ASSERT_EQUAL_STRING("1", value); TEST_ASSERT_EQUAL_STRING("1", &(value[0]));
offset += cbor_deserialize_int(&stream, offset, &key); offset += cbor_deserialize_int(&stream, offset, &key);
TEST_ASSERT_EQUAL_INT(2, key); TEST_ASSERT_EQUAL_INT(2, key);
offset += cbor_deserialize_byte_string(&stream, offset, value, sizeof(value)); offset += cbor_deserialize_byte_string(&stream, offset, value, sizeof(value));
TEST_ASSERT_EQUAL_STRING("2", value); TEST_ASSERT_EQUAL_STRING("2", &(value[0]));
} }
} }