From 17f2b65285466a19a994e22eb24bec01c7975111 Mon Sep 17 00:00:00 2001 From: BrainL Date: Fri, 16 May 2025 14:10:33 +0800 Subject: [PATCH 1/6] addUT_0516 Signed-off-by: BrainL --- .vscode/settings.json | 59 ++++ .../UTTest_discovery_manager.cpp | 286 ++++++++++++++++++ .../UTTest_softbus_connector.cpp | 172 ++++++++++- test/unittest/UTTest_dm_comm_tool.cpp | 215 +++++++++++++ 4 files changed, 730 insertions(+), 2 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..dcf05ceb4 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,59 @@ +{ + "files.associations": { + "array": "cpp", + "atomic": "cpp", + "cctype": "cpp", + "chrono": "cpp", + "cinttypes": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "condition_variable": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "deque": "cpp", + "list": "cpp", + "unordered_map": "cpp", + "unordered_set": "cpp", + "vector": "cpp", + "exception": "cpp", + "algorithm": "cpp", + "functional": "cpp", + "iterator": "cpp", + "map": "cpp", + "memory": "cpp", + "memory_resource": "cpp", + "numeric": "cpp", + "optional": "cpp", + "random": "cpp", + "ratio": "cpp", + "set": "cpp", + "string": "cpp", + "string_view": "cpp", + "system_error": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "utility": "cpp", + "fstream": "cpp", + "initializer_list": "cpp", + "iomanip": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "mutex": "cpp", + "new": "cpp", + "ostream": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "streambuf": "cpp", + "thread": "cpp", + "typeinfo": "cpp" + } +} \ No newline at end of file diff --git a/test/commonunittest/UTTest_discovery_manager.cpp b/test/commonunittest/UTTest_discovery_manager.cpp index d73b1f55f..57e34b2fd 100644 --- a/test/commonunittest/UTTest_discovery_manager.cpp +++ b/test/commonunittest/UTTest_discovery_manager.cpp @@ -358,6 +358,292 @@ HWTEST_F(DiscoveryManagerTest, CloseCommonDependencyObj_002, testing::ext::TestS bool ret = manager->CloseCommonDependencyObj(); EXPECT_EQ(ret, true); } + +HWTEST_F(DiscoveryManagerTest, OnDeviceFound_003, testing::ext::TestSize.Level0) +{ + std::string pkgName = "pkgName"; + uint32_t capabilityType = 1; + DmDeviceInfo info; + DeviceFilterPara filterPara; + manager->OnDeviceFound(pkgName, capabilityType, info, filterPara); + EXPECT_EQ(manager->discoveryContextMap_.empty(), false); + + DiscoveryContext context; + manager->discoveryContextMap_.emplace(pkgName, context); + + manager->OnDeviceFound(pkgName, capabilityType, info, filterPara); + EXPECT_EQ(manager->discoveryContextMap_.empty(), false); + manager->discoveryContextMap_.erase(pkgName); +} + +HWTEST_F(DiscoveryManagerTest, CompareCapability_001, testing::ext::TestSize.Level0) +{ + uint32_t capabilityType = 1; + std::string capabilityStr = "capabilityStr"; + auto ret = manager->CompareCapability(capabilityType, capabilityStr); + EXPECT_EQ(ret, false); + + capabilityStr = "hicall"; + ret = manager->CompareCapability(capabilityType, capabilityStr); + EXPECT_EQ(ret, true); +} + +HWTEST_F(DiscoveryManagerTest, UpdateInfoFreq_001, testing::ext::TestSize.Level0) +{ + std::map discoverParam; + discoverParam.emplace(PARAM_KEY_DISC_FREQ, "8"); + DmSubscribeInfo dmSubInfo; + dmSubInfo.freq = DM_MID; + manager->UpdateInfoFreq(discoverParam, dmSubInfo); + EXPECT_EQ(dmSubInfo.freq, DM_MID); + + discoverParam[PARAM_KEY_DISC_FREQ] = "3"; + manager->UpdateInfoFreq(discoverParam, dmSubInfo); + EXPECT_EQ(dmSubInfo.freq, DM_SUPER_HIGH); +} + +HWTEST_F(DiscoveryManagerTest, UpdateInfoMedium_001, testing::ext::TestSize.Level0) +{ + std::map discoverParam; + discoverParam.emplace(PARAM_KEY_DISC_MEDIUM, "8"); + DmSubscribeInfo dmSubInfo; + + manager->UpdateInfoMedium(discoverParam, dmSubInfo); + EXPECT_EQ(dmSubInfo.medium, 8); +} + +HWTEST_F(DiscoveryManagerTest, ClearDiscoveryCache_001, testing::ext::TestSize.Level0) +{ + ProcessInfo processInfo; + processInfo.pkgName = "pkgName"; + processInfo.userId = 1; + + + EXPECT_NO_THROW(manager->ClearDiscoveryCache(processInfo)); +} + +HWTEST_F(DiscoveryManagerTest, ClearDiscoveryPkgName_001, testing::ext::TestSize.Level0) +{ + std::string pkgName = "pkgName"; + // initialization + std::set subscribeIdSet; + DiscoveryContext context; + context.subscribeId = 1; + auto &pkgNameSet = manager->pkgNameSet_; + auto &discoveryContextMap = manager->discoveryContextMap_; + auto &capabilityMap = manager->capabilityMap_; + + + pkgNameSet.emplace("1"); + discoveryContextMap.emplace(pkgName, context); + capabilityMap.emplace(pkgName, "123"); + // Simulate real value + subscribeIdSet.insert(discoveryContextMap[pkgName].subscribeId); + + + auto ret = manager->ClearDiscoveryPkgName(pkgName); + + + EXPECT_EQ(ret, subscribeIdSet); + EXPECT_EQ(pkgNameSet.find(pkgName), pkgNameSet.end()); + EXPECT_EQ(capabilityMap.find(pkgName), capabilityMap.end()); + +} + + + +// new +// HWTEST_F(DiscoveryManagerTest, EnableDiscoveryListener_004, testing::ext::TestSize.Level0) +// { +// std::string pkgName = "123"; +// std::map discoverParam; +// std::map filterOptions; +// discoverParam.emplace(PARAM_KEY_SUBSCRIBE_ID, "123"); +// discoverParam.emplace(PARAM_KEY_META_TYPE, "ohos.test"); +// discoverParam.emplace(PARAM_KEY_SUBSCRIBE_ID, "ohos.test"); +// int32_t ret = manager->EnableDiscoveryListener(pkgName, discoverParam, filterOptions); +// EXPECT_EQ(ret, DM_OK); +// // todo: dont know return-value +// // discoverParam.emplace(PARAM_KEY_DISC_CAPABILITY, "123"); +// // ret = manager->EnableDiscoveryListener(pkgName, discoverParam, filterOptions); +// // EXPECT_EQ(ret, DM_OK); + +// } + +HWTEST_F(DiscoveryManagerTest, DisableDiscoveryListener_004, testing::ext::TestSize.Level0) +{ + std::string pkgName; + std::map extraParam; + extraParam.emplace(PARAM_KEY_SUBSCRIBE_ID, "123"); + int32_t ret = manager->DisableDiscoveryListener(pkgName, extraParam); + EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); + +} + +HWTEST_F(DiscoveryManagerTest, ConfigDiscParam_001, testing::ext::TestSize.Level0) +{ + std::map discoverParam; + DmSubscribeInfo *dmSubInfo; + dmSubInfo = nullptr; + + EXPECT_NO_THROW(manager->ConfigDiscParam(discoverParam, dmSubInfo);); + + dmSubInfo = new DmSubscribeInfo(); + discoverParam.emplace(PARAM_KEY_DISC_FREQ, "1"); + discoverParam.emplace(PARAM_KEY_DISC_MODE, "170"); + manager->ConfigDiscParam(discoverParam, dmSubInfo); + EXPECT_EQ(dmSubInfo->freq , DM_MID); + EXPECT_EQ(dmSubInfo->mode , DM_DISCOVER_MODE_ACTIVE); + + + delete dmSubInfo; + dmSubInfo = nullptr; +} + + +HWTEST_F(DiscoveryManagerTest, StartDiscoveringNoMetaType_005, testing::ext::TestSize.Level0) +{ + std::string pkgName = "pkgNameTest05"; + DmSubscribeInfo dmSubInfo; + std::map param; + + param.emplace("DISC_CAPABILITY", "1"); + int32_t ret = manager->StartDiscoveringNoMetaType(pkgName, dmSubInfo, param); + EXPECT_NE(ret, DM_OK); +} + +HWTEST_F(DiscoveryManagerTest, StartDiscovering4MetaType_005, testing::ext::TestSize.Level0) +{ + DmSubscribeInfo dmSubInfo; + std::string pkgName = "pkgNameTest05"; + std::map param; + param.emplace("CUSTOM_DATA", "1"); + param.emplace("META_TYPE", "5"); + int32_t ret = manager->StartDiscovering4MetaType(pkgName, dmSubInfo, param); + EXPECT_NE(ret, DM_OK); +} + +HWTEST_F(DiscoveryManagerTest, StopDiscoveringByInnerSubId_001, testing::ext::TestSize.Level0) +{ + std::string pkgName = ""; + uint16_t subscribeId = 0; + int32_t ret = manager->StopDiscoveringByInnerSubId(pkgName, subscribeId); + EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); +} + +HWTEST_F(DiscoveryManagerTest, OnDeviceFound_004, testing::ext::TestSize.Level0) +{ + std::string pkgName; + DmDeviceInfo info; + bool isOnline = false; + + info.extraData = R"({"identicalCredType":1,"DISC_CAPABILITY":1,"pointTopointCredType":256,"lnnCredType":3})"; + + manager->OnDeviceFound(pkgName, info,isOnline); + + EXPECT_EQ(manager->discoveryContextMap_.empty(), false); +} + +HWTEST_F(DiscoveryManagerTest, OnDiscoveringResult_004, testing::ext::TestSize.Level0) +{ + std::string pkgName = "pkgName"; + int32_t subscribeId = 1; + int32_t result = 1; + manager->listener_ = std::make_shared(); + manager->OnDiscoveringResult(pkgName, subscribeId, result); + EXPECT_NE(manager->discoveryContextMap_.empty(), true); +} + +HWTEST_F(DiscoveryManagerTest, StartDiscoveryTimer_004, testing::ext::TestSize.Level0) +{ + std::string pkgName = "pkgName"; + + manager->listener_ = std::make_shared(); + manager->StartDiscoveryTimer(pkgName); + + EXPECT_NE(manager->timer_, nullptr); +} + +HWTEST_F(DiscoveryManagerTest, CloseCommonDependencyObj_003, testing::ext::TestSize.Level0) +{ + manager->isSoLoaded_ = true; + + manager->dpConnector_ = nullptr; + manager->dpConnectorHandle_ = nullptr; + + bool ret = manager->CloseCommonDependencyObj(); + EXPECT_EQ(ret, false); + constexpr const char* LIB_DM_COMDENPENDENCY_NAME = "libdevicemanagerdependency.z.so"; + + // todo: need to import dlfcn library + // manager->dpConnectorHandle_ = lopen(LIB_DM_COMDENPENDENCY_NAME, RTLD_NOW | RTLD_NODELETE | RTLD_NOLOAD); + // ret = manager->CloseCommonDependencyObj(); + // EXPECT_EQ(ret, true); +} + + +HWTEST_F(DiscoveryManagerTest, ClearDiscoveryCache_002, testing::ext::TestSize.Level0) +{ + + ProcessInfo processInfo; + processInfo.pkgName = "pkgName"; + processInfo.userId = 1; + DiscoveryContext context; + + auto &pkgNameSet = manager->pkgNameSet_; + auto &discoveryContextMap = manager->discoveryContextMap_; + auto &capabilityMap = manager->capabilityMap_; + + + pkgNameSet.emplace("1"); + discoveryContextMap.emplace(processInfo.pkgName, context); + capabilityMap.emplace(processInfo.pkgName, "123"); + + + EXPECT_NO_THROW(manager->ClearDiscoveryCache(processInfo)); + + pkgNameSet.erase("1"); + discoveryContextMap.erase(processInfo.pkgName); + capabilityMap.erase(processInfo.pkgName); +} + +HWTEST_F(DiscoveryManagerTest, ClearDiscoveryPkgName_002, testing::ext::TestSize.Level0) +{ + string pkgName = "1"; + DiscoveryContext context; + + auto &pkgNameSet = manager->pkgNameSet_; + auto &discoveryContextMap = manager->discoveryContextMap_; + auto &capabilityMap = manager->capabilityMap_; + + + pkgNameSet.emplace("1"); + discoveryContextMap.emplace(pkgName, context); + capabilityMap.emplace(pkgName, "123"); + + + EXPECT_NO_THROW(manager->ClearDiscoveryPkgName(pkgName)); + + pkgNameSet.erase("1"); + discoveryContextMap.erase(pkgName); + capabilityMap.erase(pkgName); +} + +HWTEST_F(DiscoveryManagerTest,GetPkgNameAndUserId_001, testing::ext::TestSize.Level0) +{ + std::string pkgName = "1"; + std::string callerPkgName; + int32_t userId; + MultiUserDiscovery multiUserDiscovery; + multiUserDiscovery.pkgName = "1"; + multiUserDiscovery.userId = 123; + manager->multiUserDiscMap_.emplace("1", multiUserDiscovery); + + manager->GetPkgNameAndUserId(pkgName, callerPkgName, userId); + EXPECT_EQ(userId, manager->multiUserDiscMap_["1"].userId); + + manager->multiUserDiscMap_.erase("1"); +} } // namespace } // namespace DistributedHardware } // namespace OHOS diff --git a/test/softbusunittest/UTTest_softbus_connector.cpp b/test/softbusunittest/UTTest_softbus_connector.cpp index 7d97ecee6..184a50261 100644 --- a/test/softbusunittest/UTTest_softbus_connector.cpp +++ b/test/softbusunittest/UTTest_softbus_connector.cpp @@ -414,9 +414,10 @@ HWTEST_F(SoftbusConnectorTest, ConvertDeviceInfoToDmDevice_001, testing::ext::Te */ HWTEST_F(SoftbusConnectorTest, JoinLnn_001, testing::ext::TestSize.Level1) { - std::string deviceId; + std::string deviceId = ""; + const std::string remoteUdidHash = ""; std::shared_ptr softbusConnector = std::make_shared(); - softbusConnector->JoinLnn(deviceId); + softbusConnector->JoinLnn(deviceId, remoteUdidHash); EXPECT_EQ(SoftbusConnector::discoveryDeviceInfoMap_.empty(), true); } @@ -845,6 +846,173 @@ HWTEST_F(SoftbusConnectorTest, GetDeviceUdidHashByUdid_002, testing::ext::TestSi bool isForceJoin = false; softbusConnector->JoinLnn(deviceId, isForceJoin); } + +HWTEST_F(SoftbusConnectorTest, SyncAclList_001, testing::ext::TestSize.Level1) +{ + // todo: need reassign + int32_t userId = 1; + std::string credId = ""; + int32_t sessionKeyId = 1; + int32_t aclId = 1; + std::shared_ptr softbusConnector = std::make_shared(); + softbusConnector->hiChainAuthConnector_ = nullptr; + EXPECT_NO_THROW(softbusConnector->SyncAclList(userId, credId, sessionKeyId, aclId)); + + softbusConnector->hiChainAuthConnector_ = std::make_shared(); + EXPECT_NO_THROW(softbusConnector->SyncAclList(userId, credId, sessionKeyId, aclId)); +} + +HWTEST_F(SoftbusConnectorTest, SyncLocalAclList5_1_0_001, testing::ext::TestSize.Level1) +{ + // todo: need reassign + const std::string localUdid = "123"; + const std::string remoteUdid = "321"; + + OHOS::DistributedDeviceProfile::AccessControlProfile localAcl; + std::vector acLStrList = {""}; + OHOS::DistributedDeviceProfile::Accesser accesser; + OHOS::DistributedDeviceProfile::Accessee accessee; + accesser.SetAccesserId(123); + accessee.SetAccesseeId(321); + localAcl.SetAccesser(accesser); + localAcl.SetAccessee(accessee); + std::shared_ptr softbusConnector = std::make_shared(); + int32_t ret = softbusConnector->SyncLocalAclList5_1_0(localUdid, remoteUdid, localAcl, acLStrList); + EXPECT_EQ(ret, 0); + + accesser.SetAccesserId(321); + accessee.SetAccesseeId(123); + localAcl.SetAccesser(accesser); + localAcl.SetAccessee(accessee); + ret = softbusConnector->SyncLocalAclList5_1_0(localUdid, remoteUdid, localAcl, acLStrList); + EXPECT_EQ(ret, 0); +} + +HWTEST_F(SoftbusConnectorTest, UnRegisterConnectorCallback_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr softbusConnector = std::make_shared(); + int32_t ret = softbusConnector->UnRegisterConnectorCallback(); + EXPECT_EQ(ret, DM_OK); + +} + +HWTEST_F(SoftbusConnectorTest, ParaseAclChecksumList_001, testing::ext::TestSize.Level1) +{ + std::string jsonString = ""; + std::vector remoteAllAclList; + std::shared_ptr softbusConnector = std::make_shared(); + + int32_t ret = softbusConnector->ParaseAclChecksumList(jsonString, remoteAllAclList); + EXPECT_EQ(ret, ERR_DM_FAILED); + + // todo: reassign + jsonString.assign(R"({"identicalCredType":1,"shareCredType":2,"pointTopointCredType":256,"lnnCredType":3})"); + + ret = softbusConnector->ParaseAclChecksumList(jsonString, remoteAllAclList); + EXPECT_EQ(ret, DM_OK); + + +} + +HWTEST_F(SoftbusConnectorTest, GetLocalVersion_001, testing::ext::TestSize.Level1) +{ + // todo: need reassign + const std::string localUdid = "123"; + const std::string remoteUdid = "321"; + std::string localVersion; + OHOS::DistributedDeviceProfile::AccessControlProfile localAcl; + OHOS::DistributedDeviceProfile::Accesser accesser; + OHOS::DistributedDeviceProfile::Accessee accessee; + accesser.SetAccesserId(123456789); + accessee.SetAccesseeId(321654987); + localAcl.SetAccesser(accesser); + localAcl.SetAccessee(accessee); + std::shared_ptr softbusConnector = std::make_shared(); + int32_t ret = softbusConnector->GetLocalVersion(localUdid, remoteUdid, localVersion, localAcl); + EXPECT_EQ(ret, DM_OK); + + accesser.SetAccesserId(321); + accessee.SetAccesseeId(123); + localAcl.SetAccesser(accesser); + localAcl.SetAccessee(accessee); + ret = softbusConnector->GetLocalVersion(localUdid, remoteUdid, localVersion, localAcl); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(SoftbusConnectorTest, SortAclListDesc_001, testing::ext::TestSize.Level1) +{ + std::vector remoteAllAclList; + struct AclHashItem aclHashItem; + aclHashItem.version = "1"; + aclHashItem.aclHashList.push_back({}); + remoteAllAclList.push_back(aclHashItem); + aclHashItem.version = "2"; + remoteAllAclList.push_back(aclHashItem); + aclHashItem.version = "3"; + remoteAllAclList.push_back(aclHashItem); + std::vector aclVerDesc; + + std::map remoteAllAclMap; + std::shared_ptr softbusConnector = std::make_shared(); + EXPECT_NO_THROW(softbusConnector->SortAclListDesc(remoteAllAclList, aclVerDesc, remoteAllAclMap)) ; + +} + +HWTEST_F(SoftbusConnectorTest, SyncLocalAclListProcess_001, testing::ext::TestSize.Level1) +{ + DevUserInfo localDevUserInfo; + DevUserInfo remoteDevUserInfo; + std::string remoteAclList = {""}; + + std::shared_ptr softbusConnector = std::make_shared(); + EXPECT_EQ(softbusConnector->SyncLocalAclListProcess(localDevUserInfo, remoteDevUserInfo, remoteAclList), ERR_DM_FAILED); + + remoteAclList = "123"; + EXPECT_EQ(softbusConnector->SyncLocalAclListProcess(localDevUserInfo, remoteDevUserInfo, remoteAclList), DM_OK); +} + +HWTEST_F(SoftbusConnectorTest, GetAclListHash_001, testing::ext::TestSize.Level1) +{ + DevUserInfo localDevUserInfo; + DevUserInfo remoteDevUserInfo; + std::string aclList = {""}; + + std::shared_ptr softbusConnector = std::make_shared(); + EXPECT_EQ(softbusConnector->GetAclListHash(localDevUserInfo, remoteDevUserInfo, aclList), DM_OK); + +} + +/** + * @tc.name: JoinLnn_002 + * @tc.type: FUNC + */ +HWTEST_F(SoftbusConnectorTest, JoinLnn_002, testing::ext::TestSize.Level1) +{ + std::string deviceId("123"); + std::string remoteUdidHash(""); + + std::shared_ptr softbusConnector = std::make_shared(); + EXPECT_NO_THROW(softbusConnector->JoinLnn(deviceId, remoteUdidHash)); +} + +HWTEST_F(SoftbusConnectorTest, JoinLNNBySkId_002, testing::ext::TestSize.Level1) +{ + int32_t sessionId = 0; + int32_t sessionKeyId = 0; + int32_t remoteSessionKeyId = 0; + std::string udid = ""; + std::string udidHash = ""; + + std::shared_ptr softbusConnector = std::make_shared(); + EXPECT_NO_THROW(softbusConnector->JoinLNNBySkId(sessionId, sessionKeyId, remoteSessionKeyId, udid, udidHash)); + + udid = "123546789"; + EXPECT_NO_THROW(softbusConnector->JoinLNNBySkId(sessionId, sessionKeyId, remoteSessionKeyId, udid, udidHash)); + + sessionKeyId = 1; + remoteSessionKeyId = 1; + EXPECT_NO_THROW(softbusConnector->JoinLNNBySkId(sessionId, sessionKeyId, remoteSessionKeyId, udid, udidHash)); +} } // namespace } // namespace DistributedHardware } // namespace OHOS- \ No newline at end of file diff --git a/test/unittest/UTTest_dm_comm_tool.cpp b/test/unittest/UTTest_dm_comm_tool.cpp index 0f8971cf8..0934a1ab3 100644 --- a/test/unittest/UTTest_dm_comm_tool.cpp +++ b/test/unittest/UTTest_dm_comm_tool.cpp @@ -468,5 +468,220 @@ HWTEST_F(DMCommToolTest, ProcessResponseUserStopEvent_004, testing::ext::TestSiz EXPECT_NO_THROW(dmCommTool->ProcessResponseUserStopEvent(commMsg)); } +HWTEST_F(DMCommToolTest, ParseUserIdsMsg_001, testing::ext::TestSize.Level1) +{ + std::string InvalidNetworkmsg = ""; + std::shared_ptr commMsg_ = std::make_shared(1, InvalidNetworkmsg); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + UserIdsMsg userIdsMsg; + EXPECT_NO_THROW(dmCommTool->eventHandler_->ParseUserIdsMsg(commMsg, userIdsMsg)); +} + +HWTEST_F(DMCommToolTest, ParseUserIdsMsg_002, testing::ext::TestSize.Level1) +{ + std::string validJson = R"({ "stopUserId": 12345 })"; + std::shared_ptr commMsg_ = std::make_shared(1, validJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + UserIdsMsg userIdsMsg; + EXPECT_NO_THROW(dmCommTool->eventHandler_->ParseUserIdsMsg(commMsg, userIdsMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveCommonEvent_001, testing::ext::TestSize.Level1) +{ + std::string errjson = R"({ + "userId": 12345, + "networkId": "networkId", + "remoteUdid": "remoteUdid" + })"; + std::shared_ptr commMsg_ = std::make_shared(1, errjson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(DM_OK)); + EXPECT_NO_THROW(dmCommTool->ProcessReceiveCommonEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveCommonEvent_002, testing::ext::TestSize.Level1) +{ + std::string errjson = ""; + std::shared_ptr commMsg_ = std::make_shared(1, errjson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + EXPECT_NO_THROW(dmCommTool->ProcessReceiveCommonEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessResponseCommonEvent_001, testing::ext::TestSize.Level1) +{ + std::string errjson = ""; + std::shared_ptr commMsg_ = std::make_shared(1, errjson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + EXPECT_NO_THROW(dmCommTool->ProcessResponseCommonEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessEvent_001, testing::ext::TestSize.Level1) +{ + std::string msgJson = R"({ + "userId": 12345, + "networkId": "networkId", + "remoteUdid": "remoteUdid", + "innerEventId_": 1 + "isNewEvent": "true", + })"; + int32_t msgCode = 1; + std::shared_ptr commMsg_ = std::make_shared(msgCode, msgJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + AppExecFwk::InnerEvent::Pointer msgEvent = AppExecFwk::InnerEvent::Get(commMsg_->code, commMsg); + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + + EXPECT_NO_THROW(dmCommTool->eventHandler_->ProcessEvent(msgEvent)); + +} + +HWTEST_F(DMCommToolTest, ProcessEvent_002, testing::ext::TestSize.Level1) +{ + std::string msgJson = R"({ + "userId": 12345, + "networkId": "networkId", + "remoteUdid": "remoteUdid", + "innerEventId_": 1 + "isNewEvent": "false", + })"; + int32_t msgCode = 1; + std::shared_ptr commMsg_ = std::make_shared(msgCode, msgJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + AppExecFwk::InnerEvent::Pointer msgEvent = AppExecFwk::InnerEvent::Get(commMsg_->code, commMsg); + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + + EXPECT_NO_THROW(dmCommTool->eventHandler_->ProcessEvent(msgEvent)); +} + +HWTEST_F(DMCommToolTest, ProcessEvent_003, testing::ext::TestSize.Level1) +{ + std::string msgJson = R"({ + "userId": 12345, + "networkId": "networkId", + "remoteUdid": "remoteUdid", + "innerEventId_": 2, + "isNewEvent": "true" + })"; + int32_t msgCode = 1; + std::shared_ptr commMsg_ = std::make_shared(msgCode, msgJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + AppExecFwk::InnerEvent::Pointer msgEvent = AppExecFwk::InnerEvent::Get(commMsg_->code, commMsg); + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(DM_OK)); + EXPECT_NO_THROW(dmCommTool->eventHandler_->ProcessEvent(msgEvent)); +} + +HWTEST_F(DMCommToolTest, ProcessEvent_004, testing::ext::TestSize.Level1) +{ + std::string msgJson = R"({ + "userId": 12345, + "networkId": "networkId", + "remoteUdid": "remoteUdid", + "innerEventId_": 2, + "isNewEvent": "false" + })"; + int32_t msgCode = 1; + std::shared_ptr commMsg_ = std::make_shared(msgCode, msgJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + AppExecFwk::InnerEvent::Pointer msgEvent = AppExecFwk::InnerEvent::Get(commMsg_->code, commMsg); + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(DM_OK)); + EXPECT_NO_THROW(dmCommTool->eventHandler_->ProcessEvent(msgEvent)); +} + +HWTEST_F(DMCommToolTest, ProcessEvent_005, testing::ext::TestSize.Level1) +{ + std::string msgJson = R"({ + "userId": 12345, + "networkId": "networkId", + "remoteUdid": "remoteUdid", + "innerEventId_": 3, + "isNewEvent": "false" + })"; + int32_t msgCode = 1; + std::shared_ptr commMsg_ = std::make_shared(msgCode, msgJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + AppExecFwk::InnerEvent::Pointer msgEvent = AppExecFwk::InnerEvent::Get(commMsg_->code, commMsg); + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(DM_OK)); + EXPECT_NO_THROW(dmCommTool->eventHandler_->ProcessEvent(msgEvent)); +} + +HWTEST_F(DMCommToolTest, ProcessEvent_006, testing::ext::TestSize.Level1) +{ + std::string msgJson = R"({ + "userId": 12345, + "networkId": "networkId", + "remoteUdid": "remoteUdid", + "innerEventId_": 4, + "isNewEvent": "false" + })"; + int32_t msgCode = 1; + std::shared_ptr commMsg_ = std::make_shared(msgCode, msgJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + AppExecFwk::InnerEvent::Pointer msgEvent = AppExecFwk::InnerEvent::Get(commMsg_->code, commMsg); + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(DM_OK)); + EXPECT_NO_THROW(dmCommTool->eventHandler_->ProcessEvent(msgEvent)); +} + +HWTEST_F(DMCommToolTest, ProcessEvent_007, testing::ext::TestSize.Level1) +{ + std::string msgJson = R"({ + "userId": 12345, + "networkId": "networkId", + "remoteUdid": "remoteUdid", + "innerEventId_": 5, + "isNewEvent": "false" + })"; + int32_t msgCode = 1; + std::shared_ptr commMsg_ = std::make_shared(msgCode, msgJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + AppExecFwk::InnerEvent::Pointer msgEvent = AppExecFwk::InnerEvent::Get(commMsg_->code, commMsg); + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(DM_OK)); + EXPECT_NO_THROW(dmCommTool->eventHandler_->ProcessEvent(msgEvent)); +} + +HWTEST_F(DMCommToolTest, ProcessEvent_008, testing::ext::TestSize.Level1) +{ + std::string msgJson = R"({ + "userId": 12345, + "networkId": "networkId", + "remoteUdid": "remoteUdid", + "innerEventId_": -1, + "isNewEvent": "false" + })"; + int32_t msgCode = 1; + std::shared_ptr commMsg_ = std::make_shared(msgCode, msgJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + AppExecFwk::InnerEvent::Pointer msgEvent = AppExecFwk::InnerEvent::Get(commMsg_->code, commMsg); + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(DM_OK)); + EXPECT_NO_THROW(dmCommTool->eventHandler_->ProcessEvent(msgEvent)); +} + +HWTEST_F(DMCommToolTest, SendLogoutAccountInfo_001, testing::ext::TestSize.Level1) +{ + std::string rmtNetworkId; + rmtNetworkId.append(300, 'a'); + std::string accountId = "accountId"; + int32_t userId = 12345; + auto ret = dmCommTool->SendLogoutAccountInfo(rmtNetworkId, accountId, userId); + EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); +} } // DistributedHardware } // OHOS \ No newline at end of file -- Gitee From 9968f75ae762ead9d8d3235c562beb6bd0119c1a Mon Sep 17 00:00:00 2001 From: BrainL Date: Fri, 16 May 2025 14:32:13 +0800 Subject: [PATCH 2/6] UT_0516 Signed-off-by: BrainL --- .vscode/settings.json | 59 ------------------- .../UTTest_discovery_manager.cpp | 27 --------- .../UTTest_softbus_connector.cpp | 4 -- 3 files changed, 90 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index dcf05ceb4..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "files.associations": { - "array": "cpp", - "atomic": "cpp", - "cctype": "cpp", - "chrono": "cpp", - "cinttypes": "cpp", - "clocale": "cpp", - "cmath": "cpp", - "condition_variable": "cpp", - "cstdarg": "cpp", - "cstddef": "cpp", - "cstdint": "cpp", - "cstdio": "cpp", - "cstdlib": "cpp", - "cstring": "cpp", - "ctime": "cpp", - "cwchar": "cpp", - "cwctype": "cpp", - "deque": "cpp", - "list": "cpp", - "unordered_map": "cpp", - "unordered_set": "cpp", - "vector": "cpp", - "exception": "cpp", - "algorithm": "cpp", - "functional": "cpp", - "iterator": "cpp", - "map": "cpp", - "memory": "cpp", - "memory_resource": "cpp", - "numeric": "cpp", - "optional": "cpp", - "random": "cpp", - "ratio": "cpp", - "set": "cpp", - "string": "cpp", - "string_view": "cpp", - "system_error": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "utility": "cpp", - "fstream": "cpp", - "initializer_list": "cpp", - "iomanip": "cpp", - "iosfwd": "cpp", - "iostream": "cpp", - "istream": "cpp", - "limits": "cpp", - "mutex": "cpp", - "new": "cpp", - "ostream": "cpp", - "sstream": "cpp", - "stdexcept": "cpp", - "streambuf": "cpp", - "thread": "cpp", - "typeinfo": "cpp" - } -} \ No newline at end of file diff --git a/test/commonunittest/UTTest_discovery_manager.cpp b/test/commonunittest/UTTest_discovery_manager.cpp index 57e34b2fd..1a21cb48f 100644 --- a/test/commonunittest/UTTest_discovery_manager.cpp +++ b/test/commonunittest/UTTest_discovery_manager.cpp @@ -425,7 +425,6 @@ HWTEST_F(DiscoveryManagerTest, ClearDiscoveryCache_001, testing::ext::TestSize.L HWTEST_F(DiscoveryManagerTest, ClearDiscoveryPkgName_001, testing::ext::TestSize.Level0) { std::string pkgName = "pkgName"; - // initialization std::set subscribeIdSet; DiscoveryContext context; context.subscribeId = 1; @@ -437,7 +436,6 @@ HWTEST_F(DiscoveryManagerTest, ClearDiscoveryPkgName_001, testing::ext::TestSize pkgNameSet.emplace("1"); discoveryContextMap.emplace(pkgName, context); capabilityMap.emplace(pkgName, "123"); - // Simulate real value subscribeIdSet.insert(discoveryContextMap[pkgName].subscribeId); @@ -450,26 +448,6 @@ HWTEST_F(DiscoveryManagerTest, ClearDiscoveryPkgName_001, testing::ext::TestSize } - - -// new -// HWTEST_F(DiscoveryManagerTest, EnableDiscoveryListener_004, testing::ext::TestSize.Level0) -// { -// std::string pkgName = "123"; -// std::map discoverParam; -// std::map filterOptions; -// discoverParam.emplace(PARAM_KEY_SUBSCRIBE_ID, "123"); -// discoverParam.emplace(PARAM_KEY_META_TYPE, "ohos.test"); -// discoverParam.emplace(PARAM_KEY_SUBSCRIBE_ID, "ohos.test"); -// int32_t ret = manager->EnableDiscoveryListener(pkgName, discoverParam, filterOptions); -// EXPECT_EQ(ret, DM_OK); -// // todo: dont know return-value -// // discoverParam.emplace(PARAM_KEY_DISC_CAPABILITY, "123"); -// // ret = manager->EnableDiscoveryListener(pkgName, discoverParam, filterOptions); -// // EXPECT_EQ(ret, DM_OK); - -// } - HWTEST_F(DiscoveryManagerTest, DisableDiscoveryListener_004, testing::ext::TestSize.Level0) { std::string pkgName; @@ -574,11 +552,6 @@ HWTEST_F(DiscoveryManagerTest, CloseCommonDependencyObj_003, testing::ext::TestS bool ret = manager->CloseCommonDependencyObj(); EXPECT_EQ(ret, false); constexpr const char* LIB_DM_COMDENPENDENCY_NAME = "libdevicemanagerdependency.z.so"; - - // todo: need to import dlfcn library - // manager->dpConnectorHandle_ = lopen(LIB_DM_COMDENPENDENCY_NAME, RTLD_NOW | RTLD_NODELETE | RTLD_NOLOAD); - // ret = manager->CloseCommonDependencyObj(); - // EXPECT_EQ(ret, true); } diff --git a/test/softbusunittest/UTTest_softbus_connector.cpp b/test/softbusunittest/UTTest_softbus_connector.cpp index 184a50261..61382fd5c 100644 --- a/test/softbusunittest/UTTest_softbus_connector.cpp +++ b/test/softbusunittest/UTTest_softbus_connector.cpp @@ -849,7 +849,6 @@ HWTEST_F(SoftbusConnectorTest, GetDeviceUdidHashByUdid_002, testing::ext::TestSi HWTEST_F(SoftbusConnectorTest, SyncAclList_001, testing::ext::TestSize.Level1) { - // todo: need reassign int32_t userId = 1; std::string credId = ""; int32_t sessionKeyId = 1; @@ -864,7 +863,6 @@ HWTEST_F(SoftbusConnectorTest, SyncAclList_001, testing::ext::TestSize.Level1) HWTEST_F(SoftbusConnectorTest, SyncLocalAclList5_1_0_001, testing::ext::TestSize.Level1) { - // todo: need reassign const std::string localUdid = "123"; const std::string remoteUdid = "321"; @@ -905,7 +903,6 @@ HWTEST_F(SoftbusConnectorTest, ParaseAclChecksumList_001, testing::ext::TestSize int32_t ret = softbusConnector->ParaseAclChecksumList(jsonString, remoteAllAclList); EXPECT_EQ(ret, ERR_DM_FAILED); - // todo: reassign jsonString.assign(R"({"identicalCredType":1,"shareCredType":2,"pointTopointCredType":256,"lnnCredType":3})"); ret = softbusConnector->ParaseAclChecksumList(jsonString, remoteAllAclList); @@ -916,7 +913,6 @@ HWTEST_F(SoftbusConnectorTest, ParaseAclChecksumList_001, testing::ext::TestSize HWTEST_F(SoftbusConnectorTest, GetLocalVersion_001, testing::ext::TestSize.Level1) { - // todo: need reassign const std::string localUdid = "123"; const std::string remoteUdid = "321"; std::string localVersion; -- Gitee From 7531161744043bf7be09786756d2f3516365f051 Mon Sep 17 00:00:00 2001 From: BrainL Date: Tue, 3 Jun 2025 11:28:05 +0800 Subject: [PATCH 3/6] modify Signed-off-by: BrainL --- .../UTTest_discovery_manager.cpp | 15 +++++------- .../UTTest_softbus_connector.cpp | 8 +++---- test/unittest/UTTest_dm_comm_tool.cpp | 24 +++++++++---------- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/test/commonunittest/UTTest_discovery_manager.cpp b/test/commonunittest/UTTest_discovery_manager.cpp index 1a21cb48f..350a920a4 100644 --- a/test/commonunittest/UTTest_discovery_manager.cpp +++ b/test/commonunittest/UTTest_discovery_manager.cpp @@ -404,7 +404,7 @@ HWTEST_F(DiscoveryManagerTest, UpdateInfoFreq_001, testing::ext::TestSize.Level0 HWTEST_F(DiscoveryManagerTest, UpdateInfoMedium_001, testing::ext::TestSize.Level0) { - std::map discoverParam; + std::map discoverParam; discoverParam.emplace(PARAM_KEY_DISC_MEDIUM, "8"); DmSubscribeInfo dmSubInfo; @@ -455,7 +455,6 @@ HWTEST_F(DiscoveryManagerTest, DisableDiscoveryListener_004, testing::ext::TestS extraParam.emplace(PARAM_KEY_SUBSCRIBE_ID, "123"); int32_t ret = manager->DisableDiscoveryListener(pkgName, extraParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); - } HWTEST_F(DiscoveryManagerTest, ConfigDiscParam_001, testing::ext::TestSize.Level0) @@ -470,8 +469,8 @@ HWTEST_F(DiscoveryManagerTest, ConfigDiscParam_001, testing::ext::TestSize.Level discoverParam.emplace(PARAM_KEY_DISC_FREQ, "1"); discoverParam.emplace(PARAM_KEY_DISC_MODE, "170"); manager->ConfigDiscParam(discoverParam, dmSubInfo); - EXPECT_EQ(dmSubInfo->freq , DM_MID); - EXPECT_EQ(dmSubInfo->mode , DM_DISCOVER_MODE_ACTIVE); + EXPECT_EQ(dmSubInfo->freq, DM_MID); + EXPECT_EQ(dmSubInfo->mode, DM_DISCOVER_MODE_ACTIVE); delete dmSubInfo; @@ -517,7 +516,7 @@ HWTEST_F(DiscoveryManagerTest, OnDeviceFound_004, testing::ext::TestSize.Level0) info.extraData = R"({"identicalCredType":1,"DISC_CAPABILITY":1,"pointTopointCredType":256,"lnnCredType":3})"; - manager->OnDeviceFound(pkgName, info,isOnline); + manager->OnDeviceFound(pkgName, info, isOnline); EXPECT_EQ(manager->discoveryContextMap_.empty(), false); } @@ -551,7 +550,7 @@ HWTEST_F(DiscoveryManagerTest, CloseCommonDependencyObj_003, testing::ext::TestS bool ret = manager->CloseCommonDependencyObj(); EXPECT_EQ(ret, false); - constexpr const char* LIB_DM_COMDENPENDENCY_NAME = "libdevicemanagerdependency.z.so"; + const char* LIB_DM_COMDENPENDENCY_NAME = "libdevicemanagerdependency.z.so"; } @@ -566,13 +565,11 @@ HWTEST_F(DiscoveryManagerTest, ClearDiscoveryCache_002, testing::ext::TestSize.L auto &pkgNameSet = manager->pkgNameSet_; auto &discoveryContextMap = manager->discoveryContextMap_; auto &capabilityMap = manager->capabilityMap_; - pkgNameSet.emplace("1"); discoveryContextMap.emplace(processInfo.pkgName, context); capabilityMap.emplace(processInfo.pkgName, "123"); - EXPECT_NO_THROW(manager->ClearDiscoveryCache(processInfo)); pkgNameSet.erase("1"); @@ -602,7 +599,7 @@ HWTEST_F(DiscoveryManagerTest, ClearDiscoveryPkgName_002, testing::ext::TestSize capabilityMap.erase(pkgName); } -HWTEST_F(DiscoveryManagerTest,GetPkgNameAndUserId_001, testing::ext::TestSize.Level0) +HWTEST_F(DiscoveryManagerTest, GetPkgNameAndUserId_001, testing::ext::TestSize.Level0) { std::string pkgName = "1"; std::string callerPkgName; diff --git a/test/softbusunittest/UTTest_softbus_connector.cpp b/test/softbusunittest/UTTest_softbus_connector.cpp index 61382fd5c..46daf5014 100644 --- a/test/softbusunittest/UTTest_softbus_connector.cpp +++ b/test/softbusunittest/UTTest_softbus_connector.cpp @@ -916,7 +916,7 @@ HWTEST_F(SoftbusConnectorTest, GetLocalVersion_001, testing::ext::TestSize.Level const std::string localUdid = "123"; const std::string remoteUdid = "321"; std::string localVersion; - OHOS::DistributedDeviceProfile::AccessControlProfile localAcl; + OHOS::DistributedDeviceProfile::AccessControlProfile localAcl; OHOS::DistributedDeviceProfile::Accesser accesser; OHOS::DistributedDeviceProfile::Accessee accessee; accesser.SetAccesserId(123456789); @@ -961,7 +961,8 @@ HWTEST_F(SoftbusConnectorTest, SyncLocalAclListProcess_001, testing::ext::TestSi std::string remoteAclList = {""}; std::shared_ptr softbusConnector = std::make_shared(); - EXPECT_EQ(softbusConnector->SyncLocalAclListProcess(localDevUserInfo, remoteDevUserInfo, remoteAclList), ERR_DM_FAILED); + EXPECT_EQ(softbusConnector->SyncLocalAclListProcess(localDevUserInfo, remoteDevUserInfo, + remoteAclList), ERR_DM_FAILED); remoteAclList = "123"; EXPECT_EQ(softbusConnector->SyncLocalAclListProcess(localDevUserInfo, remoteDevUserInfo, remoteAclList), DM_OK); @@ -975,7 +976,6 @@ HWTEST_F(SoftbusConnectorTest, GetAclListHash_001, testing::ext::TestSize.Level1 std::shared_ptr softbusConnector = std::make_shared(); EXPECT_EQ(softbusConnector->GetAclListHash(localDevUserInfo, remoteDevUserInfo, aclList), DM_OK); - } /** @@ -994,7 +994,7 @@ HWTEST_F(SoftbusConnectorTest, JoinLnn_002, testing::ext::TestSize.Level1) HWTEST_F(SoftbusConnectorTest, JoinLNNBySkId_002, testing::ext::TestSize.Level1) { int32_t sessionId = 0; - int32_t sessionKeyId = 0; + int32_t sessionKeyId = 0; int32_t remoteSessionKeyId = 0; std::string udid = ""; std::string udidHash = ""; diff --git a/test/unittest/UTTest_dm_comm_tool.cpp b/test/unittest/UTTest_dm_comm_tool.cpp index 7d201a418..afb886938 100644 --- a/test/unittest/UTTest_dm_comm_tool.cpp +++ b/test/unittest/UTTest_dm_comm_tool.cpp @@ -470,8 +470,8 @@ HWTEST_F(DMCommToolTest, ProcessResponseUserStopEvent_004, testing::ext::TestSiz HWTEST_F(DMCommToolTest, ParseUserIdsMsg_001, testing::ext::TestSize.Level1) { - std::string InvalidNetworkmsg = ""; - std::shared_ptr commMsg_ = std::make_shared(1, InvalidNetworkmsg); + std::string invalidNetworkMsg = ""; + std::shared_ptr commMsg_ = std::make_shared(1, invalidNetworkMsg); std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); UserIdsMsg userIdsMsg; EXPECT_NO_THROW(dmCommTool->eventHandler_->ParseUserIdsMsg(commMsg, userIdsMsg)); @@ -488,7 +488,7 @@ HWTEST_F(DMCommToolTest, ParseUserIdsMsg_002, testing::ext::TestSize.Level1) HWTEST_F(DMCommToolTest, ProcessReceiveCommonEvent_001, testing::ext::TestSize.Level1) { - std::string errjson = R"({ + std::string errjson = R"({ "userId": 12345, "networkId": "networkId", "remoteUdid": "remoteUdid" @@ -499,7 +499,7 @@ HWTEST_F(DMCommToolTest, ProcessReceiveCommonEvent_001, testing::ext::TestSize.L .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(DM_OK)); EXPECT_NO_THROW(dmCommTool->ProcessReceiveCommonEvent(commMsg)); -} +} HWTEST_F(DMCommToolTest, ProcessReceiveCommonEvent_002, testing::ext::TestSize.Level1) { @@ -509,7 +509,7 @@ HWTEST_F(DMCommToolTest, ProcessReceiveCommonEvent_002, testing::ext::TestSize.L EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); EXPECT_NO_THROW(dmCommTool->ProcessReceiveCommonEvent(commMsg)); -} +} HWTEST_F(DMCommToolTest, ProcessResponseCommonEvent_001, testing::ext::TestSize.Level1) { @@ -619,7 +619,7 @@ HWTEST_F(DMCommToolTest, ProcessEvent_005, testing::ext::TestSize.Level1) HWTEST_F(DMCommToolTest, ProcessEvent_006, testing::ext::TestSize.Level1) { - std::string msgJson = R"({ + std::string msgJson = R"({ "userId": 12345, "networkId": "networkId", "remoteUdid": "remoteUdid", @@ -676,12 +676,12 @@ HWTEST_F(DMCommToolTest, ProcessEvent_008, testing::ext::TestSize.Level1) HWTEST_F(DMCommToolTest, SendLogoutAccountInfo_001, testing::ext::TestSize.Level1) { - std::string rmtNetworkId; - rmtNetworkId.append(300, 'a'); - std::string accountId = "accountId"; - int32_t userId = 12345; - auto ret = dmCommTool->SendLogoutAccountInfo(rmtNetworkId, accountId, userId); - EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); + std::string rmtNetworkId; + rmtNetworkId.append(300, 'a'); + std::string accountId = "accountId"; + int32_t userId = 12345; + auto ret = dmCommTool->SendLogoutAccountInfo(rmtNetworkId, accountId, userId); + EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } HWTEST_F(DMCommToolTest, SendUninstAppObj_001, testing::ext::TestSize.Level1) { -- Gitee From b586f9bec3a8ecfdb20664f78db1a61bb3ff074f Mon Sep 17 00:00:00 2001 From: BrainL Date: Tue, 3 Jun 2025 13:50:50 +0800 Subject: [PATCH 4/6] modify Signed-off-by: BrainL --- test/commonunittest/UTTest_discovery_manager.cpp | 3 --- test/softbusunittest/UTTest_softbus_connector.cpp | 3 +-- test/unittest/UTTest_dm_comm_tool.cpp | 6 ++---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/test/commonunittest/UTTest_discovery_manager.cpp b/test/commonunittest/UTTest_discovery_manager.cpp index 350a920a4..a6b14fdfc 100644 --- a/test/commonunittest/UTTest_discovery_manager.cpp +++ b/test/commonunittest/UTTest_discovery_manager.cpp @@ -445,7 +445,6 @@ HWTEST_F(DiscoveryManagerTest, ClearDiscoveryPkgName_001, testing::ext::TestSize EXPECT_EQ(ret, subscribeIdSet); EXPECT_EQ(pkgNameSet.find(pkgName), pkgNameSet.end()); EXPECT_EQ(capabilityMap.find(pkgName), capabilityMap.end()); - } HWTEST_F(DiscoveryManagerTest, DisableDiscoveryListener_004, testing::ext::TestSize.Level0) @@ -550,13 +549,11 @@ HWTEST_F(DiscoveryManagerTest, CloseCommonDependencyObj_003, testing::ext::TestS bool ret = manager->CloseCommonDependencyObj(); EXPECT_EQ(ret, false); - const char* LIB_DM_COMDENPENDENCY_NAME = "libdevicemanagerdependency.z.so"; } HWTEST_F(DiscoveryManagerTest, ClearDiscoveryCache_002, testing::ext::TestSize.Level0) { - ProcessInfo processInfo; processInfo.pkgName = "pkgName"; processInfo.userId = 1; diff --git a/test/softbusunittest/UTTest_softbus_connector.cpp b/test/softbusunittest/UTTest_softbus_connector.cpp index 46daf5014..0f28c80eb 100644 --- a/test/softbusunittest/UTTest_softbus_connector.cpp +++ b/test/softbusunittest/UTTest_softbus_connector.cpp @@ -866,7 +866,7 @@ HWTEST_F(SoftbusConnectorTest, SyncLocalAclList5_1_0_001, testing::ext::TestSize const std::string localUdid = "123"; const std::string remoteUdid = "321"; - OHOS::DistributedDeviceProfile::AccessControlProfile localAcl; + OHOS::DistributedDeviceProfile::AccessControlProfile localAcl; std::vector acLStrList = {""}; OHOS::DistributedDeviceProfile::Accesser accesser; OHOS::DistributedDeviceProfile::Accessee accessee; @@ -951,7 +951,6 @@ HWTEST_F(SoftbusConnectorTest, SortAclListDesc_001, testing::ext::TestSize.Level std::map remoteAllAclMap; std::shared_ptr softbusConnector = std::make_shared(); EXPECT_NO_THROW(softbusConnector->SortAclListDesc(remoteAllAclList, aclVerDesc, remoteAllAclMap)) ; - } HWTEST_F(SoftbusConnectorTest, SyncLocalAclListProcess_001, testing::ext::TestSize.Level1) diff --git a/test/unittest/UTTest_dm_comm_tool.cpp b/test/unittest/UTTest_dm_comm_tool.cpp index afb886938..914aa114d 100644 --- a/test/unittest/UTTest_dm_comm_tool.cpp +++ b/test/unittest/UTTest_dm_comm_tool.cpp @@ -523,7 +523,7 @@ HWTEST_F(DMCommToolTest, ProcessResponseCommonEvent_001, testing::ext::TestSize. HWTEST_F(DMCommToolTest, ProcessEvent_001, testing::ext::TestSize.Level1) { - std::string msgJson = R"({ + std::string msgJson = R"({ "userId": 12345, "networkId": "networkId", "remoteUdid": "remoteUdid", @@ -538,7 +538,6 @@ HWTEST_F(DMCommToolTest, ProcessEvent_001, testing::ext::TestSize.Level1) .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); EXPECT_NO_THROW(dmCommTool->eventHandler_->ProcessEvent(msgEvent)); - } HWTEST_F(DMCommToolTest, ProcessEvent_002, testing::ext::TestSize.Level1) @@ -556,8 +555,7 @@ HWTEST_F(DMCommToolTest, ProcessEvent_002, testing::ext::TestSize.Level1) AppExecFwk::InnerEvent::Pointer msgEvent = AppExecFwk::InnerEvent::Get(commMsg_->code, commMsg); EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); - - EXPECT_NO_THROW(dmCommTool->eventHandler_->ProcessEvent(msgEvent)); + EXPECT_NO_THROW(dmCommTool->eventHandler_->ProcessEvent(msgEvent)); } HWTEST_F(DMCommToolTest, ProcessEvent_003, testing::ext::TestSize.Level1) -- Gitee From 8eb84b8e0124f0a30b02143029e26d3d56fbba4e Mon Sep 17 00:00:00 2001 From: BrainL Date: Tue, 3 Jun 2025 14:06:09 +0800 Subject: [PATCH 5/6] modify Signed-off-by: BrainL --- test/softbusunittest/UTTest_softbus_connector.cpp | 2 -- test/unittest/UTTest_dm_comm_tool.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/test/softbusunittest/UTTest_softbus_connector.cpp b/test/softbusunittest/UTTest_softbus_connector.cpp index 0f28c80eb..39c793722 100644 --- a/test/softbusunittest/UTTest_softbus_connector.cpp +++ b/test/softbusunittest/UTTest_softbus_connector.cpp @@ -907,8 +907,6 @@ HWTEST_F(SoftbusConnectorTest, ParaseAclChecksumList_001, testing::ext::TestSize ret = softbusConnector->ParaseAclChecksumList(jsonString, remoteAllAclList); EXPECT_EQ(ret, DM_OK); - - } HWTEST_F(SoftbusConnectorTest, GetLocalVersion_001, testing::ext::TestSize.Level1) diff --git a/test/unittest/UTTest_dm_comm_tool.cpp b/test/unittest/UTTest_dm_comm_tool.cpp index 914aa114d..47f27b258 100644 --- a/test/unittest/UTTest_dm_comm_tool.cpp +++ b/test/unittest/UTTest_dm_comm_tool.cpp @@ -636,7 +636,7 @@ HWTEST_F(DMCommToolTest, ProcessEvent_006, testing::ext::TestSize.Level1) HWTEST_F(DMCommToolTest, ProcessEvent_007, testing::ext::TestSize.Level1) { - std::string msgJson = R"({ + std::string msgJson = R"({ "userId": 12345, "networkId": "networkId", "remoteUdid": "remoteUdid", -- Gitee From d962eaf9f17a7f3f4eedcd8234c3e2974a8028a1 Mon Sep 17 00:00:00 2001 From: BrainL Date: Tue, 3 Jun 2025 14:39:44 +0800 Subject: [PATCH 6/6] modify Signed-off-by: BrainL --- test/softbusunittest/UTTest_softbus_connector.cpp | 1 - test/unittest/UTTest_dm_comm_tool.cpp | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/softbusunittest/UTTest_softbus_connector.cpp b/test/softbusunittest/UTTest_softbus_connector.cpp index 39c793722..f16f5d6b0 100644 --- a/test/softbusunittest/UTTest_softbus_connector.cpp +++ b/test/softbusunittest/UTTest_softbus_connector.cpp @@ -891,7 +891,6 @@ HWTEST_F(SoftbusConnectorTest, UnRegisterConnectorCallback_001, testing::ext::Te std::shared_ptr softbusConnector = std::make_shared(); int32_t ret = softbusConnector->UnRegisterConnectorCallback(); EXPECT_EQ(ret, DM_OK); - } HWTEST_F(SoftbusConnectorTest, ParaseAclChecksumList_001, testing::ext::TestSize.Level1) diff --git a/test/unittest/UTTest_dm_comm_tool.cpp b/test/unittest/UTTest_dm_comm_tool.cpp index 47f27b258..8246a5d5d 100644 --- a/test/unittest/UTTest_dm_comm_tool.cpp +++ b/test/unittest/UTTest_dm_comm_tool.cpp @@ -542,7 +542,7 @@ HWTEST_F(DMCommToolTest, ProcessEvent_001, testing::ext::TestSize.Level1) HWTEST_F(DMCommToolTest, ProcessEvent_002, testing::ext::TestSize.Level1) { - std::string msgJson = R"({ + std::string msgJson = R"({ "userId": 12345, "networkId": "networkId", "remoteUdid": "remoteUdid", @@ -560,7 +560,7 @@ HWTEST_F(DMCommToolTest, ProcessEvent_002, testing::ext::TestSize.Level1) HWTEST_F(DMCommToolTest, ProcessEvent_003, testing::ext::TestSize.Level1) { - std::string msgJson = R"({ + std::string msgJson = R"({ "userId": 12345, "networkId": "networkId", "remoteUdid": "remoteUdid", @@ -579,7 +579,7 @@ HWTEST_F(DMCommToolTest, ProcessEvent_003, testing::ext::TestSize.Level1) HWTEST_F(DMCommToolTest, ProcessEvent_004, testing::ext::TestSize.Level1) { - std::string msgJson = R"({ + std::string msgJson = R"({ "userId": 12345, "networkId": "networkId", "remoteUdid": "remoteUdid", @@ -598,7 +598,7 @@ HWTEST_F(DMCommToolTest, ProcessEvent_004, testing::ext::TestSize.Level1) HWTEST_F(DMCommToolTest, ProcessEvent_005, testing::ext::TestSize.Level1) { - std::string msgJson = R"({ + std::string msgJson = R"({ "userId": 12345, "networkId": "networkId", "remoteUdid": "remoteUdid", @@ -655,7 +655,7 @@ HWTEST_F(DMCommToolTest, ProcessEvent_007, testing::ext::TestSize.Level1) HWTEST_F(DMCommToolTest, ProcessEvent_008, testing::ext::TestSize.Level1) { - std::string msgJson = R"({ + std::string msgJson = R"({ "userId": 12345, "networkId": "networkId", "remoteUdid": "remoteUdid", -- Gitee