From 66756fd39fb33be4d6e3158a82b22dc9db0c952e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=B0=B8=E5=BF=A0?= Date: Tue, 28 Nov 2023 14:05:49 +0000 Subject: [PATCH 1/2] modify tdd test crash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王永忠 --- test/unittest/datatransmitmgr/DevSLMgrTest.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unittest/datatransmitmgr/DevSLMgrTest.cpp b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp index 2e5fd64..21c4b03 100644 --- a/test/unittest/datatransmitmgr/DevSLMgrTest.cpp +++ b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp @@ -261,6 +261,7 @@ static void tmpCallbackLocal(DEVSLQueryParams *queryParams, int32_t result, uint { g_cnt++; EXPECT_EQ(DEVSL_SUCCESS, result); + g_cv.notify_one(); } static HWTEST_F(DevSLMgrTest, TestGetHighestSecLevelAsync004, TestSize.Level1) -- Gitee From 80d82e01431cc624ec1228c8306fa185ed5203bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=B0=B8=E5=BF=A0?= Date: Fri, 1 Dec 2023 06:58:14 +0000 Subject: [PATCH 2/2] modify tdd test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王永忠 --- .../unittest/datatransmitmgr/DevSLMgrTest.cpp | 31 ------------------- 1 file changed, 31 deletions(-) diff --git a/test/unittest/datatransmitmgr/DevSLMgrTest.cpp b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp index 21c4b03..4239512 100644 --- a/test/unittest/datatransmitmgr/DevSLMgrTest.cpp +++ b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp @@ -253,37 +253,6 @@ static HWTEST_F(DevSLMgrTest, TestGetHighestSecLevelAsync003, TestSize.Level1) DATASL_OnStop(); } -static int32_t g_cnt = 0; -static std::mutex g_mtx; -static std::condition_variable g_cv; - -static void tmpCallbackLocal(DEVSLQueryParams *queryParams, int32_t result, uint32_t levelInfo) -{ - g_cnt++; - EXPECT_EQ(DEVSL_SUCCESS, result); - g_cv.notify_one(); -} - -static HWTEST_F(DevSLMgrTest, TestGetHighestSecLevelAsync004, TestSize.Level1) -{ - int32_t ret; - DEVSLQueryParams queryParams; - (void)memset_s(&queryParams, sizeof(queryParams), 0, sizeof(queryParams)); - ret = GetLocalUdid(&queryParams); - EXPECT_EQ(DEVSL_SUCCESS, ret); - - ret = DATASL_OnStart(); - EXPECT_EQ(DEVSL_SUCCESS, ret); - ret = DATASL_GetHighestSecLevelAsync(&queryParams, &tmpCallbackLocal); - EXPECT_EQ(DEVSL_SUCCESS, ret); - - std::unique_lock lck(g_mtx); - g_cv.wait_for(lck, std::chrono::milliseconds(2000), []() { return (g_cnt == 1); }); - EXPECT_EQ(g_cnt, 1); - - DATASL_OnStop(); -} - static HWTEST_F(DevSLMgrTest, TestGetHighestSecLevelExcept001, TestSize.Level1) { OnApiDeviceSecInfoCallback(nullptr, nullptr); -- Gitee