diff --git a/frameworks/native/cloud_file_kit_inner/src/data_sync/sync_state_manager.cpp b/frameworks/native/cloud_file_kit_inner/src/data_sync/sync_state_manager.cpp index 342abc2f563a58b9a3f62b47bbf28027c888b029..fe5a5cf66b75c25cc82319fd42f30ad9c062da7e 100644 --- a/frameworks/native/cloud_file_kit_inner/src/data_sync/sync_state_manager.cpp +++ b/frameworks/native/cloud_file_kit_inner/src/data_sync/sync_state_manager.cpp @@ -89,10 +89,10 @@ bool SyncStateManager::CheckMediaLibCleaning() uint64_t curTime = GetCurrentTimeStampMs(); uint64_t intervalTime = curTime - prevTime; LOGI("media clean time: %{public}s, cur: %{public}s", closeSwitchTime.c_str(), std::to_string(curTime).c_str()); - if (prevTime > curTime || intervalTime >= TWELVE_HOURS_MILLISECOND) { + if (prevTime > curTime || intervalTime >= SIX_HOURS_MILLISECOND) { CLOUD_SYNC_FAULT_REPORT({"", CloudFile::FaultScenarioCode::CLOUD_SWITCH_CLOSE, CloudFile::FaultType::TIMEOUT, E_TIMEOUT, - "media clean time is: " + closeSwitchTime + " over 12h"}); + "media clean time is: " + closeSwitchTime + " over 6h"}); system::SetParameter(CLOUDSYNC_SWITCH_STATUS, "0"); return false; } diff --git a/frameworks/native/cloud_file_kit_inner/src/data_sync/task_state_manager.cpp b/frameworks/native/cloud_file_kit_inner/src/data_sync/task_state_manager.cpp index 00c616c21ea04fa1e5264875c29d7327991dca09..22e8e860563105798962e51a8cb9dcaedf59586d 100644 --- a/frameworks/native/cloud_file_kit_inner/src/data_sync/task_state_manager.cpp +++ b/frameworks/native/cloud_file_kit_inner/src/data_sync/task_state_manager.cpp @@ -19,6 +19,7 @@ #include "iservice_registry.h" #include "mem_mgr_client.h" #include "parameters.h" +#include "settings_data_manager.h" #include "system_ability_definition.h" #include "utils_log.h" @@ -145,6 +146,7 @@ void TaskStateManager::DelayUnloadTask(bool needSetCritical) return; } system::SetParameter(CLOUD_FILE_SERVICE_SA_STATUS_FLAG, CLOUD_FILE_SERVICE_SA_END); + SettingsDataManager::UnregisterObserver(); int32_t ret = samgrProxy->UnloadSystemAbility(FILEMANAGEMENT_CLOUD_SYNC_SERVICE_SA_ID); if (ret != ERR_OK) { LOGE("remove system ability failed"); diff --git a/frameworks/native/cloud_file_kit_inner/src/sync_rule/cloud_status.cpp b/frameworks/native/cloud_file_kit_inner/src/sync_rule/cloud_status.cpp index 1226a50bfc498dc01b2c490ebb2b7e3379d7a4b0..65c7a2f72ba15ab7bf100b521c8d8565d1e05368 100644 --- a/frameworks/native/cloud_file_kit_inner/src/sync_rule/cloud_status.cpp +++ b/frameworks/native/cloud_file_kit_inner/src/sync_rule/cloud_status.cpp @@ -17,8 +17,8 @@ #include "cloud_file_kit.h" #include "dfs_error.h" -#include "utils_log.h" #include "settings_data_manager.h" +#include "utils_log.h" namespace OHOS::FileManagement::CloudSync { int32_t CloudStatus::GetCurrentCloudInfo(const std::string &bundleName, const int32_t userId) diff --git a/frameworks/native/cloud_file_kit_inner/src/sync_rule/network_set_manager.cpp b/frameworks/native/cloud_file_kit_inner/src/sync_rule/network_set_manager.cpp index 1c297a963fabc3fa45f55517adfc142bbbc5abe8..138f326caa4fc8097ea36d72c2eb579f5aff74b3 100644 --- a/frameworks/native/cloud_file_kit_inner/src/sync_rule/network_set_manager.cpp +++ b/frameworks/native/cloud_file_kit_inner/src/sync_rule/network_set_manager.cpp @@ -283,14 +283,7 @@ void NetworkSetManager::InitNetworkSetManager(const std::string &bundleName, con LOGI("InitNetworkSetManager bundleName: %{public}s", bundleName.c_str()); if (bundleName == GALLERY_BUNDLE_NAME) { RegisterObserver(bundleName, userId, CELLULARCONNECT); - RegisterObserver(bundleName, userId, NETCONNECT); GetCellularConnect(bundleName, userId); - GetNetConnect(bundleName, userId); - } else if (bundleName == HDC_BUNDLE_NAME) { - SettingsDataManager::GetNetworkConnectionStatus(); - SettingsDataManager::GetMobileDataStatus(); - } else { - LOGE("InitNetworkSetManager bundleName is illegals"); } } diff --git a/frameworks/native/cloud_file_kit_inner/src/sync_rule/settings_data_manager.cpp b/frameworks/native/cloud_file_kit_inner/src/sync_rule/settings_data_manager.cpp index b1f63bad102cb8fbc8a174591063e9447497b0ff..e1d69f5eb7f83fb0cc31305c05fd529eb96707e4 100644 --- a/frameworks/native/cloud_file_kit_inner/src/sync_rule/settings_data_manager.cpp +++ b/frameworks/native/cloud_file_kit_inner/src/sync_rule/settings_data_manager.cpp @@ -40,12 +40,18 @@ static const int32_t LOCAL_SPACE_DAYS_DEFAULT = 30; void SettingsDataManager::InitSettingsDataManager() { - LOGI("InitSettingsDataManager"); - RegisterObserver(SYNC_SWITCH_KEY); - RegisterObserver(NETWORK_CONNECTION_KEY); - RegisterObserver(MOBILE_DATA_SYNC_KEY); - RegisterObserver(LOCAL_SPACE_FREE_KEY); - RegisterObserver(LOCAL_SPACE_DAYS_KEY); + LOGI("InitSettingsDataManager start"); + SyncSwitchObserver_ = sptr(new (std::nothrow) SettingsDataObserver(SYNC_SWITCH_KEY)); + NetworkConnectionObserver_ = + sptr(new (std::nothrow) SettingsDataObserver(NETWORK_CONNECTION_KEY)); + MobileDataSyncObserver_ = sptr(new (std::nothrow) SettingsDataObserver(MOBILE_DATA_SYNC_KEY)); + LocalSpaceFreeObserver_ = sptr(new (std::nothrow) SettingsDataObserver(LOCAL_SPACE_FREE_KEY)); + LocalSpaceDaysObserver_ = sptr(new (std::nothrow) SettingsDataObserver(LOCAL_SPACE_DAYS_KEY)); + RegisterObserver(SYNC_SWITCH_KEY, SyncSwitchObserver_); + RegisterObserver(NETWORK_CONNECTION_KEY, NetworkConnectionObserver_); + RegisterObserver(MOBILE_DATA_SYNC_KEY, MobileDataSyncObserver_); + RegisterObserver(LOCAL_SPACE_FREE_KEY, LocalSpaceFreeObserver_); + RegisterObserver(LOCAL_SPACE_DAYS_KEY, LocalSpaceDaysObserver_); QuerySwitchStatus(); QueryNetworkConnectionStatus(); QueryLocalSpaceFreeStatus(); @@ -53,6 +59,21 @@ void SettingsDataManager::InitSettingsDataManager() QueryMobileDataStatus(); } +void SettingsDataManager::UnregisterObserver() +{ + LOGI("UnregisterObserver start"); + UnregisterObserver(SYNC_SWITCH_KEY, SyncSwitchObserver_); + UnregisterObserver(NETWORK_CONNECTION_KEY, NetworkConnectionObserver_); + UnregisterObserver(MOBILE_DATA_SYNC_KEY, MobileDataSyncObserver_); + UnregisterObserver(LOCAL_SPACE_FREE_KEY, LocalSpaceFreeObserver_); + UnregisterObserver(LOCAL_SPACE_DAYS_KEY, LocalSpaceDaysObserver_); + SyncSwitchObserver_ = nullptr; + NetworkConnectionObserver_ = nullptr; + MobileDataSyncObserver_ = nullptr; + LocalSpaceFreeObserver_ = nullptr; + LocalSpaceDaysObserver_ = nullptr; +} + int32_t SettingsDataManager::QuerySwitchStatus() { std::string value; @@ -258,30 +279,17 @@ int32_t SettingsDataManager::QueryParamInSettingsData(const std::string &key, st return E_RDB; } - LOGI("Query success, value: %{public}s", value.c_str()); + LOGI("Query key: %{public}s success, value: %{public}s", key.c_str(), value.c_str()); return E_OK; } -void SettingsDataManager::RegisterObserver(const std::string &key) +void SettingsDataManager::RegisterObserver(const std::string &key, sptr dataObserver) { - LOGD("register key: %{public}s", key.c_str()); - DataShare::CreateOptions options; - options.enabled_ = true; - auto dataShareHelper = DataShare::DataShareHelper::Creator(SETTING_DATA_QUERY_URI, options); - if (dataShareHelper == nullptr) { - LOGE("dataShareHelper == nullptr"); + if (dataObserver == nullptr) { + LOGW("registerObserver key: %{public}s dataObserver is nullptr", key.c_str()); return; } - sptr dataObserver(new (std::nothrow) SettingsDataObserver(key)); - Uri observerUri(SETTING_DATA_COMMON_URI + "&key=" + key); - dataShareHelper->RegisterObserver(observerUri, dataObserver); - dataShareHelper->Release(); - LOGI("Register SettingsDataObserver key: %{public}s finish", key.c_str()); -} -void SettingsDataManager::RegisterObserver(const std::string &key, sptr dataObserver) -{ - LOGD("register key: %{public}s", key.c_str()); DataShare::CreateOptions options; options.enabled_ = true; auto dataShareHelper = DataShare::DataShareHelper::Creator(SETTING_DATA_QUERY_URI, options); @@ -296,8 +304,13 @@ void SettingsDataManager::RegisterObserver(const std::string &key, sptr dataObserver) { + if (dataObserver == nullptr) { + LOGW("unregisterObserver key: %{public}s dataObserver is nullptr", key.c_str()); + return; + } + DataShare::CreateOptions options; options.enabled_ = true; auto dataShareHelper = DataShare::DataShareHelper::Creator(SETTING_DATA_QUERY_URI, options); @@ -305,7 +318,7 @@ void SettingsDataManager::UnregisterObserver(const std::string &key) LOGE("dataShareHelper == nullptr"); return; } - sptr dataObserver(new (std::nothrow) SettingsDataObserver(key)); + Uri observerUri(SETTING_DATA_COMMON_URI + "&key=" + key); dataShareHelper->UnregisterObserver(observerUri, dataObserver); dataShareHelper->Release(); @@ -314,7 +327,7 @@ void SettingsDataManager::UnregisterObserver(const std::string &key) void SettingsDataObserver::OnChange() { - LOGD("change key: %{public}s", key_.c_str()); + LOGI("change key: %{public}s", key_.c_str()); if (key_ == SYNC_SWITCH_KEY) { SettingsDataManager::QuerySwitchStatus(); } else if (key_ == NETWORK_CONNECTION_KEY) { diff --git a/interfaces/inner_api/native/cloud_file_kit_inner/data_sync_const.h b/interfaces/inner_api/native/cloud_file_kit_inner/data_sync_const.h index cb21e60accfbbe091514de7676be27c2880a94ab..d97abef0cba89fae23ae4d0a2c9c82ace209a42b 100644 --- a/interfaces/inner_api/native/cloud_file_kit_inner/data_sync_const.h +++ b/interfaces/inner_api/native/cloud_file_kit_inner/data_sync_const.h @@ -81,7 +81,7 @@ const int32_t DIRECTORY = 1; const int32_t MILLISECOND_TO_SECOND = 1000; const int32_t SECOND_TO_MILLISECOND = 1000; const int64_t MILLISECOND_TO_NANOSECOND = 1e6; -const uint64_t TWELVE_HOURS_MILLISECOND = 12 * 60 * 60 * SECOND_TO_MILLISECOND; +const uint64_t SIX_HOURS_MILLISECOND = 6 * 60 * 60 * SECOND_TO_MILLISECOND; const int32_t NOT_IN_TRASH = 0; const int32_t NOT_IN_PENDING = 0; diff --git a/interfaces/inner_api/native/cloud_file_kit_inner/settings_data_manager.h b/interfaces/inner_api/native/cloud_file_kit_inner/settings_data_manager.h index e40783570931bdec8f0ea121a9014be2205e5c39..da11ea8b9c1b924b6f9fc06177eec1e2f80d50c8 100644 --- a/interfaces/inner_api/native/cloud_file_kit_inner/settings_data_manager.h +++ b/interfaces/inner_api/native/cloud_file_kit_inner/settings_data_manager.h @@ -55,14 +55,19 @@ public: static int32_t GetLocalSpaceFreeStatus(); static int32_t GetLocalSpaceFreeDays(); - static void RegisterObserver(const std::string &key); static void RegisterObserver(const std::string &key, sptr dataObserver); + static void UnregisterObserver(); private: static int32_t QueryParamInSettingsData(const std::string &key, std::string &value); - static void UnregisterObserver(const std::string &key); + static void UnregisterObserver(const std::string &key, sptr dataObserver); static inline SafeMap settingsDataMap_; + static inline sptr SyncSwitchObserver_ = nullptr; + static inline sptr NetworkConnectionObserver_ = nullptr; + static inline sptr MobileDataSyncObserver_ = nullptr; + static inline sptr LocalSpaceFreeObserver_ = nullptr; + static inline sptr LocalSpaceDaysObserver_ = nullptr; }; } // OHOS diff --git a/services/cloudsyncservice/src/sync_rule/user_status_listener.cpp b/services/cloudsyncservice/src/sync_rule/user_status_listener.cpp index af36303b65d01f1aa5d9eaec515b5a777bdf7f0d..299a979c3bbd65933319675cfc275d533c264e6c 100644 --- a/services/cloudsyncservice/src/sync_rule/user_status_listener.cpp +++ b/services/cloudsyncservice/src/sync_rule/user_status_listener.cpp @@ -19,6 +19,7 @@ #include "common_event_support.h" #include "iservice_registry.h" #include "parameters.h" +#include "settings_data_manager.h" #include "system_ability_definition.h" #include "task_state_manager.h" #include "utils_log.h" @@ -108,6 +109,7 @@ void UserStatusListener::DoUnloadSA() return; } system::SetParameter(CLOUD_FILE_SERVICE_SA_STATUS_FLAG, CLOUD_FILE_SERVICE_SA_END); + SettingsDataManager::UnregisterObserver(); int32_t ret = samgrProxy->UnloadSystemAbility(FILEMANAGEMENT_CLOUD_SYNC_SERVICE_SA_ID); if (ret != ERR_OK) { LOGE("remove system ability failed"); diff --git a/test/unittests/cloud_file_kit_inner/data_sync/sync_state_manager_test.cpp b/test/unittests/cloud_file_kit_inner/data_sync/sync_state_manager_test.cpp index c6a59c7adfaaef4caa5b106401d391dc26007e18..36d1b2371820e30ef85d56cb7e1015c29e13aa3b 100644 --- a/test/unittests/cloud_file_kit_inner/data_sync/sync_state_manager_test.cpp +++ b/test/unittests/cloud_file_kit_inner/data_sync/sync_state_manager_test.cpp @@ -643,7 +643,7 @@ HWTEST_F(SyncStateManagerTest, CheckMediaLibCleaningTest_007, TestSize.Level1) CloudStatus::isStopSync_.store(false); std::shared_ptr systemMock = std::make_shared(); ISystem::system_ = systemMock; - uint64_t curTime = GetCurrentTimeStampMs() - TWELVE_HOURS_MILLISECOND; + uint64_t curTime = GetCurrentTimeStampMs() - SIX_HOURS_MILLISECOND; EXPECT_CALL(*systemMock, GetParameter(_, _)).WillRepeatedly(Return(std::to_string(curTime))); EXPECT_CALL(*systemMock, SetParameter(_, _)).WillRepeatedly(Return(true)); SyncStateManager syncStateManager; @@ -708,7 +708,7 @@ HWTEST_F(SyncStateManagerTest, CheckMediaLibCleaningTest_010, TestSize.Level1) CloudStatus::isStopSync_.store(false); std::shared_ptr systemMock = std::make_shared(); ISystem::system_ = systemMock; - uint64_t curTime = GetCurrentTimeStampMs() - TWELVE_HOURS_MILLISECOND + 50000; + uint64_t curTime = GetCurrentTimeStampMs() - SIX_HOURS_MILLISECOND + 50000; EXPECT_CALL(*systemMock, GetParameter(_, _)).WillOnce(Return(std::to_string(curTime))); SyncStateManager syncStateManager; bool ret = syncStateManager.CheckMediaLibCleaning(); diff --git a/test/unittests/cloudsync_sa/mock/data_ability_observer_stub.cpp b/test/unittests/cloudsync_sa/mock/data_ability_observer_stub.cpp index 6a7b78f9d35d82fa6aed38e9a69006c8b56294b4..67138d96c094cfb211984c809107d305c8a83818 100644 --- a/test/unittests/cloudsync_sa/mock/data_ability_observer_stub.cpp +++ b/test/unittests/cloudsync_sa/mock/data_ability_observer_stub.cpp @@ -15,12 +15,12 @@ #include "data_ability_observer_stub.h" +#include "common_utils.h" +#include "dataobs_mgr_changeinfo.h" #include "hilog_tag_wrapper.h" #include "hilog_wrapper.h" #include "ipc_skeleton.h" -#include "common_utils.h" #include "string_ex.h" -#include "dataobs_mgr_changeinfo.h" namespace OHOS { namespace AAFwk { diff --git a/test/unittests/cloudsync_sa/sync_rule/BUILD.gn b/test/unittests/cloudsync_sa/sync_rule/BUILD.gn index b3b3e56cd5cdb4206d848c056a3bb082572bcfe0..c1ffceb09bc045e29f14755254ca25ca3826c7ad 100644 --- a/test/unittests/cloudsync_sa/sync_rule/BUILD.gn +++ b/test/unittests/cloudsync_sa/sync_rule/BUILD.gn @@ -490,6 +490,7 @@ ohos_unittest("user_status_listener_test") { external_deps = [ "ability_base:want", + "ability_runtime:dataobs_manager", "c_utils:utils", "common_event_service:cesfwk_innerkits", "dsoftbus:softbus_client", diff --git a/test/unittests/cloudsync_sa/sync_rule/settings_data_manager_test.cpp b/test/unittests/cloudsync_sa/sync_rule/settings_data_manager_test.cpp index 6454db279f8bddfe4df396188866ffd14fd10c13..bc021ae0a813e476b49feae3bace4c21f8c3db5a 100644 --- a/test/unittests/cloudsync_sa/sync_rule/settings_data_manager_test.cpp +++ b/test/unittests/cloudsync_sa/sync_rule/settings_data_manager_test.cpp @@ -70,6 +70,32 @@ void SettingsDataManagerTest::SetUp(void) void SettingsDataManagerTest::TearDown(void) {} +HWTEST_F(SettingsDataManagerTest, UnregisterObserverTest000, TestSize.Level1) +{ + GTEST_LOG_(INFO) << "UnregisterObserverTest000 Start"; + DataShareResultSetMock::proxy_ = nullptr; + SettingsDataManager::UnregisterObserver(); + EXPECT_EQ(SettingsDataManager::SyncSwitchObserver_, nullptr); + EXPECT_EQ(SettingsDataManager::NetworkConnectionObserver_, nullptr); + EXPECT_EQ(SettingsDataManager::MobileDataSyncObserver_, nullptr); + EXPECT_EQ(SettingsDataManager::LocalSpaceFreeObserver_, nullptr); + EXPECT_EQ(SettingsDataManager::LocalSpaceDaysObserver_, nullptr); + GTEST_LOG_(INFO) << "UnregisterObserverTest000 End"; +} + +HWTEST_F(SettingsDataManagerTest, InitSettingsDataManagerTest001, TestSize.Level1) +{ + GTEST_LOG_(INFO) << "InitSettingsDataManagerTest001 Start"; + DataShareResultSetMock::proxy_ = nullptr; + SettingsDataManager::InitSettingsDataManager(); + EXPECT_NE(SettingsDataManager::SyncSwitchObserver_, nullptr); + EXPECT_NE(SettingsDataManager::NetworkConnectionObserver_, nullptr); + EXPECT_NE(SettingsDataManager::MobileDataSyncObserver_, nullptr); + EXPECT_NE(SettingsDataManager::LocalSpaceFreeObserver_, nullptr); + EXPECT_NE(SettingsDataManager::LocalSpaceDaysObserver_, nullptr); + GTEST_LOG_(INFO) << "InitSettingsDataManagerTest001 End"; +} + HWTEST_F(SettingsDataManagerTest, QueryParamInSettingsDataTest001, TestSize.Level1) { GTEST_LOG_(INFO) << "QueryParamInSettingsDataTest001 Start"; @@ -508,8 +534,9 @@ HWTEST_F(SettingsDataManagerTest, RegisterObserverTest001, TestSize.Level1) GTEST_LOG_(INFO) << "RegisterObserverTest001 Start"; EXPECT_CALL(*dataShareHelperMock_, Creator(_, _, _)).WillOnce(Return(nullptr)); EXPECT_CALL(*dataShareHelperMock_, Query(_, _, _, _)).Times(0); - SettingsDataManager::RegisterObserver(""); - EXPECT_TRUE(true); + sptr dataObserver = + sptr(new (std::nothrow) SettingsDataObserver("")); + SettingsDataManager::RegisterObserver("", dataObserver); GTEST_LOG_(INFO) << "RegisterObserverTest001 End"; } @@ -520,8 +547,9 @@ HWTEST_F(SettingsDataManagerTest, RegisterObserverTest002, TestSize.Level1) std::shared_ptr dataShareHelper = std::make_shared(); EXPECT_CALL(*dataShareHelperMock_, Creator(_, _, _)).WillOnce(Return(dataShareHelper)); EXPECT_CALL(*dataShareHelperMock_, Query(_, _, _, _)).Times(0); - SettingsDataManager::RegisterObserver(""); - EXPECT_TRUE(true); + sptr dataObserver = + sptr(new (std::nothrow) SettingsDataObserver("")); + SettingsDataManager::RegisterObserver("", dataObserver); GTEST_LOG_(INFO) << "RegisterObserverTest002 End"; } @@ -531,8 +559,9 @@ HWTEST_F(SettingsDataManagerTest, RegisterObserverTest003, TestSize.Level1) GTEST_LOG_(INFO) << "RegisterObserverTest003 Start"; EXPECT_CALL(*dataShareHelperMock_, Creator(_, _, _)).WillOnce(Return(nullptr)); EXPECT_CALL(*dataShareHelperMock_, Query(_, _, _, _)).Times(0); - SettingsDataManager::RegisterObserver("", nullptr); - EXPECT_TRUE(true); + sptr dataObserver = + sptr(new (std::nothrow) SettingsDataObserver("")); + SettingsDataManager::RegisterObserver("", dataObserver); GTEST_LOG_(INFO) << "RegisterObserverTest003 End"; } @@ -543,19 +572,33 @@ HWTEST_F(SettingsDataManagerTest, RegisterObserverTest004, TestSize.Level1) std::shared_ptr dataShareHelper = std::make_shared(); EXPECT_CALL(*dataShareHelperMock_, Creator(_, _, _)).WillOnce(Return(dataShareHelper)); EXPECT_CALL(*dataShareHelperMock_, Query(_, _, _, _)).Times(0); - SettingsDataManager::RegisterObserver("", nullptr); - EXPECT_TRUE(true); + sptr dataObserver = + sptr(new (std::nothrow) SettingsDataObserver("")); + SettingsDataManager::RegisterObserver("", dataObserver); GTEST_LOG_(INFO) << "RegisterObserverTest004 End"; } +HWTEST_F(SettingsDataManagerTest, RegisterObserverTest005, TestSize.Level1) +{ + GTEST_LOG_(INFO) << "RegisterObserverTest005 Start"; + std::shared_ptr dataShareHelper = std::make_shared(); + EXPECT_CALL(*dataShareHelperMock_, Creator(_, _, _)).Times(0); + EXPECT_CALL(*dataShareHelperMock_, Query(_, _, _, _)).Times(0); + sptr dataObserver = nullptr; + SettingsDataManager::RegisterObserver("", dataObserver); + + GTEST_LOG_(INFO) << "RegisterObserverTest005 End"; +} + HWTEST_F(SettingsDataManagerTest, UnregisterObserverTest001, TestSize.Level1) { GTEST_LOG_(INFO) << "UnregisterObserverTest001 Start"; EXPECT_CALL(*dataShareHelperMock_, Creator(_, _, _)).WillOnce(Return(nullptr)); EXPECT_CALL(*dataShareHelperMock_, Query(_, _, _, _)).Times(0); - SettingsDataManager::UnregisterObserver(""); - EXPECT_TRUE(true); + sptr dataObserver = + sptr(new (std::nothrow) SettingsDataObserver("")); + SettingsDataManager::UnregisterObserver("", dataObserver); GTEST_LOG_(INFO) << "UnregisterObserverTest001 End"; } @@ -566,12 +609,25 @@ HWTEST_F(SettingsDataManagerTest, UnregisterObserverTest002, TestSize.Level1) std::shared_ptr dataShareHelper = std::make_shared(); EXPECT_CALL(*dataShareHelperMock_, Creator(_, _, _)).WillOnce(Return(dataShareHelper)); EXPECT_CALL(*dataShareHelperMock_, Query(_, _, _, _)).Times(0); - SettingsDataManager::UnregisterObserver(""); - EXPECT_TRUE(true); + sptr dataObserver = + sptr(new (std::nothrow) SettingsDataObserver("")); + SettingsDataManager::UnregisterObserver("", dataObserver); GTEST_LOG_(INFO) << "UnregisterObserverTest002 End"; } +HWTEST_F(SettingsDataManagerTest, UnregisterObserverTest003, TestSize.Level1) +{ + GTEST_LOG_(INFO) << "UnregisterObserverTest003 Start"; + std::shared_ptr dataShareHelper = std::make_shared(); + EXPECT_CALL(*dataShareHelperMock_, Creator(_, _, _)).Times(0); + EXPECT_CALL(*dataShareHelperMock_, Query(_, _, _, _)).Times(0); + sptr dataObserver = nullptr; + SettingsDataManager::UnregisterObserver("", dataObserver); + + GTEST_LOG_(INFO) << "UnregisterObserverTest003 End"; +} + HWTEST_F(SettingsDataManagerTest, QueryTest001, TestSize.Level1) { GTEST_LOG_(INFO) << "QueryTest001 Start"; diff --git a/utils/system/src/dfsu_access_token_helper.cpp b/utils/system/src/dfsu_access_token_helper.cpp index a8209de3aad5355b50e984d99ccf8d7121a8f526..cbccb9ff3efdef9a5213c6bb1def52c42d17e3cd 100644 --- a/utils/system/src/dfsu_access_token_helper.cpp +++ b/utils/system/src/dfsu_access_token_helper.cpp @@ -18,12 +18,12 @@ #include "dfs_error.h" #include "dfsu_access_token_helper.h" #include "ipc_skeleton.h" +#include "os_account_manager.h" #include "tokenid_kit.h" #include "uri_permission_manager_client.h" #include "uri.h" #include "utils_log.h" #include "want.h" -#include "os_account_manager.h" namespace OHOS::FileManagement { using namespace std;