[zxtest] Fix unused and format warning. TEST=zxtest-test,zxtest-integration-test Change-Id: I4e99d431431c3d5a09b5e640a9ec4a49a435ed1b
diff --git a/system/ulib/zxtest/assertion.cpp b/system/ulib/zxtest/assertion.cpp index 2d99c42..81525e9 100644 --- a/system/ulib/zxtest/assertion.cpp +++ b/system/ulib/zxtest/assertion.cpp
@@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <cinttypes> #include <stdint.h> #include <fbl/string_buffer.h> @@ -45,28 +46,23 @@ } // namespace internal -template <> -fbl::String PrintValue(int32_t value) { - return fbl::StringPrintf("%d", value); +template <> fbl::String PrintValue(int32_t value) { + return fbl::StringPrintf("%" PRIi32, value); } -template <> -fbl::String PrintValue(int64_t value) { - return fbl::StringPrintf("%ld", value); +template <> fbl::String PrintValue(int64_t value) { + return fbl::StringPrintf("%" PRIi64, value); } -template <> -fbl::String PrintValue(uint64_t value) { - return fbl::StringPrintf("%lu", value); +template <> fbl::String PrintValue(uint64_t value) { + return fbl::StringPrintf("%" PRIu64, value); } -template <> -fbl::String PrintValue(const char* value) { +template <> fbl::String PrintValue(const char* value) { return fbl::StringPrintf("%s", value); } -template <> -fbl::String PrintValue(const fbl::String& value) { +template <> fbl::String PrintValue(const fbl::String& value) { return value; }
diff --git a/system/ulib/zxtest/c-wrappers.cpp b/system/ulib/zxtest/c-wrappers.cpp index 2d8fe4d..71ea810 100644 --- a/system/ulib/zxtest/c-wrappers.cpp +++ b/system/ulib/zxtest/c-wrappers.cpp
@@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <cinttypes> #include <memory.h> #include <zxtest/base/assertion.h> @@ -62,3 +63,51 @@ bool zxtest_runner_should_abort_current_test(void) { return zxtest::Runner::GetInstance()->ShouldAbortCurrentTest(); } + +size_t _zxtest_print_int32(int32_t val, char* buffer, size_t buffer_size) { + return snprintf(buffer, buffer_size, "%" PRIi32, val); +} + +size_t _zxtest_print_uint32(int32_t val, char* buffer, size_t buffer_size) { + return snprintf(buffer, buffer_size, "%" PRIu32, val); +} + +size_t _zxtest_print_int64(int64_t val, char* buffer, size_t buffer_size) { + return snprintf(buffer, buffer_size, "%" PRIi64, val); +} + +size_t _zxtest_print_uint64(uint64_t val, char* buffer, size_t buffer_size) { + return snprintf(buffer, buffer_size, "%" PRIu64, val); +} + +size_t _zxtest_print_bool(bool val, char* buffer, size_t buffer_size) { + return snprintf(buffer, buffer_size, "%s", (val) ? "true" : "false"); +} + +size_t _zxtest_print_str(const char* val, char* buffer, size_t buffer_size) { + return snprintf(buffer, buffer_size, "%s", (val == NULL) ? "nullptr" : val); +} + +size_t _zxtest_print_ptr(const void* val, char* buffer, size_t buffer_size) { + return snprintf(buffer, buffer_size, "%p", val); +} + +size_t _zxtest_print_hex(const void* val, size_t size, char* buffer, size_t buffer_size) { + if (buffer_size == 0 || buffer_size < 2 * size + 1) { + return 3 * size + 1; + } + + if (val == NULL) { + snprintf(buffer, 4, "nullptr"); + } + + for (size_t curr = 0; curr < size; ++curr) { + snprintf(buffer + 3 * curr, buffer_size - curr, "%02X%*s", *((uint8_t*)(val) + curr), + (curr < size - 1) ? 1 : 0, " "); + } + return 0; +} + +void zxtest_c_clean_buffer(char** buffer) { + free(*buffer); +}
diff --git a/system/ulib/zxtest/include/zxtest/c/zxtest.h b/system/ulib/zxtest/include/zxtest/c/zxtest.h index ce4e764..759cb29 100644 --- a/system/ulib/zxtest/include/zxtest/c/zxtest.h +++ b/system/ulib/zxtest/include/zxtest/c/zxtest.h
@@ -42,44 +42,23 @@ int zxtest_run_all_tests(int argc, char** argv); // Internal for generating human readable output in C. -static size_t _zxtest_print_int32(int32_t val, char* buffer, size_t buffer_size) { - return snprintf(buffer, buffer_size, "%d", val); -} -static size_t _zxtest_print_uint32(int32_t val, char* buffer, size_t buffer_size) { - return snprintf(buffer, buffer_size, "%u", val); -} -static size_t _zxtest_print_int64(int64_t val, char* buffer, size_t buffer_size) { - return snprintf(buffer, buffer_size, "%ld", val); -} -static size_t _zxtest_print_uint64(uint64_t val, char* buffer, size_t buffer_size) { - return snprintf(buffer, buffer_size, "%lu", val); -} -static size_t _zxtest_print_bool(bool val, char* buffer, size_t buffer_size) { - return snprintf(buffer, buffer_size, "%s", (val) ? "true" : "false"); -} -static size_t _zxtest_print_str(const char* val, char* buffer, size_t buffer_size) { - return snprintf(buffer, buffer_size, "%s", (val == NULL) ? "nullptr" : val); -} -static size_t _zxtest_print_ptr(const void* val, char* buffer, size_t buffer_size) { - return snprintf(buffer, buffer_size, "%p", val); -} +size_t _zxtest_print_int32(int32_t val, char* buffer, size_t buffer_size); -static size_t _zxtest_print_hex(const void* val, size_t size, char* buffer, size_t buffer_size) { - if (buffer_size == 0 || buffer_size < 2 * size + 1) { - return 3 * size + 1; - } +size_t _zxtest_print_uint32(int32_t val, char* buffer, size_t buffer_size); - if (val == NULL) { - snprintf(buffer, 4, "nullptr"); - } +size_t _zxtest_print_int64(int64_t val, char* buffer, size_t buffer_size); - for (size_t curr = 0; curr < size; ++curr) { - snprintf(buffer + 3 * curr, buffer_size - curr, "%02X%*s", *((uint8_t*)(val) + curr), - (curr < size - 1) ? 1 : 0, " "); - } - return 0; -} +size_t _zxtest_print_uint64(uint64_t val, char* buffer, size_t buffer_size); +size_t _zxtest_print_bool(bool val, char* buffer, size_t buffer_size); + +size_t _zxtest_print_str(const char* val, char* buffer, size_t buffer_size); + +size_t _zxtest_print_ptr(const void* val, char* buffer, size_t buffer_size); + +size_t _zxtest_print_hex(const void* val, size_t size, char* buffer, size_t buffer_size); + +void zxtest_c_clean_buffer(char** buffer); #ifdef __cplusplus } #endif @@ -94,15 +73,15 @@ #define _ZXTEST_REGISTER_FN(TestCase, Test) TestCase##_##Test##_register_fn // Register a test as part of a TestCase. -#define TEST(TestCase, Test) \ - static zxtest_test_ref_t _ZXTEST_TEST_REF(TestCase, Test) = {.test_index = 0, \ - .test_case_index = 0}; \ - static void _ZXTEST_TEST_FN(TestCase, Test)(void); \ - static void _ZXTEST_REGISTER_FN(TestCase, Test)(void) __attribute__((constructor)); \ - void _ZXTEST_REGISTER_FN(TestCase, Test)(void) { \ - _ZXTEST_TEST_REF(TestCase, Test) = zxtest_runner_register_test( \ - #TestCase, #Test, __FILE__, __LINE__, &_ZXTEST_TEST_FN(TestCase, Test)); \ - } \ +#define TEST(TestCase, Test) \ + static zxtest_test_ref_t _ZXTEST_TEST_REF(TestCase, Test) = {.test_index = 0, \ + .test_case_index = 0}; \ + static void _ZXTEST_TEST_FN(TestCase, Test)(void); \ + static void _ZXTEST_REGISTER_FN(TestCase, Test)(void) __attribute__((constructor)); \ + void _ZXTEST_REGISTER_FN(TestCase, Test)(void) { \ + _ZXTEST_TEST_REF(TestCase, Test) = zxtest_runner_register_test( \ + #TestCase, #Test, __FILE__, __LINE__, &_ZXTEST_TEST_FN(TestCase, Test)); \ + } \ void _ZXTEST_TEST_FN(TestCase, Test)(void) // Helper function to print variables. @@ -123,33 +102,29 @@ #define _ZXTEST_NULLPTR NULL -#define _ZXTEST_HEX_PRINTER(var, buffer, size) \ +#define _ZXTEST_HEX_PRINTER(var, buffer, size) \ _zxtest_print_hex((const void*)&var, sizeof(__typeof__(var)), buffer, size) -static void zxtest_c_clean_buffer(char** buffer) { - free(*buffer); -} - -#define _ZXTEST_PRINT_BUFFER_NAME(var, type, line, printer) \ - char str_placeholder_##type##_##line = '\0'; \ - size_t buff_size_##type##_##line = printer(var, &str_placeholder_##type##_##line, 1) + 1; \ - char* str_buffer_##type##_##line __attribute__((cleanup(zxtest_c_clean_buffer))) = \ - (char*)malloc(buff_size_##type##_##line * sizeof(char)); \ - memset(str_buffer_##type##_##line, '\0', buff_size_##type##_##line); \ +#define _ZXTEST_PRINT_BUFFER_NAME(var, type, line, printer) \ + char str_placeholder_##type##_##line = '\0'; \ + size_t buff_size_##type##_##line = printer(var, &str_placeholder_##type##_##line, 1) + 1; \ + char* str_buffer_##type##_##line __attribute__((cleanup(zxtest_c_clean_buffer))) = \ + (char*)malloc(buff_size_##type##_##line * sizeof(char)); \ + memset(str_buffer_##type##_##line, '\0', buff_size_##type##_##line); \ printer(var, str_buffer_##type##_##line, buff_size_##type##_##line) -#define _ZXTEST_LOAD_PRINT_VAR(var, type, line) \ +#define _ZXTEST_LOAD_PRINT_VAR(var, type, line) \ _ZXTEST_PRINT_BUFFER_NAME(var, type, line, _ZXTEST_SPRINT_PRINTER) -#define _ZXTEST_LOAD_PRINT_HEX(var, type, line) \ +#define _ZXTEST_LOAD_PRINT_HEX(var, type, line) \ _ZXTEST_PRINT_BUFFER_NAME(var, type, line, _ZXTEST_HEX_PRINTER) #define _ZXTEST_TOKEN(token) token #define _ZXTEST_GET_PRINT_VAR(var, type, line) str_buffer_##type##_##line // Provides an alias for assertion mechanisms. -#define _ZXTEST_ASSERT(desc, expected, expected_var, actual, actual_var, file, line, is_fatal) \ - zxtest_runner_notify_assertion(desc, expected, expected_var, actual, actual_var, file, line, \ +#define _ZXTEST_ASSERT(desc, expected, expected_var, actual, actual_var, file, line, is_fatal) \ + zxtest_runner_notify_assertion(desc, expected, expected_var, actual, actual_var, file, line, \ is_fatal) #define _ZXTEST_ABORT_IF_ERROR zxtest_runner_should_abort_current_test()
diff --git a/system/ulib/zxtest/include/zxtest/zxtest.h b/system/ulib/zxtest/include/zxtest/zxtest.h index 751a6f5..910d974 100644 --- a/system/ulib/zxtest/include/zxtest/zxtest.h +++ b/system/ulib/zxtest/include/zxtest/zxtest.h
@@ -25,6 +25,8 @@ #define _BYTENE(actual, expected) memcmp(&actual, &expected, sizeof(actual)) != 0 // Used to cleanup allocated buffers for formatted messages. +// Marked unused to prevent compiler warnings. +static void zxtest_clean_buffer(char** buffer) __attribute__((unused)); static void zxtest_clean_buffer(char** buffer) { free(*buffer); } @@ -34,173 +36,173 @@ #define _GEN_ASSERT_DESC_0(buffer, buffer_size, desc) snprintf(buffer, buffer_size, desc) -#define _GEN_ASSERT_DESC_1(buffer, buffer_size, desc, msg, ...) \ +#define _GEN_ASSERT_DESC_1(buffer, buffer_size, desc, msg, ...) \ snprintf(buffer, buffer_size, desc " " msg, ##__VA_ARGS__) -#define _GEN_ASSERT_DESC(buffer, buffer_size, desc, ...) \ - _ZXTEST_SEL_N(_0, ##__VA_ARGS__, _GEN_ASSERT_DESC_1, _GEN_ASSERT_DESC_1, _GEN_ASSERT_DESC_0) \ +#define _GEN_ASSERT_DESC(buffer, buffer_size, desc, ...) \ + _ZXTEST_SEL_N(_0, ##__VA_ARGS__, _GEN_ASSERT_DESC_1, _GEN_ASSERT_DESC_1, _GEN_ASSERT_DESC_0) \ (buffer, buffer_size, desc, ##__VA_ARGS__) -#define _LOAD_BUFFER(buffer_name, desc, ...) \ - char tmp; \ - size_t req_size = _GEN_ASSERT_DESC(&tmp, 1, desc, ##__VA_ARGS__) + 1; \ - char* buffer_name __attribute__((cleanup(zxtest_clean_buffer))) = \ - (char*)malloc(req_size * sizeof(char)); \ +#define _LOAD_BUFFER(buffer_name, desc, ...) \ + char tmp; \ + size_t req_size = _GEN_ASSERT_DESC(&tmp, 1, desc, ##__VA_ARGS__) + 1; \ + char* buffer_name __attribute__((cleanup(zxtest_clean_buffer))) = \ + (char*)malloc(req_size * sizeof(char)); \ memset(buffer_name, '\0', req_size); -#define _ASSERT_VAR_BYTES(op, expected, actual, fatal, file, line, desc, ...) \ - do { \ - if (!(op(actual, expected))) { \ - _LOAD_BUFFER(msg_buffer, desc, __VA_ARGS__); \ - _GEN_ASSERT_DESC(msg_buffer, req_size, desc, ##__VA_ARGS__); \ - _ZXTEST_LOAD_PRINT_HEX(actual, act, line); \ - _ZXTEST_LOAD_PRINT_HEX(expected, exptd, line); \ - _ZXTEST_ASSERT(msg_buffer, #expected, _ZXTEST_GET_PRINT_VAR(expected, exptd, line), \ - #actual, _ZXTEST_GET_PRINT_VAR(actual, act, line), file, line, fatal); \ - if (fatal && _ZXTEST_ABORT_IF_ERROR) { \ - return; \ - } \ - } \ +#define _ASSERT_VAR_BYTES(op, expected, actual, fatal, file, line, desc, ...) \ + do { \ + if (!(op(actual, expected))) { \ + _LOAD_BUFFER(msg_buffer, desc, __VA_ARGS__); \ + _GEN_ASSERT_DESC(msg_buffer, req_size, desc, ##__VA_ARGS__); \ + _ZXTEST_LOAD_PRINT_HEX(actual, act, line); \ + _ZXTEST_LOAD_PRINT_HEX(expected, exptd, line); \ + _ZXTEST_ASSERT(msg_buffer, #expected, _ZXTEST_GET_PRINT_VAR(expected, exptd, line), \ + #actual, _ZXTEST_GET_PRINT_VAR(actual, act, line), file, line, fatal); \ + if (fatal && _ZXTEST_ABORT_IF_ERROR) { \ + return; \ + } \ + } \ } while (0) -#define _ASSERT_VAR(op, expected, actual, fatal, file, line, desc, ...) \ - do { \ - if (!(op(actual, expected))) { \ - _LOAD_BUFFER(msg_buffer, desc, __VA_ARGS__); \ - _GEN_ASSERT_DESC(msg_buffer, req_size, desc, ##__VA_ARGS__); \ - _ZXTEST_LOAD_PRINT_VAR(actual, act, line); \ - _ZXTEST_LOAD_PRINT_VAR(expected, exptd, line); \ - _ZXTEST_ASSERT(msg_buffer, #expected, _ZXTEST_GET_PRINT_VAR(expected, exptd, line), \ - #actual, _ZXTEST_GET_PRINT_VAR(actual, act, line), file, line, fatal); \ - if (fatal && _ZXTEST_ABORT_IF_ERROR) { \ - return; \ - } \ - } \ +#define _ASSERT_VAR(op, expected, actual, fatal, file, line, desc, ...) \ + do { \ + if (!(op(actual, expected))) { \ + _LOAD_BUFFER(msg_buffer, desc, __VA_ARGS__); \ + _GEN_ASSERT_DESC(msg_buffer, req_size, desc, ##__VA_ARGS__); \ + _ZXTEST_LOAD_PRINT_VAR(actual, act, line); \ + _ZXTEST_LOAD_PRINT_VAR(expected, exptd, line); \ + _ZXTEST_ASSERT(msg_buffer, #expected, _ZXTEST_GET_PRINT_VAR(expected, exptd, line), \ + #actual, _ZXTEST_GET_PRINT_VAR(actual, act, line), file, line, fatal); \ + if (fatal && _ZXTEST_ABORT_IF_ERROR) { \ + return; \ + } \ + } \ } while (0) -#define ASSERT_EQ(val2, val1, ...) \ - _ASSERT_VAR(_EQ, val2, val1, true, __FILE__, __LINE__, "Expected " #val1 " == " #val2, \ +#define ASSERT_EQ(val2, val1, ...) \ + _ASSERT_VAR(_EQ, val2, val1, true, __FILE__, __LINE__, "Expected " #val1 " == " #val2, \ ##__VA_ARGS__) -#define ASSERT_NE(val2, val1, ...) \ - _ASSERT_VAR(_NE, val2, val1, true, __FILE__, __LINE__, "Expected " #val1 " != " #val2, \ +#define ASSERT_NE(val2, val1, ...) \ + _ASSERT_VAR(_NE, val2, val1, true, __FILE__, __LINE__, "Expected " #val1 " != " #val2, \ ##__VA_ARGS__) -#define EXPECT_EQ(val2, val1, ...) \ - _ASSERT_VAR(_EQ, val2, val1, false, __FILE__, __LINE__, "Expected " #val1 " == " #val2, \ +#define EXPECT_EQ(val2, val1, ...) \ + _ASSERT_VAR(_EQ, val2, val1, false, __FILE__, __LINE__, "Expected " #val1 " == " #val2, \ ##__VA_ARGS__) -#define EXPECT_NE(val2, val1, ...) \ - _ASSERT_VAR(_NE, val2, val1, false, __FILE__, __LINE__, "Expected " #val1 " != " #val2, \ +#define EXPECT_NE(val2, val1, ...) \ + _ASSERT_VAR(_NE, val2, val1, false, __FILE__, __LINE__, "Expected " #val1 " != " #val2, \ ##__VA_ARGS__) -#define ASSERT_LT(val1, val2, ...) \ - _ASSERT_VAR(_LT, val2, val1, true, __FILE__, __LINE__, "Expected " #val1 " < " #val2, \ +#define ASSERT_LT(val1, val2, ...) \ + _ASSERT_VAR(_LT, val2, val1, true, __FILE__, __LINE__, "Expected " #val1 " < " #val2, \ ##__VA_ARGS__) -#define ASSERT_LE(val1, val2, ...) \ - _ASSERT_VAR(_LE, val2, val1, true, __FILE__, __LINE__, "Expected " #val1 " <= " #val2, \ +#define ASSERT_LE(val1, val2, ...) \ + _ASSERT_VAR(_LE, val2, val1, true, __FILE__, __LINE__, "Expected " #val1 " <= " #val2, \ ##__VA_ARGS__) -#define EXPECT_LT(val1, val2, ...) \ - _ASSERT_VAR(_LT, val2, val1, false, __FILE__, __LINE__, "Expected " #val1 " < " #val2, \ +#define EXPECT_LT(val1, val2, ...) \ + _ASSERT_VAR(_LT, val2, val1, false, __FILE__, __LINE__, "Expected " #val1 " < " #val2, \ ##__VA_ARGS__) -#define EXPECT_LE(val1, val2, ...) \ - _ASSERT_VAR(_LE, val2, val1, false, __FILE__, __LINE__, "Expected " #val1 " <= " #val2, \ +#define EXPECT_LE(val1, val2, ...) \ + _ASSERT_VAR(_LE, val2, val1, false, __FILE__, __LINE__, "Expected " #val1 " <= " #val2, \ ##__VA_ARGS__) -#define ASSERT_GT(val1, val2, ...) \ - _ASSERT_VAR(_GT, val2, val1, true, __FILE__, __LINE__, "Expected " #val1 " > " #val2, \ +#define ASSERT_GT(val1, val2, ...) \ + _ASSERT_VAR(_GT, val2, val1, true, __FILE__, __LINE__, "Expected " #val1 " > " #val2, \ ##__VA_ARGS__) -#define ASSERT_GE(val1, val2, ...) \ - _ASSERT_VAR(_GE, val2, val1, true, __FILE__, __LINE__, "Expected " #val1 " >= " #val2, \ +#define ASSERT_GE(val1, val2, ...) \ + _ASSERT_VAR(_GE, val2, val1, true, __FILE__, __LINE__, "Expected " #val1 " >= " #val2, \ ##__VA_ARGS__) -#define EXPECT_GT(val1, val2, ...) \ - _ASSERT_VAR(_GT, val2, val1, false, __FILE__, __LINE__, "Expected " #val1 " > " #val2, \ +#define EXPECT_GT(val1, val2, ...) \ + _ASSERT_VAR(_GT, val2, val1, false, __FILE__, __LINE__, "Expected " #val1 " > " #val2, \ ##__VA_ARGS__) -#define EXPECT_GE(val1, val2, ...) \ - _ASSERT_VAR(_GE, val2, val1, false, __FILE__, __LINE__, "Expected " #val1 " >= " #val2, \ +#define EXPECT_GE(val1, val2, ...) \ + _ASSERT_VAR(_GE, val2, val1, false, __FILE__, __LINE__, "Expected " #val1 " >= " #val2, \ ##__VA_ARGS__) -#define ASSERT_STR_EQ(val2, val1, ...) \ - _ASSERT_VAR(_STREQ, val2, val1, true, __FILE__, __LINE__, \ +#define ASSERT_STR_EQ(val2, val1, ...) \ + _ASSERT_VAR(_STREQ, val2, val1, true, __FILE__, __LINE__, \ "Expected strings " #val1 " == " #val2, ##__VA_ARGS__) -#define EXPECT_STR_EQ(val2, val1, ...) \ - _ASSERT_VAR(_STREQ, val2, val1, false, __FILE__, __LINE__, \ +#define EXPECT_STR_EQ(val2, val1, ...) \ + _ASSERT_VAR(_STREQ, val2, val1, false, __FILE__, __LINE__, \ "Expected strings " #val1 " == " #val2, ##__VA_ARGS__) -#define ASSERT_STR_NE(val2, val1, ...) \ - _ASSERT_VAR(_STREQ, val2, val1, true, __FILE__, __LINE__, \ +#define ASSERT_STR_NE(val2, val1, ...) \ + _ASSERT_VAR(_STREQ, val2, val1, true, __FILE__, __LINE__, \ "Expected strings " #val1 " != " #val2, ##__VA_ARGS__) -#define EXPECT_STR_NE(val2, val1, ...) \ - _ASSERT_VAR(_STRNE, val2, val1, false, __FILE__, __LINE__, \ +#define EXPECT_STR_NE(val2, val1, ...) \ + _ASSERT_VAR(_STRNE, val2, val1, false, __FILE__, __LINE__, \ "Expected strings " #val1 " != " #val2, ##__VA_ARGS__) -#define ASSERT_NULL(val1, ...) \ - _ASSERT_VAR(_EQ, val1, _ZXTEST_NULLPTR, true, __FILE__, __LINE__, \ +#define ASSERT_NULL(val1, ...) \ + _ASSERT_VAR(_EQ, val1, _ZXTEST_NULLPTR, true, __FILE__, __LINE__, \ "Expected " #val1 " is null pointer.", ##__VA_ARGS__) -#define EXPECT_NULL(val1, ...) \ - _ASSERT_VAR(_NE, val1, _ZXTEST_NULLPTR, false, __FILE__, __LINE__, \ +#define EXPECT_NULL(val1, ...) \ + _ASSERT_VAR(_NE, val1, _ZXTEST_NULLPTR, false, __FILE__, __LINE__, \ "Expected " #val1 " is null pointer.", ##__VA_ARGS__) #define ASSERT_NOT_NULL(val1, ...) \ _ASSERT_VAR(_NE, val1, NULL, true, __FILE__, __LINE__, "Expected " #val1 " non null pointer.", \ ##__VA_ARGS__) -#define EXPECT_NOT_NULL(val1, ...) \ - _ASSERT_VAR(_EQ, val1, _ZXTEST_NULLPTR, false, __FILE__, __LINE__, \ +#define EXPECT_NOT_NULL(val1, ...) \ + _ASSERT_VAR(_EQ, val1, _ZXTEST_NULLPTR, false, __FILE__, __LINE__, \ "Expected " #val1 " non null pointer.", ##__VA_ARGS__) -#define ASSERT_OK(val1, ...) \ - _ASSERT_VAR(_LE, val1, ZX_OK, true, __FILE__, __LINE__, "Expected " #val1 " is ZX_OK .", \ +#define ASSERT_OK(val1, ...) \ + _ASSERT_VAR(_LE, val1, ZX_OK, true, __FILE__, __LINE__, "Expected " #val1 " is ZX_OK .", \ ##__VA_ARGS__) -#define EXPECT_OK(val1, ...) \ - _ASSERT_VAR(_LE, val1, ZX_OK, false, __FILE__, __LINE__, "Expected " #val1 " is ZX_OK .", \ +#define EXPECT_OK(val1, ...) \ + _ASSERT_VAR(_LE, val1, ZX_OK, false, __FILE__, __LINE__, "Expected " #val1 " is ZX_OK .", \ ##__VA_ARGS__) -#define ASSERT_BYTES_EQ(val1, val2, ...) \ - _ASSERT_VAR_BYTES(_BYTEEQ, val2, val1, true, __FILE__, __LINE__, \ +#define ASSERT_BYTES_EQ(val1, val2, ...) \ + _ASSERT_VAR_BYTES(_BYTEEQ, val2, val1, true, __FILE__, __LINE__, \ "Expected " #val1 " same bytes as " #val2, ##__VA_ARGS__) -#define EXPECT_BYTES_EQ(val1, val2, ...) \ - _ASSERT_VAR_BYTES(_BYTEEQ, val2, val1, false, __FILE__, __LINE__, \ +#define EXPECT_BYTES_EQ(val1, val2, ...) \ + _ASSERT_VAR_BYTES(_BYTEEQ, val2, val1, false, __FILE__, __LINE__, \ "Expected " #val1 " same bytes as " #val2, ##__VA_ARGS__) -#define ASSERT_BYTES_NE(val1, val2, ...) \ - _ASSERT_VAR_BYTES(_BYTENE, val2, val1, true, __FILE__, __LINE__, \ +#define ASSERT_BYTES_NE(val1, val2, ...) \ + _ASSERT_VAR_BYTES(_BYTENE, val2, val1, true, __FILE__, __LINE__, \ "Expected " #val1 " same bytes as " #val2, ##__VA_ARGS__) -#define EXPECT_BYTES_NE(val1, val2, ...) \ - _ASSERT_VAR_BYTES(_BYTENE, val2, val1, false, __FILE__, __LINE__, \ +#define EXPECT_BYTES_NE(val1, val2, ...) \ + _ASSERT_VAR_BYTES(_BYTENE, val2, val1, false, __FILE__, __LINE__, \ "Expected " #val1 " same bytes as " #val2, ##__VA_ARGS__) -#define ASSERT_TRUE(val, ...) \ - _ASSERT_VAR(_EQ, val, true, true, __FILE__, __LINE__, "Expected " #val " is true.", \ +#define ASSERT_TRUE(val, ...) \ + _ASSERT_VAR(_EQ, val, true, true, __FILE__, __LINE__, "Expected " #val " is true.", \ ##__VA_ARGS__) -#define ASSERT_FALSE(val, ...) \ - _ASSERT_VAR(_EQ, val, false, true, __FILE__, __LINE__, "Expected " #val " is false.", \ +#define ASSERT_FALSE(val, ...) \ + _ASSERT_VAR(_EQ, val, false, true, __FILE__, __LINE__, "Expected " #val " is false.", \ ##__VA_ARGS__) -#define EXPECT_TRUE(val, ...) \ - _ASSERT_VAR(_EQ, val, true, false, __FILE__, __LINE__, "Expected " #val " is true.", \ +#define EXPECT_TRUE(val, ...) \ + _ASSERT_VAR(_EQ, val, true, false, __FILE__, __LINE__, "Expected " #val " is true.", \ ##__VA_ARGS__) -#define EXPECT_FALSE(val, ...) \ - _ASSERT_VAR(_EQ, val, false, false, __FILE__, __LINE__, "Expected " #val " is false.", \ +#define EXPECT_FALSE(val, ...) \ + _ASSERT_VAR(_EQ, val, false, false, __FILE__, __LINE__, "Expected " #val " is false.", \ ##__VA_ARGS__) -#define FAIL(...) \ +#define FAIL(...) \ _ASSERT_VAR(_EQ, false, true, true, __FILE__, __LINE__, "Failure condition met.", ##__VA_ARGS__) -#define ASSERT_NO_FATAL_FAILURES(...) \ - _ASSERT_VAR(_EQ, false, true, true, __FILE__, __LINE__, "Test registered fatal failures.", \ +#define ASSERT_NO_FATAL_FAILURES(...) \ + _ASSERT_VAR(_EQ, false, true, true, __FILE__, __LINE__, "Test registered fatal failures.", \ ##__VA_ARGS__)