3rd-party/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-25 17:31:36 +01:00
Code Issues Releases Wiki Activity

Fix issue \#7 INTx_WITHIN_MESSAGE() macro

Browse Source 
The reason that TEST_ASSERT_xyz_WITHIN_MESSAGE() family of functions
doesn't print any message is because is calling a re-use macro from the
TEST_ASSERT_xyz_WITHIN() family of functions. Due this two functions in
unity.h calls the same function from unity_internals.h, the message is
nullified at this point. The issue is fix by passing _message_ arg to
the 4th argument of *UnityAssertNumbersWithin()* function.
This commit is contained in:
Alex Rodriguez
2012-08-28 15:06:09 -07:00
parent b7d9d007ce
commit e95f662683
2 changed files with 111 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
test/testunity.c
View File

@@ -699,6 +699,18 @@ void testIntsWithinDelta(void)
TEST_ASSERT_INT_WITHIN(5, -1, 1);
}
void testIntsWithinDeltaAndCustomMessage(void)
{
TEST_ASSERT_INT_WITHIN_MESSAGE(1, 5000, 5001, "Custom Message.");
TEST_ASSERT_INT_WITHIN_MESSAGE(5, 5000, 4996, "Custom Message.");
TEST_ASSERT_INT_WITHIN_MESSAGE(5, 5000, 5005, "Custom Message.");
TEST_ASSERT_INT_WITHIN_MESSAGE(500, 50, -440, "Custom Message.");
TEST_ASSERT_INT_WITHIN_MESSAGE(2, -1, -1, "Custom Message.");
TEST_ASSERT_INT_WITHIN_MESSAGE(5, 1, -1, "Custom Message.");
TEST_ASSERT_INT_WITHIN_MESSAGE(5, -1, 1, "Custom Message.");
}
void testIntsNotWithinDelta(void)
{
EXPECT_ABORT_BEGIN
@@ -706,6 +718,13 @@ void testIntsNotWithinDelta(void)
VERIFY_FAILS_END
}
void testIntsNotWithinDeltaAndCustomMessage(void)
{
EXPECT_ABORT_BEGIN
TEST_ASSERT_INT_WITHIN_MESSAGE(5, 5000, 5006, "Custom Message.");
VERIFY_FAILS_END
}
void testUIntsWithinDelta(void)
{
TEST_ASSERT_UINT_WITHIN(1, 5000, 5001);
@@ -713,6 +732,13 @@ void testUIntsWithinDelta(void)
TEST_ASSERT_UINT_WITHIN(5, 5000, 5005);
}
void testUIntsWithinDeltaAndCustomMessage(void)
{
TEST_ASSERT_UINT_WITHIN_MESSAGE(1, 5000, 5001, "Custom Message.");
TEST_ASSERT_UINT_WITHIN_MESSAGE(5, 5000, 4996, "Custom Message.");
TEST_ASSERT_UINT_WITHIN_MESSAGE(5, 5000, 5005, "Custom Message.");
}
void testUIntsNotWithinDelta(void)
{
EXPECT_ABORT_BEGIN
@@ -720,6 +746,13 @@ void testUIntsNotWithinDelta(void)
VERIFY_FAILS_END
}
void testUIntsNotWithinDeltaAndCustomMessage(void)
{
EXPECT_ABORT_BEGIN
TEST_ASSERT_UINT_WITHIN_MESSAGE(1, 2147483647u, 2147483649u, "Custom Message.");
VERIFY_FAILS_END
}
void testUIntsNotWithinDeltaEvenThoughASignedIntWouldPassSmallFirst(void)
{
EXPECT_ABORT_BEGIN
@@ -727,6 +760,13 @@ void testUIntsNotWithinDeltaEvenThoughASignedIntWouldPassSmallFirst(void)
VERIFY_FAILS_END
}
void testUIntsNotWithinDeltaEvenThoughASignedIntWouldPassSmallFirstAndCustomMessage(void)
{
EXPECT_ABORT_BEGIN
TEST_ASSERT_UINT_WITHIN_MESSAGE(5, 1, -1, "Custom Message.");
VERIFY_FAILS_END
}
void testUIntsNotWithinDeltaEvenThoughASignedIntWouldPassBigFirst(void)
{
EXPECT_ABORT_BEGIN
@@ -734,6 +774,13 @@ void testUIntsNotWithinDeltaEvenThoughASignedIntWouldPassBigFirst(void)
VERIFY_FAILS_END
}
void testUIntsNotWithinDeltaEvenThoughASignedIntWouldPassBigFirstAndCustomMessage(void)
{
EXPECT_ABORT_BEGIN
TEST_ASSERT_UINT_WITHIN_MESSAGE(5, -1, 1, "Custom Message.");
VERIFY_FAILS_END
}
void testHEX32sWithinDelta(void)
{
TEST_ASSERT_HEX32_WITHIN(1, 5000, 5001);
@@ -741,6 +788,13 @@ void testHEX32sWithinDelta(void)
TEST_ASSERT_HEX32_WITHIN(5, 5000, 5005);
}
void testHEX32sWithinDeltaAndCustomMessage(void)
{
TEST_ASSERT_HEX32_WITHIN_MESSAGE(1, 5000, 5001, "Custom Message.");
TEST_ASSERT_HEX32_WITHIN_MESSAGE(5, 5000, 4996, "Custom Message.");
TEST_ASSERT_HEX32_WITHIN_MESSAGE(5, 5000, 5005, "Custom Message.");
}
void testHEX32sNotWithinDelta(void)
{
EXPECT_ABORT_BEGIN
@@ -748,6 +802,13 @@ void testHEX32sNotWithinDelta(void)
VERIFY_FAILS_END
}
void testHEX32sNotWithinDeltaAndCustomMessage(void)
{
EXPECT_ABORT_BEGIN
TEST_ASSERT_HEX32_WITHIN_MESSAGE(1, 2147483647u, 2147483649u, "Custom Message.");
VERIFY_FAILS_END
}
void testHEX32sNotWithinDeltaEvenThoughASignedIntWouldPass(void)
{
EXPECT_ABORT_BEGIN
@@ -755,6 +816,13 @@ void testHEX32sNotWithinDeltaEvenThoughASignedIntWouldPass(void)
VERIFY_FAILS_END
}
void testHEX32sNotWithinDeltaEvenThoughASignedIntWouldPassAndCustomMessage(void)
{
EXPECT_ABORT_BEGIN
TEST_ASSERT_HEX32_WITHIN_MESSAGE(5, 1, -1, "Custom Message.");
VERIFY_FAILS_END
}
void testHEX16sWithinDelta(void)
{
TEST_ASSERT_HEX16_WITHIN(1, 5000, 5001);
@@ -762,11 +830,23 @@ void testHEX16sWithinDelta(void)
TEST_ASSERT_HEX16_WITHIN(5, 5000, 5005);
}
void testHEX16sWithinDeltaAndCustomMessage(void)
{
TEST_ASSERT_HEX16_WITHIN_MESSAGE(1, 5000, 5001, "Custom Message.");
TEST_ASSERT_HEX16_WITHIN_MESSAGE(5, 5000, 4996, "Custom Message.");
TEST_ASSERT_HEX16_WITHIN_MESSAGE(5, 5000, 5005, "Custom Message.");
}
void testHEX16sWithinDeltaWhenThereAreDifferenceOutsideOf16Bits(void)
{
TEST_ASSERT_HEX16_WITHIN(5, 0x54321, 0x44321);
}
void testHEX16sWithinDeltaWhenThereAreDifferenceOutsideOf16BitsAndCustomMessage(void)
{
TEST_ASSERT_HEX16_WITHIN_MESSAGE(5, 0x54321, 0x44321, "Custom Message.");
}
void testHEX16sNotWithinDelta(void)
{
EXPECT_ABORT_BEGIN
@@ -774,6 +854,13 @@ void testHEX16sNotWithinDelta(void)
VERIFY_FAILS_END
}
void testHEX16sNotWithinDeltaAndCustomMessage(void)
{
EXPECT_ABORT_BEGIN
TEST_ASSERT_HEX16_WITHIN_MESSAGE(2, 65535, 0, "Custom Message.");
VERIFY_FAILS_END
}
void testHEX8sWithinDelta(void)
{
TEST_ASSERT_HEX8_WITHIN(1, 254, 255);
@@ -781,11 +868,23 @@ void testHEX8sWithinDelta(void)
TEST_ASSERT_HEX8_WITHIN(5, 1, 4);
}
void testHEX8sWithinDeltaAndCustomMessage(void)
{
TEST_ASSERT_HEX8_WITHIN_MESSAGE(1, 254, 255, "Custom Message.");
TEST_ASSERT_HEX8_WITHIN_MESSAGE(5, 251, 255, "Custom Message.");
TEST_ASSERT_HEX8_WITHIN_MESSAGE(5, 1, 4, "Custom Message.");
}
void testHEX8sWithinDeltaWhenThereAreDifferenceOutsideOf8Bits(void)
{
TEST_ASSERT_HEX8_WITHIN(5, 0x123, 0xF23);
}
void testHEX8sWithinDeltaWhenThereAreDifferenceOutsideOf8BitsAndCustomMessage(void)
{
TEST_ASSERT_HEX8_WITHIN_MESSAGE(5, 0x123, 0xF23, "Custom Message.");
}
void testHEX8sNotWithinDelta(void)
{
EXPECT_ABORT_BEGIN
@@ -793,6 +892,13 @@ void testHEX8sNotWithinDelta(void)
VERIFY_FAILS_END
}
void testHEX8sNotWithinDeltaAndCustomMessage(void)
{
EXPECT_ABORT_BEGIN
TEST_ASSERT_HEX8_WITHIN_MESSAGE(2, 255, 0, "Custom Message.");
VERIFY_FAILS_END
}
void testEqualStrings(void)
{
const char *testString = "foo";