diff --git a/interfaces/innerkits/accesstoken/test/BUILD.gn b/interfaces/innerkits/accesstoken/test/BUILD.gn index 55ed6e19f592c64d3b1c4d9b7ba9d5f8862d35c8..5b70fe8c3af4367d1e28d6d37e3e1d62197b5853 100644 --- a/interfaces/innerkits/accesstoken/test/BUILD.gn +++ b/interfaces/innerkits/accesstoken/test/BUILD.gn @@ -26,6 +26,7 @@ ohos_unittest("libaccesstoken_sdk_test") { "//base/security/access_token/interfaces/innerkits/nativetoken/include", "//base/security/access_token/interfaces/innerkits/token_setproc/include", "//base/security/access_token/frameworks/common/include", + "//base/security/access_token/services/tokensyncmanager/include", ] sources = [ "unittest/src/accesstoken_kit_test.cpp" ] diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp index a21f00a82ef8bdf7367d8d919165736071c1a1b6..356ae0f4fec0ab35d3bcd9e60a1f8b7303f0c35e 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp @@ -2351,7 +2351,7 @@ HWTEST_F(AccessTokenKitTest, GetTokenTypeFlag003, TestSize.Level1) HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo001, TestSize.Level1) { ACCESSTOKEN_LOG_INFO(LABEL, "SetRemoteHapTokenInfo001 start."); - std::string deviceID = "ea82205d1f9964346ee12e17ec0f362bb7203fca7c62d82899ffa917f9cbe6b2"; + std::string deviceID = "deviceid-1:udid-001"; AccessTokenKit::DeleteRemoteToken(deviceID, 0x20100000); HapTokenInfo baseInfo = { .apl = APL_NORMAL, @@ -2360,7 +2360,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo001, TestSize.Level1) .bundleName = "com.ohos.access_token", .instIndex = 1, .appID = "testtesttesttest", - .deviceID = "ea82205d1f9964346ee12e17ec0f362bb7203fca7c62d82899ffa917f9cbe6b2", + .deviceID = deviceID, .tokenID = 0x20100000, .tokenAttr = 0 }; @@ -2910,7 +2910,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo010, TestSize.Level1) HWTEST_F(AccessTokenKitTest, DeleteRemoteDeviceToken001, TestSize.Level1) { ACCESSTOKEN_LOG_INFO(LABEL, "DeleteRemoteDeviceTokens001 start."); - std::string deviceID = "ea82205d1f9964346ee12e17ec0f362bb7203fca7c62d82899ffa917f9cbe6b2"; + std::string deviceID = "deviceid-1:udid-001"; AccessTokenKit::DeleteRemoteToken(deviceID, 0x20100000); HapTokenInfo baseInfo = { .apl = APL_NORMAL, @@ -2919,7 +2919,7 @@ HWTEST_F(AccessTokenKitTest, DeleteRemoteDeviceToken001, TestSize.Level1) .bundleName = "com.ohos.access_token", .instIndex = 1, .appID = "testtesttesttest", - .deviceID = "ea82205d1f9964346ee12e17ec0f362bb7203fca7c62d82899ffa917f9cbe6b2", + .deviceID = deviceID, .tokenID = 0x20100000, .tokenAttr = 0 }; @@ -2964,7 +2964,7 @@ HWTEST_F(AccessTokenKitTest, DeleteRemoteDeviceToken001, TestSize.Level1) HWTEST_F(AccessTokenKitTest, DeleteRemoteDeviceToken002, TestSize.Level1) { ACCESSTOKEN_LOG_INFO(LABEL, "DeleteRemoteDeviceTokens001 start."); - std::string deviceID = "ea82205d1f9964346ee12e17ec0f362bb7203fca7c62d82899ffa917f9cbe6b2"; + std::string deviceID = "deviceid-1:udid-001"; AccessTokenKit::DeleteRemoteToken(deviceID, 0x20100000); HapTokenInfo baseInfo = { .apl = APL_NORMAL, @@ -2973,7 +2973,7 @@ HWTEST_F(AccessTokenKitTest, DeleteRemoteDeviceToken002, TestSize.Level1) .bundleName = "com.ohos.access_token", .instIndex = 1, .appID = "testtesttesttest", - .deviceID = "ea82205d1f9964346ee12e17ec0f362bb7203fca7c62d82899ffa917f9cbe6b2", + .deviceID = deviceID, .tokenID = 0x20100000, .tokenAttr = 0 }; diff --git a/services/tokensyncmanager/src/command/delete_remote_token_command.cpp b/services/tokensyncmanager/src/command/delete_remote_token_command.cpp index 3197b08cad08efa31065c8454d7fe2c46b6692cb..f09bb04c91560e7fcc30a9f17a78c5478e43d2a2 100644 --- a/services/tokensyncmanager/src/command/delete_remote_token_command.cpp +++ b/services/tokensyncmanager/src/command/delete_remote_token_command.cpp @@ -80,13 +80,13 @@ void DeleteRemoteTokenCommand::Execute() bool result = DeviceInfoManager::GetInstance().GetDeviceInfo(remoteProtocol_.srcDeviceId, DeviceIdType::UNKNOWN, devInfo); if (!result) { - ACCESSTOKEN_LOG_INFO(LABEL, "error: get remote networkId failed"); + ACCESSTOKEN_LOG_INFO(LABEL, "error: get remote uniqueDeviceId failed"); remoteProtocol_.statusCode = Constant::FAILURE_BUT_CAN_RETRY; return; } - std::string networkID = devInfo.deviceId.networkId; - int ret = AccessTokenKit::DeleteRemoteToken(networkID, deleteTokenId_); + std::string uniqueDeviceId = devInfo.deviceId.uniqueDeviceId; + int ret = AccessTokenKit::DeleteRemoteToken(uniqueDeviceId, deleteTokenId_); if (ret != RET_SUCCESS) { remoteProtocol_.statusCode = Constant::FAILURE_BUT_CAN_RETRY; remoteProtocol_.message = Constant::COMMAND_RESULT_FAILED; diff --git a/services/tokensyncmanager/src/command/sync_remote_native_token_command.cpp b/services/tokensyncmanager/src/command/sync_remote_native_token_command.cpp index 6484d3527f29f9d33bb5347b1bfa8e631c93242f..db3fec00b67dd966b32ffb0b5bf37f9d2a210287 100644 --- a/services/tokensyncmanager/src/command/sync_remote_native_token_command.cpp +++ b/services/tokensyncmanager/src/command/sync_remote_native_token_command.cpp @@ -102,11 +102,11 @@ void SyncRemoteNativeTokenCommand::Finish() bool result = DeviceInfoManager::GetInstance().GetDeviceInfo(remoteProtocol_.dstDeviceId, DeviceIdType::UNKNOWN, devInfo); if (!result) { - ACCESSTOKEN_LOG_ERROR(LABEL, "SyncRemoteNativeTokenCommand: get remote networkId failed"); + ACCESSTOKEN_LOG_ERROR(LABEL, "SyncRemoteNativeTokenCommand: get remote uniqueDeviceId failed"); remoteProtocol_.statusCode = Constant::FAILURE_BUT_CAN_RETRY; return; } - int ret = AccessTokenKit::SetRemoteNativeTokenInfo(devInfo.deviceId.networkId, nativeTokenInfo_); + int ret = AccessTokenKit::SetRemoteNativeTokenInfo(devInfo.deviceId.uniqueDeviceId, nativeTokenInfo_); if (ret == RET_SUCCESS) { remoteProtocol_.statusCode = Constant::SUCCESS; } else { diff --git a/services/tokensyncmanager/src/command/update_remote_hap_token_command.cpp b/services/tokensyncmanager/src/command/update_remote_hap_token_command.cpp index 6910c984cf10dad81e8f46dc6ea7dc3e1a8c61d5..0d6dfe6e6bdb452daf2c0e2c5011c9729cbb669c 100644 --- a/services/tokensyncmanager/src/command/update_remote_hap_token_command.cpp +++ b/services/tokensyncmanager/src/command/update_remote_hap_token_command.cpp @@ -76,13 +76,13 @@ void UpdateRemoteHapTokenCommand::Execute() bool result = DeviceInfoManager::GetInstance().GetDeviceInfo(remoteProtocol_.srcDeviceId, DeviceIdType::UNKNOWN, devInfo); if (!result) { - ACCESSTOKEN_LOG_INFO(LABEL, "UpdateRemoteHapTokenCommand: get remote networkId failed"); + ACCESSTOKEN_LOG_INFO(LABEL, "UpdateRemoteHapTokenCommand: get remote uniqueDeviceId failed"); remoteProtocol_.statusCode = Constant::FAILURE_BUT_CAN_RETRY; return; } - std::string networkID = devInfo.deviceId.networkId; - int ret = AccessTokenKit::SetRemoteHapTokenInfo(networkID, updateTokenInfo_); + std::string uniqueDeviceId = devInfo.deviceId.uniqueDeviceId; + int ret = AccessTokenKit::SetRemoteHapTokenInfo(uniqueDeviceId, updateTokenInfo_); if (ret != RET_SUCCESS) { remoteProtocol_.statusCode = Constant::FAILURE_BUT_CAN_RETRY; remoteProtocol_.message = Constant::COMMAND_RESULT_FAILED; diff --git a/services/tokensyncmanager/src/remote/remote_command_manager.cpp b/services/tokensyncmanager/src/remote/remote_command_manager.cpp index 5d119f278359a9908348c7823d2d77e1f240db90..d9a604c455240a8fdf1a865eeb0650472b004e1b 100644 --- a/services/tokensyncmanager/src/remote/remote_command_manager.cpp +++ b/services/tokensyncmanager/src/remote/remote_command_manager.cpp @@ -224,9 +224,9 @@ int RemoteCommandManager::NotifyDeviceOffline(const std::string &nodeId) ACCESSTOKEN_LOG_INFO(LABEL, "get remote networkId failed"); return Constant::FAILURE; } - std::string networkId = devInfo.deviceId.networkId; + std::string uniqueDeviceId = devInfo.deviceId.uniqueDeviceId; std::function delayed = ([=]() { - AccessTokenKit::DeleteRemoteDeviceTokens(networkId); + AccessTokenKit::DeleteRemoteDeviceTokens(uniqueDeviceId); }); std::shared_ptr handler = diff --git a/services/tokensyncmanager/src/service/token_sync_manager_service.cpp b/services/tokensyncmanager/src/service/token_sync_manager_service.cpp index adb43917b1679f51fc7a88b0101b72481dae2a1c..9f0dc3d7b9c0744e726b3f60c0bca3bd7df742e1 100644 --- a/services/tokensyncmanager/src/service/token_sync_manager_service.cpp +++ b/services/tokensyncmanager/src/service/token_sync_manager_service.cpp @@ -123,7 +123,7 @@ int TokenSyncManagerService::DeleteRemoteHapTokenInfo(AccessTokenID tokenID) } const std::shared_ptr deleteRemoteTokenCommand = RemoteCommandFactory::GetInstance().NewDeleteRemoteTokenCommand(Constant::GetLocalDeviceId(), - device.deviceId.networkId, tokenID); + device.deviceId.uniqueDeviceId, tokenID); const int32_t resultCode = RemoteCommandManager::GetInstance().ExecuteCommand( device.deviceId.uniqueDeviceId, deleteRemoteTokenCommand); @@ -149,7 +149,7 @@ int TokenSyncManagerService::UpdateRemoteHapTokenInfo(const HapTokenInfoForSync& const std::shared_ptr updateRemoteHapTokenCommand = RemoteCommandFactory::GetInstance().NewUpdateRemoteHapTokenCommand(Constant::GetLocalDeviceId(), - device.deviceId.networkId, tokenInfo); + device.deviceId.uniqueDeviceId, tokenInfo); const int32_t resultCode = RemoteCommandManager::GetInstance().ExecuteCommand( device.deviceId.uniqueDeviceId, updateRemoteHapTokenCommand); diff --git a/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.cpp b/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.cpp index a5aee02f9beba7898522237f33ddcedf6a99a396..c2c59a9496e33a8b1ff98a643b485f71cd1d7798 100644 --- a/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.cpp +++ b/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.cpp @@ -29,6 +29,7 @@ #include "session.h" #include "soft_bus_device_connection_listener.h" #include "soft_bus_session_listener.h" +#include "device_info_manager.h" #define private public #include "token_sync_manager_service.h" @@ -41,6 +42,7 @@ static std::vector threads_; static std::shared_ptr g_ptrDeviceStateCallback = std::make_shared(); static std::string g_networkID = "deviceid-1"; +static std::string g_UDID = "deviceid-1:udid-001"; static DmDeviceInfo g_devInfo = { // udid = deviceid-1:udid-001 uuid = deviceid-1:uuid-001 .deviceId = "deviceid-1", @@ -63,9 +65,11 @@ void TokenSyncServiceTest::SetUpTestCase() void TokenSyncServiceTest::TearDownTestCase() {} void TokenSyncServiceTest::SetUp() -{} +{ +} void TokenSyncServiceTest::TearDown() { + ACCESSTOKEN_LOG_INFO(LABEL, "TearDown start."); for (auto it = threads_.begin(); it != threads_.end(); it++) { it->join(); } @@ -120,7 +124,7 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo001, TestSize.Level1) "\\\"111111\\\",\\\"instIndex\\\":0,\\\"dlpType\\\":0,\\\"permState\\\":" "null,\\\"tokenAttr\\\":0,\\\"tokenID\\\":537919488," "\\\"userID\\\":0,\\\"version\\\":1},\\\"commandName\\\":\\\"SyncRemoteHapTokenCommand\\\"," - "\\\"dstDeviceId\\\":\\\"deviceid-1\\\",\\\"dstDeviceLevel\\\":\\\"\\\",\\\"message\\\":\\\"success\\\"," + "\\\"dstDeviceId\\\":\\\"deviceid-1:udid-001\\\",\\\"dstDeviceLevel\\\":\\\"\\\",\\\"message\\\":\\\"success\\\"," "\\\"requestTokenId\\\":537919488,\\\"requestVersion\\\":2,\\\"responseDeviceId\\\":\\\"deviceid-1:udid-001\\\"" ",\\\"responseVersion\\\":2,\\\"srcDeviceId\\\":\\\"local:udid-001\\\",\\\"srcDeviceLevel\\\":\\\"\\\"," "\\\"statusCode\\\":0,\\\"uniqueId\\\":\\\"SyncRemoteHapTokenCommand\\\"}\",\"type\":\"response\"}"; @@ -130,10 +134,10 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo001, TestSize.Level1) g_ptrDeviceStateCallback->OnDeviceOnline(g_devInfo); int ret = OHOS::DelayedSingleton::GetInstance()->GetRemoteHapTokenInfo( - g_networkID, 0x20100000); + g_UDID, 0x20100000); ASSERT_EQ(ret, RET_SUCCESS); - AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_networkID, 0x20100000); + AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_UDID, 0x20100000); ASSERT_NE(mapID, (AccessTokenID)0); HapTokenInfo tokeInfo; @@ -221,7 +225,7 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo002, TestSize.Level1) "\\\"requestTokenId\\\":"; std::string tokenJsonStr = std::to_string(tokenIdEx.tokenIdExStruct.tokenID); std::string jsonAfter = ",\\\"requestVersion\\\":2,\\\"responseDeviceId\\\":\\\"\\\",\\\"responseVersion\\\":2," - "\\\"srcDeviceId\\\":\\\"deviceid-1\\\",\\\"srcDeviceLevel\\\":\\\"\\\",\\\"statusCode\\\":100001," + "\\\"srcDeviceId\\\":\\\"deviceid-1:udid-001\\\",\\\"srcDeviceLevel\\\":\\\"\\\",\\\"statusCode\\\":100001," "\\\"uniqueId\\\":\\\"SyncRemoteHapTokenCommand\\\"}\",\"type\":\"request\"}"; std::string recvJson = jsonBefore + tokenJsonStr + jsonAfter; @@ -262,7 +266,7 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo003, TestSize.Level1) "\\\"test\\\",\\\"bundleName\\\":\\\"mock_token_sync\\\",\\\"deviceID\\\":" "\\\"111111\\\",\\\"instIndex\\\":0,\\\"permState\\\":null,\\\"tokenAttr\\\":0,\\\"tokenID\\\":537919488," "\\\"userID\\\":0,\\\"version\\\":1},\\\"commandName\\\":\\\"SyncRemoteHapTokenCommand\\\"," - "\\\"dstDeviceId\\\":\\\"deviceid-1\\\",\\\"dstDeviceLevel\\\":\\\"\\\",\\\"message\\\":\\\"success\\\"," + "\\\"dstDeviceId\\\":\\\"deviceid-1:udid-001\\\",\\\"dstDeviceLevel\\\":\\\"\\\",\\\"message\\\":\\\"success\\\"," "\\\"requestTokenId\\\":537919488,\\\"requestVersion\\\":2,\\\"responseDeviceId\\\":\\\"deviceid-1:udid-001\\\"" ",\\\"responseVersion\\\":2,\\\"srcDeviceId\\\":\\\"local:udid-001\\\",\\\"srcDeviceLevel\\\":\\\"\\\"," "\\\"statusCode\\\":0,\\\"uniqueId\\\":\\\"SyncRemoteHapTokenCommand\\\"}\",\"type\":\"response\"}"; @@ -272,9 +276,9 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo003, TestSize.Level1) g_ptrDeviceStateCallback->OnDeviceOnline(g_devInfo); OHOS::DelayedSingleton::GetInstance()->GetRemoteHapTokenInfo( - g_networkID, 0x20100000); + g_UDID, 0x20100000); - AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_networkID, 0x20100000); + AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_UDID, 0x20100000); ASSERT_EQ(mapID, (AccessTokenID)0); } @@ -294,7 +298,7 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo004, TestSize.Level1) "\\\"test\\\",\\\"bundleName\\\":\\\"mock_token_sync\\\",\\\"deviceID\\\":" "\\\"111111\\\",\\\"permState\\\":null,\\\"tokenAttr\\\":0," "\\\"userID\\\":0,\\\"version\\\":1},\\\"commandName\\\":\\\"SyncRemoteHapTokenCommand\\\"," - "\\\"dstDeviceId\\\":\\\"deviceid-1\\\",\\\"dstDeviceLevel\\\":\\\"\\\",\\\"message\\\":\\\"success\\\"," + "\\\"dstDeviceId\\\":\\\"deviceid-1:udid-001\\\",\\\"dstDeviceLevel\\\":\\\"\\\",\\\"message\\\":\\\"success\\\"," "\\\"requestTokenId\\\":537919488,\\\"requestVersion\\\":2,\\\"responseDeviceId\\\":\\\"deviceid-1:udid-001\\\"" ",\\\"responseVersion\\\":2,\\\"srcDeviceId\\\":\\\"local:udid-001\\\",\\\"srcDeviceLevel\\\":\\\"\\\"," "\\\"statusCode\\\":0,\\\"uniqueId\\\":\\\"SyncRemoteHapTokenCommand\\\"}\",\"type\":\"response\"}"; @@ -304,9 +308,9 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo004, TestSize.Level1) g_ptrDeviceStateCallback->OnDeviceOnline(g_devInfo); OHOS::DelayedSingleton::GetInstance()->GetRemoteHapTokenInfo( - g_networkID, 0x20100000); + g_UDID, 0x20100000); - AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_networkID, 0x20100000); + AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_UDID, 0x20100000); ASSERT_EQ(mapID, (AccessTokenID)0); } @@ -327,7 +331,7 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo005, TestSize.Level1) "\\\"111111\\\",\\\"instIndex\\\":1,\\\"permState\\\":null,\\\"tokenAttr\\\":0," "\\\"tokenID\\\":\\\"aaa\\\"," "\\\"userID\\\":0,\\\"version\\\":1},\\\"commandName\\\":\\\"SyncRemoteHapTokenCommand\\\"," - "\\\"dstDeviceId\\\":\\\"deviceid-1\\\",\\\"dstDeviceLevel\\\":\\\"\\\",\\\"message\\\":\\\"success\\\"," + "\\\"dstDeviceId\\\":\\\"deviceid-1:udid-001\\\",\\\"dstDeviceLevel\\\":\\\"\\\",\\\"message\\\":\\\"success\\\"," "\\\"requestTokenId\\\":537919488,\\\"requestVersion\\\":2,\\\"responseDeviceId\\\":\\\"deviceid-1:udid-001\\\"" ",\\\"responseVersion\\\":2,\\\"srcDeviceId\\\":\\\"local:udid-001\\\",\\\"srcDeviceLevel\\\":\\\"\\\"," "\\\"statusCode\\\":0,\\\"uniqueId\\\":\\\"SyncRemoteHapTokenCommand\\\"}\",\"type\":\"response\"}"; @@ -337,9 +341,9 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo005, TestSize.Level1) g_ptrDeviceStateCallback->OnDeviceOnline(g_devInfo); OHOS::DelayedSingleton::GetInstance()->GetRemoteHapTokenInfo( - g_networkID, 0x20100000); + g_UDID, 0x20100000); - AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_networkID, 0x20100000); + AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_UDID, 0x20100000); ASSERT_EQ(mapID, (AccessTokenID)0); } @@ -360,7 +364,7 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo006, TestSize.Level1) "\\\"111111\\\",\\\"instIndex\\\":1,\\\"permState\\\":null,\\\"tokenAttr\\\":0," "\\\"tokenID\\\":537919488," "\\\"userID\\\":0,\\\"version\\\":1},\\\"commandName\\\":\\\"SyncRemoteHapTokenCommand\\\"," - "\\\"dstDeviceId\\\":\\\"deviceid-1\\\",\\\"dstDeviceLevel\\\":\\\"\\\",\\\"message\\\":\\\"success\\\"," + "\\\"dstDeviceId\\\":\\\"deviceid-1:udid-001\\\",\\\"dstDeviceLevel\\\":\\\"\\\",\\\"message\\\":\\\"success\\\"," "\\\"requestTokenId\\\":537919488,\\\"requestVersion\\\":2,\\\"responseDeviceId\\\":\\\"deviceid-1:udid-001\\\"" ",\\\"responseVersion\\\":2,\\\"srcDeviceId\\\":\\\"local:udid-001\\\",\\\"srcDeviceLevel\\\":\\\"\\\"," "\\\"statusCode\\\":0,\\\"uniqueId\\\":\\\"SyncRemoteHapTokenCommand\\\"}\",\"type\":\"response\"}"; @@ -370,9 +374,9 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo006, TestSize.Level1) g_ptrDeviceStateCallback->OnDeviceOnline(g_devInfo); OHOS::DelayedSingleton::GetInstance()->GetRemoteHapTokenInfo( - g_networkID, 0x20100000); + g_UDID, 0x20100000); - AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_networkID, 0x20100000); + AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_UDID, 0x20100000); ASSERT_EQ(mapID, (AccessTokenID)0); } @@ -405,9 +409,9 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo007, TestSize.Level1) g_ptrDeviceStateCallback->OnDeviceOnline(g_devInfo); OHOS::DelayedSingleton::GetInstance()->GetRemoteHapTokenInfo( - g_networkID, 0x20100000); + g_UDID, 0x20100000); - AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_networkID, 0x20100000); + AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_UDID, 0x20100000); ASSERT_EQ(mapID, (AccessTokenID)0); } @@ -436,7 +440,7 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo008, TestSize.Level1) "\\\"requestTokenId\\\":"; std::string tokenJsonStr = std::to_string(tokenID); std::string jsonAfter = ",\\\"requestVersion\\\":2,\\\"responseDeviceId\\\":\\\"\\\",\\\"responseVersion\\\":2," - "\\\"srcDeviceId\\\":\\\"deviceid-1\\\",\\\"srcDeviceLevel\\\":\\\"\\\",\\\"statusCode\\\":100001," + "\\\"srcDeviceId\\\":\\\"deviceid-1:udid-001\\\",\\\"srcDeviceLevel\\\":\\\"\\\",\\\"statusCode\\\":100001," "\\\"uniqueId\\\":\\\"SyncRemoteHapTokenCommand\\\"}\",\"type\":\"request\"}"; // create recv message @@ -477,7 +481,7 @@ HWTEST_F(TokenSyncServiceTest, SyncNativeTokens001, TestSize.Level1) "{\\\"apl\\\":3,\\\"processName\\\":\\\"attest1\\\",\\\"tokenAttr\\\":0,\\\"tokenId\\\":671088641," "\\\"version\\\":1,\\\"dcaps\\\":[\\\"SYSDCAP\\\",\\\"DMSDCAP\\\"]}]," "\\\"commandName\\\":\\\"SyncRemoteNativeTokenCommand\\\"," - "\\\"dstDeviceId\\\":\\\"deviceid-1\\\",\\\"dstDeviceLevel\\\":\\\"\\\",\\\"message\\\":\\\"success\\\"," + "\\\"dstDeviceId\\\":\\\"deviceid-1:udid-001\\\",\\\"dstDeviceLevel\\\":\\\"\\\",\\\"message\\\":\\\"success\\\"," "\\\"requestVersion\\\":2,\\\"responseDeviceId\\\":\\\"deviceid-1:udid-001\\\"," "\\\"responseVersion\\\":2,\\\"srcDeviceId\\\":\\\"local:udid-001\\\"," "\\\"srcDeviceLevel\\\":\\\"\\\",\\\"statusCode\\\":0,\\\"uniqueId\\\":\\\"SyncRemoteNativeTokenCommand\\\"}\"," @@ -489,14 +493,14 @@ HWTEST_F(TokenSyncServiceTest, SyncNativeTokens001, TestSize.Level1) sleep(6); - AccessTokenID mapID = AccessTokenKit::GetRemoteNativeTokenID(g_networkID, 0x28000000); + AccessTokenID mapID = AccessTokenKit::GetRemoteNativeTokenID(g_UDID, 0x28000000); ASSERT_NE(mapID, (AccessTokenID)0); int ret = AccessTokenKit::CheckNativeDCap(mapID, "SYSDCAP"); ASSERT_EQ(ret, RET_SUCCESS); ret = AccessTokenKit::CheckNativeDCap(mapID, "DMSDCAP"); ASSERT_EQ(ret, RET_SUCCESS); - mapID = AccessTokenKit::GetRemoteNativeTokenID(g_networkID, 0x28000001); + mapID = AccessTokenKit::GetRemoteNativeTokenID(g_UDID, 0x28000001); ASSERT_NE(mapID, (AccessTokenID)0); ret = AccessTokenKit::CheckNativeDCap(mapID, "SYSDCAP"); ASSERT_EQ(ret, RET_SUCCESS); @@ -533,14 +537,14 @@ HWTEST_F(TokenSyncServiceTest, SyncNativeTokens002, TestSize.Level1) sleep(6); - AccessTokenID mapID = AccessTokenKit::GetRemoteNativeTokenID(g_networkID, 0x28000000); + AccessTokenID mapID = AccessTokenKit::GetRemoteNativeTokenID(g_UDID, 0x28000000); ASSERT_NE(mapID, (AccessTokenID)0); int ret = AccessTokenKit::CheckNativeDCap(mapID, "SYSDCAP"); ASSERT_EQ(ret, RET_SUCCESS); ret = AccessTokenKit::CheckNativeDCap(mapID, "DMSDCAP"); ASSERT_EQ(ret, RET_SUCCESS); - mapID = AccessTokenKit::GetRemoteNativeTokenID(g_networkID, 0x28000001); + mapID = AccessTokenKit::GetRemoteNativeTokenID(g_UDID, 0x28000001); ASSERT_EQ(mapID, (AccessTokenID)0); } @@ -573,10 +577,10 @@ HWTEST_F(TokenSyncServiceTest, SyncNativeTokens003, TestSize.Level1) sleep(6); - AccessTokenID mapID = AccessTokenKit::GetRemoteNativeTokenID(g_networkID, 0x28000000); + AccessTokenID mapID = AccessTokenKit::GetRemoteNativeTokenID(g_UDID, 0x28000000); ASSERT_EQ(mapID, (AccessTokenID)0); - mapID = AccessTokenKit::GetRemoteNativeTokenID(g_networkID, 0x28000001); + mapID = AccessTokenKit::GetRemoteNativeTokenID(g_UDID, 0x28000001); ASSERT_EQ(mapID, (AccessTokenID)0); } @@ -610,10 +614,10 @@ HWTEST_F(TokenSyncServiceTest, SyncNativeTokens004, TestSize.Level1) sleep(6); - AccessTokenID mapID = AccessTokenKit::GetRemoteNativeTokenID(g_networkID, 0x28000000); + AccessTokenID mapID = AccessTokenKit::GetRemoteNativeTokenID(g_UDID, 0x28000000); ASSERT_EQ(mapID, (AccessTokenID)0); - mapID = AccessTokenKit::GetRemoteNativeTokenID(g_networkID, 0x28000001); + mapID = AccessTokenKit::GetRemoteNativeTokenID(g_UDID, 0x28000001); ASSERT_EQ(mapID, (AccessTokenID)0); } @@ -702,9 +706,9 @@ HWTEST_F(TokenSyncServiceTest, UpdateRemoteHapTokenCommand001, TestSize.Level1) g_ptrDeviceStateCallback->OnDeviceOnline(g_devInfo); sleep(6); - int ret = AccessTokenKit::SetRemoteHapTokenInfo(g_networkID, g_remoteHapInfo); + int ret = AccessTokenKit::SetRemoteHapTokenInfo(g_UDID, g_remoteHapInfo); ASSERT_EQ(ret, RET_SUCCESS); - AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_networkID, 0x20000001); + AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_UDID, 0x20000001); ASSERT_NE(mapID, 0); HapTokenInfo mapInfo; @@ -784,9 +788,9 @@ HWTEST_F(TokenSyncServiceTest, DeleteRemoteTokenCommand001, TestSize.Level1) g_ptrDeviceStateCallback->OnDeviceOnline(g_devInfo); - int ret = AccessTokenKit::SetRemoteHapTokenInfo(g_networkID, g_remoteHapInfo); + int ret = AccessTokenKit::SetRemoteHapTokenInfo(g_UDID, g_remoteHapInfo); ASSERT_EQ(ret, RET_SUCCESS); - AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_networkID, 0x20000001); + AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_UDID, 0x20000001); ASSERT_NE(mapID, 0); HapTokenInfo mapInfo; @@ -826,9 +830,9 @@ HWTEST_F(TokenSyncServiceTest, DeviceOffline001, TestSize.Level1) // device online g_ptrDeviceStateCallback->OnDeviceOnline(g_devInfo); - int ret = AccessTokenKit::SetRemoteHapTokenInfo(g_networkID, g_remoteHapInfo); + int ret = AccessTokenKit::SetRemoteHapTokenInfo(g_UDID, g_remoteHapInfo); ASSERT_EQ(ret, RET_SUCCESS); - AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_networkID, 0x20000001); + AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_UDID, 0x20000001); ASSERT_NE(mapID, 0); HapTokenInfo mapInfo; @@ -840,4 +844,5 @@ HWTEST_F(TokenSyncServiceTest, DeviceOffline001, TestSize.Level1) ret = AccessTokenKit::GetHapTokenInfo(mapID, mapInfo); ASSERT_EQ(ret, RET_FAILED); + }