From 765a9e257861615da31c0e0bb75e2bc40528a55a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E4=BD=B3=E7=82=9C?= Date: Fri, 27 Jun 2025 21:50:50 +0800 Subject: [PATCH 01/14] add ut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 石佳炜 --- .../include/datashare_helper_mock.h | 158 +++++++++ .../include/datashare_result_set_mock.h | 49 +++ .../src/datashare_helper_mock.cpp | 100 ++++++ .../src/datashare_result_set_mock .cpp | 55 ++++ .../backup_sa/module_external/BUILD.gn | 5 +- .../storage_manager_service_test.cpp | 307 +++++++++++++++--- 6 files changed, 633 insertions(+), 41 deletions(-) create mode 100644 tests/mock/module_external/include/datashare_helper_mock.h create mode 100644 tests/mock/module_external/include/datashare_result_set_mock.h create mode 100644 tests/mock/module_external/src/datashare_helper_mock.cpp create mode 100644 tests/mock/module_external/src/datashare_result_set_mock .cpp diff --git a/tests/mock/module_external/include/datashare_helper_mock.h b/tests/mock/module_external/include/datashare_helper_mock.h new file mode 100644 index 000000000..b67dda95c --- /dev/null +++ b/tests/mock/module_external/include/datashare_helper_mock.h @@ -0,0 +1,158 @@ +/* + * Copyright (c) 202 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef DATASHARE_HELPER_MOCK_H +#define DATASHARE_HELPER_MOCK_H + +#include +#include "gmock/gmock.h" +#include "datashare_helper.h" +#include "datashare_helper_mock.h" + +namespace OHOS{ +using namespace DataShare; +using string = std::string; +namespace FileManageMent::Backup { +class IDataShareHelper { +public: + IDataShareHelper() = default; + virtual ~IDataShareHelper() = default; + virtual std::share_ptr Creator(const sptr &token, + const string &strUri, const string &extUri, const int waitTime, bool isSystem) = 0; + virtual std::shared_ptr Query(Uri &uri,const DataSharePredicates &predicates, + std::vector &colums, DataShareBusinessError *businessError) = 0;; +public: + static inline std::shared_ptr idsh = nullptr; +}; + +class DataShareHelperImpl : public DataShareHelper { +public: + MOCK_METHOD(std::shared_ptr, Query, (Uri &uri, const DataSharePredicates& predicates, + std::vector &colums, DataShareBusinessError *businessError), (override)); + + MOCK_METHOD(bool, Release, (), (override)); + + MOCK_METHOD(std::vector, GetFileTypes, (Uri &uri, const string &mimeTypeFilter), (override)); + + MOCK_METHOD(int, OpenFile, (Uri &uri, const std::string &mode), (override)); + + MOCK_METHOD(int, OpenRawFile, (Uri &uri, const std::string &mode), (override)); + + MOCK_METHOD(int, Insert, (Uri &uri, const DataShareValuesBucket &value), (override)); + + MOCK_METHOD(int, InsertExt, (Uri &uri, const DataShareValuesBucket &value, std::string &result), (override)); + + MOCK_METHOD(int, Update, (Uri &uri, const DataSharePredicates &predicates, + const DataShareValuesBucket &value), (override)); + + MOCK_METHOD(int, BatchUpdate, (const UpdateOperations &operations, + std::vector &results), (override)); + + MOCK_METHOD(int, Delete, (Uri &uri, const DataSharePredicates &predicates), (override)); + + MOCK_METHOD(string, GetType, (Uri &uri), (override)); + + MOCK_METHOD(int, BatchInsert, (Uri &uri, const std::vector &values), (override)); + + MOCK_METHOD(int, ExecuteBatch, (const std::vector &statements, + ExecResultSet &result), (override)); + + MOCK_METHOD(int, RegisterObserver, (const Uri &uri, + const sptr &dataObserver), (override)); + + MOCK_METHOD(int, UnregisterObserver, (const Uri &uri, + const sptr &dataObserver), (override)); + + MOCK_METHOD(void, NotifyChange, (const Uri &uri), (override)); + + MOCK_METHOD(int, RegisterObserverExtProvider, (const Uri &uri, std::shared_ptr dataObserver, + bool isDescendants), (override)); + + MOCK_METHOD(int, UnregisterObserverExtProvider, (const Uri &uri, + std::shared_ptr dataObserver), (override)); + + MOCK_METHOD(void, NotifyChangeExtProvider, (const DataShareObserver::ChangeInfo &changeInfo), (override)); + + MOCK_METHOD(Uri, NormalizeUri, (Uri &uri), (override)); + + MOCK_METHOD(Uri, DenormalizeUri, (Uri &uri), (override)); + + MOCK_METHOD(int, AddQueryTemplate, (const std::string &uri, int64_t subscriberId, Template &tpl), (override)); + + MOCK_METHOD(int, DelQueryTemplate, (const std::string &uri, int64_t subscriberId), (override)); + + MOCK_METHOD(std::vector, Publish, (const Data &data, const std::string &bundleName), (override)); + + MOCK_METHOD(Data, GetPublishedData, (const std::string &bundleName, int &resultCode), (override)); + + MOCK_METHOD(std::vector, SubscribeRdbData, (const std::vector &uris, +<<<<<<< HEAD +<<<<<<< HEAD + const TemplateId &templateId, + const std::function &callback), (override)); +======= + const TemplateId &templateId, const std::function &callback), (override)); +>>>>>>> df18e2da (add ut for storage manager service) +======= + const TemplateId &templateId, + const std::function &callback), (override)); +>>>>>>> f9bba3bd (add ut) + + MOCK_METHOD(std::vector, UnsubscribeRdbData, (const std::vector &uris, + const TemplateId &templateId), (override)); + + MOCK_METHOD(std::vector, EnableRdbSubs, (const std::vector &uris, + const TemplateId &templateId), (override)); + + MOCK_METHOD(std::vector, DisableRdbSubs, (const std::vector &uris, + const TemplateId &templateId), (override)); + + MOCK_METHOD(std::vector, SubscribePublishedData, + (const std::vector &uris, int64_t subscriberId, + const std::function &callback), (override)); + + MOCK_METHOD(std::vector, UnsubscribePublishedData,(const std::vector &uris, + int64_t subscriberId), (override)); + + MOCK_METHOD(std::vector, EnablePubSubs, + (const std::vector &uris, int64_t subscriberId), (override)); + + MOCK_METHOD(std::vector, DisablePubSubs, + (const std::vector &uris, int64_t subscriberId), (override)); + + MOCK_METHOD(std::pair, InsertEx, + (Uri &uri, const DataShareValuesBucket &value), (override)); + + MOCK_METHOD(std::pair, UpdateEx, (Uri &uri, const DataSharePredicates &predicates, + const DataShareValuesBucket &value), (override)); + + MOCK_METHOD((std::pair), DeleteEx, + (Uri &uri, const DataSharePredicates &predicates), (override)); + + MOCK_METHOD(int32_t, UserDefineFunc, (MessageParcel &data, MessageParcel &reply, + MessageOption &option), (override)); +}; + +class DataShareHelperMock : public IDataShareHelper { +public: + MOCK_METHOD(std::share_ptr, Creator,(const sptr &token, + const string &strUri, const string &extUri, const int waitTime, bool isSystem)); + + MOCK_METHOD(std::shared_ptr, Query, (Uri &uri, const DataSharePredicates& predicates, + std::vector &colums, DataShareBusinessError *businessError)); +} +} // using namespace OHOS::FileManageMent::Backup +} // namespace OHOS +#endif diff --git a/tests/mock/module_external/include/datashare_result_set_mock.h b/tests/mock/module_external/include/datashare_result_set_mock.h new file mode 100644 index 000000000..42448c8c5 --- /dev/null +++ b/tests/mock/module_external/include/datashare_result_set_mock.h @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef DATASHARE_RESULT_SET_MOCK_H +#define DATASHARE_RESULT_SET_MOCK_H + +#include +#include "gmock/gmock.h" +#include "datashare_result_set.h" + +namespace OHOS{ +using namespace DataShare; +namespace FileManageMent::Backup { +class IDataShareResultSet { +public: + IDataShareResultSet() = default; + virtual ~IDataShareResultSet() = default; + virtual int GetRowCount(int &count) = 0; + virtual int GoToNextRow() = 0; + virtual int GetColumIndex(const std::string &columnName, int columnIndex) = 0; + virtual int GetInt(int columnIndex, int &value) = 0; + virtual int GetLong(int columnIndex, int64_t &value) = 0; +public: + static inline std::shared_ptr idrsr = nullptr; +}; + +class DataShareResultSetMock : public IDataShareResultSet { +public: + MOCK_METHOD(int, GetRowCount, (int &count), (override)) = 0; + MOCK_METHOD(int, GoToNextRow, ()); + MOCK_METHOD(int, GetColumIndex, (const std::string &columnName, int columnIndex));; + MOCK_METHOD(int, GetInt, (int columnIndex, int &value), (override)); + MOCK_METHOD(int, GetLong, (int columnIndex, int64_t &value), (override)); +} +} // using namespace OHOS::FileManageMent::Backup +} // namespace OHOS +#endif diff --git a/tests/mock/module_external/src/datashare_helper_mock.cpp b/tests/mock/module_external/src/datashare_helper_mock.cpp new file mode 100644 index 000000000..d067557be --- /dev/null +++ b/tests/mock/module_external/src/datashare_helper_mock.cpp @@ -0,0 +1,100 @@ +/* +<<<<<<< HEAD +<<<<<<< HEAD + * Copyright (c) 2025 Huawei Device Co., Ltd. +======= + * Copyright (c) 2024 Huawei Device Co., Ltd. +>>>>>>> df18e2da (add ut for storage manager service) +======= + * Copyright (c) 2025 Huawei Device Co., Ltd. +>>>>>>> 0cc1da75 (add ut) + * 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. + */ + +<<<<<<< HEAD +<<<<<<< HEAD +======= +#ifndef DATASHARE_HELPER_MOCK_H +#define DATASHARE_HELPER_MOCK_H + +#include +#include "gmock/gmock.h" +>>>>>>> df18e2da (add ut for storage manager service) +======= +>>>>>>> 0cc1da75 (add ut) +#include "datashare_helper.h" +#include "datashare_helper_mock.h" + +namespace OHOS{ +<<<<<<< HEAD +<<<<<<< HEAD +namespace DataShare { +using namespace std; +using namespace FileManageMent::Backup + +std:shared_ptr DataShareHelper::Creator(const sptr &token, + const std::string &strUri, const std::string &extUri, const int waitTime, bool isSystem) +{ + GTEST_LOG(INFO) << "DataShareHelperMock Creator is OK"; + return IDataShareHelper::idsh->Creator(token, strUri, extUri, waitTime, isSystem); +} + +std::shared_ptr Query(Uri &uri,const DataSharePredicates &predicates, + std::vector &colums, DataShareBusinessError *businessError) +{ + GTEST_LOG(INFO) << "DataShareHelperMock Query is OK"; + return IDataShareHelper::idsh->Query(uri, predicates, colums, businessError); +} + +======= +using namespace DataShare; +using string = std::string; +namespace FileManageMent::Backup { +class IDataShareHelper { +public: + IDataShareHelper() = default; + virtual ~IDataShareHelper() = default; + virtual std::share_ptr Creator(const sptr &token, + const string &strUri, const string &extUri, const int waitTime, bool isSystem) = 0; + virtual std::shared_ptr Query(Uri &uri,const DataSharePredicates &predicates, + std::vector &colums, DataShareBusinessError *businessError) = 0;; +public: + static inline std::shared_ptr idsh = nullptr; +}; +======= +namespace DataShare { +using namespace std; +using namespace FileManageMent::Backup +>>>>>>> 0cc1da75 (add ut) + +std:shared_ptr DataShareHelper::Creator(const sptr &token, + const std::string &strUri, const std::string &extUri, const int waitTime, bool isSystem) +{ + GTEST_LOG(INFO) << "DataShareHelperMock Creator is OK"; + return IDataShareHelper::idsh->Creator(token, strUri, extUri, waitTime, isSystem); +} +<<<<<<< HEAD +>>>>>>> df18e2da (add ut for storage manager service) +======= + +std::shared_ptr Query(Uri &uri,const DataSharePredicates &predicates, + std::vector &colums, DataShareBusinessError *businessError) +{ + GTEST_LOG(INFO) << "DataShareHelperMock Query is OK"; + return IDataShareHelper::idsh->Query(uri, predicates, colums, businessError); +} + +>>>>>>> 0cc1da75 (add ut) +} // using namespace OHOS::FileManageMent::Backup +} // namespace OHOS +#endif diff --git a/tests/mock/module_external/src/datashare_result_set_mock .cpp b/tests/mock/module_external/src/datashare_result_set_mock .cpp new file mode 100644 index 000000000..40c865d4c --- /dev/null +++ b/tests/mock/module_external/src/datashare_result_set_mock .cpp @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2025 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 "datashare_result_set.h" +#include "datashare_result_set_mock.h" + +namespace OHOS{ +namespace DataShare { +using namespace std; +using namespace FileManageMent::Backup + +int GetRowCount(int &count) +{ + GTEST_LOG(INFO) << "DataShareResultSet GetRowCount is OK"; + return IDataShareResultSet::idrsr->GetRowCount(count); +} + +int GoToNextRow() +{ + GTEST_LOG(INFO) << "DataShareResultSet GoToNextRow is OK"; + return IDataShareResultSet::idrsr->GoToNextRow(); +} + +int GetColumIndex(const std::string &columnName, int &columnIndex) +{ + GTEST_LOG(INFO) << "DataShareResultSet GetColumIndex is OK"; + return IDataShareResultSet::idrsr->GetColumIndex(columnName, columnIndex); +} + +int GetInt(int columnIndex, int &value) +{ + GTEST_LOG(INFO) << "DataShareResultSet GetInt is OK"; + return IDataShareResultSet::idrsr->GetInt(columnIndex, value); +} + +int GetLong(int columnIndex, int64_t &value) +{ + GTEST_LOG(INFO) << "DataShareResultSet GetLong is OK"; + return IDataShareResultSet::idrsr->GetLong(columnIndex, value); +} +} +} + diff --git a/tests/unittests/backup_sa/module_external/BUILD.gn b/tests/unittests/backup_sa/module_external/BUILD.gn index f0f63b4d4..150f56cfd 100644 --- a/tests/unittests/backup_sa/module_external/BUILD.gn +++ b/tests/unittests/backup_sa/module_external/BUILD.gn @@ -72,11 +72,14 @@ ohos_unittest("storage_manager_service_test") { "${path_backup}/utils/include", "${path_backup}/utils/include/b_hilog", "${path_backup_mock}/utils_mock/include", + "${path_backup_mock}/module_external/include", ] sources = [ "${path_backup_mock}/utils_mock/src/b_jsonutil_mock.cpp", "${path_backup_mock}/utils_mock/src/b_sa_utils_mock.cpp", + "${path_backup_mock}/module_external/src/datashare_helper_mock.cpp", + "${path_backup_mock}/module_external/src/datashare_result_set_mock .cpp", "storage_manager_service_test.cpp", ] @@ -90,7 +93,7 @@ ohos_unittest("storage_manager_service_test") { defines = [ "LOG_TAG=\"app_file_service\"", - "LOG_DOMAIN=0xD200000", + "LOG_DOMAIN=0xD04303", "private = public", "protected = public", ] diff --git a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp index 5cf4c353e..b9a0f92f9 100644 --- a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp +++ b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp @@ -22,28 +22,110 @@ #include #include "file_uri.h" #include "sandbox_helper.h" +#include "b_jsonutil_mock.h" +#include "b_sa_utils_mock.h" +#include "if_system_ability_manager.h" +#include "iremote_stub.h" +#include "iservice_registry.h" +#include "module_external/bms_adapter.h" #include "module_external/storage_manager_service.h" #include "module_external/storage_manager_service.cpp" +#include "datashare_helper_mock.h" +#include "datashare_result_set_mock.h" +#include "directory_ex.h" namespace OHOS { const std::string CAMERA_BUNDLENAME = "file"; +const std::string CALENDAR_BUNDLENAME = "com.huawei.hmos.calendar"; using namespace std; using namespace testing; using namespace FileManagement::Backup; namespace fs = std::filesystem; + +class SystemAbilityManagerMock : public ISystemAbilityManager { +public: + MOCK_METHOD((sptr), AsObject, ()); + MOCK_METHOD((std::vector), ListSystemAbilities, (unsigned int)); + MOCK_METHOD((sptr), GetSystemAbility, (int32_t)); + MOCK_METHOD((sptr), CheckSystemAbility, (int32_t)); + MOCK_METHOD(int32_t, RemoveSystemAbility, (int32_t)); + MOCK_METHOD(int32_t, SubscribeSystemAbility, (int32_t, (const sptr&))); + MOCK_METHOD(int32_t, UnSubscribeSystemAbility, (int32_t, (const sptr&))); + MOCK_METHOD((sptr), GetSystemAbility, (int32_t, const std::string&)); + MOCK_METHOD(sptr, CheckSystemAbility, (int32_t, const std::string&)); + MOCK_METHOD(int32_t, AddOnDemandSystemAbilityInfo, (int32_t, const std::u16string&)); + MOCK_METHOD((sptr), CheckSystemAbility, (int32_t, bool&)); + MOCK_METHOD(int32_t, AddSystemAbility, (int32_t, (const sptr&), const SAExtraProp&)); + MOCK_METHOD(int32_t, AddSystemProcess, (const std::u16string&, (const sptr&))); + MOCK_METHOD((sptr), LoadSystemAbility, (int32_t, int32_t)); + MOCK_METHOD(int32_t, LoadSystemAbility, (int32_t, (const sptr&))); + MOCK_METHOD(int32_t, LoadSystemAbility, (int32_t, const std::string&, (const sptr&))); + MOCK_METHOD(int32_t, UnloadSystemAbility, (int32_t)); + MOCK_METHOD(int32_t, CancelUnloadSystemAbility, (int32_t)); + MOCK_METHOD(int32_t, UnloadAllIdleSystemAbility, ()); + MOCK_METHOD(int32_t, GetSystemProcessInfo, (int32_t, SystemProcessInfo&)); + MOCK_METHOD(int32_t, GetRunningSystemProcess, (std::list&)); + MOCK_METHOD(int32_t, SubscribeSystemProcess, (const sptr&)); + MOCK_METHOD(int32_t, SendStrategy, (int32_t, (std::vector&), int32_t, std::string&)); + MOCK_METHOD(int32_t, UnSubscribeSystemProcess, (const sptr&)); + MOCK_METHOD(int32_t, GetOnDemandReasonExtraData, (int64_t, MessageParcel&)); + MOCK_METHOD(int32_t, GetOnDemandPolicy, (int32_t, OnDemandPolicyType, (std::vector&))); + MOCK_METHOD(int32_t, UpdateOnDemandPolicy, (int32_t, OnDemandPolicyType, + (const std::vector&))); + MOCK_METHOD(int32_t, GetOnDemandSystemAbilityIds, (std::vector&)); + MOCK_METHOD(int32_t, GetExtensionSaIds, (const std::string&, std::vector&)); + MOCK_METHOD(int32_t, GetExtensionRunningSaList, (const std::string&, (std::vector>&))); + MOCK_METHOD(int32_t, GetRunningSaExtensionInfoList, (const std::string&, (std::vector&))); + MOCK_METHOD(int32_t, GetCommonEventExtraDataIdlist, (int32_t, (std::vector&), const std::string&)); +}; + +class BundleMgrMock : public IRemoteStub { +public: + MOCK_METHOD((sptr), AsObject, ()); + MOCK_METHOD(bool, GetBundleInfos, (const AppExecFwk::BundleFlag, (std::vector&), int32_t)); + MOCK_METHOD(ErrCode, GetCloneBundleInfo, (const std::string&, int32_t, int32_t, AppExecFwk::BundleInfo&, int32_t)); +}; + class StorageManagerServiceTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); void SetUp() override; void TearDown() override; + + static inline sptr bms = nullptr; + static inline sptr sam = nullptr; + static inline shared_ptr dsh = nullptr; + static inline shared_ptr dsrs = nullptr; + static inline shared_ptr dhelper = nullptr; + static inline shared_ptr dset = nullptr; }; -void StorageManagerServiceTest::SetUpTestCase(void) {} -void StorageManagerServiceTest::TearDownTestCase(void) {} +void StorageManagerServiceTest::SetUpTestCase(void) { + bms = sptr(new BundleMgrMock()); + sam = sptr(new SystemAbilityManagerMock()); + dsh = make_shared(); + DataShareHelperMock::idsh = dsh; + dsrs = make_shared(); + DataShareResultMock::idrs = dsrs; + dhelper = make_shared(); + dset = std::make_shared(); +} + +void StorageManagerServiceTest::TearDownTestCase(void) +{ + bms = nullptr; + sam = nullptr; +} + void StorageManagerServiceTest::SetUp(void) {} void StorageManagerServiceTest::TearDown(void) {} +sptr SystemAbilityManagerClient::GetSystemAbilityManager() +{ + return StorageManagerServiceTest::sam; +} + /** * @tc.name: Storage_Manager_ServiceTest_GetBundleStatsForIncrease_001 * @tc.desc: check the GetBundleStatsForIncrease function @@ -54,7 +136,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStatsFo testing::ext::TestSize.Level1) { uint32_t userId = 100; - std::vector bundleNames = {"com.example.app1", "com.example.app2"}; + std::vector bundleNames = {"com.example.app1", "com.huawei.hmos.calendar"}; std::vector incrementalBackTimes = {123456789}; std::vector pkgFileSizes; std::vector incPkgFileSizes; @@ -73,7 +155,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStatsFo testing::ext::TestSize.Level1) { uint32_t userId = 100; - std::vector bundleNames = {"com.example.app1", "com.example.app2"}; + std::vector bundleNames = {"com.example.app1", "com.huawei.hmos.calendar"}; std::vector incrementalBackTimes = {123456789, 987654321}; std::vector pkgFileSizes; std::vector incPkgFileSizes; @@ -92,7 +174,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStatsFo testing::ext::TestSize.Level1) { uint32_t userId = 100; - std::string bundleName = "testBundle"; + std::string bundleName = CALENDAR_BUNDLENAME; int64_t lastBackupTime = 123456789; std::vector pkgFileSizes; std::vector incPkgFileSizes; @@ -113,7 +195,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStatsFo HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ReadIncludesExcludesPath_001, testing::ext::TestSize.Level1) { - std::string bundleName = ""; + std::string bundleName = CALENDAR_BUNDLENAME; int64_t lastBackupTime = 123456789; uint32_t userId = 100; auto result = StorageManagerService::GetInstance().ReadIncludesExcludesPath(bundleName, lastBackupTime, userId); @@ -130,7 +212,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ReadIncludesExcl HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ReadIncludesExcludesPath_002, testing::ext::TestSize.Level1) { - std::string bundleName = "testBundle"; + std::string bundleName = CALENDAR_BUNDLENAME; int64_t lastBackupTime = 123456789; uint32_t userId = 100; // Assuming the file does not exist or cannot be opened @@ -148,7 +230,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ReadIncludesExcl HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DealWithIncludeFiles_001, testing::ext::TestSize.Level1) { - std::string bundleName = CAMERA_BUNDLENAME; + std::string bundleName = CALENDAR_BUNDLENAME; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; std::vector includes = {"data/storage/el1/base/" + DEFAULT_PATH_WITH_WILDCARD}; @@ -167,7 +249,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DealWithIncludeF HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DealWithIncludeFiles_002, testing::ext::TestSize.Level1) { - std::string bundleName = CAMERA_BUNDLENAME; + std::string bundleName = CALENDAR_BUNDLENAME; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; std::vector includes = {NORMAL_SAND_PREFIX}; @@ -186,7 +268,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DealWithIncludeF HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DealWithIncludeFiles_003, testing::ext::TestSize.Level1) { - std::string bundleName = "testBundle"; + std::string bundleName = CALENDAR_BUNDLENAME; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; std::vector includes = {}; @@ -206,7 +288,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ConvertSandboxRe testing::ext::TestSize.Level1) { uint32_t userId = 100; - std::string bundleName = "com.example.app"; + std::string bundleName = CALENDAR_BUNDLENAME; std::string sandboxPathStr = NORMAL_SAND_PREFIX + "/path/to/file"; std::vector realPaths; std::map pathMap; @@ -250,7 +332,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_CheckIfDirForInc testing::ext::TestSize.Level1) { ofstream closedStatFile; - std::string bundleName = "testBundle"; + std::string bundleName = CALENDAR_BUNDLENAME; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; std::map pathMap; @@ -270,7 +352,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_CheckIfDirForInc testing::ext::TestSize.Level1) { ofstream statFile; - std::string bundleName = "testBundle"; + std::string bundleName = CALENDAR_BUNDLENAME; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; std::map pathMap; @@ -311,17 +393,6 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_CheckIfDirForInc } catch (const fs::filesystem_error& e) { std::cerr << "Filesystem error: " << e.what() << '\n'; } - - statFile.open("/system/etc/NOTICE.TXT", ios::out | ios::trunc); - EXPECT_FALSE(!statFile.is_open()) << "file can not open"; - std::string bundleName = "testBundle"; - BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, - .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; - std::map pathMap; - std::map excludesMap; - auto result = StorageManagerService::GetInstance().CheckIfDirForIncludes("/data/service", paras, pathMap, - statFile, excludesMap); - EXPECT_EQ(result, std::make_tuple(true, true)); } /** @@ -363,14 +434,19 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ExcludeFilter_00 HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetUserStorageStatsByType_001, testing::ext::TestSize.Level1) { + int_32 userId = 100; + string basePath = "data/storage/el2/" + to_string(useId); + string path = basePath + "/base" + EXPECT_TRUE(OHOS::ForceCreateDirectory(path)); + StorageManager::StorageStats storageStats; - std::string type = "MEDIA_TYPE"; - int32_t userId = 100; + std::string type = MEDIA_TYPE; + EXPECT_CALL(*sam, GetSystemAbility(_)).WillRepeatedly(Return(bms)); + EXPECT_CALL(*dsh, Creator(_, _, _, _, _)).WillRepeatedly(Return(dhelper)); + EXPECT_CALL(*dhelper, Query(_, _, _, _)).WillOnce(Return(dset)); + EXPECT_CALL(*dsrs, GetRowCount(_)).WillOnce(SetArgReferee<0>(100), Return(0)); int64_t result = StorageManagerService::GetInstance().GetUserStorageStatsByType(userId, storageStats, type); - EXPECT_EQ(result, E_ERR); - EXPECT_EQ(storageStats.video_, 0); - EXPECT_EQ(storageStats.image_, 0); - EXPECT_EQ(storageStats.file_, 0); + EXPECT_EQ(result, E_GETROWCOUNT); } /** @@ -383,13 +459,10 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetUserStorageSt testing::ext::TestSize.Level1) { StorageManager::StorageStats storageStats; - std::string type = "FILE_TYPE"; + std::string type = FILE_TYPE; int32_t userId = 100; int64_t result = StorageManagerService::GetInstance().GetUserStorageStatsByType(userId, storageStats, type); - EXPECT_EQ(result, E_ERR); - EXPECT_EQ(storageStats.video_, 0); - EXPECT_EQ(storageStats.image_, 0); - EXPECT_EQ(storageStats.file_, 0); + EXPECT_EQ(result, 0); } /** @@ -402,13 +475,71 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetUserStorageSt testing::ext::TestSize.Level1) { StorageManager::StorageStats storageStats; - std::string type = "OTHER_TYPE"; + std::string type = "other"; int32_t userId = 100; int64_t result = StorageManagerService::GetInstance().GetUserStorageStatsByType(userId, storageStats, type); EXPECT_EQ(result, E_ERR); - EXPECT_EQ(storageStats.video_, 0); - EXPECT_EQ(storageStats.image_, 0); - EXPECT_EQ(storageStats.file_, 0); +} + +<<<<<<< HEAD +<<<<<<< HEAD +======= +// /** +// * @tc.name: Storage_Manager_ServiceTest_GetUserStorageStatsByType_003 +// * @tc.desc: check the GetUserStorageStatsByType function +// * @tc.type: FUNC +// */ +// HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetUserStorageStatsByType_003, +// testing::ext::TestSize.Level1) { +// StorageManager::StorageStats storageStats; +// sam = nullptr; +// int64_t result = StorageManagerService::GetInstance().GetMediaStorageStats(storageStats); +// sanm = ; +// EXPECT_EQ(result, E_ERR); +// } + +>>>>>>> df18e2da (add ut for storage manager service) +======= +>>>>>>> f9bba3bd (add ut) +/** + * @tc.name: Storage_Manager_ServiceTest_GetMediaStorageStats_001 + * @tc.number: GetMediaStorageStats_001 + * @tc.desc: FUNC + */ +HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaStorageStats_001, + testing::ext::TestSize.Level1) { + StorageManager::StorageStats storageStats; + + EXPECT_CALL(*sam, GetSystemAbility(_)).WillOnce(Return(nullptr)).WillRepeatedly(Return(bms)); + int32_t result = StorageManagerService::GetInstance().GetMediaStorageStats(storageStats); + EXPECT_EQ(result, E_REMOTE_IS_NULLPTR); +} + +/** + * @tc.name: Storage_Manager_ServiceTest_GetMediaStorageStats_002 + * @tc.number: GetMediaStorageStats_002 + * @tc.desc: FUNC + */ +HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaStorageStats_002, + testing::ext::TestSize.Level1) { + StorageManager::StorageStats storageStats; + EXPECT_CALL(*sam, GetSystemAbility(_)).WillOnce(Return(nullptr)).WillRepeatedly(Return(bms)); + int32_t result = StorageManagerService::GetInstance().GetMediaStorageStats(storageStats); + EXPECT_EQ(result, E_MEDIALIBRARY_ERROR); +} + +/** + * @tc.name: Storage_Manager_ServiceTest_GetMediaStorageStats_002 + * @tc.number: GetMediaStorageStats_002 + * @tc.desc: FUNC + */ +HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaStorageStats_003, + testing::ext::TestSize.Level1) { + StorageManager::StorageStats storageStats; + EXPECT_CALL(*dsh, Creator(_, _, _, _, _)).WillRepeatedly(Return(dhelper)); + EXPECT_CALL(*dhelper, Query(_, _, _, _)).WillOnce(Return(nullptr)); + int32_t result = StorageManagerService::GetInstance().GetMediaStorageStats(storageStats); + EXPECT_EQ(result, E_QUERY); } /** @@ -438,7 +569,8 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaTypeAndS { auto resultSet = std::make_shared(); StorageManager::StorageStats storageStats; - StorageManagerService::GetInstance().GetMediaTypeAndSize(nullptr, storageStats); + EXPECT_CALL(*dsrs, GoToNextRow(_, _, _, _)).WillRepeatedly(Return(true)); + StorageManagerService::GetInstance().GetMediaTypeAndSize(resultSet, storageStats); EXPECT_EQ(storageStats.image_, 0); EXPECT_EQ(storageStats.audio_, 0); EXPECT_EQ(storageStats.video_, 0); @@ -493,4 +625,99 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_PathSortFunc_001 std::string path2 = "BBB"; EXPECT_TRUE(PathSortFunc(path1, path2)); } + +/** + * @tc.name: Storage_Manager_ServiceTest_GetBundleStatsTest_001 + * @tc.number: GetBundleStatsTest_001 + * @tc.desc: 测试 GetBundleInfosForLocalCapabilities 接口 + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: AR000IGCR7 + */ +HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStats_001, testing::ext::TestSize.Level1) +{ + string bundleName = CALENDAR_BUNDLENAME; + StorageManager::StorageStats storageStats; + + bool result = StorageManagerService::GetInstance().GetBundleStats(bundleName, storageStats); + EXPECT_TRUE(result); +} + +/** + * @tc.name: Storage_Manager_ServiceTest_DeduplicationPath_001 + * @tc.desc: DeduplicationPathTest_001 + * @tc.desc: 测试configPath为空时，不执行任何操作 + */ +HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DeduplicationPath_001, + testing::ext::TestSize.Level1) +{ + std::vector configPaths; + StorageManagerService::GetInstance().DeduplicationPath(configPaths); + EXPECT_TRUE(result); +} + +/** + * @tc.name: Storage_Manager_ServiceTest_DeduplicationPath_002 + * @tc.desc: DeduplicationPathTest_002 + * @tc.desc: 测试configPath不为空时，执行去重 + */ +HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DeduplicationPath_002, + testing::ext::TestSize.Level1) +{ + std::vector configPaths = {"path1", "path2", "path3"}; + StorageManagerService::GetInstance().DeduplicationPath(configPaths); + EXPECT_TRUE(result); +} + +/** + * @tc.name: Storage_Manager_ServiceTest_ScanExtensionPath_001 + * @tc.desc: ScanExtensionPathTest_001 + * @tc.desc: ScanExtensionPath 有效路径正确扫描 + */ +HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ScanExtensionPath_001, + testing::ext::TestSize.Level1) +{ + std::string bundleName = CALENDAR_BUNDLENAME; + BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, + .lastBackupTime = 123456789, .fileSizeSum = 0, .incFileSizeSum = 0}; + std::vector includes = {"path/to/include"}; + std::vector excludes = {"path/to/exclude"}; + std::map pathMap; + std::ofstream statFile("statfile.txt"); + + StorageManagerService::GetInstance().ScanExtensionPath(paras, includes, excludes, pathMap, statFile); + EXPECT_TRUE(pathMap.empty()); + EXPECT_TRUE(statFile.good()); + + statFile.close(); + remove(statfile.txt); + +} + +/** + * @tc.name: Storage_Manager_ServiceTest_AddOuterDirIntoFileStat_001 + * @tc.desc: AddOuterDirIntoFileStat_001 + * @tc.desc: AddOuterDirIntoFileStat 调用时正常返回 + */ +HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_AddOuterDirIntoFileStat_001, + testing::ext::TestSize.Level1) +{ + std::string bundleName = CALENDAR_BUNDLENAME; + std::string dir = "/data/app/el1/100/base/" + bundleName +"/.backup" + BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, + .lastBackupTime = 123456789, .fileSizeSum = 0, .incFileSizeSum = 0}; + std::vector sandboxDir = {"path/to/sandboxDir"}; + std::map pathMap; + std::ofstream statFile("statfile.txt"); + + StorageManagerService::GetInstance().AddOuterDirIntoFileStat(dir, paras, sandboxDir, statFile, excludesMap); + EXPECT_TRUE(true); + + dir = "" + StorageManagerService::GetInstance().AddOuterDirIntoFileStat(dir, paras, sandboxDir, statFile, excludesMap); + EXPECT_TRUE(true); + + statFile.close(); + remove(statfile.txt); +} } \ No newline at end of file -- Gitee From 63b9428b4caf42b818857760cc47c4fcae974bee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E4=BD=B3=E7=82=9C?= Date: Sat, 28 Jun 2025 10:04:11 +0800 Subject: [PATCH 02/14] add ut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 石佳炜 --- .../include/datashare_helper_mock.h | 30 +++------ .../include/datashare_result_set_mock.h | 12 ++-- .../src/datashare_helper_mock.cpp | 65 +------------------ .../src/datashare_result_set_mock .cpp | 9 ++- .../storage_manager_service_test.cpp | 56 +++++----------- 5 files changed, 41 insertions(+), 131 deletions(-) diff --git a/tests/mock/module_external/include/datashare_helper_mock.h b/tests/mock/module_external/include/datashare_helper_mock.h index b67dda95c..949c70080 100644 --- a/tests/mock/module_external/include/datashare_helper_mock.h +++ b/tests/mock/module_external/include/datashare_helper_mock.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 202 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -21,17 +21,16 @@ #include "datashare_helper.h" #include "datashare_helper_mock.h" -namespace OHOS{ -using namespace DataShare; -using string = std::string; +namespace OHOS { namespace FileManageMent::Backup { +using namespace DataShare; class IDataShareHelper { public: IDataShareHelper() = default; virtual ~IDataShareHelper() = default; - virtual std::share_ptr Creator(const sptr &token, + virtual std::shared_ptr Creator(const sptr &token, const string &strUri, const string &extUri, const int waitTime, bool isSystem) = 0; - virtual std::shared_ptr Query(Uri &uri,const DataSharePredicates &predicates, + virtual std::shared_ptr Query(Uri &uri, const DataSharePredicates &predicates, std::vector &colums, DataShareBusinessError *businessError) = 0;; public: static inline std::shared_ptr idsh = nullptr; @@ -98,17 +97,8 @@ public: MOCK_METHOD(Data, GetPublishedData, (const std::string &bundleName, int &resultCode), (override)); MOCK_METHOD(std::vector, SubscribeRdbData, (const std::vector &uris, -<<<<<<< HEAD -<<<<<<< HEAD - const TemplateId &templateId, - const std::function &callback), (override)); -======= - const TemplateId &templateId, const std::function &callback), (override)); ->>>>>>> df18e2da (add ut for storage manager service) -======= const TemplateId &templateId, const std::function &callback), (override)); ->>>>>>> f9bba3bd (add ut) MOCK_METHOD(std::vector, UnsubscribeRdbData, (const std::vector &uris, const TemplateId &templateId), (override)); @@ -123,7 +113,7 @@ public: (const std::vector &uris, int64_t subscriberId, const std::function &callback), (override)); - MOCK_METHOD(std::vector, UnsubscribePublishedData,(const std::vector &uris, + MOCK_METHOD(std::vector, UnsubscribePublishedData, (const std::vector &uris, int64_t subscriberId), (override)); MOCK_METHOD(std::vector, EnablePubSubs, @@ -147,12 +137,12 @@ public: class DataShareHelperMock : public IDataShareHelper { public: - MOCK_METHOD(std::share_ptr, Creator,(const sptr &token, + MOCK_METHOD(std::shared_ptr, Creator, (const sptr &token, const string &strUri, const string &extUri, const int waitTime, bool isSystem)); - MOCK_METHOD(std::shared_ptr, Query, (Uri &uri, const DataSharePredicates& predicates, + MOCK_METHOD(std::shared_ptr, Query, (Uri &uri, const DataSharePredicates &predicates, std::vector &colums, DataShareBusinessError *businessError)); } -} // using namespace OHOS::FileManageMent::Backup -} // namespace OHOS +} +} // namespace OHOS::FileManagement::Backup #endif diff --git a/tests/mock/module_external/include/datashare_result_set_mock.h b/tests/mock/module_external/include/datashare_result_set_mock.h index 42448c8c5..3ade436a7 100644 --- a/tests/mock/module_external/include/datashare_result_set_mock.h +++ b/tests/mock/module_external/include/datashare_result_set_mock.h @@ -20,16 +20,16 @@ #include "gmock/gmock.h" #include "datashare_result_set.h" -namespace OHOS{ -using namespace DataShare; +namespace OHOS { namespace FileManageMent::Backup { +using namespace DataShare; class IDataShareResultSet { public: IDataShareResultSet() = default; virtual ~IDataShareResultSet() = default; virtual int GetRowCount(int &count) = 0; virtual int GoToNextRow() = 0; - virtual int GetColumIndex(const std::string &columnName, int columnIndex) = 0; + virtual int GetColumIndex(const std::string &columnName, int &columnIndex) = 0; virtual int GetInt(int columnIndex, int &value) = 0; virtual int GetLong(int columnIndex, int64_t &value) = 0; public: @@ -40,10 +40,10 @@ class DataShareResultSetMock : public IDataShareResultSet { public: MOCK_METHOD(int, GetRowCount, (int &count), (override)) = 0; MOCK_METHOD(int, GoToNextRow, ()); - MOCK_METHOD(int, GetColumIndex, (const std::string &columnName, int columnIndex));; + MOCK_METHOD(int, GetColumIndex, (const std::string &columnName, int &columnIndex));; MOCK_METHOD(int, GetInt, (int columnIndex, int &value), (override)); MOCK_METHOD(int, GetLong, (int columnIndex, int64_t &value), (override)); } -} // using namespace OHOS::FileManageMent::Backup -} // namespace OHOS +} +} // namespace OHOS::FileManagement::Backup #endif diff --git a/tests/mock/module_external/src/datashare_helper_mock.cpp b/tests/mock/module_external/src/datashare_helper_mock.cpp index d067557be..248b6430b 100644 --- a/tests/mock/module_external/src/datashare_helper_mock.cpp +++ b/tests/mock/module_external/src/datashare_helper_mock.cpp @@ -1,13 +1,5 @@ /* -<<<<<<< HEAD -<<<<<<< HEAD * Copyright (c) 2025 Huawei Device Co., Ltd. -======= - * Copyright (c) 2024 Huawei Device Co., Ltd. ->>>>>>> df18e2da (add ut for storage manager service) -======= - * Copyright (c) 2025 Huawei Device Co., Ltd. ->>>>>>> 0cc1da75 (add ut) * 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 @@ -21,26 +13,15 @@ * limitations under the License. */ -<<<<<<< HEAD -<<<<<<< HEAD -======= -#ifndef DATASHARE_HELPER_MOCK_H -#define DATASHARE_HELPER_MOCK_H - #include #include "gmock/gmock.h" ->>>>>>> df18e2da (add ut for storage manager service) -======= ->>>>>>> 0cc1da75 (add ut) #include "datashare_helper.h" #include "datashare_helper_mock.h" -namespace OHOS{ -<<<<<<< HEAD -<<<<<<< HEAD +namespace OHOS { namespace DataShare { using namespace std; -using namespace FileManageMent::Backup +using namespace FileManageMent::Backup; std:shared_ptr DataShareHelper::Creator(const sptr &token, const std::string &strUri, const std::string &extUri, const int waitTime, bool isSystem) @@ -55,46 +36,6 @@ std::shared_ptr Query(Uri &uri,const DataSharePredicates &pr GTEST_LOG(INFO) << "DataShareHelperMock Query is OK"; return IDataShareHelper::idsh->Query(uri, predicates, colums, businessError); } - -======= -using namespace DataShare; -using string = std::string; -namespace FileManageMent::Backup { -class IDataShareHelper { -public: - IDataShareHelper() = default; - virtual ~IDataShareHelper() = default; - virtual std::share_ptr Creator(const sptr &token, - const string &strUri, const string &extUri, const int waitTime, bool isSystem) = 0; - virtual std::shared_ptr Query(Uri &uri,const DataSharePredicates &predicates, - std::vector &colums, DataShareBusinessError *businessError) = 0;; -public: - static inline std::shared_ptr idsh = nullptr; -}; -======= -namespace DataShare { -using namespace std; -using namespace FileManageMent::Backup ->>>>>>> 0cc1da75 (add ut) - -std:shared_ptr DataShareHelper::Creator(const sptr &token, - const std::string &strUri, const std::string &extUri, const int waitTime, bool isSystem) -{ - GTEST_LOG(INFO) << "DataShareHelperMock Creator is OK"; - return IDataShareHelper::idsh->Creator(token, strUri, extUri, waitTime, isSystem); } -<<<<<<< HEAD ->>>>>>> df18e2da (add ut for storage manager service) -======= - -std::shared_ptr Query(Uri &uri,const DataSharePredicates &predicates, - std::vector &colums, DataShareBusinessError *businessError) -{ - GTEST_LOG(INFO) << "DataShareHelperMock Query is OK"; - return IDataShareHelper::idsh->Query(uri, predicates, colums, businessError); -} - ->>>>>>> 0cc1da75 (add ut) -} // using namespace OHOS::FileManageMent::Backup -} // namespace OHOS +} // using namespace OHOS::DataShare #endif diff --git a/tests/mock/module_external/src/datashare_result_set_mock .cpp b/tests/mock/module_external/src/datashare_result_set_mock .cpp index 40c865d4c..d7e7b4995 100644 --- a/tests/mock/module_external/src/datashare_result_set_mock .cpp +++ b/tests/mock/module_external/src/datashare_result_set_mock .cpp @@ -16,10 +16,10 @@ #include "datashare_result_set.h" #include "datashare_result_set_mock.h" -namespace OHOS{ +namespace OHOS { namespace DataShare { using namespace std; -using namespace FileManageMent::Backup +using namespace FileManageMent::Backup; int GetRowCount(int &count) { @@ -50,6 +50,5 @@ int GetLong(int columnIndex, int64_t &value) GTEST_LOG(INFO) << "DataShareResultSet GetLong is OK"; return IDataShareResultSet::idrsr->GetLong(columnIndex, value); } -} -} - +} +} \ No newline at end of file diff --git a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp index b9a0f92f9..7605027f3 100644 --- a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp +++ b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp @@ -36,7 +36,7 @@ namespace OHOS { const std::string CAMERA_BUNDLENAME = "file"; -const std::string CALENDAR_BUNDLENAME = "com.huawei.hmos.calendar"; +const std::string MMS_BUNDLENAME = "com.ohos.mms"; using namespace std; using namespace testing; using namespace FileManagement::Backup; @@ -101,7 +101,8 @@ public: static inline shared_ptr dset = nullptr; }; -void StorageManagerServiceTest::SetUpTestCase(void) { +void StorageManagerServiceTest::SetUpTestCase(void) +{ bms = sptr(new BundleMgrMock()); sam = sptr(new SystemAbilityManagerMock()); dsh = make_shared(); @@ -136,7 +137,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStatsFo testing::ext::TestSize.Level1) { uint32_t userId = 100; - std::vector bundleNames = {"com.example.app1", "com.huawei.hmos.calendar"}; + std::vector bundleNames = {"com.example.app1", "com.example.app2"}; std::vector incrementalBackTimes = {123456789}; std::vector pkgFileSizes; std::vector incPkgFileSizes; @@ -155,7 +156,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStatsFo testing::ext::TestSize.Level1) { uint32_t userId = 100; - std::vector bundleNames = {"com.example.app1", "com.huawei.hmos.calendar"}; + std::vector bundleNames = {"com.example.app1", "com.example.app2"}; std::vector incrementalBackTimes = {123456789, 987654321}; std::vector pkgFileSizes; std::vector incPkgFileSizes; @@ -174,7 +175,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStatsFo testing::ext::TestSize.Level1) { uint32_t userId = 100; - std::string bundleName = CALENDAR_BUNDLENAME; + std::string bundleName = MMS_BUNDLENAME; int64_t lastBackupTime = 123456789; std::vector pkgFileSizes; std::vector incPkgFileSizes; @@ -195,7 +196,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStatsFo HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ReadIncludesExcludesPath_001, testing::ext::TestSize.Level1) { - std::string bundleName = CALENDAR_BUNDLENAME; + std::string bundleName = MMS_BUNDLENAME; int64_t lastBackupTime = 123456789; uint32_t userId = 100; auto result = StorageManagerService::GetInstance().ReadIncludesExcludesPath(bundleName, lastBackupTime, userId); @@ -212,7 +213,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ReadIncludesExcl HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ReadIncludesExcludesPath_002, testing::ext::TestSize.Level1) { - std::string bundleName = CALENDAR_BUNDLENAME; + std::string bundleName = MMS_BUNDLENAME; int64_t lastBackupTime = 123456789; uint32_t userId = 100; // Assuming the file does not exist or cannot be opened @@ -230,7 +231,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ReadIncludesExcl HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DealWithIncludeFiles_001, testing::ext::TestSize.Level1) { - std::string bundleName = CALENDAR_BUNDLENAME; + std::string bundleName = MMS_BUNDLENAME; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; std::vector includes = {"data/storage/el1/base/" + DEFAULT_PATH_WITH_WILDCARD}; @@ -249,7 +250,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DealWithIncludeF HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DealWithIncludeFiles_002, testing::ext::TestSize.Level1) { - std::string bundleName = CALENDAR_BUNDLENAME; + std::string bundleName = MMS_BUNDLENAME; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; std::vector includes = {NORMAL_SAND_PREFIX}; @@ -268,7 +269,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DealWithIncludeF HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DealWithIncludeFiles_003, testing::ext::TestSize.Level1) { - std::string bundleName = CALENDAR_BUNDLENAME; + std::string bundleName = MMS_BUNDLENAME; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; std::vector includes = {}; @@ -288,7 +289,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ConvertSandboxRe testing::ext::TestSize.Level1) { uint32_t userId = 100; - std::string bundleName = CALENDAR_BUNDLENAME; + std::string bundleName = MMS_BUNDLENAME; std::string sandboxPathStr = NORMAL_SAND_PREFIX + "/path/to/file"; std::vector realPaths; std::map pathMap; @@ -332,7 +333,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_CheckIfDirForInc testing::ext::TestSize.Level1) { ofstream closedStatFile; - std::string bundleName = CALENDAR_BUNDLENAME; + std::string bundleName = MMS_BUNDLENAME; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; std::map pathMap; @@ -352,7 +353,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_CheckIfDirForInc testing::ext::TestSize.Level1) { ofstream statFile; - std::string bundleName = CALENDAR_BUNDLENAME; + std::string bundleName = MMS_BUNDLENAME; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; std::map pathMap; @@ -446,7 +447,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetUserStorageSt EXPECT_CALL(*dhelper, Query(_, _, _, _)).WillOnce(Return(dset)); EXPECT_CALL(*dsrs, GetRowCount(_)).WillOnce(SetArgReferee<0>(100), Return(0)); int64_t result = StorageManagerService::GetInstance().GetUserStorageStatsByType(userId, storageStats, type); - EXPECT_EQ(result, E_GETROWCOUNT); + EXPECT_EQ(result, E_GETROWCOUNT); } /** @@ -481,26 +482,6 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetUserStorageSt EXPECT_EQ(result, E_ERR); } -<<<<<<< HEAD -<<<<<<< HEAD -======= -// /** -// * @tc.name: Storage_Manager_ServiceTest_GetUserStorageStatsByType_003 -// * @tc.desc: check the GetUserStorageStatsByType function -// * @tc.type: FUNC -// */ -// HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetUserStorageStatsByType_003, -// testing::ext::TestSize.Level1) { -// StorageManager::StorageStats storageStats; -// sam = nullptr; -// int64_t result = StorageManagerService::GetInstance().GetMediaStorageStats(storageStats); -// sanm = ; -// EXPECT_EQ(result, E_ERR); -// } - ->>>>>>> df18e2da (add ut for storage manager service) -======= ->>>>>>> f9bba3bd (add ut) /** * @tc.name: Storage_Manager_ServiceTest_GetMediaStorageStats_001 * @tc.number: GetMediaStorageStats_001 @@ -636,7 +617,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_PathSortFunc_001 */ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStats_001, testing::ext::TestSize.Level1) { - string bundleName = CALENDAR_BUNDLENAME; + string bundleName = MMS_BUNDLENAME; StorageManager::StorageStats storageStats; bool result = StorageManagerService::GetInstance().GetBundleStats(bundleName, storageStats); @@ -677,7 +658,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DeduplicationPat HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ScanExtensionPath_001, testing::ext::TestSize.Level1) { - std::string bundleName = CALENDAR_BUNDLENAME; + std::string bundleName = MMS_BUNDLENAME; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 123456789, .fileSizeSum = 0, .incFileSizeSum = 0}; std::vector includes = {"path/to/include"}; @@ -691,7 +672,6 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ScanExtensionPat statFile.close(); remove(statfile.txt); - } /** @@ -702,7 +682,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ScanExtensionPat HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_AddOuterDirIntoFileStat_001, testing::ext::TestSize.Level1) { - std::string bundleName = CALENDAR_BUNDLENAME; + std::string bundleName = MMS_BUNDLENAME; std::string dir = "/data/app/el1/100/base/" + bundleName +"/.backup" BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 123456789, .fileSizeSum = 0, .incFileSizeSum = 0}; -- Gitee From edc49a282256844664521a1733589695726b03a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E4=BD=B3=E7=82=9C?= Date: Sat, 28 Jun 2025 11:28:00 +0800 Subject: [PATCH 03/14] add ut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 石佳炜 --- tests/mock/module_external/include/datashare_helper_mock.h | 2 +- tests/mock/module_external/src/datashare_helper_mock.cpp | 5 ++--- .../module_external/storage_manager_service_test.cpp | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/mock/module_external/include/datashare_helper_mock.h b/tests/mock/module_external/include/datashare_helper_mock.h index 949c70080..0ca6c49b3 100644 --- a/tests/mock/module_external/include/datashare_helper_mock.h +++ b/tests/mock/module_external/include/datashare_helper_mock.h @@ -40,7 +40,7 @@ class DataShareHelperImpl : public DataShareHelper { public: MOCK_METHOD(std::shared_ptr, Query, (Uri &uri, const DataSharePredicates& predicates, std::vector &colums, DataShareBusinessError *businessError), (override)); - + MOCK_METHOD(bool, Release, (), (override)); MOCK_METHOD(std::vector, GetFileTypes, (Uri &uri, const string &mimeTypeFilter), (override)); diff --git a/tests/mock/module_external/src/datashare_helper_mock.cpp b/tests/mock/module_external/src/datashare_helper_mock.cpp index 248b6430b..2f0d5dda3 100644 --- a/tests/mock/module_external/src/datashare_helper_mock.cpp +++ b/tests/mock/module_external/src/datashare_helper_mock.cpp @@ -30,12 +30,11 @@ std:shared_ptr DataShareHelper::Creator(const sptrCreator(token, strUri, extUri, waitTime, isSystem); } -std::shared_ptr Query(Uri &uri,const DataSharePredicates &predicates, +std::shared_ptr Query(Uri &uri, const DataSharePredicates &predicates, std::vector &colums, DataShareBusinessError *businessError) { GTEST_LOG(INFO) << "DataShareHelperMock Query is OK"; return IDataShareHelper::idsh->Query(uri, predicates, colums, businessError); } -} +} } // using namespace OHOS::DataShare -#endif diff --git a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp index 7605027f3..af08dc874 100644 --- a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp +++ b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp @@ -113,7 +113,7 @@ void StorageManagerServiceTest::SetUpTestCase(void) dset = std::make_shared(); } -void StorageManagerServiceTest::TearDownTestCase(void) +void StorageManagerServiceTest::TearDownTestCase(void) { bms = nullptr; sam = nullptr; @@ -619,7 +619,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStats_0 { string bundleName = MMS_BUNDLENAME; StorageManager::StorageStats storageStats; - + bool result = StorageManagerService::GetInstance().GetBundleStats(bundleName, storageStats); EXPECT_TRUE(result); } -- Gitee From 69196765b756360b0d1d97dd0088e6e6acd6a796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E4=BD=B3=E7=82=9C?= Date: Sat, 28 Jun 2025 11:28:00 +0800 Subject: [PATCH 04/14] add ut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 石佳炜 --- .../mock/module_external/include/datashare_helper_mock.h | 2 +- .../module_external/include/datashare_result_set_mock.h | 7 ++++--- tests/mock/module_external/src/datashare_helper_mock.cpp | 9 ++++----- .../module_external/src/datashare_result_set_mock .cpp | 2 +- tests/unittests/backup_sa/module_external/BUILD.gn | 2 +- .../module_external/storage_manager_service_test.cpp | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/mock/module_external/include/datashare_helper_mock.h b/tests/mock/module_external/include/datashare_helper_mock.h index 949c70080..0ca6c49b3 100644 --- a/tests/mock/module_external/include/datashare_helper_mock.h +++ b/tests/mock/module_external/include/datashare_helper_mock.h @@ -40,7 +40,7 @@ class DataShareHelperImpl : public DataShareHelper { public: MOCK_METHOD(std::shared_ptr, Query, (Uri &uri, const DataSharePredicates& predicates, std::vector &colums, DataShareBusinessError *businessError), (override)); - + MOCK_METHOD(bool, Release, (), (override)); MOCK_METHOD(std::vector, GetFileTypes, (Uri &uri, const string &mimeTypeFilter), (override)); diff --git a/tests/mock/module_external/include/datashare_result_set_mock.h b/tests/mock/module_external/include/datashare_result_set_mock.h index 3ade436a7..368674c32 100644 --- a/tests/mock/module_external/include/datashare_result_set_mock.h +++ b/tests/mock/module_external/include/datashare_result_set_mock.h @@ -21,8 +21,9 @@ #include "datashare_result_set.h" namespace OHOS { -namespace FileManageMent::Backup { using namespace DataShare; +namespace FileManageMent::Backup { + class IDataShareResultSet { public: IDataShareResultSet() = default; @@ -38,12 +39,12 @@ public: class DataShareResultSetMock : public IDataShareResultSet { public: - MOCK_METHOD(int, GetRowCount, (int &count), (override)) = 0; + MOCK_METHOD(int, GetRowCount, (int &count), (override)); MOCK_METHOD(int, GoToNextRow, ()); MOCK_METHOD(int, GetColumIndex, (const std::string &columnName, int &columnIndex));; MOCK_METHOD(int, GetInt, (int columnIndex, int &value), (override)); MOCK_METHOD(int, GetLong, (int columnIndex, int64_t &value), (override)); -} +}; } } // namespace OHOS::FileManagement::Backup #endif diff --git a/tests/mock/module_external/src/datashare_helper_mock.cpp b/tests/mock/module_external/src/datashare_helper_mock.cpp index 248b6430b..27357c7b5 100644 --- a/tests/mock/module_external/src/datashare_helper_mock.cpp +++ b/tests/mock/module_external/src/datashare_helper_mock.cpp @@ -26,16 +26,15 @@ using namespace FileManageMent::Backup; std:shared_ptr DataShareHelper::Creator(const sptr &token, const std::string &strUri, const std::string &extUri, const int waitTime, bool isSystem) { - GTEST_LOG(INFO) << "DataShareHelperMock Creator is OK"; + GTEST_LOG_(INFO) << "DataShareHelperMock Creator is OK"; return IDataShareHelper::idsh->Creator(token, strUri, extUri, waitTime, isSystem); } -std::shared_ptr Query(Uri &uri,const DataSharePredicates &predicates, - std::vector &colums, DataShareBusinessError *businessError) +std::shared_ptr Query(Uri &uri, const DataSharePredicates &predicates, + std::vector &colums, DataShareBusinessError *businessError) { - GTEST_LOG(INFO) << "DataShareHelperMock Query is OK"; + GTEST_LOG_(INFO) << "DataShareHelperMock Query is OK"; return IDataShareHelper::idsh->Query(uri, predicates, colums, businessError); } } } // using namespace OHOS::DataShare -#endif diff --git a/tests/mock/module_external/src/datashare_result_set_mock .cpp b/tests/mock/module_external/src/datashare_result_set_mock .cpp index d7e7b4995..ed0c0a87c 100644 --- a/tests/mock/module_external/src/datashare_result_set_mock .cpp +++ b/tests/mock/module_external/src/datashare_result_set_mock .cpp @@ -51,4 +51,4 @@ int GetLong(int columnIndex, int64_t &value) return IDataShareResultSet::idrsr->GetLong(columnIndex, value); } } -} \ No newline at end of file +}// namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/tests/unittests/backup_sa/module_external/BUILD.gn b/tests/unittests/backup_sa/module_external/BUILD.gn index 150f56cfd..9d9079951 100644 --- a/tests/unittests/backup_sa/module_external/BUILD.gn +++ b/tests/unittests/backup_sa/module_external/BUILD.gn @@ -79,7 +79,7 @@ ohos_unittest("storage_manager_service_test") { "${path_backup_mock}/utils_mock/src/b_jsonutil_mock.cpp", "${path_backup_mock}/utils_mock/src/b_sa_utils_mock.cpp", "${path_backup_mock}/module_external/src/datashare_helper_mock.cpp", - "${path_backup_mock}/module_external/src/datashare_result_set_mock .cpp", + "${path_backup_mock}/module_external/src/datashare_result_set_mock.cpp", "storage_manager_service_test.cpp", ] diff --git a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp index 7605027f3..af08dc874 100644 --- a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp +++ b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp @@ -113,7 +113,7 @@ void StorageManagerServiceTest::SetUpTestCase(void) dset = std::make_shared(); } -void StorageManagerServiceTest::TearDownTestCase(void) +void StorageManagerServiceTest::TearDownTestCase(void) { bms = nullptr; sam = nullptr; @@ -619,7 +619,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStats_0 { string bundleName = MMS_BUNDLENAME; StorageManager::StorageStats storageStats; - + bool result = StorageManagerService::GetInstance().GetBundleStats(bundleName, storageStats); EXPECT_TRUE(result); } -- Gitee From 9c15c095cf6607595f11ce5d4a6a2b1edb0d1659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E4=BD=B3=E7=82=9C?= Date: Sat, 28 Jun 2025 11:28:00 +0800 Subject: [PATCH 05/14] add ut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 石佳炜 --- tests/mock/module_external/src/datashare_helper_mock.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/mock/module_external/src/datashare_helper_mock.cpp b/tests/mock/module_external/src/datashare_helper_mock.cpp index 27357c7b5..3b379a529 100644 --- a/tests/mock/module_external/src/datashare_helper_mock.cpp +++ b/tests/mock/module_external/src/datashare_helper_mock.cpp @@ -36,5 +36,5 @@ std::shared_ptr Query(Uri &uri, const DataSharePredicates &p GTEST_LOG_(INFO) << "DataShareHelperMock Query is OK"; return IDataShareHelper::idsh->Query(uri, predicates, colums, businessError); } -} +} } // using namespace OHOS::DataShare -- Gitee From 749b72759aa91ef96dec945eb25f600aa4f854a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E4=BD=B3=E7=82=9C?= Date: Sat, 28 Jun 2025 12:40:33 +0800 Subject: [PATCH 06/14] add ut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 石佳炜 --- tests/mock/module_external/src/datashare_helper_mock.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/mock/module_external/src/datashare_helper_mock.cpp b/tests/mock/module_external/src/datashare_helper_mock.cpp index 3b379a529..27357c7b5 100644 --- a/tests/mock/module_external/src/datashare_helper_mock.cpp +++ b/tests/mock/module_external/src/datashare_helper_mock.cpp @@ -36,5 +36,5 @@ std::shared_ptr Query(Uri &uri, const DataSharePredicates &p GTEST_LOG_(INFO) << "DataShareHelperMock Query is OK"; return IDataShareHelper::idsh->Query(uri, predicates, colums, businessError); } -} +} } // using namespace OHOS::DataShare -- Gitee From ee92ca33f87ac448d555527417db61270ff796dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E4=BD=B3=E7=82=9C?= Date: Sat, 28 Jun 2025 12:53:38 +0800 Subject: [PATCH 07/14] add ut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 石佳炜 --- .../module_external/include/datashare_helper_mock.h | 2 +- .../src/datashare_result_set_mock .cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/mock/module_external/include/datashare_helper_mock.h b/tests/mock/module_external/include/datashare_helper_mock.h index 0ca6c49b3..2b2f78d98 100644 --- a/tests/mock/module_external/include/datashare_helper_mock.h +++ b/tests/mock/module_external/include/datashare_helper_mock.h @@ -22,8 +22,8 @@ #include "datashare_helper_mock.h" namespace OHOS { -namespace FileManageMent::Backup { using namespace DataShare; +namespace FileManageMent::Backup { class IDataShareHelper { public: IDataShareHelper() = default; diff --git a/tests/mock/module_external/src/datashare_result_set_mock .cpp b/tests/mock/module_external/src/datashare_result_set_mock .cpp index ed0c0a87c..2eacd8309 100644 --- a/tests/mock/module_external/src/datashare_result_set_mock .cpp +++ b/tests/mock/module_external/src/datashare_result_set_mock .cpp @@ -23,32 +23,32 @@ using namespace FileManageMent::Backup; int GetRowCount(int &count) { - GTEST_LOG(INFO) << "DataShareResultSet GetRowCount is OK"; + GTEST_LOG_(INFO) << "DataShareResultSet GetRowCount is OK"; return IDataShareResultSet::idrsr->GetRowCount(count); } int GoToNextRow() { - GTEST_LOG(INFO) << "DataShareResultSet GoToNextRow is OK"; + GTEST_LOG_(INFO) << "DataShareResultSet GoToNextRow is OK"; return IDataShareResultSet::idrsr->GoToNextRow(); } int GetColumIndex(const std::string &columnName, int &columnIndex) { - GTEST_LOG(INFO) << "DataShareResultSet GetColumIndex is OK"; + GTEST_LOG_(INFO) << "DataShareResultSet GetColumIndex is OK"; return IDataShareResultSet::idrsr->GetColumIndex(columnName, columnIndex); } int GetInt(int columnIndex, int &value) { - GTEST_LOG(INFO) << "DataShareResultSet GetInt is OK"; + GTEST_LOG_(INFO) << "DataShareResultSet GetInt is OK"; return IDataShareResultSet::idrsr->GetInt(columnIndex, value); } int GetLong(int columnIndex, int64_t &value) { - GTEST_LOG(INFO) << "DataShareResultSet GetLong is OK"; + GTEST_LOG_(INFO) << "DataShareResultSet GetLong is OK"; return IDataShareResultSet::idrsr->GetLong(columnIndex, value); } } -}// namespace OHOS::FileManagement::Backup \ No newline at end of file +} \ No newline at end of file -- Gitee From da79d865a93521181edc8d66297220ef84f5a217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E4=BD=B3=E7=82=9C?= Date: Sat, 28 Jun 2025 14:21:11 +0800 Subject: [PATCH 08/14] add ut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 石佳炜 --- .../include/datashare_helper_mock.h | 27 +++++------ .../include/datashare_result_set_mock.h | 16 +++---- .../src/datashare_helper_mock.cpp | 13 ++---- .../src/datashare_result_set_mock .cpp | 10 ++-- .../storage_manager_service_test.cpp | 46 +++++++++---------- 5 files changed, 55 insertions(+), 57 deletions(-) diff --git a/tests/mock/module_external/include/datashare_helper_mock.h b/tests/mock/module_external/include/datashare_helper_mock.h index 2b2f78d98..d10143a6c 100644 --- a/tests/mock/module_external/include/datashare_helper_mock.h +++ b/tests/mock/module_external/include/datashare_helper_mock.h @@ -13,17 +13,17 @@ * limitations under the License. */ -#ifndef DATASHARE_HELPER_MOCK_H -#define DATASHARE_HELPER_MOCK_H +#ifndef OHOS_FILEMGMT_BACKUP_DATASHARE_HELPER_MOCK_H +#define OHOS_FILEMGMT_BACKUP_DATASHARE_HELPER_MOCK_H -#include +#include #include "gmock/gmock.h" #include "datashare_helper.h" -#include "datashare_helper_mock.h" +#include "datashare_result_set_mock.h" namespace OHOS { using namespace DataShare; -namespace FileManageMent::Backup { +namespace FileManagement::Backup { class IDataShareHelper { public: IDataShareHelper() = default; @@ -31,15 +31,16 @@ public: virtual std::shared_ptr Creator(const sptr &token, const string &strUri, const string &extUri, const int waitTime, bool isSystem) = 0; virtual std::shared_ptr Query(Uri &uri, const DataSharePredicates &predicates, - std::vector &colums, DataShareBusinessError *businessError) = 0;; + std::vector &columns, DatashareBusinessError *businessError) = 0; public: static inline std::shared_ptr idsh = nullptr; }; class DataShareHelperImpl : public DataShareHelper { public: - MOCK_METHOD(std::shared_ptr, Query, (Uri &uri, const DataSharePredicates& predicates, - std::vector &colums, DataShareBusinessError *businessError), (override)); + MOCK_METHOD(std::shared_ptr, Query, (Uri &uri, + const DataShare::DataSharePredicates& predicates, std::vector &columns, + DatashareBusinessError *businessError), (override)); MOCK_METHOD(bool, Release, (), (override)); @@ -98,7 +99,7 @@ public: MOCK_METHOD(std::vector, SubscribeRdbData, (const std::vector &uris, const TemplateId &templateId, - const std::function &callback), (override)); + const std::function &callback), (override)); MOCK_METHOD(std::vector, UnsubscribeRdbData, (const std::vector &uris, const TemplateId &templateId), (override)); @@ -111,7 +112,7 @@ public: MOCK_METHOD(std::vector, SubscribePublishedData, (const std::vector &uris, int64_t subscriberId, - const std::function &callback), (override)); + const std::function &callback), (override)); MOCK_METHOD(std::vector, UnsubscribePublishedData, (const std::vector &uris, int64_t subscriberId), (override)); @@ -122,10 +123,10 @@ public: MOCK_METHOD(std::vector, DisablePubSubs, (const std::vector &uris, int64_t subscriberId), (override)); - MOCK_METHOD(std::pair, InsertEx, + MOCK_METHOD((std::pair), InsertEx, (Uri &uri, const DataShareValuesBucket &value), (override)); - MOCK_METHOD(std::pair, UpdateEx, (Uri &uri, const DataSharePredicates &predicates, + MOCK_METHOD((std::pair), UpdateEx, (Uri &uri, const DataSharePredicates &predicates, const DataShareValuesBucket &value), (override)); MOCK_METHOD((std::pair), DeleteEx, @@ -142,7 +143,7 @@ public: MOCK_METHOD(std::shared_ptr, Query, (Uri &uri, const DataSharePredicates &predicates, std::vector &colums, DataShareBusinessError *businessError)); -} +}; } } // namespace OHOS::FileManagement::Backup #endif diff --git a/tests/mock/module_external/include/datashare_result_set_mock.h b/tests/mock/module_external/include/datashare_result_set_mock.h index 368674c32..93c306ef1 100644 --- a/tests/mock/module_external/include/datashare_result_set_mock.h +++ b/tests/mock/module_external/include/datashare_result_set_mock.h @@ -13,16 +13,16 @@ * limitations under the License. */ -#ifndef DATASHARE_RESULT_SET_MOCK_H -#define DATASHARE_RESULT_SET_MOCK_H +#ifndef OHOS_FILEMGMT_BACKUP_DATASHARE_RESULT_SET_MOCK_H +#define OHOS_FILEMGMT_BACKUP_DATASHARE_RESULT_SET_MOCK_H -#include +#include #include "gmock/gmock.h" #include "datashare_result_set.h" namespace OHOS { using namespace DataShare; -namespace FileManageMent::Backup { +namespace FileManagement::Backup { class IDataShareResultSet { public: @@ -30,21 +30,21 @@ public: virtual ~IDataShareResultSet() = default; virtual int GetRowCount(int &count) = 0; virtual int GoToNextRow() = 0; - virtual int GetColumIndex(const std::string &columnName, int &columnIndex) = 0; + virtual int GetColumnIndex(const std::string &columnName, int &columnIndex) = 0; virtual int GetInt(int columnIndex, int &value) = 0; virtual int GetLong(int columnIndex, int64_t &value) = 0; public: - static inline std::shared_ptr idrsr = nullptr; + static inline std::shared_ptr idsrs = nullptr; }; class DataShareResultSetMock : public IDataShareResultSet { public: MOCK_METHOD(int, GetRowCount, (int &count), (override)); MOCK_METHOD(int, GoToNextRow, ()); - MOCK_METHOD(int, GetColumIndex, (const std::string &columnName, int &columnIndex));; + MOCK_METHOD(int, GetColumnIndex, (const std::string &columnName, int &columnIndex)); MOCK_METHOD(int, GetInt, (int columnIndex, int &value), (override)); MOCK_METHOD(int, GetLong, (int columnIndex, int64_t &value), (override)); }; } -} // namespace OHOS::FileManagement::Backup +} #endif diff --git a/tests/mock/module_external/src/datashare_helper_mock.cpp b/tests/mock/module_external/src/datashare_helper_mock.cpp index 27357c7b5..c5fa42a2a 100644 --- a/tests/mock/module_external/src/datashare_helper_mock.cpp +++ b/tests/mock/module_external/src/datashare_helper_mock.cpp @@ -13,17 +13,14 @@ * limitations under the License. */ -#include -#include "gmock/gmock.h" #include "datashare_helper.h" -#include "datashare_helper_mock.h" namespace OHOS { namespace DataShare { using namespace std; -using namespace FileManageMent::Backup; +using namespace FileManagement::Backup; -std:shared_ptr DataShareHelper::Creator(const sptr &token, +std::shared_ptr DataShareHelper::Creator(const sptr &token, const std::string &strUri, const std::string &extUri, const int waitTime, bool isSystem) { GTEST_LOG_(INFO) << "DataShareHelperMock Creator is OK"; @@ -31,10 +28,10 @@ std:shared_ptr DataShareHelper::Creator(const sptr Query(Uri &uri, const DataSharePredicates &predicates, - std::vector &colums, DataShareBusinessError *businessError) + std::vector &colums, DataShareBusinessError *businessError) { - GTEST_LOG_(INFO) << "DataShareHelperMock Query is OK"; + GTEST_LOG_(INFO) << "DataShareResultSet Query is OK"; return IDataShareHelper::idsh->Query(uri, predicates, colums, businessError); } } -} // using namespace OHOS::DataShare +} \ No newline at end of file diff --git a/tests/mock/module_external/src/datashare_result_set_mock .cpp b/tests/mock/module_external/src/datashare_result_set_mock .cpp index 2eacd8309..876da9b3b 100644 --- a/tests/mock/module_external/src/datashare_result_set_mock .cpp +++ b/tests/mock/module_external/src/datashare_result_set_mock .cpp @@ -24,31 +24,31 @@ using namespace FileManageMent::Backup; int GetRowCount(int &count) { GTEST_LOG_(INFO) << "DataShareResultSet GetRowCount is OK"; - return IDataShareResultSet::idrsr->GetRowCount(count); + return IDataShareResultSet::idsrs->GetRowCount(count); } int GoToNextRow() { GTEST_LOG_(INFO) << "DataShareResultSet GoToNextRow is OK"; - return IDataShareResultSet::idrsr->GoToNextRow(); + return IDataShareResultSet::idsrs->GoToNextRow(); } int GetColumIndex(const std::string &columnName, int &columnIndex) { GTEST_LOG_(INFO) << "DataShareResultSet GetColumIndex is OK"; - return IDataShareResultSet::idrsr->GetColumIndex(columnName, columnIndex); + return IDataShareResultSet::idsrs->GetColumIndex(columnName, columnIndex); } int GetInt(int columnIndex, int &value) { GTEST_LOG_(INFO) << "DataShareResultSet GetInt is OK"; - return IDataShareResultSet::idrsr->GetInt(columnIndex, value); + return IDataShareResultSet::idsrs->GetInt(columnIndex, value); } int GetLong(int columnIndex, int64_t &value) { GTEST_LOG_(INFO) << "DataShareResultSet GetLong is OK"; - return IDataShareResultSet::idrsr->GetLong(columnIndex, value); + return IDataShareResultSet::idsrs->GetLong(columnIndex, value); } } } \ No newline at end of file diff --git a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp index af08dc874..6448fd015 100644 --- a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp +++ b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp @@ -107,8 +107,8 @@ void StorageManagerServiceTest::SetUpTestCase(void) sam = sptr(new SystemAbilityManagerMock()); dsh = make_shared(); DataShareHelperMock::idsh = dsh; - dsrs = make_shared(); - DataShareResultMock::idrs = dsrs; + dsrs = make_shared(); + DataShareResultSetMock::idsrs = dsrs; dhelper = make_shared(); dset = std::make_shared(); } @@ -435,9 +435,9 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ExcludeFilter_00 HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetUserStorageStatsByType_001, testing::ext::TestSize.Level1) { - int_32 userId = 100; - string basePath = "data/storage/el2/" + to_string(useId); - string path = basePath + "/base" + int32_t userId = 100; + string basePath = "/data/storage/el2/" + to_string(useId); + string path = basePath + "/base"; EXPECT_TRUE(OHOS::ForceCreateDirectory(path)); StorageManager::StorageStats storageStats; @@ -445,7 +445,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetUserStorageSt EXPECT_CALL(*sam, GetSystemAbility(_)).WillRepeatedly(Return(bms)); EXPECT_CALL(*dsh, Creator(_, _, _, _, _)).WillRepeatedly(Return(dhelper)); EXPECT_CALL(*dhelper, Query(_, _, _, _)).WillOnce(Return(dset)); - EXPECT_CALL(*dsrs, GetRowCount(_)).WillOnce(SetArgReferee<0>(100), Return(0)); + EXPECT_CALL(*dsrs, GetRowCount(_)).WillOnce(DoAll(SetArgReferee<0>(100), Return(0))); int64_t result = StorageManagerService::GetInstance().GetUserStorageStatsByType(userId, storageStats, type); EXPECT_EQ(result, E_GETROWCOUNT); } @@ -485,7 +485,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetUserStorageSt /** * @tc.name: Storage_Manager_ServiceTest_GetMediaStorageStats_001 * @tc.number: GetMediaStorageStats_001 - * @tc.desc: FUNC + * @tc.desc: 测试返回E_MEDIALIBRARY_ERROR */ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaStorageStats_001, testing::ext::TestSize.Level1) { @@ -499,12 +499,12 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaStorageS /** * @tc.name: Storage_Manager_ServiceTest_GetMediaStorageStats_002 * @tc.number: GetMediaStorageStats_002 - * @tc.desc: FUNC + * @tc.desc: 测试返回E_MEDIALIBRARY_ERROR */ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaStorageStats_002, testing::ext::TestSize.Level1) { StorageManager::StorageStats storageStats; - EXPECT_CALL(*sam, GetSystemAbility(_)).WillOnce(Return(nullptr)).WillRepeatedly(Return(bms)); + EXPECT_CALL(*dsh, Creator(_, _, _, _, _)).WillRepeatedly(Return(dhelper)); int32_t result = StorageManagerService::GetInstance().GetMediaStorageStats(storageStats); EXPECT_EQ(result, E_MEDIALIBRARY_ERROR); } @@ -512,7 +512,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaStorageS /** * @tc.name: Storage_Manager_ServiceTest_GetMediaStorageStats_002 * @tc.number: GetMediaStorageStats_002 - * @tc.desc: FUNC + * @tc.desc: 测试返回E_QUERY */ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaStorageStats_003, testing::ext::TestSize.Level1) { @@ -550,7 +550,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaTypeAndS { auto resultSet = std::make_shared(); StorageManager::StorageStats storageStats; - EXPECT_CALL(*dsrs, GoToNextRow(_, _, _, _)).WillRepeatedly(Return(true)); + EXPECT_CALL(*dsrs, GoToNextRow()).WillRepeatedly(Return(true)); StorageManagerService::GetInstance().GetMediaTypeAndSize(resultSet, storageStats); EXPECT_EQ(storageStats.image_, 0); EXPECT_EQ(storageStats.audio_, 0); @@ -626,7 +626,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStats_0 /** * @tc.name: Storage_Manager_ServiceTest_DeduplicationPath_001 - * @tc.desc: DeduplicationPathTest_001 + * @tc.number: DeduplicationPathTest_001 * @tc.desc: 测试configPath为空时，不执行任何操作 */ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DeduplicationPath_001, @@ -634,12 +634,12 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DeduplicationPat { std::vector configPaths; StorageManagerService::GetInstance().DeduplicationPath(configPaths); - EXPECT_TRUE(result); + EXPECT_TRUE(true); } /** * @tc.name: Storage_Manager_ServiceTest_DeduplicationPath_002 - * @tc.desc: DeduplicationPathTest_002 + * @tc.number: DeduplicationPathTest_002 * @tc.desc: 测试configPath不为空时，执行去重 */ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DeduplicationPath_002, @@ -647,12 +647,12 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DeduplicationPat { std::vector configPaths = {"path1", "path2", "path3"}; StorageManagerService::GetInstance().DeduplicationPath(configPaths); - EXPECT_TRUE(result); + EXPECT_TRUE(true); } /** * @tc.name: Storage_Manager_ServiceTest_ScanExtensionPath_001 - * @tc.desc: ScanExtensionPathTest_001 + * @tc.number: ScanExtensionPathTest_001 * @tc.desc: ScanExtensionPath 有效路径正确扫描 */ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ScanExtensionPath_001, @@ -661,8 +661,8 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ScanExtensionPat std::string bundleName = MMS_BUNDLENAME; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 123456789, .fileSizeSum = 0, .incFileSizeSum = 0}; - std::vector includes = {"path/to/include"}; - std::vector excludes = {"path/to/exclude"}; + std::vector includes = {"/path/to/include"}; + std::vector excludes = {"/path/to/exclude"}; std::map pathMap; std::ofstream statFile("statfile.txt"); @@ -671,12 +671,12 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ScanExtensionPat EXPECT_TRUE(statFile.good()); statFile.close(); - remove(statfile.txt); + remove("statfile.txt"); } /** * @tc.name: Storage_Manager_ServiceTest_AddOuterDirIntoFileStat_001 - * @tc.desc: AddOuterDirIntoFileStat_001 + * @tc.number: AddOuterDirIntoFileStat_001 * @tc.desc: AddOuterDirIntoFileStat 调用时正常返回 */ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_AddOuterDirIntoFileStat_001, @@ -685,10 +685,10 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_AddOuterDirIntoF std::string bundleName = MMS_BUNDLENAME; std::string dir = "/data/app/el1/100/base/" + bundleName +"/.backup" BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, - .lastBackupTime = 123456789, .fileSizeSum = 0, .incFileSizeSum = 0}; - std::vector sandboxDir = {"path/to/sandboxDir"}; - std::map pathMap; + .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; + std::vector sandboxDir = {"/path/to/sandboxDir"}; std::ofstream statFile("statfile.txt"); + std::map excludesMap; StorageManagerService::GetInstance().AddOuterDirIntoFileStat(dir, paras, sandboxDir, statFile, excludesMap); EXPECT_TRUE(true); -- Gitee From 08f3993cc8a20d5d5693b3960e3f3b64bfd503f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E4=BD=B3=E7=82=9C?= Date: Sat, 28 Jun 2025 15:23:38 +0800 Subject: [PATCH 09/14] add ut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 石佳炜 --- .../mock/module_external/include/datashare_helper_mock.h | 2 +- tests/mock/module_external/src/datashare_helper_mock.cpp | 3 ++- ...result_set_mock .cpp => datashare_result_set_mock.cpp} | 0 tests/unittests/backup_sa/module_external/BUILD.gn | 2 +- .../module_external/storage_manager_service_test.cpp | 8 ++++---- 5 files changed, 8 insertions(+), 7 deletions(-) rename tests/mock/module_external/src/{datashare_result_set_mock .cpp => datashare_result_set_mock.cpp} (100%) diff --git a/tests/mock/module_external/include/datashare_helper_mock.h b/tests/mock/module_external/include/datashare_helper_mock.h index d10143a6c..4db3d3b59 100644 --- a/tests/mock/module_external/include/datashare_helper_mock.h +++ b/tests/mock/module_external/include/datashare_helper_mock.h @@ -142,7 +142,7 @@ public: const string &strUri, const string &extUri, const int waitTime, bool isSystem)); MOCK_METHOD(std::shared_ptr, Query, (Uri &uri, const DataSharePredicates &predicates, - std::vector &colums, DataShareBusinessError *businessError)); + std::vector &colums, DatashareBusinessError *businessError)); }; } } // namespace OHOS::FileManagement::Backup diff --git a/tests/mock/module_external/src/datashare_helper_mock.cpp b/tests/mock/module_external/src/datashare_helper_mock.cpp index c5fa42a2a..8d8db51a7 100644 --- a/tests/mock/module_external/src/datashare_helper_mock.cpp +++ b/tests/mock/module_external/src/datashare_helper_mock.cpp @@ -14,6 +14,7 @@ */ #include "datashare_helper.h" +#include "datashare_helper_mock.h" namespace OHOS { namespace DataShare { @@ -28,7 +29,7 @@ std::shared_ptr DataShareHelper::Creator(const sptr Query(Uri &uri, const DataSharePredicates &predicates, - std::vector &colums, DataShareBusinessError *businessError) + std::vector &colums, DatashareBusinessError *businessError) { GTEST_LOG_(INFO) << "DataShareResultSet Query is OK"; return IDataShareHelper::idsh->Query(uri, predicates, colums, businessError); diff --git a/tests/mock/module_external/src/datashare_result_set_mock .cpp b/tests/mock/module_external/src/datashare_result_set_mock.cpp similarity index 100% rename from tests/mock/module_external/src/datashare_result_set_mock .cpp rename to tests/mock/module_external/src/datashare_result_set_mock.cpp diff --git a/tests/unittests/backup_sa/module_external/BUILD.gn b/tests/unittests/backup_sa/module_external/BUILD.gn index 9d9079951..d1ddd21eb 100644 --- a/tests/unittests/backup_sa/module_external/BUILD.gn +++ b/tests/unittests/backup_sa/module_external/BUILD.gn @@ -93,7 +93,7 @@ ohos_unittest("storage_manager_service_test") { defines = [ "LOG_TAG=\"app_file_service\"", - "LOG_DOMAIN=0xD04303", + "LOG_DOMAIN=0xD004303", "private = public", "protected = public", ] diff --git a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp index 6448fd015..44da8b719 100644 --- a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp +++ b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp @@ -436,7 +436,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetUserStorageSt testing::ext::TestSize.Level1) { int32_t userId = 100; - string basePath = "/data/storage/el2/" + to_string(useId); + string basePath = "/data/storage/el2/" + to_string(userId); string path = basePath + "/base"; EXPECT_TRUE(OHOS::ForceCreateDirectory(path)); @@ -683,7 +683,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_AddOuterDirIntoF testing::ext::TestSize.Level1) { std::string bundleName = MMS_BUNDLENAME; - std::string dir = "/data/app/el1/100/base/" + bundleName +"/.backup" + std::string dir = "/data/app/el1/100/base/" + bundleName + "/.backup"; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; std::vector sandboxDir = {"/path/to/sandboxDir"}; @@ -693,11 +693,11 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_AddOuterDirIntoF StorageManagerService::GetInstance().AddOuterDirIntoFileStat(dir, paras, sandboxDir, statFile, excludesMap); EXPECT_TRUE(true); - dir = "" + dir = ""; StorageManagerService::GetInstance().AddOuterDirIntoFileStat(dir, paras, sandboxDir, statFile, excludesMap); EXPECT_TRUE(true); statFile.close(); - remove(statfile.txt); + remove("statfile.txt"); } } \ No newline at end of file -- Gitee From 4afc5eea94309a8d4baec4cfe1fd4641781adf7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E4=BD=B3=E7=82=9C?= Date: Sat, 28 Jun 2025 15:41:12 +0800 Subject: [PATCH 10/14] add ut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 石佳炜 --- .../module_external/src/datashare_result_set_mock.cpp | 8 ++++---- .../module_external/storage_manager_service_test.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/mock/module_external/src/datashare_result_set_mock.cpp b/tests/mock/module_external/src/datashare_result_set_mock.cpp index 876da9b3b..b01978b6c 100644 --- a/tests/mock/module_external/src/datashare_result_set_mock.cpp +++ b/tests/mock/module_external/src/datashare_result_set_mock.cpp @@ -19,7 +19,7 @@ namespace OHOS { namespace DataShare { using namespace std; -using namespace FileManageMent::Backup; +using namespace FileManagement::Backup; int GetRowCount(int &count) { @@ -33,10 +33,10 @@ int GoToNextRow() return IDataShareResultSet::idsrs->GoToNextRow(); } -int GetColumIndex(const std::string &columnName, int &columnIndex) +int GetColumnIndex(const std::string &columnName, int &columnIndex) { - GTEST_LOG_(INFO) << "DataShareResultSet GetColumIndex is OK"; - return IDataShareResultSet::idsrs->GetColumIndex(columnName, columnIndex); + GTEST_LOG_(INFO) << "DataShareResultSet GetColumnIndex is OK"; + return IDataShareResultSet::idsrs->GetColumnIndex(columnName, columnIndex); } int GetInt(int columnIndex, int &value) diff --git a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp index 44da8b719..a575bc321 100644 --- a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp +++ b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp @@ -686,7 +686,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_AddOuterDirIntoF std::string dir = "/data/app/el1/100/base/" + bundleName + "/.backup"; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; - std::vector sandboxDir = {"/path/to/sandboxDir"}; + std::string sandboxDir = "/path/to/sandboxDir"; std::ofstream statFile("statfile.txt"); std::map excludesMap; -- Gitee From 05d646eae3706aa1bff9d87233062f5e679ba5a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E4=BD=B3=E7=82=9C?= Date: Sat, 28 Jun 2025 17:56:51 +0800 Subject: [PATCH 11/14] add ut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 石佳炜 --- .../module_external/storage_manager_service_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp index a575bc321..876197ec5 100644 --- a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp +++ b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp @@ -504,7 +504,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaStorageS HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaStorageStats_002, testing::ext::TestSize.Level1) { StorageManager::StorageStats storageStats; - EXPECT_CALL(*dsh, Creator(_, _, _, _, _)).WillRepeatedly(Return(dhelper)); + EXPECT_CALL(*dsh, Creator(_, _, _, _, _)).WillRepeatedly(Return(nullptr)); int32_t result = StorageManagerService::GetInstance().GetMediaStorageStats(storageStats); EXPECT_EQ(result, E_MEDIALIBRARY_ERROR); } @@ -618,9 +618,9 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_PathSortFunc_001 HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStats_001, testing::ext::TestSize.Level1) { string bundleName = MMS_BUNDLENAME; - StorageManager::StorageStats storageStats; + StorageManager::BundleStats bundleStats; - bool result = StorageManagerService::GetInstance().GetBundleStats(bundleName, storageStats); + bool result = StorageManagerService::GetInstance().GetBundleStats(bundleName, bundleStats); EXPECT_TRUE(result); } -- Gitee From c22cb529586e377c41c9f40a8f4c5e5b3d704d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E4=BD=B3=E7=82=9C?= Date: Sat, 28 Jun 2025 18:16:23 +0800 Subject: [PATCH 12/14] add ut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 石佳炜 --- tests/mock/module_external/src/datashare_helper_mock.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/mock/module_external/src/datashare_helper_mock.cpp b/tests/mock/module_external/src/datashare_helper_mock.cpp index 8d8db51a7..92bc1e4a8 100644 --- a/tests/mock/module_external/src/datashare_helper_mock.cpp +++ b/tests/mock/module_external/src/datashare_helper_mock.cpp @@ -22,7 +22,7 @@ using namespace std; using namespace FileManagement::Backup; std::shared_ptr DataShareHelper::Creator(const sptr &token, - const std::string &strUri, const std::string &extUri, const int waitTime, bool isSystem) + const std::string &strUri, const std::string &extUri, const int waitTime, bool isSystem) { GTEST_LOG_(INFO) << "DataShareHelperMock Creator is OK"; return IDataShareHelper::idsh->Creator(token, strUri, extUri, waitTime, isSystem); -- Gitee From 4f50f214f7ab09fd0bfff27fa3434c2caf5b3caf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E4=BD=B3=E7=82=9C?= Date: Wed, 2 Jul 2025 14:54:49 +0800 Subject: [PATCH 13/14] add ut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 石佳炜 --- .../include/datashare_helper_mock.h | 149 --------- .../include/datashare_result_set_mock.h | 50 --- .../src/datashare_helper_mock.cpp | 38 --- .../src/datashare_result_set_mock.cpp | 54 ---- .../backup_sa/module_external/BUILD.gn | 5 +- .../storage_manager_service_test.cpp | 295 +++++++----------- 6 files changed, 117 insertions(+), 474 deletions(-) delete mode 100644 tests/mock/module_external/include/datashare_helper_mock.h delete mode 100644 tests/mock/module_external/include/datashare_result_set_mock.h delete mode 100644 tests/mock/module_external/src/datashare_helper_mock.cpp delete mode 100644 tests/mock/module_external/src/datashare_result_set_mock.cpp diff --git a/tests/mock/module_external/include/datashare_helper_mock.h b/tests/mock/module_external/include/datashare_helper_mock.h deleted file mode 100644 index 4db3d3b59..000000000 --- a/tests/mock/module_external/include/datashare_helper_mock.h +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_FILEMGMT_BACKUP_DATASHARE_HELPER_MOCK_H -#define OHOS_FILEMGMT_BACKUP_DATASHARE_HELPER_MOCK_H - -#include -#include "gmock/gmock.h" -#include "datashare_helper.h" -#include "datashare_result_set_mock.h" - -namespace OHOS { -using namespace DataShare; -namespace FileManagement::Backup { -class IDataShareHelper { -public: - IDataShareHelper() = default; - virtual ~IDataShareHelper() = default; - virtual std::shared_ptr Creator(const sptr &token, - const string &strUri, const string &extUri, const int waitTime, bool isSystem) = 0; - virtual std::shared_ptr Query(Uri &uri, const DataSharePredicates &predicates, - std::vector &columns, DatashareBusinessError *businessError) = 0; -public: - static inline std::shared_ptr idsh = nullptr; -}; - -class DataShareHelperImpl : public DataShareHelper { -public: - MOCK_METHOD(std::shared_ptr, Query, (Uri &uri, - const DataShare::DataSharePredicates& predicates, std::vector &columns, - DatashareBusinessError *businessError), (override)); - - MOCK_METHOD(bool, Release, (), (override)); - - MOCK_METHOD(std::vector, GetFileTypes, (Uri &uri, const string &mimeTypeFilter), (override)); - - MOCK_METHOD(int, OpenFile, (Uri &uri, const std::string &mode), (override)); - - MOCK_METHOD(int, OpenRawFile, (Uri &uri, const std::string &mode), (override)); - - MOCK_METHOD(int, Insert, (Uri &uri, const DataShareValuesBucket &value), (override)); - - MOCK_METHOD(int, InsertExt, (Uri &uri, const DataShareValuesBucket &value, std::string &result), (override)); - - MOCK_METHOD(int, Update, (Uri &uri, const DataSharePredicates &predicates, - const DataShareValuesBucket &value), (override)); - - MOCK_METHOD(int, BatchUpdate, (const UpdateOperations &operations, - std::vector &results), (override)); - - MOCK_METHOD(int, Delete, (Uri &uri, const DataSharePredicates &predicates), (override)); - - MOCK_METHOD(string, GetType, (Uri &uri), (override)); - - MOCK_METHOD(int, BatchInsert, (Uri &uri, const std::vector &values), (override)); - - MOCK_METHOD(int, ExecuteBatch, (const std::vector &statements, - ExecResultSet &result), (override)); - - MOCK_METHOD(int, RegisterObserver, (const Uri &uri, - const sptr &dataObserver), (override)); - - MOCK_METHOD(int, UnregisterObserver, (const Uri &uri, - const sptr &dataObserver), (override)); - - MOCK_METHOD(void, NotifyChange, (const Uri &uri), (override)); - - MOCK_METHOD(int, RegisterObserverExtProvider, (const Uri &uri, std::shared_ptr dataObserver, - bool isDescendants), (override)); - - MOCK_METHOD(int, UnregisterObserverExtProvider, (const Uri &uri, - std::shared_ptr dataObserver), (override)); - - MOCK_METHOD(void, NotifyChangeExtProvider, (const DataShareObserver::ChangeInfo &changeInfo), (override)); - - MOCK_METHOD(Uri, NormalizeUri, (Uri &uri), (override)); - - MOCK_METHOD(Uri, DenormalizeUri, (Uri &uri), (override)); - - MOCK_METHOD(int, AddQueryTemplate, (const std::string &uri, int64_t subscriberId, Template &tpl), (override)); - - MOCK_METHOD(int, DelQueryTemplate, (const std::string &uri, int64_t subscriberId), (override)); - - MOCK_METHOD(std::vector, Publish, (const Data &data, const std::string &bundleName), (override)); - - MOCK_METHOD(Data, GetPublishedData, (const std::string &bundleName, int &resultCode), (override)); - - MOCK_METHOD(std::vector, SubscribeRdbData, (const std::vector &uris, - const TemplateId &templateId, - const std::function &callback), (override)); - - MOCK_METHOD(std::vector, UnsubscribeRdbData, (const std::vector &uris, - const TemplateId &templateId), (override)); - - MOCK_METHOD(std::vector, EnableRdbSubs, (const std::vector &uris, - const TemplateId &templateId), (override)); - - MOCK_METHOD(std::vector, DisableRdbSubs, (const std::vector &uris, - const TemplateId &templateId), (override)); - - MOCK_METHOD(std::vector, SubscribePublishedData, - (const std::vector &uris, int64_t subscriberId, - const std::function &callback), (override)); - - MOCK_METHOD(std::vector, UnsubscribePublishedData, (const std::vector &uris, - int64_t subscriberId), (override)); - - MOCK_METHOD(std::vector, EnablePubSubs, - (const std::vector &uris, int64_t subscriberId), (override)); - - MOCK_METHOD(std::vector, DisablePubSubs, - (const std::vector &uris, int64_t subscriberId), (override)); - - MOCK_METHOD((std::pair), InsertEx, - (Uri &uri, const DataShareValuesBucket &value), (override)); - - MOCK_METHOD((std::pair), UpdateEx, (Uri &uri, const DataSharePredicates &predicates, - const DataShareValuesBucket &value), (override)); - - MOCK_METHOD((std::pair), DeleteEx, - (Uri &uri, const DataSharePredicates &predicates), (override)); - - MOCK_METHOD(int32_t, UserDefineFunc, (MessageParcel &data, MessageParcel &reply, - MessageOption &option), (override)); -}; - -class DataShareHelperMock : public IDataShareHelper { -public: - MOCK_METHOD(std::shared_ptr, Creator, (const sptr &token, - const string &strUri, const string &extUri, const int waitTime, bool isSystem)); - - MOCK_METHOD(std::shared_ptr, Query, (Uri &uri, const DataSharePredicates &predicates, - std::vector &colums, DatashareBusinessError *businessError)); -}; -} -} // namespace OHOS::FileManagement::Backup -#endif diff --git a/tests/mock/module_external/include/datashare_result_set_mock.h b/tests/mock/module_external/include/datashare_result_set_mock.h deleted file mode 100644 index 93c306ef1..000000000 --- a/tests/mock/module_external/include/datashare_result_set_mock.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_FILEMGMT_BACKUP_DATASHARE_RESULT_SET_MOCK_H -#define OHOS_FILEMGMT_BACKUP_DATASHARE_RESULT_SET_MOCK_H - -#include -#include "gmock/gmock.h" -#include "datashare_result_set.h" - -namespace OHOS { -using namespace DataShare; -namespace FileManagement::Backup { - -class IDataShareResultSet { -public: - IDataShareResultSet() = default; - virtual ~IDataShareResultSet() = default; - virtual int GetRowCount(int &count) = 0; - virtual int GoToNextRow() = 0; - virtual int GetColumnIndex(const std::string &columnName, int &columnIndex) = 0; - virtual int GetInt(int columnIndex, int &value) = 0; - virtual int GetLong(int columnIndex, int64_t &value) = 0; -public: - static inline std::shared_ptr idsrs = nullptr; -}; - -class DataShareResultSetMock : public IDataShareResultSet { -public: - MOCK_METHOD(int, GetRowCount, (int &count), (override)); - MOCK_METHOD(int, GoToNextRow, ()); - MOCK_METHOD(int, GetColumnIndex, (const std::string &columnName, int &columnIndex)); - MOCK_METHOD(int, GetInt, (int columnIndex, int &value), (override)); - MOCK_METHOD(int, GetLong, (int columnIndex, int64_t &value), (override)); -}; -} -} -#endif diff --git a/tests/mock/module_external/src/datashare_helper_mock.cpp b/tests/mock/module_external/src/datashare_helper_mock.cpp deleted file mode 100644 index 92bc1e4a8..000000000 --- a/tests/mock/module_external/src/datashare_helper_mock.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2025 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 "datashare_helper.h" -#include "datashare_helper_mock.h" - -namespace OHOS { -namespace DataShare { -using namespace std; -using namespace FileManagement::Backup; - -std::shared_ptr DataShareHelper::Creator(const sptr &token, - const std::string &strUri, const std::string &extUri, const int waitTime, bool isSystem) -{ - GTEST_LOG_(INFO) << "DataShareHelperMock Creator is OK"; - return IDataShareHelper::idsh->Creator(token, strUri, extUri, waitTime, isSystem); -} - -std::shared_ptr Query(Uri &uri, const DataSharePredicates &predicates, - std::vector &colums, DatashareBusinessError *businessError) -{ - GTEST_LOG_(INFO) << "DataShareResultSet Query is OK"; - return IDataShareHelper::idsh->Query(uri, predicates, colums, businessError); -} -} -} \ No newline at end of file diff --git a/tests/mock/module_external/src/datashare_result_set_mock.cpp b/tests/mock/module_external/src/datashare_result_set_mock.cpp deleted file mode 100644 index b01978b6c..000000000 --- a/tests/mock/module_external/src/datashare_result_set_mock.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2025 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 "datashare_result_set.h" -#include "datashare_result_set_mock.h" - -namespace OHOS { -namespace DataShare { -using namespace std; -using namespace FileManagement::Backup; - -int GetRowCount(int &count) -{ - GTEST_LOG_(INFO) << "DataShareResultSet GetRowCount is OK"; - return IDataShareResultSet::idsrs->GetRowCount(count); -} - -int GoToNextRow() -{ - GTEST_LOG_(INFO) << "DataShareResultSet GoToNextRow is OK"; - return IDataShareResultSet::idsrs->GoToNextRow(); -} - -int GetColumnIndex(const std::string &columnName, int &columnIndex) -{ - GTEST_LOG_(INFO) << "DataShareResultSet GetColumnIndex is OK"; - return IDataShareResultSet::idsrs->GetColumnIndex(columnName, columnIndex); -} - -int GetInt(int columnIndex, int &value) -{ - GTEST_LOG_(INFO) << "DataShareResultSet GetInt is OK"; - return IDataShareResultSet::idsrs->GetInt(columnIndex, value); -} - -int GetLong(int columnIndex, int64_t &value) -{ - GTEST_LOG_(INFO) << "DataShareResultSet GetLong is OK"; - return IDataShareResultSet::idsrs->GetLong(columnIndex, value); -} -} -} \ No newline at end of file diff --git a/tests/unittests/backup_sa/module_external/BUILD.gn b/tests/unittests/backup_sa/module_external/BUILD.gn index d1ddd21eb..f0f63b4d4 100644 --- a/tests/unittests/backup_sa/module_external/BUILD.gn +++ b/tests/unittests/backup_sa/module_external/BUILD.gn @@ -72,14 +72,11 @@ ohos_unittest("storage_manager_service_test") { "${path_backup}/utils/include", "${path_backup}/utils/include/b_hilog", "${path_backup_mock}/utils_mock/include", - "${path_backup_mock}/module_external/include", ] sources = [ "${path_backup_mock}/utils_mock/src/b_jsonutil_mock.cpp", "${path_backup_mock}/utils_mock/src/b_sa_utils_mock.cpp", - "${path_backup_mock}/module_external/src/datashare_helper_mock.cpp", - "${path_backup_mock}/module_external/src/datashare_result_set_mock.cpp", "storage_manager_service_test.cpp", ] @@ -93,7 +90,7 @@ ohos_unittest("storage_manager_service_test") { defines = [ "LOG_TAG=\"app_file_service\"", - "LOG_DOMAIN=0xD004303", + "LOG_DOMAIN=0xD200000", "private = public", "protected = public", ] diff --git a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp index 876197ec5..8fb8d9baf 100644 --- a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp +++ b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp @@ -22,17 +22,8 @@ #include #include "file_uri.h" #include "sandbox_helper.h" -#include "b_jsonutil_mock.h" -#include "b_sa_utils_mock.h" -#include "if_system_ability_manager.h" -#include "iremote_stub.h" -#include "iservice_registry.h" -#include "module_external/bms_adapter.h" #include "module_external/storage_manager_service.h" #include "module_external/storage_manager_service.cpp" -#include "datashare_helper_mock.h" -#include "datashare_result_set_mock.h" -#include "directory_ex.h" namespace OHOS { const std::string CAMERA_BUNDLENAME = "file"; @@ -41,92 +32,19 @@ using namespace std; using namespace testing; using namespace FileManagement::Backup; namespace fs = std::filesystem; - -class SystemAbilityManagerMock : public ISystemAbilityManager { -public: - MOCK_METHOD((sptr), AsObject, ()); - MOCK_METHOD((std::vector), ListSystemAbilities, (unsigned int)); - MOCK_METHOD((sptr), GetSystemAbility, (int32_t)); - MOCK_METHOD((sptr), CheckSystemAbility, (int32_t)); - MOCK_METHOD(int32_t, RemoveSystemAbility, (int32_t)); - MOCK_METHOD(int32_t, SubscribeSystemAbility, (int32_t, (const sptr&))); - MOCK_METHOD(int32_t, UnSubscribeSystemAbility, (int32_t, (const sptr&))); - MOCK_METHOD((sptr), GetSystemAbility, (int32_t, const std::string&)); - MOCK_METHOD(sptr, CheckSystemAbility, (int32_t, const std::string&)); - MOCK_METHOD(int32_t, AddOnDemandSystemAbilityInfo, (int32_t, const std::u16string&)); - MOCK_METHOD((sptr), CheckSystemAbility, (int32_t, bool&)); - MOCK_METHOD(int32_t, AddSystemAbility, (int32_t, (const sptr&), const SAExtraProp&)); - MOCK_METHOD(int32_t, AddSystemProcess, (const std::u16string&, (const sptr&))); - MOCK_METHOD((sptr), LoadSystemAbility, (int32_t, int32_t)); - MOCK_METHOD(int32_t, LoadSystemAbility, (int32_t, (const sptr&))); - MOCK_METHOD(int32_t, LoadSystemAbility, (int32_t, const std::string&, (const sptr&))); - MOCK_METHOD(int32_t, UnloadSystemAbility, (int32_t)); - MOCK_METHOD(int32_t, CancelUnloadSystemAbility, (int32_t)); - MOCK_METHOD(int32_t, UnloadAllIdleSystemAbility, ()); - MOCK_METHOD(int32_t, GetSystemProcessInfo, (int32_t, SystemProcessInfo&)); - MOCK_METHOD(int32_t, GetRunningSystemProcess, (std::list&)); - MOCK_METHOD(int32_t, SubscribeSystemProcess, (const sptr&)); - MOCK_METHOD(int32_t, SendStrategy, (int32_t, (std::vector&), int32_t, std::string&)); - MOCK_METHOD(int32_t, UnSubscribeSystemProcess, (const sptr&)); - MOCK_METHOD(int32_t, GetOnDemandReasonExtraData, (int64_t, MessageParcel&)); - MOCK_METHOD(int32_t, GetOnDemandPolicy, (int32_t, OnDemandPolicyType, (std::vector&))); - MOCK_METHOD(int32_t, UpdateOnDemandPolicy, (int32_t, OnDemandPolicyType, - (const std::vector&))); - MOCK_METHOD(int32_t, GetOnDemandSystemAbilityIds, (std::vector&)); - MOCK_METHOD(int32_t, GetExtensionSaIds, (const std::string&, std::vector&)); - MOCK_METHOD(int32_t, GetExtensionRunningSaList, (const std::string&, (std::vector>&))); - MOCK_METHOD(int32_t, GetRunningSaExtensionInfoList, (const std::string&, (std::vector&))); - MOCK_METHOD(int32_t, GetCommonEventExtraDataIdlist, (int32_t, (std::vector&), const std::string&)); -}; - -class BundleMgrMock : public IRemoteStub { -public: - MOCK_METHOD((sptr), AsObject, ()); - MOCK_METHOD(bool, GetBundleInfos, (const AppExecFwk::BundleFlag, (std::vector&), int32_t)); - MOCK_METHOD(ErrCode, GetCloneBundleInfo, (const std::string&, int32_t, int32_t, AppExecFwk::BundleInfo&, int32_t)); -}; - class StorageManagerServiceTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); void SetUp() override; void TearDown() override; - - static inline sptr bms = nullptr; - static inline sptr sam = nullptr; - static inline shared_ptr dsh = nullptr; - static inline shared_ptr dsrs = nullptr; - static inline shared_ptr dhelper = nullptr; - static inline shared_ptr dset = nullptr; }; -void StorageManagerServiceTest::SetUpTestCase(void) -{ - bms = sptr(new BundleMgrMock()); - sam = sptr(new SystemAbilityManagerMock()); - dsh = make_shared(); - DataShareHelperMock::idsh = dsh; - dsrs = make_shared(); - DataShareResultSetMock::idsrs = dsrs; - dhelper = make_shared(); - dset = std::make_shared(); -} - -void StorageManagerServiceTest::TearDownTestCase(void) -{ - bms = nullptr; - sam = nullptr; -} - +void StorageManagerServiceTest::SetUpTestCase(void) {} +void StorageManagerServiceTest::TearDownTestCase(void) {} void StorageManagerServiceTest::SetUp(void) {} void StorageManagerServiceTest::TearDown(void) {} -sptr SystemAbilityManagerClient::GetSystemAbilityManager() -{ - return StorageManagerServiceTest::sam; -} - /** * @tc.name: Storage_Manager_ServiceTest_GetBundleStatsForIncrease_001 * @tc.desc: check the GetBundleStatsForIncrease function @@ -175,7 +93,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStatsFo testing::ext::TestSize.Level1) { uint32_t userId = 100; - std::string bundleName = MMS_BUNDLENAME; + std::string bundleName = "testBundle"; int64_t lastBackupTime = 123456789; std::vector pkgFileSizes; std::vector incPkgFileSizes; @@ -196,7 +114,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStatsFo HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ReadIncludesExcludesPath_001, testing::ext::TestSize.Level1) { - std::string bundleName = MMS_BUNDLENAME; + std::string bundleName = ""; int64_t lastBackupTime = 123456789; uint32_t userId = 100; auto result = StorageManagerService::GetInstance().ReadIncludesExcludesPath(bundleName, lastBackupTime, userId); @@ -213,7 +131,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ReadIncludesExcl HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ReadIncludesExcludesPath_002, testing::ext::TestSize.Level1) { - std::string bundleName = MMS_BUNDLENAME; + std::string bundleName = "testBundle"; int64_t lastBackupTime = 123456789; uint32_t userId = 100; // Assuming the file does not exist or cannot be opened @@ -231,7 +149,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ReadIncludesExcl HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DealWithIncludeFiles_001, testing::ext::TestSize.Level1) { - std::string bundleName = MMS_BUNDLENAME; + std::string bundleName = CAMERA_BUNDLENAME; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; std::vector includes = {"data/storage/el1/base/" + DEFAULT_PATH_WITH_WILDCARD}; @@ -250,7 +168,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DealWithIncludeF HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DealWithIncludeFiles_002, testing::ext::TestSize.Level1) { - std::string bundleName = MMS_BUNDLENAME; + std::string bundleName = CAMERA_BUNDLENAME; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; std::vector includes = {NORMAL_SAND_PREFIX}; @@ -269,7 +187,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DealWithIncludeF HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DealWithIncludeFiles_003, testing::ext::TestSize.Level1) { - std::string bundleName = MMS_BUNDLENAME; + std::string bundleName = "testBundle"; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; std::vector includes = {}; @@ -289,7 +207,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ConvertSandboxRe testing::ext::TestSize.Level1) { uint32_t userId = 100; - std::string bundleName = MMS_BUNDLENAME; + std::string bundleName = "com.example.app"; std::string sandboxPathStr = NORMAL_SAND_PREFIX + "/path/to/file"; std::vector realPaths; std::map pathMap; @@ -333,7 +251,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_CheckIfDirForInc testing::ext::TestSize.Level1) { ofstream closedStatFile; - std::string bundleName = MMS_BUNDLENAME; + std::string bundleName = "com.example.app"; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; std::map pathMap; @@ -353,7 +271,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_CheckIfDirForInc testing::ext::TestSize.Level1) { ofstream statFile; - std::string bundleName = MMS_BUNDLENAME; + std::string bundleName = "com.example.app"; BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; std::map pathMap; @@ -435,19 +353,14 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_ExcludeFilter_00 HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetUserStorageStatsByType_001, testing::ext::TestSize.Level1) { - int32_t userId = 100; - string basePath = "/data/storage/el2/" + to_string(userId); - string path = basePath + "/base"; - EXPECT_TRUE(OHOS::ForceCreateDirectory(path)); - StorageManager::StorageStats storageStats; - std::string type = MEDIA_TYPE; - EXPECT_CALL(*sam, GetSystemAbility(_)).WillRepeatedly(Return(bms)); - EXPECT_CALL(*dsh, Creator(_, _, _, _, _)).WillRepeatedly(Return(dhelper)); - EXPECT_CALL(*dhelper, Query(_, _, _, _)).WillOnce(Return(dset)); - EXPECT_CALL(*dsrs, GetRowCount(_)).WillOnce(DoAll(SetArgReferee<0>(100), Return(0))); + std::string type = "MEDIA_TYPE"; + int32_t userId = 100; int64_t result = StorageManagerService::GetInstance().GetUserStorageStatsByType(userId, storageStats, type); - EXPECT_EQ(result, E_GETROWCOUNT); + EXPECT_EQ(result, E_ERR); + EXPECT_EQ(storageStats.video_, 0); + EXPECT_EQ(storageStats.image_, 0); + EXPECT_EQ(storageStats.file_, 0); } /** @@ -464,6 +377,9 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetUserStorageSt int32_t userId = 100; int64_t result = StorageManagerService::GetInstance().GetUserStorageStatsByType(userId, storageStats, type); EXPECT_EQ(result, 0); + EXPECT_GE(storageStats.video_, 0); + EXPECT_GE(storageStats.image_, 0); + EXPECT_GE(storageStats.file_, 0); } /** @@ -480,47 +396,9 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetUserStorageSt int32_t userId = 100; int64_t result = StorageManagerService::GetInstance().GetUserStorageStatsByType(userId, storageStats, type); EXPECT_EQ(result, E_ERR); -} - -/** - * @tc.name: Storage_Manager_ServiceTest_GetMediaStorageStats_001 - * @tc.number: GetMediaStorageStats_001 - * @tc.desc: 测试返回E_MEDIALIBRARY_ERROR - */ -HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaStorageStats_001, - testing::ext::TestSize.Level1) { - StorageManager::StorageStats storageStats; - - EXPECT_CALL(*sam, GetSystemAbility(_)).WillOnce(Return(nullptr)).WillRepeatedly(Return(bms)); - int32_t result = StorageManagerService::GetInstance().GetMediaStorageStats(storageStats); - EXPECT_EQ(result, E_REMOTE_IS_NULLPTR); -} - -/** - * @tc.name: Storage_Manager_ServiceTest_GetMediaStorageStats_002 - * @tc.number: GetMediaStorageStats_002 - * @tc.desc: 测试返回E_MEDIALIBRARY_ERROR - */ -HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaStorageStats_002, - testing::ext::TestSize.Level1) { - StorageManager::StorageStats storageStats; - EXPECT_CALL(*dsh, Creator(_, _, _, _, _)).WillRepeatedly(Return(nullptr)); - int32_t result = StorageManagerService::GetInstance().GetMediaStorageStats(storageStats); - EXPECT_EQ(result, E_MEDIALIBRARY_ERROR); -} - -/** - * @tc.name: Storage_Manager_ServiceTest_GetMediaStorageStats_002 - * @tc.number: GetMediaStorageStats_002 - * @tc.desc: 测试返回E_QUERY - */ -HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaStorageStats_003, - testing::ext::TestSize.Level1) { - StorageManager::StorageStats storageStats; - EXPECT_CALL(*dsh, Creator(_, _, _, _, _)).WillRepeatedly(Return(dhelper)); - EXPECT_CALL(*dhelper, Query(_, _, _, _)).WillOnce(Return(nullptr)); - int32_t result = StorageManagerService::GetInstance().GetMediaStorageStats(storageStats); - EXPECT_EQ(result, E_QUERY); + EXPECT_GE(storageStats.video_, 0); + EXPECT_GE(storageStats.image_, 0); + EXPECT_GE(storageStats.file_, 0); } /** @@ -537,21 +415,10 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaTypeAndS EXPECT_EQ(storageStats.image_, 0); EXPECT_EQ(storageStats.audio_, 0); EXPECT_EQ(storageStats.video_, 0); -} -/** - * @tc.name: Storage_Manager_ServiceTest_GetMediaTypeAndSize_002 - * @tc.desc: check the GetMediaTypeAndSize function - * @tc.type: FUNC - * @tc.require: AR000IGCR7 - */ -HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetMediaTypeAndSize_002, - testing::ext::TestSize.Level1) -{ auto resultSet = std::make_shared(); - StorageManager::StorageStats storageStats; - EXPECT_CALL(*dsrs, GoToNextRow()).WillRepeatedly(Return(true)); StorageManagerService::GetInstance().GetMediaTypeAndSize(resultSet, storageStats); + EXPECT_EQ(storageStats.image_, 0); EXPECT_EQ(storageStats.audio_, 0); EXPECT_EQ(storageStats.video_, 0); @@ -607,23 +474,6 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_PathSortFunc_001 EXPECT_TRUE(PathSortFunc(path1, path2)); } -/** - * @tc.name: Storage_Manager_ServiceTest_GetBundleStatsTest_001 - * @tc.number: GetBundleStatsTest_001 - * @tc.desc: 测试 GetBundleInfosForLocalCapabilities 接口 - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: AR000IGCR7 - */ -HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_GetBundleStats_001, testing::ext::TestSize.Level1) -{ - string bundleName = MMS_BUNDLENAME; - StorageManager::BundleStats bundleStats; - - bool result = StorageManagerService::GetInstance().GetBundleStats(bundleName, bundleStats); - EXPECT_TRUE(result); -} - /** * @tc.name: Storage_Manager_ServiceTest_DeduplicationPath_001 * @tc.number: DeduplicationPathTest_001 @@ -634,7 +484,7 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DeduplicationPat { std::vector configPaths; StorageManagerService::GetInstance().DeduplicationPath(configPaths); - EXPECT_TRUE(true); + EXPECT_TRUE(configPaths.size() == 0); } /** @@ -645,9 +495,9 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DeduplicationPat HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_DeduplicationPath_002, testing::ext::TestSize.Level1) { - std::vector configPaths = {"path1", "path2", "path3"}; + std::vector configPaths = {"path1", "path2", "path2"}; StorageManagerService::GetInstance().DeduplicationPath(configPaths); - EXPECT_TRUE(true); + EXPECT_TRUE(configPaths.size() == 2); } /** @@ -691,13 +541,100 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_AddOuterDirIntoF std::map excludesMap; StorageManagerService::GetInstance().AddOuterDirIntoFileStat(dir, paras, sandboxDir, statFile, excludesMap); - EXPECT_TRUE(true); + EXPECT_TRUE(excludesMap.empty()); dir = ""; StorageManagerService::GetInstance().AddOuterDirIntoFileStat(dir, paras, sandboxDir, statFile, excludesMap); - EXPECT_TRUE(true); + EXPECT_TRUE(excludesMap.empty()); statFile.close(); remove("statfile.txt"); } + +/** + * @tc.name: Storage_Manager_ServiceTest_InsertStatFile_001 + * @tc.number: InsertStatFile_001 + * @tc.desc: 测试 InsertStatFile 函数在输入有效时是否正确插入文件信息 + */ +HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_InsertStatFile_001, testing::ext::TestSize.Level1) +{ + std::string bundleName = MMS_BUNDLENAME; + std::string path = "/data/app/el1/100/base/" + bundleName + "/.backup"; + struct FileStat fileStat = {.isDir = true}; + std::ofstream statFile("test_stat_file.txt"); + std::map excludesMap; + BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, + .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; + + StorageManagerService::GetInstance().InsertStatFile(path, fileStat, statFile, excludesMap, paras); + EXPECT_TRUE(excludesMap.empty()); + statFile.close(); +} + +/** + * @tc.name: Storage_Manager_ServiceTest_InsertStatFile_002 + * @tc.number: InsertStatFile_002 + * @tc.desc: 测试 InsertStatFile 函数路径在excludesMap中时是否正确排除文件信息 + */ +HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_InsertStatFile_002, testing::ext::TestSize.Level1) +{ + std::string bundleName = MMS_BUNDLENAME; + std::string path = "/data/app/el1/100/base/" + bundleName + "/.backup"; + struct FileStat fileStat = {}; + std::ofstream statFile("test_stat_file.txt"); + std::map excludesMap = {{path, true}}; + BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, + .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; + + StorageManagerService::GetInstance().InsertStatFile(path, fileStat, statFile, excludesMap, paras); + EXPECT_TRUE(excludesMap.find(path) != excludesMap.end()); + statFile.close(); +} + +/** + * @tc.name: Storage_Manager_ServiceTest_InsertStatFile_003 + * @tc.number: InsertStatFile_003 + * @tc.desc: 测试 InsertStatFile 函数路径在输入无效文件状态信息时的处理 + */ +HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_InsertStatFile_003, testing::ext::TestSize.Level1) +{ + std::string bundleName = MMS_BUNDLENAME; + std::string path = "/invalid/path"; + struct FileStat fileStat = {}; + std::ofstream statFile("test_stat_file.txt"); + std::map excludesMap; + BundleStatsParas paras = {.userId = 100, .bundleName = bundleName, + .lastBackupTime = 0, .fileSizeSum = 0, .incFileSizeSum = 0}; + + StorageManagerService::GetInstance().InsertStatFile(path, fileStat, statFile, excludesMap, paras); + EXPECT_TRUE(excludesMap.empty()); + statFile.close(); +} + +/** + * @tc.name: Storage_Manager_ServiceTest_AddPathMapForPathWildCard_001 + * @tc.number: AddPathMapForPathWildCard_001 + * @tc.desc: 测试 AddPathMapForPathWildCard 函数返回值正常 + */ +HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_AddPathMapForPathWildCard_001, + testing::ext::TestSize.Level1) +{ + uint32_t userId = 100; + std::string name = MMS_BUNDLENAME; + std::string phyPath = "/data/app/el1/100/base/com.ohos.mms/.backup"; + std::map pathMap; + + bool result = StorageManagerService::GetInstance().AddPathMapForPathWildCard(userId, name, phyPath, pathMap); + EXPECT_TRUE(result, true); + + name = "com.example.app2"; + phyPath = "/data/app/el2/100/base/com.example.app2/.backup"; + pathMap.insert({phyPath, ".backup"}); + result = StorageManagerService::GetInstance().AddPathMapForPathWildCard(userId, name, phyPath, pathMap); + EXPECT_TRUE(result, true); + + phyPath = ""; + result = StorageManagerService::GetInstance().AddPathMapForPathWildCard(userId, name, phyPath, pathMap); + EXPECT_TRUE(result, false); +} } \ No newline at end of file -- Gitee From 2bb53d4567a0d757d0f04b283cd39fa39a8b2445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E4=BD=B3=E7=82=9C?= Date: Wed, 2 Jul 2025 15:37:34 +0800 Subject: [PATCH 14/14] add ut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 石佳炜 --- .../module_external/storage_manager_service_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp index 8fb8d9baf..05fbbd72a 100644 --- a/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp +++ b/tests/unittests/backup_sa/module_external/storage_manager_service_test.cpp @@ -625,16 +625,16 @@ HWTEST_F(StorageManagerServiceTest, Storage_Manager_ServiceTest_AddPathMapForPat std::map pathMap; bool result = StorageManagerService::GetInstance().AddPathMapForPathWildCard(userId, name, phyPath, pathMap); - EXPECT_TRUE(result, true); + EXPECT_EQ(result, true); name = "com.example.app2"; phyPath = "/data/app/el2/100/base/com.example.app2/.backup"; pathMap.insert({phyPath, ".backup"}); result = StorageManagerService::GetInstance().AddPathMapForPathWildCard(userId, name, phyPath, pathMap); - EXPECT_TRUE(result, true); + EXPECT_EQ(result, true); phyPath = ""; result = StorageManagerService::GetInstance().AddPathMapForPathWildCard(userId, name, phyPath, pathMap); - EXPECT_TRUE(result, false); + EXPECT_EQ(result, false); } } \ No newline at end of file -- Gitee