From 2b484e4239d8c769acf672462cb80e2e58af5387 Mon Sep 17 00:00:00 2001 From: Antony Male Date: Fri, 28 Jun 2013 11:10:51 +0100 Subject: [PATCH] Fix tests testing TEST_ASSERT_EQUAL_MEMORY_ARRAY on 16-bit platforms The tests which exercise TEST_ASSERT_EQUAL_MEMORY_ARRAY use int arrays, and hard-code the size of each element as 4 bytes. This is of course untrue on 16-bit platforms. Replace this hard-coded value with sizeof(int). --- test/testunity.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/testunity.c b/test/testunity.c index 2a10894..1c15998 100755 --- a/test/testunity.c +++ b/test/testunity.c @@ -1803,11 +1803,11 @@ void testEqualMemoryArrays(void) int p2[] = {1, 8, 987, 2}; int p3[] = {1, 500, 600, 700}; - TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p0, 4, 1); - TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p0, 4, 4); - TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, 4, 4); - TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p2, 4, 3); - TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p3, 4, 1); + TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p0, sizeof(int), 1); + TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p0, sizeof(int), 4); + TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, sizeof(int), 4); + TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p2, sizeof(int), 3); + TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p3, sizeof(int), 1); } void testNotEqualMemoryArraysExpectedNull(void) @@ -1816,7 +1816,7 @@ void testNotEqualMemoryArraysExpectedNull(void) int p1[] = {1, 8, 987, 2}; EXPECT_ABORT_BEGIN - TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, 4, 4); + TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, sizeof(int), 4); VERIFY_FAILS_END } @@ -1826,7 +1826,7 @@ void testNotEqualMemoryArraysActualNull(void) int* p1 = NULL; EXPECT_ABORT_BEGIN - TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, 4, 4); + TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, sizeof(int), 4); VERIFY_FAILS_END } @@ -1836,7 +1836,7 @@ void testNotEqualMemoryArrays1(void) int p1[] = {1, 8, 987, 2}; EXPECT_ABORT_BEGIN - TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, 4, 4); + TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, sizeof(int), 4); VERIFY_FAILS_END } @@ -1846,7 +1846,7 @@ void testNotEqualMemoryArrays2(void) int p1[] = {2, 8, 987, -2}; EXPECT_ABORT_BEGIN - TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, 4, 4); + TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, sizeof(int), 4); VERIFY_FAILS_END } @@ -1856,7 +1856,7 @@ void testNotEqualMemoryArrays3(void) int p1[] = {1, 8, 986, -2}; EXPECT_ABORT_BEGIN - TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, 4, 4); + TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, sizeof(int), 4); VERIFY_FAILS_END }