From c5238adab25ea40c5fe81753ecb66d12419843aa Mon Sep 17 00:00:00 2001 From: jsalling Date: Tue, 3 May 2016 21:58:29 -0500 Subject: [PATCH] 100% code coverage for Unity project Add test for failure count and UnityEnd return value Cover printing escape codes with length parameter Full statement coverage --- src/unity.h | 4 ++-- test/tests/testunity.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/unity.h b/src/unity.h index 9b3d97b..c74c073 100644 --- a/src/unity.h +++ b/src/unity.h @@ -235,8 +235,8 @@ void tearDown(void); //Structs and Strings #define TEST_ASSERT_EQUAL_PTR_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_PTR((expected), (actual), __LINE__, (message)) #define TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_STRING((expected), (actual), __LINE__, (message)) -#define TEST_ASSERT_EQUAL_STRING_LEN_MESSAGE(expected, actual, len, message) UNITY_TEST_ASSERT_EQUAL_STRING_LEN((expected), (actual), (len), __LINE__, (message)) -#define TEST_ASSERT_EQUAL_MEMORY_MESSAGE(expected, actual, len, message) UNITY_TEST_ASSERT_EQUAL_MEMORY((expected), (actual), (len), __LINE__, (message)) +#define TEST_ASSERT_EQUAL_STRING_LEN_MESSAGE(expected, actual, len, message) UNITY_TEST_ASSERT_EQUAL_STRING_LEN((expected), (actual), (len), __LINE__, (message)) +#define TEST_ASSERT_EQUAL_MEMORY_MESSAGE(expected, actual, len, message) UNITY_TEST_ASSERT_EQUAL_MEMORY((expected), (actual), (len), __LINE__, (message)) //Arrays #define TEST_ASSERT_EQUAL_INT_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_INT_ARRAY((expected), (actual), (num_elements), __LINE__, (message)) diff --git a/test/tests/testunity.c b/test/tests/testunity.c index f1316b9..e0872cc 100644 --- a/test/tests/testunity.c +++ b/test/tests/testunity.c @@ -1370,7 +1370,7 @@ void testNotEqualString4(void) void testNotEqualStringLen4(void) { EXPECT_ABORT_BEGIN - TEST_ASSERT_EQUAL_STRING_LEN("bar\r", "bar\n", 4); + TEST_ASSERT_EQUAL_STRING_LEN("\r\x16", "bar\n", 4); VERIFY_FAILS_END } @@ -2260,6 +2260,19 @@ int putcharSpy(int c) return c; } +void testFailureCountIncrementsAndIsReturnedAtEnd(void) +{ + Unity.CurrentTestFailed = 1; + startPutcharSpy(); // Suppress output + UnityConcludeTest(); + TEST_ASSERT_EQUAL(1, Unity.TestFailures); + + int failures = UnityEnd(); + Unity.TestFailures--; + endPutcharSpy(); + TEST_ASSERT_EQUAL(1, failures); +} + #define TEST_ASSERT_EQUAL_PRINT_NUMBERS(expected, actual) { \ startPutcharSpy(); UnityPrintNumber((actual)); endPutcharSpy(); \ TEST_ASSERT_EQUAL_STRING((expected), getBufferPutcharSpy()); \ -- GitLab