yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:Scheduling optimization, test case adaptation modification. 

Close #I3OING

Change-Id: Ia131ebb46e92578081f2df93010eaf305dfbf977
This commit is contained in:
zhushengle 2021-04-28 19:45:29 +08:00
parent 1f725147f3
commit 1a7a6b9ffe
49 changed files with 230 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testsuits/sample/kernel/event/It_los_event_039.c
View File

@ -39,7 +39,7 @@ static VOID TaskF01(VOID)
g_testCount++;
ret = LOS_EventRead(&g_pevent, 0x11, LOS_WAITMODE_AND, 2); // 2, The timeout period for reading events.
ret = LOS_EventRead(&g_pevent, 0x11, LOS_WAITMODE_AND, 3); // 3, The timeout period for reading events.
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
ICUNIT_GOTO_EQUAL(g_pevent.uwEventID, 0, g_pevent.uwEventID, EXIT);

2
testsuits/sample/kernel/mux/It_los_mutex_024.c
View File

@ -68,7 +68,7 @@ static UINT32 Testcase(VOID)
ICUNIT_ASSERT_EQUAL(g_testCount, 1, g_testCount); // 1, Here, assert that g_testCount is equal to 1.
LOS_TaskDelay(100); // 100, set delay time.
LOS_TaskDelay(101); // 101, set delay time.
ICUNIT_ASSERT_EQUAL(g_testCount, 2, g_testCount); // 2, Here, assert that g_testCount is equal to 2.

4
testsuits/sample/kernel/sem/It_los_sem.h
View File

@ -40,8 +40,6 @@ extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
extern UINT64 g_ullTickCount;
VOID ItLosSem001(void);
VOID ItLosSem002(void);
VOID ItLosSem003(void);
@ -93,4 +91,4 @@ VOID ItLosSem044(void);
#endif /* __cplusplus */
#endif /* __cplusplus */
#endif /* IT_LOS_SEM_H */
#endif /* IT_LOS_SEM_H */

4
testsuits/sample/kernel/sem/It_los_sem_034.c
View File

@ -42,9 +42,9 @@ static VOID TaskF01(void)
g_testCount++;
osStartTime = g_ullTickCount;
osStartTime = LOS_TickCountGet();
ret = LOS_SemPend(g_usSemID, 1000); // 1000, Timeout interval of sem.
osEndTime = g_ullTickCount;
osEndTime = LOS_TickCountGet();
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_ERRNO_SEM_TIMEOUT, ret);
tickNum = (osEndTime - osStartTime);

2
testsuits/sample/kernel/swtmr/It_los_swtmr.c
View File

@ -116,7 +116,7 @@ VOID ItSuiteLosSwtmr(void)
ItLosSwtmr076();
ItLosSwtmr077();
ItLosSwtmr078();
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
ItLosSwtmrAlign001();
ItLosSwtmrAlign002();
ItLosSwtmrAlign003();

2
testsuits/sample/kernel/swtmr/It_los_swtmr_001.c
View File

@ -81,7 +81,7 @@ static UINT32 Testcase(VOID)
#ifdef LOS_HIMIDEER_RV32
// 4, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(4, LOS_SWTMR_MODE_NO_SELFDELETE, Case1, &swtmrId2, 0xffff
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
, OS_SWTMR_ROUSES_ALLOW, OS_SWTMR_ALIGN_INSENSITIVE
#endif
);

2
testsuits/sample/kernel/swtmr/It_los_swtmr_066.c
View File

@ -63,7 +63,7 @@ static UINT32 Testcase(VOID)
ret = LOS_SwtmrTimeGet(swTmrID, &tick);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(tick, TIMER_LOS_EXPIRATION1, tick, EXIT);
ICUNIT_GOTO_EQUAL(tick, TIMER_LOS_EXPIRATION1 - 1, tick, EXIT);
ret = LOS_TaskDelay(10); // 10, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);

6
testsuits/sample/kernel/swtmr/It_los_swtmr_068.c
View File

@ -65,15 +65,15 @@ static UINT32 Testcase(VOID)
ret = LOS_SwtmrTimeGet(swTmrID, &tick);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(tick, TIMER_LOS_EXPIRATION1, tick, EXIT);
ICUNIT_GOTO_EQUAL(tick, TIMER_LOS_EXPIRATION1 - 1, tick, EXIT);
ret = LOS_TaskDelay(10); // 10, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ret = LOS_SwtmrTimeGet(swTmrID, &tick);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
// 2, Here, assert that uwTick is equal to this .
ICUNIT_GOTO_EQUAL(tick, 2, tick, EXIT);
// 2 - 1, Here, assert that uwTick is equal to this .
ICUNIT_GOTO_EQUAL(tick, 2 - 1, tick, EXIT);
// 2, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT);

4
testsuits/sample/kernel/swtmr/It_los_swtmr_069.c
View File

