diff --git a/storage/BUILD.gn b/storage/BUILD.gn index 63b04993603c373d6eb52e08ff264430db80fb36..d9f67927158d9e63c34594acaafb6a5848b7d9ee 100644 --- a/storage/BUILD.gn +++ b/storage/BUILD.gn @@ -21,6 +21,7 @@ group("storage") { "storagefileiojstest:storagefileio_js_test", "storagefilejstest:storagefile_js_test", "storagestatfsjstest:storagestatfs_js_test", + "storagestatisticsjstest:storagestatistics_js_test", "storagevolumesjstest:storagevolumes_js_test", ] } diff --git a/storage/storagestatisticsjstest/BUILD.gn b/storage/storagestatisticsjstest/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..522b7bb8c952a7b5faad49e8fc81c49122d48d1f --- /dev/null +++ b/storage/storagestatisticsjstest/BUILD.gn @@ -0,0 +1,31 @@ +# Copyright (C) 2021 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//test/xts/tools/build/suite.gni") + +ohos_js_hap_suite("storagestatistics_js_test") { + hap_profile = "./src/main/config.json" + deps = [ + ":storagestatistics_js_assets", + ":storagestatistics_js_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsStorageStatisticsJsTest" +} +ohos_js_assets("storagestatistics_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("storagestatistics_js_resources") { + sources = [ "./src/main/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/storage/storagestatisticsjstest/Test.json b/storage/storagestatisticsjstest/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..611c13b0a2a56b0e1dbec48e6bf0989ec711924e --- /dev/null +++ b/storage/storagestatisticsjstest/Test.json @@ -0,0 +1,18 @@ +{ + "description": "Configuration for storage statistics Tests", + "driver": { + "type": "JSUnitTest", + "test-timeout": "60000", + "package": "ohos.acts.storage.statistics", + "shell-timeout": "60000" + }, + "kits": [ + { + "test-file-name": [ + "ActsStorageStatisticsJsTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} \ No newline at end of file diff --git a/storage/storagestatisticsjstest/signature/openharmony_sx.p7b b/storage/storagestatisticsjstest/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/storage/storagestatisticsjstest/signature/openharmony_sx.p7b differ diff --git a/storage/storagestatisticsjstest/src/main/config.json b/storage/storagestatisticsjstest/src/main/config.json new file mode 100644 index 0000000000000000000000000000000000000000..975025e2f0cfd1aca9dace720b790545accd0831 --- /dev/null +++ b/storage/storagestatisticsjstest/src/main/config.json @@ -0,0 +1,61 @@ +{ + "app": { + "bundleName": "ohos.acts.storage.statistics", + "vendor": "acts", + "version": { + "code": 1000000, + "name": "1.0.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5 + } + }, + "deviceConfig": {}, + "module": { + "package": "ohos.acts.storage.statistics", + "name": ".MyApplication", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": true + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "visible": true, + "name": "ohos.acts.storage.statistics.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:entry_MainAbility", + "type": "page", + "launchType": "standard" + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": true + } + } + ] + } +} \ No newline at end of file diff --git a/storage/storagestatisticsjstest/src/main/js/default/app.js b/storage/storagestatisticsjstest/src/main/js/default/app.js new file mode 100644 index 0000000000000000000000000000000000000000..9a7430474639cce2ebb9d56423320c58fa78a579 --- /dev/null +++ b/storage/storagestatisticsjstest/src/main/js/default/app.js @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2021 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +export default { + onCreate() { + console.info('ohos.acts.storage.statistics onCreate'); + }, + onDestroy() { + console.info('ohos.acts.storage.statistics onDestroy'); + } +}; \ No newline at end of file diff --git a/storage/storagestatisticsjstest/src/main/js/default/i18n/en-US.json b/storage/storagestatisticsjstest/src/main/js/default/i18n/en-US.json new file mode 100644 index 0000000000000000000000000000000000000000..2f2f89aa81447205d7dfa028d51a0944e9e64db8 --- /dev/null +++ b/storage/storagestatisticsjstest/src/main/js/default/i18n/en-US.json @@ -0,0 +1,6 @@ +{ + "strings": { + "hello": "Hello", + "world": "Test" + } +} \ No newline at end of file diff --git a/storage/storagestatisticsjstest/src/main/js/default/i18n/zh-CN.json b/storage/storagestatisticsjstest/src/main/js/default/i18n/zh-CN.json new file mode 100644 index 0000000000000000000000000000000000000000..c7ff73d8917d62b63f6172cd3364e95727b0e7a3 --- /dev/null +++ b/storage/storagestatisticsjstest/src/main/js/default/i18n/zh-CN.json @@ -0,0 +1,6 @@ +{ + "strings": { + "hello": "您好", + "world": "测试" + } +} \ No newline at end of file diff --git a/storage/storagestatisticsjstest/src/main/js/default/pages/index/index.css b/storage/storagestatisticsjstest/src/main/js/default/pages/index/index.css new file mode 100644 index 0000000000000000000000000000000000000000..5c52a87a04f583e9d5f4db1dd40d4eafdb9b6aeb --- /dev/null +++ b/storage/storagestatisticsjstest/src/main/js/default/pages/index/index.css @@ -0,0 +1,9 @@ +.container { + flex-direction: column; + justify-content: center; + align-items: center; +} + +.title { + font-size: 100px; +} diff --git a/storage/storagestatisticsjstest/src/main/js/default/pages/index/index.hml b/storage/storagestatisticsjstest/src/main/js/default/pages/index/index.hml new file mode 100644 index 0000000000000000000000000000000000000000..f629c71a9be857db6cdf94149652a191b9b272ea --- /dev/null +++ b/storage/storagestatisticsjstest/src/main/js/default/pages/index/index.hml @@ -0,0 +1,5 @@ +
+ + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/storage/storagestatisticsjstest/src/main/js/default/pages/index/index.js b/storage/storagestatisticsjstest/src/main/js/default/pages/index/index.js new file mode 100644 index 0000000000000000000000000000000000000000..15f94c33513b18b65911ca987de378af271c52e0 --- /dev/null +++ b/storage/storagestatisticsjstest/src/main/js/default/pages/index/index.js @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2021 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import app from '@system.app' + +import {Core} from 'deccjsunit/index' + +const injectRef = Object.getPrototypeOf(global) || global +injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') + +export default { + data: { + title: '' + }, + onInit() { + this.title = this.$t('strings.world'); + }, + onShow() { + console.info('onShow finish') + const core = Core.getInstance() + core.init() + const configService = core.getDefaultService('config') + configService.setConfig(this) + require('../../test/List.test') + core.execute() + }, + onReady() { + }, +} \ No newline at end of file diff --git a/storage/storagestatisticsjstest/src/main/js/default/test/Common.js b/storage/storagestatisticsjstest/src/main/js/default/test/Common.js new file mode 100644 index 0000000000000000000000000000000000000000..1a034201399cfc4d2c807e08569b0e97b83e5dd5 --- /dev/null +++ b/storage/storagestatisticsjstest/src/main/js/default/test/Common.js @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2021 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import storageStatistics from "@ohos.storagestatistics"; +import volumeManager from "@ohos.volumemanager"; +import featureAbility from '@ohos.ability.featureAbility'; +import { + describe, + beforeAll, + beforeEach, + afterEach, + afterAll, + it, + expect, +} from "deccjsunit/index"; + +export function randomString(num) { + let len = num; + var $chars = "helloWord"; + var maxPos = $chars.length; + var pwd = ""; + for (var i = 0; i < len; i++) { + pwd += $chars.charAt(Math.floor(Math.random() * maxPos)); + } + return pwd; +} + +function isIntNum(val) { + return typeof val === "number" && val % 1 === 0; +} + +function isNegativeNum(val) { + return val < 0; +} + +function isString(str) { + return typeof str == "string" && str.constructor == String; +} + +function isBoolean(val) { + return typeof val == "boolean"; +} + +function isInclude(error, message) { + return error.toString().indexOf(message) != -1; +} + +function isArray(object) { + return object && typeof object === 'object' && Array == object.constructor; +} + +async function getPackageName() { + console.log("featureAbility:" + JSON.stringify(featureAbility)); + let want = await featureAbility.getWant(); + return want.bundleName; +} + +export { + isIntNum, + isNegativeNum, + isString, + isBoolean, + isInclude, + isArray, + getPackageName, + describe, + beforeAll, + beforeEach, + afterEach, + afterAll, + it, + expect, + storageStatistics, + volumeManager, +}; diff --git a/storage/storagestatisticsjstest/src/main/js/default/test/List.test.js b/storage/storagestatisticsjstest/src/main/js/default/test/List.test.js new file mode 100644 index 0000000000000000000000000000000000000000..7261c436375874e303322c3b4cea6943e71074cf --- /dev/null +++ b/storage/storagestatisticsjstest/src/main/js/default/test/List.test.js @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2021 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +require('./StorageStatistics.test.js') diff --git a/storage/storagestatisticsjstest/src/main/js/default/test/StorageStatistics.test.js b/storage/storagestatisticsjstest/src/main/js/default/test/StorageStatistics.test.js new file mode 100644 index 0000000000000000000000000000000000000000..41d1ebd4c2e65705c432ab35b3b328aee1f40b53 --- /dev/null +++ b/storage/storagestatisticsjstest/src/main/js/default/test/StorageStatistics.test.js @@ -0,0 +1,150 @@ +/* + * Copyright (C) 2021 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { + isIntNum, + isNegativeNum, + describe, + it, + expect, + storageStatistics, + getPackageName, +} from "./Common"; + +describe("storageStatistics", function () { + + /** + * @tc.number SUB_DF_STORAGE_STATISTICS_GET_BUNDLE_STAT_0000 + * @tc.name storage_statistics_test_get_bundle_stat_async_000 + * @tc.desc Test getBundleStats() interfaces, returned in promise mode. + * @tc.size MEDIUM + * @tc.type Function + * @tc.level Level 0 + * @tc.require + */ + it("storage_statistics_test_get_bundle_stat_async_000", 0, async function (done) { + try { + let packageName = await getPackageName(); + let bundleStat = await storageStatistics.getBundleStats("id", packageName); + expect(bundleStat != null).assertTrue(); + expect(isIntNum(bundleStat.appSize) && !isNegativeNum(bundleStat.appSize)).assertTrue(); + expect(isIntNum(bundleStat.cacheSize) && !isNegativeNum(bundleStat.cacheSize)).assertTrue(); + expect(isIntNum(bundleStat.dataSize) && !isNegativeNum(bundleStat.dataSize)).assertTrue(); + console.log(`promise bundleStat ===---=== ${JSON.stringify(bundleStat)}`); + } catch (e) { + console.log("storage_statistics_test_get_bundle_stat_async_000 has failed for " + e); + expect(null).assertFail(); + } + done(); + }); + + /** + * @tc.number SUB_DF_STORAGE_STATISTICS_GET_BUNDLE_STAT_0010 + * @tc.name storage_statistics_test_get_bundle_stat_async_001 + * @tc.desc Test getBundleStats() interfaces , returned in callback mode. + * @tc.size MEDIUM + * @tc.type Function + * @tc.level Level 0 + * @tc.require + */ + it("storage_statistics_test_get_bundle_stat_async_001", 0, async function (done) { + try { + let packageName = await getPackageName(); + storageStatistics.getBundleStats("id", packageName, (error, bundleStat) => { + expect(bundleStat != null).assertTrue(); + expect(isIntNum(bundleStat.appSize) && !isNegativeNum(bundleStat.appSize)).assertTrue(); + expect(isIntNum(bundleStat.cacheSize) && !isNegativeNum(bundleStat.cacheSize)).assertTrue(); + expect(isIntNum(bundleStat.dataSize) && !isNegativeNum(bundleStat.dataSize)).assertTrue(); + console.log(`callback bundleStat ===---=== ${JSON.stringify(bundleStat)}`); + }); + } catch (e) { + console.log("storage_statistics_test_get_bundle_stat_async_001 has failed for " + e); + expect(null).assertFail(); + } + done(); + }); + + /** + * @tc.number SUB_DF_STORAGE_STATISTICS_GET_BUNDLE_STAT_0020 + * @tc.name storage_statistics_test_get_bundle_stat_async_002 + * @tc.desc Test getBundleStats() interfaces, the parameter packagename is errors, returning error results. + * @tc.size MEDIUM + * @tc.type Function + * @tc.level Level 0 + * @tc.require + */ + it("storage_statistics_test_get_bundle_stat_async_002", 0, async function (done) { + try { + let bundleStat = await storageStatistics.getBundleStats("id", "packageName"); + expect(bundleStat != null).assertTrue(); + expect(bundleStat.appSize == 0).assertTrue(); + expect(bundleStat.cacheSize == 0).assertTrue(); + expect(bundleStat.dataSize == 0).assertTrue(); + console.log(`async_002 bundleStat ===---=== ${JSON.stringify(bundleStat)}`); + } catch (e) { + console.log("storage_statistics_test_get_bundle_stat_async_002 has failed for " + e); + expect(!!e).assertTrue(); + } + done(); + }); + + /** + * @tc.number SUB_DF_STORAGE_STATISTICS_GET_BUNDLE_STAT_0030 + * @tc.name storage_statistics_test_get_bundle_stat_async_003 + * @tc.desc Test getBundleStats() interfaces, No parameters, returns the correct result. + * @tc.size MEDIUM + * @tc.type Function + * @tc.level Level 0 + * @tc.require + */ + it("storage_statistics_test_get_bundle_stat_async_003", 0, async function (done) { + try { + let packageName = await getPackageName(); + let bundleStat = await storageStatistics.getBundleStats("", packageName); + expect(bundleStat != null).assertTrue(); + expect(isIntNum(bundleStat.appSize) && !isNegativeNum(bundleStat.appSize)).assertTrue(); + expect(isIntNum(bundleStat.cacheSize) && !isNegativeNum(bundleStat.cacheSize)).assertTrue(); + expect(isIntNum(bundleStat.dataSize) && !isNegativeNum(bundleStat.dataSize)).assertTrue(); + console.log(`async_003 bundleStat ===---=== ${JSON.stringify(bundleStat)}`); + } catch (e) { + console.log("storage_statistics_test_get_bundle_stat_async_003 has failed for " + e); + expect(!!e).assertTrue(); + } + done(); + }); + + /** + * @tc.number SUB_DF_STORAGE_STATISTICS_GET_BUNDLE_STAT_0040 + * @tc.name storage_statistics_test_get_bundle_stat_async_004 + * @tc.desc Test getBundleStats() interfaces, the parameter packagename does not exist, returning error results. + * @tc.size MEDIUM + * @tc.type Function + * @tc.level Level 0 + * @tc.require + */ + it("storage_statistics_test_get_bundle_stat_async_004", 0, async function (done) { + try { + let bundleStat = await storageStatistics.getBundleStats("id", ""); + expect(bundleStat != null).assertTrue(); + expect(bundleStat.appSize == 0).assertTrue(); + expect(bundleStat.cacheSize == 0).assertTrue(); + expect(bundleStat.dataSize == 0).assertTrue(); + console.log(`async_004 bundleStat ===---=== ${JSON.stringify(bundleStat)}`); + } catch (e) { + console.log("storage_statistics_test_get_bundle_stat_async_004 has failed for " + e); + expect(!!e).assertTrue(); + } + done(); + }); +}); diff --git a/storage/storagestatisticsjstest/src/main/resources/base/element/string.json b/storage/storagestatisticsjstest/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..e5ad4ce19aa231fbeaf59fda975d86355dd20204 --- /dev/null +++ b/storage/storagestatisticsjstest/src/main/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "statistics" + }, + { + "name": "mainability_description", + "value": "JS_Grid Ability" + } + ] +} \ No newline at end of file diff --git a/storage/storagestatisticsjstest/src/main/resources/base/media/icon.png b/storage/storagestatisticsjstest/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/storage/storagestatisticsjstest/src/main/resources/base/media/icon.png differ diff --git a/storage/storagevolumesjstest/src/main/js/default/test/VolumeManager.test.js b/storage/storagevolumesjstest/src/main/js/default/test/VolumeManager.test.js index 3d1c169c22244fe5c04a9b159d97660eb0d21d69..4297786d5165ec0ad9d20ee57de08a06af5654ce 100644 --- a/storage/storagevolumesjstest/src/main/js/default/test/VolumeManager.test.js +++ b/storage/storagevolumesjstest/src/main/js/default/test/VolumeManager.test.js @@ -26,6 +26,7 @@ import { } from "./Common"; describe("volumeManager", function () { + /** * @tc.number SUB_DF_VOLUME_MANAGER_GET_ALL_VOLUMES_0000 * @tc.name volume_manager_test_get_all_volumes_async_000