diff --git a/common/src/dm_anonymous.cpp b/common/src/dm_anonymous.cpp index 2ee4165d90a8f7001ea6951e3de04a62f82184e5..bb4fa5c3a1e5f1a5ab5559a92d09483124f6768f 100644 --- a/common/src/dm_anonymous.cpp +++ b/common/src/dm_anonymous.cpp @@ -23,14 +23,15 @@ constexpr uint32_t MAX_MESSAGE_LEN = 40 * 1024 * 1024; constexpr uint32_t MAX_MAP_LEN = 1000; constexpr uint32_t MAX_INT_LEN = 20; constexpr uint32_t MAX_ID_LEN = 256; +constexpr int32_t INT32_SHORT_ID_LENGTH = 20; +constexpr int32_t INT32_PLAINTEXT_LENGTH = 4; +constexpr int32_t INT32_MIN_ID_LENGTH = 3; +constexpr int32_t MIN_ASCII_NUM = 48; +constexpr int32_t MAX_ASCII_NUM = 57; } std::string GetAnonyString(const std::string &value) { - const int32_t INT32_SHORT_ID_LENGTH = 20; - const int32_t INT32_PLAINTEXT_LENGTH = 4; - const int32_t INT32_MIN_ID_LENGTH = 3; - std::string tmpStr("******"); size_t strLen = value.length(); if (strLen < INT32_MIN_ID_LENGTH) { @@ -102,8 +103,6 @@ bool IsNumberString(const std::string &inputString) LOGE("inputString is Null or inputString length is too long"); return false; } - const int32_t MIN_ASCII_NUM = 48; - const int32_t MAX_ASCII_NUM = 57; for (size_t i = 0; i < inputString.length(); i++) { int num = (int)inputString[i]; if (num >= MIN_ASCII_NUM && num <= MAX_ASCII_NUM) { diff --git a/test/commonunittest/UTTest_discovery_manager.cpp b/test/commonunittest/UTTest_discovery_manager.cpp index 95f3f90eb8d8cdaebfd9c26dcc8022486b8a4430..f1bde10349f178940158421647826deb8525ad1c 100644 --- a/test/commonunittest/UTTest_discovery_manager.cpp +++ b/test/commonunittest/UTTest_discovery_manager.cpp @@ -50,7 +50,7 @@ namespace { std::shared_ptr listener = std::make_shared(); std::shared_ptr manager = std::make_shared(softbusListener, listener); -bool checkSoftbusRes(int32_t ret) +bool CheckSoftbusRes(int32_t ret) { return ret == SOFTBUS_INVALID_PARAM || ret == SOFTBUS_NETWORK_NOT_INIT || ret == SOFTBUS_NETWORK_LOOPER_ERR; } @@ -72,7 +72,7 @@ HWTEST_F(DiscoveryManagerTest, EnableDiscoveryListener_002, testing::ext::TestSi discoverParam.insert(std::pair("SUBSCRIBE_ID", "ohos.test")); std::map filterOptions; int32_t ret = manager->EnableDiscoveryListener(pkgName, discoverParam, filterOptions); - EXPECT_EQ(true, checkSoftbusRes(ret)); + EXPECT_EQ(true, CheckSoftbusRes(ret)); } HWTEST_F(DiscoveryManagerTest, EnableDiscoveryListener_003, testing::ext::TestSize.Level0) @@ -81,7 +81,7 @@ HWTEST_F(DiscoveryManagerTest, EnableDiscoveryListener_003, testing::ext::TestSi std::map discoverParam; std::map filterOptions; int32_t ret = manager->EnableDiscoveryListener(pkgName, discoverParam, filterOptions); - EXPECT_EQ(true, checkSoftbusRes(ret)); + EXPECT_EQ(true, CheckSoftbusRes(ret)); } HWTEST_F(DiscoveryManagerTest, DisableDiscoveryListener_001, testing::ext::TestSize.Level0) @@ -99,7 +99,7 @@ HWTEST_F(DiscoveryManagerTest, DisableDiscoveryListener_002, testing::ext::TestS extraParam.insert(std::pair("META_TYPE", "ohos.test")); extraParam.insert(std::pair("SUBSCRIBE_ID", "ohos.test")); int32_t ret = manager->DisableDiscoveryListener(pkgName, extraParam); - EXPECT_EQ(true, checkSoftbusRes(ret)); + EXPECT_EQ(true, CheckSoftbusRes(ret)); } HWTEST_F(DiscoveryManagerTest, DisableDiscoveryListener_003, testing::ext::TestSize.Level0) @@ -107,7 +107,7 @@ HWTEST_F(DiscoveryManagerTest, DisableDiscoveryListener_003, testing::ext::TestS std::string pkgName = "pkgName"; std::map extraParam; int32_t ret = manager->DisableDiscoveryListener(pkgName, extraParam); - EXPECT_EQ(true, checkSoftbusRes(ret)); + EXPECT_EQ(true, CheckSoftbusRes(ret)); } HWTEST_F(DiscoveryManagerTest, StartDiscovering_001, testing::ext::TestSize.Level0) @@ -129,7 +129,7 @@ HWTEST_F(DiscoveryManagerTest, StartDiscovering_002, testing::ext::TestSize.Leve discoverParam.insert(std::pair("FILTER_OPTIONS", "ohos.test")); std::map filterOptions; int32_t ret = manager->StartDiscovering(pkgName, discoverParam, filterOptions); - EXPECT_EQ(true, checkSoftbusRes(ret)); + EXPECT_EQ(true, CheckSoftbusRes(ret)); } HWTEST_F(DiscoveryManagerTest, StartDiscovering_003, testing::ext::TestSize.Level0) @@ -245,7 +245,7 @@ HWTEST_F(DiscoveryManagerTest, StopDiscovering_002, testing::ext::TestSize.Level DiscoveryContext context; manager->discoveryContextMap_.emplace(pkgName, context); int32_t ret = manager->StopDiscovering(pkgName, subscribeId); - EXPECT_EQ(true, checkSoftbusRes(ret)); + EXPECT_EQ(true, CheckSoftbusRes(ret)); } HWTEST_F(DiscoveryManagerTest, OnDeviceFound_001, testing::ext::TestSize.Level0) diff --git a/test/commonunittest/UTTest_dm_anonymous.cpp b/test/commonunittest/UTTest_dm_anonymous.cpp index d66adfad207d385ede7d75c3879670fccc254caf..42a08cd6cfdfa23230e1414fc8d8fe50843b0e0c 100644 --- a/test/commonunittest/UTTest_dm_anonymous.cpp +++ b/test/commonunittest/UTTest_dm_anonymous.cpp @@ -32,6 +32,7 @@ void DmAnonymousTest::TearDownTestCase() } namespace { +constexpr uint32_t MAX_MESSAGE_LEN = 40 * 1024 * 1024; /** * @tc.name: GetAnonyString_001 * @tc.desc: Return size of anony string @@ -394,7 +395,6 @@ HWTEST_F(DmAnonymousTest, IsBool_002, testing::ext::TestSize.Level0) */ HWTEST_F(DmAnonymousTest, ConvertCharArray2String_001, testing::ext::TestSize.Level0) { - constexpr uint32_t MAX_MESSAGE_LEN = 40 * 1024 * 1024; char *srcData = nullptr; uint32_t srcLen = 0; std::string ret = ConvertCharArray2String(srcData, srcLen); diff --git a/test/commonunittest/UTTest_permission_manager.cpp b/test/commonunittest/UTTest_permission_manager.cpp index 4c44794cca38f2377e5257b85bfcc6e27661f1d0..58c043cbb43687f210a9c746edb1b044a6b4ac93 100644 --- a/test/commonunittest/UTTest_permission_manager.cpp +++ b/test/commonunittest/UTTest_permission_manager.cpp @@ -46,7 +46,7 @@ void PermissionManagerTest::SetUp() constexpr int32_t PAKAGE_NAME_SIZE_MAX = 256; #define SYSTEM_SA_WHITE_LIST_NUM (4) -constexpr const static char systemSaWhiteList[SYSTEM_SA_WHITE_LIST_NUM][PAKAGE_NAME_SIZE_MAX] = { +constexpr const static char SYSTEM_SA_WHITE_LIST[SYSTEM_SA_WHITE_LIST_NUM][PAKAGE_NAME_SIZE_MAX] = { "Samgr_Networking", "ohos.distributeddata.service", "ohos.dslm", @@ -116,16 +116,16 @@ HWTEST_F(PermissionManagerTest, CheckWhiteListSystemSA_001, testing::ext::TestSi */ HWTEST_F(PermissionManagerTest, CheckWhiteListSystemSA_002, testing::ext::TestSize.Level0) { - std::string pkgName1(systemSaWhiteList[0]); + std::string pkgName1(SYSTEM_SA_WHITE_LIST[0]); bool ret = PermissionManager::GetInstance().CheckWhiteListSystemSA(pkgName1); ASSERT_EQ(ret, true); - std::string pkgName2(systemSaWhiteList[1]); + std::string pkgName2(SYSTEM_SA_WHITE_LIST[1]); ret = PermissionManager::GetInstance().CheckWhiteListSystemSA(pkgName2); ASSERT_EQ(ret, true); - std::string pkgName3(systemSaWhiteList[2]); + std::string pkgName3(SYSTEM_SA_WHITE_LIST[2]); ret = PermissionManager::GetInstance().CheckWhiteListSystemSA(pkgName3); ASSERT_EQ(ret, true); - std::string pkgName4(systemSaWhiteList[3]); + std::string pkgName4(SYSTEM_SA_WHITE_LIST[3]); ret = PermissionManager::GetInstance().CheckWhiteListSystemSA(pkgName4); ASSERT_EQ(ret, true); } diff --git a/test/softbusunittest/UTTest_softbus_listener.cpp b/test/softbusunittest/UTTest_softbus_listener.cpp index 783bc036255c6d3f52f4633286f975466451c354..03f321cd81234e0b1ce0bfa30f103109ba29dafd 100644 --- a/test/softbusunittest/UTTest_softbus_listener.cpp +++ b/test/softbusunittest/UTTest_softbus_listener.cpp @@ -48,7 +48,7 @@ void SoftbusListenerTest::TearDownTestCase() namespace { std::shared_ptr softbusListener = std::make_shared(); -bool checkSoftbusRes(int32_t ret) +bool CheckSoftbusRes(int32_t ret) { return ret == SOFTBUS_INVALID_PARAM || ret == SOFTBUS_NETWORK_NOT_INIT || ret == SOFTBUS_NETWORK_LOOPER_ERR || ret == SOFTBUS_IPC_ERR; @@ -262,7 +262,7 @@ HWTEST_F(SoftbusListenerTest, PublishSoftbusLNN_001, testing::ext::TestSize.Leve softbusListener = std::make_shared(); } int32_t ret = softbusListener->PublishSoftbusLNN(dmPubInfo, capability, customData); - EXPECT_EQ(true, checkSoftbusRes(ret)); + EXPECT_EQ(true, CheckSoftbusRes(ret)); } HWTEST_F(SoftbusListenerTest, StopPublishSoftbusLNN_001, testing::ext::TestSize.Level0) @@ -272,7 +272,7 @@ HWTEST_F(SoftbusListenerTest, StopPublishSoftbusLNN_001, testing::ext::TestSize. softbusListener = std::make_shared(); } int32_t ret = softbusListener->StopPublishSoftbusLNN(publishId); - EXPECT_EQ(true, checkSoftbusRes(ret)); + EXPECT_EQ(true, CheckSoftbusRes(ret)); } HWTEST_F(SoftbusListenerTest, RegisterSoftbusLnnOpsCbk_001, testing::ext::TestSize.Level0) @@ -315,7 +315,7 @@ HWTEST_F(SoftbusListenerTest, GetUdidByNetworkId_001, testing::ext::TestSize.Lev softbusListener = std::make_shared(); } int32_t ret = softbusListener->GetUdidByNetworkId(networkId.c_str(), udid); - EXPECT_EQ(true, checkSoftbusRes(ret)); + EXPECT_EQ(true, CheckSoftbusRes(ret)); } HWTEST_F(SoftbusListenerTest, GetUuidByNetworkId_001, testing::ext::TestSize.Level0) @@ -326,7 +326,7 @@ HWTEST_F(SoftbusListenerTest, GetUuidByNetworkId_001, testing::ext::TestSize.Lev softbusListener = std::make_shared(); } int32_t ret = softbusListener->GetUuidByNetworkId(networkId.c_str(), udid); - EXPECT_EQ(true, checkSoftbusRes(ret)); + EXPECT_EQ(true, CheckSoftbusRes(ret)); } HWTEST_F(SoftbusListenerTest, ConvertDeviceInfoToDmDevice_001, testing::ext::TestSize.Level0) @@ -789,7 +789,7 @@ HWTEST_F(SoftbusListenerTest, GetDeviceInfo_001, testing::ext::TestSize.Level0) softbusListener = std::make_shared(); } int32_t ret = softbusListener->GetDeviceInfo(networkId, info); - EXPECT_EQ(true, checkSoftbusRes(ret)); + EXPECT_EQ(true, CheckSoftbusRes(ret)); } HWTEST_F(SoftbusListenerTest, GetLocalDeviceInfo_001, testing::ext::TestSize.Level0) @@ -799,7 +799,7 @@ HWTEST_F(SoftbusListenerTest, GetLocalDeviceInfo_001, testing::ext::TestSize.Lev softbusListener = std::make_shared(); } int32_t ret = softbusListener->GetLocalDeviceInfo(info); - EXPECT_EQ(true, checkSoftbusRes(ret)); + EXPECT_EQ(true, CheckSoftbusRes(ret)); } HWTEST_F(SoftbusListenerTest, ConvertBytesToUpperCaseHexString_001, testing::ext::TestSize.Level0) @@ -998,7 +998,7 @@ HWTEST_F(SoftbusListenerTest, RefreshSoftbusLNN_001, testing::ext::TestSize.Leve type = NodeStatusType::TYPE_AUTH_STATUS; softbusListener->OnDeviceScreenStatusChanged(type, status); int32_t ret = softbusListener->RefreshSoftbusLNN(pkgName.c_str(), dmSubInfo, customData); - EXPECT_EQ(true, checkSoftbusRes(ret)); + EXPECT_EQ(true, CheckSoftbusRes(ret)); } HWTEST_F(SoftbusListenerTest, StopRefreshSoftbusLNN_001, testing::ext::TestSize.Level0) @@ -1030,7 +1030,7 @@ HWTEST_F(SoftbusListenerTest, StopRefreshSoftbusLNN_001, testing::ext::TestSize. std::string deviceList2; deviceTypeId = 0xA2F; softbusListener->CredentialAuthStatusProcess(deviceList2, deviceTypeId, errcode); - EXPECT_EQ(true, checkSoftbusRes(ret)); + EXPECT_EQ(true, CheckSoftbusRes(ret)); } HWTEST_F(SoftbusListenerTest, GetNetworkIdByUdid_001, testing::ext::TestSize.Level0) @@ -1072,7 +1072,7 @@ HWTEST_F(SoftbusListenerTest, GetDeviceScreenStatus_001, testing::ext::TestSize. softbusListener = std::make_shared(); } int32_t ret = softbusListener->GetDeviceScreenStatus(networkId.c_str(), screenStatus); - EXPECT_TRUE(checkSoftbusRes(ret)); + EXPECT_TRUE(CheckSoftbusRes(ret)); softbusListener = nullptr; } diff --git a/test/unittest/UTTest_device_manager_service_impl.cpp b/test/unittest/UTTest_device_manager_service_impl.cpp index 1a85404c211571938fd34548b5db823e3714ce44..969ca2d9760c4ba9f2dfec2a1ad29544b606ac44 100644 --- a/test/unittest/UTTest_device_manager_service_impl.cpp +++ b/test/unittest/UTTest_device_manager_service_impl.cpp @@ -31,7 +31,7 @@ void DeviceManagerServiceImplTest::SetUp() } deviceManagerServiceImpl_->Initialize(listener_); } -const std::string testID("111111"); +const std::string TEST_ID("111111"); void DeviceManagerServiceImplTest::TearDown() { @@ -840,7 +840,7 @@ HWTEST_F(DeviceManagerServiceImplTest, HandleOffline_002, testing::ext::TestSize { DmDeviceState devState = DmDeviceState::DEVICE_INFO_READY; DmDeviceInfo devInfo; - strcpy_s(devInfo.networkId, sizeof(devInfo.networkId) - 1, testID.c_str()); + strcpy_s(devInfo.networkId, sizeof(devInfo.networkId) - 1, TEST_ID.c_str()); devInfo.networkId[sizeof(devInfo.networkId) - 1] = '\0'; if (deviceManagerServiceImpl_ == nullptr) { deviceManagerServiceImpl_ = std::make_shared(); @@ -872,7 +872,7 @@ HWTEST_F(DeviceManagerServiceImplTest, HandleOnline_002, testing::ext::TestSize. { DmDeviceState devState = DmDeviceState::DEVICE_INFO_READY; DmDeviceInfo devInfo; - strcpy_s(devInfo.networkId, sizeof(devInfo.networkId) - 1, testID.c_str()); + strcpy_s(devInfo.networkId, sizeof(devInfo.networkId) - 1, TEST_ID.c_str()); devInfo.networkId[sizeof(devInfo.networkId) - 1] = '\0'; if (deviceManagerServiceImpl_ == nullptr) { deviceManagerServiceImpl_ = std::make_shared(); @@ -1302,7 +1302,7 @@ HWTEST_F(DeviceManagerServiceImplTest, ScreenCommonEventCallback_001, testing::e */ HWTEST_F(DeviceManagerServiceImplTest, HandleDeviceNotTrust_001, testing::ext::TestSize.Level0) { - std::string udid = testID; + std::string udid = TEST_ID; deviceManagerServiceImpl_->HandleDeviceNotTrust(udid); EXPECT_NE(deviceManagerServiceImpl_->authMgr_, nullptr); } @@ -1565,7 +1565,7 @@ HWTEST_F(DeviceManagerServiceImplTest, HandleOnline_003, testing::ext::TestSize. if (deviceManagerServiceImpl_->softbusConnector_ == nullptr) { deviceManagerServiceImpl_->Initialize(listener_); } - strcpy_s(devInfo.networkId, sizeof(devInfo.networkId) - 1, testID.c_str()); + strcpy_s(devInfo.networkId, sizeof(devInfo.networkId) - 1, TEST_ID.c_str()); devInfo.networkId[sizeof(devInfo.networkId) - 1] = '\0'; EXPECT_CALL(*softbusConnectorMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(ERR_DM_FAILED)); deviceManagerServiceImpl_->HandleOnline(devState, devInfo); @@ -1605,7 +1605,7 @@ HWTEST_F(DeviceManagerServiceImplTest, HandleOffline_003, testing::ext::TestSize { DmDeviceState devState = DmDeviceState::DEVICE_INFO_READY; DmDeviceInfo devInfo; - strcpy_s(devInfo.networkId, sizeof(devInfo.networkId) - 1, testID.c_str()); + strcpy_s(devInfo.networkId, sizeof(devInfo.networkId) - 1, TEST_ID.c_str()); devInfo.networkId[sizeof(devInfo.networkId) - 1] = '\0'; if (deviceManagerServiceImpl_->deviceStateMgr_ == nullptr) { deviceManagerServiceImpl_->Initialize(listener_); diff --git a/test/unittest/UTTest_dm_pin_holder.h b/test/unittest/UTTest_dm_pin_holder.h index 5fcd67186ec31678065e9741333fa786adfc5e8e..28fac18aac07fe3c63eb39b123da7626952483b2 100644 --- a/test/unittest/UTTest_dm_pin_holder.h +++ b/test/unittest/UTTest_dm_pin_holder.h @@ -216,7 +216,7 @@ public: (void)processInfo; } - virtual void OnDevStateCallbackAdd(const ProcessInfo &processInfo, + void OnDevStateCallbackAdd(const ProcessInfo &processInfo, const std::vector &deviceList) override { (void)processInfo; diff --git a/test/unittest/UTTest_dm_transport.cpp b/test/unittest/UTTest_dm_transport.cpp index 534d17d7f46e95db009f0972ca2c518e45a4265c..0f372df1aab3b6face5b84618f97b8390492480a 100644 --- a/test/unittest/UTTest_dm_transport.cpp +++ b/test/unittest/UTTest_dm_transport.cpp @@ -30,6 +30,10 @@ void DMTransportTest::TearDownTestCase() { } +namespace { +constexpr int32_t ERR_DM_FAILED = 96929744; +constexpr int32_t ERR_DM_INPUT_PARA_INVALID = 96929749; +constexpr int32_t DM_OK = 0; /** * @tc.name: CreateClientSocket_InvalidInput * @tc.type: FUNC @@ -203,5 +207,6 @@ HWTEST_F(DMTransportTest, Send_SessionNotOpened_Failure, testing::ext::TestSize. int32_t result = dmTransport.Send(notOpenedId, payload, 0); EXPECT_EQ(result, ERR_DM_FAILED); } +} } // DistributedHardware } // OHOS \ No newline at end of file diff --git a/test/unittest/UTTest_dm_transport.h b/test/unittest/UTTest_dm_transport.h index fcfebeb98ccde9ec6e074243c95d06f7084d27e1..2e2bbd5b57812b3d661bfc8b6348d60cb656635c 100644 --- a/test/unittest/UTTest_dm_transport.h +++ b/test/unittest/UTTest_dm_transport.h @@ -35,11 +35,6 @@ protected: std::shared_ptr dmCommTool; std::shared_ptr dmCommToolPtr = std::make_shared(); DMTransport dmTransport = DMTransport(dmCommToolPtr); - - int32_t ERR_DM_FAILED = 96929744; - int32_t ERR_DM_INPUT_PARA_INVALID = 96929749; - uint32_t MAX_SEND_MSG_LENGTH = 4 * 1024 * 1024; - int32_t DM_OK = 0; }; } // namespace DistributedHardware } // namespace OHOS