From f21a31f90ce0100b0ba4ffbf915749a4e02a0f8e Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Wed, 19 Oct 2022 16:45:14 +0800 Subject: [PATCH 01/17] update ut Signed-off-by: wanderer-dl122 --- .../test/unittest/BUILD.gn | 3 +- .../unittest/common/accessmanager/BUILD.gn | 2 +- .../accessmanager/access_manager_test.cpp | 180 ++------------ .../BUILD.gn | 71 ++++++ ...tributed_hardware_manager_factory_test.cpp | 229 ++++++++++++++++++ 5 files changed, 318 insertions(+), 167 deletions(-) create mode 100644 services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/BUILD.gn create mode 100644 services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp diff --git a/services/distributedhardwarefwkservice/test/unittest/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/BUILD.gn index eb44ec1b..611a8e11 100644 --- a/services/distributedhardwarefwkservice/test/unittest/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/BUILD.gn @@ -15,11 +15,12 @@ group("test") { testonly = true deps = [ - "common/accessmanager:AccessManagerTest", + "common/accessmanager:access_manager_test", "common/componentloader:component_loader_test", "common/componentmanager:component_manager_test", "common/dbadapter:db_adapter_test", "common/distributedhardwaremanager:distributed_hardware_manager_test", + "common/distributedhardwaremanagerfactory:distributed_hardware_manager_factory_test", "common/distributedhardwareservice:distributed_hardware_service_test", "common/localhardwaremanager:local_hardware_manager_test", "common/resourcemanager:resource_manager_test", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index 212af2c6..519520b2 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -64,7 +64,7 @@ ohos_unittest("AccessManagerTest") { external_deps = [ "init:libbegetutil" ] } -group("unittest") { +group("access_manager_test") { testonly = true deps = [ ":AccessManagerTest" ] diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp index 49e18d06..34363a2d 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp @@ -33,16 +33,13 @@ enum class Status : uint32_t { DEVICE_OFFLINE = 1, }; -constexpr int32_t INTERVAL_TIME_MS = 100; -constexpr uint16_t TEST_DEV_TYPE_PAD = 0x11; - /* save networkId and uuid */ -const std::vector> TEST_DEVICES = { - { "11111111111111111111111111111111", "22222222222222222222222222222222" }, - { "33333333333333333333333333333333", "44444444444444444444444444444444" }, - { "55555555555555555555555555555555", "66666666666666666666666666666666" }, - { "77777777777777777777777777777777", "88888888888888888888888888888888" }, -}; +// const std::vector> TEST_DEVICES = { +// { "11111111111111111111111111111111", "22222222222222222222222222222222" }, +// { "33333333333333333333333333333333", "44444444444444444444444444444444" }, +// { "55555555555555555555555555555555", "66666666666666666666666666666666" }, +// { "77777777777777777777777777777777", "88888888888888888888888888888888" }, +// }; } class AccessManagerTest : public testing::Test { @@ -56,18 +53,10 @@ public: void AccessManagerTest::SetUp() { - // at last one device online, ensure sa not exit - std::string networkId = "00000000000000000000000000000000"; - std::string uuid = "99999999999999999999999999999999"; - DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, TEST_DEV_TYPE_PAD); } void AccessManagerTest::TearDown() { - // clear all the online devices - for (const auto &dev : TEST_DEVICES) { - DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent(dev.first, dev.second, TEST_DEV_TYPE_PAD); - } } void AccessManagerTest::SetUpTestCase() {} @@ -75,166 +64,27 @@ void AccessManagerTest::SetUpTestCase() {} void AccessManagerTest::TearDownTestCase() {} /** - * @tc.name: SendOnLineEvent_001 - * @tc.desc: Verify the online success - * @tc.type: FUNC - * @tc.require: AR000GHSJK - */ -HWTEST_F(AccessManagerTest, SendOnLineEvent_001, TestSize.Level1) -{ - ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); - - for (const auto &dev : TEST_DEVICES) { - auto ret = - DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(dev.first, dev.second, TEST_DEV_TYPE_PAD); - ASSERT_EQ(DH_FWK_SUCCESS, ret); - ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); - } -} - -/** - * @tc.name: SendOnLineEvent_002 - * @tc.desc: Verify the online failed - * @tc.type: FUNC - * @tc.require: AR000GHSJK - */ -HWTEST_F(AccessManagerTest, SendOnLineEvent_002, TestSize.Level1) -{ - ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); - - auto ret = - DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent("", TEST_DEVICES[0].second, TEST_DEV_TYPE_PAD); - ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); - ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); - - ret = - DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(TEST_DEVICES[0].first, "", TEST_DEV_TYPE_PAD); - ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); - ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); -} - -/** - * @tc.name: SendOffLineEvent_001 - * @tc.desc: Verify the offline success - * @tc.type: FUNC - * @tc.require: AR000GHSJM - */ -HWTEST_F(AccessManagerTest, SendOffLineEvent_001, TestSize.Level1) -{ - ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); - - for (const auto &dev : TEST_DEVICES) { - auto ret = - DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(dev.first, dev.second, TEST_DEV_TYPE_PAD); - ASSERT_EQ(DH_FWK_SUCCESS, ret); - ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); - } - - for (const auto &dev : TEST_DEVICES) { - auto ret = - DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent(dev.first, dev.second, TEST_DEV_TYPE_PAD); - ASSERT_EQ(DH_FWK_SUCCESS, ret); - } - ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); -} - -/** - * @tc.name: SendOffLineEvent_002 - * @tc.desc: Verify the offline failed - * @tc.type: FUNC - * @tc.require: AR000GHSJM - */ -HWTEST_F(AccessManagerTest, SendOffLineEvent_002, TestSize.Level1) -{ - ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); - - auto ret = DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent("", TEST_DEVICES[0].second, - TEST_DEV_TYPE_PAD); - ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); - ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); - - ret = - DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent(TEST_DEVICES[0].first, "", TEST_DEV_TYPE_PAD); - ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); - ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); -} - -/** - * @tc.name: SendOffLineEvent_003 - * @tc.desc: Verify the SendOnLineEvent for Multi-thread + * @tc.name: AccessManagerInit + * @tc.desc: Verify the Init function * @tc.type: FUNC * @tc.require: AR000GHSJM */ -HWTEST_F(AccessManagerTest, SendOffLineEvent_003, TestSize.Level0) +HWTEST_F(AccessManagerTest, AccessManagerInit, TestSize.Level0) { - auto handler = [this](Status status, std::string networkId, std::string uuid, int32_t expect) { - if (status == Status::DEVICE_ONLINE) { - std::lock_guard lock(testAccessMutex_); - std::this_thread::sleep_for(std::chrono::milliseconds(100)); - auto onlineResult = - DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, TEST_DEV_TYPE_PAD); - EXPECT_EQ(expect, onlineResult); - } else { - std::lock_guard lock(testAccessMutex_); - std::this_thread::sleep_for(std::chrono::milliseconds(90)); - auto offlineResult = - DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent(networkId, uuid, TEST_DEV_TYPE_PAD); - EXPECT_EQ(expect, offlineResult); - } - }; - - std::vector threadVec; - threadVec.emplace_back( - std::thread(handler, Status::DEVICE_ONLINE, TEST_DEVICES[0].first, TEST_DEVICES[0].second, DH_FWK_SUCCESS)); - std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); - - threadVec.emplace_back( - std::thread(handler, Status::DEVICE_ONLINE, TEST_DEVICES[1].first, TEST_DEVICES[1].second, DH_FWK_SUCCESS)); - std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); - - threadVec.emplace_back(std::thread(handler, Status::DEVICE_ONLINE, TEST_DEVICES[0].first, TEST_DEVICES[0].second, - ERR_DH_FWK_HARDWARE_MANAGER_DEVICE_REPEAT_ONLINE)); - std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); - - threadVec.emplace_back( - std::thread(handler, Status::DEVICE_ONLINE, TEST_DEVICES[2].first, TEST_DEVICES[2].second, DH_FWK_SUCCESS)); - std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); - - threadVec.emplace_back( - std::thread(handler, Status::DEVICE_ONLINE, TEST_DEVICES[3].first, TEST_DEVICES[3].second, DH_FWK_SUCCESS)); - std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); - - threadVec.emplace_back( - std::thread(handler, Status::DEVICE_OFFLINE, TEST_DEVICES[3].first, TEST_DEVICES[3].second, DH_FWK_SUCCESS)); - std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); - - threadVec.emplace_back(std::thread(handler, Status::DEVICE_OFFLINE, TEST_DEVICES[3].first, TEST_DEVICES[3].second, - ERR_DH_FWK_HARDWARE_MANAGER_DEVICE_REPEAT_OFFLINE)); - std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); - - threadVec.emplace_back( - std::thread(handler, Status::DEVICE_OFFLINE, TEST_DEVICES[1].first, TEST_DEVICES[1].second, DH_FWK_SUCCESS)); - std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); - - threadVec.emplace_back( - std::thread(handler, Status::DEVICE_OFFLINE, TEST_DEVICES[0].first, TEST_DEVICES[0].second, DH_FWK_SUCCESS)); - std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); - - threadVec.emplace_back( - std::thread(handler, Status::DEVICE_OFFLINE, TEST_DEVICES[2].first, TEST_DEVICES[2].second, DH_FWK_SUCCESS)); - - for_each(threadVec.begin(), threadVec.end(), [](std::thread &t) { t.join(); }); + EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); } /** - * @tc.name: AccessManagerInit + * @tc.name: OnDeviceOffline * @tc.desc: Verify the Init function * @tc.type: FUNC * @tc.require: AR000GHSJM */ -HWTEST_F(AccessManagerTest, AccessManagerInit, TestSize.Level0) +HWTEST_F(AccessManagerTest, OnDeviceOffline, TestSize.Level0) { - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); + DmDeviceInfo deviceInfo; + AccessManager::GetInstance()->OnDeviceOffline(deviceInfo); + EXPECT_EQ(DistributedHardwareManagerFactory::GetInstance().IsInit(), false); } } // namespace DistributedHardware } // namespace OHOS diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/BUILD.gn new file mode 100644 index 00000000..c5219651 --- /dev/null +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/BUILD.gn @@ -0,0 +1,71 @@ +# 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. + +import("//build/test.gni") +import( + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") + +module_out_path = "distributed_hardware_fwk/distributed_hardware_manager_factory_test" + +config("module_private_config") { + include_dirs = [ + "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", + "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", + "//base/notification/eventhandler/interfaces/inner_api", + "//commonlibrary/c_utils/base/include", + "//utils/system/safwk/native/include", + "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", + "//foundation/distributedhardware/device_manager/common/include", + "${utils_path}/include", + "${utils_path}/include/log", + "${common_path}/utils/include", + "${common_path}/log/include", + "${services_path}/distributedhardwarefwkservice/include", + "${services_path}/distributedhardwarefwkservice/include/utils", + "${services_path}/distributedhardwarefwkservice/include/accessmanager", + "${utils_path}/include/eventbus", + ] +} + +ohos_unittest("DistributedHardwareManagerFactoryTest") { + module_out_path = module_out_path + + sources = [ + "${services_path}/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp", + "${services_path}/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp", + ] + + sources += [ "distributed_hardware_manager_factory_test.cpp" ] + + configs = [ ":module_private_config" ] + + deps = [ + "${utils_path}:distributedhardwareutils", + "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", + "//third_party/googletest:gtest_main", + ] + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"dhfwksvr\"", + "LOG_DOMAIN=0xD004100", + ] + + external_deps = [ "init:libbegetutil" ] +} + +group("distributed_hardware_manager_factory_test") { + testonly = true + + deps = [ ":DistributedHardwareManagerFactoryTest" ] +} diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp new file mode 100644 index 00000000..41dfd075 --- /dev/null +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp @@ -0,0 +1,229 @@ +/* + * 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 +#include +#include + +#include "gtest/gtest.h" + +#include "access_manager.h" +#include "distributed_hardware_errno.h" +#include "distributed_hardware_manager_factory.h" +using namespace testing::ext; + +namespace OHOS { +namespace DistributedHardware { +namespace { +enum class Status : uint32_t { + DEVICE_ONLINE = 0, + DEVICE_OFFLINE = 1, +}; + +constexpr int32_t INTERVAL_TIME_MS = 100; +constexpr uint16_t TEST_DEV_TYPE_PAD = 0x11; + +/* save networkId and uuid */ +const std::vector> TEST_DEVICES = { + { "11111111111111111111111111111111", "22222222222222222222222222222222" }, + { "33333333333333333333333333333333", "44444444444444444444444444444444" }, + { "55555555555555555555555555555555", "66666666666666666666666666666666" }, + { "77777777777777777777777777777777", "88888888888888888888888888888888" }, +}; +} + +class DistributedHardwareManagerFactoryTest : public testing::Test { +public: + static void SetUpTestCase(void); + static void TearDownTestCase(void); + void SetUp(); + void TearDown(); + std::mutex testAccessMutex_; +}; + +void DistributedHardwareManagerFactoryTest::SetUp() +{ + // at last one device online, ensure sa not exit + std::string networkId = "00000000000000000000000000000000"; + std::string uuid = "99999999999999999999999999999999"; + DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, TEST_DEV_TYPE_PAD); +} + +void DistributedHardwareManagerFactoryTest::TearDown() +{ + // clear all the online devices + for (const auto &dev : TEST_DEVICES) { + DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent(dev.first, dev.second, TEST_DEV_TYPE_PAD); + } +} + +void DistributedHardwareManagerFactoryTest::SetUpTestCase() {} + +void DistributedHardwareManagerFactoryTest::TearDownTestCase() {} + +/** + * @tc.name: SendOnLineEvent_001 + * @tc.desc: Verify the online success + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DistributedHardwareManagerFactoryTest, SendOnLineEvent_001, TestSize.Level1) +{ + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); + + for (const auto &dev : TEST_DEVICES) { + auto ret = + DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(dev.first, dev.second, TEST_DEV_TYPE_PAD); + ASSERT_EQ(DH_FWK_SUCCESS, ret); + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); + } +} + +/** + * @tc.name: SendOnLineEvent_002 + * @tc.desc: Verify the online failed + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DistributedHardwareManagerFactoryTest, SendOnLineEvent_002, TestSize.Level1) +{ + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); + + auto ret = + DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent("", TEST_DEVICES[0].second, TEST_DEV_TYPE_PAD); + ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); + + ret = + DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(TEST_DEVICES[0].first, "", TEST_DEV_TYPE_PAD); + ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); +} + +/** + * @tc.name: SendOffLineEvent_001 + * @tc.desc: Verify the offline success + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_001, TestSize.Level1) +{ + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); + + for (const auto &dev : TEST_DEVICES) { + auto ret = + DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(dev.first, dev.second, TEST_DEV_TYPE_PAD); + ASSERT_EQ(DH_FWK_SUCCESS, ret); + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); + } + + for (const auto &dev : TEST_DEVICES) { + auto ret = + DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent(dev.first, dev.second, TEST_DEV_TYPE_PAD); + ASSERT_EQ(DH_FWK_SUCCESS, ret); + } + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); +} + +/** + * @tc.name: SendOffLineEvent_002 + * @tc.desc: Verify the offline failed + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_002, TestSize.Level1) +{ + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); + + auto ret = DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent("", TEST_DEVICES[0].second, + TEST_DEV_TYPE_PAD); + ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); + + ret = + DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent(TEST_DEVICES[0].first, "", TEST_DEV_TYPE_PAD); + ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); +} + +/** + * @tc.name: SendOffLineEvent_003 + * @tc.desc: Verify the SendOnLineEvent for Multi-thread + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_003, TestSize.Level0) +{ + auto handler = [this](Status status, std::string networkId, std::string uuid, int32_t expect) { + if (status == Status::DEVICE_ONLINE) { + std::lock_guard lock(testAccessMutex_); + std::this_thread::sleep_for(std::chrono::milliseconds(100)); + auto onlineResult = + DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, TEST_DEV_TYPE_PAD); + EXPECT_EQ(expect, onlineResult); + } else { + std::lock_guard lock(testAccessMutex_); + std::this_thread::sleep_for(std::chrono::milliseconds(90)); + auto offlineResult = + DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent(networkId, uuid, TEST_DEV_TYPE_PAD); + EXPECT_EQ(expect, offlineResult); + } + }; + + std::vector threadVec; + threadVec.emplace_back( + std::thread(handler, Status::DEVICE_ONLINE, TEST_DEVICES[0].first, TEST_DEVICES[0].second, DH_FWK_SUCCESS)); + std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); + + threadVec.emplace_back( + std::thread(handler, Status::DEVICE_ONLINE, TEST_DEVICES[1].first, TEST_DEVICES[1].second, DH_FWK_SUCCESS)); + std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); + + threadVec.emplace_back(std::thread(handler, Status::DEVICE_ONLINE, TEST_DEVICES[0].first, TEST_DEVICES[0].second, + ERR_DH_FWK_HARDWARE_MANAGER_DEVICE_REPEAT_ONLINE)); + std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); + + threadVec.emplace_back( + std::thread(handler, Status::DEVICE_ONLINE, TEST_DEVICES[2].first, TEST_DEVICES[2].second, DH_FWK_SUCCESS)); + std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); + + threadVec.emplace_back( + std::thread(handler, Status::DEVICE_ONLINE, TEST_DEVICES[3].first, TEST_DEVICES[3].second, DH_FWK_SUCCESS)); + std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); + + threadVec.emplace_back( + std::thread(handler, Status::DEVICE_OFFLINE, TEST_DEVICES[3].first, TEST_DEVICES[3].second, DH_FWK_SUCCESS)); + std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); + + threadVec.emplace_back(std::thread(handler, Status::DEVICE_OFFLINE, TEST_DEVICES[3].first, TEST_DEVICES[3].second, + ERR_DH_FWK_HARDWARE_MANAGER_DEVICE_REPEAT_OFFLINE)); + std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); + + threadVec.emplace_back( + std::thread(handler, Status::DEVICE_OFFLINE, TEST_DEVICES[1].first, TEST_DEVICES[1].second, DH_FWK_SUCCESS)); + std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); + + threadVec.emplace_back( + std::thread(handler, Status::DEVICE_OFFLINE, TEST_DEVICES[0].first, TEST_DEVICES[0].second, DH_FWK_SUCCESS)); + std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); + + threadVec.emplace_back( + std::thread(handler, Status::DEVICE_OFFLINE, TEST_DEVICES[2].first, TEST_DEVICES[2].second, DH_FWK_SUCCESS)); + + for_each(threadVec.begin(), threadVec.end(), [](std::thread &t) { t.join(); }); +} +} // namespace DistributedHardware +} // namespace OHOS -- Gitee From b4d7aaebff6709ffc06b14437ce78a2714504907 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Wed, 19 Oct 2022 19:05:36 -0700 Subject: [PATCH 02/17] update ut Signed-off-by: wanderer-dl122 --- .../test/unittest/common/accessmanager/BUILD.gn | 2 +- .../accessmanager/access_manager_test.cpp | 17 +++++++++++++++-- .../distributedhardwaremanagerfactory/BUILD.gn | 2 +- ...istributed_hardware_manager_factory_test.cpp | 2 +- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index 519520b2..e8967b9b 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. +# Copyright (c) 2022 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 diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp index 34363a2d..2d50b655 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2022 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 @@ -74,9 +74,22 @@ HWTEST_F(AccessManagerTest, AccessManagerInit, TestSize.Level0) EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); } +/** + * @tc.name: OnDeviceReady + * @tc.desc: Verify the OnDeviceReady function + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(AccessManagerTest, OnDeviceReady, TestSize.Level0) +{ + DmDeviceInfo deviceInfo; + AccessManager::GetInstance()->OnDeviceReady(deviceInfo); + EXPECT_EQ(DistributedHardwareManagerFactory::GetInstance().IsInit(), false); +} + /** * @tc.name: OnDeviceOffline - * @tc.desc: Verify the Init function + * @tc.desc: Verify the OnDeviceOffline function * @tc.type: FUNC * @tc.require: AR000GHSJM */ diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/BUILD.gn index c5219651..367670a2 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. +# Copyright (c) 2022 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 diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp index 41dfd075..2f72ca06 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2022 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 -- Gitee From 4aa43f7274ca993ff99dbafc24ee8c9ba78a45f6 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Wed, 19 Oct 2022 19:10:10 -0700 Subject: [PATCH 03/17] update ut Signed-off-by: wanderer-dl122 --- .../common/accessmanager/access_manager_test.cpp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp index 2d50b655..218abe11 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp @@ -28,18 +28,6 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { namespace { -enum class Status : uint32_t { - DEVICE_ONLINE = 0, - DEVICE_OFFLINE = 1, -}; - -/* save networkId and uuid */ -// const std::vector> TEST_DEVICES = { -// { "11111111111111111111111111111111", "22222222222222222222222222222222" }, -// { "33333333333333333333333333333333", "44444444444444444444444444444444" }, -// { "55555555555555555555555555555555", "66666666666666666666666666666666" }, -// { "77777777777777777777777777777777", "88888888888888888888888888888888" }, -// }; } class AccessManagerTest : public testing::Test { @@ -48,7 +36,6 @@ public: static void TearDownTestCase(void); void SetUp(); void TearDown(); - std::mutex testAccessMutex_; }; void AccessManagerTest::SetUp() -- Gitee From 5e0b986c3d21842f5e204bad5d31d9399bfa6efb Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 20 Oct 2022 04:47:04 -0700 Subject: [PATCH 04/17] update ut Signed-off-by: wanderer-dl122 --- .../src/component_loader_test.cpp | 27 ++++++++++++++ ...tributed_hardware_manager_factory_test.cpp | 36 +++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp index 7838556d..b8817f8f 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp @@ -160,5 +160,32 @@ HWTEST_F(ComponentLoaderTest, component_loader_test_008, TestSize.Level0) auto vec = ComponentLoader::GetInstance().GetAllCompTypes(); EXPECT_EQ(vec.size(), ComponentLoader::GetInstance().compHandlerMap_.size()); } + + +/** + * @tc.name: component_loader_test_009 + * @tc.desc: Verify the GetHandler function. + * @tc.type: FUNC + * @tc.require: AR000GHSK3 + */ +HWTEST_F(ComponentLoaderTest, component_loader_test_009, TestSize.Level0) +{ + std::string soNameEmpty = ""; + auto handler = ComponentLoader::GetInstance().GetHandler(); + EXPECT_EQ(handler, nullptr); +} + +/** + * @tc.name: component_loader_test_010 + * @tc.desc: Verify the GetHandler function. + * @tc.type: FUNC + * @tc.require: AR000GHSK3 + */ +HWTEST_F(ComponentLoaderTest, component_loader_test_010, TestSize.Level0) +{ + std::string soName = "NON_EXISTENT_SO"; + auto handler = ComponentLoader::GetInstance().GetHandler(); + EXPECT_EQ(handler, nullptr); +} } // namespace DistributedHardware } // namespace OHOS diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp index 2f72ca06..4f12e181 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp @@ -225,5 +225,41 @@ HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_003, TestSize.L for_each(threadVec.begin(), threadVec.end(), [](std::thread &t) { t.join(); }); } + +HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_003, TestSize.Level0) +{ + std::string networkIdEmpty = ""; + std::string uuid = "uu1234567890"; + auto ret = DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, TEST_DEV_TYPE_PAD); + ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); + +} + +HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_004, TestSize.Level0) +{ + std::string networkId = "nt12345678790"; + std::string uuidEmpty = ""; + auto ret = DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, TEST_DEV_TYPE_PAD); + ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); + +} + +HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_004, TestSize.Level0) +{ + std::string networkIdEmpty = ""; + std::string uuid = "uu1234567890"; + auto ret = DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent(networkId, uuid, TEST_DEV_TYPE_PAD); + ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); + +} + +HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_005, TestSize.Level0) +{ + std::string networkId = "nt12345678790"; + std::string uuidEmpty = ""; + auto ret = DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent(networkId, uuid, TEST_DEV_TYPE_PAD); + ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); + +} } // namespace DistributedHardware } // namespace OHOS -- Gitee From 2203c8f434bf24843e6fc4b34138e8f7a35de3db Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 20 Oct 2022 07:11:59 -0700 Subject: [PATCH 05/17] update ut Signed-off-by: wanderer-dl122 --- .../common/dbadapter/src/db_adapter_test.cpp | 31 ++++++++++++++++ .../src/resource_manager_test.cpp | 35 +++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp index 17387888..338cbdce 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp @@ -125,6 +125,22 @@ HWTEST_F(DbAdapterTest, db_adapter_test_000, TestSize.Level0) EXPECT_EQ(g_dbAdapterPtr->Init(), DH_FWK_SUCCESS); } +/** + * @tc.name: db_adapter_test_011 + * @tc.desc: Verify the PutDataBatch function. + * @tc.type: FUNC + * @tc.require: AR000GHSCV + */ +HWTEST_F(DbAdapterTest, db_adapter_test_011, TestSize.Level0) +{ + std::string key = TEST_DEV_ID_0; + std::string value = TEST_DH_ATTR_0; + + EXPECT_EQ(g_dbAdapterPtr->PutData(key, value), DH_FWK_SUCCESS); + + g_dbAdapterPtr->RemoveDataByKey(key); +} + /** * @tc.name: db_adapter_test_001 * @tc.desc: Verify the PutDataBatch function. @@ -145,6 +161,7 @@ HWTEST_F(DbAdapterTest, db_adapter_test_001, TestSize.Level0) values.push_back(resInfo->ToJsonString()); } EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keys, values), DH_FWK_SUCCESS); + for (auto &resInfo : resInfos) { g_dbAdapterPtr->RemoveDataByKey(resInfo->GetKey()); } @@ -235,5 +252,19 @@ HWTEST_F(DbAdapterTest, db_adapter_test_007, TestSize.Level0) EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keys, values), ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL); } + +/** + * @tc.name: db_adapter_test_008 + * @tc.desc: Verify the PutDataBatch function. + * @tc.type: FUNC + * @tc.require: AR000GHSCV + */ +HWTEST_F(DbAdapterTest, db_adapter_test_008, TestSize.Level0) +{ + std::string key = std::string(TEST_DEV_ID_1 + TEST_DH_ID_1); + std::string value = TEST_DH_ATTR_0; + + EXPECT_EQ(g_dbAdapterPtr->PutData(key, value), ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL); +} } // namespace DistributedHardware } // namespace OHOS diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp index c37786b3..00d19e00 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp @@ -372,5 +372,40 @@ HWTEST_F(ResourceManagerTest, resource_manager_test_013, TestSize.Level0) DH_FWK_SUCCESS); EXPECT_EQ(capMap.size(), TEST_SIZE_10); } + +/** + * @tc.name: resource_manager_test_014 + * @tc.desc: Verify the CapabilityInfoManager RemoveCapabilityInfoInDB function. + * @tc.type: FUNC + * @tc.require: AR000GHSJE + */ +HWTEST_F(ResourceManagerTest, resource_manager_test_014, TestSize.Level0) +{ + EXPECT_EQ(CapabilityInfoManager::GetInstance()->RemoveCapabilityInfoInDB(CAP_INFO_0->GetDeviceId()), + DH_FWK_SUCCESS); + EXPECT_EQ(CapabilityInfoManager::GetInstance()->RemoveCapabilityInfoInDB(CAP_INFO_1->GetDeviceId()), + ERR_DH_FWK_RESOURCE_DB_ADAPTER_OPERATION_FAIL); + + EXPECT_EQ(CapabilityInfoManager::GetInstance()->RemoveCapabilityInfoInDB(CAP_INFO_5->GetDeviceId()), + DH_FWK_SUCCESS); + EXPECT_EQ(CapabilityInfoManager::GetInstance()->RemoveCapabilityInfoInDB(CAP_INFO_6->GetDeviceId()), + ERR_DH_FWK_RESOURCE_DB_ADAPTER_OPERATION_FAIL); + + EXPECT_EQ(CapabilityInfoManager::GetInstance()->globalCapInfoMap_.size(), TEST_SIZE_0); +} + +/** + * @tc.name: resource_manager_test_015 + * @tc.desc: Verify the CapabilityInfoManager RemoveCapabilityInfoInDB function. + * @tc.type: FUNC + * @tc.require: AR000GHSJE + */ +HWTEST_F(ResourceManagerTest, resource_manager_test_015, TestSize.Level0) +{ + std::string deviceIdEmpty = ""; + EXPECT_EQ(CapabilityInfoManager::GetInstance()->RemoveCapabilityInfoInDB(deviceIdEmpty), + ERR_DH_FWK_PARA_INVALID); + +} } // namespace DistributedHardware } // namespace OHOS -- Gitee From 1804739f50664da1e547f1037277acc516327132 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 20 Oct 2022 07:49:29 -0700 Subject: [PATCH 06/17] update ut Signed-off-by: wanderer-dl122 --- .../common/dbadapter/src/db_adapter_test.cpp | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp index 338cbdce..7899d155 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp @@ -167,6 +167,47 @@ HWTEST_F(DbAdapterTest, db_adapter_test_001, TestSize.Level0) } } +/** + * @tc.name: db_adapter_test_001 + * @tc.desc: Verify the PutDataBatch function. + * @tc.type: FUNC + * @tc.require: AR000GHSJE + */ +HWTEST_F(DbAdapterTest, db_adapter_test_001, TestSize.Level0) +{ + vector> resInfos { CAP_INFO_0, CAP_INFO_1, CAP_INFO_2, CAP_INFO_3, CAP_INFO_4, + CAP_INFO_5, CAP_INFO_6, CAP_INFO_7, CAP_INFO_8, CAP_INFO_9 }; + + std::vector keys; + std::vector values; + std::string key; + for (auto &resInfo : resInfos) { + key = resInfo->GetKey(); + keys.push_back(key); + values.push_back(resInfo->ToJsonString()); + } + g_dbAdapterPtr->PutDataBatch(keys, values); + + std::string keyPrefix; + std::vector values; + + EXPECT_EQ(g_dbAdapterPtr->GetDataByKeyPrefix(CAP_INFO_0->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->GetDataByKeyPrefix(CAP_INFO_1->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->GetDataByKeyPrefix(CAP_INFO_2->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->GetDataByKeyPrefix(CAP_INFO_3->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->GetDataByKeyPrefix(CAP_INFO_4->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->GetDataByKeyPrefix(CAP_INFO_5->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->GetDataByKeyPrefix(CAP_INFO_6->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->GetDataByKeyPrefix(CAP_INFO_7->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->GetDataByKeyPrefix(CAP_INFO_8->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->GetDataByKeyPrefix(CAP_INFO_9->GetDeviceId(), values), DH_FWK_SUCCESS); + + + for (auto &resInfo : resInfos) { + g_dbAdapterPtr->RemoveDataByKey(resInfo->GetKey()); + } +} + /** * @tc.name: db_adapter_test_002 * @tc.desc: Verify the PutDataBatch function. -- Gitee From b62e3cafcbbd5dead7b89d6f969dc69faf381805 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 20 Oct 2022 20:48:52 -0700 Subject: [PATCH 07/17] update ut Signed-off-by: wanderer-dl122 --- .../common/dbadapter/src/db_adapter_test.cpp | 155 +++++++++++++++++- 1 file changed, 153 insertions(+), 2 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp index 7899d155..e9a46b2c 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp @@ -127,7 +127,7 @@ HWTEST_F(DbAdapterTest, db_adapter_test_000, TestSize.Level0) /** * @tc.name: db_adapter_test_011 - * @tc.desc: Verify the PutDataBatch function. + * @tc.desc: Verify the PutData function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ @@ -141,6 +141,47 @@ HWTEST_F(DbAdapterTest, db_adapter_test_011, TestSize.Level0) g_dbAdapterPtr->RemoveDataByKey(key); } +/** + * @tc.name: db_adapter_test_012 + * @tc.desc: Verify the PutData function. + * @tc.type: FUNC + * @tc.require: AR000GHSCV + */ +HWTEST_F(DbAdapterTest, db_adapter_test_012, TestSize.Level0) +{ + std::string key = ""; + std::string value = TEST_DH_ATTR_0; + + EXPECT_EQ(g_dbAdapterPtr->PutData(key, value), ERR_DH_FWK_PARA_INVALID); +} + +/** + * @tc.name: db_adapter_test_013 + * @tc.desc: Verify the PutData function. + * @tc.type: FUNC + * @tc.require: AR000GHSCV + */ +HWTEST_F(DbAdapterTest, db_adapter_test_013, TestSize.Level0) +{ + std::string key = "TEST_DEV_ID_0"; + std::string value = ; + + EXPECT_EQ(g_dbAdapterPtr->PutData(key, value), ERR_DH_FWK_PARA_INVALID); +} + +/** + * @tc.name: db_adapter_test_014 + * @tc.desc: Verify the ManualSync function. + * @tc.type: FUNC + * @tc.require: AR000GHSCV + */ +HWTEST_F(DbAdapterTest, db_adapter_test_014, TestSize.Level0) +{ + std::string networkId = DEV_NETWORK_ID_1; + + EXPECT_EQ(g_dbAdapterPtr->ManualSync(DEV_NETWORK_ID_1), ERR_DH_FWK_RESOURCE_KV_STORAGE_OPERATION_FAIL); +} + /** * @tc.name: db_adapter_test_001 * @tc.desc: Verify the PutDataBatch function. @@ -167,6 +208,76 @@ HWTEST_F(DbAdapterTest, db_adapter_test_001, TestSize.Level0) } } +/** + * @tc.name: db_adapter_test_101 + * @tc.desc: Verify the RemoveDeviceData function. + * @tc.type: FUNC + * @tc.require: AR000GHSJE + */ +HWTEST_F(DbAdapterTest, db_adapter_test_101, TestSize.Level0) +{ + vector> resInfos { CAP_INFO_0, CAP_INFO_1, CAP_INFO_2, CAP_INFO_3, CAP_INFO_4, + CAP_INFO_5, CAP_INFO_6, CAP_INFO_7, CAP_INFO_8, CAP_INFO_9 }; + + std::vector keys; + std::vector values; + std::string key; + for (auto &resInfo : resInfos) { + key = resInfo->GetKey(); + keys.push_back(key); + values.push_back(resInfo->ToJsonString()); + } + g_dbAdapterPtr->PutDataBatch(keys, values); + + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_0->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_1->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_2->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_3->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_4->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_5->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_6->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_7->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_8->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_9->GetDeviceId(), values), DH_FWK_SUCCESS); + + for (auto &resInfo : resInfos) { + g_dbAdapterPtr->RemoveDataByKey(resInfo->GetKey()); + } +} + +/** + * @tc.name: db_adapter_test_102 + * @tc.desc: Verify the RemoveDataByKey function. + * @tc.type: FUNC + * @tc.require: AR000GHSJE + */ +HWTEST_F(DbAdapterTest, db_adapter_test_102, TestSize.Level0) +{ + vector> resInfos { CAP_INFO_0, CAP_INFO_1, CAP_INFO_2, CAP_INFO_3, CAP_INFO_4, + CAP_INFO_5, CAP_INFO_6, CAP_INFO_7, CAP_INFO_8, CAP_INFO_9 }; + + std::vector keys; + std::vector values; + std::string key; + for (auto &resInfo : resInfos) { + key = resInfo->GetKey(); + keys.push_back(key); + values.push_back(resInfo->ToJsonString()); + } + g_dbAdapterPtr->PutDataBatch(keys, values); + + EXPECT_EQ(g_dbAdapterPtr->RemoveDataByKey(CAP_INFO_0->GetKey()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDataByKey(CAP_INFO_1->GetKey()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDataByKey(CAP_INFO_2->GetKey()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDataByKey(CAP_INFO_3->GetKey()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDataByKey(CAP_INFO_4->GetKey()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDataByKey(CAP_INFO_5->GetKey()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDataByKey(CAP_INFO_6->GetKey()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDataByKey(CAP_INFO_7->GetKey()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDataByKey(CAP_INFO_8->GetKey()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDataByKey(CAP_INFO_9->GetKey()), DH_FWK_SUCCESS); +} + /** * @tc.name: db_adapter_test_001 * @tc.desc: Verify the PutDataBatch function. @@ -279,6 +390,18 @@ HWTEST_F(DbAdapterTest, db_adapter_test_006, TestSize.Level0) EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keys, values), ERR_DH_FWK_PARA_INVALID); } +/** + * @tc.name: db_adapter_test_106 + * @tc.desc: Verify the UnRegisterChangeListener function. + * @tc.type: FUNC + * @tc.require: AR000GHSCV + */ +HWTEST_F(DbAdapterTest, db_adapter_test_106, TestSize.Level0) +{ + + EXPECT_EQ(g_dbAdapterPtr->UnRegisterChangeListener(), DH_FWK_SUCCESS); +} + /** * @tc.name: db_adapter_test_007 * @tc.desc: Verify the PutDataBatch function. @@ -296,7 +419,7 @@ HWTEST_F(DbAdapterTest, db_adapter_test_007, TestSize.Level0) /** * @tc.name: db_adapter_test_008 - * @tc.desc: Verify the PutDataBatch function. + * @tc.desc: Verify the PutData function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ @@ -304,8 +427,36 @@ HWTEST_F(DbAdapterTest, db_adapter_test_008, TestSize.Level0) { std::string key = std::string(TEST_DEV_ID_1 + TEST_DH_ID_1); std::string value = TEST_DH_ATTR_0; + g_dbAdapterPtr->kvStoragePtr_ = nullptr; EXPECT_EQ(g_dbAdapterPtr->PutData(key, value), ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL); } + +/** + * @tc.name: db_adapter_test_009 + * @tc.desc: Verify the ManualSync function. + * @tc.type: FUNC + * @tc.require: AR000GHSCV + */ +HWTEST_F(DbAdapterTest, db_adapter_test_009, TestSize.Level0) +{ + std::string networkId = DEV_NETWORK_ID_1; + g_dbAdapterPtr->kvStoragePtr_ = nullptr; + + EXPECT_EQ(g_dbAdapterPtr->RegisterChangeListener(DEV_NETWORK_ID_1), ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL); +} + +/** + * @tc.name: db_adapter_test_006 + * @tc.desc: Verify the UnRegisterChangeListener function. + * @tc.type: FUNC + * @tc.require: AR000GHSCV + */ +HWTEST_F(DbAdapterTest, db_adapter_test_006, TestSize.Level0) +{ + g_dbAdapterPtr->kvStoragePtr_ = nullptr; + EXPECT_EQ(g_dbAdapterPtr->UnRegisterChangeListener(), ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL); +} + } // namespace DistributedHardware } // namespace OHOS -- Gitee From 0b79a678c197f3a2ece78aeb9faf0f75bc2bb71b Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 20 Oct 2022 21:53:29 -0700 Subject: [PATCH 08/17] update ut Signed-off-by: wanderer-dl122 --- .../common/dbadapter/src/db_adapter_test.cpp | 98 +++++++++---------- ...tributed_hardware_manager_factory_test.cpp | 32 +++++- 2 files changed, 77 insertions(+), 53 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp index e9a46b2c..fd5b2634 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp @@ -40,6 +40,7 @@ namespace DistributedHardware { namespace { const string DATABASE_DIR = "/data/service/el1/public/database/dtbhardware_manager_service/"; +const std::string DEV_NETWORK_ID_1 = "nt36a637105409e904d4da83790a4a9"; const string TEST_DEV_ID_0 = "bb536a637105409e904d4da83791aa11"; const string TEST_DEV_ID_1 = "bb536a637105409e904d4da83791bb22"; const string TEST_DEV_ID_2 = "bb536a637105409e904d4da83791bb33"; @@ -126,12 +127,12 @@ HWTEST_F(DbAdapterTest, db_adapter_test_000, TestSize.Level0) } /** - * @tc.name: db_adapter_test_011 + * @tc.name: db_adapter_test_001 * @tc.desc: Verify the PutData function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_011, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_001, TestSize.Level0) { std::string key = TEST_DEV_ID_0; std::string value = TEST_DH_ATTR_0; @@ -142,12 +143,12 @@ HWTEST_F(DbAdapterTest, db_adapter_test_011, TestSize.Level0) } /** - * @tc.name: db_adapter_test_012 + * @tc.name: db_adapter_test_002 * @tc.desc: Verify the PutData function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_012, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_002, TestSize.Level0) { std::string key = ""; std::string value = TEST_DH_ATTR_0; @@ -156,26 +157,26 @@ HWTEST_F(DbAdapterTest, db_adapter_test_012, TestSize.Level0) } /** - * @tc.name: db_adapter_test_013 + * @tc.name: db_adapter_test_003 * @tc.desc: Verify the PutData function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_013, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_003, TestSize.Level0) { std::string key = "TEST_DEV_ID_0"; - std::string value = ; + std::string value = ""; EXPECT_EQ(g_dbAdapterPtr->PutData(key, value), ERR_DH_FWK_PARA_INVALID); } /** - * @tc.name: db_adapter_test_014 + * @tc.name: db_adapter_test_004 * @tc.desc: Verify the ManualSync function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_014, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_004, TestSize.Level0) { std::string networkId = DEV_NETWORK_ID_1; @@ -183,12 +184,12 @@ HWTEST_F(DbAdapterTest, db_adapter_test_014, TestSize.Level0) } /** - * @tc.name: db_adapter_test_001 + * @tc.name: db_adapter_test_004 * @tc.desc: Verify the PutDataBatch function. * @tc.type: FUNC * @tc.require: AR000GHSJE */ -HWTEST_F(DbAdapterTest, db_adapter_test_001, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_004, TestSize.Level0) { vector> resInfos { CAP_INFO_0, CAP_INFO_1, CAP_INFO_2, CAP_INFO_3, CAP_INFO_4, CAP_INFO_5, CAP_INFO_6, CAP_INFO_7, CAP_INFO_8, CAP_INFO_9 }; @@ -209,12 +210,12 @@ HWTEST_F(DbAdapterTest, db_adapter_test_001, TestSize.Level0) } /** - * @tc.name: db_adapter_test_101 + * @tc.name: db_adapter_test_005 * @tc.desc: Verify the RemoveDeviceData function. * @tc.type: FUNC * @tc.require: AR000GHSJE */ -HWTEST_F(DbAdapterTest, db_adapter_test_101, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_005, TestSize.Level0) { vector> resInfos { CAP_INFO_0, CAP_INFO_1, CAP_INFO_2, CAP_INFO_3, CAP_INFO_4, CAP_INFO_5, CAP_INFO_6, CAP_INFO_7, CAP_INFO_8, CAP_INFO_9 }; @@ -229,16 +230,16 @@ HWTEST_F(DbAdapterTest, db_adapter_test_101, TestSize.Level0) } g_dbAdapterPtr->PutDataBatch(keys, values); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_0->GetDeviceId(), values), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_1->GetDeviceId(), values), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_2->GetDeviceId(), values), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_3->GetDeviceId(), values), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_4->GetDeviceId(), values), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_5->GetDeviceId(), values), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_6->GetDeviceId(), values), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_7->GetDeviceId(), values), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_8->GetDeviceId(), values), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_9->GetDeviceId(), values), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_0->GetDeviceId()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_1->GetDeviceId()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_2->GetDeviceId()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_3->GetDeviceId()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_4->GetDeviceId()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_5->GetDeviceId()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_6->GetDeviceId()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_7->GetDeviceId()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_8->GetDeviceId()), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_9->GetDeviceId()), DH_FWK_SUCCESS); for (auto &resInfo : resInfos) { g_dbAdapterPtr->RemoveDataByKey(resInfo->GetKey()); @@ -246,12 +247,12 @@ HWTEST_F(DbAdapterTest, db_adapter_test_101, TestSize.Level0) } /** - * @tc.name: db_adapter_test_102 + * @tc.name: db_adapter_test_006 * @tc.desc: Verify the RemoveDataByKey function. * @tc.type: FUNC * @tc.require: AR000GHSJE */ -HWTEST_F(DbAdapterTest, db_adapter_test_102, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_006, TestSize.Level0) { vector> resInfos { CAP_INFO_0, CAP_INFO_1, CAP_INFO_2, CAP_INFO_3, CAP_INFO_4, CAP_INFO_5, CAP_INFO_6, CAP_INFO_7, CAP_INFO_8, CAP_INFO_9 }; @@ -279,12 +280,12 @@ HWTEST_F(DbAdapterTest, db_adapter_test_102, TestSize.Level0) } /** - * @tc.name: db_adapter_test_001 - * @tc.desc: Verify the PutDataBatch function. + * @tc.name: db_adapter_test_007 + * @tc.desc: Verify the GetDataByKeyPrefix function. * @tc.type: FUNC * @tc.require: AR000GHSJE */ -HWTEST_F(DbAdapterTest, db_adapter_test_001, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_007, TestSize.Level0) { vector> resInfos { CAP_INFO_0, CAP_INFO_1, CAP_INFO_2, CAP_INFO_3, CAP_INFO_4, CAP_INFO_5, CAP_INFO_6, CAP_INFO_7, CAP_INFO_8, CAP_INFO_9 }; @@ -313,19 +314,18 @@ HWTEST_F(DbAdapterTest, db_adapter_test_001, TestSize.Level0) EXPECT_EQ(g_dbAdapterPtr->GetDataByKeyPrefix(CAP_INFO_8->GetDeviceId(), values), DH_FWK_SUCCESS); EXPECT_EQ(g_dbAdapterPtr->GetDataByKeyPrefix(CAP_INFO_9->GetDeviceId(), values), DH_FWK_SUCCESS); - for (auto &resInfo : resInfos) { g_dbAdapterPtr->RemoveDataByKey(resInfo->GetKey()); } } /** - * @tc.name: db_adapter_test_002 + * @tc.name: db_adapter_test_008 * @tc.desc: Verify the PutDataBatch function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_002, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_008, TestSize.Level0) { std::vector keys { std::string(TEST_DEV_ID_2 + TEST_DH_ID_0) }; std::vector values { TEST_DH_ATTR_0 }; @@ -335,12 +335,12 @@ HWTEST_F(DbAdapterTest, db_adapter_test_002, TestSize.Level0) } /** - * @tc.name: db_adapter_test_003 + * @tc.name: db_adapter_test_009 * @tc.desc: Verify the PutDataBatch function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_003, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_009, TestSize.Level0) { std::vector keys { std::string(TEST_DEV_ID_2 + TEST_DH_ID_0) }; std::vector valuesEmpty; @@ -349,12 +349,12 @@ HWTEST_F(DbAdapterTest, db_adapter_test_003, TestSize.Level0) } /** - * @tc.name: db_adapter_test_004 + * @tc.name: db_adapter_test_010 * @tc.desc: Verify the PutDataBatch function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_004, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_010, TestSize.Level0) { std::vector keysEmpty; std::vector values { TEST_DH_ATTR_0 }; @@ -363,12 +363,12 @@ HWTEST_F(DbAdapterTest, db_adapter_test_004, TestSize.Level0) } /** - * @tc.name: db_adapter_test_005 + * @tc.name: db_adapter_test_011 * @tc.desc: Verify the PutDataBatch function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_005, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_011, TestSize.Level0) { std::vector keysEmpty; std::vector valuesEmpty; @@ -377,12 +377,12 @@ HWTEST_F(DbAdapterTest, db_adapter_test_005, TestSize.Level0) } /** - * @tc.name: db_adapter_test_006 + * @tc.name: db_adapter_test_012 * @tc.desc: Verify the PutDataBatch function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_006, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_012, TestSize.Level0) { std::vector keys { std::string(TEST_DEV_ID_2 + TEST_DH_ID_0) }; std::vector values { TEST_DH_ATTR_0, TEST_DH_ATTR_1 }; @@ -391,24 +391,24 @@ HWTEST_F(DbAdapterTest, db_adapter_test_006, TestSize.Level0) } /** - * @tc.name: db_adapter_test_106 + * @tc.name: db_adapter_test_013 * @tc.desc: Verify the UnRegisterChangeListener function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_106, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_013, TestSize.Level0) { EXPECT_EQ(g_dbAdapterPtr->UnRegisterChangeListener(), DH_FWK_SUCCESS); } /** - * @tc.name: db_adapter_test_007 + * @tc.name: db_adapter_test_014 * @tc.desc: Verify the PutDataBatch function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_007, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_014, TestSize.Level0) { g_dbAdapterPtr->kvStoragePtr_ = nullptr; std::vector keys { std::string(TEST_DEV_ID_2 + TEST_DH_ID_0) }; @@ -418,12 +418,12 @@ HWTEST_F(DbAdapterTest, db_adapter_test_007, TestSize.Level0) } /** - * @tc.name: db_adapter_test_008 + * @tc.name: db_adapter_test_015 * @tc.desc: Verify the PutData function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_008, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_015, TestSize.Level0) { std::string key = std::string(TEST_DEV_ID_1 + TEST_DH_ID_1); std::string value = TEST_DH_ATTR_0; @@ -433,12 +433,12 @@ HWTEST_F(DbAdapterTest, db_adapter_test_008, TestSize.Level0) } /** - * @tc.name: db_adapter_test_009 + * @tc.name: db_adapter_test_016 * @tc.desc: Verify the ManualSync function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_009, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_016, TestSize.Level0) { std::string networkId = DEV_NETWORK_ID_1; g_dbAdapterPtr->kvStoragePtr_ = nullptr; @@ -447,12 +447,12 @@ HWTEST_F(DbAdapterTest, db_adapter_test_009, TestSize.Level0) } /** - * @tc.name: db_adapter_test_006 + * @tc.name: db_adapter_test_017 * @tc.desc: Verify the UnRegisterChangeListener function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_006, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_017, TestSize.Level0) { g_dbAdapterPtr->kvStoragePtr_ = nullptr; EXPECT_EQ(g_dbAdapterPtr->UnRegisterChangeListener(), ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL); diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp index 4f12e181..07c6a590 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp @@ -226,7 +226,13 @@ HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_003, TestSize.L for_each(threadVec.begin(), threadVec.end(), [](std::thread &t) { t.join(); }); } -HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_003, TestSize.Level0) +/** + * @tc.name: SendOffLineEvent_004 + * @tc.desc: Verify the SendOnLineEvent + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_004, TestSize.Level0) { std::string networkIdEmpty = ""; std::string uuid = "uu1234567890"; @@ -235,7 +241,13 @@ HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_003, TestSize.L } -HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_004, TestSize.Level0) +/** + * @tc.name: SendOffLineEvent_005 + * @tc.desc: Verify the SendOnLineEvent + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_005, TestSize.Level0) { std::string networkId = "nt12345678790"; std::string uuidEmpty = ""; @@ -244,7 +256,13 @@ HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_004, TestSize.L } -HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_004, TestSize.Level0) +/** + * @tc.name: SendOffLineEvent_006 + * @tc.desc: Verify the SendOffLineEvent + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_006, TestSize.Level0) { std::string networkIdEmpty = ""; std::string uuid = "uu1234567890"; @@ -253,7 +271,13 @@ HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_004, TestSize.L } -HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_005, TestSize.Level0) +/** + * @tc.name: SendOffLineEvent_007 + * @tc.desc: Verify the SendOffLineEvent + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_007, TestSize.Level0) { std::string networkId = "nt12345678790"; std::string uuidEmpty = ""; -- Gitee From 08f88d121df59042c8815f66881f1f1ed500bf57 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 20 Oct 2022 21:55:45 -0700 Subject: [PATCH 09/17] update ut Signed-off-by: wanderer-dl122 --- .../distributed_hardware_manager_factory_test.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp index 07c6a590..ce26e109 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp @@ -236,9 +236,9 @@ HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_004, TestSize.L { std::string networkIdEmpty = ""; std::string uuid = "uu1234567890"; - auto ret = DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, TEST_DEV_TYPE_PAD); + auto ret = DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent( + networkIdEmpty, uuid, TEST_DEV_TYPE_PAD); ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); - } /** @@ -251,9 +251,9 @@ HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_005, TestSize.L { std::string networkId = "nt12345678790"; std::string uuidEmpty = ""; - auto ret = DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, TEST_DEV_TYPE_PAD); + auto ret = DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent( + networkId, uuidEmpty, TEST_DEV_TYPE_PAD); ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); - } /** -- Gitee From b587e7a711a84655f512ba931739a0f9006a5bf5 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 20 Oct 2022 23:45:14 -0700 Subject: [PATCH 10/17] update ut Signed-off-by: wanderer-dl122 --- .../src/component_loader_test.cpp | 5 +- .../common/dbadapter/src/db_adapter_test.cpp | 49 +++++++++---------- ...tributed_hardware_manager_factory_test.cpp | 6 ++- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp index b8817f8f..0f40fc58 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp @@ -161,7 +161,6 @@ HWTEST_F(ComponentLoaderTest, component_loader_test_008, TestSize.Level0) EXPECT_EQ(vec.size(), ComponentLoader::GetInstance().compHandlerMap_.size()); } - /** * @tc.name: component_loader_test_009 * @tc.desc: Verify the GetHandler function. @@ -171,7 +170,7 @@ HWTEST_F(ComponentLoaderTest, component_loader_test_008, TestSize.Level0) HWTEST_F(ComponentLoaderTest, component_loader_test_009, TestSize.Level0) { std::string soNameEmpty = ""; - auto handler = ComponentLoader::GetInstance().GetHandler(); + auto handler = ComponentLoader::GetInstance().GetHandler(soNameEmpty); EXPECT_EQ(handler, nullptr); } @@ -184,7 +183,7 @@ HWTEST_F(ComponentLoaderTest, component_loader_test_009, TestSize.Level0) HWTEST_F(ComponentLoaderTest, component_loader_test_010, TestSize.Level0) { std::string soName = "NON_EXISTENT_SO"; - auto handler = ComponentLoader::GetInstance().GetHandler(); + auto handler = ComponentLoader::GetInstance().GetHandler(soName); EXPECT_EQ(handler, nullptr); } } // namespace DistributedHardware diff --git a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp index fd5b2634..ef895d18 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp @@ -170,19 +170,6 @@ HWTEST_F(DbAdapterTest, db_adapter_test_003, TestSize.Level0) EXPECT_EQ(g_dbAdapterPtr->PutData(key, value), ERR_DH_FWK_PARA_INVALID); } -/** - * @tc.name: db_adapter_test_004 - * @tc.desc: Verify the ManualSync function. - * @tc.type: FUNC - * @tc.require: AR000GHSCV - */ -HWTEST_F(DbAdapterTest, db_adapter_test_004, TestSize.Level0) -{ - std::string networkId = DEV_NETWORK_ID_1; - - EXPECT_EQ(g_dbAdapterPtr->ManualSync(DEV_NETWORK_ID_1), ERR_DH_FWK_RESOURCE_KV_STORAGE_OPERATION_FAIL); -} - /** * @tc.name: db_adapter_test_004 * @tc.desc: Verify the PutDataBatch function. @@ -392,23 +379,36 @@ HWTEST_F(DbAdapterTest, db_adapter_test_012, TestSize.Level0) /** * @tc.name: db_adapter_test_013 - * @tc.desc: Verify the UnRegisterChangeListener function. + * @tc.desc: Verify the ManualSync function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ HWTEST_F(DbAdapterTest, db_adapter_test_013, TestSize.Level0) { + std::string networkId = DEV_NETWORK_ID_1; - EXPECT_EQ(g_dbAdapterPtr->UnRegisterChangeListener(), DH_FWK_SUCCESS); + EXPECT_EQ(g_dbAdapterPtr->ManualSync(DEV_NETWORK_ID_1), ERR_DH_FWK_RESOURCE_KV_STORAGE_OPERATION_FAIL); } /** * @tc.name: db_adapter_test_014 - * @tc.desc: Verify the PutDataBatch function. + * @tc.desc: Verify the UnRegisterChangeListener function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ HWTEST_F(DbAdapterTest, db_adapter_test_014, TestSize.Level0) +{ + + EXPECT_EQ(g_dbAdapterPtr->UnRegisterChangeListener(), DH_FWK_SUCCESS); +} + +/** + * @tc.name: db_adapter_test_015 + * @tc.desc: Verify the PutDataBatch function. + * @tc.type: FUNC + * @tc.require: AR000GHSCV + */ +HWTEST_F(DbAdapterTest, db_adapter_test_015, TestSize.Level0) { g_dbAdapterPtr->kvStoragePtr_ = nullptr; std::vector keys { std::string(TEST_DEV_ID_2 + TEST_DH_ID_0) }; @@ -418,12 +418,12 @@ HWTEST_F(DbAdapterTest, db_adapter_test_014, TestSize.Level0) } /** - * @tc.name: db_adapter_test_015 + * @tc.name: db_adapter_test_016 * @tc.desc: Verify the PutData function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_015, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_016, TestSize.Level0) { std::string key = std::string(TEST_DEV_ID_1 + TEST_DH_ID_1); std::string value = TEST_DH_ATTR_0; @@ -433,30 +433,29 @@ HWTEST_F(DbAdapterTest, db_adapter_test_015, TestSize.Level0) } /** - * @tc.name: db_adapter_test_016 - * @tc.desc: Verify the ManualSync function. + * @tc.name: db_adapter_test_017 + * @tc.desc: Verify the RegisterChangeListener function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_016, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_017, TestSize.Level0) { std::string networkId = DEV_NETWORK_ID_1; g_dbAdapterPtr->kvStoragePtr_ = nullptr; - EXPECT_EQ(g_dbAdapterPtr->RegisterChangeListener(DEV_NETWORK_ID_1), ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL); + EXPECT_EQ(g_dbAdapterPtr->RegisterChangeListener(), ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL); } /** - * @tc.name: db_adapter_test_017 + * @tc.name: db_adapter_test_018 * @tc.desc: Verify the UnRegisterChangeListener function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(DbAdapterTest, db_adapter_test_017, TestSize.Level0) +HWTEST_F(DbAdapterTest, db_adapter_test_018, TestSize.Level0) { g_dbAdapterPtr->kvStoragePtr_ = nullptr; EXPECT_EQ(g_dbAdapterPtr->UnRegisterChangeListener(), ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL); } - } // namespace DistributedHardware } // namespace OHOS diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp index ce26e109..57c9b6e2 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp @@ -266,7 +266,8 @@ HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_006, TestSize.L { std::string networkIdEmpty = ""; std::string uuid = "uu1234567890"; - auto ret = DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent(networkId, uuid, TEST_DEV_TYPE_PAD); + auto ret = DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent( + networkIdEmpty, uuid, TEST_DEV_TYPE_PAD); ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); } @@ -281,7 +282,8 @@ HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_007, TestSize.L { std::string networkId = "nt12345678790"; std::string uuidEmpty = ""; - auto ret = DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent(networkId, uuid, TEST_DEV_TYPE_PAD); + auto ret = DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent( + networkId, uuid, TEST_DEV_TYPE_PAD); ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); } -- Gitee From eedd1256560fb23d867c2428f1100ca3642d9a48 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 20 Oct 2022 23:48:00 -0700 Subject: [PATCH 11/17] update ut Signed-off-by: wanderer-dl122 --- .../distributed_hardware_manager_factory_test.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp index 57c9b6e2..871065ab 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp @@ -269,7 +269,6 @@ HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_006, TestSize.L auto ret = DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent( networkIdEmpty, uuid, TEST_DEV_TYPE_PAD); ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); - } /** @@ -285,7 +284,6 @@ HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_007, TestSize.L auto ret = DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent( networkId, uuid, TEST_DEV_TYPE_PAD); ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); - } } // namespace DistributedHardware } // namespace OHOS -- Gitee From 71cf20400bd963f15609250eb2b58f78fff04620 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Fri, 21 Oct 2022 00:56:09 -0700 Subject: [PATCH 12/17] update ut Signed-off-by: wanderer-dl122 --- .../unittest/common/dbadapter/src/db_adapter_test.cpp | 8 +++----- .../distributed_hardware_manager_factory_test.cpp | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp index ef895d18..e15f7b1b 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp @@ -278,18 +278,16 @@ HWTEST_F(DbAdapterTest, db_adapter_test_007, TestSize.Level0) CAP_INFO_5, CAP_INFO_6, CAP_INFO_7, CAP_INFO_8, CAP_INFO_9 }; std::vector keys; - std::vector values; + std::vector infos; std::string key; for (auto &resInfo : resInfos) { key = resInfo->GetKey(); keys.push_back(key); - values.push_back(resInfo->ToJsonString()); + infos.push_back(resInfo->ToJsonString()); } - g_dbAdapterPtr->PutDataBatch(keys, values); + g_dbAdapterPtr->PutDataBatch(keys, infos); - std::string keyPrefix; std::vector values; - EXPECT_EQ(g_dbAdapterPtr->GetDataByKeyPrefix(CAP_INFO_0->GetDeviceId(), values), DH_FWK_SUCCESS); EXPECT_EQ(g_dbAdapterPtr->GetDataByKeyPrefix(CAP_INFO_1->GetDeviceId(), values), DH_FWK_SUCCESS); EXPECT_EQ(g_dbAdapterPtr->GetDataByKeyPrefix(CAP_INFO_2->GetDeviceId(), values), DH_FWK_SUCCESS); diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp index 871065ab..5821174e 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/distributed_hardware_manager_factory_test.cpp @@ -282,7 +282,7 @@ HWTEST_F(DistributedHardwareManagerFactoryTest, SendOffLineEvent_007, TestSize.L std::string networkId = "nt12345678790"; std::string uuidEmpty = ""; auto ret = DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent( - networkId, uuid, TEST_DEV_TYPE_PAD); + networkId, uuidEmpty, TEST_DEV_TYPE_PAD); ASSERT_EQ(ERR_DH_FWK_PARA_INVALID, ret); } } // namespace DistributedHardware -- Gitee From d0f99f41758c6e1ff35f73d1f3b4a9200d2e3df6 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Mon, 24 Oct 2022 00:33:32 -0700 Subject: [PATCH 13/17] update ut Signed-off-by: wanderer-dl122 --- .../common/dbadapter/src/db_adapter_test.cpp | 37 ------------------- .../src/resource_manager_test.cpp | 21 ----------- 2 files changed, 58 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp index e15f7b1b..89c4de64 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp @@ -196,43 +196,6 @@ HWTEST_F(DbAdapterTest, db_adapter_test_004, TestSize.Level0) } } -/** - * @tc.name: db_adapter_test_005 - * @tc.desc: Verify the RemoveDeviceData function. - * @tc.type: FUNC - * @tc.require: AR000GHSJE - */ -HWTEST_F(DbAdapterTest, db_adapter_test_005, TestSize.Level0) -{ - vector> resInfos { CAP_INFO_0, CAP_INFO_1, CAP_INFO_2, CAP_INFO_3, CAP_INFO_4, - CAP_INFO_5, CAP_INFO_6, CAP_INFO_7, CAP_INFO_8, CAP_INFO_9 }; - - std::vector keys; - std::vector values; - std::string key; - for (auto &resInfo : resInfos) { - key = resInfo->GetKey(); - keys.push_back(key); - values.push_back(resInfo->ToJsonString()); - } - g_dbAdapterPtr->PutDataBatch(keys, values); - - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_0->GetDeviceId()), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_1->GetDeviceId()), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_2->GetDeviceId()), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_3->GetDeviceId()), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_4->GetDeviceId()), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_5->GetDeviceId()), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_6->GetDeviceId()), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_7->GetDeviceId()), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_8->GetDeviceId()), DH_FWK_SUCCESS); - EXPECT_EQ(g_dbAdapterPtr->RemoveDeviceData(CAP_INFO_9->GetDeviceId()), DH_FWK_SUCCESS); - - for (auto &resInfo : resInfos) { - g_dbAdapterPtr->RemoveDataByKey(resInfo->GetKey()); - } -} - /** * @tc.name: db_adapter_test_006 * @tc.desc: Verify the RemoveDataByKey function. diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp index 00d19e00..ce0963d0 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp @@ -373,27 +373,6 @@ HWTEST_F(ResourceManagerTest, resource_manager_test_013, TestSize.Level0) EXPECT_EQ(capMap.size(), TEST_SIZE_10); } -/** - * @tc.name: resource_manager_test_014 - * @tc.desc: Verify the CapabilityInfoManager RemoveCapabilityInfoInDB function. - * @tc.type: FUNC - * @tc.require: AR000GHSJE - */ -HWTEST_F(ResourceManagerTest, resource_manager_test_014, TestSize.Level0) -{ - EXPECT_EQ(CapabilityInfoManager::GetInstance()->RemoveCapabilityInfoInDB(CAP_INFO_0->GetDeviceId()), - DH_FWK_SUCCESS); - EXPECT_EQ(CapabilityInfoManager::GetInstance()->RemoveCapabilityInfoInDB(CAP_INFO_1->GetDeviceId()), - ERR_DH_FWK_RESOURCE_DB_ADAPTER_OPERATION_FAIL); - - EXPECT_EQ(CapabilityInfoManager::GetInstance()->RemoveCapabilityInfoInDB(CAP_INFO_5->GetDeviceId()), - DH_FWK_SUCCESS); - EXPECT_EQ(CapabilityInfoManager::GetInstance()->RemoveCapabilityInfoInDB(CAP_INFO_6->GetDeviceId()), - ERR_DH_FWK_RESOURCE_DB_ADAPTER_OPERATION_FAIL); - - EXPECT_EQ(CapabilityInfoManager::GetInstance()->globalCapInfoMap_.size(), TEST_SIZE_0); -} - /** * @tc.name: resource_manager_test_015 * @tc.desc: Verify the CapabilityInfoManager RemoveCapabilityInfoInDB function. -- Gitee From 18ad31b5e90af4a31cbf0a31bed7ce92f48f2cae Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Mon, 24 Oct 2022 01:05:40 -0700 Subject: [PATCH 14/17] update ut Signed-off-by: wanderer-dl122 --- .../unittest/common/distributedhardwaremanagerfactory/BUILD.gn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/BUILD.gn index 367670a2..83290b1c 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanagerfactory/BUILD.gn @@ -15,7 +15,8 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") -module_out_path = "distributed_hardware_fwk/distributed_hardware_manager_factory_test" +module_out_path = + "distributed_hardware_fwk/distributed_hardware_manager_factory_test" config("module_private_config") { include_dirs = [ -- Gitee From 38b07554d2952caa6db18cca251810a4aa9b7db5 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Mon, 24 Oct 2022 01:27:19 -0700 Subject: [PATCH 15/17] update ut Signed-off-by: wanderer-dl122 --- .../common/utilstool/utils_tool_test.cpp | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/utils/test/unittest/common/utilstool/utils_tool_test.cpp b/utils/test/unittest/common/utilstool/utils_tool_test.cpp index b8981972..55f7cb2b 100644 --- a/utils/test/unittest/common/utilstool/utils_tool_test.cpp +++ b/utils/test/unittest/common/utilstool/utils_tool_test.cpp @@ -120,5 +120,33 @@ HWTEST_F(UtilsToolTest, utils_tool_test_004, TestSize.Level0) ASSERT_STRNE(std::to_string(i4).c_str(), GetAnonyInt32(i4).c_str()); ASSERT_STRNE(std::to_string(i5).c_str(), GetAnonyInt32(i5).c_str()); } + +/** + * @tc.name: utils_tool_test_005 + * @tc.desc: Verify the GetDeviceIdByUUID function + * @tc.type: FUNC + * @tc.require: AR000GHSK0 + */ +HWTEST_F(UtilsToolTest, utils_tool_test_005, TestSize.Level0) +{ + // const std::string UUID_TEST = "bb536a637105409e904d4da78290ab1"; + + std::string uuidEmpty = ""; + auto id = GetDeviceIdByUUID(uuidEmpty) + ASSERT_EQ(id.size(), 0); +} + +/** + * @tc.name: utils_tool_test_006 + * @tc.desc: Verify the GetDeviceIdByUUID function + * @tc.type: FUNC + * @tc.require: AR000GHSK0 + */ +HWTEST_F(UtilsToolTest, utils_tool_test_006, TestSize.Level0) +{ + std::string uuid = "bb536a637105409e904d4da78290ab1"; + auto id = GetDeviceIdByUUID(uuid) + ASSERT_NE(id.size(), 0); +} } // namespace DistributedHardware } // namespace OHOS -- Gitee From 9f19d56488ae4b6b5da352cbb85ceaa1e2862e1e Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Mon, 24 Oct 2022 02:01:00 -0700 Subject: [PATCH 16/17] update ut Signed-off-by: wanderer-dl122 --- utils/test/unittest/common/utilstool/utils_tool_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/test/unittest/common/utilstool/utils_tool_test.cpp b/utils/test/unittest/common/utilstool/utils_tool_test.cpp index 55f7cb2b..d792045b 100644 --- a/utils/test/unittest/common/utilstool/utils_tool_test.cpp +++ b/utils/test/unittest/common/utilstool/utils_tool_test.cpp @@ -132,7 +132,7 @@ HWTEST_F(UtilsToolTest, utils_tool_test_005, TestSize.Level0) // const std::string UUID_TEST = "bb536a637105409e904d4da78290ab1"; std::string uuidEmpty = ""; - auto id = GetDeviceIdByUUID(uuidEmpty) + auto id = GetDeviceIdByUUID(uuidEmpty); ASSERT_EQ(id.size(), 0); } @@ -145,7 +145,7 @@ HWTEST_F(UtilsToolTest, utils_tool_test_005, TestSize.Level0) HWTEST_F(UtilsToolTest, utils_tool_test_006, TestSize.Level0) { std::string uuid = "bb536a637105409e904d4da78290ab1"; - auto id = GetDeviceIdByUUID(uuid) + auto id = GetDeviceIdByUUID(uuid); ASSERT_NE(id.size(), 0); } } // namespace DistributedHardware -- Gitee From 406f1cfd98ff1573a941cd405381a8dea1ac50e0 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 27 Oct 2022 15:46:36 +0800 Subject: [PATCH 17/17] update ut Signed-off-by: wanderer-dl122 --- .../src/version_info_manager_test.cpp | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/src/version_info_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/src/version_info_manager_test.cpp index c9716e05..b943b2f4 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/src/version_info_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/src/version_info_manager_test.cpp @@ -138,22 +138,11 @@ HWTEST_F(VersionInfoManagerTest, version_info_manager_test_001, TestSize.Level0) /** * @tc.name:version_info_manager_test_002 - * @tc.desc: Verify the VersionInfoManager SyncRemoteVersionInfos function. - * @tc.type: FUNC - * @tc.require: AR000GHSJE - */ -HWTEST_F(VersionInfoManagerTest, version_info_manager_test_002, TestSize.Level0) -{ - EXPECT_EQ(VersionInfoManager::GetInstance()->SyncRemoteVersionInfos(), DH_FWK_SUCCESS); -} - -/** - * @tc.name:version_info_manager_test_003 * @tc.desc: Verify the VersionInfoManager AddVersion function. * @tc.type: FUNC * @tc.require: AR000GHSCV */ -HWTEST_F(VersionInfoManagerTest, version_info_manager_test_004, TestSize.Level0) +HWTEST_F(VersionInfoManagerTest, version_info_manager_test_002, TestSize.Level0) { for (const auto& verInfo : g_versionInfos) { EXPECT_EQ(VersionInfoManager::GetInstance()->AddVersion(verInfo), DH_FWK_SUCCESS); @@ -161,12 +150,12 @@ HWTEST_F(VersionInfoManagerTest, version_info_manager_test_004, TestSize.Level0) } /** - * @tc.name:version_info_manager_test_005 + * @tc.name:version_info_manager_test_003 * @tc.desc: Verify the VersionInfoManager GetVersionInfoByDeviceId function. * @tc.type: FUNC * @tc.require: AR000GHSJE */ -HWTEST_F(VersionInfoManagerTest, version_info_manager_test_005, TestSize.Level0) +HWTEST_F(VersionInfoManagerTest, version_info_manager_test_003, TestSize.Level0) { VersionInfo versionInfo; for (const auto& verInfo : g_versionInfos) { @@ -176,23 +165,23 @@ HWTEST_F(VersionInfoManagerTest, version_info_manager_test_005, TestSize.Level0) } /** - * @tc.name:version_info_manager_test_006 + * @tc.name:version_info_manager_test_004 * @tc.desc: Verify the VersionInfoManager SyncVersionInfoFromDB function. * @tc.type: FUNC * @tc.require: AR000GHSJE */ -HWTEST_F(VersionInfoManagerTest, version_info_manager_test_006, TestSize.Level0) +HWTEST_F(VersionInfoManagerTest, version_info_manager_test_004, TestSize.Level0) { EXPECT_EQ(VersionInfoManager::GetInstance()->SyncVersionInfoFromDB(DEV_ID_1), DH_FWK_SUCCESS); } /** - * @tc.name:version_info_manager_test_007 + * @tc.name:version_info_manager_test_005 * @tc.desc: Verify the VersionInfoManager UnInit function. * @tc.type: FUNC * @tc.require: AR000GHSJE */ -HWTEST_F(VersionInfoManagerTest, version_info_manager_test_007, TestSize.Level0) +HWTEST_F(VersionInfoManagerTest, version_info_manager_test_005, TestSize.Level0) { EXPECT_EQ(VersionInfoManager::GetInstance()->UnInit(), DH_FWK_SUCCESS); } -- Gitee