From a2c243bfbbd1ab8205d0cc22a893fa3edf1e2d5f Mon Sep 17 00:00:00 2001 From: wuxiaodong02 Date: Mon, 28 Nov 2022 18:20:39 +0800 Subject: [PATCH 1/2] add ut Signed-off-by: wuxiaodong02 --- .../unittest/common/accessmanager/BUILD.gn | 5 +- .../accessmanager/access_manager_test.cpp | 145 ++++++++++++++++++ .../src/component_loader_test.cpp | 65 ++++++++ .../src/component_manager_test.cpp | 50 +++++- .../common/dbadapter/src/db_adapter_test.cpp | 117 +++++++++++++- .../src/distributed_hardware_manager_test.cpp | 23 +++ .../src/distributed_hardware_service_test.cpp | 29 ++++ .../src/resource_manager_test.cpp | 94 ++++++++++++ .../src/version_manager_test.cpp | 21 +++ utils/include/eventbus/event_bus.h | 2 +- .../common/utilstool/utils_tool_test.cpp | 39 +++++ 11 files changed, 578 insertions(+), 12 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index 62d8ffc1..307ba0d3 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -62,7 +62,10 @@ ohos_unittest("AccessManagerTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ "init:libbegetutil" ] + external_deps = [ + "c_utils:utils", + "init:libbegetutil", + ] } group("unittest") { 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..2abe6618 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp @@ -15,12 +15,16 @@ #include #include +#include #include #include #include "gtest/gtest.h" +#define private public #include "access_manager.h" +#undef private +#include "dm_device_info.h" #include "distributed_hardware_errno.h" #include "distributed_hardware_manager_factory.h" using namespace testing::ext; @@ -236,5 +240,146 @@ HWTEST_F(AccessManagerTest, AccessManagerInit, TestSize.Level0) { EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); } + +/** + * @tc.name: OnRemoteDied_001 + * @tc.desc: Verify the OnRemoteDied function + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(AccessManagerTest, OnRemoteDied_001, TestSize.Level0) +{ + EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); + AccessManager::GetInstance()->OnRemoteDied(); +} + +/** + * @tc.name: OnDeviceOnline_001 + * @tc.desc: Verify the OnDeviceOnline function + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(AccessManagerTest, OnDeviceOnline_001, TestSize.Level0) +{ + EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); + DmDeviceInfo deviceInfo; + AccessManager::GetInstance()->OnDeviceOnline(deviceInfo); +} + +/** + * @tc.name: OnDeviceOffline_001 + * @tc.desc: Verify the OnDeviceOffline function + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(AccessManagerTest, OnDeviceOffline_001, TestSize.Level0) +{ + EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); + DmDeviceInfo deviceInfo; + AccessManager::GetInstance()->OnDeviceOffline(deviceInfo); +} + +/** + * @tc.name: OnDeviceOffline_002 + * @tc.desc: Verify the OnDeviceOffline function + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(AccessManagerTest, OnDeviceOffline_002, TestSize.Level0) +{ + EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); + DmDeviceInfo deviceInfo; + std::string devId = "000001"; + EXPECT_EQ(EOK, memcpy_s(deviceInfo.deviceId, DM_MAX_DEVICE_ID_LEN, devId.c_str(), devId.length())); + AccessManager::GetInstance()->OnDeviceOffline(deviceInfo); +} + +/** + * @tc.name: OnDeviceOffline_003 + * @tc.desc: Verify the OnDeviceOffline function + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(AccessManagerTest, OnDeviceOffline_003, TestSize.Level0) +{ + EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); + DmDeviceInfo deviceInfo; + std::string devId = "000001"; + EXPECT_EQ(EOK, memcpy_s(deviceInfo.deviceId, DM_MAX_DEVICE_ID_LEN, devId.c_str(), devId.length())); + std::string netId = "000002"; + EXPECT_EQ(EOK, memcpy_s(deviceInfo.networkId, DM_MAX_DEVICE_ID_LEN, netId.c_str(), netId.length())); + AccessManager::GetInstance()->OnDeviceOffline(deviceInfo); +} + +/** + * @tc.name: OnDeviceReady_001 + * @tc.desc: Verify the OnDeviceReady function + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(AccessManagerTest, OnDeviceReady_001, TestSize.Level0) +{ + EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); + DmDeviceInfo deviceInfo; + AccessManager::GetInstance()->OnDeviceReady(deviceInfo); +} + +/** + * @tc.name: OnDeviceReady_002 + * @tc.desc: Verify the OnDeviceReady function + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(AccessManagerTest, OnDeviceReady_002, TestSize.Level0) +{ + EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); + DmDeviceInfo deviceInfo; + std::string devId = "000001"; + EXPECT_EQ(EOK, memcpy_s(deviceInfo.deviceId, DM_MAX_DEVICE_ID_LEN, devId.c_str(), devId.length())); + AccessManager::GetInstance()->OnDeviceReady(deviceInfo); +} + +/** + * @tc.name: OnDeviceReady_003 + * @tc.desc: Verify the OnDeviceReady function + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(AccessManagerTest, OnDeviceReady_003, TestSize.Level0) +{ + EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); + DmDeviceInfo deviceInfo; + std::string devId = "000001"; + EXPECT_EQ(EOK, memcpy_s(deviceInfo.deviceId, DM_MAX_DEVICE_ID_LEN, devId.c_str(), devId.length())); + std::string netId = "000002"; + EXPECT_EQ(EOK, memcpy_s(deviceInfo.networkId, DM_MAX_DEVICE_ID_LEN, netId.c_str(), netId.length())); + AccessManager::GetInstance()->OnDeviceReady(deviceInfo); +} + +/** + * @tc.name: OnDeviceChanged_001 + * @tc.desc: Verify the OnDeviceChanged function + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(AccessManagerTest, OnDeviceChanged_001, TestSize.Level0) +{ + EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); + DmDeviceInfo deviceInfo; + AccessManager::GetInstance()->OnDeviceChanged(deviceInfo); +} + +/** + * @tc.name: UnInit_001 + * @tc.desc: Verify the UnInit function + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(AccessManagerTest, UnInit_001, TestSize.Level0) +{ + EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); + DmDeviceInfo deviceInfo; + AccessManager::GetInstance()->OnDeviceChanged(deviceInfo); +} } // namespace DistributedHardware } // namespace OHOS 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..875f6b83 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,70 @@ 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(soNameEmpty); + EXPECT_EQ(nullptr, handler); +} + +/** + * @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(soName); + EXPECT_EQ(nullptr, handler); +} + +/** + * @tc.name: component_loader_test_011 + * @tc.desc: Verify the GetCompPathAndVersion function. + * @tc.type: FUNC + * @tc.require: AR000GHSK3 + */ +HWTEST_F(ComponentLoaderTest, component_loader_test_011, TestSize.Level0) +{ + std::string jsonStr = ""; + std::map dhtypeMap; + int32_t ret = ComponentLoader::GetInstance().GetCompPathAndVersion(jsonStr, dhtypeMap); + EXPECT_EQ(ERR_DH_FWK_JSON_PARSE_FAILED, ret); +} + +/** + * @tc.name: component_loader_test_012 + * @tc.desc: Verify the IsDHTypeExist function. + * @tc.type: FUNC + * @tc.require: AR000GHSK3 + */ +HWTEST_F(ComponentLoaderTest, component_loader_test_012, TestSize.Level0) +{ + bool ret = ComponentLoader::GetInstance().IsDHTypeExist(DHType::CAMERA); + EXPECT_EQ(true, ret); +} + +/** + * @tc.name: component_loader_test_013 + * @tc.desc: Verify the GetSourceSaId function. + * @tc.type: FUNC + * @tc.require: AR000GHSK3 + */ +HWTEST_F(ComponentLoaderTest, component_loader_test_013, TestSize.Level0) +{ + const int32_t INVALID_SA_ID = -1; + int32_t ret = ComponentLoader::GetInstance().GetSourceSaId(DHType::UNKNOWN); + EXPECT_EQ(INVALID_SA_ID, ret); +} } // namespace DistributedHardware } // namespace OHOS diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/src/component_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/src/component_manager_test.cpp index a09736fa..021ca223 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/src/component_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/src/component_manager_test.cpp @@ -309,6 +309,22 @@ HWTEST_F(ComponentManagerTest, enable_test_004, TestSize.Level0) thread6.join(); } +/** + * @tc.name: enable_test_005 + * @tc.desc: Verify the Enable for Multi-thread + * @tc.type: FUNC + * @tc.require: AR000GHSK7 + */ +HWTEST_F(ComponentManagerTest, Enable_test_005, TestSize.Level0) +{ + std::string networkId = ""; + std::string uuid = ""; + std::string dhId = ""; + ComponentManager::GetInstance().compSource_.clear(); + auto ret = ComponentManager::GetInstance().Enable(networkId, uuid, dhId, DHType::CAMERA); + EXPECT_EQ(ERR_DH_FWK_PARA_INVALID, ret); +} + /** * @tc.name: disable_test_001 * @tc.desc: Verify the Disable success @@ -376,6 +392,22 @@ HWTEST_F(ComponentManagerTest, disable_test_004, TestSize.Level0) thread6.join(); } +/** + * @tc.name: disable_test_005 + * @tc.desc: Verify the Disable for Multi-thread + * @tc.type: FUNC + * @tc.require: AR000GHSK9 + */ +HWTEST_F(ComponentManagerTest, Disable_test_005, TestSize.Level0) +{ + std::string networkId = ""; + std::string uuid = ""; + std::string dhId = ""; + ComponentManager::GetInstance().compSource_.clear(); + auto ret = ComponentManager::GetInstance().Disable(networkId, uuid, dhId, DHType::CAMERA); + EXPECT_EQ(ERR_DH_FWK_PARA_INVALID, ret); +} + /** * @tc.name: init_compSource_test_001 * @tc.desc: Verify the InitCompSource @@ -436,7 +468,7 @@ HWTEST_F(ComponentManagerTest, get_enableparam_test_001, TestSize.Level0) EnableParam param; auto ret = ComponentManager::GetInstance().GetEnableParam(NETWORK_TEST, UUID_TEST, DH_ID_1, DHType::CAMERA, param); - EXPECT_EQ(ret, DH_FWK_SUCCESS); + EXPECT_EQ(DH_FWK_SUCCESS, ret); } /** @@ -462,7 +494,21 @@ HWTEST_F(ComponentManagerTest, get_sinkversion_fromvermgr_test_001, TestSize.Lev VersionManager::GetInstance().AddDHVersion(UUID_TEST, dhVersion); std::string sinkVersion; auto ret = ComponentManager::GetInstance().GetSinkVersionFromVerMgr(UUID_TEST, DHType::CAMERA, sinkVersion); - EXPECT_EQ(ret, DH_FWK_SUCCESS); + EXPECT_EQ(DH_FWK_SUCCESS, ret); +} + +/** + * @tc.name: GetDHType_test_001 + * @tc.desc: Verify the GetDHType + * @tc.type: FUNC + * @tc.require: AR000GHSK9 + */ +HWTEST_F(ComponentManagerTest, GetDHType_test_001, TestSize.Level0) +{ + std::string uuid = "distribueted_111222333"; + std::string dhId = "camera_1234567489"; + auto ret = ComponentManager::GetInstance().GetDHType(uuid, dhId); + EXPECT_EQ(DHType::UNKNOWN, ret); } } // namespace DistributedHardware } // namespace OHOS 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..c7932d01 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"; @@ -122,7 +123,7 @@ void DbAdapterTest::TearDown() */ HWTEST_F(DbAdapterTest, db_adapter_test_000, TestSize.Level0) { - EXPECT_EQ(g_dbAdapterPtr->Init(), DH_FWK_SUCCESS); + EXPECT_EQ(DH_FWK_SUCCESS, g_dbAdapterPtr->Init()); } /** @@ -144,7 +145,7 @@ HWTEST_F(DbAdapterTest, db_adapter_test_001, TestSize.Level0) keys.push_back(key); values.push_back(resInfo->ToJsonString()); } - EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keys, values), DH_FWK_SUCCESS); + EXPECT_EQ(DH_FWK_SUCCESS, g_dbAdapterPtr->PutDataBatch(keys, values)); for (auto &resInfo : resInfos) { g_dbAdapterPtr->RemoveDataByKey(resInfo->GetKey()); } @@ -161,7 +162,7 @@ HWTEST_F(DbAdapterTest, db_adapter_test_002, TestSize.Level0) std::vector keys { std::string(TEST_DEV_ID_2 + TEST_DH_ID_0) }; std::vector values { TEST_DH_ATTR_0 }; - EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keys, values), DH_FWK_SUCCESS); + EXPECT_EQ(DH_FWK_SUCCESS, g_dbAdapterPtr->PutDataBatch(keys, values)); g_dbAdapterPtr->RemoveDataByKey(keys[0]); } @@ -176,7 +177,7 @@ HWTEST_F(DbAdapterTest, db_adapter_test_003, TestSize.Level0) std::vector keys { std::string(TEST_DEV_ID_2 + TEST_DH_ID_0) }; std::vector valuesEmpty; - EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keys, valuesEmpty), ERR_DH_FWK_PARA_INVALID); + EXPECT_EQ(ERR_DH_FWK_PARA_INVALID, g_dbAdapterPtr->PutDataBatch(keys, valuesEmpty)); } /** @@ -190,7 +191,7 @@ HWTEST_F(DbAdapterTest, db_adapter_test_004, TestSize.Level0) std::vector keysEmpty; std::vector values { TEST_DH_ATTR_0 }; - EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keysEmpty, values), ERR_DH_FWK_PARA_INVALID); + EXPECT_EQ(ERR_DH_FWK_PARA_INVALID, g_dbAdapterPtr->PutDataBatch(keysEmpty, values)); } /** @@ -204,7 +205,7 @@ HWTEST_F(DbAdapterTest, db_adapter_test_005, TestSize.Level0) std::vector keysEmpty; std::vector valuesEmpty; - EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keysEmpty, valuesEmpty), ERR_DH_FWK_PARA_INVALID); + EXPECT_EQ(ERR_DH_FWK_PARA_INVALID, g_dbAdapterPtr->PutDataBatch(keysEmpty, valuesEmpty)); } /** @@ -218,7 +219,7 @@ HWTEST_F(DbAdapterTest, db_adapter_test_006, 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 }; - EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keys, values), ERR_DH_FWK_PARA_INVALID); + EXPECT_EQ(ERR_DH_FWK_PARA_INVALID, g_dbAdapterPtr->PutDataBatch(keys, values)); } /** @@ -233,7 +234,107 @@ HWTEST_F(DbAdapterTest, db_adapter_test_007, TestSize.Level0) std::vector keys { std::string(TEST_DEV_ID_2 + TEST_DH_ID_0) }; std::vector values { TEST_DH_ATTR_0 }; - EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keys, values), ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL); + EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->PutDataBatch(keys, values)); +} + +/** + * @tc.name: db_adapter_test_008 + * @tc.desc: Verify the ReInit function. + * @tc.type: FUNC + * @tc.require: AR000GHSCV + */ +HWTEST_F(DbAdapterTest, db_adapter_test_008, TestSize.Level0) +{ + g_dbAdapterPtr->kvStoragePtr_ = nullptr; + EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->ReInit()); +} + +/** + * @tc.name: db_adapter_test_009 + * @tc.desc: Verify the RemoveDeviceData function. + * @tc.type: FUNC + * @tc.require: AR000GHSCV + */ +HWTEST_F(DbAdapterTest, db_adapter_test_009, TestSize.Level0) +{ + g_dbAdapterPtr->kvStoragePtr_ = nullptr; + EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->RemoveDeviceData(TEST_DEV_ID_0)); +} + +/** + * @tc.name: db_adapter_test_010 + * @tc.desc: Verify the RemoveDataByKey function. + * @tc.type: FUNC + * @tc.require: AR000GHSCV + */ +HWTEST_F(DbAdapterTest, db_adapter_test_010, TestSize.Level0) +{ + g_dbAdapterPtr->kvStoragePtr_ = nullptr; + EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->RemoveDataByKey("key")); +} + +/** + * @tc.name: db_adapter_test_011 + * @tc.desc: Verify the ManualSync function. + * @tc.type: FUNC + * @tc.require: AR000GHSCV + */ +HWTEST_F(DbAdapterTest, db_adapter_test_011, TestSize.Level0) +{ + std::string networkId = DEV_NETWORK_ID_1; + g_dbAdapterPtr->kvStoragePtr_ = nullptr; + EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->ManualSync(DEV_NETWORK_ID_1)); +} + +/** + * @tc.name: db_adapter_test_012 + * @tc.desc: Verify the UnRegisterChangeListener function. + * @tc.type: FUNC + * @tc.require: AR000GHSCV + */ +HWTEST_F(DbAdapterTest, db_adapter_test_012, TestSize.Level0) +{ + g_dbAdapterPtr->kvStoragePtr_ = nullptr; + EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->UnRegisterChangeListener()); +} + +/** + * @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 = std::string(TEST_DEV_ID_1 + TEST_DH_ID_1); + std::string value = TEST_DH_ATTR_0; + g_dbAdapterPtr->kvStoragePtr_ = nullptr; + EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->PutData(key, value)); +} + +/** + * @tc.name: db_adapter_test_014 + * @tc.desc: Verify the RegisterChangeListener function. + * @tc.type: FUNC + * @tc.require: AR000GHSCV + */ +HWTEST_F(DbAdapterTest, db_adapter_test_014, TestSize.Level0) +{ + std::string networkId = DEV_NETWORK_ID_1; + g_dbAdapterPtr->kvStoragePtr_ = nullptr; + EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->RegisterChangeListener()); +} + +/** + * @tc.name: db_adapter_test_015 + * @tc.desc: Verify the UnRegisterChangeListener function. + * @tc.type: FUNC + * @tc.require: AR000GHSCV + */ +HWTEST_F(DbAdapterTest, db_adapter_test_015, TestSize.Level0) +{ + g_dbAdapterPtr->kvStoragePtr_ = nullptr; + EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->UnRegisterChangeListener()); } } // namespace DistributedHardware } // namespace OHOS diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/src/distributed_hardware_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/src/distributed_hardware_manager_test.cpp index dcf836cc..5c66fe4f 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/src/distributed_hardware_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/src/distributed_hardware_manager_test.cpp @@ -168,5 +168,28 @@ HWTEST_F(DistributedHardwareManagerTest, sendOffLineEvent_test_003, TestSize.Lev ASSERT_EQ(DH_FWK_SUCCESS, TaskBoard::GetInstance().WaitForALLTaskFinish()); ASSERT_TRUE(TaskBoard::GetInstance().IsAllTaskFinish()); } + +/** + * @tc.name: Release_001 + * @tc.desc: Verify the Release function + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(DistributedHardwareManagerTest, Release_001, TestSize.Level0) +{ + EXPECT_EQ(DH_FWK_SUCCESS, DistributedHardwareManager::GetInstance().Release()); +} + +/** + * @tc.name: GetComponentVersion_001 + * @tc.desc: Verify the GetComponentVersion function + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(DistributedHardwareManagerTest, RGetComponentVersion_001, TestSize.Level0) +{ + std::unordered_map versionMap; + EXPECT_NE(DH_FWK_SUCCESS, DistributedHardwareManager::GetInstance().GetComponentVersion(versionMap)); +} } // namespace DistributedHardware } // namespace OHOS diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/src/distributed_hardware_service_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/src/distributed_hardware_service_test.cpp index 2e6e5fe9..5b441914 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/src/distributed_hardware_service_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/src/distributed_hardware_service_test.cpp @@ -136,5 +136,34 @@ HWTEST_F(DistributedHardwareServiceTest, dump_test_001, TestSize.Level0) ret = service.Dump(fd, std::vector { ARGS_C }); EXPECT_EQ(ret, DH_FWK_SUCCESS); } + +/** + * @tc.name: OnStart_001 + * @tc.desc: Verify the OnStart function + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(DistributedHardwareServiceTest, OnStart_001, TestSize.Level0) +{ + DistributedHardwareService service(ASID, true); + service.state_ = ServiceRunningState::STATE_RUNNING; + service.OnStart(); + service.OnStop(); + EXPECT_EQ(ServiceRunningState::STATE_NOT_START, service.state_); +} + +/** + * @tc.name: Init_001 + * @tc.desc: Verify the Init function + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(DistributedHardwareServiceTest, Init_001, TestSize.Level0) +{ + DistributedHardwareService service(ASID, true); + service.registerToService_ = false; + + EXPECT_EQ(false, service.Init()); +} } // 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..6d6513b4 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,99 @@ 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 RemoveCapabilityInfoInDB function. + * @tc.type: FUNC + * @tc.require: AR000GHSJE + */ +HWTEST_F(ResourceManagerTest, resource_manager_test_014, TestSize.Level0) +{ + std::string deviceIdEmpty = ""; + int32_t ret = CapabilityInfoManager::GetInstance()->RemoveCapabilityInfoInDB(deviceIdEmpty); + EXPECT_EQ(ERR_DH_FWK_PARA_INVALID, ret); +} + +/** + * @tc.name: resource_manager_test_015 + * @tc.desc: Verify the GetCapabilityByValue function. + * @tc.type: FUNC + * @tc.require: AR000GHSJE + */ +HWTEST_F(ResourceManagerTest, resource_manager_test_015, TestSize.Level0) +{ + std::string value = ""; + std::shared_ptr capPtr = nullptr; + int32_t ret = CapabilityUtils::GetCapabilityByValue(value, capPtr); + EXPECT_EQ(ERR_DH_FWK_JSON_PARSE_FAILED, ret); +} + +/** + * @tc.name: resource_manager_test_016 + * @tc.desc: Verify the GetCapabilityKey function. + * @tc.type: FUNC + * @tc.require: AR000GHSJE + */ +HWTEST_F(ResourceManagerTest, resource_manager_test_016, TestSize.Level0) +{ + std::string deviceId = "deviceIdtest"; + std::string dhId = "dhIdtest"; + std::string str = CapabilityUtils::GetCapabilityKey(deviceId, dhId); + EXPECT_EQ("deviceIdtest###dhIdtest", str); +} + +/** + * @tc.name: resource_manager_test_017 + * @tc.desc: Verify the IsCapKeyMatchDeviceId function. + * @tc.type: FUNC + * @tc.require: AR000GHSJE + */ +HWTEST_F(ResourceManagerTest, resource_manager_test_017, TestSize.Level0) +{ + std::string key = "keytest"; + bool ret = CapabilityUtils::IsCapKeyMatchDeviceId(key, DEV_ID_0); + EXPECT_EQ(false, ret); +} + +/** + * @tc.name: resource_manager_test_018 + * @tc.desc: Verify the IsCapKeyMatchDeviceId function. + * @tc.type: FUNC + * @tc.require: AR000GHSJE + */ +HWTEST_F(ResourceManagerTest, resource_manager_test_018, TestSize.Level0) +{ + std::string key = "bb536a637105409e904d4da83790a4a7###keytest"; + bool ret = CapabilityUtils::IsCapKeyMatchDeviceId(key, DEV_ID_0); + EXPECT_EQ(true, ret); +} + +/** + * @tc.name: resource_manager_test_019 + * @tc.desc: Verify the FromJsonString function. + * @tc.type: FUNC + * @tc.require: AR000GHSJE + */ +HWTEST_F(ResourceManagerTest, resource_manager_test_019, TestSize.Level0) +{ + CapabilityInfo capaInfo; + std::string jsonStr = ""; + int32_t ret = capaInfo.FromJsonString(jsonStr); + EXPECT_EQ(ERR_DH_FWK_JSON_PARSE_FAILED, ret); +} + +/** + * @tc.name: resource_manager_test_020 + * @tc.desc: Verify the Compare function. + * @tc.type: FUNC + * @tc.require: AR000GHSJE + */ +HWTEST_F(ResourceManagerTest, resource_manager_test_020, TestSize.Level0) +{ + CapabilityInfo capaInfo(DH_ID_0, DEV_ID_0, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::CAMERA, DH_ATTR_0); + bool ret = CAP_INFO_1->Compare(capaInfo); + EXPECT_EQ(false, ret); +} } // namespace DistributedHardware } // namespace OHOS diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/src/version_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/src/version_manager_test.cpp index 4193cc1b..e7a82bda 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/src/version_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/src/version_manager_test.cpp @@ -154,5 +154,26 @@ HWTEST_F(VersionManagerTest, version_manager_test_005, TestSize.Level0) ret = VersionManager::GetInstance().RemoveDHVersion(TEST_DEVICE_ID_1); EXPECT_EQ(DH_FWK_SUCCESS, ret); } + +/** + * @tc.name: version_manager_test_006 + * @tc.desc: Verify GetCompVersion function + * @tc.type: FUNC + * @tc.require: AR000GHSKN + */ +HWTEST_F(VersionManagerTest, version_manager_test_006, TestSize.Level0) +{ + DHVersion dhVersion; + CompVersion cVs1; + CompVersionGetValue(cVs1, TEST_COMPONENT_NAME_1, DHType::CAMERA, TEST_HANDLER_VERSION_1, TEST_SOURCE_VERSION_1, + TEST_SINK_VERSION_1); + dhVersion.uuid = TEST_DEVICE_ID_1; + dhVersion.dhVersion = TEST_DH_VERSION; + dhVersion.compVersions.insert(std::make_pair(cVs1.dhType, cVs1)); + int32_t ret = VersionManager::GetInstance().AddDHVersion(dhVersion.uuid, dhVersion); + EXPECT_EQ(DH_FWK_SUCCESS, ret); + ret = VersionManager::GetInstance().GetCompVersion(TEST_DEVICE_ID_1, DHType::CAMERA, cVs1); + EXPECT_EQ(DH_FWK_SUCCESS, ret); +} } // namespace DistributedHardware } // namespace OHOS diff --git a/utils/include/eventbus/event_bus.h b/utils/include/eventbus/event_bus.h index 9e4f013e..9989f194 100644 --- a/utils/include/eventbus/event_bus.h +++ b/utils/include/eventbus/event_bus.h @@ -57,7 +57,7 @@ public: } } - EventBus(const std::string &threadName) + explicit EventBus(const std::string &threadName) { ULOGI("ctor EventBus threadName: %s", threadName.c_str()); if (eventbusHandler_ == nullptr) { diff --git a/utils/test/unittest/common/utilstool/utils_tool_test.cpp b/utils/test/unittest/common/utilstool/utils_tool_test.cpp index b8981972..e43067bf 100644 --- a/utils/test/unittest/common/utilstool/utils_tool_test.cpp +++ b/utils/test/unittest/common/utilstool/utils_tool_test.cpp @@ -120,5 +120,44 @@ 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 GetUUIDBySoftBus function + * @tc.type: FUNC + * @tc.require: AR000GHSK0 + */ +HWTEST_F(UtilsToolTest, utils_tool_test_005, TestSize.Level0) +{ + std::string networkId = ""; + std::string ret = GetUUIDBySoftBus(networkId); + EXPECT_EQ(0, ret.size()); +} + +/** + * @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 uuidEmpty = ""; + std::string ret = GetDeviceIdByUUID(uuidEmpty); + ASSERT_EQ(0, ret.size()); +} + +/** + * @tc.name: utils_tool_test_007 + * @tc.desc: Verify the GetDeviceIdByUUID function + * @tc.type: FUNC + * @tc.require: AR000GHSK0 + */ +HWTEST_F(UtilsToolTest, utils_tool_test_007, TestSize.Level0) +{ + std::string uuid = "bb536a637105409e904d4da78290ab1"; + std::string ret = GetDeviceIdByUUID(uuid); + ASSERT_NE(0, ret.size()); +} } // namespace DistributedHardware } // namespace OHOS -- Gitee From 95ed9e84d04773cd2caf4d9865cad0f74cd066d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A6=E5=B0=8F=E4=B8=9C?= Date: Mon, 28 Nov 2022 12:24:44 +0000 Subject: [PATCH 2/2] =?UTF-8?q?update=20access=5Fmanager=5Ftest.cpp.=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E6=84=8F=E4=B9=89ut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 武小东 --- .../accessmanager/access_manager_test.cpp | 141 ------------------ 1 file changed, 141 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 2abe6618..299db1e3 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp @@ -240,146 +240,5 @@ HWTEST_F(AccessManagerTest, AccessManagerInit, TestSize.Level0) { EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); } - -/** - * @tc.name: OnRemoteDied_001 - * @tc.desc: Verify the OnRemoteDied function - * @tc.type: FUNC - * @tc.require: AR000GHSJM - */ -HWTEST_F(AccessManagerTest, OnRemoteDied_001, TestSize.Level0) -{ - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); - AccessManager::GetInstance()->OnRemoteDied(); -} - -/** - * @tc.name: OnDeviceOnline_001 - * @tc.desc: Verify the OnDeviceOnline function - * @tc.type: FUNC - * @tc.require: AR000GHSJM - */ -HWTEST_F(AccessManagerTest, OnDeviceOnline_001, TestSize.Level0) -{ - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); - DmDeviceInfo deviceInfo; - AccessManager::GetInstance()->OnDeviceOnline(deviceInfo); -} - -/** - * @tc.name: OnDeviceOffline_001 - * @tc.desc: Verify the OnDeviceOffline function - * @tc.type: FUNC - * @tc.require: AR000GHSJM - */ -HWTEST_F(AccessManagerTest, OnDeviceOffline_001, TestSize.Level0) -{ - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); - DmDeviceInfo deviceInfo; - AccessManager::GetInstance()->OnDeviceOffline(deviceInfo); -} - -/** - * @tc.name: OnDeviceOffline_002 - * @tc.desc: Verify the OnDeviceOffline function - * @tc.type: FUNC - * @tc.require: AR000GHSJM - */ -HWTEST_F(AccessManagerTest, OnDeviceOffline_002, TestSize.Level0) -{ - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); - DmDeviceInfo deviceInfo; - std::string devId = "000001"; - EXPECT_EQ(EOK, memcpy_s(deviceInfo.deviceId, DM_MAX_DEVICE_ID_LEN, devId.c_str(), devId.length())); - AccessManager::GetInstance()->OnDeviceOffline(deviceInfo); -} - -/** - * @tc.name: OnDeviceOffline_003 - * @tc.desc: Verify the OnDeviceOffline function - * @tc.type: FUNC - * @tc.require: AR000GHSJM - */ -HWTEST_F(AccessManagerTest, OnDeviceOffline_003, TestSize.Level0) -{ - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); - DmDeviceInfo deviceInfo; - std::string devId = "000001"; - EXPECT_EQ(EOK, memcpy_s(deviceInfo.deviceId, DM_MAX_DEVICE_ID_LEN, devId.c_str(), devId.length())); - std::string netId = "000002"; - EXPECT_EQ(EOK, memcpy_s(deviceInfo.networkId, DM_MAX_DEVICE_ID_LEN, netId.c_str(), netId.length())); - AccessManager::GetInstance()->OnDeviceOffline(deviceInfo); -} - -/** - * @tc.name: OnDeviceReady_001 - * @tc.desc: Verify the OnDeviceReady function - * @tc.type: FUNC - * @tc.require: AR000GHSJM - */ -HWTEST_F(AccessManagerTest, OnDeviceReady_001, TestSize.Level0) -{ - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); - DmDeviceInfo deviceInfo; - AccessManager::GetInstance()->OnDeviceReady(deviceInfo); -} - -/** - * @tc.name: OnDeviceReady_002 - * @tc.desc: Verify the OnDeviceReady function - * @tc.type: FUNC - * @tc.require: AR000GHSJM - */ -HWTEST_F(AccessManagerTest, OnDeviceReady_002, TestSize.Level0) -{ - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); - DmDeviceInfo deviceInfo; - std::string devId = "000001"; - EXPECT_EQ(EOK, memcpy_s(deviceInfo.deviceId, DM_MAX_DEVICE_ID_LEN, devId.c_str(), devId.length())); - AccessManager::GetInstance()->OnDeviceReady(deviceInfo); -} - -/** - * @tc.name: OnDeviceReady_003 - * @tc.desc: Verify the OnDeviceReady function - * @tc.type: FUNC - * @tc.require: AR000GHSJM - */ -HWTEST_F(AccessManagerTest, OnDeviceReady_003, TestSize.Level0) -{ - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); - DmDeviceInfo deviceInfo; - std::string devId = "000001"; - EXPECT_EQ(EOK, memcpy_s(deviceInfo.deviceId, DM_MAX_DEVICE_ID_LEN, devId.c_str(), devId.length())); - std::string netId = "000002"; - EXPECT_EQ(EOK, memcpy_s(deviceInfo.networkId, DM_MAX_DEVICE_ID_LEN, netId.c_str(), netId.length())); - AccessManager::GetInstance()->OnDeviceReady(deviceInfo); -} - -/** - * @tc.name: OnDeviceChanged_001 - * @tc.desc: Verify the OnDeviceChanged function - * @tc.type: FUNC - * @tc.require: AR000GHSJM - */ -HWTEST_F(AccessManagerTest, OnDeviceChanged_001, TestSize.Level0) -{ - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); - DmDeviceInfo deviceInfo; - AccessManager::GetInstance()->OnDeviceChanged(deviceInfo); -} - -/** - * @tc.name: UnInit_001 - * @tc.desc: Verify the UnInit function - * @tc.type: FUNC - * @tc.require: AR000GHSJM - */ -HWTEST_F(AccessManagerTest, UnInit_001, TestSize.Level0) -{ - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); - DmDeviceInfo deviceInfo; - AccessManager::GetInstance()->OnDeviceChanged(deviceInfo); -} } // namespace DistributedHardware } // namespace OHOS -- Gitee