@ -44,7 +44,7 @@ static VOID SwtmrF01(UINT32 arg)
ret = LOS_SwtmrTimeGet(g_swtmrId1, &tick);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(tick, TIMER_LOS_EXPIRATION1, tick, EXIT);
ICUNIT_GOTO_EQUAL(tick, TIMER_LOS_EXPIRATION1 - 1, tick, EXIT);
g_testCount++;
return;
@ -78,7 +78,7 @@ static UINT32 Testcase(VOID)
ret = LOS_SwtmrTimeGet(g_swtmrId1, &tick);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
// 2, assert that uwTick is equal to this.
ICUNIT_GOTO_EQUAL(tick, 2, tick, EXIT);

2
testsuits/sample/kernel/swtmr/It_los_swtmr_071.c
View File

@ -77,7 +77,7 @@ static UINT32 Testcase(VOID)
ret = LOS_SwtmrTimeGet(g_swtmrId1, &tick);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(tick, TIMER_LOS_EXPIRATION3 - delayTime, tick, EXIT);
ICUNIT_GOTO_EQUAL(tick, TIMER_LOS_EXPIRATION3 - delayTime - 1, tick, EXIT);
ret = LOS_SwtmrStop(g_swtmrId1);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);

4
testsuits/sample/kernel/swtmr/It_los_swtmr_072.c
View File

@ -77,7 +77,7 @@ static UINT32 Testcase(VOID)
ret = LOS_SwtmrTimeGet(g_swtmrId1, &tick);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(tick, TIMER_LOS_EXPIRATION3 - delayTime, tick, EXIT);
ICUNIT_GOTO_EQUAL(tick, TIMER_LOS_EXPIRATION3 - delayTime - 1, tick, EXIT);
ret = LOS_SwtmrStop(g_swtmrId1);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
@ -94,7 +94,7 @@ static UINT32 Testcase(VOID)
ret = LOS_SwtmrTimeGet(g_swtmrId1, &tick);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(tick, TIMER_LOS_EXPIRATION3, tick, EXIT);
ICUNIT_GOTO_EQUAL(tick, TIMER_LOS_EXPIRATION3 - 1, tick, EXIT);
ret = LOS_SwtmrDelete(g_swtmrId1);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);

2
testsuits/sample/kernel/swtmr/It_los_swtmr_074.c
View File

@ -94,7 +94,7 @@ static UINT32 Testcase(VOID)
ret = LOS_SwtmrTimeGet(swTmrID, &tick);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(tick, TIMER_LOS_EXPIRATION3 - delayTime, tick, EXIT);
ICUNIT_GOTO_EQUAL(tick, TIMER_LOS_EXPIRATION3 - delayTime - 1, tick, EXIT);
ret = LOS_TaskDelay(7); // 7, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);

6
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_001.c
View File

@ -33,7 +33,7 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
@ -44,8 +44,8 @@ static VOID Case1(UINT32 arg)
static UINT32 Testcase(VOID)
{
UINT32 ret;
UINT16 swtmrId1;
UINT16 swtmrId2;
UINT32 swtmrId1;
UINT32 swtmrId2;
// 4, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(4, LOS_SWTMR_MODE_PERIOD, Case1, &swtmrId1, 0xffff, OS_SWTMR_ROUSES_ALLOW, -1);
ICUNIT_ASSERT_EQUAL(ret, OS_ERRNO_SWTMR_ALIGN_INVALID, ret);

2
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_002.c
View File

@ -33,7 +33,7 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);

2
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_003.c
View File

@ -33,7 +33,7 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);

2
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_004.c
View File

@ -33,7 +33,7 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);

4
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_005.c
View File

@ -33,7 +33,7 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
@ -55,7 +55,7 @@ static UINT32 Testcase(VOID)
ret = LOS_SwtmrStart(swTmrID);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ret = LOS_TaskDelay(12); // 12, set delay time.
ret = LOS_TaskDelay(13); // 13, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
// 3, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT);

4
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_006.c
View File

@ -33,7 +33,7 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
@ -56,7 +56,7 @@ static UINT32 Testcase(VOID)
ret = LOS_SwtmrStart(swTmrID);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ret = LOS_TaskDelay(12); // 12, set delay time.
ret = LOS_TaskDelay(13); // 13, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
// 3, assert that g_testCount is equal to this.
ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT);

4
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_007.c
View File

@ -33,7 +33,7 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
@ -55,7 +55,7 @@ static UINT32 Testcase(VOID)
ret = LOS_SwtmrStart(swTmrID);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ret = LOS_TaskDelay(60); // 60, set delay time.
ret = LOS_TaskDelay(61); // 61, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
// 3, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT);

20
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_008.c
View File

