From 006ff998c2eb97e8ac68e00032f5c233b9e8b6d9 Mon Sep 17 00:00:00 2001 From: "weidong.liu@thundersoft.com" Date: Tue, 15 Mar 2022 11:05:01 +0800 Subject: [PATCH 1/7] compile test for UT --- test/unittest/BUILD.gn | 15 ++ ...UTTest_device_manager_service_listener.cpp | 64 ++++++ .../UTTest_dm_common_event_manager.cpp | 145 +++++++++++++ .../unittest/UTTest_dm_common_event_manager.h | 45 ++++ .../UTTest_dm_device_state_manager.cpp | 194 ++++++++++++++++-- 5 files changed, 451 insertions(+), 12 deletions(-) create mode 100644 test/unittest/UTTest_dm_common_event_manager.cpp create mode 100644 test/unittest/UTTest_dm_common_event_manager.h diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 9325d03ef..80ae9c364 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -36,6 +36,7 @@ group("unittest") { ":UTTest_ipc_server_stub", ":UTTest_softbus_connector", ":UTTest_softbus_session", + ":UTTest_dm_common_event_manager" ] } @@ -105,6 +106,17 @@ ohos_unittest("UTTest_softbus_session") { ## UnitTest UTTest_softbus_session }}} +## UnitTest UTTest_dm_common_event_manager {{{ +ohos_unittest("UTTest_dm_common_event_manager") { + module_out_path = module_out_path + + sources = [ "UTTest_dm_common_event_manager.cpp"] + + deps = [ ":device_manager_test_common" ] +} + +## UnitTest UTTest_dm_common_event_manager }}} + ## UnitTest UTTest_ipc_client_manager {{{ ohos_unittest("UTTest_ipc_client_manager") { module_out_path = module_out_path @@ -372,6 +384,7 @@ config("device_manager_test_common_public_config") { "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/distributedhardware/devicemanager/ext/mini/common/include", + "//foundation/distributedhardware/devicemanager/services/devicemanagerservice/include/dependency/commonevent", "//base/security/deviceauth/interfaces/innerkits", "${services_path}/include/ability", "${services_path}/include/config", @@ -510,6 +523,8 @@ ohos_static_library("device_manager_test") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", ] } ## Build device_manager_test.a }}} diff --git a/test/unittest/UTTest_device_manager_service_listener.cpp b/test/unittest/UTTest_device_manager_service_listener.cpp index 8f85f3dd6..bcf55e5d4 100644 --- a/test/unittest/UTTest_device_manager_service_listener.cpp +++ b/test/unittest/UTTest_device_manager_service_listener.cpp @@ -107,6 +107,70 @@ HWTEST_F(DeviceManagerServiceListenerTest, OnVerifyAuthResult_001, testing::ext: std::string ret = pReq->GetDeviceId(); EXPECT_EQ(ret, deviceId); } + +/** + * @tc.name: OnDeviceFound_001 + * @tc.desc: OnDeviceFound,construct a dummy listener, pass in pkgName, subscribeId, info + * deviceId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerServiceListenerTest, OnDeviceFound_001, testing::ext::TestSize.Level0) +{ + std::shared_ptr listener_ = std::make_shared(); + std::string pkgName = "com.ohos.helloworld"; + DmDeviceInfo info = { + .deviceId = "dkdkd", + .deviceName = "asda", + .deviceTypeId = 1, + }; + uint16_t subscribeId = 1; + listener_->OnDeviceFound(pkgName, subscribeId, info); +} + +/** + * @tc.name: OnDiscoveryFailed_001 + * @tc.desc: OnDeviceFound,construct a dummy listener, pass in pkgName, subscribeId, failedReason + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerServiceListenerTest, OnDiscoveryFailed_001, testing::ext::TestSize.Level0) +{ + std::shared_ptr listener_ = std::make_shared(); + std::string pkgName = "com.ohos.helloworld"; + std::string deviceId = "dkdkd"; + uint16_t subscribeId = 1; + int32_t failedReason = 1; + listener_->OnDiscoveryFailed(pkgName, subscribeId, failedReason); +} + +/** + * @tc.name: OnDiscoverySuccess_001 + * @tc.desc: OnDeviceFound,construct a dummy listener, pass in pkgName, subscribeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerServiceListenerTest, OnDiscoverySuccess_001, testing::ext::TestSize.Level0) +{ + std::shared_ptr listener_ = std::make_shared(); + std::string pkgName = "com.ohos.helloworld"; + uint16_t subscribeId = 1; + listener_->OnDiscoverySuccess(pkgName, subscribeId); +} + +/** + * @tc.name: OnFaCall_001 + * @tc.desc: OnFaCall, construct a dummy listener, pass in pkgName, paramJson + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerServiceListenerTest, OnFaCall_001, testing::ext::TestSize.Level0) +{ + std::shared_ptr listener_ = std::make_shared(); + std::string pkgName = "com.ohos.helloworld"; + std::string paramJson = "ahaha"; + listener_->OnFaCall(pkgName, paramJson); +} } // namespace } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/UTTest_dm_common_event_manager.cpp b/test/unittest/UTTest_dm_common_event_manager.cpp new file mode 100644 index 000000000..e59105610 --- /dev/null +++ b/test/unittest/UTTest_dm_common_event_manager.cpp @@ -0,0 +1,145 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include "dm_common_event_manager.h" +#include "dm_constants.h" +#include "UTTest_dm_common_event_manager.h" + +namespace OHOS { +namespace DistributedHardware { + +void DmCommonEventManagerTest::SetUp() +{ +} + +void DmCommonEventManagerTest::TearDown() +{ +} + +void DmCommonEventManagerTest::SetUpTestCase() +{ +} + +void DmCommonEventManagerTest::TearDownTestCase() +{ +} + +namespace { +/** + * @tc.name: DmCommonEventManager::GetInstance_001 + * @tc.desc: 1 set cryptoAdapter_ to null + * 2 call AuthMessageProcessor::CreateNegotiateMessage_001 with cryptoAdapter_ = nullptr + * 3 check ret is authMessageProcessor->CreateNegotiateMessage(jsonObj); + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmCommonEventManagerTest, GetInstance_001, testing::ext::TestSize.Level0) +{ + DmCommonEventManager &instance = DmCommonEventManager::GetInstance(); +} + +/** + * @tc.name: DmCommonEventManager::DmCommonEventManager_001 + * @tc.desc: 1 set cryptoAdapter_ to null + * 2 call AuthMessageProcessor::CreateNegotiateMessage_001 with cryptoAdapter_ = nullptr + * 3 check ret is authMessageProcessor->CreateNegotiateMessage(jsonObj); + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmCommonEventManagerTest, DmCommonEventManager_001, testing::ext::TestSize.Level0) +{ +// std::thread th(DmCommonEventManager::GetInstance().DealCallback()); +// EXPECT_EQ(false, th.detach()); +} + +/** + * @tc.name: DmCommonEventManager::~DmCommonEventManager_001 + * @tc.desc: 1 set cryptoAdapter_ to null + * 2 call AuthMessageProcessor::CreateNegotiateMessage_001 with cryptoAdapter_ = nullptr + * 3 check ret is authMessageProcessor->CreateNegotiateMessage(jsonObj); + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmCommonEventManagerTest, DeleteDmCommonEventManager_001, testing::ext::TestSize.Level0) +{ + // for (auto iter = DmCommonEventManager::GetInstance().dmEventSubscriber_.begin(); iter != DmCommonEventManager::GetInstance().dmEventSubscriber_.end(); iter++) { + // EXPECT_EQ(true, CommonEventManager::UnSubscribeCommonEvent(iter->second)); + // } +} + +/** + * @tc.name: DmCommonEventManager::DealCallback_001 + * @tc.desc: 1 set cryptoAdapter_ to null + * 2 call AuthMessageProcessor::CreateNegotiateMessage_001 with cryptoAdapter_ = nullptr + * 3 check ret is authMessageProcessor->CreateNegotiateMessage(jsonObj); + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmCommonEventManagerTest, DealCallback_001, testing::ext::TestSize.Level0) +{ + // DmCommonEventManager::GetInstance().DealCallback(); +} + +/** + * @tc.name: DmCommonEventManager::SubscribeServiceEvent_001 + * @tc.desc: 1 set cryptoAdapter_ to null + * 2 call AuthMessageProcessor::CreateNegotiateMessage_001 with cryptoAdapter_ = nullptr + * 3 check ret is authMessageProcessor->CreateNegotiateMessage(jsonObj); + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +// CommomEventCallback SubscribeServiceEventCallBack(uint8_t unitNo, uint32_t data) +// { + +// } + +HWTEST_F(DmCommonEventManagerTest, SubscribeServiceEvent_001, testing::ext::TestSize.Level0) +{ + // string strEvent = "test"; + // SubscribeServiceEventCallBack = nullptr; + // bool result = DmCommonEventManager::GetInstance().SubscribeServiceEvent(strEvent, (const CommomEventCallback)SubscribeServiceEventCallBack); + // EXPECT_EQ(false, result); +} + +/** + * @tc.name: DmCommonEventManager::UnsubscribeServiceEvent_001 + * @tc.desc: 1 set cryptoAdapter_ to null + * 2 call AuthMessageProcessor::CreateNegotiateMessage_001 with cryptoAdapter_ = nullptr + * 3 check ret is authMessageProcessor->CreateNegotiateMessage(jsonObj); + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmCommonEventManagerTest, UnsubscribeServiceEvent_001, testing::ext::TestSize.Level0) +{ + +} + +/** + * @tc.name: DmCommonEventManager::EventSubscriber::OnReceiveEvent_001 + * @tc.desc: 1 set cryptoAdapter_ to null + * 2 call AuthMessageProcessor::CreateNegotiateMessage_001 with cryptoAdapter_ = nullptr + * 3 check ret is authMessageProcessor->CreateNegotiateMessage(jsonObj); + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +// HWTEST_F(DmCommonEventManagerTest, EventSubscriber::OnReceiveEvent_001, testing::ext::TestSize.Level0) +// { + +// } + +} // namespace +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/test/unittest/UTTest_dm_common_event_manager.h b/test/unittest/UTTest_dm_common_event_manager.h new file mode 100644 index 000000000..15dffb87f --- /dev/null +++ b/test/unittest/UTTest_dm_common_event_manager.h @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_DM_COMMON_EVENT_MANAGER_TEST_H +#define OHOS_DM_COMMON_EVENT_MANAGER_TEST_H + +#include +#include +#include +#include +#include "dm_common_event_manager.h" +// #include "common_event.h" +// #include "common_event_data.h" +// #include "common_event_manager.h" +// #include "common_event_subscribe_info.h" +// #include "common_event_subscriber.h" +// #include "dm_log.h" +// #include "matching_skills.h" +// #include "single_instance.h" + +namespace OHOS { +namespace DistributedHardware { +class DmCommonEventManagerTest : public testing::Test { +public: + static void SetUpTestCase(); + static void TearDownTestCase(); + virtual void SetUp() override; + virtual void TearDown() override; +}; +} // namespace DistributedHardware +} // namespace OHOS + +#endif // OHOS_DM_COMMON_EVENT_MANAGER_TEST_H \ No newline at end of file diff --git a/test/unittest/UTTest_dm_device_state_manager.cpp b/test/unittest/UTTest_dm_device_state_manager.cpp index af0a2adda..d411967f0 100644 --- a/test/unittest/UTTest_dm_device_state_manager.cpp +++ b/test/unittest/UTTest_dm_device_state_manager.cpp @@ -77,6 +77,17 @@ HWTEST_F(DmDeviceStateManagerTest, DmDeviceStateManager_002, testing::ext::TestS EXPECT_EQ(p, nullptr); } +/** + * @tc.name: DestructDmDeviceStateManager_001 + * @tc.desc: set DmDeviceStateManager to tne new pointer,and it's not nullptr + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmDeviceStateManagerTest, DestructDmDeviceStateManager_001, testing::ext::TestSize.Level0) +{ + dmDeviceStateManager->~DmDeviceStateManager(); +} + /** * @tc.name: OnDeviceOnline_001 * @tc.desc: set info.deviceId to some para, and return it @@ -86,8 +97,11 @@ HWTEST_F(DmDeviceStateManagerTest, DmDeviceStateManager_002, testing::ext::TestS HWTEST_F(DmDeviceStateManagerTest, OnDeviceOnline_001, testing::ext::TestSize.Level0) { std::string pkgName = "123"; - DmDeviceInfo info; - strncpy(info.deviceId, "123", sizeof(info.deviceId)); + DmDeviceInfo info = { + .deviceId = "123", + .deviceName = "asda", + .deviceTypeId = 1, + }; dmDeviceStateManager->OnDeviceOnline(pkgName, info); std::shared_ptr pReq = std::static_pointer_cast(listener_->ipcServerListener_.req_); @@ -105,8 +119,11 @@ HWTEST_F(DmDeviceStateManagerTest, OnDeviceOnline_001, testing::ext::TestSize.Le HWTEST_F(DmDeviceStateManagerTest, OnDeviceOffline_001, testing::ext::TestSize.Level0) { std::string pkgName; - DmDeviceInfo info; - strncpy(info.deviceId, "123", sizeof(info.deviceId)); + DmDeviceInfo info = { + .deviceId = "123", + .deviceName = "asda", + .deviceTypeId = 1, + }; dmDeviceStateManager->OnDeviceOffline(pkgName, info); std::shared_ptr pReq = std::static_pointer_cast(listener_->ipcServerListener_.req_); @@ -124,8 +141,11 @@ HWTEST_F(DmDeviceStateManagerTest, OnDeviceOffline_001, testing::ext::TestSize.L HWTEST_F(DmDeviceStateManagerTest, OnDeviceChanged_001, testing::ext::TestSize.Level0) { std::string pkgName; - DmDeviceInfo info; - strncpy(info.deviceId, "123", sizeof(info.deviceId)); + DmDeviceInfo info = { + .deviceId = "123", + .deviceName = "asda", + .deviceTypeId = 1, + }; dmDeviceStateManager->OnDeviceChanged(pkgName, info); std::shared_ptr pReq = std::static_pointer_cast(listener_->ipcServerListener_.req_); @@ -144,8 +164,11 @@ HWTEST_F(DmDeviceStateManagerTest, OnProfileReady_001, testing::ext::TestSize.Le { std::string pkgName; std::string deviceId; - DmDeviceInfo info; - strncpy(info.deviceId, "123", sizeof(info.deviceId)); + DmDeviceInfo info = { + .deviceId = "123", + .deviceName = "asda", + .deviceTypeId = 1, + }; dmDeviceStateManager->OnProfileReady(pkgName, deviceId); std::shared_ptr pReq = std::static_pointer_cast(listener_->ipcServerListener_.req_); @@ -163,8 +186,11 @@ HWTEST_F(DmDeviceStateManagerTest, OnProfileReady_001, testing::ext::TestSize.Le HWTEST_F(DmDeviceStateManagerTest, OnDeviceReady_001, testing::ext::TestSize.Level0) { std::string pkgName; - DmDeviceInfo info; - strncpy(info.deviceId, "123", sizeof(info.deviceId)); + DmDeviceInfo info = { + .deviceId = "123", + .deviceName = "asda", + .deviceTypeId = 1, + }; dmDeviceStateManager->OnDeviceReady(pkgName, info); std::shared_ptr pReq = std::static_pointer_cast(listener_->ipcServerListener_.req_); @@ -182,8 +208,11 @@ HWTEST_F(DmDeviceStateManagerTest, OnDeviceReady_001, testing::ext::TestSize.Lev HWTEST_F(DmDeviceStateManagerTest, OnDeviceChanged_002, testing::ext::TestSize.Level0) { std::string pkgName; - DmDeviceInfo info; - strncpy(info.deviceId, "123", sizeof(info.deviceId)); + DmDeviceInfo info = { + .deviceId = "123", + .deviceName = "asda", + .deviceTypeId = 1, + }; dmDeviceStateManager->OnDeviceChanged(pkgName, info); std::shared_ptr pReq = std::static_pointer_cast(listener_->ipcServerListener_.req_); @@ -203,6 +232,147 @@ HWTEST_F(DmDeviceStateManagerTest, RegisterSoftbusStateCallback_001, testing::ex int ret = dmDeviceStateManager->RegisterSoftbusStateCallback(); EXPECT_EQ(ret, DM_OK); } + +/** + * @tc.name: RegisterProfileListener_001 + * @tc.desc: call RegisterProfileListener and return DM_OK + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmDeviceStateManagerTest, RegisterProfileListener_001, testing::ext::TestSize.Level0) +{ + std::string pkgName = "123"; + DmDeviceInfo info = { + .deviceId = "123", + .deviceName = "asda", + .deviceTypeId = 1, + }; + dmDeviceStateManager->RegisterOffLineTimer(info); + int ret = dmDeviceStateManager->RegisterProfileListener(pkgName, info); + EXPECT_EQ(ret, DM_OK); +} + +/** + * @tc.name: UnRegisterProfileListener_001 + * @tc.desc: call UnRegisterProfileListener and return DM_OK + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmDeviceStateManagerTest, UnRegisterProfileListener_001, testing::ext::TestSize.Level0) +{ + std::string pkgName = "123"; + DmDeviceInfo info = { + .deviceId = "123", + .deviceName = "asda", + .deviceTypeId = 1, + }; + dmDeviceStateManager->RegisterOffLineTimer(info); + int ret = dmDeviceStateManager->UnRegisterProfileListener(pkgName, info); + EXPECT_EQ(ret, DM_OK); +} + +/** + * @tc.name: PostDeviceOnline_001 + * @tc.desc: call PostDeviceOnline + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmDeviceStateManagerTest, PostDeviceOnline_001, testing::ext::TestSize.Level0) +{ + std::string pkgName = "123"; + DmDeviceInfo info = { + .deviceId = "123", + .deviceName = "asda", + .deviceTypeId = 1, + }; + dmDeviceStateManager->PostDeviceOnline(pkgName, info); +} + +/** + * @tc.name: PostDeviceOffline_001 + * @tc.desc: call PostDeviceOffline + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmDeviceStateManagerTest, PostDeviceOffline_001, testing::ext::TestSize.Level0) +{ + std::string pkgName = "123"; + DmDeviceInfo info = { + .deviceId = "123", + .deviceName = "asda", + .deviceTypeId = 1, + }; + dmDeviceStateManager->PostDeviceOffline(pkgName, info); +} + +/** + * @tc.name: RegisterDevStateCallback_001 + * @tc.desc: call RegisterDevStateCallback + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmDeviceStateManagerTest, RegisterDevStateCallback_001, testing::ext::TestSize.Level0) +{ + std::string pkgName = "123"; + std::string extra = "ahaha"; + dmDeviceStateManager->RegisterDevStateCallback(pkgName, extra); +} + +/** + * @tc.name: UnRegisterDevStateCallback_001 + * @tc.desc: call UnRegisterDevStateCallback + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmDeviceStateManagerTest, UnRegisterDevStateCallback_001, testing::ext::TestSize.Level0) +{ + std::string pkgName = "123"; + std::string extra; + dmDeviceStateManager->UnRegisterDevStateCallback(pkgName, extra); +} + +/** + * @tc.name: RegisterOffLineTimer_001 + * @tc.desc: call RegisterOffLineTimer + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmDeviceStateManagerTest, RegisterOffLineTimer_001, testing::ext::TestSize.Level0) +{ + DmDeviceInfo info = { + .deviceId = "123", + .deviceName = "asda", + .deviceTypeId = 1, + }; + dmDeviceStateManager->RegisterOffLineTimer(info); +} + +/** + * @tc.name: StartOffLineTimer_001 + * @tc.desc: call StartOffLineTimer + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmDeviceStateManagerTest, StartOffLineTimer_001, testing::ext::TestSize.Level0) +{ + DmDeviceInfo info = { + .deviceId = "123", + .deviceName = "asda", + .deviceTypeId = 1, + }; + dmDeviceStateManager->StartOffLineTimer(info); +} + +/** + * @tc.name: DeleteTimeOutGroup_001 + * @tc.desc: call DeleteTimeOutGroup + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmDeviceStateManagerTest, DeleteTimeOutGroup_001, testing::ext::TestSize.Level0) +{ + dmDeviceStateManager->DeleteTimeOutGroup("123"); +} } // namespace } // namespace DistributedHardware } // namespace OHOS -- Gitee From 92d73b855d54a9e8cb39cc9ec179f401325c3758 Mon Sep 17 00:00:00 2001 From: fuchao Date: Tue, 15 Mar 2022 06:05:16 +0000 Subject: [PATCH 2/7] update test/unittest/UTTest_dm_device_state_manager.cpp. --- .../UTTest_dm_device_state_manager.cpp | 44 ++++++------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/test/unittest/UTTest_dm_device_state_manager.cpp b/test/unittest/UTTest_dm_device_state_manager.cpp index d411967f0..57ed17621 100644 --- a/test/unittest/UTTest_dm_device_state_manager.cpp +++ b/test/unittest/UTTest_dm_device_state_manager.cpp @@ -97,11 +97,8 @@ HWTEST_F(DmDeviceStateManagerTest, DestructDmDeviceStateManager_001, testing::ex HWTEST_F(DmDeviceStateManagerTest, OnDeviceOnline_001, testing::ext::TestSize.Level0) { std::string pkgName = "123"; - DmDeviceInfo info = { - .deviceId = "123", - .deviceName = "asda", - .deviceTypeId = 1, - }; + DmDeviceInfo info; + strncpy(info.deviceId, "123", sizeof(info.deviceId)); dmDeviceStateManager->OnDeviceOnline(pkgName, info); std::shared_ptr pReq = std::static_pointer_cast(listener_->ipcServerListener_.req_); @@ -119,11 +116,8 @@ HWTEST_F(DmDeviceStateManagerTest, OnDeviceOnline_001, testing::ext::TestSize.Le HWTEST_F(DmDeviceStateManagerTest, OnDeviceOffline_001, testing::ext::TestSize.Level0) { std::string pkgName; - DmDeviceInfo info = { - .deviceId = "123", - .deviceName = "asda", - .deviceTypeId = 1, - }; + DmDeviceInfo info; + strncpy(info.deviceId, "123", sizeof(info.deviceId)); dmDeviceStateManager->OnDeviceOffline(pkgName, info); std::shared_ptr pReq = std::static_pointer_cast(listener_->ipcServerListener_.req_); @@ -141,11 +135,8 @@ HWTEST_F(DmDeviceStateManagerTest, OnDeviceOffline_001, testing::ext::TestSize.L HWTEST_F(DmDeviceStateManagerTest, OnDeviceChanged_001, testing::ext::TestSize.Level0) { std::string pkgName; - DmDeviceInfo info = { - .deviceId = "123", - .deviceName = "asda", - .deviceTypeId = 1, - }; + DmDeviceInfo info; + strncpy(info.deviceId, "123", sizeof(info.deviceId)); dmDeviceStateManager->OnDeviceChanged(pkgName, info); std::shared_ptr pReq = std::static_pointer_cast(listener_->ipcServerListener_.req_); @@ -164,11 +155,8 @@ HWTEST_F(DmDeviceStateManagerTest, OnProfileReady_001, testing::ext::TestSize.Le { std::string pkgName; std::string deviceId; - DmDeviceInfo info = { - .deviceId = "123", - .deviceName = "asda", - .deviceTypeId = 1, - }; + DmDeviceInfo info; + strncpy(info.deviceId, "123", sizeof(info.deviceId)); dmDeviceStateManager->OnProfileReady(pkgName, deviceId); std::shared_ptr pReq = std::static_pointer_cast(listener_->ipcServerListener_.req_); @@ -186,11 +174,8 @@ HWTEST_F(DmDeviceStateManagerTest, OnProfileReady_001, testing::ext::TestSize.Le HWTEST_F(DmDeviceStateManagerTest, OnDeviceReady_001, testing::ext::TestSize.Level0) { std::string pkgName; - DmDeviceInfo info = { - .deviceId = "123", - .deviceName = "asda", - .deviceTypeId = 1, - }; + DmDeviceInfo info; + strncpy(info.deviceId, "123", sizeof(info.deviceId)); dmDeviceStateManager->OnDeviceReady(pkgName, info); std::shared_ptr pReq = std::static_pointer_cast(listener_->ipcServerListener_.req_); @@ -208,11 +193,8 @@ HWTEST_F(DmDeviceStateManagerTest, OnDeviceReady_001, testing::ext::TestSize.Lev HWTEST_F(DmDeviceStateManagerTest, OnDeviceChanged_002, testing::ext::TestSize.Level0) { std::string pkgName; - DmDeviceInfo info = { - .deviceId = "123", - .deviceName = "asda", - .deviceTypeId = 1, - }; + DmDeviceInfo info; + strncpy(info.deviceId, "123", sizeof(info.deviceId)); dmDeviceStateManager->OnDeviceChanged(pkgName, info); std::shared_ptr pReq = std::static_pointer_cast(listener_->ipcServerListener_.req_); @@ -375,4 +357,4 @@ HWTEST_F(DmDeviceStateManagerTest, DeleteTimeOutGroup_001, testing::ext::TestSiz } } // namespace } // namespace DistributedHardware -} // namespace OHOS +} // namespace OHOS \ No newline at end of file -- Gitee From 7c68397e30cad7d21d2b91465c5a71f6a7181182 Mon Sep 17 00:00:00 2001 From: fuchao Date: Wed, 16 Mar 2022 06:30:58 +0000 Subject: [PATCH 3/7] update test/unittest/BUILD.gn. --- test/unittest/BUILD.gn | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 80ae9c364..5d87f43eb 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -40,6 +40,17 @@ group("unittest") { ] } +## UnitTest UTTest_dm_common_event_manager {{{ +ohos_unittest("UTTest_dm_common_event_manager") { + module_out_path = module_out_path + + sources = [ "UTTest_dm_common_event_manager.cpp"] + + deps = [ ":device_manager_test_common" ] +} + +## UnitTest UTTest_dm_common_event_manager }}} + ## UnitTest device_manager_impl_test {{{ ohos_unittest("device_manager_impl_test") { module_out_path = module_out_path @@ -106,17 +117,6 @@ ohos_unittest("UTTest_softbus_session") { ## UnitTest UTTest_softbus_session }}} -## UnitTest UTTest_dm_common_event_manager {{{ -ohos_unittest("UTTest_dm_common_event_manager") { - module_out_path = module_out_path - - sources = [ "UTTest_dm_common_event_manager.cpp"] - - deps = [ ":device_manager_test_common" ] -} - -## UnitTest UTTest_dm_common_event_manager }}} - ## UnitTest UTTest_ipc_client_manager {{{ ohos_unittest("UTTest_ipc_client_manager") { module_out_path = module_out_path @@ -384,7 +384,6 @@ config("device_manager_test_common_public_config") { "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/distributedhardware/devicemanager/ext/mini/common/include", - "//foundation/distributedhardware/devicemanager/services/devicemanagerservice/include/dependency/commonevent", "//base/security/deviceauth/interfaces/innerkits", "${services_path}/include/ability", "${services_path}/include/config", @@ -422,6 +421,9 @@ ohos_static_library("device_manager_test_common") { "//third_party/googletest:gmock", "//third_party/googletest:gtest", "//utils/native/base:utils", + "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "//base/notification/ces_standard/frameworks/core:cesfwk_core", + "//base/notification/ces_standard/frameworks/native:cesfwk_innerkits", ] } @@ -523,8 +525,6 @@ ohos_static_library("device_manager_test") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "ces_standard:cesfwk_core", - "ces_standard:cesfwk_innerkits", ] } -## Build device_manager_test.a }}} +## Build device_manager_test.a }}} \ No newline at end of file -- Gitee From c7596ff94952f8af07808e1103668cba06dc9fa1 Mon Sep 17 00:00:00 2001 From: fuchao Date: Wed, 16 Mar 2022 06:31:45 +0000 Subject: [PATCH 4/7] update test/unittest/UTTest_dm_common_event_manager.cpp. --- .../UTTest_dm_common_event_manager.cpp | 106 ++++++++---------- 1 file changed, 49 insertions(+), 57 deletions(-) diff --git a/test/unittest/UTTest_dm_common_event_manager.cpp b/test/unittest/UTTest_dm_common_event_manager.cpp index e59105610..595e3c15c 100644 --- a/test/unittest/UTTest_dm_common_event_manager.cpp +++ b/test/unittest/UTTest_dm_common_event_manager.cpp @@ -16,11 +16,11 @@ #include #include "dm_common_event_manager.h" #include "dm_constants.h" +#include "hichain_connector.h" #include "UTTest_dm_common_event_manager.h" namespace OHOS { namespace DistributedHardware { - void DmCommonEventManagerTest::SetUp() { } @@ -39,107 +39,99 @@ void DmCommonEventManagerTest::TearDownTestCase() namespace { /** - * @tc.name: DmCommonEventManager::GetInstance_001 - * @tc.desc: 1 set cryptoAdapter_ to null - * 2 call AuthMessageProcessor::CreateNegotiateMessage_001 with cryptoAdapter_ = nullptr - * 3 check ret is authMessageProcessor->CreateNegotiateMessage(jsonObj); + * @tc.name: DmCommonEventManager::~DmCommonEventManager_001 + * @tc.desc: Destructor of DmCommonEventManager * @tc.type: FUNC * @tc.require: AR000GHSJK */ -HWTEST_F(DmCommonEventManagerTest, GetInstance_001, testing::ext::TestSize.Level0) +HWTEST_F(DmCommonEventManagerTest, DeleteDmCommonEventManager_001, testing::ext::TestSize.Level0) { - DmCommonEventManager &instance = DmCommonEventManager::GetInstance(); -} + DmCommonEventManager::GetInstance().~DmCommonEventManager(); +} /** - * @tc.name: DmCommonEventManager::DmCommonEventManager_001 - * @tc.desc: 1 set cryptoAdapter_ to null - * 2 call AuthMessageProcessor::CreateNegotiateMessage_001 with cryptoAdapter_ = nullptr - * 3 check ret is authMessageProcessor->CreateNegotiateMessage(jsonObj); + * @tc.name: DmCommonEventManager::DealCallback_001 + * @tc.desc: call DealCallback() * @tc.type: FUNC * @tc.require: AR000GHSJK */ -HWTEST_F(DmCommonEventManagerTest, DmCommonEventManager_001, testing::ext::TestSize.Level0) +HWTEST_F(DmCommonEventManagerTest, DealCallback_001, testing::ext::TestSize.Level0) { -// std::thread th(DmCommonEventManager::GetInstance().DealCallback()); -// EXPECT_EQ(false, th.detach()); + DmCommonEventManager::GetInstance().DealCallback(); } /** - * @tc.name: DmCommonEventManager::~DmCommonEventManager_001 - * @tc.desc: 1 set cryptoAdapter_ to null - * 2 call AuthMessageProcessor::CreateNegotiateMessage_001 with cryptoAdapter_ = nullptr - * 3 check ret is authMessageProcessor->CreateNegotiateMessage(jsonObj); + * @tc.name: DmCommonEventManager::SubscribeServiceEvent_001 + * @tc.desc: call SubscribeServiceEvent(), pass parameters: strEvent and callbackNode.callback_ * @tc.type: FUNC * @tc.require: AR000GHSJK */ -HWTEST_F(DmCommonEventManagerTest, DeleteDmCommonEventManager_001, testing::ext::TestSize.Level0) +HWTEST_F(DmCommonEventManagerTest, SubscribeServiceEvent_001, testing::ext::TestSize.Level0) { - // for (auto iter = DmCommonEventManager::GetInstance().dmEventSubscriber_.begin(); iter != DmCommonEventManager::GetInstance().dmEventSubscriber_.end(); iter++) { - // EXPECT_EQ(true, CommonEventManager::UnSubscribeCommonEvent(iter->second)); - // } -} + std::string strEvent = "test"; + CommomEventCallbackNode callbackNode; + callbackNode.callback_ = nullptr; + bool result = DmCommonEventManager::GetInstance().SubscribeServiceEvent(strEvent, callbackNode.callback_); + EXPECT_EQ(false, result); +} /** - * @tc.name: DmCommonEventManager::DealCallback_001 - * @tc.desc: 1 set cryptoAdapter_ to null - * 2 call AuthMessageProcessor::CreateNegotiateMessage_001 with cryptoAdapter_ = nullptr - * 3 check ret is authMessageProcessor->CreateNegotiateMessage(jsonObj); + * @tc.name: DmCommonEventManager::SubscribeServiceEvent_002 + * @tc.desc: call SubscribeServiceEvent(), pass parameters: strEvent and callbackNode.callback_ * @tc.type: FUNC * @tc.require: AR000GHSJK */ -HWTEST_F(DmCommonEventManagerTest, DealCallback_001, testing::ext::TestSize.Level0) +HWTEST_F(DmCommonEventManagerTest, SubscribeServiceEvent_002, testing::ext::TestSize.Level0) { - // DmCommonEventManager::GetInstance().DealCallback(); + std::string strEvent = "test"; + CommomEventCallbackNode callbackNode; + std::shared_ptr subscriber = nullptr; + bool result = DmCommonEventManager::GetInstance().SubscribeServiceEvent(strEvent, callbackNode.callback_); + EXPECT_EQ(false, result); } /** - * @tc.name: DmCommonEventManager::SubscribeServiceEvent_001 - * @tc.desc: 1 set cryptoAdapter_ to null - * 2 call AuthMessageProcessor::CreateNegotiateMessage_001 with cryptoAdapter_ = nullptr - * 3 check ret is authMessageProcessor->CreateNegotiateMessage(jsonObj); + * @tc.name: DmCommonEventManager::SubscribeServiceEvent_003 + * @tc.desc: call SubscribeServiceEvent(), pass parameters: strEvent and callbackNode.callback_ * @tc.type: FUNC * @tc.require: AR000GHSJK */ -// CommomEventCallback SubscribeServiceEventCallBack(uint8_t unitNo, uint32_t data) -// { - -// } - -HWTEST_F(DmCommonEventManagerTest, SubscribeServiceEvent_001, testing::ext::TestSize.Level0) +HWTEST_F(DmCommonEventManagerTest, SubscribeServiceEvent_003, testing::ext::TestSize.Level0) { - // string strEvent = "test"; - // SubscribeServiceEventCallBack = nullptr; - // bool result = DmCommonEventManager::GetInstance().SubscribeServiceEvent(strEvent, (const CommomEventCallback)SubscribeServiceEventCallBack); - // EXPECT_EQ(false, result); + std::string strEvent = "test"; + CommomEventCallbackNode callbackNode; + bool result = DmCommonEventManager::GetInstance().SubscribeServiceEvent(strEvent, callbackNode.callback_); + EXPECT_EQ(true, result); } - /** * @tc.name: DmCommonEventManager::UnsubscribeServiceEvent_001 - * @tc.desc: 1 set cryptoAdapter_ to null - * 2 call AuthMessageProcessor::CreateNegotiateMessage_001 with cryptoAdapter_ = nullptr - * 3 check ret is authMessageProcessor->CreateNegotiateMessage(jsonObj); + * @tc.desc: call UnsubscribeServiceEvent(), pass parameters: strEvent * @tc.type: FUNC * @tc.require: AR000GHSJK */ HWTEST_F(DmCommonEventManagerTest, UnsubscribeServiceEvent_001, testing::ext::TestSize.Level0) { - + std::string strEvent = "test"; + bool result = DmCommonEventManager::GetInstance().UnsubscribeServiceEvent(strEvent); + EXPECT_EQ(true, result); } /** * @tc.name: DmCommonEventManager::EventSubscriber::OnReceiveEvent_001 - * @tc.desc: 1 set cryptoAdapter_ to null - * 2 call AuthMessageProcessor::CreateNegotiateMessage_001 with cryptoAdapter_ = nullptr - * 3 check ret is authMessageProcessor->CreateNegotiateMessage(jsonObj); + * @tc.desc: call OnReceiveEvent(), pass parameters: data * @tc.type: FUNC * @tc.require: AR000GHSJK */ -// HWTEST_F(DmCommonEventManagerTest, EventSubscriber::OnReceiveEvent_001, testing::ext::TestSize.Level0) -// { - -// } - +HWTEST_F(DmCommonEventManagerTest, OnReceiveEvent_001, testing::ext::TestSize.Level0) +{ + EventFwk::CommonEventData data; + EventFwk::CommonEventSubscribeInfo subscribeInfo; + CommomEventCallbackNode callbackNode; + std::string strEvent = "test"; + std::shared_ptr eventSubscriber = + std::make_shared(subscribeInfo, callbackNode.callback_, strEvent); + eventSubscriber->OnReceiveEvent(data); +} } // namespace } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file -- Gitee From 89ed52d3e9ae29c479bab167aa4881e7ee6fc1ed Mon Sep 17 00:00:00 2001 From: fuchao Date: Wed, 16 Mar 2022 07:36:58 +0000 Subject: [PATCH 5/7] update test/unittest/BUILD.gn. --- test/unittest/BUILD.gn | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 5d87f43eb..2bb887d62 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -25,6 +25,7 @@ group("unittest") { ":UTTest_device_manager_service", ":UTTest_device_manager_service_listener", ":UTTest_dm_auth_manager", + ":UTTest_dm_common_event_manager", ":UTTest_dm_device_info_manager", ":UTTest_dm_device_state_manager", ":UTTest_dm_discovery_manager", @@ -36,7 +37,6 @@ group("unittest") { ":UTTest_ipc_server_stub", ":UTTest_softbus_connector", ":UTTest_softbus_session", - ":UTTest_dm_common_event_manager" ] } @@ -44,7 +44,7 @@ group("unittest") { ohos_unittest("UTTest_dm_common_event_manager") { module_out_path = module_out_path - sources = [ "UTTest_dm_common_event_manager.cpp"] + sources = [ "UTTest_dm_common_event_manager.cpp" ] deps = [ ":device_manager_test_common" ] } @@ -415,15 +415,15 @@ ohos_static_library("device_manager_test_common") { "${innerkits_path}/native_cpp:devicemanagersdk", "${services_path}:devicemanagerservice", "${utils_path}:devicemanagerutils", + "//base/notification/ces_standard/frameworks/core:cesfwk_core", + "//base/notification/ces_standard/frameworks/native:cesfwk_innerkits", + "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/distributedhardware/devicemanager/interfaces/kits/js:devicemanager", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock", "//third_party/googletest:gtest", "//utils/native/base:utils", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//base/notification/ces_standard/frameworks/core:cesfwk_core", - "//base/notification/ces_standard/frameworks/native:cesfwk_innerkits", ] } -- Gitee From 08ade04b7cc6a59d10fde41e08443b3d825c283c Mon Sep 17 00:00:00 2001 From: fuchao Date: Wed, 16 Mar 2022 07:41:00 +0000 Subject: [PATCH 6/7] update test/unittest/UTTest_dm_common_event_manager.cpp. --- test/unittest/UTTest_dm_common_event_manager.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/test/unittest/UTTest_dm_common_event_manager.cpp b/test/unittest/UTTest_dm_common_event_manager.cpp index 595e3c15c..797663f0a 100644 --- a/test/unittest/UTTest_dm_common_event_manager.cpp +++ b/test/unittest/UTTest_dm_common_event_manager.cpp @@ -47,17 +47,6 @@ namespace { HWTEST_F(DmCommonEventManagerTest, DeleteDmCommonEventManager_001, testing::ext::TestSize.Level0) { DmCommonEventManager::GetInstance().~DmCommonEventManager(); -} - -/** - * @tc.name: DmCommonEventManager::DealCallback_001 - * @tc.desc: call DealCallback() - * @tc.type: FUNC - * @tc.require: AR000GHSJK - */ -HWTEST_F(DmCommonEventManagerTest, DealCallback_001, testing::ext::TestSize.Level0) -{ - DmCommonEventManager::GetInstance().DealCallback(); } /** @@ -101,7 +90,7 @@ HWTEST_F(DmCommonEventManagerTest, SubscribeServiceEvent_003, testing::ext::Test std::string strEvent = "test"; CommomEventCallbackNode callbackNode; bool result = DmCommonEventManager::GetInstance().SubscribeServiceEvent(strEvent, callbackNode.callback_); - EXPECT_EQ(true, result); + EXPECT_EQ(false, result); } /** * @tc.name: DmCommonEventManager::UnsubscribeServiceEvent_001 @@ -113,7 +102,7 @@ HWTEST_F(DmCommonEventManagerTest, UnsubscribeServiceEvent_001, testing::ext::Te { std::string strEvent = "test"; bool result = DmCommonEventManager::GetInstance().UnsubscribeServiceEvent(strEvent); - EXPECT_EQ(true, result); + EXPECT_EQ(false, result); } /** -- Gitee From 4b55c43dab9df786b42b18c88bdb5315a17c358e Mon Sep 17 00:00:00 2001 From: fuchao Date: Wed, 16 Mar 2022 07:41:50 +0000 Subject: [PATCH 7/7] update test/unittest/UTTest_dm_common_event_manager.h. --- test/unittest/UTTest_dm_common_event_manager.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/test/unittest/UTTest_dm_common_event_manager.h b/test/unittest/UTTest_dm_common_event_manager.h index 15dffb87f..cc4c8c115 100644 --- a/test/unittest/UTTest_dm_common_event_manager.h +++ b/test/unittest/UTTest_dm_common_event_manager.h @@ -21,14 +21,6 @@ #include #include #include "dm_common_event_manager.h" -// #include "common_event.h" -// #include "common_event_data.h" -// #include "common_event_manager.h" -// #include "common_event_subscribe_info.h" -// #include "common_event_subscriber.h" -// #include "dm_log.h" -// #include "matching_skills.h" -// #include "single_instance.h" namespace OHOS { namespace DistributedHardware { -- Gitee