From 1ffbf079c66a3d91a61fc72d66d1818692420fcf Mon Sep 17 00:00:00 2001 From: wangyongzhong2 Date: Mon, 19 Feb 2024 15:21:11 +0800 Subject: [PATCH] tdd test refine Signed-off-by: wangyongzhong2 --- test/unittest/datatransmitmgr/BUILD.gn | 2 +- test/unittest/datatransmitmgr/DevSLMgrTest.cpp | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/test/unittest/datatransmitmgr/BUILD.gn b/test/unittest/datatransmitmgr/BUILD.gn index d5246da..24f9fb8 100644 --- a/test/unittest/datatransmitmgr/BUILD.gn +++ b/test/unittest/datatransmitmgr/BUILD.gn @@ -57,7 +57,7 @@ ohos_unittest("DevSLMgrTest") { external_deps = [ "c_utils:utils", "device_security_level:dslm_sdk", - "dsoftbus:softbus_client", "hilog:libhilog", + "init:libbegetutil", ] } diff --git a/test/unittest/datatransmitmgr/DevSLMgrTest.cpp b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp index 2e5fd64..27ae554 100644 --- a/test/unittest/datatransmitmgr/DevSLMgrTest.cpp +++ b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp @@ -20,7 +20,7 @@ #include "gtest/gtest.h" #include "file_ex.h" #include "securec.h" -#include "softbus_bus_center.h" +#include "parameter.h" #include "dev_slinfo_adpt.h" #include "DevSLMgrTest.h" #include "DevslinfoListTest.h" @@ -123,14 +123,13 @@ static void DATASL_GetUdidByExceptZero(DEVSLQueryParams *queryParams) static int32_t GetLocalUdid(DEVSLQueryParams *queryParams) { - const char *pkgName = "ohos.dslm"; - NodeBasicInfo info; - int32_t ret = GetLocalNodeDeviceInfo(pkgName, &info); - if (GetNodeKeyInfo(pkgName, info.networkId, NODE_KEY_UDID, (uint8_t *)(queryParams->udid), UDID_BUF_LEN) != 0) { - return ret; - } + char udid[65] = {0}; + int32_t ret = GetDevUdid(udid, MAX_UDID_LENGTH + 1); + EXPECT_EQ(DEVSL_SUCCESS, ret); + + (void)memcpy_s(queryParams->udid, MAX_UDID_LENGTH, udid, MAX_UDID_LENGTH); queryParams->udidLen = MAX_UDID_LENGTH; - return DEVSL_SUCCESS; + return ret; } static HWTEST_F(DevSLMgrTest, TestOnstart, TestSize.Level1) -- Gitee