From f68e30583a7b4c35bbad07ba5d31b59aa7beb76b Mon Sep 17 00:00:00 2001 From: "yupeng74@huawei.com" Date: Thu, 12 Jan 2023 19:45:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTDD=20crash=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yupeng74@huawei.com --- .../device_usage_statistics_mock_test.cpp | 68 +++++++++---------- .../device_usage_statistics_service_test.cpp | 58 ++++++++-------- 2 files changed, 59 insertions(+), 67 deletions(-) diff --git a/test/unittest/device_usage_statistics_mock_test.cpp b/test/unittest/device_usage_statistics_mock_test.cpp index 2623151..69c45fc 100644 --- a/test/unittest/device_usage_statistics_mock_test.cpp +++ b/test/unittest/device_usage_statistics_mock_test.cpp @@ -118,11 +118,13 @@ HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_GetBundleA HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_GetBundleMgrProxy_001, Function | MediumTest | Level0) { - auto service = std::make_shared(); std::string bundleName; bool isBundleIdle = false; - EXPECT_NE(service->IsBundleIdle(isBundleIdle, bundleName, -1), ERR_OK); - EXPECT_NE(service->CheckBundleIsSystemAppAndHasPermission(100, 100000), ERR_OK); + ErrCode code = DelayedSingleton::GetInstance()->IsBundleIdle(isBundleIdle, bundleName, -1); + EXPECT_NE(code, ERR_OK); + + code = DelayedSingleton::GetInstance()->CheckBundleIsSystemAppAndHasPermission(100, 100000); + EXPECT_NE(code, ERR_OK); } /* @@ -134,10 +136,10 @@ HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_GetBundleM HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_QueryDeviceEventStats_001, Function | MediumTest | Level0) { - auto service = std::make_shared(); - std::vector eventStats; - EXPECT_NE(service->QueryDeviceEventStats(0, LARGE_NUM, eventStats, -1), ERR_OK); + ErrCode code = + DelayedSingleton::GetInstance()->QueryDeviceEventStats(0, LARGE_NUM, eventStats, -1); + EXPECT_NE(code, ERR_OK); } /* @@ -149,10 +151,10 @@ HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_QueryDevic HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_QueryNotificationEventStats_001, Function | MediumTest | Level0) { - auto service = std::make_shared(); - std::vector eventStats; - EXPECT_NE(service->QueryNotificationEventStats(0, LARGE_NUM, eventStats, -1), ERR_OK); + ErrCode code = + DelayedSingleton::GetInstance()->QueryNotificationEventStats(0, LARGE_NUM, eventStats, -1); + EXPECT_NE(code, ERR_OK); } /* @@ -164,13 +166,11 @@ HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_QueryNotif HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_QueryModuleUsageRecords_001, Function | MediumTest | Level0) { - auto service = std::make_shared(); - std::vector records; - EXPECT_NE(service->QueryModuleUsageRecords(1000, records, -1), ERR_OK); + EXPECT_NE(DelayedSingleton::GetInstance()->QueryModuleUsageRecords(1000, records, -1), ERR_OK); BundleActiveModuleRecord bundleActiveModuleRecord; - service->QueryModuleRecordInfos(bundleActiveModuleRecord); + DelayedSingleton::GetInstance()->QueryModuleRecordInfos(bundleActiveModuleRecord); } /* @@ -182,12 +182,10 @@ HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_QueryModul HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_QueryAppGroup_001, Function | MediumTest | Level0) { - auto service = std::make_shared(); - int32_t appGroup; std::string bundleName; - EXPECT_NE(service->QueryAppGroup(appGroup, bundleName, -1), ERR_OK); - EXPECT_NE(service->QueryAppGroup(appGroup, bundleName, 100), ERR_OK); + EXPECT_NE(DelayedSingleton::GetInstance()->QueryAppGroup(appGroup, bundleName, -1), ERR_OK); + EXPECT_NE(DelayedSingleton::GetInstance()->QueryAppGroup(appGroup, bundleName, 100), ERR_OK); } /* @@ -199,12 +197,10 @@ HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_QueryAppGr HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_SetAppGroup_001, Function | MediumTest | Level0) { - auto service = std::make_shared(); - int32_t appGroup = 100; std::string bundleName; - EXPECT_NE(service->SetAppGroup(bundleName, appGroup, -1), ERR_OK); - EXPECT_NE(service->SetAppGroup(bundleName, appGroup, 100), ERR_OK); + EXPECT_NE(DelayedSingleton::GetInstance()->SetAppGroup(bundleName, appGroup, -1), ERR_OK); + EXPECT_NE(DelayedSingleton::GetInstance()->SetAppGroup(bundleName, appGroup, 100), ERR_OK); } /* @@ -216,12 +212,10 @@ HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_SetAppGrou HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_AppGroupCallback_001, Function | MediumTest | Level0) { - auto service = std::make_shared(); - sptr observer = nullptr; - service->bundleActiveCore_ = nullptr; - EXPECT_NE(service->RegisterAppGroupCallBack(observer), ERR_OK); - EXPECT_NE(service->UnRegisterAppGroupCallBack(observer), ERR_OK); + DelayedSingleton::GetInstance()->bundleActiveCore_ = nullptr; + EXPECT_NE(DelayedSingleton::GetInstance()->RegisterAppGroupCallBack(observer), ERR_OK); + EXPECT_NE(DelayedSingleton::GetInstance()->UnRegisterAppGroupCallBack(observer), ERR_OK); } /* @@ -233,11 +227,13 @@ HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_AppGroupCa HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_QueryBundleEvents_001, Function | MediumTest | Level0) { - auto service = std::make_shared(); - std::vector bundleActiveEvents; - EXPECT_NE(service->QueryBundleEvents(bundleActiveEvents, 0, LARGE_NUM, -1), ERR_OK); - EXPECT_NE(service->QueryCurrentBundleEvents(bundleActiveEvents, 0, LARGE_NUM), ERR_OK); + ErrCode code = DelayedSingleton::GetInstance() + ->QueryBundleEvents(bundleActiveEvents, 0, LARGE_NUM, -1); + EXPECT_NE(code, ERR_OK); + code = DelayedSingleton::GetInstance() + ->QueryCurrentBundleEvents(bundleActiveEvents, 0, LARGE_NUM); + EXPECT_NE(code, ERR_OK); } /* @@ -249,10 +245,10 @@ HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_QueryBundl HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_QueryBundleStatsInfoByInterval_001, Function | MediumTest | Level0) { - auto service = std::make_shared(); - std::vector packageStats; - EXPECT_NE(service->QueryBundleStatsInfoByInterval(packageStats, 0, 0, LARGE_NUM, -1), ERR_OK); + ErrCode code = DelayedSingleton::GetInstance() + ->QueryBundleStatsInfoByInterval(packageStats, 0, 0, LARGE_NUM, -1); + EXPECT_NE(code, ERR_OK); } /* @@ -264,10 +260,10 @@ HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_QueryBundl HWTEST_F(DeviceUsageStatisticsMockTest, DeviceUsageStatisticsMockTest_QueryBundleStatsInfos_001, Function | MediumTest | Level0) { - auto service = std::make_shared(); - std::vector packageStats; - EXPECT_NE(service->QueryBundleStatsInfos(packageStats, 0, 0, LARGE_NUM), ERR_OK); + ErrCode code = DelayedSingleton::GetInstance() + ->QueryBundleStatsInfos(packageStats, 0, 0, LARGE_NUM); + EXPECT_NE(code, ERR_OK); } /* diff --git a/test/unittest/device_usage_statistics_service_test.cpp b/test/unittest/device_usage_statistics_service_test.cpp index 7013f06..d1654ec 100644 --- a/test/unittest/device_usage_statistics_service_test.cpp +++ b/test/unittest/device_usage_statistics_service_test.cpp @@ -93,55 +93,53 @@ HWTEST_F(DeviceUsageStatisticsServiceTest, DeviceUsageStatisticsServiceTest_GetS */ HWTEST_F(DeviceUsageStatisticsServiceTest, DeviceUsageStatisticsServiceTest_dump_001, Function | MediumTest | Level0) { - auto service = std::make_shared(); - service->bundleActiveCore_ = std::make_shared(); - service->bundleActiveCore_->Init(); + DelayedSingleton::GetInstance()->bundleActiveCore_ = std::make_shared(); + DelayedSingleton::GetInstance()->bundleActiveCore_->Init(); BUNDLE_ACTIVE_LOGI("DeviceUsageStatisticsServiceTest create BundleActiveService!"); std::vector dumpOption{"-A", "Events"}; std::vector dumpInfo; - service->ShellDump(dumpOption, dumpInfo); + DelayedSingleton::GetInstance()->ShellDump(dumpOption, dumpInfo); dumpOption.clear(); dumpInfo.clear(); dumpOption = {"-A", "Events", "0", "20000000000000", "100"}; - service->ShellDump(dumpOption, dumpInfo); + DelayedSingleton::GetInstance()->ShellDump(dumpOption, dumpInfo); dumpOption.clear(); dumpInfo.clear(); dumpOption = {"-A", "PackageUsage"}; - service->ShellDump(dumpOption, dumpInfo); + DelayedSingleton::GetInstance()->ShellDump(dumpOption, dumpInfo); dumpOption.clear(); dumpInfo.clear(); dumpOption = {"-A", "PackageUsage", "1", "0", "20000000000000", "100"}; - service->ShellDump(dumpOption, dumpInfo); + DelayedSingleton::GetInstance()->ShellDump(dumpOption, dumpInfo); dumpOption.clear(); dumpInfo.clear(); dumpOption = {"-A", "ModuleUsage"}; - service->ShellDump(dumpOption, dumpInfo); + DelayedSingleton::GetInstance()->ShellDump(dumpOption, dumpInfo); dumpOption.clear(); dumpInfo.clear(); dumpOption = {"-A", "ModuleUsage", "1", "100"}; - service->ShellDump(dumpOption, dumpInfo); + DelayedSingleton::GetInstance()->ShellDump(dumpOption, dumpInfo); std::vector args; - service->Dump(-1, args); + DelayedSingleton::GetInstance()->Dump(-1, args); args.clear(); args = {to_utf16("-h")}; - service->Dump(-1, args); + DelayedSingleton::GetInstance()->Dump(-1, args); args.clear(); args = {to_utf16("-A")}; - service->Dump(-1, args); + DelayedSingleton::GetInstance()->Dump(-1, args); args.clear(); args = {to_utf16("-D")}; - service->Dump(-1, args); - EXPECT_TRUE(service!=nullptr); + DelayedSingleton::GetInstance()->Dump(-1, args); } /* @@ -153,15 +151,14 @@ HWTEST_F(DeviceUsageStatisticsServiceTest, DeviceUsageStatisticsServiceTest_dump HWTEST_F(DeviceUsageStatisticsServiceTest, DeviceUsageStatisticsServiceTest_QueryModuleUsageRecords_001, Function | MediumTest | Level0) { - auto service = std::make_shared(); std::vector results; int32_t maxNum = 0; - ErrCode errCode = service->QueryModuleUsageRecords(maxNum, results, 100); - EXPECT_NE(errCode, 0); + ErrCode code = DelayedSingleton::GetInstance()->QueryModuleUsageRecords(maxNum, results, 100); + EXPECT_NE(code, 0); maxNum = 1001; - errCode = service->QueryModuleUsageRecords(maxNum, results, 100); - EXPECT_NE(errCode, 0); + code = DelayedSingleton::GetInstance()->QueryModuleUsageRecords(maxNum, results, 100); + EXPECT_NE(code, 0); } /* @@ -173,26 +170,25 @@ HWTEST_F(DeviceUsageStatisticsServiceTest, DeviceUsageStatisticsServiceTest_Quer HWTEST_F(DeviceUsageStatisticsServiceTest, DeviceUsageStatisticsServiceTest_AppGroupCallback_001, Function | MediumTest | Level0) { - auto service = std::make_shared(); BUNDLE_ACTIVE_LOGI("DeviceUsageStatisticsServiceTest create BundleActiveService!"); sptr observer = new (std::nothrow) TestServiceAppGroupChangeCallback(); - service->bundleActiveCore_ = std::make_shared(); - EXPECT_EQ(service->RegisterAppGroupCallBack(observer), ERR_OK); - EXPECT_NE(service->RegisterAppGroupCallBack(observer), ERR_OK); - service->bundleActiveCore_->AddObserverDeathRecipient(observer); + 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); - EXPECT_EQ(service->UnRegisterAppGroupCallBack(observer), ERR_OK); - EXPECT_NE(service->UnRegisterAppGroupCallBack(observer), ERR_OK); + EXPECT_EQ(DelayedSingleton::GetInstance()->UnRegisterAppGroupCallBack(observer), ERR_OK); + EXPECT_NE(DelayedSingleton::GetInstance()->UnRegisterAppGroupCallBack(observer), ERR_OK); observer = nullptr; - EXPECT_NE(service->RegisterAppGroupCallBack(observer), ERR_OK); + EXPECT_NE(DelayedSingleton::GetInstance()->RegisterAppGroupCallBack(observer), ERR_OK); - service->bundleActiveCore_->AddObserverDeathRecipient(observer); - service->bundleActiveCore_->RemoveObserverDeathRecipient(observer); + DelayedSingleton::GetInstance()->bundleActiveCore_->AddObserverDeathRecipient(observer); + DelayedSingleton::GetInstance()->bundleActiveCore_->RemoveObserverDeathRecipient(observer); wptr remote = nullptr; - service->bundleActiveCore_->OnObserverDied(remote); - service->bundleActiveCore_->OnObserverDiedInner(remote); + DelayedSingleton::GetInstance()->bundleActiveCore_->OnObserverDied(remote); + DelayedSingleton::GetInstance()->bundleActiveCore_->OnObserverDiedInner(remote); } /* -- Gitee