@ -33,20 +33,22 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static UINT32 g_swtmrCount1;
static UINT32 g_swtmrCount2;
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_testCount++;
g_swtmrCount1++;
return;
}
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_testCount++;
g_swtmrCount2++;
return;
}
@ -57,6 +59,9 @@ static UINT32 Testcase(VOID)
UINT32 swtmrId2;
g_testCount = 0;
g_swtmrCount1 = 0;
g_swtmrCount2 = 0;
// 4, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(4, LOS_SWTMR_MODE_PERIOD, Case1, &swtmrId1, 0xffff, OS_SWTMR_ROUSES_ALLOW,
OS_SWTMR_ALIGN_SENSITIVE);
@ -76,13 +81,13 @@ static UINT32 Testcase(VOID)
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
// 2, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick2 - g_uwsTick1, 0, g_uwsTick2 - g_uwsTick1, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount2 - g_swtmrCount1, 0, g_swtmrCount2 - g_swtmrCount1, EXIT);
ret = LOS_TaskDelay(8); // 8, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
// 6, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 6, g_testCount, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick2 - g_uwsTick1, 0, g_uwsTick2 - g_uwsTick1, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount1, g_swtmrCount2, g_swtmrCount1 - g_swtmrCount2, EXIT);
ret = LOS_SwtmrDelete(swtmrId1);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
@ -90,11 +95,6 @@ static UINT32 Testcase(VOID)
ret = LOS_SwtmrDelete(swtmrId2);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ret = LOS_TaskDelay(12); // 12, set delay time.
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
// 6, Here, assert that g_testCount is equal to this .
ICUNIT_ASSERT_EQUAL(g_testCount, 6, g_testCount);
return LOS_OK;
EXIT:

6
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_009.c
View File

@ -33,11 +33,11 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_uwsTick1 = LOS_TickCountGet();
g_testCount++;
return;
}
@ -46,7 +46,7 @@ static VOID Case2(UINT32 arg)
{
UINT16 align;
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_uwsTick2 = LOS_TickCountGet();
align = g_uwsTick2 - g_uwsTick1;
ICUNIT_ASSERT_NOT_EQUAL_VOID(align, 0, align);
g_testCount++;

18
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_010.c
View File

@ -33,20 +33,22 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static UINT32 g_swtmrCount1;
static UINT32 g_swtmrCount2;
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_testCount++;
g_swtmrCount1++;
return;
}
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_testCount++;
g_swtmrCount2++;
return;
}
@ -58,6 +60,9 @@ static UINT32 Testcase(VOID)
UINT32 swtmrId2;
g_testCount = 0;
g_swtmrCount1 = 0;
g_swtmrCount2 = 0;
// 4, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(4, LOS_SWTMR_MODE_PERIOD, Case1, &swtmrId1, 0xffff, OS_SWTMR_ROUSES_ALLOW,
OS_SWTMR_ALIGN_INSENSITIVE);
@ -77,7 +82,7 @@ static UINT32 Testcase(VOID)
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
// 2, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick2 - g_uwsTick1, 0, g_uwsTick2 - g_uwsTick1, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount1 - g_swtmrCount2, 0, g_swtmrCount1 - g_swtmrCount2, EXIT);
ret = LOS_SwtmrDelete(swtmrId1);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
@ -85,11 +90,6 @@ static UINT32 Testcase(VOID)
ret = LOS_SwtmrDelete(swtmrId2);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ret = LOS_TaskDelay(12); // 12, set delay time.
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
// 2, Here, assert that g_testCount is equal to this .
ICUNIT_ASSERT_EQUAL(g_testCount, 2, g_testCount);
return LOS_OK;
EXIT:

19
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_011.c
View File

@ -33,21 +33,22 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static UINT32 g_swtmrCount1;
static UINT32 g_swtmrCount2;
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_testCount++;
g_swtmrCount1++;
return;
}
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_testCount++;
g_swtmrCount2++;
return;
}
@ -58,6 +59,9 @@ static UINT32 Testcase(VOID)
UINT32 swtmrId2;
g_testCount = 0;
g_swtmrCount1 = 0;
g_swtmrCount2 = 0;
// 8, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(8, LOS_SWTMR_MODE_PERIOD, Case1, &swtmrId1, 0xffff, OS_SWTMR_ROUSES_ALLOW,
OS_SWTMR_ALIGN_INSENSITIVE);
@ -80,7 +84,7 @@ static UINT32 Testcase(VOID)
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
// 2, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick2 - g_uwsTick1, 0, g_uwsTick2 - g_uwsTick1, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount2 - g_swtmrCount1, 0, g_swtmrCount2 - g_swtmrCount1, EXIT);
ret = LOS_TaskDelay(16); // 16, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
@ -93,11 +97,6 @@ static UINT32 Testcase(VOID)
ret = LOS_SwtmrDelete(swtmrId2);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ret = LOS_TaskDelay(10); // 10, set delay time.
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
// 6, Here, assert that g_testCount is equal to this .
ICUNIT_ASSERT_EQUAL(g_testCount, 6, g_testCount);
return LOS_OK;
EXIT:

13
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_012.c
View File

@ -33,21 +33,22 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static UINT32 g_swtmrCount1;
static UINT32 g_swtmrCount2;
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_testCount++;
g_swtmrCount1++;
return;
}
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_testCount++;
g_swtmrCount2++;
return;
}
@ -58,6 +59,8 @@ static UINT32 Testcase(VOID)
UINT32 swtmrId2;
g_testCount = 0;
g_swtmrCount1 = 0;
g_swtmrCount2 = 0;
// 20, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(20, LOS_SWTMR_MODE_PERIOD, Case1, &swtmrId1, 0xffff, OS_SWTMR_ROUSES_ALLOW,
OS_SWTMR_ALIGN_INSENSITIVE);
@ -77,7 +80,7 @@ static UINT32 Testcase(VOID)
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
// 2, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick2 - g_uwsTick1, 0, g_uwsTick2 - g_uwsTick1, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount2 - g_swtmrCount1, 0, g_swtmrCount2 - g_swtmrCount1, EXIT);
ret = LOS_TaskDelay(20); // 20, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);

