openharmony/device_manager
1
0
Fork 0
mirror of https://github.com/openharmony/device_manager.git synced 2026-07-19 10:12:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

bug fix

Browse Source 
Signed-off-by: yuqianyuan <yuqianyuan@huawei.com>
This commit is contained in:
yuqianyuan
2021-09-16 16:55:46 +08:00
parent 4cd4cfdfc5
commit 08f02607bf
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/devicemanagerservice/src/ipc/standard/ipc_cmd_parser.cpp
+2 -2
View File
@@ -265,8 +265,8 @@ ON_IPC_CMD(AUTHENTICATE_DEVICE, MessageParcel &data, MessageParcel &reply)
uint8_t *appIcon = appIconLen > 0? (uint8_t *)data.ReadRawData(appIconLen) : nullptr;
uint8_t *appThumbnail = appThumbnailLen > 0? (uint8_t *)data.ReadRawData(appThumbnailLen) : nullptr;
DmAppImageInfo imageInfo(appIcon, appIconLen, appThumbnail, appThumbnailLen);
int32_t result = IpcServerAdapter::GetInstance().AuthenticateDevice(pkgName, *deviceInfo, imageInfo, extra);
DmAppImageInfo imageInfo(appIcon, appIconLen, appThumbnail, appThumbnailLen);
int32_t result = IpcServerAdapter::GetInstance().AuthenticateDevice(pkgName, *deviceInfo, imageInfo, extra);
if (!reply.WriteInt32(result)) {
DMLOG(DM_LOG_ERROR, "write result failed");
test/unittest/device_manager_impl_test.cpp
+9 -8
View File
@@ -66,7 +66,7 @@ HWTEST_F(DeviceManagerImplTest, AuthenticateDevice2, testing::ext::TestSize.Leve
std::shared_ptr<AuthenticateCallback> callback = nullptr;
std::shared_ptr<MockIpcClient> mockInstance = std::make_shared<MockIpcClient>();
DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance;
EXPECT_CALL(*mockInstance,SendRequest(testing::_,testing::_,testing::_))
EXPECT_CALL(*mockInstance, SendRequest(testing::_,testing::_,testing::_))
.Times(1).WillOnce(testing::Return(DEVICEMANAGER_FAILED));
int32_t ret= DeviceManager::GetInstance().AuthenticateDevice(packName, dmDeviceInfo,
dmAppImageInfo, extra, callback);
@@ -107,7 +107,7 @@ HWTEST_F(DeviceManagerImplTest, CheckAuthentication2, testing::ext::TestSize.Lev
std::shared_ptr<CheckAuthCallback> callback = nullptr;
std::shared_ptr<MockIpcClient> mockInstance = std::make_shared<MockIpcClient>();
DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance;
EXPECT_CALL(*mockInstance,SendRequest(testing::_,testing::_,testing::_))
EXPECT_CALL(*mockInstance, SendRequest(testing::_,testing::_,testing::_))
.Times(1).WillOnce(testing::Return(DEVICEMANAGER_FAILED));
int32_t ret= DeviceManager::GetInstance().CheckAuthentication(packName, authPara, callback);
ASSERT_EQ(ret, DEVICEMANAGER_IPC_FAILED);
@@ -121,7 +121,7 @@ HWTEST_F(DeviceManagerImplTest, CheckAuthentication3, testing::ext::TestSize.Lev
std::shared_ptr<CheckAuthCallback> callback = nullptr;
std::shared_ptr<MockIpcClient> mockInstance = std::make_shared<MockIpcClient>();
DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance;
EXPECT_CALL(*mockInstance,SendRequest(testing::_,testing::_,testing::_))
EXPECT_CALL(*mockInstance, SendRequest(testing::_,testing::_,testing::_))
.Times(1).WillOnce(testing::Return(DEVICEMANAGER_OK));
int32_t ret= DeviceManager::GetInstance().CheckAuthentication(packName, authPara, callback);
ASSERT_EQ(ret, DEVICEMANAGER_OK);
@@ -144,7 +144,7 @@ HWTEST_F(DeviceManagerImplTest, StartDeviceDiscovery2, testing::ext::TestSize.Le
test_callback_ = std::make_shared<DeviceDiscoverCallback>();
std::shared_ptr<MockIpcClient> mockInstance = std::make_shared<MockIpcClient>();
DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance;
EXPECT_CALL(*mockInstance,SendRequest(testing::_,testing::_,testing::_))
EXPECT_CALL(*mockInstance, SendRequest(testing::_,testing::_,testing::_))
.Times(1).WillOnce(testing::Return(DEVICEMANAGER_OK));
int32_t ret = DeviceManager::GetInstance().StartDeviceDiscovery(packName, subscribeInfo, test_callback_);
ASSERT_EQ(ret, DEVICEMANAGER_OK);
@@ -158,7 +158,7 @@ HWTEST_F(DeviceManagerImplTest, StartDeviceDiscovery3, testing::ext::TestSize.Le
test_callback_ = std::make_shared<DeviceDiscoverCallback>();
std::shared_ptr<MockIpcClient> mockInstance = std::make_shared<MockIpcClient>();
DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance;
EXPECT_CALL(*mockInstance,SendRequest(testing::_,testing::_,testing::_))
EXPECT_CALL(*mockInstance, SendRequest(testing::_,testing::_,testing::_))
.Times(1).WillOnce(testing::Return(DEVICEMANAGER_FAILED));
int32_t ret = DeviceManager::GetInstance().StartDeviceDiscovery(packName, subscribeInfo, test_callback_);
ASSERT_EQ(ret, DEVICEMANAGER_IPC_FAILED);
@@ -168,17 +168,18 @@ HWTEST_F(DeviceManagerImplTest, StartDeviceDiscovery3, testing::ext::TestSize.Le
void DeviceDiscoverCallback::OnDiscoverySuccess(uint16_t subscribeId)
{
(void)subscribeId;
}
void DeviceDiscoverCallback::OnDiscoverFailed(uint16_t subscribeId, int32_t failedReason)
{
(void)subscribeId;
(void)failedReason;
}
void DeviceDiscoverCallback::OnDeviceFound(uint16_t subscribeId, const DmDeviceInfo &deviceInfo)
{
(void)subscribeId;
}
} // namespace Vsync
} // namespace OHOS
test/unittest/device_manager_impl_test.h
+1 -1
View File
@@ -36,7 +36,7 @@ private:
std::shared_ptr<DiscoverCallback> test_callback_ = nullptr;
};
class DeviceDiscoverCallback : public DiscoverCallback{
class DeviceDiscoverCallback : public DiscoverCallback {
public:
DeviceDiscoverCallback() : DiscoverCallback() {}
virtual ~DeviceDiscoverCallback() override {}
test/unittest/mock/mock_ipc_client_proxy.h
+1 -1
View File
@@ -23,7 +23,7 @@
namespace OHOS {
namespace DistributedHardware {
class MockIpcClient : public IpcClientProxy, public RefBase{
class MockIpcClientProxy : public IpcClientProxy, public RefBase {
public:
MOCK_METHOD3(SendRequest, int32_t(int32_t cmdCode, std::shared_ptr<IpcReq> req, std::shared_ptr<IpcRsp> rsp));
};