diff --git a/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_c_test.cpp b/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_c_test.cpp index f31fc00d46642d99b3fc52d9a216844eceefddfb..fee9c7e278a1051a5f2962091f64c7b4c3ee8f1f 100644 --- a/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_c_test.cpp +++ b/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_c_test.cpp @@ -817,11 +817,15 @@ HWTEST_F(HdfServiceMangerHdiCTest, ServMgrTest019, TestSize.Level1) int ret = servmgr->RegisterServiceStatusListener(servmgr, listener, DEVICE_CLASS_DEFAULT); ASSERT_TRUE(ret == HDF_SUCCESS); ret = servmgr->UnregisterServiceStatusListener(servmgr, listener); - ASSERT_TRUE(ret != HDF_SUCCESS); + ASSERT_TRUE(ret == HDF_SUCCESS); struct HdiServiceSet *serviceSet = (struct HdiServiceSet *)OsalMemAlloc(sizeof(struct HdiServiceSet)); serviceSet->count = 20; ret = HdiServiceSetRelease(serviceSet); ASSERT_TRUE(ret != HDF_SUCCESS); HdiServiceStatusListenerFree(listener); + ret = HdfRemoteServiceRegister(-1, NULL); + ASSERT_TRUE(ret != HDF_SUCCESS); + int status = HdfRemoteServiceDefaultDispatch(NULL, 0, NULL, NULL); + ASSERT_TRUE(status != HDF_SUCCESS); } } // namespace OHOS \ No newline at end of file diff --git a/adapter/uhdf2/host/test/unittest/devhost_test.cpp b/adapter/uhdf2/host/test/unittest/devhost_test.cpp index cf51c647b55d452c432671b807015be9123ae306..81384ea0165fb04518d81382d4fd8e479b4e9b5a 100644 --- a/adapter/uhdf2/host/test/unittest/devhost_test.cpp +++ b/adapter/uhdf2/host/test/unittest/devhost_test.cpp @@ -78,7 +78,7 @@ HWTEST_F(DevHostTest, DevHostDevMgrServiceProxyTest, TestSize.Level1) ASSERT_TRUE(ret != HDF_SUCCESS); const char *name = "test_svcName"; ret = instance->LoadDevice(instance, name); - ASSERT_TRUE(ret != HDF_SUCCESS); + ASSERT_TRUE(ret == HDF_SUCCESS); struct DevmgrServiceProxy *proxy = reinterpret_cast(object); HdfRemoteServiceRecycle(proxy->remote); @@ -324,8 +324,10 @@ HWTEST_F(DevHostTest, DevHostDeviceNodeTest3, TestSize.Level1) deviceInfo.deviceName = "test_module"; struct HdfDeviceNode *devNode = HdfDeviceNodeNewInstance(&deviceInfo, &driver); ASSERT_TRUE(devNode != nullptr); + int32_t ret = HdfDeviceNodePublishPublicService(devNode); + ASSERT_TRUE(ret != HDF_SUCCESS); struct IDeviceNode *nodeIf = &devNode->super; - int32_t ret = HdfDeviceNodeAddPowerStateListener(devNode, nullptr); + ret = HdfDeviceNodeAddPowerStateListener(devNode, nullptr); ASSERT_TRUE(ret == HDF_SUCCESS); ret = HdfDeviceNodeAddPowerStateListener(devNode, nullptr); ASSERT_TRUE(ret != HDF_SUCCESS); @@ -333,8 +335,6 @@ HWTEST_F(DevHostTest, DevHostDeviceNodeTest3, TestSize.Level1) HdfDeviceNodeRemovePowerStateListener(nullptr, nullptr); HdfDeviceNodeRemovePowerStateListener(devNode, nullptr); HdfDeviceNodeRemovePowerStateListener(devNode, nullptr); - ret = HdfDeviceNodePublishPublicService(devNode); - ASSERT_TRUE(ret != HDF_SUCCESS); devNode->deviceObject.service = nullptr; ret = HdfDeviceNodePublishPublicService(devNode); ASSERT_TRUE(ret != HDF_SUCCESS); diff --git a/framework/core/manager/test/unittest/common/hdf_remote_adapter_test.cpp b/framework/core/manager/test/unittest/common/hdf_remote_adapter_test.cpp index 04754bffc08fdb97fa6d88fa2d9010d2a3a90f2d..8355981452981e492f935dc4b55c7509e7f73126 100644 --- a/framework/core/manager/test/unittest/common/hdf_remote_adapter_test.cpp +++ b/framework/core/manager/test/unittest/common/hdf_remote_adapter_test.cpp @@ -67,7 +67,7 @@ HWTEST_F(HdfRemoteAdapterTest, HdfRemoteAdapterTest002, TestSize.Level1) ret = HdfRemoteAdapterAddService(serviceName, remoteService); ASSERT_TRUE(ret != HDF_SUCCESS); ret = HdfRemoteAdapterAddSa(-1, remoteService); - ASSERT_TRUE(ret != HDF_SUCCESS); + ASSERT_TRUE(ret == HDF_SUCCESS); HdfRemoteService *remote = HdfRemoteAdapterGetService(NULL); ASSERT_EQ(remote, nullptr); @@ -172,6 +172,9 @@ HWTEST_F(HdfRemoteAdapterTest, HdfRemoteAdapterTest007, TestSize.Level1) ASSERT_TRUE(status); status = HdfRemoteServiceCheckInterfaceToken(service, sBuf); ASSERT_FALSE(status); + HdfSBuf *data = HdfSbufTypedObtain(SBUF_IPC); + HdfSBuf *reply = HdfSbufTypedObtain(SBUF_IPC); + HdfRemoteAdapterDefaultDispatch(service, 0, data, reply); HdfRemoteServiceRecycle(service); } } // namespace OHOS