13
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_013.c
View File

@ -33,21 +33,22 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static UINT32 g_swtmrCount1;
static UINT32 g_swtmrCount2;
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_testCount++;
g_swtmrCount1++;
return;
}
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_testCount++;
g_swtmrCount2++;
return;
}
@ -58,6 +59,8 @@ static UINT32 Testcase(VOID)
UINT32 swtmrId2;
g_testCount = 0;
g_swtmrCount1 = 0;
g_swtmrCount2 = 0;
// 20, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(20, LOS_SWTMR_MODE_PERIOD, Case1, &swtmrId1, 0xffff, OS_SWTMR_ROUSES_ALLOW,
OS_SWTMR_ALIGN_INSENSITIVE);
@ -80,7 +83,7 @@ static UINT32 Testcase(VOID)
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
// 2, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick2 - g_uwsTick1, 0, g_uwsTick2 - g_uwsTick1, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount2 - g_swtmrCount1, 0, g_swtmrCount2 - g_swtmrCount1, EXIT);
ret = LOS_TaskDelay(20); // 20, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);

6
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_014.c
View File

@ -33,11 +33,11 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_uwsTick1 = LOS_TickCountGet();
g_testCount++;
return;
}
@ -45,7 +45,7 @@ static VOID Case1(UINT32 arg)
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_uwsTick2 = LOS_TickCountGet();
g_testCount++;
return;
}

6
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_015.c
View File

@ -33,11 +33,11 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_uwsTick1 = LOS_TickCountGet();
g_testCount++;
return;
}
@ -45,7 +45,7 @@ static VOID Case1(UINT32 arg)
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_uwsTick2 = LOS_TickCountGet();
g_testCount++;
return;

6
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_016.c
View File

@ -33,11 +33,11 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_uwsTick1 = LOS_TickCountGet();
g_testCount++;
return;
}
@ -45,7 +45,7 @@ static VOID Case1(UINT32 arg)
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_uwsTick2 = LOS_TickCountGet();
g_testCount++;
return;
}

6
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_017.c
View File

@ -33,11 +33,11 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_uwsTick1 = LOS_TickCountGet();
g_testCount++;
return;
}
@ -45,7 +45,7 @@ static VOID Case1(UINT32 arg)
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_uwsTick2 = LOS_TickCountGet();
g_testCount++;
return;
}

6
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_018.c
View File

@ -33,11 +33,11 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_uwsTick1 = LOS_TickCountGet();
g_testCount++;
return;
}
@ -45,7 +45,7 @@ static VOID Case1(UINT32 arg)
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_uwsTick2 = LOS_TickCountGet();
g_testCount++;
return;
}

13
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_019.c
View File

@ -33,11 +33,13 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static UINT32 g_swtmrCount1;
static UINT32 g_swtmrCount2;
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_swtmrCount1++;
g_testCount++;
return;
}
@ -45,7 +47,7 @@ static VOID Case1(UINT32 arg)
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_swtmrCount2++;
g_testCount++;
return;
}
@ -57,6 +59,9 @@ static UINT32 Testcase(VOID)
UINT32 swtmrId2;
g_testCount = 0;
g_swtmrCount1 = 0;
g_swtmrCount2 = 0;
// 20, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(20, LOS_SWTMR_MODE_PERIOD, Case1, &swtmrId1, 0xffff, OS_SWTMR_ROUSES_ALLOW,
OS_SWTMR_ALIGN_INSENSITIVE);
@ -80,7 +85,7 @@ static UINT32 Testcase(VOID)
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
// 3, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick2 - g_uwsTick1, 0, g_uwsTick2 - g_uwsTick1, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount1 - g_swtmrCount2, 1, g_swtmrCount1 - g_swtmrCount2, EXIT);
ret = LOS_SwtmrDelete(swtmrId1);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);

13
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_020.c
View File

@ -33,11 +33,13 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static UINT32 g_swtmrCount1;
static UINT32 g_swtmrCount2;
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_swtmrCount1++;
g_testCount++;
return;
}
@ -45,7 +47,7 @@ static VOID Case1(UINT32 arg)
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_swtmrCount2++;
g_testCount++;
return;
}
@ -57,6 +59,9 @@ static UINT32 Testcase(VOID)
UINT32 swtmrId2;
g_testCount = 0;
g_swtmrCount1 = 0;
g_swtmrCount2 = 0;
// 20, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(20, LOS_SWTMR_MODE_PERIOD, Case1, &swtmrId1, 0xffff, OS_SWTMR_ROUSES_ALLOW,
OS_SWTMR_ALIGN_INSENSITIVE);
@ -79,7 +84,7 @@ static UINT32 Testcase(VOID)
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
// 2, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick2 - g_uwsTick1, 0, g_uwsTick2 - g_uwsTick1, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount1 - g_swtmrCount2, 0, g_swtmrCount1 - g_swtmrCount2, EXIT);
ret = LOS_SwtmrDelete(swtmrId1);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);

