From 388968f76bce89cd6f2307bc225718269b47cf50 Mon Sep 17 00:00:00 2001 From: Brian Daniels Date: Mon, 22 May 2017 18:43:14 -0500 Subject: [PATCH] Simplifying assert statements --- features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_echo/main.cpp | 4 ++-- .../TESTS/mbedmicro-net/tcp_echo_parallel/main.cpp | 2 +- .../TESTS/mbedmicro-net/tcp_hello_world/main.cpp | 6 +++--- .../TESTS/mbedmicro-net/udp_dtls_handshake/main.cpp | 2 +- .../TESTS/mbedmicro-net/udp_echo_parallel/main.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_echo/main.cpp b/features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_echo/main.cpp index f8200928d6..01337af101 100644 --- a/features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_echo/main.cpp +++ b/features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_echo/main.cpp @@ -77,12 +77,12 @@ void test_tcp_echo() { result = !memcmp(tx_buffer, rx_buffer, sizeof(tx_buffer)); TEST_ASSERT_EQUAL(ret, sizeof(rx_buffer)); - TEST_ASSERT_EQUAL(true, result); + TEST_ASSERT(result); } sock.close(); eth.disconnect(); - TEST_ASSERT_EQUAL(true, result); + TEST_ASSERT(result); } diff --git a/features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_echo_parallel/main.cpp b/features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_echo_parallel/main.cpp index 3829c3d013..f146565002 100644 --- a/features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_echo_parallel/main.cpp +++ b/features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_echo_parallel/main.cpp @@ -80,7 +80,7 @@ public: const int ret = sock.recv(rx_buffer, sizeof(rx_buffer)); bool result = !memcmp(tx_buffer, rx_buffer, sizeof(tx_buffer)); TEST_ASSERT_EQUAL(ret, sizeof(rx_buffer)); - TEST_ASSERT_EQUAL(true, result); + TEST_ASSERT(result); err = sock.close(); TEST_ASSERT_EQUAL(0, err); diff --git a/features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_hello_world/main.cpp b/features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_hello_world/main.cpp index 4ea4b16ac7..c489f956ce 100644 --- a/features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_hello_world/main.cpp +++ b/features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_hello_world/main.cpp @@ -69,8 +69,8 @@ void test_tcp_hello_world() { // Find "Hello World!" string in reply bool found_hello = find_substring(buffer, buffer + ret, HTTP_HELLO_STR, HTTP_HELLO_STR + strlen(HTTP_HELLO_STR)); - TEST_ASSERT_TRUE(found_200_ok); - TEST_ASSERT_TRUE(found_hello); + TEST_ASSERT(found_200_ok); + TEST_ASSERT(found_hello); if (found_200_ok && found_hello) result = true; @@ -85,7 +85,7 @@ void test_tcp_hello_world() { } eth.disconnect(); - TEST_ASSERT_EQUAL(true, result); + TEST_ASSERT(result); } diff --git a/features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_dtls_handshake/main.cpp b/features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_dtls_handshake/main.cpp index c3e7b37541..0c48533664 100644 --- a/features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_dtls_handshake/main.cpp +++ b/features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_dtls_handshake/main.cpp @@ -129,7 +129,7 @@ void test_udp_dtls_handshake() { } eth.disconnect(); - TEST_ASSERT_EQUAL(true, result); + TEST_ASSERT(result); } diff --git a/features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_echo_parallel/main.cpp b/features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_echo_parallel/main.cpp index 6915a1846c..329021307b 100644 --- a/features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_echo_parallel/main.cpp +++ b/features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_echo_parallel/main.cpp @@ -195,7 +195,7 @@ void test_udp_echo_parallel() { } net.disconnect(); - TEST_ASSERT_EQUAL(true, result); + TEST_ASSERT(result); } }