From c2174d91b3c0cf8ed07a6831c9de268b9823af8f Mon Sep 17 00:00:00 2001 From: fengyang Date: Wed, 18 Jun 2025 15:03:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=8B=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fengyang --- test/unittest/bundle_active_total_test.cpp | 1 + .../device_usage_statistics_service_test.cpp | 53 ++++++++++--------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/test/unittest/bundle_active_total_test.cpp b/test/unittest/bundle_active_total_test.cpp index 49b1ef5..c2c5426 100644 --- a/test/unittest/bundle_active_total_test.cpp +++ b/test/unittest/bundle_active_total_test.cpp @@ -71,6 +71,7 @@ HWTEST_F(BundleActiveTotalTest, BundleActiveAccountHelperTest_001, Function | Me { std::vector activatedOsAccountIds; BundleActiveAccountHelper::GetActiveUserId(activatedOsAccountIds); + SUCCEED(); } diff --git a/test/unittest/device_usage_statistics_service_test.cpp b/test/unittest/device_usage_statistics_service_test.cpp index f45ba49..b01779c 100644 --- a/test/unittest/device_usage_statistics_service_test.cpp +++ b/test/unittest/device_usage_statistics_service_test.cpp @@ -126,53 +126,54 @@ 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"}; - DelayedSingleton::GetInstance()->ShellDump(dumpOption, dumpInfo); + bundleActiveService->ShellDump(dumpOption, dumpInfo); 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); } /* @@ -184,13 +185,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); } @@ -203,25 +205,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); } /* -- Gitee