fix: 修复测试用例返回值不匹配的问题

【背景】
部分测试用例所使用的宏的返回值与函数本身返回值不匹配

【修改方案】
修改不匹配的宏和函数

【影响】
对现有的产品编译不会有影响。

re #I58CP5

Signed-off-by: yinjiaming <yinjiaming@huawei.com>
Change-Id: Id7b93e215cd760dbe36caea392db5abe3a1dd5f1
This commit is contained in:
yinjiaming
2022-07-05 09:44:22 +00:00
parent dd36f4482c
commit 6f92337be2
12 changed files with 189 additions and 68 deletions

View File

@@ -48,176 +48,176 @@ static VOID TaskF01(VOID)
INT64 read64Counter = 0;
INT64 atomic64Ret = 0;
ICUNIT_ASSERT_EQUAL(g_testCount, 0, g_testCount);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 0, g_testCount);
atomicTestCounter = 0x88888888;
LOS_AtomicSet(&atomicTestCounter, 0x88888888);
atomicRet = LOS_AtomicAdd(&atomicTestCounter, 0x33333333);
ICUNIT_ASSERT_EQUAL(atomicRet, 0xbbbbbbbb, atomicRet);
ICUNIT_ASSERT_EQUAL_VOID(atomicRet, 0xbbbbbbbb, atomicRet);
readCounter = LOS_AtomicRead(&atomicTestCounter);
ICUNIT_ASSERT_EQUAL(readCounter, 0xbbbbbbbb, readCounter);
ICUNIT_ASSERT_EQUAL_VOID(readCounter, 0xbbbbbbbb, readCounter);
LOS_AtomicSet(&atomicTestCounter, 0xaaaaaaaa);
atomicRet = LOS_AtomicAdd(&atomicTestCounter, 0x77777777);
ICUNIT_ASSERT_EQUAL(atomicRet, 0x22222221, atomicRet);
ICUNIT_ASSERT_EQUAL_VOID(atomicRet, 0x22222221, atomicRet);
readCounter = LOS_AtomicRead(&atomicTestCounter);
ICUNIT_ASSERT_EQUAL(readCounter, 0x22222221, readCounter);
LOS_AtomicSet(&atomicTestCounter, 0xdddddddd);
atomicRet = LOS_AtomicSub(&atomicTestCounter, 0x99999999);
ICUNIT_ASSERT_EQUAL(atomicRet, 0x44444444, atomicRet);
ICUNIT_ASSERT_EQUAL_VOID(atomicRet, 0x44444444, atomicRet);
readCounter = LOS_AtomicRead(&atomicTestCounter);
ICUNIT_ASSERT_EQUAL(readCounter, 0x44444444, readCounter);
ICUNIT_ASSERT_EQUAL_VOID(readCounter, 0x44444444, readCounter);
LOS_AtomicSet(&atomicTestCounter, 0x88888888);
atomicRet = LOS_AtomicSub(&atomicTestCounter, 0xdddddddd);
ICUNIT_ASSERT_EQUAL(atomicRet, 0xaaaaaaab, atomicRet);
ICUNIT_ASSERT_EQUAL_VOID(atomicRet, 0xaaaaaaab, atomicRet);
readCounter = LOS_AtomicRead(&atomicTestCounter);
ICUNIT_ASSERT_EQUAL(readCounter, 0xaaaaaaab, readCounter);
ICUNIT_ASSERT_EQUAL_VOID(readCounter, 0xaaaaaaab, readCounter);
LOS_AtomicSet(&atomicTestCounter, 0x11111111);
LOS_AtomicInc(&atomicTestCounter);
readCounter = LOS_AtomicRead(&atomicTestCounter);
ICUNIT_ASSERT_EQUAL(readCounter, 0x11111112, readCounter);
ICUNIT_ASSERT_EQUAL_VOID(readCounter, 0x11111112, readCounter);
LOS_AtomicSet(&atomicTestCounter, 0xffffffff);
LOS_AtomicInc(&atomicTestCounter);
readCounter = LOS_AtomicRead(&atomicTestCounter);
ICUNIT_ASSERT_EQUAL(readCounter, 0x00000000, readCounter);
ICUNIT_ASSERT_EQUAL_VOID(readCounter, 0x00000000, readCounter);
LOS_AtomicSet(&atomicTestCounter, 0x88888888);
atomicRet = LOS_AtomicIncRet(&atomicTestCounter);
ICUNIT_ASSERT_EQUAL(atomicRet, 0x88888889, atomicRet);
ICUNIT_ASSERT_EQUAL_VOID(atomicRet, 0x88888889, atomicRet);
LOS_AtomicSet(&atomicTestCounter, 0xffffffff);
atomicRet = LOS_AtomicIncRet(&atomicTestCounter);
ICUNIT_ASSERT_EQUAL(atomicRet, 0x00000000, atomicRet);
ICUNIT_ASSERT_EQUAL_VOID(atomicRet, 0x00000000, atomicRet);
readCounter = LOS_AtomicRead(&atomicTestCounter);
ICUNIT_ASSERT_EQUAL(readCounter, 0x00000000, readCounter);
ICUNIT_ASSERT_EQUAL_VOID(readCounter, 0x00000000, readCounter);
LOS_AtomicSet(&atomicTestCounter, 0x66666666);
LOS_AtomicDec(&atomicTestCounter);
readCounter = LOS_AtomicRead(&atomicTestCounter);
ICUNIT_ASSERT_EQUAL(readCounter, 0x66666665, readCounter);
ICUNIT_ASSERT_EQUAL_VOID(readCounter, 0x66666665, readCounter);
LOS_AtomicSet(&atomicTestCounter, 0x00000000);
LOS_AtomicDec(&atomicTestCounter);
readCounter = LOS_AtomicRead(&atomicTestCounter);
ICUNIT_ASSERT_EQUAL(readCounter, 0xffffffff, readCounter);
ICUNIT_ASSERT_EQUAL_VOID(readCounter, 0xffffffff, readCounter);
LOS_AtomicSet(&atomicTestCounter, 0x88888888);
atomicRet = LOS_AtomicDecRet(&atomicTestCounter);
ICUNIT_ASSERT_EQUAL(atomicRet, 0x88888887, atomicRet);
ICUNIT_ASSERT_EQUAL_VOID(atomicRet, 0x88888887, atomicRet);
readCounter = LOS_AtomicRead(&atomicTestCounter);
ICUNIT_ASSERT_EQUAL(readCounter, 0x88888887, readCounter);
ICUNIT_ASSERT_EQUAL_VOID(readCounter, 0x88888887, readCounter);
LOS_AtomicSet(&atomicTestCounter, 0x00000000);
atomicRet = LOS_AtomicDecRet(&atomicTestCounter);
ICUNIT_ASSERT_EQUAL(atomicRet, 0xffffffff, atomicRet);
ICUNIT_ASSERT_EQUAL_VOID(atomicRet, 0xffffffff, atomicRet);
readCounter = LOS_AtomicRead(&atomicTestCounter);
ICUNIT_ASSERT_EQUAL(readCounter, 0xffffffff, readCounter);
ICUNIT_ASSERT_EQUAL_VOID(readCounter, 0xffffffff, readCounter);
LOS_Atomic64Set(&atomic64TestCounter, 0x5aaaaaaa88888888);
atomic64Ret = LOS_Atomic64Add(&atomic64TestCounter, 0x0000000033333333);
ICUNIT_ASSERT_EQUAL(atomic64Ret, 0x5aaaaaaabbbbbbbb, atomic64Ret);
ICUNIT_ASSERT_EQUAL_VOID(atomic64Ret, 0x5aaaaaaabbbbbbbb, atomic64Ret);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0x5aaaaaaabbbbbbbb, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0x5aaaaaaabbbbbbbb, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0x5aaaaaaa88888888);
atomic64Ret = LOS_Atomic64Add(&atomic64TestCounter, 0x0000123456789abc);
ICUNIT_ASSERT_EQUAL(atomic64Ret, 0x5aaabcdedf012344, atomic64Ret);
ICUNIT_ASSERT_EQUAL_VOID(atomic64Ret, 0x5aaabcdedf012344, atomic64Ret);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0x5aaabcdedf012344, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0x5aaabcdedf012344, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0xaaaaaaaa88888888);
atomic64Ret = LOS_Atomic64Add(&atomic64TestCounter, 0x88888888aaaaaaaa);
ICUNIT_ASSERT_EQUAL(atomic64Ret, 0x3333333333333332, atomic64Ret);
ICUNIT_ASSERT_EQUAL_VOID(atomic64Ret, 0x3333333333333332, atomic64Ret);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0x3333333333333332, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0x3333333333333332, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0x5aaaaaaa88888888);
atomic64Ret = LOS_Atomic64Sub(&atomic64TestCounter, 0x0000000033333333);
ICUNIT_ASSERT_EQUAL(atomic64Ret, 0x5aaaaaaa55555555, atomic64Ret);
ICUNIT_ASSERT_EQUAL_VOID(atomic64Ret, 0x5aaaaaaa55555555, atomic64Ret);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0x5aaaaaaa55555555, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0x5aaaaaaa55555555, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0x5aaaaaaa88888888);
atomic64Ret = LOS_Atomic64Sub(&atomic64TestCounter, 0x00001234cba98765);
ICUNIT_ASSERT_EQUAL(atomic64Ret, 0x5aaa9875bcdf0123, atomic64Ret);
ICUNIT_ASSERT_EQUAL_VOID(atomic64Ret, 0x5aaa9875bcdf0123, atomic64Ret);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0x5aaa9875bcdf0123, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0x5aaa9875bcdf0123, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0x5aaaaaaa88888888);
atomic64Ret = LOS_Atomic64Sub(&atomic64TestCounter, 0x60001234cba98765);
ICUNIT_ASSERT_EQUAL(atomic64Ret, 0xfaaa9875bcdf0123, atomic64Ret);
ICUNIT_ASSERT_EQUAL_VOID(atomic64Ret, 0xfaaa9875bcdf0123, atomic64Ret);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0xfaaa9875bcdf0123, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0xfaaa9875bcdf0123, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0x5aaaaaaa88888888);
LOS_Atomic64Inc(&atomic64TestCounter);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0x5aaaaaaa88888889, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0x5aaaaaaa88888889, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0x5aaaaaaaffffffff);
LOS_Atomic64Inc(&atomic64TestCounter);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0x5aaaaaab00000000, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0x5aaaaaab00000000, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0xffffffffffffffff);
LOS_Atomic64Inc(&atomic64TestCounter);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0x0000000000000000, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0x0000000000000000, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0x5aaaaaaa88888888);
atomic64Ret = LOS_Atomic64IncRet(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(atomic64Ret, 0x5aaaaaaa88888889, atomic64Ret);
ICUNIT_ASSERT_EQUAL_VOID(atomic64Ret, 0x5aaaaaaa88888889, atomic64Ret);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0x5aaaaaaa88888889, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0x5aaaaaaa88888889, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0x5aaaaaaaffffffff);
atomic64Ret = LOS_Atomic64IncRet(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(atomic64Ret, 0x5aaaaaab00000000, atomic64Ret);
ICUNIT_ASSERT_EQUAL_VOID(atomic64Ret, 0x5aaaaaab00000000, atomic64Ret);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0x5aaaaaab00000000, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0x5aaaaaab00000000, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0xffffffffffffffff);
atomic64Ret = LOS_Atomic64IncRet(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(atomic64Ret, 0x0000000000000000, atomic64Ret);
ICUNIT_ASSERT_EQUAL_VOID(atomic64Ret, 0x0000000000000000, atomic64Ret);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0x0000000000000000, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0x0000000000000000, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0x5aaaaaaa88888888);
LOS_Atomic64Dec(&atomic64TestCounter);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0x5aaaaaaa88888887, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0x5aaaaaaa88888887, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0x5aaaaaaa00000000);
LOS_Atomic64Dec(&atomic64TestCounter);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0x5aaaaaa9ffffffff, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0x5aaaaaa9ffffffff, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0x0000000000000000);
LOS_Atomic64Dec(&atomic64TestCounter);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0xffffffffffffffff, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0xffffffffffffffff, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0x5aaaaaaa88888888);
atomic64Ret = LOS_Atomic64DecRet(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(atomic64Ret, 0x5aaaaaaa88888887, atomic64Ret);
ICUNIT_ASSERT_EQUAL_VOID(atomic64Ret, 0x5aaaaaaa88888887, atomic64Ret);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0x5aaaaaaa88888887, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0x5aaaaaaa88888887, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0x5aaaaaaa00000000);
atomic64Ret = LOS_Atomic64DecRet(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(atomic64Ret, 0x5aaaaaa9ffffffff, atomic64Ret);
ICUNIT_ASSERT_EQUAL_VOID(atomic64Ret, 0x5aaaaaa9ffffffff, atomic64Ret);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0x5aaaaaa9ffffffff, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0x5aaaaaa9ffffffff, read64Counter);
LOS_Atomic64Set(&atomic64TestCounter, 0x0000000000000000);
atomic64Ret = LOS_Atomic64DecRet(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(atomic64Ret, 0xffffffffffffffff, atomic64Ret);
ICUNIT_ASSERT_EQUAL_VOID(atomic64Ret, 0xffffffffffffffff, atomic64Ret);
read64Counter = LOS_Atomic64Read(&atomic64TestCounter);
ICUNIT_ASSERT_EQUAL(read64Counter, 0xffffffffffffffff, read64Counter);
ICUNIT_ASSERT_EQUAL_VOID(read64Counter, 0xffffffffffffffff, read64Counter);
++g_testCount;
}