14
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_021.c
View File

@ -33,11 +33,13 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static UINT32 g_swtmrCount1;
static UINT32 g_swtmrCount2;
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_swtmrCount1++;
g_testCount++;
return;
}
@ -45,7 +47,7 @@ static VOID Case1(UINT32 arg)
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_swtmrCount2++;
g_testCount++;
return;
}
@ -57,7 +59,9 @@ static UINT32 Testcase(VOID)
UINT32 swtmrId2;
g_testCount = 0;
g_swtmrCount1 = 0;
g_swtmrCount2 = 0;
// 20, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(20, LOS_SWTMR_MODE_PERIOD, Case1, &swtmrId1, 0xffff, OS_SWTMR_ROUSES_ALLOW,
OS_SWTMR_ALIGN_INSENSITIVE);
@ -83,7 +87,7 @@ static UINT32 Testcase(VOID)
ret = LOS_TaskDelay(20); // 20, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick2 - g_uwsTick1, 0, g_uwsTick2 - g_uwsTick1, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount1 - g_swtmrCount2, 1, g_swtmrCount1 - g_swtmrCount2, EXIT);
// 3, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT);

20
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_022.c
View File

@ -33,11 +33,14 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static UINT32 g_swtmrCount1;
static UINT32 g_swtmrCount2;
static UINT32 g_swtmrCount3;
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_swtmrCount1++;
g_testCount++;
return;
}
@ -45,7 +48,7 @@ static VOID Case1(UINT32 arg)
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_swtmrCount2++;
g_testCount++;
return;
}
@ -53,7 +56,7 @@ static VOID Case2(UINT32 arg)
static VOID Case3(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick3 = g_ullTickCount;
g_swtmrCount3++;
g_testCount++;
return;
}
@ -66,6 +69,9 @@ static UINT32 Testcase(VOID)
UINT32 swtmrId3;
g_testCount = 0;
g_swtmrCount1 = 0;
g_swtmrCount2 = 0;
g_swtmrCount3 = 0;
// 4, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(4, LOS_SWTMR_MODE_PERIOD, Case1, &swtmrId1, 0xffff, OS_SWTMR_ROUSES_ALLOW,
@ -91,10 +97,10 @@ static UINT32 Testcase(VOID)
ret = LOS_SwtmrStart(swtmrId3);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ret = LOS_TaskDelay(4); // 4, set delay time.
ret = LOS_TaskDelay(5); // 5, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick2 - g_uwsTick1, 0, g_uwsTick2 - g_uwsTick1, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick3 - g_uwsTick2, 0, g_uwsTick3 - g_uwsTick2, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount2 - g_swtmrCount1, 0, g_swtmrCount2 - g_swtmrCount1, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount2 - g_swtmrCount3, 0, g_swtmrCount2 - g_swtmrCount3, EXIT);
// 3, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT);

8
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_023.c
View File

@ -33,11 +33,11 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_uwsTick1 = LOS_TickCountGet();
g_testCount++;
return;
}
@ -46,7 +46,7 @@ static VOID Case2(UINT32 arg)
{
UINT16 align;
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_uwsTick2 = LOS_TickCountGet();
align = g_uwsTick2 - g_uwsTick1;
ICUNIT_ASSERT_NOT_EQUAL_VOID(align, 0, align);
g_testCount++;
@ -57,7 +57,7 @@ static VOID Case3(UINT32 arg)
{
UINT16 align;
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick3 = g_ullTickCount;
g_uwsTick3 = LOS_TickCountGet();
printf("g_uwsTick3=%d\n", g_uwsTick3);
align = g_uwsTick3 - g_uwsTick2;
ICUNIT_ASSERT_NOT_EQUAL_VOID(align, 0, align);

18
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_024.c
View File

@ -33,11 +33,14 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static UINT32 g_swtmrCount1;
static UINT32 g_swtmrCount2;
static UINT32 g_swtmrCount3;
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_swtmrCount1++;
g_testCount++;
return;
}
@ -45,7 +48,7 @@ static VOID Case1(UINT32 arg)
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_swtmrCount2++;
g_testCount++;
return;
}
@ -53,7 +56,7 @@ static VOID Case2(UINT32 arg)
static VOID Case3(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick3 = g_ullTickCount;
g_swtmrCount3++;
g_testCount++;
return;
}
@ -66,6 +69,9 @@ static UINT32 Testcase(VOID)
UINT32 swtmrId3;
g_testCount = 0;
g_swtmrCount1 = 0;
g_swtmrCount2 = 0;
g_swtmrCount3 = 0;
// 13, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(13, LOS_SWTMR_MODE_PERIOD, Case1, &swtmrId1, 0xffff, OS_SWTMR_ROUSES_ALLOW,
@ -93,8 +99,8 @@ static UINT32 Testcase(VOID)
ret = LOS_TaskDelay(13); // 13, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick2 - g_uwsTick1, 0, g_uwsTick2 - g_uwsTick1, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick3 - g_uwsTick2, 0, g_uwsTick3 - g_uwsTick2, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount2 - g_swtmrCount1, 0, g_swtmrCount2 - g_swtmrCount1, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount3 - g_swtmrCount2, 0, g_swtmrCount3 - g_swtmrCount2, EXIT);
// 3, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT);

