From f4b580331922d5bce6eb8532d3ed9748a2e1b4ff Mon Sep 17 00:00:00 2001 From: fengyang Date: Mon, 24 Mar 2025 14:30:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E5=A4=B1=E8=B4=A5=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=96=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fengyang --- test/unittest/bundle_active_usage_database_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unittest/bundle_active_usage_database_test.cpp b/test/unittest/bundle_active_usage_database_test.cpp index 26359b2..1be5d84 100644 --- a/test/unittest/bundle_active_usage_database_test.cpp +++ b/test/unittest/bundle_active_usage_database_test.cpp @@ -230,9 +230,9 @@ HWTEST_F(BundleActiveUsageDatabaseTest, BundleActiveUsageDatabaseTest_CreateReco std::vector queryCondition; std::string queryPackageSql; auto database = std::make_shared(); - database->sortedTableArray_ = {{0}, {1}}; + database->sortedTableArray_ = {{0}, {1}, {2}}; database->GetQuerySqlCommand(0, 1, 2, 0, 0, 1, 10, queryCondition, queryPackageSql); - EXPECT_NE(database, nullptr); + EXPECT_TRUE(!queryPackageSql.empty()); } /* -- Gitee From 1be15bbdf0227a8920f573cd91c038de4299a961 Mon Sep 17 00:00:00 2001 From: fengyang Date: Mon, 24 Mar 2025 17:16:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fengyang --- test/unittest/device_usage_statistics_service_test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unittest/device_usage_statistics_service_test.cpp b/test/unittest/device_usage_statistics_service_test.cpp index b6d5970..f6f9518 100644 --- a/test/unittest/device_usage_statistics_service_test.cpp +++ b/test/unittest/device_usage_statistics_service_test.cpp @@ -76,6 +76,7 @@ void DeviceUsageStatisticsServiceTest::SetUpTestCase(void) void DeviceUsageStatisticsServiceTest::TearDownTestCase(void) { bundleActiveCore_->bundleGroupHandler_->ffrtQueue_.reset(); + DelayedSingleton::DestroyInstance(); int64_t sleepTime = 10; std::this_thread::sleep_for(std::chrono::seconds(sleepTime)); } -- Gitee From 15619b3fb617446a4038415fb1128b55fa1c4ae1 Mon Sep 17 00:00:00 2001 From: fengyang Date: Mon, 24 Mar 2025 20:58:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fengyang --- .../device_usage_statistics_service_test.cpp | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/test/unittest/device_usage_statistics_service_test.cpp b/test/unittest/device_usage_statistics_service_test.cpp index f6f9518..0347ea5 100644 --- a/test/unittest/device_usage_statistics_service_test.cpp +++ b/test/unittest/device_usage_statistics_service_test.cpp @@ -76,7 +76,6 @@ void DeviceUsageStatisticsServiceTest::SetUpTestCase(void) void DeviceUsageStatisticsServiceTest::TearDownTestCase(void) { bundleActiveCore_->bundleGroupHandler_->ffrtQueue_.reset(); - DelayedSingleton::DestroyInstance(); int64_t sleepTime = 10; std::this_thread::sleep_for(std::chrono::seconds(sleepTime)); } @@ -129,8 +128,9 @@ HWTEST_F(DeviceUsageStatisticsServiceTest, DeviceUsageStatisticsServiceTest_GetS HWTEST_F(DeviceUsageStatisticsServiceTest, DeviceUsageStatisticsServiceTest_GetNameAndIndexForUid_001, Function | MediumTest | Level0) { + auto bundleActiveService = std::make_shared(); int32_t uid = 10; - int32_t result = DelayedSingleton::GetInstance()->GetNameAndIndexForUid(uid); + int32_t result = bundleActiveService->GetNameAndIndexForUid(uid); EXPECT_TRUE(result == -1); } @@ -142,55 +142,56 @@ HWTEST_F(DeviceUsageStatisticsServiceTest, DeviceUsageStatisticsServiceTest_GetS */ HWTEST_F(DeviceUsageStatisticsServiceTest, DeviceUsageStatisticsServiceTest_dump_001, Function | MediumTest | Level0) { - DelayedSingleton::GetInstance()->bundleActiveCore_ = std::make_shared(); - DelayedSingleton::GetInstance()->bundleActiveCore_->Init(); + auto bundleActiveService = std::make_shared(); + bundleActiveService->bundleActiveCore_ = std::make_shared(); + bundleActiveService->bundleActiveCore_->Init(); BUNDLE_ACTIVE_LOGI("DeviceUsageStatisticsServiceTest create BundleActiveService!"); std::vector dumpOption{"-A", "Events"}; std::vector dumpInfo; - DelayedSingleton::GetInstance()->ShellDump(dumpOption, dumpInfo); + bundleActiveService->ShellDump(dumpOption, dumpInfo); dumpOption.clear(); dumpInfo.clear(); dumpOption = {"-A", "Events", "0", "20000000000000", "100"}; - DelayedSingleton::GetInstance()->ShellDump(dumpOption, dumpInfo); + bundleActiveService->ShellDump(dumpOption, dumpInfo); dumpOption.clear(); dumpInfo.clear(); dumpOption = {"-A", "PackageUsage"}; - DelayedSingleton::GetInstance()->ShellDump(dumpOption, dumpInfo); + bundleActiveService->ShellDump(dumpOption, dumpInfo); dumpOption.clear(); dumpInfo.clear(); dumpOption = {"-A", "PackageUsage", "1", "0", "20000000000000", "100"}; - DelayedSingleton::GetInstance()->ShellDump(dumpOption, dumpInfo); + bundleActiveService->ShellDump(dumpOption, dumpInfo); dumpOption.clear(); dumpInfo.clear(); dumpOption = {"-A", "ModuleUsage"}; int32_t ret; - ret = DelayedSingleton::GetInstance()->ShellDump(dumpOption, dumpInfo); + ret = bundleActiveService->ShellDump(dumpOption, dumpInfo); EXPECT_TRUE(ret == -1); dumpOption.clear(); dumpInfo.clear(); dumpOption = {"-A", "ModuleUsage", "1", "100"}; - DelayedSingleton::GetInstance()->ShellDump(dumpOption, dumpInfo); + bundleActiveService->ShellDump(dumpOption, dumpInfo); std::vector args; - DelayedSingleton::GetInstance()->Dump(-1, args); + bundleActiveService->Dump(-1, args); args.clear(); args = {to_utf16("-h")}; - DelayedSingleton::GetInstance()->Dump(-1, args); + bundleActiveService->Dump(-1, args); args.clear(); args = {to_utf16("-A")}; - DelayedSingleton::GetInstance()->Dump(-1, args); + bundleActiveService->Dump(-1, args); args.clear(); args = {to_utf16("-D")}; - DelayedSingleton::GetInstance()->Dump(-1, args); + bundleActiveService->Dump(-1, args); } /* @@ -202,13 +203,14 @@ HWTEST_F(DeviceUsageStatisticsServiceTest, DeviceUsageStatisticsServiceTest_dump HWTEST_F(DeviceUsageStatisticsServiceTest, DeviceUsageStatisticsServiceTest_QueryModuleUsageRecords_001, Function | MediumTest | Level0) { + auto bundleActiveService = std::make_shared(); std::vector results; int32_t maxNum = 0; - ErrCode code = DelayedSingleton::GetInstance()->QueryModuleUsageRecords(maxNum, results, 100); + ErrCode code = bundleActiveService->QueryModuleUsageRecords(maxNum, results, 100); EXPECT_NE(code, 0); maxNum = 1001; - code = DelayedSingleton::GetInstance()->QueryModuleUsageRecords(maxNum, results, 100); + code = bundleActiveService->QueryModuleUsageRecords(maxNum, results, 100); EXPECT_NE(code, 0); } @@ -221,25 +223,26 @@ HWTEST_F(DeviceUsageStatisticsServiceTest, DeviceUsageStatisticsServiceTest_Quer HWTEST_F(DeviceUsageStatisticsServiceTest, DeviceUsageStatisticsServiceTest_AppGroupCallback_001, Function | MediumTest | Level0) { + auto bundleActiveService = std::make_shared(); BUNDLE_ACTIVE_LOGI("DeviceUsageStatisticsServiceTest create BundleActiveService!"); sptr observer = new (std::nothrow) TestServiceAppGroupChangeCallback(); - DelayedSingleton::GetInstance()->bundleActiveCore_ = std::make_shared(); - EXPECT_EQ(DelayedSingleton::GetInstance()->RegisterAppGroupCallBack(observer), ERR_OK); - EXPECT_NE(DelayedSingleton::GetInstance()->RegisterAppGroupCallBack(observer), ERR_OK); - DelayedSingleton::GetInstance()->bundleActiveCore_->AddObserverDeathRecipient(observer); + bundleActiveService->bundleActiveCore_ = std::make_shared(); + EXPECT_EQ(bundleActiveService->RegisterAppGroupCallBack(observer), ERR_OK); + EXPECT_NE(bundleActiveService->RegisterAppGroupCallBack(observer), ERR_OK); + bundleActiveService->bundleActiveCore_->AddObserverDeathRecipient(observer); - EXPECT_EQ(DelayedSingleton::GetInstance()->UnRegisterAppGroupCallBack(observer), ERR_OK); - EXPECT_NE(DelayedSingleton::GetInstance()->UnRegisterAppGroupCallBack(observer), ERR_OK); + EXPECT_EQ(bundleActiveService->UnRegisterAppGroupCallBack(observer), ERR_OK); + EXPECT_NE(bundleActiveService->UnRegisterAppGroupCallBack(observer), ERR_OK); observer = nullptr; - EXPECT_NE(DelayedSingleton::GetInstance()->RegisterAppGroupCallBack(observer), ERR_OK); + EXPECT_NE(bundleActiveService->RegisterAppGroupCallBack(observer), ERR_OK); - DelayedSingleton::GetInstance()->bundleActiveCore_->AddObserverDeathRecipient(observer); - DelayedSingleton::GetInstance()->bundleActiveCore_->RemoveObserverDeathRecipient(observer); + bundleActiveService->bundleActiveCore_->AddObserverDeathRecipient(observer); + bundleActiveService->bundleActiveCore_->RemoveObserverDeathRecipient(observer); wptr remote = nullptr; - DelayedSingleton::GetInstance()->bundleActiveCore_->OnObserverDied(remote); - DelayedSingleton::GetInstance()->bundleActiveCore_->OnObserverDiedInner(remote); + bundleActiveService->bundleActiveCore_->OnObserverDied(remote); + bundleActiveService->bundleActiveCore_->OnObserverDiedInner(remote); } /* @@ -1447,11 +1450,10 @@ HWTEST_F(DeviceUsageStatisticsServiceTest, DeviceUsageStatisticsServiceTest_Upda std::string bundleName = "defaultBundleName"; std::string moduleName = "defaultModuleName"; std::string formName = "defaultFormName"; - std::vector formValueBuckets; database->InitUsageGroupDatabase(0, true); BundleActiveFormRecord formRecord; auto rdbStore = database->GetBundleActiveRdbStore(0); - database->UpdateFormData(userId, bundleName, moduleName, formRecord, rdbStore, formValueBuckets); + database->UpdateFormData(userId, bundleName, moduleName, formRecord, rdbStore); EXPECT_NE(database, nullptr); } -- Gitee