View File

@@ -439,7 +439,7 @@ static VOID *PthreadFunc07(void *argument)
g_testCount = 0;
ret = pthread_mutex_init(&g_pthread_mutex, NULL);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
ret = pthread_attr_init(&attr);
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
@@ -626,7 +626,7 @@ LITE_TEST_CASE(PthreadFuncTestSuite, TestPthread008, Function | MediumTest | Lev
static VOID *PthreadPrioFunc01(void *argument)
{
g_testCount++;
ICUNIT_ASSERT_EQUAL(g_testCount, (UINT32)argument, g_testCount);
ICUNIT_TRACK_EQUAL(g_testCount, (UINT32)argument, g_testCount);
return NULL;
}
@@ -677,7 +677,7 @@ LITE_TEST_CASE(PthreadFuncTestSuite, TestPthread009, Function | MediumTest | Lev
static VOID PthreadOnceFunc01(void)
{
g_testCount++;
ICUNIT_ASSERT_EQUAL(g_testCount, 1, g_testCount);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 1, g_testCount);
}
/**
@@ -722,10 +722,11 @@ static VOID *PthreadCancelFunc01(void *argument)
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
while (1) {
g_testCount++;
ICUNIT_ASSERT_EQUAL(g_testCount, 1, g_testCount);
ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT);
LOS_TaskDelay(PTHREAD_TASK_DELAY);
}
EXIT:
return NULL;
}
@@ -774,7 +775,7 @@ static VOID *PthreadTestcancelFunc01(void *argument)
ICUNIT_TRACK_EQUAL(ret, 0, ret);
ret = pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
g_testCount = 1;
g_pthreadSem = 1;
@@ -786,6 +787,7 @@ static VOID *PthreadTestcancelFunc01(void *argument)
pthread_testcancel();
g_testCount = -1;
EXIT:
return NULL;
}
@@ -996,7 +998,7 @@ EXIT:
return LOS_OK;
};
static void *PosixTestThread(void *arg)
static void PosixTestCase(void)
{
ADD_TEST_CASE(TestPthread001);
ADD_TEST_CASE(TestPthread002);
@@ -1015,9 +1017,14 @@ static void *PosixTestThread(void *arg)
ADD_TEST_CASE(TestPthread015);
ADD_TEST_CASE(TestPthread016);
ADD_TEST_CASE(TestPthread017);
return NULL;
return;
}
static void *PosixTestThread(void *arg)
{
PosixTestCase();
return NULL;
}
int PthreadFuncTestSuite(void)
{
pthread_attr_t attr;