Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Unity
提交
8152932f
T
Third Party Unity
项目概览
OpenHarmony
/
Third Party Unity
接近 2 年 前同步成功
通知
38
Star
144
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Unity
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
8152932f
编写于
9月 06, 2012
作者:
G
Greg Williams
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #8 from alejmrm/fix_within_message
Fix issue #7 INTx_WITHIN_MESSAGE() macro
上级
b7d9d007
e95f6626
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
111 addition
and
5 deletion
+111
-5
src/unity_internals.h
src/unity_internals.h
+5
-5
test/testunity.c
test/testunity.c
+106
-0
未找到文件。
src/unity_internals.h
浏览文件 @
8152932f
...
@@ -454,11 +454,11 @@ void UnityAssertEqualDoubleArray(const _UD* expected,
...
@@ -454,11 +454,11 @@ void UnityAssertEqualDoubleArray(const _UD* expected,
#define UNITY_TEST_ASSERT_EQUAL_HEX32(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(_US32)(expected), (_U_SINT)(_US32)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32)
#define UNITY_TEST_ASSERT_EQUAL_HEX32(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(_US32)(expected), (_U_SINT)(_US32)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32)
#define UNITY_TEST_ASSERT_BITS(mask, expected, actual, line, message) UnityAssertBits((_U_SINT)(mask), (_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line)
#define UNITY_TEST_ASSERT_BITS(mask, expected, actual, line, message) UnityAssertBits((_U_SINT)(mask), (_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line)
#define UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual),
NULL
, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT)
#define UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual),
(message)
, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT)
#define UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual),
NULL
, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT)
#define UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual),
(message)
, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT)
#define UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(_U_UINT)(_UU8 )(delta), (_U_SINT)(_U_UINT)(_UU8 )(expected), (_U_SINT)(_U_UINT)(_UU8 )(actual),
NULL
, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8)
#define UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(_U_UINT)(_UU8 )(delta), (_U_SINT)(_U_UINT)(_UU8 )(expected), (_U_SINT)(_U_UINT)(_UU8 )(actual),
(message)
, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8)
#define UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(_U_UINT)(_UU16)(delta), (_U_SINT)(_U_UINT)(_UU16)(expected), (_U_SINT)(_U_UINT)(_UU16)(actual),
NULL
, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16)
#define UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(_U_UINT)(_UU16)(delta), (_U_SINT)(_U_UINT)(_UU16)(expected), (_U_SINT)(_U_UINT)(_UU16)(actual),
(message)
, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16)
#define UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(_U_UINT)(_UU32)(delta), (_U_SINT)(_U_UINT)(_UU32)(expected), (_U_SINT)(_U_UINT)(_UU32)(actual),
NULL
, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32)
#define UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(_U_UINT)(_UU32)(delta), (_U_SINT)(_U_UINT)(_UU32)(expected), (_U_SINT)(_U_UINT)(_UU32)(actual),
(message)
, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32)
#define UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(_UP)(expected), (_U_SINT)(_UP)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_POINTER)
#define UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(_UP)(expected), (_U_SINT)(_UP)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_POINTER)
#define UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, line, message) UnityAssertEqualString((const char*)(expected), (const char*)(actual), (message), (UNITY_LINE_TYPE)line)
#define UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, line, message) UnityAssertEqualString((const char*)(expected), (const char*)(actual), (message), (UNITY_LINE_TYPE)line)
...
...
test/testunity.c
浏览文件 @
8152932f
...
@@ -699,6 +699,18 @@ void testIntsWithinDelta(void)
...
@@ -699,6 +699,18 @@ void testIntsWithinDelta(void)
TEST_ASSERT_INT_WITHIN
(
5
,
-
1
,
1
);
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
)
void
testIntsNotWithinDelta
(
void
)
{
{
EXPECT_ABORT_BEGIN
EXPECT_ABORT_BEGIN
...
@@ -706,6 +718,13 @@ void testIntsNotWithinDelta(void)
...
@@ -706,6 +718,13 @@ void testIntsNotWithinDelta(void)
VERIFY_FAILS_END
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
)
void
testUIntsWithinDelta
(
void
)
{
{
TEST_ASSERT_UINT_WITHIN
(
1
,
5000
,
5001
);
TEST_ASSERT_UINT_WITHIN
(
1
,
5000
,
5001
);
...
@@ -713,6 +732,13 @@ void testUIntsWithinDelta(void)
...
@@ -713,6 +732,13 @@ void testUIntsWithinDelta(void)
TEST_ASSERT_UINT_WITHIN
(
5
,
5000
,
5005
);
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
)
void
testUIntsNotWithinDelta
(
void
)
{
{
EXPECT_ABORT_BEGIN
EXPECT_ABORT_BEGIN
...
@@ -720,6 +746,13 @@ void testUIntsNotWithinDelta(void)
...
@@ -720,6 +746,13 @@ void testUIntsNotWithinDelta(void)
VERIFY_FAILS_END
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
)
void
testUIntsNotWithinDeltaEvenThoughASignedIntWouldPassSmallFirst
(
void
)
{
{
EXPECT_ABORT_BEGIN
EXPECT_ABORT_BEGIN
...
@@ -727,6 +760,13 @@ void testUIntsNotWithinDeltaEvenThoughASignedIntWouldPassSmallFirst(void)
...
@@ -727,6 +760,13 @@ void testUIntsNotWithinDeltaEvenThoughASignedIntWouldPassSmallFirst(void)
VERIFY_FAILS_END
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
)
void
testUIntsNotWithinDeltaEvenThoughASignedIntWouldPassBigFirst
(
void
)
{
{
EXPECT_ABORT_BEGIN
EXPECT_ABORT_BEGIN
...
@@ -734,6 +774,13 @@ void testUIntsNotWithinDeltaEvenThoughASignedIntWouldPassBigFirst(void)
...
@@ -734,6 +774,13 @@ void testUIntsNotWithinDeltaEvenThoughASignedIntWouldPassBigFirst(void)
VERIFY_FAILS_END
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
)
void
testHEX32sWithinDelta
(
void
)
{
{
TEST_ASSERT_HEX32_WITHIN
(
1
,
5000
,
5001
);
TEST_ASSERT_HEX32_WITHIN
(
1
,
5000
,
5001
);
...
@@ -741,6 +788,13 @@ void testHEX32sWithinDelta(void)
...
@@ -741,6 +788,13 @@ void testHEX32sWithinDelta(void)
TEST_ASSERT_HEX32_WITHIN
(
5
,
5000
,
5005
);
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
)
void
testHEX32sNotWithinDelta
(
void
)
{
{
EXPECT_ABORT_BEGIN
EXPECT_ABORT_BEGIN
...
@@ -748,6 +802,13 @@ void testHEX32sNotWithinDelta(void)
...
@@ -748,6 +802,13 @@ void testHEX32sNotWithinDelta(void)
VERIFY_FAILS_END
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
)
void
testHEX32sNotWithinDeltaEvenThoughASignedIntWouldPass
(
void
)
{
{
EXPECT_ABORT_BEGIN
EXPECT_ABORT_BEGIN
...
@@ -755,6 +816,13 @@ void testHEX32sNotWithinDeltaEvenThoughASignedIntWouldPass(void)
...
@@ -755,6 +816,13 @@ void testHEX32sNotWithinDeltaEvenThoughASignedIntWouldPass(void)
VERIFY_FAILS_END
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
)
void
testHEX16sWithinDelta
(
void
)
{
{
TEST_ASSERT_HEX16_WITHIN
(
1
,
5000
,
5001
);
TEST_ASSERT_HEX16_WITHIN
(
1
,
5000
,
5001
);
...
@@ -762,11 +830,23 @@ void testHEX16sWithinDelta(void)
...
@@ -762,11 +830,23 @@ void testHEX16sWithinDelta(void)
TEST_ASSERT_HEX16_WITHIN
(
5
,
5000
,
5005
);
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
)
void
testHEX16sWithinDeltaWhenThereAreDifferenceOutsideOf16Bits
(
void
)
{
{
TEST_ASSERT_HEX16_WITHIN
(
5
,
0x54321
,
0x44321
);
TEST_ASSERT_HEX16_WITHIN
(
5
,
0x54321
,
0x44321
);
}
}
void
testHEX16sWithinDeltaWhenThereAreDifferenceOutsideOf16BitsAndCustomMessage
(
void
)
{
TEST_ASSERT_HEX16_WITHIN_MESSAGE
(
5
,
0x54321
,
0x44321
,
"Custom Message."
);
}
void
testHEX16sNotWithinDelta
(
void
)
void
testHEX16sNotWithinDelta
(
void
)
{
{
EXPECT_ABORT_BEGIN
EXPECT_ABORT_BEGIN
...
@@ -774,6 +854,13 @@ void testHEX16sNotWithinDelta(void)
...
@@ -774,6 +854,13 @@ void testHEX16sNotWithinDelta(void)
VERIFY_FAILS_END
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
)
void
testHEX8sWithinDelta
(
void
)
{
{
TEST_ASSERT_HEX8_WITHIN
(
1
,
254
,
255
);
TEST_ASSERT_HEX8_WITHIN
(
1
,
254
,
255
);
...
@@ -781,11 +868,23 @@ void testHEX8sWithinDelta(void)
...
@@ -781,11 +868,23 @@ void testHEX8sWithinDelta(void)
TEST_ASSERT_HEX8_WITHIN
(
5
,
1
,
4
);
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
)
void
testHEX8sWithinDeltaWhenThereAreDifferenceOutsideOf8Bits
(
void
)
{
{
TEST_ASSERT_HEX8_WITHIN
(
5
,
0x123
,
0xF23
);
TEST_ASSERT_HEX8_WITHIN
(
5
,
0x123
,
0xF23
);
}
}
void
testHEX8sWithinDeltaWhenThereAreDifferenceOutsideOf8BitsAndCustomMessage
(
void
)
{
TEST_ASSERT_HEX8_WITHIN_MESSAGE
(
5
,
0x123
,
0xF23
,
"Custom Message."
);
}
void
testHEX8sNotWithinDelta
(
void
)
void
testHEX8sNotWithinDelta
(
void
)
{
{
EXPECT_ABORT_BEGIN
EXPECT_ABORT_BEGIN
...
@@ -793,6 +892,13 @@ void testHEX8sNotWithinDelta(void)
...
@@ -793,6 +892,13 @@ void testHEX8sNotWithinDelta(void)
VERIFY_FAILS_END
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
)
void
testEqualStrings
(
void
)
{
{
const
char
*
testString
=
"foo"
;
const
char
*
testString
=
"foo"
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录