diff --git a/storage/BUILD.gn b/storage/BUILD.gn index 8fa18b349b45b47e873f2316e1a516edee8bfd62..b4c412db4f9390c83de53e7d6e6abf92257f9145 100644 --- a/storage/BUILD.gn +++ b/storage/BUILD.gn @@ -16,6 +16,7 @@ group("storage") { testonly = true if (is_standard_system) { deps = [ + "storageenvironmentjstest:storageenvironment_js_test", "storagefileioerrorjstest:storagefileioerror_js_test", "storagefileiojstest:storagefileio_js_test", "storagefilejstest:storagefile_js_test", diff --git a/storage/storageenvironmentjstest/BUILD.gn b/storage/storageenvironmentjstest/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..48bc8bec2afb62368fd04b1cae8221f3ac4fdfec --- /dev/null +++ b/storage/storageenvironmentjstest/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("storageenvironment_js_test") { + hap_profile = "./src/main/config.json" + deps = [ + ":storageenvironment_js_assets", + ":storageenvironment_js_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsStorageEnvironmentJsTest" +} +ohos_js_assets("storageenvironment_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("storageenvironment_js_resources") { + sources = [ "./src/main/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/storage/storageenvironmentjstest/Test.json b/storage/storageenvironmentjstest/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..84b8f1655e073e4c8355974f636eefa18e7bd1d8 --- /dev/null +++ b/storage/storageenvironmentjstest/Test.json @@ -0,0 +1,18 @@ +{ + "description": "Configuration for storage environment Tests", + "driver": { + "type": "JSUnitTest", + "test-timeout": "60000", + "package": "ohos.acts.storage.environment", + "shell-timeout": "60000" + }, + "kits": [ + { + "test-file-name": [ + "ActsStorageEnvironmentJsTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} \ No newline at end of file diff --git a/storage/storageenvironmentjstest/signature/openharmony_sx.p7b b/storage/storageenvironmentjstest/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/storage/storageenvironmentjstest/signature/openharmony_sx.p7b differ diff --git a/storage/storageenvironmentjstest/src/main/config.json b/storage/storageenvironmentjstest/src/main/config.json new file mode 100644 index 0000000000000000000000000000000000000000..2996364c84ad95ece184bdc7216cbb7aff02d080 --- /dev/null +++ b/storage/storageenvironmentjstest/src/main/config.json @@ -0,0 +1,61 @@ +{ + "app": { + "bundleName": "ohos.acts.storage.environment", + "vendor": "example", + "version": { + "code": 1000000, + "name": "1.0.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5 + } + }, + "deviceConfig": {}, + "module": { + "package": "ohos.acts.storage.environment", + "name": ".MyApplication", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": true + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "name": "ohos.acts.storage.environment.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:app_name", + "type": "page", + "launchType": "standard", + "visible": true + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } +} \ No newline at end of file diff --git a/storage/storageenvironmentjstest/src/main/js/default/app.js b/storage/storageenvironmentjstest/src/main/js/default/app.js new file mode 100644 index 0000000000000000000000000000000000000000..9e0cea585dc50daf83d96f709fa721040b978526 --- /dev/null +++ b/storage/storageenvironmentjstest/src/main/js/default/app.js @@ -0,0 +1,23 @@ +/* + * 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.environment onCreate'); + }, + onDestroy() { + console.info('ohos.acts.storage.environment onDestroy'); + } +}; diff --git a/storage/storageenvironmentjstest/src/main/js/default/i18n/en-US.json b/storage/storageenvironmentjstest/src/main/js/default/i18n/en-US.json new file mode 100644 index 0000000000000000000000000000000000000000..ead52ed2e09ec82aaf7aa9f4e714ed39ea88308e --- /dev/null +++ b/storage/storageenvironmentjstest/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/storageenvironmentjstest/src/main/js/default/i18n/zh-CN.json b/storage/storageenvironmentjstest/src/main/js/default/i18n/zh-CN.json new file mode 100644 index 0000000000000000000000000000000000000000..3f48f2585b24a8fe4a745e8ee2972a9e991a7803 --- /dev/null +++ b/storage/storageenvironmentjstest/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/storageenvironmentjstest/src/main/js/default/pages/index/index.css b/storage/storageenvironmentjstest/src/main/js/default/pages/index/index.css new file mode 100644 index 0000000000000000000000000000000000000000..6fda792753f2e15f22b529c7b90a82185b2770bf --- /dev/null +++ b/storage/storageenvironmentjstest/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/storageenvironmentjstest/src/main/js/default/pages/index/index.hml b/storage/storageenvironmentjstest/src/main/js/default/pages/index/index.hml new file mode 100644 index 0000000000000000000000000000000000000000..f64b040a5ae394dbaa5e185e1ecd4f4556b92184 --- /dev/null +++ b/storage/storageenvironmentjstest/src/main/js/default/pages/index/index.hml @@ -0,0 +1,5 @@ +
+ + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/storage/storageenvironmentjstest/src/main/js/default/pages/index/index.js b/storage/storageenvironmentjstest/src/main/js/default/pages/index/index.js new file mode 100644 index 0000000000000000000000000000000000000000..61921cf3ba7d0a16a9c2edb9b9f04c1fb69a6333 --- /dev/null +++ b/storage/storageenvironmentjstest/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/storageenvironmentjstest/src/main/js/default/test/Common.js b/storage/storageenvironmentjstest/src/main/js/default/test/Common.js new file mode 100644 index 0000000000000000000000000000000000000000..6336fb2b509d3617b29b32526ca75c049e184e00 --- /dev/null +++ b/storage/storageenvironmentjstest/src/main/js/default/test/Common.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 environment from '@ohos.environment'; + +import { + describe, beforeAll, beforeEach, afterEach, afterAll, it, expect +} +from 'deccjsunit/index' + +function isIntNum(val) { + return typeof val === 'number' && val % 1 === 0; +} +function isString(str) { + return typeof str == "string" && str.constructor == String; +} + +export { + environment, + isIntNum, + isString, + describe, + beforeAll, + beforeEach, + afterEach, + afterAll, + it, + expect, +}; \ No newline at end of file diff --git a/storage/storageenvironmentjstest/src/main/js/default/test/List.test.js b/storage/storageenvironmentjstest/src/main/js/default/test/List.test.js new file mode 100644 index 0000000000000000000000000000000000000000..ae4cbf865a3ed1437ef38e35b1b75e0e135095ab --- /dev/null +++ b/storage/storageenvironmentjstest/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("./environment.test.js"); diff --git a/storage/storageenvironmentjstest/src/main/js/default/test/environment.test.js b/storage/storageenvironmentjstest/src/main/js/default/test/environment.test.js new file mode 100644 index 0000000000000000000000000000000000000000..5c6f0567f5b657261140369bd8fab52bfa15cb48 --- /dev/null +++ b/storage/storageenvironmentjstest/src/main/js/default/test/environment.test.js @@ -0,0 +1,196 @@ +/* + * 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, + describe, + it, + expect, + environment, + isString, +} from "./Common"; + +describe("environment", function () { + + /** + * @tc.number SUB_DF_ENVIRONMENT_GET_STORAGE_DATA_0000 + * @tc.name environment_test_get_storage_data_async_000 + * @tc.desc Test getStorageDataDir() interfaces. + * @tc.size MEDIUM + * @tc.type Function + * @tc.level Level 0 + * @tc.require + */ + it("environment_test_get_storage_data_async_000", 0, async function (done) { + try { + let url = await environment.getStorageDataDir(); + expect(isString(url)).assertTrue(); + expect(url == "/data").assertTrue(); + console.log("promise environment_test_get_storage_data_async_000:" + url); + done(); + } catch (e) { + console.log("environment_test_get_storage_data_async_000 has failed for " + e); + expect(null).assertFail(); + } + }); + + /** + * @tc.number SUB_DF_ENVIRONMENT_GET_STORAGE_DATA_0010 + * @tc.name environment_test_get_storage_data_async_001 + * @tc.desc Test getStorageDataDir() interfaces. + * @tc.size MEDIUM + * @tc.type Function + * @tc.level Level 0 + * @tc.require + */ + it("environment_test_get_storage_data_async_001", 0, async function (done) { + try { + environment.getStorageDataDir((err, url) => { + expect(isString(url)).assertTrue(); + expect(url == "/data").assertTrue(); + console.log("callback environment_test_get_storage_data_async_001:" + url); + done(); + }); + } catch (e) { + console.log("environment_test_get_storage_data_async_001 has failed for " + e); + expect(null).assertFail(); + } + }); + + /** + * @tc.number SUB_DF_ENVIRONMENT_GET_STORAGE_DATA_0020 + * @tc.name environment_test_get_storage_data_async_002 + * @tc.desc Test getStorageDataDir() interfaces. + * @tc.size MEDIUM + * @tc.type Function + * @tc.level Level 0 + * @tc.require + */ + it("environment_test_get_storage_data_async_002", 0, async function (done) { + try { + await environment.getStorageDataDir("123%$*&^"); + expect(null).assertFail(); + } catch (e) { + console.log("environment_test_get_storage_data_async_002 has failed for " + e); + expect(!!e).assertTrue(); + } + done(); + }); + + /** + * @tc.number SUB_DF_ENVIRONMENT_GET_STORAGE_DATA_0030 + * @tc.name environment_test_get_storage_data_async_003 + * @tc.desc Test getStorageDataDir() interfaces. + * @tc.size MEDIUM + * @tc.type Function + * @tc.level Level 0 + * @tc.require + */ + it("environment_test_get_storage_data_async_003", 0, async function (done) { + try { + await environment.getStorageDataDir(true); + expect(null).assertFail(); + } catch (e) { + console.log("environment_test_get_storage_data_async_003 has failed for " + e); + expect(!!e).assertTrue(); + } + done(); + }); + + /** + * @tc.number SUB_DF_ENVIRONMENT_GET_USER_DATA_0000 + * @tc.name environment_test_get_user_data_async_000 + * @tc.desc Test getUserDataDir() interfaces. + * @tc.size MEDIUM + * @tc.type Function + * @tc.level Level 0 + * @tc.require + */ + it("environment_test_get_user_data_async_000", 0, async function (done) { + try { + let url = await environment.getUserDataDir(); + expect(isString(url)).assertTrue(); + expect(url == "/storage/media/0/local").assertTrue(); + console.log("promise environment_test_get_user_data_async_000:" + url); + done(); + } catch (e) { + console.log("environment_test_get_user_data_async_000 has failed for " + e); + expect(null).assertFail(); + } + }); + + /** + * @tc.number SUB_DF_ENVIRONMENT_GET_USER_DATA_0010 + * @tc.name environment_test_get_user_data_async_001 + * @tc.desc Test getUserDataDir() interfaces. + * @tc.size MEDIUM + * @tc.type Function + * @tc.level Level 0 + * @tc.require + */ + it("environment_test_get_user_data_async_001", 0, async function (done) { + try { + environment.getUserDataDir((err, url) => { + expect(isString(url)).assertTrue(); + expect(url == "/storage/media/0/local").assertTrue(); + console.log("callback environment_test_get_user_data_async_001:" + url); + done(); + }); + } catch (e) { + console.log("callback environment_test_get_user_data_async_001 has failed for " + e); + expect(null).assertFail(); + } + }); + + /** + * @tc.number SUB_DF_ENVIRONMENT_GET_USER_DATA_0020 + * @tc.name environment_test_get_user_data_async_002 + * @tc.desc Test getUserDataDir() interfaces. + * @tc.size MEDIUM + * @tc.type Function + * @tc.level Level 0 + * @tc.require + */ + it("environment_test_get_user_data_async_002", 0, async function (done) { + try { + await environment.getUserDataDir("123#$%^&*"); + expect(null).assertFail(); + } catch (e) { + console.log("environment_test_get_user_data_async_002 has failed for " + e); + expect(!!e).assertTrue(); + } + done(); + }); + + /** + * @tc.number SUB_DF_ENVIRONMENT_GET_USER_DATA_0030 + * @tc.name environment_test_get_user_data_async_003 + * @tc.desc Test getUserDataDir() interfaces. + * @tc.size MEDIUM + * @tc.type Function + * @tc.level Level 0 + * @tc.require + */ + it("environment_test_get_user_data_async_003", 0, async function (done) { + try { + await environment.getUserDataDir(true); + expect(null).assertFail(); + } catch (e) { + console.log("environment_test_get_user_data_async_003 has failed for " + e); + expect(!!e).assertTrue(); + } + done(); + }); +}); diff --git a/storage/storageenvironmentjstest/src/main/resources/base/element/string.json b/storage/storageenvironmentjstest/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..bc72e00a930d88121702cd058346062a4bbe604c --- /dev/null +++ b/storage/storageenvironmentjstest/src/main/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "app_name", + "value": "Storageenvironmentjstest" + }, + { + "name": "mainability_description", + "value": "JS_Phone_Empty Feature Ability" + } + ] +} \ No newline at end of file diff --git a/storage/storageenvironmentjstest/src/main/resources/base/media/icon.png b/storage/storageenvironmentjstest/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/storage/storageenvironmentjstest/src/main/resources/base/media/icon.png differ