From b7da60f460539e3b535093f226fcc6952a892c79 Mon Sep 17 00:00:00 2001 From: "yupeng74@huawei.com" Date: Fri, 9 Sep 2022 16:04:55 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=92=8C=E6=B7=BB=E5=8A=A0TDD=E7=94=A8=E4=BE=8B=E8=A6=86?= =?UTF-8?q?=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yupeng74@huawei.com --- .../innerkits/src/bundle_active_client.cpp | 3 ++- .../unittest/device_usage_statistics_test.cpp | 23 +++++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/interfaces/innerkits/src/bundle_active_client.cpp b/interfaces/innerkits/src/bundle_active_client.cpp index 5ea2280..bc98d1d 100644 --- a/interfaces/innerkits/src/bundle_active_client.cpp +++ b/interfaces/innerkits/src/bundle_active_client.cpp @@ -21,6 +21,7 @@ namespace DeviceUsageStats { namespace { const std::string BUNDLE_ACTIVE_CLIENT_NAME = "bundleActiveName"; static const int32_t DELAY_TIME = 5000; + static const int32_t SLEEP_TIME = 1000; } BundleActiveClient& BundleActiveClient::GetInstance() { @@ -226,7 +227,7 @@ void BundleActiveClient::BundleActiveClientDeathRecipient::OnRemoteDied(const wp void BundleActiveClient::BundleActiveClientDeathRecipient::OnServiceDiedInner(const wptr &object) { while (!BundleActiveClient::GetInstance().GetBundleActiveProxy()) { - sleep(1000); + sleep(SLEEP_TIME); } if (observer_) { BundleActiveClient::GetInstance().RegisterGroupCallBack(observer_); diff --git a/test/unittest/device_usage_statistics_test.cpp b/test/unittest/device_usage_statistics_test.cpp index c58abbd..766cd8f 100644 --- a/test/unittest/device_usage_statistics_test.cpp +++ b/test/unittest/device_usage_statistics_test.cpp @@ -32,13 +32,13 @@ using namespace testing::ext; namespace OHOS { namespace DeviceUsageStats { -static std::string DEFAULT_BUNDLENAME = "com.ohos.camera"; -static std::string DEFAULT_MODULENAME = "defaultmodulename"; -static std::string DEFAULT_FORM_NAME = "defaultformname"; +static const std::string DEFAULT_BUNDLENAME = "com.ohos.camera"; +static const std::string DEFAULT_MODULENAME = "defaultmodulename"; +static const std::string DEFAULT_FORM_NAME = "defaultformname"; static int32_t DEFAULT_DIMENSION = 4; static int64_t DEFAULT_FORMID = 1; -static std::string DEFAULT_ABILITYID = "1234"; -static std::string DEFAULT_ABILITYNAME = "testability"; +static const std::string DEFAULT_ABILITYID = "1234"; +static const std::string DEFAULT_ABILITYNAME = "testability"; static int32_t DEFAULT_USERID = 0; static int32_t COMMON_USERID = 100; static int32_t DEFAULT_ERRCODE = 0; @@ -143,6 +143,19 @@ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_QueryPackagesStats EXPECT_EQ(result.size(), 0); } +/* + * @tc.name: DeviceUsageStatisticsTest_QueryCurrentPackageStats_001 + * @tc.desc: querycurrentpackagestats + * @tc.type: FUNC + * @tc.require: issuesI5QJD9 + */ +HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_QueryCurrentPackageStats_001, Function | MediumTest | Level0) +{ + int32_t errCode = 0; + std::vector result = BundleActiveClient::GetInstance().QueryCurrentPackageStats(4, 0, LARGE_NUM); + EXPECT_EQ(result.size(), 0); +} + /* * @tc.name: DeviceUsageStatisticsTest_IsBundleIdle_001 * @tc.desc: isbundleidle -- Gitee From c3a8e7a02c072c79837b9d824398e13a7d1d04a6 Mon Sep 17 00:00:00 2001 From: "yupeng74@huawei.com" Date: Fri, 9 Sep 2022 16:32:30 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=92=8C=E6=B7=BB=E5=8A=A0TDD=E7=94=A8=E4=BE=8B=E8=A6=86?= =?UTF-8?q?=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yupeng74@huawei.com --- .../device_usage_statistics_jsunit.test.js | 96 +++++++++---------- .../unittest/device_usage_statistics_test.cpp | 66 ++++++------- 2 files changed, 81 insertions(+), 81 deletions(-) diff --git a/interfaces/test/unittest/device_usage_statistics_jsunittest/device_usage_statistics_jsunit.test.js b/interfaces/test/unittest/device_usage_statistics_jsunittest/device_usage_statistics_jsunit.test.js index cb8ec05..87a2369 100644 --- a/interfaces/test/unittest/device_usage_statistics_jsunittest/device_usage_statistics_jsunit.test.js +++ b/interfaces/test/unittest/device_usage_statistics_jsunittest/device_usage_statistics_jsunit.test.js @@ -392,42 +392,54 @@ describe("DeviceUsageStatisticsJsTest", function () { /* * @tc.name: DeviceUsageStatisticsJsTest017 - * @tc.desc: test setBundleGroup promise. + * @tc.desc: test registerGroupCallBack promise. * @tc.type: FUNC * @tc.require: SR000H0HAQ AR000H0ROE */ it("DeviceUsageStatisticsJsTest017", 0, async function (done) { console.info('----------------------DeviceUsageStatisticsJsTest017---------------------------'); - let bundleName = 'com.example.deviceUsageStatistics'; - let newGroup = 30; - bundleState.setBundleGroup(bundleName, newGroup).then( res => { - console.info('BUNDLE_ACTIVE setBundleGroup promise success.'); - expect(false).assertEqual(true); + let onBundleGroupChanged = (err,res) =>{ + console.log('BUNDLE_ACTIVE RegisterGroupCallBack callback success.'); + console.log('BUNDLE_ACTIVE RegisterGroupCallBack appUsageOldGroup is : ' + res.appUsageOldGroup); + console.log('BUNDLE_ACTIVE RegisterGroupCallBack appUsageNewGroup is : ' + res.appUsageNewGroup); + console.log('BUNDLE_ACTIVE RegisterGroupCallBack changeReason is : ' + res.changeReason); + console.log('BUNDLE_ACTIVE RegisterGroupCallBack userId is : ' + res.userId); + console.log('BUNDLE_ACTIVE RegisterGroupCallBack bundleName is : ' + res.bundleName); + }; + bundleState.registerGroupCallBack(onBundleGroupChanged).then( res => { + console.info('BUNDLE_ACTIVE RegisterGroupCallBack promise success.'); + expect(true).assertEqual(true); done(); }).catch( err => { - console.info('BUNDLE_ACTIVE setBundleGroup promise failure.'); - expect(true).assertEqual(true); + console.info('BUNDLE_ACTIVE RegisterGroupCallBack promise failure.'); + expect(false).assertEqual(true); done(); }); }) /* * @tc.name: DeviceUsageStatisticsJsTest018 - * @tc.desc: test setBundleGroup callback. + * @tc.desc: test registerGroupCallBack callback. * @tc.type: FUNC * @tc.require: SR000H0HAQ AR000H0ROE */ it("DeviceUsageStatisticsJsTest018", 0, async function (done) { console.info('----------------------DeviceUsageStatisticsJsTest018---------------------------'); - let bundleName = 'com.example.deviceUsageStatistics'; - let newGroup = 30; - bundleState.setBundleGroup(bundleName, newGroup, (err, res) => { + let onBundleGroupChanged = (err,res) =>{ + console.log('BUNDLE_ACTIVE onBundleGroupChanged RegisterGroupCallBack callback success.'); + console.log('BUNDLE_ACTIVE RegisterGroupCallBack appUsageOldGroup is : ' + res.appUsageOldGroup); + console.log('BUNDLE_ACTIVE RegisterGroupCallBack appUsageNewGroup is : ' + res.appUsageNewGroup); + console.log('BUNDLE_ACTIVE RegisterGroupCallBack changeReason is : ' + res.changeReason); + console.log('BUNDLE_ACTIVE RegisterGroupCallBack userId is : ' + res.userId); + console.log('BUNDLE_ACTIVE RegisterGroupCallBack bundleName is : ' + res.bundleName); + }; + bundleState.registerGroupCallBack(onBundleGroupChanged, (err, res) => { if (err) { - console.info('BUNDLE_ACTIVE setBundleGroup callback failure.'); + console.info('BUNDLE_ACTIVE registerGroupCallBack callback failure.'); expect(true).assertEqual(true); done(); } else { - console.info('BUNDLE_ACTIVE setBundleGroup callback success.'); + console.info('BUNDLE_ACTIVE registerGroupCallBack callback success.'); expect(false).assertEqual(true); done(); } @@ -436,26 +448,18 @@ describe("DeviceUsageStatisticsJsTest", function () { /* * @tc.name: DeviceUsageStatisticsJsTest019 - * @tc.desc: test registerGroupCallBack promise. + * @tc.desc: test unRegisterGroupCallBack promise. * @tc.type: FUNC * @tc.require: SR000H0HAQ AR000H0ROE */ it("DeviceUsageStatisticsJsTest019", 0, async function (done) { console.info('----------------------DeviceUsageStatisticsJsTest019---------------------------'); - let onBundleGroupChanged = (err,res) =>{ - console.log('BUNDLE_ACTIVE RegisterGroupCallBack callback success.'); - console.log('BUNDLE_ACTIVE RegisterGroupCallBack appUsageOldGroup is : ' + res.appUsageOldGroup); - console.log('BUNDLE_ACTIVE RegisterGroupCallBack appUsageNewGroup is : ' + res.appUsageNewGroup); - console.log('BUNDLE_ACTIVE RegisterGroupCallBack changeReason is : ' + res.changeReason); - console.log('BUNDLE_ACTIVE RegisterGroupCallBack userId is : ' + res.userId); - console.log('BUNDLE_ACTIVE RegisterGroupCallBack bundleName is : ' + res.bundleName); - }; - bundleState.registerGroupCallBack(onBundleGroupChanged).then( res => { - console.info('BUNDLE_ACTIVE RegisterGroupCallBack promise success.'); + bundleState.unRegisterGroupCallBack().then( res => { + console.info('BUNDLE_ACTIVE unRegisterGroupCallBack promise success.'); expect(true).assertEqual(true); done(); }).catch( err => { - console.info('BUNDLE_ACTIVE RegisterGroupCallBack promise failure.'); + console.info('BUNDLE_ACTIVE unRegisterGroupCallBack promise failure.'); expect(false).assertEqual(true); done(); }); @@ -463,27 +467,19 @@ describe("DeviceUsageStatisticsJsTest", function () { /* * @tc.name: DeviceUsageStatisticsJsTest020 - * @tc.desc: test registerGroupCallBack callback. + * @tc.desc: test unRegisterGroupCallBack callback. * @tc.type: FUNC * @tc.require: SR000H0HAQ AR000H0ROE */ it("DeviceUsageStatisticsJsTest020", 0, async function (done) { console.info('----------------------DeviceUsageStatisticsJsTest020---------------------------'); - let onBundleGroupChanged = (err,res) =>{ - console.log('BUNDLE_ACTIVE onBundleGroupChanged RegisterGroupCallBack callback success.'); - console.log('BUNDLE_ACTIVE RegisterGroupCallBack appUsageOldGroup is : ' + res.appUsageOldGroup); - console.log('BUNDLE_ACTIVE RegisterGroupCallBack appUsageNewGroup is : ' + res.appUsageNewGroup); - console.log('BUNDLE_ACTIVE RegisterGroupCallBack changeReason is : ' + res.changeReason); - console.log('BUNDLE_ACTIVE RegisterGroupCallBack userId is : ' + res.userId); - console.log('BUNDLE_ACTIVE RegisterGroupCallBack bundleName is : ' + res.bundleName); - }; - bundleState.registerGroupCallBack(onBundleGroupChanged, (err, res) => { + bundleState.unRegisterGroupCallBack((err, res) => { if (err) { - console.info('BUNDLE_ACTIVE registerGroupCallBack callback failure.'); + console.info('BUNDLE_ACTIVE unRegisterGroupCallBack callback failure.'); expect(true).assertEqual(true); done(); } else { - console.info('BUNDLE_ACTIVE registerGroupCallBack callback success.'); + console.info('BUNDLE_ACTIVE unRegisterGroupCallBack callback success.'); expect(false).assertEqual(true); done(); } @@ -492,18 +488,20 @@ describe("DeviceUsageStatisticsJsTest", function () { /* * @tc.name: DeviceUsageStatisticsJsTest021 - * @tc.desc: test unRegisterGroupCallBack promise. + * @tc.desc: test setBundleGroup promise. * @tc.type: FUNC * @tc.require: SR000H0HAQ AR000H0ROE */ it("DeviceUsageStatisticsJsTest021", 0, async function (done) { console.info('----------------------DeviceUsageStatisticsJsTest021---------------------------'); - bundleState.unRegisterGroupCallBack().then( res => { - console.info('BUNDLE_ACTIVE unRegisterGroupCallBack promise success.'); + let bundleName = 'com.ohos.camera'; + let newGroup = 20; + bundleState.setBundleGroup(bundleName, newGroup).then( res => { + console.info('BUNDLE_ACTIVE setBundleGroup promise success.'); expect(true).assertEqual(true); done(); }).catch( err => { - console.info('BUNDLE_ACTIVE unRegisterGroupCallBack promise failure.'); + console.info('BUNDLE_ACTIVE setBundleGroup promise failure.'); expect(false).assertEqual(true); done(); }); @@ -511,20 +509,22 @@ describe("DeviceUsageStatisticsJsTest", function () { /* * @tc.name: DeviceUsageStatisticsJsTest022 - * @tc.desc: test unRegisterGroupCallBack callback. + * @tc.desc: test setBundleGroup callback. * @tc.type: FUNC * @tc.require: SR000H0HAQ AR000H0ROE */ it("DeviceUsageStatisticsJsTest022", 0, async function (done) { console.info('----------------------DeviceUsageStatisticsJsTest022---------------------------'); - bundleState.unRegisterGroupCallBack((err, res) => { + let bundleName = 'com.example.deviceUsageStatistics'; + let newGroup = 30; + bundleState.setBundleGroup(bundleName, newGroup, (err, res) => { if (err) { - console.info('BUNDLE_ACTIVE unRegisterGroupCallBack callback failure.'); - expect(true).assertEqual(true); + console.info('BUNDLE_ACTIVE setBundleGroup callback failure.'); + expect(false).assertEqual(true); done(); } else { - console.info('BUNDLE_ACTIVE unRegisterGroupCallBack callback success.'); - expect(false).assertEqual(true); + console.info('BUNDLE_ACTIVE setBundleGroup callback success.'); + expect(true).assertEqual(true); done(); } }); diff --git a/test/unittest/device_usage_statistics_test.cpp b/test/unittest/device_usage_statistics_test.cpp index 766cd8f..0f7cf9a 100644 --- a/test/unittest/device_usage_statistics_test.cpp +++ b/test/unittest/device_usage_statistics_test.cpp @@ -188,6 +188,39 @@ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_QueryFormStatistic EXPECT_EQ(results.size(), 0); } +/* + * @tc.name: DeviceUsageStatisticsTest_RegisterGroupCallBack_001 + * @tc.desc: registercallback + * @tc.type: FUNC + * @tc.require: SR000H0HAQ AR000H0ROE + */ +HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_RegisterGroupCallBack_001, Function | MediumTest | Level0) +{ + observer = std::make_unique().release(); + if (!observer) { + BUNDLE_ACTIVE_LOGI("RegisterGroupCallBack construct observer!"); + } + int32_t result = BundleActiveClient::GetInstance().RegisterGroupCallBack(observer); + EXPECT_EQ(result, DEFAULT_ERRCODE); +} + +/* + * @tc.name: DeviceUsageStatisticsTest_UnRegisterGroupCallBack_001 + * @tc.desc: unregistercallback + * @tc.type: FUNC + * @tc.require: SR000H0HAQ AR000H0ROE + */ +HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_UnRegisterGroupCallBack_001, + Function | MediumTest | Level0) +{ + if (!observer) { + BUNDLE_ACTIVE_LOGI("observer has been delete"); + } + int32_t result = BundleActiveClient::GetInstance().UnregisterGroupCallBack(observer); + observer = nullptr; + EXPECT_EQ(result, DEFAULT_ERRCODE); +} + /* * @tc.name: DeviceUsageStatisticsTest_SetBundleGroup_001 * @tc.desc: setbundlename @@ -224,39 +257,6 @@ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_QueryPackageGroup_ EXPECT_EQ(flag, true); } -/* - * @tc.name: DeviceUsageStatisticsTest_RegisterGroupCallBack_001 - * @tc.desc: registercallback - * @tc.type: FUNC - * @tc.require: SR000H0HAQ AR000H0ROE - */ -HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_RegisterGroupCallBack_001, Function | MediumTest | Level0) -{ - observer = std::make_unique().release(); - if (!observer) { - BUNDLE_ACTIVE_LOGI("RegisterGroupCallBack construct observer!"); - } - int32_t result = BundleActiveClient::GetInstance().RegisterGroupCallBack(observer); - EXPECT_EQ(result, DEFAULT_ERRCODE); -} - -/* - * @tc.name: DeviceUsageStatisticsTest_UnRegisterGroupCallBack_001 - * @tc.desc: unregistercallback - * @tc.type: FUNC - * @tc.require: SR000H0HAQ AR000H0ROE - */ -HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_UnRegisterGroupCallBack_001, - Function | MediumTest | Level0) -{ - if (!observer) { - BUNDLE_ACTIVE_LOGI("observer has been delete"); - } - int32_t result = BundleActiveClient::GetInstance().UnregisterGroupCallBack(observer); - observer = nullptr; - EXPECT_EQ(result, DEFAULT_ERRCODE); -} - /* * @tc.name: DeviceUsageStatisticsTest_QueryEventStats_001 * @tc.desc: QueryEventStats -- Gitee From 811d145e1bde8ab8819e759b6f20a74c5f8573d5 Mon Sep 17 00:00:00 2001 From: "yupeng74@huawei.com" Date: Fri, 9 Sep 2022 16:34:30 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=92=8C=E6=B7=BB=E5=8A=A0TDD=E7=94=A8=E4=BE=8B=E8=A6=86?= =?UTF-8?q?=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yupeng74@huawei.com --- .../device_usage_statistics_jsunit.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/test/unittest/device_usage_statistics_jsunittest/device_usage_statistics_jsunit.test.js b/interfaces/test/unittest/device_usage_statistics_jsunittest/device_usage_statistics_jsunit.test.js index 87a2369..680656f 100644 --- a/interfaces/test/unittest/device_usage_statistics_jsunittest/device_usage_statistics_jsunit.test.js +++ b/interfaces/test/unittest/device_usage_statistics_jsunittest/device_usage_statistics_jsunit.test.js @@ -515,7 +515,7 @@ describe("DeviceUsageStatisticsJsTest", function () { */ it("DeviceUsageStatisticsJsTest022", 0, async function (done) { console.info('----------------------DeviceUsageStatisticsJsTest022---------------------------'); - let bundleName = 'com.example.deviceUsageStatistics'; + let bundleName = 'com.ohos.camera'; let newGroup = 30; bundleState.setBundleGroup(bundleName, newGroup, (err, res) => { if (err) { -- Gitee From 3901d1c43172eeeda8176220368f93b2e4c26bc1 Mon Sep 17 00:00:00 2001 From: "yupeng74@huawei.com" Date: Fri, 9 Sep 2022 17:02:35 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=92=8C=E6=B7=BB=E5=8A=A0TDD=E7=94=A8=E4=BE=8B=E8=A6=86?= =?UTF-8?q?=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yupeng74@huawei.com --- test/unittest/device_usage_statistics_test.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/unittest/device_usage_statistics_test.cpp b/test/unittest/device_usage_statistics_test.cpp index 0f7cf9a..9851b0f 100644 --- a/test/unittest/device_usage_statistics_test.cpp +++ b/test/unittest/device_usage_statistics_test.cpp @@ -149,10 +149,12 @@ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_QueryPackagesStats * @tc.type: FUNC * @tc.require: issuesI5QJD9 */ -HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_QueryCurrentPackageStats_001, Function | MediumTest | Level0) +HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_QueryCurrentPackageStats_001, + Function | MediumTest | Level0) { int32_t errCode = 0; - std::vector result = BundleActiveClient::GetInstance().QueryCurrentPackageStats(4, 0, LARGE_NUM); + std::vector result = + BundleActiveClient::GetInstance().QueryCurrentPackageStats(4, 0, LARGE_NUM); EXPECT_EQ(result.size(), 0); } -- Gitee From c72c0effff15ef3cf7afac1b53f3b440a3ae348b Mon Sep 17 00:00:00 2001 From: "yupeng74@huawei.com" Date: Fri, 9 Sep 2022 17:43:22 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=92=8C=E6=B7=BB=E5=8A=A0TDD=E7=94=A8=E4=BE=8B=E8=A6=86?= =?UTF-8?q?=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yupeng74@huawei.com --- .../unittest/device_usage_statistics_test.cpp | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/test/unittest/device_usage_statistics_test.cpp b/test/unittest/device_usage_statistics_test.cpp index 9851b0f..f5e78c3 100644 --- a/test/unittest/device_usage_statistics_test.cpp +++ b/test/unittest/device_usage_statistics_test.cpp @@ -32,13 +32,11 @@ using namespace testing::ext; namespace OHOS { namespace DeviceUsageStats { -static const std::string DEFAULT_BUNDLENAME = "com.ohos.camera"; -static const std::string DEFAULT_MODULENAME = "defaultmodulename"; -static const std::string DEFAULT_FORM_NAME = "defaultformname"; +static std::string g_defaultBundleName = "com.ohos.camera"; +static std::string g_defaultMoudleName = "defaultmodulename"; +static std::string g_defaultFormName = "defaultformname"; static int32_t DEFAULT_DIMENSION = 4; static int64_t DEFAULT_FORMID = 1; -static const std::string DEFAULT_ABILITYID = "1234"; -static const std::string DEFAULT_ABILITYNAME = "testability"; static int32_t DEFAULT_USERID = 0; static int32_t COMMON_USERID = 100; static int32_t DEFAULT_ERRCODE = 0; @@ -96,10 +94,10 @@ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_GetServiceObject_0 */ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_ReportEvent_001, Function | MediumTest | Level0) { - BundleActiveEvent eventA(DEFAULT_BUNDLENAME, DEFAULT_MODULENAME, DEFAULT_FORM_NAME, + BundleActiveEvent eventA(g_defaultBundleName, g_defaultMoudleName, g_defaultFormName, DEFAULT_DIMENSION, DEFAULT_FORMID, BundleActiveEvent::FORM_IS_CLICKED); BundleActiveClient::GetInstance().ReportEvent(eventA, DEFAULT_USERID); - BundleActiveEvent eventB(DEFAULT_BUNDLENAME, DEFAULT_MODULENAME, DEFAULT_FORM_NAME, + BundleActiveEvent eventB(g_defaultBundleName, g_defaultMoudleName, g_defaultFormName, DEFAULT_DIMENSION, DEFAULT_FORMID, BundleActiveEvent::FORM_IS_REMOVED); BundleActiveClient::GetInstance().ReportEvent(eventB, DEFAULT_USERID); } @@ -152,7 +150,6 @@ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_QueryPackagesStats HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_QueryCurrentPackageStats_001, Function | MediumTest | Level0) { - int32_t errCode = 0; std::vector result = BundleActiveClient::GetInstance().QueryCurrentPackageStats(4, 0, LARGE_NUM); EXPECT_EQ(result.size(), 0); @@ -167,7 +164,7 @@ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_QueryCurrentPackag HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_IsBundleIdle_001, Function | MediumTest | Level0) { int32_t errCode = 0; - bool result = BundleActiveClient::GetInstance().IsBundleIdle(DEFAULT_BUNDLENAME, errCode, DEFAULT_USERID); + bool result = BundleActiveClient::GetInstance().IsBundleIdle(g_defaultBundleName, errCode, DEFAULT_USERID); EXPECT_EQ(result, false); EXPECT_EQ(errCode, 0); } @@ -181,7 +178,7 @@ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_IsBundleIdle_001, HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_QueryFormStatistics_001, Function | MediumTest | Level0) { int32_t maxNum = 1; - BundleActiveEvent eventA(DEFAULT_BUNDLENAME, DEFAULT_MODULENAME, DEFAULT_FORM_NAME, + BundleActiveEvent eventA(g_defaultBundleName, g_defaultMoudleName, g_defaultFormName, DEFAULT_DIMENSION, DEFAULT_FORMID, BundleActiveEvent::FORM_IS_CLICKED); BundleActiveClient::GetInstance().ReportEvent(eventA, DEFAULT_USERID); std::vector results; @@ -231,9 +228,9 @@ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_UnRegisterGroupCal */ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_SetBundleGroup_001, Function | MediumTest | Level0) { - int32_t result = BundleActiveClient::GetInstance().QueryPackageGroup(DEFAULT_BUNDLENAME, COMMON_USERID); + int32_t result = BundleActiveClient::GetInstance().QueryPackageGroup(g_defaultBundleName, COMMON_USERID); DEFAULT_GROUP = (result == DEFAULT_GROUP) ? (result + 10) : DEFAULT_GROUP; - result = BundleActiveClient::GetInstance().SetBundleGroup(DEFAULT_BUNDLENAME, DEFAULT_GROUP, + result = BundleActiveClient::GetInstance().SetBundleGroup(g_defaultBundleName, DEFAULT_GROUP, DEFAULT_ERRCODE, COMMON_USERID); EXPECT_EQ(result, DEFAULT_ERRCODE); } @@ -246,9 +243,9 @@ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_SetBundleGroup_001 */ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_QueryPackageGroup_001, Function | MediumTest | Level0) { - BundleActiveClient::GetInstance().SetBundleGroup(DEFAULT_BUNDLENAME, DEFAULT_GROUP, + BundleActiveClient::GetInstance().SetBundleGroup(g_defaultBundleName, DEFAULT_GROUP, DEFAULT_ERRCODE, COMMON_USERID); - int32_t result = BundleActiveClient::GetInstance().QueryPackageGroup(DEFAULT_BUNDLENAME, COMMON_USERID); + int32_t result = BundleActiveClient::GetInstance().QueryPackageGroup(g_defaultBundleName, COMMON_USERID); bool flag = false; for (auto item = GROUP_TYPE.begin(); item != GROUP_TYPE.end(); item++) { if (*item == result) { -- Gitee From 9921814b632f18dc23da0336e2ceac95553f1655 Mon Sep 17 00:00:00 2001 From: "yupeng74@huawei.com" Date: Wed, 14 Sep 2022 09:11:52 +0800 Subject: [PATCH 6/7] add token shell Signed-off-by: yupeng74@huawei.com --- services/common/src/bundle_active_service.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/common/src/bundle_active_service.cpp b/services/common/src/bundle_active_service.cpp index 28acc53..4d1b088 100644 --- a/services/common/src/bundle_active_service.cpp +++ b/services/common/src/bundle_active_service.cpp @@ -500,7 +500,8 @@ int32_t BundleActiveService::RegisterGroupCallBack(const sptrRegisterGroupCallBack(tokenId, observer); } return result; @@ -518,7 +519,8 @@ int32_t BundleActiveService::UnregisterGroupCallBack(const sptrUnregisterGroupCallBack(tokenId, observer); } return result; -- Gitee From 668e7d550fd64258ffd7b294a25ffc30cd5c5be1 Mon Sep 17 00:00:00 2001 From: "yupeng74@huawei.com" Date: Wed, 14 Sep 2022 09:40:52 +0800 Subject: [PATCH 7/7] add token shell Signed-off-by: yupeng74@huawei.com --- test/unittest/device_usage_statistics_test.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/unittest/device_usage_statistics_test.cpp b/test/unittest/device_usage_statistics_test.cpp index f5e78c3..c7a9ca0 100644 --- a/test/unittest/device_usage_statistics_test.cpp +++ b/test/unittest/device_usage_statistics_test.cpp @@ -195,10 +195,11 @@ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_QueryFormStatistic */ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_RegisterGroupCallBack_001, Function | MediumTest | Level0) { - observer = std::make_unique().release(); if (!observer) { BUNDLE_ACTIVE_LOGI("RegisterGroupCallBack construct observer!"); + observer = std::make_unique().release(); } + ASSERT_NE(observer, nullptr); int32_t result = BundleActiveClient::GetInstance().RegisterGroupCallBack(observer); EXPECT_EQ(result, DEFAULT_ERRCODE); } @@ -215,6 +216,7 @@ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_UnRegisterGroupCal if (!observer) { BUNDLE_ACTIVE_LOGI("observer has been delete"); } + ASSERT_NE(observer, nullptr); int32_t result = BundleActiveClient::GetInstance().UnregisterGroupCallBack(observer); observer = nullptr; EXPECT_EQ(result, DEFAULT_ERRCODE); -- Gitee