Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Unity
提交
2b0d0938
T
Third Party Unity
项目概览
OpenHarmony
/
Third Party Unity
大约 1 年 前同步成功
通知
34
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看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
2b0d0938
编写于
5月 04, 2019
作者:
M
Mark VanderVoord
提交者:
GitHub
5月 04, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #403 from farrrb/fix-issue-392
Used sizeof operator for pointer increments in UnityAssertEqualIntArray().
上级
25c15f63
d01e3229
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
33 addition
and
20 deletion
+33
-20
src/unity.c
src/unity.c
+29
-16
src/unity.h
src/unity.h
+1
-1
src/unity_internals.h
src/unity_internals.h
+3
-3
未找到文件。
src/unity.c
浏览文件 @
2b0d0938
/* =========================================================================
Unity Project - A Test Framework for C
Copyright (c) 2007-1
4
Mike Karlesky, Mark VanderVoord, Greg Williams
Copyright (c) 2007-1
9
Mike Karlesky, Mark VanderVoord, Greg Williams
[Released under MIT License. Please refer to license.txt for details]
============================================================================ */
...
...
@@ -693,7 +693,8 @@ static int UnityIsOneArrayNull(UNITY_INTERNAL_PTR expected,
const
UNITY_LINE_TYPE
lineNumber
,
const
char
*
msg
)
{
if
(
expected
==
actual
)
return
0
;
/* Both are NULL or same pointer */
/* Both are NULL or same pointer */
if
(
expected
==
actual
)
{
return
0
;
}
/* print and return true if just expected is NULL */
if
(
expected
==
NULL
)
...
...
@@ -819,6 +820,7 @@ void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
{
UNITY_UINT32
elements
=
num_elements
;
unsigned
int
length
=
style
&
0xF
;
unsigned
int
increment
=
0
;
RETURN_IF_FAIL_OR_IGNORE
;
...
...
@@ -841,32 +843,41 @@ void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
{
UNITY_INT
expect_val
;
UNITY_INT
actual_val
;
switch
(
length
)
{
case
1
:
expect_val
=
*
(
UNITY_PTR_ATTRIBUTE
const
UNITY_INT8
*
)
expected
;
actual_val
=
*
(
UNITY_PTR_ATTRIBUTE
const
UNITY_INT8
*
)
actual
;
increment
=
sizeof
(
UNITY_INT8
);
break
;
case
2
:
expect_val
=
*
(
UNITY_PTR_ATTRIBUTE
const
UNITY_INT16
*
)
expected
;
actual_val
=
*
(
UNITY_PTR_ATTRIBUTE
const
UNITY_INT16
*
)
actual
;
increment
=
sizeof
(
UNITY_INT16
);
break
;
#ifdef UNITY_SUPPORT_64
case
8
:
expect_val
=
*
(
UNITY_PTR_ATTRIBUTE
const
UNITY_INT64
*
)
expected
;
actual_val
=
*
(
UNITY_PTR_ATTRIBUTE
const
UNITY_INT64
*
)
actual
;
increment
=
sizeof
(
UNITY_INT64
);
break
;
#endif
default:
/* length 4 bytes */
default:
/* default is length 4 bytes */
case
4
:
expect_val
=
*
(
UNITY_PTR_ATTRIBUTE
const
UNITY_INT32
*
)
expected
;
actual_val
=
*
(
UNITY_PTR_ATTRIBUTE
const
UNITY_INT32
*
)
actual
;
increment
=
sizeof
(
UNITY_INT32
);
length
=
4
;
break
;
}
if
(
expect_val
!=
actual_val
)
{
if
((
style
&
UNITY_DISPLAY_RANGE_UINT
)
&&
(
length
<
sizeof
(
expect_val
)))
if
((
style
&
UNITY_DISPLAY_RANGE_UINT
)
&&
(
length
<
(
UNITY_INT_WIDTH
/
8
)))
{
/* For UINT, remove sign extension (padding 1's) from signed type casts above */
UNITY_INT
mask
=
1
;
mask
=
(
mask
<<
8
*
length
)
-
1
;
...
...
@@ -883,11 +894,12 @@ void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
UnityAddMsgIfSpecified
(
msg
);
UNITY_FAIL_AND_BAIL
;
}
/* Walk through array by incrementing the pointers */
if
(
flags
==
UNITY_ARRAY_TO_ARRAY
)
{
expected
=
(
UNITY_INTERNAL_PTR
)(
length
+
(
const
char
*
)
expected
);
expected
=
(
UNITY_INTERNAL_PTR
)(
(
const
char
*
)
expected
+
increment
);
}
actual
=
(
UNITY_INTERNAL_PTR
)(
length
+
(
const
char
*
)
actual
);
actual
=
(
UNITY_INTERNAL_PTR
)((
const
char
*
)
actual
+
increment
);
}
}
...
...
@@ -1614,6 +1626,7 @@ UNITY_INTERNAL_PTR UnityNumToPtr(const UNITY_INT num, const UNITY_UINT8 size)
UnityQuickCompare
.
i64
=
(
UNITY_INT64
)
num
;
return
(
UNITY_INTERNAL_PTR
)(
&
UnityQuickCompare
.
i64
);
#endif
default:
/* 4 bytes */
UnityQuickCompare
.
i32
=
(
UNITY_INT32
)
num
;
return
(
UNITY_INTERNAL_PTR
)(
&
UnityQuickCompare
.
i32
);
...
...
src/unity.h
浏览文件 @
2b0d0938
/* ==========================================
Unity Project - A Test Framework for C
Copyright (c) 2007-1
4
Mike Karlesky, Mark VanderVoord, Greg Williams
Copyright (c) 2007-1
9
Mike Karlesky, Mark VanderVoord, Greg Williams
[Released under MIT License. Please refer to license.txt for details]
========================================== */
...
...
src/unity_internals.h
浏览文件 @
2b0d0938
/* ==========================================
Unity Project - A Test Framework for C
Copyright (c) 2007-1
4
Mike Karlesky, Mark VanderVoord, Greg Williams
Copyright (c) 2007-1
9
Mike Karlesky, Mark VanderVoord, Greg Williams
[Released under MIT License. Please refer to license.txt for details]
========================================== */
...
...
@@ -375,7 +375,7 @@ typedef void (*UnityTestFunction)(void);
typedef
enum
{
UNITY_DISPLAY_STYLE_INT
=
sizeof
(
int
)
+
UNITY_DISPLAY_RANGE_INT
,
UNITY_DISPLAY_STYLE_INT
=
sizeof
(
int
)
+
UNITY_DISPLAY_RANGE_INT
,
UNITY_DISPLAY_STYLE_INT8
=
1
+
UNITY_DISPLAY_RANGE_INT
,
UNITY_DISPLAY_STYLE_INT16
=
2
+
UNITY_DISPLAY_RANGE_INT
,
UNITY_DISPLAY_STYLE_INT32
=
4
+
UNITY_DISPLAY_RANGE_INT
,
...
...
@@ -383,7 +383,7 @@ UNITY_DISPLAY_STYLE_INT = sizeof(int)+ UNITY_DISPLAY_RANGE_INT,
UNITY_DISPLAY_STYLE_INT64
=
8
+
UNITY_DISPLAY_RANGE_INT
,
#endif
UNITY_DISPLAY_STYLE_UINT
=
sizeof
(
unsigned
)
+
UNITY_DISPLAY_RANGE_UINT
,
UNITY_DISPLAY_STYLE_UINT
=
sizeof
(
unsigned
)
+
UNITY_DISPLAY_RANGE_UINT
,
UNITY_DISPLAY_STYLE_UINT8
=
1
+
UNITY_DISPLAY_RANGE_UINT
,
UNITY_DISPLAY_STYLE_UINT16
=
2
+
UNITY_DISPLAY_RANGE_UINT
,
UNITY_DISPLAY_STYLE_UINT32
=
4
+
UNITY_DISPLAY_RANGE_UINT
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录