19
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_025.c
View File

@ -33,12 +33,14 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static UINT32 g_swtmrCount1;
static UINT32 g_swtmrCount2;
static UINT32 g_swtmrCount3;
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_swtmrCount1++;
g_testCount++;
return;
}
@ -46,7 +48,7 @@ static VOID Case1(UINT32 arg)
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_swtmrCount2++;
g_testCount++;
return;
}
@ -54,7 +56,7 @@ static VOID Case2(UINT32 arg)
static VOID Case3(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick3 = g_ullTickCount;
g_swtmrCount3++;
g_testCount++;
return;
}
@ -67,6 +69,9 @@ static UINT32 Testcase(VOID)
UINT32 swtmrId3;
g_testCount = 0;
g_swtmrCount1 = 0;
g_swtmrCount2 = 0;
g_swtmrCount3 = 0;
// 15, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(15, LOS_SWTMR_MODE_PERIOD, Case1, &swtmrId1, 0xffff, OS_SWTMR_ROUSES_ALLOW,
@ -100,8 +105,8 @@ static UINT32 Testcase(VOID)
ret = LOS_TaskDelay(5); // 5, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick2 - g_uwsTick1, 0, g_uwsTick2 - g_uwsTick1, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick3 - g_uwsTick2, 0, g_uwsTick3 - g_uwsTick2, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount2 - g_swtmrCount1, 0, g_swtmrCount2 - g_swtmrCount1, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount3 - g_swtmrCount2, 0, g_swtmrCount3 - g_swtmrCount2, EXIT);
// 3, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT);

19
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_026.c
View File

@ -33,12 +33,14 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static UINT32 g_swtmrCount1;
static UINT32 g_swtmrCount2;
static UINT32 g_swtmrCount3;
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_swtmrCount1++;
g_testCount++;
return;
}
@ -46,7 +48,7 @@ static VOID Case1(UINT32 arg)
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_swtmrCount2++;
g_testCount++;
return;
}
@ -54,7 +56,7 @@ static VOID Case2(UINT32 arg)
static VOID Case3(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick3 = g_ullTickCount;
g_swtmrCount3++;
g_testCount++;
return;
}
@ -67,6 +69,9 @@ static UINT32 Testcase(VOID)
UINT32 swtmrId3;
g_testCount = 0;
g_swtmrCount1 = 0;
g_swtmrCount2 = 0;
g_swtmrCount3 = 0;
// 20, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(20, LOS_SWTMR_MODE_PERIOD, Case1, &swtmrId1, 0xffff, OS_SWTMR_ROUSES_ALLOW,
@ -94,8 +99,8 @@ static UINT32 Testcase(VOID)
ret = LOS_TaskDelay(20); // 20, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick2 - g_uwsTick1, 0, g_uwsTick2 - g_uwsTick1, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick3 - g_uwsTick2, 0, g_uwsTick3 - g_uwsTick2, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount2 - g_swtmrCount1, 0, g_swtmrCount2 - g_swtmrCount1, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount3 - g_swtmrCount2, 0, g_swtmrCount3 - g_swtmrCount2, EXIT);
// 3, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT);

18
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_027.c
View File

@ -33,11 +33,14 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static UINT32 g_swtmrCount1;
static UINT32 g_swtmrCount2;
static UINT32 g_swtmrCount3;
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_swtmrCount1++;
g_testCount++;
return;
}
@ -45,7 +48,7 @@ static VOID Case1(UINT32 arg)
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_swtmrCount2++;
g_testCount++;
return;
}
@ -53,7 +56,7 @@ static VOID Case2(UINT32 arg)
static VOID Case3(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick3 = g_ullTickCount;
g_swtmrCount3++;
g_testCount++;
return;
}
@ -66,6 +69,9 @@ static UINT32 Testcase(VOID)
UINT32 swtmrId3;
g_testCount = 0;
g_swtmrCount1 = 0;
g_swtmrCount2 = 0;
g_swtmrCount3 = 0;
// 20, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(20, LOS_SWTMR_MODE_PERIOD, Case1, &swtmrId1, 0xffff, OS_SWTMR_ROUSES_ALLOW,
@ -99,8 +105,8 @@ static UINT32 Testcase(VOID)
ret = LOS_TaskDelay(10); // 10, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick2 - g_uwsTick1, 0, g_uwsTick2 - g_uwsTick1, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick3 - g_uwsTick2, 0, g_uwsTick3 - g_uwsTick2, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount2 - g_swtmrCount1, 0, g_swtmrCount2 - g_swtmrCount1, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount3 - g_swtmrCount2, 0, g_swtmrCount3 - g_swtmrCount2, EXIT);
// 3, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT);

16
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_028.c
View File

