Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Unity
提交
3399bba2
T
Third Party Unity
项目概览
OpenHarmony
/
Third Party Unity
1 年多 前同步成功
通知
37
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看板
提交
3399bba2
编写于
9月 22, 2013
作者:
M
Mark VanderVoord
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
- merged in changes by TheGreenDroid to reduce Lint and Compiler warnings
上级
72c55e02
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
65 addition
and
64 deletion
+65
-64
extras/fixture/src/unity_fixture.h
extras/fixture/src/unity_fixture.h
+17
-16
src/unity.c
src/unity.c
+29
-29
src/unity_internals.h
src/unity_internals.h
+19
-19
未找到文件。
extras/fixture/src/unity_fixture.h
浏览文件 @
3399bba2
...
@@ -13,40 +13,40 @@
...
@@ -13,40 +13,40 @@
#include "unity_fixture_malloc_overrides.h"
#include "unity_fixture_malloc_overrides.h"
#include "unity_fixture_internals.h"
#include "unity_fixture_internals.h"
int
UnityMain
(
int
argc
,
char
*
argv
[],
void
(
*
runAllTests
)());
int
UnityMain
(
int
argc
,
char
*
argv
[],
void
(
*
runAllTests
)(
void
));
#define TEST_GROUP(group)\
#define TEST_GROUP(group)\
int TEST_GROUP_##group = 0
static const char* TEST_GROUP_##group = #group
#define TEST_SETUP(group) void TEST_##group##_SETUP()
#define TEST_SETUP(group) void TEST_##group##_SETUP(
void
)
#define TEST_TEAR_DOWN(group) void TEST_##group##_TEAR_DOWN()
#define TEST_TEAR_DOWN(group) void TEST_##group##_TEAR_DOWN(
void
)
#define TEST(group, name) \
#define TEST(group, name) \
void TEST_##group##_##name##_();\
void TEST_##group##_##name##_(
void
);\
void TEST_##group##_##name##_run()\
void TEST_##group##_##name##_run(
void
)\
{\
{\
UnityTestRunner(TEST_##group##_SETUP,\
UnityTestRunner(TEST_##group##_SETUP,\
TEST_##group##_##name##_,\
TEST_##group##_##name##_,\
TEST_##group##_TEAR_DOWN,\
TEST_##group##_TEAR_DOWN,\
"TEST(" #group ", " #name ")",\
"TEST(" #group ", " #name ")",\
#group, #name,\
TEST_GROUP_#
#group, #name,\
__FILE__, __LINE__);\
__FILE__, __LINE__);\
}\
}\
void TEST_##group##_##name##_()
void TEST_##group##_##name##_(
void
)
#define IGNORE_TEST(group, name) \
#define IGNORE_TEST(group, name) \
void TEST_##group##_##name##_();\
void TEST_##group##_##name##_(
void
);\
void TEST_##group##_##name##_run()\
void TEST_##group##_##name##_run(
void
)\
{\
{\
UnityIgnoreTest("IGNORE_TEST(" #group ", " #name ")");\
UnityIgnoreTest("IGNORE_TEST(" #group ", " #name ")");\
}\
}\
void
TEST_##group##_##name##_(
)
void
TEST_##group##_##name##_(void
)
#define DECLARE_TEST_CASE(group, name) \
#define DECLARE_TEST_CASE(group, name) \
void TEST_##group##_##name##_run()
void TEST_##group##_##name##_run(
void
)
#define RUN_TEST_CASE(group, name) \
#define RUN_TEST_CASE(group, name) \
{ DECLARE_TEST_CASE(group, name);\
{ DECLARE_TEST_CASE(group, name);\
...
@@ -54,8 +54,9 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)());
...
@@ -54,8 +54,9 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)());
//This goes at the bottom of each test file or in a separate c file
//This goes at the bottom of each test file or in a separate c file
#define TEST_GROUP_RUNNER(group)\
#define TEST_GROUP_RUNNER(group)\
void TEST_##group##_GROUP_RUNNER_runAll();\
void TEST_##group##_GROUP_RUNNER_runAll(void);\
void TEST_##group##_GROUP_RUNNER()\
void TEST_##group##_GROUP_RUNNER(void);\
void TEST_##group##_GROUP_RUNNER(void)\
{\
{\
TEST_##group##_GROUP_RUNNER_runAll();\
TEST_##group##_GROUP_RUNNER_runAll();\
}\
}\
...
@@ -63,7 +64,7 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)());
...
@@ -63,7 +64,7 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)());
//Call this from main
//Call this from main
#define RUN_TEST_GROUP(group)\
#define RUN_TEST_GROUP(group)\
{ void TEST_##group##_GROUP_RUNNER();\
{ void TEST_##group##_GROUP_RUNNER(
void
);\
TEST_##group##_GROUP_RUNNER(); }
TEST_##group##_GROUP_RUNNER(); }
//CppUTest Compatibility Macros
//CppUTest Compatibility Macros
...
...
src/unity.c
浏览文件 @
3399bba2
...
@@ -42,7 +42,7 @@ static const _UD d_zero = 0.0;
...
@@ -42,7 +42,7 @@ static const _UD d_zero = 0.0;
#endif
#endif
// compiler-generic print formatting masks
// compiler-generic print formatting masks
const
_U_UINT
UnitySizeMask
[]
=
const
_U_UINT
UnitySizeMask
[]
=
{
{
255u
,
// 0xFF
255u
,
// 0xFF
65535u
,
// 0xFFFF
65535u
,
// 0xFFFF
...
@@ -308,7 +308,7 @@ void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual
...
@@ -308,7 +308,7 @@ void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual
}
}
else
else
{
{
UnityPrint
(
UnityStrNull
);
UnityPrint
(
UnityStrNull
);
}
}
UnityPrint
(
UnityStrWas
);
UnityPrint
(
UnityStrWas
);
if
(
actual
!=
NULL
)
if
(
actual
!=
NULL
)
...
@@ -319,7 +319,7 @@ void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual
...
@@ -319,7 +319,7 @@ void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual
}
}
else
else
{
{
UnityPrint
(
UnityStrNull
);
UnityPrint
(
UnityStrNull
);
}
}
}
}
...
@@ -332,7 +332,7 @@ int UnityCheckArraysForNull(UNITY_PTR_ATTRIBUTE const void* expected, UNITY_PTR_
...
@@ -332,7 +332,7 @@ int UnityCheckArraysForNull(UNITY_PTR_ATTRIBUTE const void* expected, UNITY_PTR_
//return true if they are both NULL
//return true if they are both NULL
if
((
expected
==
NULL
)
&&
(
actual
==
NULL
))
if
((
expected
==
NULL
)
&&
(
actual
==
NULL
))
return
1
;
return
1
;
//throw error if just expected is NULL
//throw error if just expected is NULL
if
(
expected
==
NULL
)
if
(
expected
==
NULL
)
{
{
...
@@ -350,7 +350,7 @@ int UnityCheckArraysForNull(UNITY_PTR_ATTRIBUTE const void* expected, UNITY_PTR_
...
@@ -350,7 +350,7 @@ int UnityCheckArraysForNull(UNITY_PTR_ATTRIBUTE const void* expected, UNITY_PTR_
UnityAddMsgIfSpecified
(
msg
);
UnityAddMsgIfSpecified
(
msg
);
UNITY_FAIL_AND_BAIL
;
UNITY_FAIL_AND_BAIL
;
}
}
//return false if neither is NULL
//return false if neither is NULL
return
0
;
return
0
;
}
}
...
@@ -366,7 +366,7 @@ void UnityAssertBits(const _U_SINT mask,
...
@@ -366,7 +366,7 @@ void UnityAssertBits(const _U_SINT mask,
const
UNITY_LINE_TYPE
lineNumber
)
const
UNITY_LINE_TYPE
lineNumber
)
{
{
UNITY_SKIP_EXECUTION
;
UNITY_SKIP_EXECUTION
;
if
((
mask
&
expected
)
!=
(
mask
&
actual
))
if
((
mask
&
expected
)
!=
(
mask
&
actual
))
{
{
UnityTestResultsFailBegin
(
lineNumber
);
UnityTestResultsFailBegin
(
lineNumber
);
...
@@ -401,8 +401,8 @@ void UnityAssertEqualNumber(const _U_SINT expected,
...
@@ -401,8 +401,8 @@ void UnityAssertEqualNumber(const _U_SINT expected,
}
}
//-----------------------------------------------
//-----------------------------------------------
void
UnityAssertEqualIntArray
(
UNITY_PTR_ATTRIBUTE
const
_U_SINT
*
expected
,
void
UnityAssertEqualIntArray
(
UNITY_PTR_ATTRIBUTE
const
void
*
expected
,
UNITY_PTR_ATTRIBUTE
const
_U_SINT
*
actual
,
UNITY_PTR_ATTRIBUTE
const
void
*
actual
,
const
_UU32
num_elements
,
const
_UU32
num_elements
,
const
char
*
msg
,
const
char
*
msg
,
const
UNITY_LINE_TYPE
lineNumber
,
const
UNITY_LINE_TYPE
lineNumber
,
...
@@ -413,7 +413,7 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const _U_SINT* expected,
...
@@ -413,7 +413,7 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const _U_SINT* expected,
UNITY_PTR_ATTRIBUTE
const
_US8
*
ptr_act
=
(
UNITY_PTR_ATTRIBUTE
_US8
*
)
actual
;
UNITY_PTR_ATTRIBUTE
const
_US8
*
ptr_act
=
(
UNITY_PTR_ATTRIBUTE
_US8
*
)
actual
;
UNITY_SKIP_EXECUTION
;
UNITY_SKIP_EXECUTION
;
if
(
elements
==
0
)
if
(
elements
==
0
)
{
{
UnityTestResultsFailBegin
(
lineNumber
);
UnityTestResultsFailBegin
(
lineNumber
);
...
@@ -421,7 +421,7 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const _U_SINT* expected,
...
@@ -421,7 +421,7 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const _U_SINT* expected,
UnityAddMsgIfSpecified
(
msg
);
UnityAddMsgIfSpecified
(
msg
);
UNITY_FAIL_AND_BAIL
;
UNITY_FAIL_AND_BAIL
;
}
}
if
(
UnityCheckArraysForNull
((
UNITY_PTR_ATTRIBUTE
void
*
)
expected
,
(
UNITY_PTR_ATTRIBUTE
void
*
)
actual
,
lineNumber
,
msg
)
==
1
)
if
(
UnityCheckArraysForNull
((
UNITY_PTR_ATTRIBUTE
void
*
)
expected
,
(
UNITY_PTR_ATTRIBUTE
void
*
)
actual
,
lineNumber
,
msg
)
==
1
)
return
;
return
;
...
@@ -531,7 +531,7 @@ void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const _UF* expected,
...
@@ -531,7 +531,7 @@ void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const _UF* expected,
_UF
diff
,
tol
;
_UF
diff
,
tol
;
UNITY_SKIP_EXECUTION
;
UNITY_SKIP_EXECUTION
;
if
(
elements
==
0
)
if
(
elements
==
0
)
{
{
UnityTestResultsFailBegin
(
lineNumber
);
UnityTestResultsFailBegin
(
lineNumber
);
...
@@ -539,7 +539,7 @@ void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const _UF* expected,
...
@@ -539,7 +539,7 @@ void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const _UF* expected,
UnityAddMsgIfSpecified
(
msg
);
UnityAddMsgIfSpecified
(
msg
);
UNITY_FAIL_AND_BAIL
;
UNITY_FAIL_AND_BAIL
;
}
}
if
(
UnityCheckArraysForNull
((
UNITY_PTR_ATTRIBUTE
void
*
)
expected
,
(
UNITY_PTR_ATTRIBUTE
void
*
)
actual
,
lineNumber
,
msg
)
==
1
)
if
(
UnityCheckArraysForNull
((
UNITY_PTR_ATTRIBUTE
void
*
)
expected
,
(
UNITY_PTR_ATTRIBUTE
void
*
)
actual
,
lineNumber
,
msg
)
==
1
)
return
;
return
;
...
@@ -551,7 +551,7 @@ void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const _UF* expected,
...
@@ -551,7 +551,7 @@ void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const _UF* expected,
tol
=
UNITY_FLOAT_PRECISION
*
*
ptr_expected
;
tol
=
UNITY_FLOAT_PRECISION
*
*
ptr_expected
;
if
(
tol
<
0
.
0
f
)
if
(
tol
<
0
.
0
f
)
tol
=
0
.
0
f
-
tol
;
tol
=
0
.
0
f
-
tol
;
//This first part of this condition will catch any NaN or Infinite values
//This first part of this condition will catch any NaN or Infinite values
if
((
diff
*
0
.
0
f
!=
0
.
0
f
)
||
(
diff
>
tol
))
if
((
diff
*
0
.
0
f
!=
0
.
0
f
)
||
(
diff
>
tol
))
{
{
...
@@ -585,7 +585,7 @@ void UnityAssertFloatsWithin(const _UF delta,
...
@@ -585,7 +585,7 @@ void UnityAssertFloatsWithin(const _UF delta,
_UF
pos_delta
=
delta
;
_UF
pos_delta
=
delta
;
UNITY_SKIP_EXECUTION
;
UNITY_SKIP_EXECUTION
;
if
(
diff
<
0
.
0
f
)
if
(
diff
<
0
.
0
f
)
{
{
diff
=
0
.
0
f
-
diff
;
diff
=
0
.
0
f
-
diff
;
...
@@ -703,7 +703,7 @@ void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const _UD* expected,
...
@@ -703,7 +703,7 @@ void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const _UD* expected,
_UD
diff
,
tol
;
_UD
diff
,
tol
;
UNITY_SKIP_EXECUTION
;
UNITY_SKIP_EXECUTION
;
if
(
elements
==
0
)
if
(
elements
==
0
)
{
{
UnityTestResultsFailBegin
(
lineNumber
);
UnityTestResultsFailBegin
(
lineNumber
);
...
@@ -711,7 +711,7 @@ void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const _UD* expected,
...
@@ -711,7 +711,7 @@ void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const _UD* expected,
UnityAddMsgIfSpecified
(
msg
);
UnityAddMsgIfSpecified
(
msg
);
UNITY_FAIL_AND_BAIL
;
UNITY_FAIL_AND_BAIL
;
}
}
if
(
UnityCheckArraysForNull
((
UNITY_PTR_ATTRIBUTE
void
*
)
expected
,
(
UNITY_PTR_ATTRIBUTE
void
*
)
actual
,
lineNumber
,
msg
)
==
1
)
if
(
UnityCheckArraysForNull
((
UNITY_PTR_ATTRIBUTE
void
*
)
expected
,
(
UNITY_PTR_ATTRIBUTE
void
*
)
actual
,
lineNumber
,
msg
)
==
1
)
return
;
return
;
...
@@ -723,7 +723,7 @@ void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const _UD* expected,
...
@@ -723,7 +723,7 @@ void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const _UD* expected,
tol
=
UNITY_DOUBLE_PRECISION
*
*
ptr_expected
;
tol
=
UNITY_DOUBLE_PRECISION
*
*
ptr_expected
;
if
(
tol
<
0
.
0
)
if
(
tol
<
0
.
0
)
tol
=
0
.
0
-
tol
;
tol
=
0
.
0
-
tol
;
//This first part of this condition will catch any NaN or Infinite values
//This first part of this condition will catch any NaN or Infinite values
if
((
diff
*
0
.
0
!=
0
.
0
)
||
(
diff
>
tol
))
if
((
diff
*
0
.
0
!=
0
.
0
)
||
(
diff
>
tol
))
{
{
...
@@ -757,7 +757,7 @@ void UnityAssertDoublesWithin(const _UD delta,
...
@@ -757,7 +757,7 @@ void UnityAssertDoublesWithin(const _UD delta,
_UD
pos_delta
=
delta
;
_UD
pos_delta
=
delta
;
UNITY_SKIP_EXECUTION
;
UNITY_SKIP_EXECUTION
;
if
(
diff
<
0
.
0
)
if
(
diff
<
0
.
0
)
{
{
diff
=
0
.
0
-
diff
;
diff
=
0
.
0
-
diff
;
...
@@ -866,7 +866,7 @@ void UnityAssertNumbersWithin( const _U_SINT delta,
...
@@ -866,7 +866,7 @@ void UnityAssertNumbersWithin( const _U_SINT delta,
const
UNITY_DISPLAY_STYLE_T
style
)
const
UNITY_DISPLAY_STYLE_T
style
)
{
{
UNITY_SKIP_EXECUTION
;
UNITY_SKIP_EXECUTION
;
if
((
style
&
UNITY_DISPLAY_RANGE_INT
)
==
UNITY_DISPLAY_RANGE_INT
)
if
((
style
&
UNITY_DISPLAY_RANGE_INT
)
==
UNITY_DISPLAY_RANGE_INT
)
{
{
if
(
actual
>
expected
)
if
(
actual
>
expected
)
...
@@ -905,7 +905,7 @@ void UnityAssertEqualString(const char* expected,
...
@@ -905,7 +905,7 @@ void UnityAssertEqualString(const char* expected,
_UU32
i
;
_UU32
i
;
UNITY_SKIP_EXECUTION
;
UNITY_SKIP_EXECUTION
;
// if both pointers not null compare the strings
// if both pointers not null compare the strings
if
(
expected
&&
actual
)
if
(
expected
&&
actual
)
{
{
...
@@ -943,9 +943,9 @@ void UnityAssertEqualStringArray( const char** expected,
...
@@ -943,9 +943,9 @@ void UnityAssertEqualStringArray( const char** expected,
const
UNITY_LINE_TYPE
lineNumber
)
const
UNITY_LINE_TYPE
lineNumber
)
{
{
_UU32
i
,
j
=
0
;
_UU32
i
,
j
=
0
;
UNITY_SKIP_EXECUTION
;
UNITY_SKIP_EXECUTION
;
// if no elements, it's an error
// if no elements, it's an error
if
(
num_elements
==
0
)
if
(
num_elements
==
0
)
{
{
...
@@ -957,7 +957,7 @@ void UnityAssertEqualStringArray( const char** expected,
...
@@ -957,7 +957,7 @@ void UnityAssertEqualStringArray( const char** expected,
if
(
UnityCheckArraysForNull
((
UNITY_PTR_ATTRIBUTE
void
*
)
expected
,
(
UNITY_PTR_ATTRIBUTE
void
*
)
actual
,
lineNumber
,
msg
)
==
1
)
if
(
UnityCheckArraysForNull
((
UNITY_PTR_ATTRIBUTE
void
*
)
expected
,
(
UNITY_PTR_ATTRIBUTE
void
*
)
actual
,
lineNumber
,
msg
)
==
1
)
return
;
return
;
do
do
{
{
// if both pointers not null compare the strings
// if both pointers not null compare the strings
...
@@ -991,7 +991,7 @@ void UnityAssertEqualStringArray( const char** expected,
...
@@ -991,7 +991,7 @@ void UnityAssertEqualStringArray( const char** expected,
UnityPrintExpectedAndActualStrings
((
const
char
*
)(
expected
[
j
]),
(
const
char
*
)(
actual
[
j
]));
UnityPrintExpectedAndActualStrings
((
const
char
*
)(
expected
[
j
]),
(
const
char
*
)(
actual
[
j
]));
UnityAddMsgIfSpecified
(
msg
);
UnityAddMsgIfSpecified
(
msg
);
UNITY_FAIL_AND_BAIL
;
UNITY_FAIL_AND_BAIL
;
}
}
}
while
(
++
j
<
num_elements
);
}
while
(
++
j
<
num_elements
);
}
}
...
@@ -1009,7 +1009,7 @@ void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected,
...
@@ -1009,7 +1009,7 @@ void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected,
_UU32
bytes
;
_UU32
bytes
;
UNITY_SKIP_EXECUTION
;
UNITY_SKIP_EXECUTION
;
if
((
elements
==
0
)
||
(
length
==
0
))
if
((
elements
==
0
)
||
(
length
==
0
))
{
{
UnityTestResultsFailBegin
(
lineNumber
);
UnityTestResultsFailBegin
(
lineNumber
);
...
@@ -1020,7 +1020,7 @@ void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected,
...
@@ -1020,7 +1020,7 @@ void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected,
if
(
UnityCheckArraysForNull
((
UNITY_PTR_ATTRIBUTE
void
*
)
expected
,
(
UNITY_PTR_ATTRIBUTE
void
*
)
actual
,
lineNumber
,
msg
)
==
1
)
if
(
UnityCheckArraysForNull
((
UNITY_PTR_ATTRIBUTE
void
*
)
expected
,
(
UNITY_PTR_ATTRIBUTE
void
*
)
actual
,
lineNumber
,
msg
)
==
1
)
return
;
return
;
while
(
elements
--
)
while
(
elements
--
)
{
{
/////////////////////////////////////
/////////////////////////////////////
...
@@ -1049,7 +1049,7 @@ void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected,
...
@@ -1049,7 +1049,7 @@ void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected,
ptr_act
+=
1
;
ptr_act
+=
1
;
}
}
/////////////////////////////////////
/////////////////////////////////////
}
}
}
}
...
@@ -1068,7 +1068,7 @@ void UnityFail(const char* msg, const UNITY_LINE_TYPE line)
...
@@ -1068,7 +1068,7 @@ void UnityFail(const char* msg, const UNITY_LINE_TYPE line)
UNITY_OUTPUT_CHAR
(
':'
);
UNITY_OUTPUT_CHAR
(
':'
);
if
(
msg
[
0
]
!=
' '
)
if
(
msg
[
0
]
!=
' '
)
{
{
UNITY_OUTPUT_CHAR
(
' '
);
UNITY_OUTPUT_CHAR
(
' '
);
}
}
UnityPrint
(
msg
);
UnityPrint
(
msg
);
}
}
...
@@ -1098,7 +1098,7 @@ void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int
...
@@ -1098,7 +1098,7 @@ void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int
{
{
Unity
.
CurrentTestName
=
FuncName
;
Unity
.
CurrentTestName
=
FuncName
;
Unity
.
CurrentTestLineNumber
=
FuncLineNum
;
Unity
.
CurrentTestLineNumber
=
FuncLineNum
;
Unity
.
NumberOfTests
++
;
Unity
.
NumberOfTests
++
;
if
(
TEST_PROTECT
())
if
(
TEST_PROTECT
())
{
{
setUp
();
setUp
();
...
...
src/unity_internals.h
浏览文件 @
3399bba2
...
@@ -181,7 +181,7 @@ typedef _US64 _U_SINT;
...
@@ -181,7 +181,7 @@ typedef _US64 _U_SINT;
// Float Support
// Float Support
//-------------------------------------------------------
//-------------------------------------------------------
#ifdef UNITY_EXCLUDE_FLOAT
#ifdef UNITY_EXCLUDE_FLOAT
//No Floating Point Support
//No Floating Point Support
#undef UNITY_FLOAT_PRECISION
#undef UNITY_FLOAT_PRECISION
...
@@ -198,7 +198,7 @@ typedef _US64 _U_SINT;
...
@@ -198,7 +198,7 @@ typedef _US64 _U_SINT;
#define UNITY_FLOAT_TYPE float
#define UNITY_FLOAT_TYPE float
#endif
#endif
typedef
UNITY_FLOAT_TYPE
_UF
;
typedef
UNITY_FLOAT_TYPE
_UF
;
#endif
#endif
//-------------------------------------------------------
//-------------------------------------------------------
...
@@ -212,7 +212,7 @@ typedef UNITY_FLOAT_TYPE _UF;
...
@@ -212,7 +212,7 @@ typedef UNITY_FLOAT_TYPE _UF;
#endif
#endif
#endif
#endif
#ifdef UNITY_EXCLUDE_DOUBLE
#ifdef UNITY_EXCLUDE_DOUBLE
//No Floating Point Support
//No Floating Point Support
#undef UNITY_DOUBLE_PRECISION
#undef UNITY_DOUBLE_PRECISION
...
@@ -223,13 +223,13 @@ typedef UNITY_FLOAT_TYPE _UF;
...
@@ -223,13 +223,13 @@ typedef UNITY_FLOAT_TYPE _UF;
//Floating Point Support
//Floating Point Support
#ifndef UNITY_DOUBLE_PRECISION
#ifndef UNITY_DOUBLE_PRECISION
#define UNITY_DOUBLE_PRECISION (1e-12f)
#define UNITY_DOUBLE_PRECISION (1e-12f)
#endif
#endif
#ifndef UNITY_DOUBLE_TYPE
#ifndef UNITY_DOUBLE_TYPE
#define UNITY_DOUBLE_TYPE double
#define UNITY_DOUBLE_TYPE double
#endif
#endif
typedef
UNITY_DOUBLE_TYPE
_UD
;
typedef
UNITY_DOUBLE_TYPE
_UD
;
#endif
#endif
//-------------------------------------------------------
//-------------------------------------------------------
...
@@ -358,8 +358,8 @@ void UnityAssertEqualNumber(const _U_SINT expected,
...
@@ -358,8 +358,8 @@ void UnityAssertEqualNumber(const _U_SINT expected,
const
UNITY_LINE_TYPE
lineNumber
,
const
UNITY_LINE_TYPE
lineNumber
,
const
UNITY_DISPLAY_STYLE_T
style
);
const
UNITY_DISPLAY_STYLE_T
style
);
void
UnityAssertEqualIntArray
(
UNITY_PTR_ATTRIBUTE
const
_U_SINT
*
expected
,
void
UnityAssertEqualIntArray
(
UNITY_PTR_ATTRIBUTE
const
void
*
expected
,
UNITY_PTR_ATTRIBUTE
const
_U_SINT
*
actual
,
UNITY_PTR_ATTRIBUTE
const
void
*
actual
,
const
_UU32
num_elements
,
const
_UU32
num_elements
,
const
char
*
msg
,
const
char
*
msg
,
const
UNITY_LINE_TYPE
lineNumber
,
const
UNITY_LINE_TYPE
lineNumber
,
...
@@ -490,18 +490,18 @@ void UnityAssertDoubleIsNaN(const _UD actual,
...
@@ -490,18 +490,18 @@ void UnityAssertDoubleIsNaN(const _UD actual,
#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)
#define UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, line, message) UnityAssertEqualMemory((UNITY_PTR_ATTRIBUTE void*)(expected), (UNITY_PTR_ATTRIBUTE void*)(actual), (_UU32)(len), 1, (message), (UNITY_LINE_TYPE)line)
#define UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, line, message) UnityAssertEqualMemory((UNITY_PTR_ATTRIBUTE void*)(expected), (UNITY_PTR_ATTRIBUTE void*)(actual), (_UU32)(len), 1, (message), (UNITY_LINE_TYPE)line)
#define UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
_U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT)
#define UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
void*)(expected), (UNITY_PTR_ATTRIBUTE const void
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT)
#define UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
_U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT8)
#define UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
void*)(expected), (UNITY_PTR_ATTRIBUTE const void
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT8)
#define UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
_U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT16)
#define UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
void*)(expected), (UNITY_PTR_ATTRIBUTE const void
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT16)
#define UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
_U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT32)
#define UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
void*)(expected), (UNITY_PTR_ATTRIBUTE const void
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT32)
#define UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
_U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT)
#define UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
void*)(expected), (UNITY_PTR_ATTRIBUTE const void
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT)
#define UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
_U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT8)
#define UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
void*)(expected), (UNITY_PTR_ATTRIBUTE const void
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT8)
#define UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
_U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT16)
#define UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
void*)(expected), (UNITY_PTR_ATTRIBUTE const void
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT16)
#define UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
_U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT32)
#define UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
void*)(expected), (UNITY_PTR_ATTRIBUTE const void
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT32)
#define UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
_U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8)
#define UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
void*)(expected), (UNITY_PTR_ATTRIBUTE const void
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8)
#define UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
_U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16)
#define UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
void*)(expected), (UNITY_PTR_ATTRIBUTE const void
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16)
#define UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
_U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32)
#define UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
void*)(expected), (UNITY_PTR_ATTRIBUTE const void
*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32)
#define UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
_U_SINT*)(_UP*)(expected), (const _U_SINT
*)(_UP*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_POINTER)
#define UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const
void*)(_UP*)(expected), (const void
*)(_UP*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_POINTER)
#define UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualStringArray((const char**)(expected), (const char**)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line)
#define UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualStringArray((const char**)(expected), (const char**)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line)
#define UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, line, message) UnityAssertEqualMemory((UNITY_PTR_ATTRIBUTE void*)(expected), (UNITY_PTR_ATTRIBUTE void*)(actual), (_UU32)(len), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line)
#define UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, line, message) UnityAssertEqualMemory((UNITY_PTR_ATTRIBUTE void*)(expected), (UNITY_PTR_ATTRIBUTE void*)(actual), (_UU32)(len), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录