- protect against ints that only have differences in higher nibbles that shouldn't be part of comparison

git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@130 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e
This commit is contained in:
mvandervoord
2011-04-20 11:56:56 +00:00
parent 114755e200
commit 43b4c94f7b
2 changed files with 136 additions and 13 deletions

View File

@ -329,6 +329,56 @@ void testEqualInts(void)
TEST_ASSERT_EQUAL_INT(*p0, 19467);
}
void testEqualInt8s(void)
{
_US8 v0, v1;
_US8 *p0, *p1;
v0 = 0x22;
v1 = 0x22;
p0 = &v0;
p1 = &v1;
TEST_ASSERT_EQUAL_INT8(0x22, 0x22);
TEST_ASSERT_EQUAL_INT8(v0, v1);
TEST_ASSERT_EQUAL_INT8(0x22, v1);
TEST_ASSERT_EQUAL_INT8(v0, 0x22);
TEST_ASSERT_EQUAL_INT8(*p0, v1);
TEST_ASSERT_EQUAL_INT8(*p0, *p1);
TEST_ASSERT_EQUAL_INT8(*p0, 0x22);
}
void testEqualInt8sWhenThereAreDifferencesOutside8Bits(void)
{
TEST_ASSERT_EQUAL_INT8(0x321,0x421);
TEST_ASSERT_EQUAL_INT8(0xFF21,0x0021);
}
void testEqualInt16s(void)
{
_US16 v0, v1;
_US16 *p0, *p1;
v0 = 0x9876;
v1 = 0x9876;
p0 = &v0;
p1 = &v1;
TEST_ASSERT_EQUAL_INT16(0x9876, 0x9876);
TEST_ASSERT_EQUAL_INT16(v0, v1);
TEST_ASSERT_EQUAL_INT16(0x9876, v1);
TEST_ASSERT_EQUAL_INT16(v0, 0x9876);
TEST_ASSERT_EQUAL_INT16(*p0, v1);
TEST_ASSERT_EQUAL_INT16(*p0, *p1);
TEST_ASSERT_EQUAL_INT16(*p0, 0x9876);
}
void testEqualInt16sWhenThereAreDifferencesOutside16Bits(void)
{
TEST_ASSERT_EQUAL_INT16(0x54321,0x64321);
TEST_ASSERT_EQUAL_INT16(0xFFFF4321,0x00004321);
}
void testEqualUints(void)
{
unsigned int v0, v1;
@ -349,6 +399,57 @@ void testEqualUints(void)
TEST_ASSERT_EQUAL_UINT(60872u, 60872u);
}
void testEqualUint8s(void)
{
_UU8 v0, v1;
_UU8 *p0, *p1;
v0 = 0x22;
v1 = 0x22;
p0 = &v0;
p1 = &v1;
TEST_ASSERT_EQUAL_UINT8(0x22, 0x22);
TEST_ASSERT_EQUAL_UINT8(v0, v1);
TEST_ASSERT_EQUAL_UINT8(0x22, v1);
TEST_ASSERT_EQUAL_UINT8(v0, 0x22);
TEST_ASSERT_EQUAL_UINT8(*p0, v1);
TEST_ASSERT_EQUAL_UINT8(*p0, *p1);
TEST_ASSERT_EQUAL_UINT8(*p0, 0x22);
}
void testEqualUint8sWhenThereAreDifferencesOutside8Bits(void)
{
TEST_ASSERT_EQUAL_UINT8(0x321,0x421);
TEST_ASSERT_EQUAL_UINT8(0xFF21,0x0021);
}
void testEqualUint16s(void)
{
_UU16 v0, v1;
_UU16 *p0, *p1;
v0 = 0x9876;
v1 = 0x9876;
p0 = &v0;
p1 = &v1;
TEST_ASSERT_EQUAL_UINT16(0x9876, 0x9876);
TEST_ASSERT_EQUAL_UINT16(v0, v1);
TEST_ASSERT_EQUAL_UINT16(0x9876, v1);
TEST_ASSERT_EQUAL_UINT16(v0, 0x9876);
TEST_ASSERT_EQUAL_UINT16(*p0, v1);
TEST_ASSERT_EQUAL_UINT16(*p0, *p1);
TEST_ASSERT_EQUAL_UINT16(*p0, 0x9876);
}
void testEqualUint16sWhenThereAreDifferencesOutside16Bits(void)
{
TEST_ASSERT_EQUAL_UINT16(0x54321,0x64321);
TEST_ASSERT_EQUAL_UINT16(0xFFFF4321,0x00004321);
}
void testNotEqual(void)
{
TEST_ASSERT_NOT_EQUAL(0, 1);
@ -379,6 +480,12 @@ void testEqualHex8s(void)
TEST_ASSERT_EQUAL_HEX8(*p0, 0x22);
}
void testEqualHex8sWhenThereAreDifferencesOutside8Bits(void)
{
TEST_ASSERT_EQUAL_HEX8(0x321,0x421);
TEST_ASSERT_EQUAL_HEX8(0xFF21,0x0021);
}
void testEqualHex8sNegatives(void)
{
_UU8 v0, v1;
@ -417,6 +524,12 @@ void testEqualHex16s(void)
TEST_ASSERT_EQUAL_HEX16(*p0, 0x9876);
}
void testEqualHex16sWhenThereAreDifferencesOutside16Bits(void)
{
TEST_ASSERT_EQUAL_HEX16(0x54321,0x64321);
TEST_ASSERT_EQUAL_HEX16(0xFFFF4321,0x00004321);
}
void testEqualHex32s(void)
{
_UU32 v0, v1;
@ -630,6 +743,11 @@ void testHEX16sWithinDelta(void)
TEST_ASSERT_HEX16_WITHIN(5, 5000, 5005);
}
void testHEX16sWithinDeltaWhenThereAreDifferenceOutsideOf16Bits(void)
{
TEST_ASSERT_HEX16_WITHIN(5, 0x54321, 0x44321);
}
void testHEX16sNotWithinDelta(void)
{
EXPECT_ABORT_BEGIN
@ -644,6 +762,11 @@ void testHEX8sWithinDelta(void)
TEST_ASSERT_HEX8_WITHIN(5, 1, 4);
}
void testHEX8sWithinDeltaWhenThereAreDifferenceOutsideOf8Bits(void)
{
TEST_ASSERT_HEX8_WITHIN(5, 0x123, 0xF23);
}
void testHEX8sNotWithinDelta(void)
{
EXPECT_ABORT_BEGIN