@ -33,11 +33,11 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_uwsTick1 = LOS_TickCountGet();
g_testCount++;
return;
}
@ -46,7 +46,7 @@ static VOID Case2(UINT32 arg)
{
UINT16 align;
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_uwsTick2 = LOS_TickCountGet();
align = g_uwsTick2 - g_uwsTick1;
ICUNIT_ASSERT_NOT_EQUAL_VOID(align, 0, align);
g_testCount++;
@ -57,7 +57,7 @@ static VOID Case3(UINT32 arg)
{
UINT16 align;
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick3 = g_ullTickCount;
g_uwsTick3 = LOS_TickCountGet();
align = g_uwsTick3 - g_uwsTick2;
ICUNIT_ASSERT_NOT_EQUAL_VOID(align, 0, align);
g_testCount++;
@ -78,13 +78,13 @@ static UINT32 Testcase(VOID)
OS_SWTMR_ALIGN_INSENSITIVE);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
// 8, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(8, LOS_SWTMR_MODE_PERIOD, Case2, &swtmrId2, 0xffff, OS_SWTMR_ROUSES_ALLOW,
// 9, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(9, LOS_SWTMR_MODE_PERIOD, Case2, &swtmrId2, 0xffff, OS_SWTMR_ROUSES_ALLOW,
OS_SWTMR_ALIGN_INSENSITIVE);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
// 9, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(9, LOS_SWTMR_MODE_PERIOD, Case3, &swtmrId3, 0xffff, OS_SWTMR_ROUSES_ALLOW,
// 11, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(11, LOS_SWTMR_MODE_PERIOD, Case3, &swtmrId3, 0xffff, OS_SWTMR_ROUSES_ALLOW,
OS_SWTMR_ALIGN_INSENSITIVE);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);

8
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_029.c
View File

@ -33,11 +33,11 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_uwsTick1 = LOS_TickCountGet();
g_testCount++;
return;
}
@ -46,7 +46,7 @@ static VOID Case2(UINT32 arg)
{
UINT16 align;
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_uwsTick2 = LOS_TickCountGet();
align = g_uwsTick2 - g_uwsTick1;
ICUNIT_ASSERT_NOT_EQUAL_VOID(align, 0, align);
g_testCount++;
@ -57,7 +57,7 @@ static VOID Case3(UINT32 arg)
{
UINT16 align;
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick3 = g_ullTickCount;
g_uwsTick3 = LOS_TickCountGet();
align = g_uwsTick3 - g_uwsTick2;
ICUNIT_ASSERT_NOT_EQUAL_VOID(align, 0, align);
g_testCount++;

18
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_030.c
View File

@ -33,11 +33,14 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static UINT32 g_swtmrCount1;
static UINT32 g_swtmrCount2;
static UINT32 g_swtmrCount3;
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_swtmrCount1++;
g_testCount++;
return;
}
@ -45,7 +48,7 @@ static VOID Case1(UINT32 arg)
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_swtmrCount2++;
g_testCount++;
return;
}
@ -53,7 +56,7 @@ static VOID Case2(UINT32 arg)
static VOID Case3(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick3 = g_ullTickCount;
g_swtmrCount3++;
g_testCount++;
return;
}
@ -66,6 +69,9 @@ static UINT32 Testcase(VOID)
UINT32 swtmrId3;
g_testCount = 0;
g_swtmrCount1 = 0;
g_swtmrCount2 = 0;
g_swtmrCount3 = 0;
// 20, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(20, LOS_SWTMR_MODE_PERIOD, Case1, &swtmrId1, 0xffff, OS_SWTMR_ROUSES_ALLOW,
@ -93,8 +99,8 @@ static UINT32 Testcase(VOID)
ret = LOS_TaskDelay(20); // 20, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick2 - g_uwsTick1, 0, g_uwsTick2 - g_uwsTick1, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick3 - g_uwsTick2, 0, g_uwsTick3 - g_uwsTick2, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount2 - g_swtmrCount1, 0, g_swtmrCount2 - g_swtmrCount1, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount3 - g_swtmrCount2, 0, g_swtmrCount3 - g_swtmrCount2, EXIT);
// 3, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT);

18
testsuits/sample/kernel/swtmr/It_los_swtmr_Align_031.c
View File

@ -33,11 +33,14 @@
#include "It_los_swtmr.h"
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES)
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
static UINT32 g_swtmrCount1;
static UINT32 g_swtmrCount2;
static UINT32 g_swtmrCount3;
static VOID Case1(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick1 = g_ullTickCount;
g_swtmrCount1++;
g_testCount++;
return;
}
@ -45,7 +48,7 @@ static VOID Case1(UINT32 arg)
static VOID Case2(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick2 = g_ullTickCount;
g_swtmrCount2++;
g_testCount++;
return;
}
@ -53,7 +56,7 @@ static VOID Case2(UINT32 arg)
static VOID Case3(UINT32 arg)
{
ICUNIT_ASSERT_EQUAL_VOID(arg, 0xffff, arg);
g_uwsTick3 = g_ullTickCount;
g_swtmrCount3++;
g_testCount++;
return;
}
@ -66,6 +69,9 @@ static UINT32 Testcase(VOID)
UINT32 swtmrId3;
g_testCount = 0;
g_swtmrCount1 = 0;
g_swtmrCount2 = 0;
g_swtmrCount3 = 0;
// 20, Timeout interval of a periodic software timer.
ret = LOS_SwtmrCreate(20, LOS_SWTMR_MODE_PERIOD, Case1, &swtmrId1, 0xffff, OS_SWTMR_ROUSES_ALLOW,
@ -99,8 +105,8 @@ static UINT32 Testcase(VOID)
ret = LOS_TaskDelay(10); // 10, set delay time.
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick2 - g_uwsTick1, 0, g_uwsTick2 - g_uwsTick1, EXIT);
ICUNIT_GOTO_EQUAL(g_uwsTick3 - g_uwsTick2, 0, g_uwsTick3 - g_uwsTick2, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount2 - g_swtmrCount2, 0, g_swtmrCount2 - g_swtmrCount1, EXIT);
ICUNIT_GOTO_EQUAL(g_swtmrCount3 - g_swtmrCount2, 0, g_swtmrCount3 - g_swtmrCount2, EXIT);
// 3, Here, assert that g_testCount is equal to this .
ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT);

