From 7fb7d555e546ff0634ad20b785d15f03688b93aa Mon Sep 17 00:00:00 2001 From: gaojiaqi Date: Sun, 15 Sep 2024 15:54:01 +0800 Subject: [PATCH 1/3] 5.0release Signed-off-by: gaojiaqi --- .../device_usage_statistics_jsunit.test.js | 97 +++---------------- test/unittest/bundle_active_total_test.cpp | 29 +++--- .../bundle_active_usage_database_test.cpp | 2 +- .../device_usage_statistics_multi_test.cpp | 20 ++-- 4 files changed, 35 insertions(+), 113 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 82b688a..e27aaba 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 @@ -15,7 +15,6 @@ import bundleState from '@ohos.bundleState' import usageStatistics from '@ohos.resourceschedule.usageStatistics' -import power from '@ohos.power' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' @@ -276,30 +275,13 @@ describe("DeviceUsageStatisticsJsTest", function () { */ it("DeviceUsageStatisticsJsTest011", 0, async function (done) { console.info('----------------------DeviceUsageStatisticsJsTest011---------------------------'); - let isScreenOn_ = false; - power.isScreenOn((err, data) => { - if (typeof err === 'undefined') { - console.info('screen on status is ' + data); - isScreenOn_ = data - } else { - console.error('check screen status failed, err: ' + err); - } - }) bundleState.queryAppUsagePriorityGroup().then( res => { console.info('BUNDLE_ACTIVE queryAppUsagePriorityGroup promise success.'); - if (isScreenOn_ == true) { - expect(true).assertEqual(true); - } else { - expect(false).assertEqual(true); - } + expect(true).assertEqual(true); done(); }).catch( err => { console.info('BUNDLE_ACTIVE queryAppUsagePriorityGroup promise failure.'); - if (isScreenOn_ == true) { - expect(false).assertEqual(true); - } else { - expect(true).assertEqual(true); - } + expect(false).assertEqual(true); done(); }); }) @@ -312,32 +294,14 @@ describe("DeviceUsageStatisticsJsTest", function () { */ it("DeviceUsageStatisticsJsTest012", 0, async function (done) { console.info('----------------------DeviceUsageStatisticsJsTest012---------------------------'); - let isScreenOn_ = false; - power.isScreenOn((err, data) => { - if (typeof err === 'undefined') { - console.info('screen on status is ' + data); - isScreenOn_ = data - } else { - console.error('check screen status failed, err: ' + err); - } - }) bundleState.queryAppUsagePriorityGroup((err, res) => { if (err) { console.info('BUNDLE_ACTIVE queryAppUsagePriorityGroup callback failure.'); - if (isScreenOn_ == true) { - expect(false).assertEqual(true); - } else { - expect(true).assertEqual(true); - } - + expect(false).assertEqual(true); done(); } else { console.info('BUNDLE_ACTIVE queryAppUsagePriorityGroup callback success.'); - if (isScreenOn_ == true) { - expect(true).assertEqual(true); - } else { - expect(false).assertEqual(true); - } + expect(true).assertEqual(true); done(); } }); @@ -407,24 +371,14 @@ describe("DeviceUsageStatisticsJsTest", function () { console.info('----------------------DeviceUsageStatisticsJsTest015---------------------------'); let bundleName = 'com.example.deviceUsageStatistics'; try{ - var isActive = power.isActive(); usageStatistics.queryAppGroup(bundleName, (err, res) => { if(err) { console.info('BUNDLE_ACTIVE queryAppGroup callback failure.'); - if (isActive == true) { - expect(false).assertEqual(true); - } else { - expect(true).assertEqual(true); - } - + expect(false).assertEqual(true); done(); } else { console.info('BUNDLE_ACTIVE queryAppGroup callback success.'); - if (isActive == true) { - expect(true).assertEqual(true); - } else { - expect(false).assertEqual(true); - } + expect(true).assertEqual(true); done(); } }); @@ -445,22 +399,13 @@ describe("DeviceUsageStatisticsJsTest", function () { console.info('----------------------DeviceUsageStatisticsJsTest016---------------------------'); let bundleName = 'com.example.deviceUsageStatistics'; try{ - var isActive = power.isActive(); usageStatistics.queryAppGroup(bundleName).then( res => { console.info('BUNDLE_ACTIVE queryAppGroup promise success.'); - if (isActive == true) { - expect(true).assertEqual(true); - } else { - expect(false).assertEqual(true); - } + expect(true).assertEqual(true); done(); }).catch( err => { console.info('BUNDLE_ACTIVE queryAppGroup promise failure.'); - if (isActive == true) { - expect(false).assertEqual(true); - } else { - expect(true).assertEqual(true); - } + expect(false).assertEqual(true); done(); }); } catch (error) { @@ -479,23 +424,14 @@ describe("DeviceUsageStatisticsJsTest", function () { it("DeviceUsageStatisticsJsTest017", 0, async function (done) { console.info('----------------------DeviceUsageStatisticsJsTest017---------------------------'); try{ - var isActive = power.isActive(); usageStatistics.queryAppGroup((err, res) => { if(err) { console.info('BUNDLE_ACTIVE queryAppGroup method callback failure.'); - if (isActive == true) { - expect(false).assertEqual(true); - } else { - expect(true).assertEqual(true); - } + expect(false).assertEqual(true); done(); } else { console.info('BUNDLE_ACTIVE queryAppGroup method callback success.'); - if (isActive == true) { - expect(true).assertEqual(true); - } else { - expect(false).assertEqual(true); - } + expect(true).assertEqual(true); done(); } }); @@ -515,22 +451,13 @@ describe("DeviceUsageStatisticsJsTest", function () { it("DeviceUsageStatisticsJsTest018", 0, async function (done) { console.info('----------------------DeviceUsageStatisticsJsTest018---------------------------'); try{ - var isActive = power.isActive(); usageStatistics.queryAppGroup().then( res => { console.info('BUNDLE_ACTIVE queryAppGroup method promise success.'); - if (isActive == true) { - expect(true).assertEqual(true); - } else { - expect(false).assertEqual(true); - } + expect(true).assertEqual(true); done(); }).catch( err => { console.info('BUNDLE_ACTIVE queryAppGroup method promise failure.'); - if (isActive == true) { - expect(false).assertEqual(true); - } else { - expect(true).assertEqual(true); - } + expect(false).assertEqual(true); done(); }); } catch (error) { diff --git a/test/unittest/bundle_active_total_test.cpp b/test/unittest/bundle_active_total_test.cpp index f140fed..63a63a0 100644 --- a/test/unittest/bundle_active_total_test.cpp +++ b/test/unittest/bundle_active_total_test.cpp @@ -65,17 +65,12 @@ void BundleActiveTotalTest::TearDown(void) * @tc.name: BundleActiveAccountHelperTest_001 * @tc.desc: test the interface of bundle_active_account_helper * @tc.type: FUNC - * @tc.require: issuesI9BMBP + * @tc.require: DTS2023121404861 */ HWTEST_F(BundleActiveTotalTest, BundleActiveAccountHelperTest_001, Function | MediumTest | Level0) { - // Given std::vector activatedOsAccountIds; - - // When BundleActiveAccountHelper::GetActiveUserId(activatedOsAccountIds); - - // Then SUCCEED(); } @@ -83,7 +78,7 @@ HWTEST_F(BundleActiveTotalTest, BundleActiveAccountHelperTest_001, Function | Me * @tc.name: BundleActiveContinuousTaskObserverTest_001 * @tc.desc: test the interface of bundle_active_continuous_task_observer * @tc.type: FUNC - * @tc.require: issuesI9BMBP + * @tc.require: DTS2023121404861 */ HWTEST_F(BundleActiveTotalTest, BundleActiveContinuousTaskObserverTest_001, Function | MediumTest | Level0) { @@ -116,7 +111,7 @@ HWTEST_F(BundleActiveTotalTest, BundleActiveContinuousTaskObserverTest_001, Func * @tc.name: BundleActiveBundleMgrHelperTest_001 * @tc.desc: test the interface of bundle_active_bundle_mgr_helper * @tc.type: FUNC - * @tc.require: issuesI9BMBP + * @tc.require: DTS2023121404861 */ HWTEST_F(BundleActiveTotalTest, BundleActiveBundleMgrHelperTest_001, Function | MediumTest | Level0) { @@ -171,7 +166,7 @@ HWTEST_F(BundleActiveTotalTest, BundleActiveBundleMgrHelperTest_003, Function | * @tc.name: BundleActiveAppStateObserverTest_001 * @tc.desc: test the interface of bundle_active_app_state_observer * @tc.type: FUNC - * @tc.require: issuesI9BMBP + * @tc.require: DTS2023121404861 */ HWTEST_F(BundleActiveTotalTest, BundleActiveAppStateObserverTest_001, Function | MediumTest | Level0) { @@ -200,7 +195,7 @@ HWTEST_F(BundleActiveTotalTest, BundleActiveAppStateObserverTest_001, Function | * @tc.name: BundleActiveUsageDatabaseTest_001 * @tc.desc: test the interface of bundle_active_usage_database * @tc.type: FUNC - * @tc.require: issuesI9BMBP + * @tc.require: DTS2023121404861 */ HWTEST_F(BundleActiveTotalTest, BundleActiveUsageDatabaseTest_001, Function | MediumTest | Level0) { @@ -213,7 +208,7 @@ HWTEST_F(BundleActiveTotalTest, BundleActiveUsageDatabaseTest_001, Function | Me * @tc.name: BundleActiveUsageDatabaseTest_002 * @tc.desc: test the interface of bundle_active_usage_database * @tc.type: FUNC - * @tc.require: issuesI9BMBP + * @tc.require: DTS2023121404861 */ HWTEST_F(BundleActiveTotalTest, BundleActiveUsageDatabaseTest_002, Function | MediumTest | Level0) { @@ -228,7 +223,7 @@ HWTEST_F(BundleActiveTotalTest, BundleActiveUsageDatabaseTest_002, Function | Me * @tc.name: BundleActiveUsageDatabaseTest_003 * @tc.desc: test the interface of bundle_active_usage_database * @tc.type: FUNC - * @tc.require: issuesI9BMBP + * @tc.require: DTS2023121404861 */ HWTEST_F(BundleActiveTotalTest, BundleActiveUsageDatabaseTest_003, Function | MediumTest | Level0) { @@ -241,7 +236,7 @@ HWTEST_F(BundleActiveTotalTest, BundleActiveUsageDatabaseTest_003, Function | Me * @tc.name: BundleActiveUsageDatabaseTest_005 * @tc.desc: test the interface of bundle_active_usage_database * @tc.type: FUNC - * @tc.require: issuesI9BMBP + * @tc.require: DTS2023121404861 */ HWTEST_F(BundleActiveTotalTest, BundleActiveUsageDatabaseTest_005, Function | MediumTest | Level0) { @@ -262,7 +257,7 @@ HWTEST_F(BundleActiveTotalTest, BundleActiveUsageDatabaseTest_005, Function | Me * @tc.name: BundleActiveUsageDatabaseTest_006 * @tc.desc: test the interface of bundle_active_usage_database * @tc.type: FUNC - * @tc.require: issuesI9BMBP + * @tc.require: DTS2023121404861 */ HWTEST_F(BundleActiveTotalTest, BundleActiveUsageDatabaseTest_006, Function | MediumTest | Level0) { @@ -279,7 +274,7 @@ HWTEST_F(BundleActiveTotalTest, BundleActiveUsageDatabaseTest_006, Function | Me * @tc.name: BundleActiveUsageDatabaseTest_007 * @tc.desc: test the interface of bundle_active_usage_database * @tc.type: FUNC - * @tc.require: issuesI9BMBP + * @tc.require: DTS2023121404861 */ HWTEST_F(BundleActiveTotalTest, BundleActiveUsageDatabaseTest_007, Function | MediumTest | Level0) { @@ -296,7 +291,7 @@ HWTEST_F(BundleActiveTotalTest, BundleActiveUsageDatabaseTest_007, Function | Me * @tc.name: BundleActivePowerStateCallbackServiceTest_001 * @tc.desc: test the interface of bundle_active_usage_database * @tc.type: FUNC - * @tc.require: issuesI9BMBP + * @tc.require: DTS2023121404861 */ HWTEST_F(BundleActiveTotalTest, BundleActivePowerStateCallbackServiceTest_001, Function | MediumTest | Level0) { @@ -317,7 +312,7 @@ HWTEST_F(BundleActiveTotalTest, BundleActivePowerStateCallbackServiceTest_001, F * @tc.name: BundleActiveBinarySearchTest_001 * @tc.desc: test the interface of bundle_active_binary_search * @tc.type: FUNC - * @tc.require: issuesI9BMBP + * @tc.require: DTS2023121404861 */ HWTEST_F(BundleActiveTotalTest, BundleActiveBinarySearchTest_001, Function | MediumTest | Level0) { diff --git a/test/unittest/bundle_active_usage_database_test.cpp b/test/unittest/bundle_active_usage_database_test.cpp index 6696b71..2d209d4 100644 --- a/test/unittest/bundle_active_usage_database_test.cpp +++ b/test/unittest/bundle_active_usage_database_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/test/unittest/device_usage_statistics_multi_test.cpp b/test/unittest/device_usage_statistics_multi_test.cpp index 0514641..0673c8f 100644 --- a/test/unittest/device_usage_statistics_multi_test.cpp +++ b/test/unittest/device_usage_statistics_multi_test.cpp @@ -100,7 +100,7 @@ void TestAppGroupChangeCallback::OnAppGroupChanged(const AppGroupCallbackInfo &a * @tc.name: DeviceUsageStatisticsMultiTest_IsBundleIdle_001 * @tc.desc: isbundleidle * @tc.type: FUNC - * @tc.require: issuesI5SOZY + * @tc.require: SR000GGTO5 AR000GH6PG */ void MultiTestIsBundleIdle(void) { @@ -121,7 +121,7 @@ HWTEST_F(DeviceUsageStatisticsMultiTest, DeviceUsageStatisticsMultiTest_IsBundle * @tc.name: DeviceUsageStatisticsMultiTest_ReportEvent_001 * @tc.desc: report a mock event * @tc.type: FUNC - * @tc.require: issuesI5SOZY + * @tc.require: SR000GGTO7 SR000GU31B AR000GH6RJ AR000GU380 */ void MultiTestReportEvent(void) { @@ -143,7 +143,7 @@ HWTEST_F(DeviceUsageStatisticsMultiTest, DeviceUsageStatisticsMultiTest_ReportEv * @tc.name: DeviceUsageStatisticsMultiTest_QueryBundleEvents_001 * @tc.desc: QueryBundleEvents * @tc.type: FUNC - * @tc.require: issuesI5SOZY + * @tc.require: SR000GGTO6 AR000GH6PH */ void MultiTestQueryBundleEvents(void) { @@ -164,7 +164,7 @@ HWTEST_F(DeviceUsageStatisticsMultiTest, DeviceUsageStatisticsMultiTest_QueryBun * @tc.name: DeviceUsageStatisticsMultiTest_QueryCurrentBundleEvents_001 * @tc.desc: QueryCurrentBundleEvents * @tc.type: FUNC - * @tc.require: issuesI5SOZY + * @tc.require: SR000GGTO4 AR000GH6PF */ void MultiTestQueryCurrentBundleEvents(void) { @@ -184,7 +184,7 @@ HWTEST_F(DeviceUsageStatisticsMultiTest, DeviceUsageStatisticsMultiTest_QueryCur * @tc.name: DeviceUsageStatisticsMultiTest_QueryPackagesStats_001 * @tc.desc: querypackagestats * @tc.type: FUNC - * @tc.require: issuesI5SOZY + * @tc.require: SR000GGTO3 AR000GH6PD */ void MultiTestQueryBundleStatsInfoByInterval(void) { @@ -226,7 +226,7 @@ HWTEST_F(DeviceUsageStatisticsMultiTest, DeviceUsageStatisticsMultiTest_QueryBun * @tc.name: DeviceUsageStatisticsMultiTest_QueryModuleUsageRecords_001 * @tc.desc: QueryModuleUsageRecords * @tc.type: FUNC - * @tc.require: issuesI5SOZY + * @tc.require: SR000GU2T1 AR000GU37U */ void MultiTestQueryModuleUsageRecords(void) { @@ -261,7 +261,7 @@ HWTEST_F(DeviceUsageStatisticsMultiTest, DeviceUsageStatisticsMultiTest_QueryMod * @tc.name: DeviceUsageStatisticsMultiTest_QueryAppGroup_001 * @tc.desc: QueryAppGroup, no bundleName * @tc.type: FUNC - * @tc.require: issuesI5SOZY + * @tc.require: SR000HOHAQ AR000HOROE */ void MultiTestAppGroup(void) { @@ -288,7 +288,7 @@ HWTEST_F(DeviceUsageStatisticsMultiTest, DeviceUsageStatisticsMultiTest_AppGroup * @tc.name: DeviceUsageStatisticsMultiTest_QueryDeviceEventStats_001 * @tc.desc: QueryDeviceEventStats * @tc.type: FUNC - * @tc.require: issuesI5SOZY + * @tc.require: SR000HOH9H AR000HOROG */ void MultiTestQueryDeviceEventStats(void) { @@ -310,7 +310,7 @@ HWTEST_F(DeviceUsageStatisticsMultiTest, DeviceUsageStatisticsMultiTest_QueryDev * @tc.name: DeviceUsageStatisticsMultiTest_QueryNotificationEventStats_001 * @tc.desc: QueryNotificationEventStats * @tc.type: FUNC - * @tc.require: issuesI5SOZY + * @tc.require: SR000HOH7D AR000HORR6 */ void MultiTestQueryNotificationEventStats(void) { @@ -332,7 +332,7 @@ HWTEST_F(DeviceUsageStatisticsMultiTest, DeviceUsageStatisticsMultiTest_QueryNot * @tc.name: DeviceUsageStatisticsMultiTest_BundleActiveGroupMap_001 * @tc.desc: BundleActiveGroupMap * @tc.type: FUNC - * @tc.require: issuesI5SOZY + * @tc.require: SR000HOG4F AR000H2US8 */ void MultiTestDeviceUsageStatsGroupMap(void) { -- Gitee From ce3b82193a9bfc699ba7e542bfbd9da0c0d19098 Mon Sep 17 00:00:00 2001 From: gaojiaqi Date: Sun, 15 Sep 2024 16:05:00 +0800 Subject: [PATCH 2/3] update Signed-off-by: gaojiaqi --- test/unittest/device_usage_statistics_multi_test.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/unittest/device_usage_statistics_multi_test.cpp b/test/unittest/device_usage_statistics_multi_test.cpp index 0673c8f..01e908f 100644 --- a/test/unittest/device_usage_statistics_multi_test.cpp +++ b/test/unittest/device_usage_statistics_multi_test.cpp @@ -121,7 +121,7 @@ HWTEST_F(DeviceUsageStatisticsMultiTest, DeviceUsageStatisticsMultiTest_IsBundle * @tc.name: DeviceUsageStatisticsMultiTest_ReportEvent_001 * @tc.desc: report a mock event * @tc.type: FUNC - * @tc.require: SR000GGTO7 SR000GU31B AR000GH6RJ AR000GU380 + * @tc.require: SR000GGTO7 SR000GU31B AR000GH6PJ AR000GU380 */ void MultiTestReportEvent(void) { @@ -261,7 +261,7 @@ HWTEST_F(DeviceUsageStatisticsMultiTest, DeviceUsageStatisticsMultiTest_QueryMod * @tc.name: DeviceUsageStatisticsMultiTest_QueryAppGroup_001 * @tc.desc: QueryAppGroup, no bundleName * @tc.type: FUNC - * @tc.require: SR000HOHAQ AR000HOROE + * @tc.require: SR000H0HAQ AR000H0ROE */ void MultiTestAppGroup(void) { @@ -288,7 +288,7 @@ HWTEST_F(DeviceUsageStatisticsMultiTest, DeviceUsageStatisticsMultiTest_AppGroup * @tc.name: DeviceUsageStatisticsMultiTest_QueryDeviceEventStats_001 * @tc.desc: QueryDeviceEventStats * @tc.type: FUNC - * @tc.require: SR000HOH9H AR000HOROG + * @tc.require: SR000H0H9H AR000H0ROG */ void MultiTestQueryDeviceEventStats(void) { @@ -310,7 +310,7 @@ HWTEST_F(DeviceUsageStatisticsMultiTest, DeviceUsageStatisticsMultiTest_QueryDev * @tc.name: DeviceUsageStatisticsMultiTest_QueryNotificationEventStats_001 * @tc.desc: QueryNotificationEventStats * @tc.type: FUNC - * @tc.require: SR000HOH7D AR000HORR6 + * @tc.require: SR000H0H7D AR000H0RR6 */ void MultiTestQueryNotificationEventStats(void) { @@ -332,7 +332,7 @@ HWTEST_F(DeviceUsageStatisticsMultiTest, DeviceUsageStatisticsMultiTest_QueryNot * @tc.name: DeviceUsageStatisticsMultiTest_BundleActiveGroupMap_001 * @tc.desc: BundleActiveGroupMap * @tc.type: FUNC - * @tc.require: SR000HOG4F AR000H2US8 + * @tc.require: SR000H0G4F AR000H2US8 */ void MultiTestDeviceUsageStatsGroupMap(void) { -- Gitee From 7c0e62d1c160cea982d2f4af499d6d7d1fe0424a Mon Sep 17 00:00:00 2001 From: gaojiaqi Date: Sun, 15 Sep 2024 17:32:03 +0800 Subject: [PATCH 3/3] update Signed-off-by: gaojiaqi --- test/unittest/bundle_active_total_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/bundle_active_total_test.cpp b/test/unittest/bundle_active_total_test.cpp index 63a63a0..8aadf47 100644 --- a/test/unittest/bundle_active_total_test.cpp +++ b/test/unittest/bundle_active_total_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at -- Gitee