diff --git a/startup/startup_standard/BUILD.gn b/startup/startup_standard/BUILD.gn index 928cdcbb59b9875c9b94f3f53f1ebfba04b4f751..465d36b6c33e1d4624894497b0826bddd290ea32 100644 --- a/startup/startup_standard/BUILD.gn +++ b/startup/startup_standard/BUILD.gn @@ -17,8 +17,7 @@ group("startup_standard") { testonly = true if (is_standard_system) { deps = [ - "deviceinfo:startup_deviceinfo_js_test", - "systemparamter:startup_sysparam_js_test", + "deviceinfo:startup_deviceinfo_js_test" ] } } diff --git a/startup/startup_standard/systemparamter/BUILD.gn b/startup/startup_standard/systemparamter/BUILD.gn deleted file mode 100644 index ed14c5697408f88af58ee1914d504b57595e3581..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/BUILD.gn +++ /dev/null @@ -1,31 +0,0 @@ -# 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("startup_sysparam_js_test") { - hap_profile = "./src/main/config.json" - deps = [ - ":startup_js_assets", - ":startup_js_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsStartupSysParamTest" -} -ohos_js_assets("startup_js_assets") { - source_dir = "./src/main/js/default" -} -ohos_resources("startup_js_resources") { - sources = [ "./src/main/resources" ] - hap_profile = "./src/main/config.json" -} diff --git a/startup/startup_standard/systemparamter/Test.json b/startup/startup_standard/systemparamter/Test.json deleted file mode 100644 index f3ebf51e84e33196e253e2af9ad035360bdb3741..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/Test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "description": "Configuration for startup sysparam js api Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "300000", - "package": "ohos.acts.startup.sysparam.function", - "shell-timeout": "60000" - }, - "kits": [ - { - "test-file-name": [ - "ActsStartupSysParamTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} diff --git a/startup/startup_standard/systemparamter/signature/openharmony_sx.p7b b/startup/startup_standard/systemparamter/signature/openharmony_sx.p7b deleted file mode 100644 index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..0000000000000000000000000000000000000000 Binary files a/startup/startup_standard/systemparamter/signature/openharmony_sx.p7b and /dev/null differ diff --git a/startup/startup_standard/systemparamter/src/main/config.json b/startup/startup_standard/systemparamter/src/main/config.json deleted file mode 100644 index d0745842e2b0cf82a1cae511c669f8f7cee2d59d..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/config.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "app": { - "bundleName": "ohos.acts.startup.sysparam.function", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 - } - }, - "deviceConfig": {}, - "module": { - "package": "ohos.acts.startup.sysparam.function", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "abilities": [ - { - "visible": true, - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "name": "ohos.acts.startup.sysparam.function.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:app_name", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } -} diff --git a/startup/startup_standard/systemparamter/src/main/js/default/app.js b/startup/startup_standard/systemparamter/src/main/js/default/app.js deleted file mode 100644 index e423f4bce4698ec1d7dc86c3eea3990a5e7b1085..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/default/app.js +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -}; diff --git a/startup/startup_standard/systemparamter/src/main/js/default/i18n/en-US.json b/startup/startup_standard/systemparamter/src/main/js/default/i18n/en-US.json deleted file mode 100644 index 25b4997e50df3af032339fe395b293b95a44c275..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/default/i18n/en-US.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "OpenHarmony" - } -} \ No newline at end of file diff --git a/startup/startup_standard/systemparamter/src/main/js/default/i18n/zh-CN.json b/startup/startup_standard/systemparamter/src/main/js/default/i18n/zh-CN.json deleted file mode 100644 index b9543e1912f72ea9075609981bf64496330cbb41..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/default/i18n/zh-CN.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "您好", - "world": "鸿蒙OS" - } -} \ No newline at end of file diff --git a/startup/startup_standard/systemparamter/src/main/js/default/pages/index/index.css b/startup/startup_standard/systemparamter/src/main/js/default/pages/index/index.css deleted file mode 100644 index 6fda792753f2e15f22b529c7b90a82185b2770bf..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/default/pages/index/index.css +++ /dev/null @@ -1,9 +0,0 @@ -.container { - flex-direction: column; - justify-content: center; - align-items: center; -} - -.title { - font-size: 100px; -} diff --git a/startup/startup_standard/systemparamter/src/main/js/default/pages/index/index.hml b/startup/startup_standard/systemparamter/src/main/js/default/pages/index/index.hml deleted file mode 100644 index f64b040a5ae394dbaa5e185e1ecd4f4556b92184..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/default/pages/index/index.hml +++ /dev/null @@ -1,5 +0,0 @@ -
- - {{ $t('strings.hello') }} {{ title }} - -
diff --git a/startup/startup_standard/systemparamter/src/main/js/default/pages/index/index.js b/startup/startup_standard/systemparamter/src/main/js/default/pages/index/index.js deleted file mode 100644 index 0c564bb030d56eb17a14063cee23df41abced5ba..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/default/pages/index/index.js +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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 {Core, ExpectExtend} 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() - const expectExtend = new ExpectExtend({ - 'id': 'extend' - }) - core.addService('expect', expectExtend) - core.init() - - const configService = core.getDefaultService('config') - configService.setConfig(this) - - require('../../test/List.test') - core.execute() - }, - onReady() { - }, -} diff --git a/startup/startup_standard/systemparamter/src/main/js/default/test/List.test.js b/startup/startup_standard/systemparamter/src/main/js/default/test/List.test.js deleted file mode 100644 index febf35778507cf7717120d80d01436603cd8cfab..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/default/test/List.test.js +++ /dev/null @@ -1,18 +0,0 @@ -/* - * 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('./SysParametersJs.test.js') - - - diff --git a/startup/startup_standard/systemparamter/src/main/js/default/test/SysParametersJs.test.js b/startup/startup_standard/systemparamter/src/main/js/default/test/SysParametersJs.test.js deleted file mode 100644 index 25dc6815c44ce33110b54f8d61c9437cc7846449..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/default/test/SysParametersJs.test.js +++ /dev/null @@ -1,324 +0,0 @@ -/* - * 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. - */ - -// @ts-nocheck - -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index' -import systemparameter from '@ohos.systemParameter' - -describe('SystemParameterTest', function () { - - console.info('SystemParameterTest start################################start'); - - function SetParameter(key, value) { - let tmp = value; - if (value === "" || value === undefined) { - let myDate = new Date(); - tmp = myDate.toLocaleString(); - } - - console.info('SetParameter key ' + key); - console.info('SetParameter value ' + tmp); - try { - systemparameter.setSync(key, tmp); - } catch (err) { - expect(ret).assertTrue(); - console.info('SetParameter error: ' + err); - } - console.info('SetParameter key' + key + " end"); - } - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0801 - * @tc.name testWaitPromise01 - * @tc.desc Waits the value of the attribute with the specified key. - */ - it('system_parameter_test_0801', 0, async function (done) { - console.info('system_parameter_test_0801 start'); - var ret = false; - try { - var parameterInfo = systemparameter.wait("test.wait_param.101", "100", 1); - parameterInfo.then(function (result) { // timeout - console.info("system_parameter_test_0801 test.wait_param.101 success: " + result); - expect(ret).assertTrue(); - }).catch(function (err) { - ret = true; - console.info("system_parameter_test_0801 test.wait_param.101 error: " + err.code); - expect(ret).assertTrue(); - done(); - }); - } catch (e) { - expect(ret).assertTrue(); - console.info("promise get input error: " + e); - } - console.info('system_parameter_test_0801 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0802 - * @tc.name testWaitPromise02 - * @tc.desc Waits the value of the attribute with the specified key. - */ - it('system_parameter_test_0802', 0, async function (done) { - console.info('system_parameter_test_0802 start'); - var ret = false; - try { - var parameterInfo = systemparameter.wait("test.wait_param.102", "", 1); - parameterInfo.then(function (result) { // timeout - console.info("system_parameter_test_0802 test.wait_param.102 success: "); - expect(ret).assertTrue(); - done(); - }).catch(function (err) { - ret = true; - console.info("system_parameter_test_0802 test.wait_param.102 error: " + err.code); - expect(ret).assertTrue(); - done(); - }); - } catch (e) { - expect(ret).assertTrue(); - console.info("promise get input error: " + e); - } - console.info('system_parameter_test_0802 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0803 - * @tc.name testWaitPromise03 - * @tc.desc Waits the value of the attribute with the specified key. - */ - it('system_parameter_test_0803', 0, async function (done) { - console.info('system_parameter_test_0803 start'); - var ret = false; - SetParameter("test.wait_param.103", "103"); - try { - var parameterInfo = systemparameter.wait("test.wait_param.103", "103", 1); - parameterInfo.then(function (result) { // ok - ret = true; - console.info("system_parameter_test_0803 test.wait_param.103 success: "); - expect(ret).assertTrue(); - done(); - }).catch(function (err) { - expect(ret).assertTrue(); - console.info("system_parameter_test_0803 test.wait_param.103 error: " + err.code); - }); - } catch (e) { - expect(ret).assertTrue(); - console.info("promise get input error: " + e); - } - console.info('system_parameter_test_0803 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0804 - * @tc.name testWaitPromise04 - * @tc.desc Waits the value of the attribute with the specified key. - */ - it('system_parameter_test_0804', 0, async function (done) { - console.info('system_parameter_test_0804 start'); - var ret = false; - SetParameter("test.wait_param.104", "104"); - try { - var parameterInfo = systemparameter.wait("test.wait_param.104", "*", 1); - parameterInfo.then(function (result) { // ok - ret = true; - console.info("system_parameter_test_0804 test.wait_param.104 success"); - expect(ret).assertTrue(); - done(); - }).catch(function (err) { - console.info("system_parameter_test_0804 test.wait_param.104 error: " + err.code); - expect(ret).assertTrue(); - }); - } catch (e) { - expect(ret).assertTrue(); - console.info("promise get input error: " + e); - } - console.info('system_parameter_test_0804 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0805 - * @tc.name testWaitPromise05 - * @tc.desc Waits the value of the attribute with the specified key. - */ - it('system_parameter_test_0805', 0, async function (done) { - console.info('system_parameter_test_0805 start'); - var ret = false; - SetParameter("test.wait_param.105", "105"); - try { - var parameterInfo = systemparameter.wait("test.wait_param.105", "*", -1); - parameterInfo.then(function (result) { - ret = true; - console.info("system_parameter_test_0805 test.wait_param.105 success"); - expect(ret).assertTrue(); - done(); - }).catch(function (err) { - console.info("system_parameter_test_0805 test.wait_param.105 error: " + err.code); - expect(ret).assertTrue(); - }); - } catch (e) { - expect(ret).assertTrue(); - console.info("promise get input error: " + e); - } - console.info('system_parameter_test_0805 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0806 - * @tc.name testWait01 - * @tc.desc Waits the value of the attribute with the specified key. - */ - it('system_parameter_test_0806', 0, async function (done) { - console.info('system_parameter_test_0806 start'); - var ret = false; - try { - systemparameter.wait("test.wait_param.201", "100", 1, function (err, data) { - if (err == undefined || err.code === 0) { - console.info("system_parameter_test_0806 test.wait_param.201 success") - } else { - ret = true; // wait timeout - console.info("system_parameter_test_0806 test.wait_param.201 err:" + err.code); - expect(ret).assertTrue(); - } - }); - } catch (e) { - expect(ret).assertTrue(); - console.info("system_parameter_test_0806 get input error: " + e); - } - setTimeout(function () { - expect(ret).assertTrue(); - done(); - }, '2000'); - console.info('system_parameter_test_0806 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0807 - * @tc.name testWait02 - * @tc.desc Waits the value of the attribute with the specified key. - */ - it('system_parameter_test_0807', 0, async function (done) { - console.info('system_parameter_test_0807 start'); - var ret = false; - try { - ret = true; - systemparameter.wait("test.wait_param.202", "", 1, function (err, data) { - if (err == undefined || err.code === 0) { // timeout - ret = false; - console.info("system_parameter_test_0807 test.wait_param.202 success"); - } else { - console.info("system_parameter_test_0807 callback test.wait_param.202 err:" + err.code); - } - expect(ret).assertTrue(); - done(); - }); - } catch (e) { - ret = true; - console.info("get input error: " + e); - } - expect(ret).assertTrue(); - console.info('system_parameter_test_0807 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0808 - * @tc.name testWait03 - * @tc.desc Waits the value of the attribute with the specified key. - */ - it('system_parameter_test_0808', 0, async function (done) { - console.info('system_parameter_test_0808 start'); - var ret = false; - SetParameter("test.wait_param.203", "103"); - try { - systemparameter.wait("test.wait_param.203", "103", 1, function (err, data) { - if (err == undefined || err.code === 0) { - ret = true; - console.info("system_parameter_test_0808 test.wait_param.203 success") - } else { - console.info("system_parameter_test_0808 test.wait_param.203 err:" + err.code) - } - expect(ret).assertTrue(); - }); - } catch (e) { - expect(ret).assertTrue(); - console.info("get input error: " + e); - } - setTimeout(function () { - expect(ret).assertTrue(); - done(); - }, '1000'); - console.info('system_parameter_test_0808 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0809 - * @tc.name testWait04 - * @tc.desc Waits the value of the attribute with the specified key. - */ - it('system_parameter_test_0809', 0, async function (done) { - console.info('system_parameter_test_0809 start'); - var ret = false; - SetParameter("test.wait_param.204", "104"); - try { - systemparameter.wait("test.wait_param.204", "*", 1, function (err, data) { - if (err == undefined || err.code === 0) { - ret = true; - console.info("system_parameter_test_0809 test.wait_param.204 success") - } else { - ret = false; - console.info("system_parameter_test_0809 callback test.wait_param.204 err:" + err.code) - } - expect(ret).assertTrue(); - }); - } catch (e) { - expect(ret).assertTrue(); - console.info("promise get input error: " + e); - } - setTimeout(function () { - expect(ret).assertTrue(); - done(); - }, '1000'); - console.info('system_parameter_test_0809 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0810 - * @tc.name testWait05 - * @tc.desc Waits the value of the attribute with the specified key. - */ - it('system_parameter_test_0810', 0, async function (done) { - console.info('system_parameter_test_0810 start'); - var ret = false; - SetParameter("test.wait_param.205", "105"); - try { - systemparameter.wait("test.wait_param.205", "*", 1, function (err, data) { - if (err == undefined || err.code === 0) { - ret = true; - console.info("system_parameter_test_0810 test.wait_param.205 success:" + data) - } else { - console.info("system_parameter_test_0810 test.wait_param.205 err:" + err.code) - } - expect(ret).assertTrue(); - }); - } catch (e) { - ret = false; - console.info("promise get input error: " + e); - } - setTimeout(function () { - expect(ret).assertTrue(); - done(); - }, '1000'); - console.info('system_parameter_test_0810 end'); - }) -}) \ No newline at end of file diff --git a/startup/startup_standard/systemparamter/src/main/resources/base/element/string.json b/startup/startup_standard/systemparamter/src/main/resources/base/element/string.json deleted file mode 100644 index a5239a2b383f65174036cf864f016078bbc4733d..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/resources/base/element/string.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "StartupJSApiTest" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - } - ] -} \ No newline at end of file diff --git a/startup/startup_standard/systemparamter/src/main/resources/base/media/icon.png b/startup/startup_standard/systemparamter/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/startup/startup_standard/systemparamter/src/main/resources/base/media/icon.png and /dev/null differ