2
testsuits/sample/kernel/task/It_los_task_026.c
View File

@ -38,7 +38,7 @@ static UINT32 TestCase(VOID)
UINT32 ret;
ret = LOS_TaskDelay(0);
ICUNIT_ASSERT_EQUAL(ret, LOS_ERRNO_TSK_YIELD_NOT_ENOUGH_TASK, ret);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
return LOS_OK;
}

2
testsuits/sample/kernel/task/It_los_task_076.c
View File

@ -49,7 +49,7 @@ static VOID TaskF01(VOID)
g_testCount++;
ret = LOS_TaskDelay(0);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_ERRNO_TSK_YIELD_NOT_ENOUGH_TASK, ret);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT);

8
testsuits/sample/kernel/task/It_los_task_081.c
View File

@ -41,9 +41,9 @@ static VOID TaskF01(VOID)
ICUNIT_GOTO_EQUAL(g_testCount, 0, g_testCount, EXIT);
g_testCount++;
tick1 = g_ullTickCount;
tick1 = LOS_TickCountGet();
LOS_TaskDelay(10); // 10, set delay time
tick2 = g_ullTickCount;
tick2 = LOS_TickCountGet();
ICUNIT_GOTO_EQUAL((tick2 - tick1), 10, (tick2 - tick1), EXIT); // 10, Here, assert that result is equal to 10.
@ -69,9 +69,9 @@ static VOID TaskF02(VOID)
ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT); // 3, Here, assert that g_testCount is equal to 3.
g_testCount++;
tick1 = g_ullTickCount;
tick1 = LOS_TickCountGet();
ret = LOS_SemPend(semHandle, 10); // 10, suspend with wait time.
tick2 = g_ullTickCount;
tick2 = LOS_TickCountGet();
ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_SEM_TIMEOUT, ret, EXIT);
ICUNIT_GOTO_EQUAL((tick2 - tick1), 10, (tick2 - tick1), EXIT); // 10, Here, assert that result is equal to 10.

2
testsuits/sample/kernel/task/It_los_task_089.c
View File

@ -37,7 +37,7 @@ static UINT32 TestCase(VOID)
{
UINT32 ret;
ret = LOS_TaskYield();
ICUNIT_ASSERT_EQUAL(ret, LOS_ERRNO_TSK_YIELD_NOT_ENOUGH_TASK, ret);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
return LOS_OK;
}

4
testsuits/sample/kernel/task/It_los_task_112.c
View File

@ -44,7 +44,7 @@ static VOID TaskF02(VOID)
g_testCount++;
// 2, Assert this result is consistent with the priority that has been set.
ret = LOS_TaskPriSet(g_testTaskID02, TASK_PRIO_TEST - 2);
ret = LOS_TaskPriSet(g_testTaskID02, TASK_PRIO_TEST - 1);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); // 2, Here, assert that g_testCount is equal to 2.
@ -72,7 +72,7 @@ static VOID TaskF01(VOID)
ret = LOS_TaskPriGet(g_testTaskID02);
// 2, Assert this result is consistent with the priority that has been set.
ICUNIT_GOTO_EQUAL(ret, TASK_PRIO_TEST - 2, ret, EXIT);
ICUNIT_GOTO_EQUAL(ret, TASK_PRIO_TEST - 1, ret, EXIT);
ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT);
g_testCount++;

4
testsuits/sample/kernel/task/It_los_task_115.c
View File

@ -44,7 +44,7 @@ static VOID TaskF02(VOID)
LOS_TaskLock();
// 2, modify task priority, base on testsuite task`s priority.
ret = LOS_CurTaskPriSet(TASK_PRIO_TEST - 2);
ret = LOS_CurTaskPriSet(TASK_PRIO_TEST - 1);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT);
@ -77,7 +77,7 @@ static VOID TaskF01(VOID)
ret = LOS_TaskPriGet(g_testTaskID02);
// 2, Assert this result is consistent with the priority that has been set.
ICUNIT_GOTO_EQUAL(ret, TASK_PRIO_TEST - 2, ret, EXIT);
ICUNIT_GOTO_EQUAL(ret, TASK_PRIO_TEST - 1, ret, EXIT);
ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); // 2, Here, assert that g_testCount is equal to 2.
g_testCount++;