diff --git a/distributed_schedule_lite/samgr_hal/src/feature_func_test.c b/distributed_schedule_lite/samgr_hal/src/feature_func_test.c index 42bbc79c3e138959c3a0b9d4a2e872c283aa6e7b..d8c274cb873e3bfc3878bfaee6d00d75175bd4f7 100755 --- a/distributed_schedule_lite/samgr_hal/src/feature_func_test.c +++ b/distributed_schedule_lite/samgr_hal/src/feature_func_test.c @@ -14,7 +14,7 @@ */ #include -#include +#include "cmsis_os.h" #include "hctest.h" #include "samgr_lite.h" diff --git a/distributed_schedule_lite/samgr_hal/src/featureapi_func_test.c b/distributed_schedule_lite/samgr_hal/src/featureapi_func_test.c index 1cb1ac55c2691fc6372ac32745177387eacb6c29..c3dc9fc909c834c905c548e76c73ad5772071fa3 100755 --- a/distributed_schedule_lite/samgr_hal/src/featureapi_func_test.c +++ b/distributed_schedule_lite/samgr_hal/src/featureapi_func_test.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include +#include "cmsis_os.h" #include "hctest.h" #include "samgr_lite.h" diff --git a/distributed_schedule_lite/samgr_hal/src/iunknown_func_test.c b/distributed_schedule_lite/samgr_hal/src/iunknown_func_test.c index 891abb960497960178056d52d1cba10cd11ed85a..5bbd4b7ad1b4533ac75759e0d4cd6ea296498e82 100755 --- a/distributed_schedule_lite/samgr_hal/src/iunknown_func_test.c +++ b/distributed_schedule_lite/samgr_hal/src/iunknown_func_test.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include +#include "cmsis_os.h" #include #include "hctest.h" #include "samgr_lite.h" diff --git a/distributed_schedule_lite/samgr_hal/src/sendrequest_func_test.c b/distributed_schedule_lite/samgr_hal/src/sendrequest_func_test.c index 1e0ffd050de4110a840bd11a174a256d2fc390bf..85dc2b73452b1097087b3f5d13d9fa33ff790203 100755 --- a/distributed_schedule_lite/samgr_hal/src/sendrequest_func_test.c +++ b/distributed_schedule_lite/samgr_hal/src/sendrequest_func_test.c @@ -15,7 +15,7 @@ #include #include -#include +#include "cmsis_os.h" #include "securec.h" #include "hctest.h" #include "samgr_lite.h" @@ -396,7 +396,7 @@ LITE_TEST_SUIT(test, samgr, SendRequestTestSuite); static BOOL SendRequestTestSuiteSetUp(void) { - LOS_Msleep(OPER_INTERVAL); + osDelay(OPER_INTERVAL); return TRUE; } @@ -463,7 +463,7 @@ LITE_TEST_CASE(SendRequestTestSuite, testSendRequest0010, Function | MediumTest int32 result = demoApi->SAMGR_SendRequestProxy(&feature->identity, &request, NULL); TEST_ASSERT_EQUAL_INT(result == 0, TRUE); - LOS_Msleep(OPER_INTERVAL); + osDelay(OPER_INTERVAL); TEST_ASSERT_EQUAL_INT(feature->featureCalledCount == 1, TRUE); TEST_ASSERT_EQUAL_INT(strcmp(feature->latestRequest, body), 0); @@ -500,7 +500,7 @@ LITE_TEST_CASE(SendRequestTestSuite, testSendRequest0020, Function | MediumTest int32 result = demoApi->SAMGR_SendRequestProxy(&feature->identity, &request, NULL); TEST_ASSERT_EQUAL_INT(result == 0, TRUE); - LOS_Msleep(OPER_INTERVAL); + osDelay(OPER_INTERVAL); TEST_ASSERT_EQUAL_INT(feature->featureCalledCount == 1, TRUE); TEST_ASSERT_EQUAL_INT(strcmp(feature->latestRequest, body), 0); @@ -558,7 +558,7 @@ LITE_TEST_CASE(SendRequestTestSuite, testSendRequest0040, Function | MediumTest int32 result = demoApi->SAMGR_SendRequestProxy(&feature->identity, &request, NULL); TEST_ASSERT_EQUAL_INT(result == 0, TRUE); - LOS_Msleep(OPER_INTERVAL); + osDelay(OPER_INTERVAL); TEST_ASSERT_EQUAL_INT(feature->featureCalledCount == 1, TRUE); ReleaseIUnknown(demoApi); diff --git a/distributed_schedule_lite/samgr_hal/src/sendresponse_func_test.c b/distributed_schedule_lite/samgr_hal/src/sendresponse_func_test.c index b0bec0ff717a04958c0d4adcc3910d7cad594eca..34c6eb92ce5014aadbd0899e0a7eb3c2a614c6f1 100755 --- a/distributed_schedule_lite/samgr_hal/src/sendresponse_func_test.c +++ b/distributed_schedule_lite/samgr_hal/src/sendresponse_func_test.c @@ -15,7 +15,7 @@ #include #include -#include +#include "cmsis_os.h" #include "securec.h" #include "hctest.h" #include "samgr_lite.h" @@ -338,7 +338,7 @@ LITE_TEST_SUIT(test, samgr, SendResponseTestSuite); static BOOL SendResponseTestSuiteSetUp(void) { - LOS_Msleep(OPER_INTERVAL); + osDelay(OPER_INTERVAL); return TRUE; } @@ -374,7 +374,7 @@ LITE_TEST_CASE(SendResponseTestSuite, testSendResponse0010, Function | MediumTes DemoFeature *feature = GET_OBJECT(iUnknown, DemoFeature, iUnknown); demoApi->SAMGR_SendRequestProxy(&feature->identity, &request, DemoHandlerAndCheck); - LOS_Msleep(OPER_INTERVAL); + osDelay(OPER_INTERVAL); TEST_ASSERT_EQUAL_INT(feature->featureStatus == TRUE, TRUE); ReleaseIUnknown(demoApi); } @@ -406,7 +406,7 @@ LITE_TEST_CASE(SendResponseTestSuite, testSendResponse0020, Function | MediumTes DemoFeature *feature = GET_OBJECT(iUnknown, DemoFeature, iUnknown); demoApi->SAMGR_SendRequestProxy(&feature->identity, &request, NULL); - LOS_Msleep(OPER_INTERVAL); + osDelay(OPER_INTERVAL); TEST_ASSERT_EQUAL_INT(feature->featureStatus == FALSE, TRUE); ReleaseIUnknown(demoApi); } @@ -438,7 +438,7 @@ LITE_TEST_CASE(SendResponseTestSuite, testSendResponse0030, Function | MediumTes DemoFeature *feature = GET_OBJECT(iUnknown, DemoFeature, iUnknown); demoApi->SAMGR_SendRequestProxy(&feature->identity, &request, DemoHandler); - LOS_Msleep(OPER_INTERVAL); + osDelay(OPER_INTERVAL); TEST_ASSERT_EQUAL_INT(feature->featureStatus == TRUE, TRUE); ReleaseIUnknown(demoApi); } @@ -471,7 +471,7 @@ LITE_TEST_CASE(SendResponseTestSuite, testSendResponseByIdentity0010, Function | feature->featureStatus = FALSE; demoApi->SAMGR_SendRequestProxy(&feature->identity, &request, DemoHandlerAndCheck); - LOS_Msleep(OPER_INTERVAL); + osDelay(OPER_INTERVAL); TEST_ASSERT_EQUAL_INT(feature->featureStatus == TRUE, TRUE); ReleaseIUnknown(demoApi); @@ -504,7 +504,7 @@ LITE_TEST_CASE(SendResponseTestSuite, testSendResponseByIdentity0020, Function | DemoFeature *feature = GET_OBJECT(iUnknown, DemoFeature, iUnknown); demoApi->SAMGR_SendRequestProxy(&feature->identity, &request, NULL); - LOS_Msleep(OPER_INTERVAL); + osDelay(OPER_INTERVAL); TEST_ASSERT_EQUAL_INT(feature->featureStatus == FALSE, TRUE); ReleaseIUnknown(demoApi);