From acf39d2580628daa1e168dbe6b92729439976654 Mon Sep 17 00:00:00 2001 From: huyx Date: Tue, 13 Aug 2024 20:45:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=A6=86=E7=9B=96=E7=8E=87=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- .../uhdf2/hdi/test/servmgr/service_manager_hdi_c_test.cpp | 6 +++++- adapter/uhdf2/host/test/unittest/devhost_test.cpp | 2 +- .../test/unittest/common/hdf_remote_adapter_test.cpp | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) 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 f31fc00d4..fee9c7e27 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 cf51c647b..7c0c6e63f 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); 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 04754bffc..835598145 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 -- Gitee From 7dc2f6d610b971135870cd40d6bd9ca23476a6e1 Mon Sep 17 00:00:00 2001 From: huyx Date: Wed, 14 Aug 2024 14:19:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A6=86=E7=9B=96=E7=8E=87=E6=8F=90?= =?UTF-8?q?=E5=8D=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- .../test/servmgr/service_manager_hdi_c_test.cpp | 4 ++++ adapter/uhdf2/host/test/unittest/devhost_test.cpp | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) 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 fee9c7e27..a627a3aab 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 @@ -812,6 +812,10 @@ HWTEST_F(HdfServiceMangerHdiCTest, HdiSupportTest, TestSize.Level1) HWTEST_F(HdfServiceMangerHdiCTest, ServMgrTest019, TestSize.Level1) { struct ServiceStatusListener *listener = HdiServiceStatusListenerNewInstance(); + struct ServstatListenerStub *stub = CONTAINER_OF(listener, struct ServstatListenerStub, listener); + struct HdfSBuf *dataSbuf = HdfSbufTypedObtain(SBUF_IPC); + struct HdfSBuf *replySbuf = HdfSbufTypedObtain(SBUF_IPC); + stub->remote->dispatcher->Dispatch(nullptr, -1, dataSbuf, replySbuf); HdiServiceStatusListenerFree(nullptr); struct HDIServiceManager *servmgr = HDIServiceManagerGet(); int ret = servmgr->RegisterServiceStatusListener(servmgr, listener, DEVICE_CLASS_DEFAULT); diff --git a/adapter/uhdf2/host/test/unittest/devhost_test.cpp b/adapter/uhdf2/host/test/unittest/devhost_test.cpp index 7c0c6e63f..2fadc7d0b 100644 --- a/adapter/uhdf2/host/test/unittest/devhost_test.cpp +++ b/adapter/uhdf2/host/test/unittest/devhost_test.cpp @@ -226,6 +226,10 @@ HWTEST_F(DevHostTest, DevHostDeviceNodeTest1, TestSize.Level1) int32_t ret = HdfDeviceNodeRemoveService(devNode); ASSERT_TRUE(ret == HDF_SUCCESS); + devNode->servStatus = true; + ret = HdfDeviceNodeRemoveService(devNode); + ASSERT_TRUE(ret == HDF_SUCCESS); + ret = DeviceDriverBind(devNode); ASSERT_TRUE(ret == HDF_SUCCESS); HdfDeviceNodeFreeInstance(devNode); @@ -324,6 +328,8 @@ HWTEST_F(DevHostTest, DevHostDeviceNodeTest3, TestSize.Level1) deviceInfo.deviceName = "test_module"; struct HdfDeviceNode *devNode = HdfDeviceNodeNewInstance(&deviceInfo, &driver); ASSERT_TRUE(devNode != nullptr); + ret = HdfDeviceNodePublishPublicService(devNode); + ASSERT_TRUE(ret != HDF_SUCCESS); struct IDeviceNode *nodeIf = &devNode->super; int32_t ret = HdfDeviceNodeAddPowerStateListener(devNode, nullptr); ASSERT_TRUE(ret == HDF_SUCCESS); @@ -333,14 +339,16 @@ 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); nodeIf->UnlaunchNode(nullptr); HdfDeviceNodeFreeInstance(nullptr); HdfDeviceNodeConstruct(nullptr); + devNode->devStatus = DEVNODE_LAUNCHED; + HdfDeviceNodeDestruct(devNode); + devNode->devStatus = 10; + HdfDeviceNodeDestruct(devNode); HdfDeviceNodeDestruct(nullptr); ret = HdfDeviceNodePublishPublicService(nullptr); ASSERT_TRUE(ret != HDF_SUCCESS); @@ -390,6 +398,8 @@ HWTEST_F(DevHostTest, DevHostDeviceTest, TestSize.Level1) ASSERT_TRUE(ret != HDF_SUCCESS); ret = HdfDeviceDetach(device, nullptr); ASSERT_TRUE(ret != HDF_SUCCESS); + ret = HdfDeviceDetach(device, devNode); + ASSERT_TRUE(ret != HDF_SUCCESS); devNode->servStatus = true; struct IDeviceNode *deviceIf = reinterpret_cast(object); ret = deviceIf->RemoveService(devNode); -- Gitee From c6dca42f8fcf8a31a4b43d475334463a6df52a69 Mon Sep 17 00:00:00 2001 From: huyx Date: Wed, 14 Aug 2024 14:22:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A6=86=E7=9B=96=E7=8E=87=E6=8F=90?= =?UTF-8?q?=E5=8D=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- adapter/uhdf2/host/test/unittest/devhost_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adapter/uhdf2/host/test/unittest/devhost_test.cpp b/adapter/uhdf2/host/test/unittest/devhost_test.cpp index 2fadc7d0b..6a3d52b17 100644 --- a/adapter/uhdf2/host/test/unittest/devhost_test.cpp +++ b/adapter/uhdf2/host/test/unittest/devhost_test.cpp @@ -328,10 +328,10 @@ HWTEST_F(DevHostTest, DevHostDeviceNodeTest3, TestSize.Level1) deviceInfo.deviceName = "test_module"; struct HdfDeviceNode *devNode = HdfDeviceNodeNewInstance(&deviceInfo, &driver); ASSERT_TRUE(devNode != nullptr); - ret = HdfDeviceNodePublishPublicService(devNode); + 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); -- Gitee From d631ea5ee6c2147232581b1132902531bf23d954 Mon Sep 17 00:00:00 2001 From: huyx Date: Wed, 14 Aug 2024 16:17:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A6=86=E7=9B=96=E7=8E=87=E6=8F=90?= =?UTF-8?q?=E5=8D=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- .../hdi/test/servmgr/service_manager_hdi_c_test.cpp | 4 ---- adapter/uhdf2/host/test/unittest/devhost_test.cpp | 10 ---------- 2 files changed, 14 deletions(-) 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 a627a3aab..fee9c7e27 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 @@ -812,10 +812,6 @@ HWTEST_F(HdfServiceMangerHdiCTest, HdiSupportTest, TestSize.Level1) HWTEST_F(HdfServiceMangerHdiCTest, ServMgrTest019, TestSize.Level1) { struct ServiceStatusListener *listener = HdiServiceStatusListenerNewInstance(); - struct ServstatListenerStub *stub = CONTAINER_OF(listener, struct ServstatListenerStub, listener); - struct HdfSBuf *dataSbuf = HdfSbufTypedObtain(SBUF_IPC); - struct HdfSBuf *replySbuf = HdfSbufTypedObtain(SBUF_IPC); - stub->remote->dispatcher->Dispatch(nullptr, -1, dataSbuf, replySbuf); HdiServiceStatusListenerFree(nullptr); struct HDIServiceManager *servmgr = HDIServiceManagerGet(); int ret = servmgr->RegisterServiceStatusListener(servmgr, listener, DEVICE_CLASS_DEFAULT); diff --git a/adapter/uhdf2/host/test/unittest/devhost_test.cpp b/adapter/uhdf2/host/test/unittest/devhost_test.cpp index 6a3d52b17..81384ea01 100644 --- a/adapter/uhdf2/host/test/unittest/devhost_test.cpp +++ b/adapter/uhdf2/host/test/unittest/devhost_test.cpp @@ -226,10 +226,6 @@ HWTEST_F(DevHostTest, DevHostDeviceNodeTest1, TestSize.Level1) int32_t ret = HdfDeviceNodeRemoveService(devNode); ASSERT_TRUE(ret == HDF_SUCCESS); - devNode->servStatus = true; - ret = HdfDeviceNodeRemoveService(devNode); - ASSERT_TRUE(ret == HDF_SUCCESS); - ret = DeviceDriverBind(devNode); ASSERT_TRUE(ret == HDF_SUCCESS); HdfDeviceNodeFreeInstance(devNode); @@ -345,10 +341,6 @@ HWTEST_F(DevHostTest, DevHostDeviceNodeTest3, TestSize.Level1) nodeIf->UnlaunchNode(nullptr); HdfDeviceNodeFreeInstance(nullptr); HdfDeviceNodeConstruct(nullptr); - devNode->devStatus = DEVNODE_LAUNCHED; - HdfDeviceNodeDestruct(devNode); - devNode->devStatus = 10; - HdfDeviceNodeDestruct(devNode); HdfDeviceNodeDestruct(nullptr); ret = HdfDeviceNodePublishPublicService(nullptr); ASSERT_TRUE(ret != HDF_SUCCESS); @@ -398,8 +390,6 @@ HWTEST_F(DevHostTest, DevHostDeviceTest, TestSize.Level1) ASSERT_TRUE(ret != HDF_SUCCESS); ret = HdfDeviceDetach(device, nullptr); ASSERT_TRUE(ret != HDF_SUCCESS); - ret = HdfDeviceDetach(device, devNode); - ASSERT_TRUE(ret != HDF_SUCCESS); devNode->servStatus = true; struct IDeviceNode *deviceIf = reinterpret_cast(object); ret = deviceIf->RemoveService(devNode); -- Gitee