diff --git a/startup/startup_standard/BUILD.gn b/startup/startup_standard/BUILD.gn index fbcac9e27c5c1bd643f13abf6b1c07a14eeac652..218da1bf6fdf5979c2c4e758ae9647a9ce84f224 100644 --- a/startup/startup_standard/BUILD.gn +++ b/startup/startup_standard/BUILD.gn @@ -19,7 +19,6 @@ group("startup_standard") { deps = [ "deviceinfo:startup_deviceinfo_js_test", "syscap_ndk:startup_syscapability_js_test", - "systemparamter:startup_sysparam_js_test", ] } } diff --git a/startup/startup_standard/systemparamter/BUILD.gn b/startup/startup_standard/systemparamter/BUILD.gn deleted file mode 100644 index ad0bce621d571dc72818feef69cdc9060da84c02..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/BUILD.gn +++ /dev/null @@ -1,33 +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") { - js2abc = true - hap_profile = "./src/main/config.json" - source_dir = "./src/main/js" -} -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 094a5254f989940ffdb4b13682b715a7ccf36bdb..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/Test.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "description": "Configuration for startup sysparam js api Tests", - "driver": { - "type": "OHJSUnitTest", - "test-timeout": "300000", - "shell-timeout": "300000", - "bundle-name": "ohos.acts.startup.sysparam.function", - "package-name": "ohos.acts.startup.sysparam.function" - }, - "kits": [ - { - "test-file-name": [ - "ActsStartupSysParamTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} \ No newline at end of file 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 2de5efb76b1cec056fcf000b037a816c62625289..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/config.json +++ /dev/null @@ -1,93 +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": ".entry", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "orientation": "unspecified", - "formsEnabled": false, - "name": ".MainAbility", - "srcLanguage": "js", - "srcPath": "MainAbility", - "icon": "$media:icon", - "description": "$string:MainAbility_desc", - "label": "$string:MainAbility_label", - "type": "page", - "visible": true, - "launchType": "standard" - }, - { - "orientation": "unspecified", - "formsEnabled": false, - "name": ".TestAbility", - "srcLanguage": "js", - "srcPath": "TestAbility", - "icon": "$media:icon", - "description": "$string:TestAbility_desc", - "label": "$string:TestAbility_label", - "type": "page", - "visible": true, - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - }, - { - "pages": [ - "pages/index/index" - ], - "name": ".TestAbility", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ], - "testRunner": { - "name": "OpenHarmonyTestRunner", - "srcPath": "TestRunner" - }, - "mainAbility": ".MainAbility", - "srcPath": "" - } -} \ No newline at end of file diff --git a/startup/startup_standard/systemparamter/src/main/js/MainAbility/app.js b/startup/startup_standard/systemparamter/src/main/js/MainAbility/app.js deleted file mode 100644 index e423f4bce4698ec1d7dc86c3eea3990a5e7b1085..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/MainAbility/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/MainAbility/i18n/en-US.json b/startup/startup_standard/systemparamter/src/main/js/MainAbility/i18n/en-US.json deleted file mode 100644 index 25b4997e50df3af032339fe395b293b95a44c275..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/MainAbility/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/MainAbility/i18n/zh-CN.json b/startup/startup_standard/systemparamter/src/main/js/MainAbility/i18n/zh-CN.json deleted file mode 100644 index b9543e1912f72ea9075609981bf64496330cbb41..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/MainAbility/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/MainAbility/pages/index/index.css b/startup/startup_standard/systemparamter/src/main/js/MainAbility/pages/index/index.css deleted file mode 100644 index 6fda792753f2e15f22b529c7b90a82185b2770bf..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/MainAbility/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/MainAbility/pages/index/index.hml b/startup/startup_standard/systemparamter/src/main/js/MainAbility/pages/index/index.hml deleted file mode 100644 index f64b040a5ae394dbaa5e185e1ecd4f4556b92184..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/MainAbility/pages/index/index.hml +++ /dev/null @@ -1,5 +0,0 @@ -
- - {{ $t('strings.hello') }} {{ title }} - -
diff --git a/startup/startup_standard/systemparamter/src/main/js/MainAbility/pages/index/index.js b/startup/startup_standard/systemparamter/src/main/js/MainAbility/pages/index/index.js deleted file mode 100644 index af4eb3e36a12da5f06a27d61d5fd178a846dc866..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/MainAbility/pages/index/index.js +++ /dev/null @@ -1,32 +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. - */ - - -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') - }, - onReady() { - }, -} diff --git a/startup/startup_standard/systemparamter/src/main/js/TestAbility/app.js b/startup/startup_standard/systemparamter/src/main/js/TestAbility/app.js deleted file mode 100644 index cdc31f3dcf031e2f6a7665d9653e53bb649e21c5..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/TestAbility/app.js +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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 - * - * 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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' -import { Hypium } from '@ohos/hypium' -import testsuite from '../test/List.test' - -export default { - onCreate() { - console.info('TestApplication onCreate') - var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() - console.info('start run testcase!!!') - Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) - }, - onDestroy() { - console.info("TestApplication onDestroy"); - } -}; diff --git a/startup/startup_standard/systemparamter/src/main/js/TestAbility/i18n/en-US.json b/startup/startup_standard/systemparamter/src/main/js/TestAbility/i18n/en-US.json deleted file mode 100644 index 3cb24b374b1d919ca8eac0638f361692b603a900..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/TestAbility/i18n/en-US.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "World" - }, - "Files": { - } -} \ No newline at end of file diff --git a/startup/startup_standard/systemparamter/src/main/js/TestAbility/i18n/zh-CN.json b/startup/startup_standard/systemparamter/src/main/js/TestAbility/i18n/zh-CN.json deleted file mode 100644 index c804e32c0c3103929baca5617cdac70be11fdba1..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/TestAbility/i18n/zh-CN.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - }, - "Files": { - } -} \ No newline at end of file diff --git a/startup/startup_standard/systemparamter/src/main/js/TestAbility/pages/index/index.css b/startup/startup_standard/systemparamter/src/main/js/TestAbility/pages/index/index.css deleted file mode 100644 index b1bcd43387ba131cc1d30975ff7508a6f8084a4b..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/TestAbility/pages/index/index.css +++ /dev/null @@ -1,30 +0,0 @@ -.container { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - left: 0px; - top: 0px; - width: 100%; - height: 100%; -} - -.title { - font-size: 60px; - text-align: center; - width: 100%; - height: 40%; - margin: 10px; -} - -@media screen and (device-type: phone) and (orientation: landscape) { - .title { - font-size: 60px; - } -} - -@media screen and (device-type: tablet) and (orientation: landscape) { - .title { - font-size: 100px; - } -} \ No newline at end of file diff --git a/startup/startup_standard/systemparamter/src/main/js/TestAbility/pages/index/index.hml b/startup/startup_standard/systemparamter/src/main/js/TestAbility/pages/index/index.hml deleted file mode 100644 index f629c71a9be857db6cdf94149652a191b9b272ea..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/TestAbility/pages/index/index.hml +++ /dev/null @@ -1,5 +0,0 @@ -
- - {{ $t('strings.hello') }} {{ title }} - -
diff --git a/startup/startup_standard/systemparamter/src/main/js/TestAbility/pages/index/index.js b/startup/startup_standard/systemparamter/src/main/js/TestAbility/pages/index/index.js deleted file mode 100644 index 88b083a7f6b979019d6a2c5ad20b19c5fd43286b..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/TestAbility/pages/index/index.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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 - * - * 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 { - data: { - title: "" - }, - onInit() { - this.title = this.$t('strings.world'); - } -} - - - diff --git a/startup/startup_standard/systemparamter/src/main/js/TestRunner/OpenHarmonyTestRunner.js b/startup/startup_standard/systemparamter/src/main/js/TestRunner/OpenHarmonyTestRunner.js deleted file mode 100644 index c5fa8620ca77d381f20b65a903b833e6e3378c97..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/TestRunner/OpenHarmonyTestRunner.js +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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 - * - * 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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' - -function translateParamsToString(parameters) { - const keySet = new Set([ - '-s class', '-s notClass', '-s suite', '-s itName', - '-s level', '-s testType', '-s size', '-s timeout', - '-s package', '-s dryRun' - ]) - let targetParams = ''; - for (const key in parameters) { - if (keySet.has(key)) { - targetParams += ' ' + key + ' ' + parameters[key] - } - } - return targetParams.trim() -} - - export default { - onPrepare() { - console.info('OpenHarmonyTestRunner OnPrepare') - }, - onRun() { - console.log('OpenHarmonyTestRunner onRun run') - var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() - var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - - var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility' - - var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName - cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters) - var debug = abilityDelegatorArguments.parameters["-D"] - console.info('debug value : '+debug) - if (debug == 'true') - { - cmd += ' -D' - } - console.info('cmd : '+cmd) - abilityDelegator.executeShellCommand(cmd, (err, data) => { - console.info('executeShellCommand : err : ' + JSON.stringify(err)); - console.info('executeShellCommand : data : ' + data.stdResult); - console.info('executeShellCommand : data : ' + data.exitCode); - }) - } -}; diff --git a/startup/startup_standard/systemparamter/src/main/js/test/List.test.js b/startup/startup_standard/systemparamter/src/main/js/test/List.test.js deleted file mode 100644 index 469bc5f5dab086d26182f13efa328f2a87ea7667..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/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. - */ -import SystemParameterTest from './SysParametersJs.test.js' -export default function testsuite() { -SystemParameterTest() -} diff --git a/startup/startup_standard/systemparamter/src/main/js/test/SysParametersJs.test.js b/startup/startup_standard/systemparamter/src/main/js/test/SysParametersJs.test.js deleted file mode 100644 index fc884ddb12efb6a26f7da4e5e7fff524e8df4b73..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/js/test/SysParametersJs.test.js +++ /dev/null @@ -1,325 +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 '@ohos/hypium' -import systemparameter from '@ohos.systemparameter' - -export default function SystemParameterTest() { -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('testWaitPromise01', 0, async function (done) { - console.info('testWaitPromise01 start'); - let ret = false; - try { - var parameterInfo = systemparameter.wait("test.wait_param.101", "100", 1); - parameterInfo.then(function (result) { // timeout - console.info("testWaitPromise01 test.wait_param.101 success: " + result); - expect(ret).assertTrue(); - }).catch(function (err) { - ret = true; - console.info("testWaitPromise01 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('testWaitPromise01 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('testWaitPromise02', 0, async function (done) { - console.info('testWaitPromise02 start'); - let ret = false; - try { - var parameterInfo = systemparameter.wait("test.wait_param.102", "", 1); - parameterInfo.then(function (result) { // timeout - console.info("testWaitPromise02 test.wait_param.102 success: "); - expect(ret).assertTrue(); - done(); - }).catch(function (err) { - ret = true; - console.info("testWaitPromise02 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('testWaitPromise02 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('testWaitPromise03', 0, async function (done) { - console.info('testWaitPromise03 start'); - let 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("testWaitPromise03 test.wait_param.103 success: "); - expect(ret).assertTrue(); - done(); - }).catch(function (err) { - expect(ret).assertTrue(); - console.info("testWaitPromise03 test.wait_param.103 error: " + err.code); - }); - } catch (e) { - expect(ret).assertTrue(); - console.info("promise get input error: " + e); - } - console.info('testWaitPromise03 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('testWaitPromise04', 0, async function (done) { - console.info('testWaitPromise04 start'); - let 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("testWaitPromise04 test.wait_param.104 success"); - expect(ret).assertTrue(); - done(); - }).catch(function (err) { - console.info("testWaitPromise04 test.wait_param.104 error: " + err.code); - expect(ret).assertTrue(); - }); - } catch (e) { - expect(ret).assertTrue(); - console.info("promise get input error: " + e); - } - console.info('testWaitPromise04 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('testWaitPromise05', 0, async function (done) { - console.info('testWaitPromise05 start'); - let 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("testWaitPromise05 test.wait_param.105 success"); - expect(ret).assertTrue(); - done(); - }).catch(function (err) { - console.info("testWaitPromise05 test.wait_param.105 error: " + err.code); - expect(ret).assertTrue(); - }); - } catch (e) { - expect(ret).assertTrue(); - console.info("promise get input error: " + e); - } - console.info('testWaitPromise05 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('testWait01', 0, async function (done) { - console.info('testWait01 start'); - let ret = false; - try { - systemparameter.wait("test.wait_param.201", "100", 1, function (err, data) { - if (err == undefined || err.code === 0) { - console.info("testWait01 test.wait_param.201 success") - } else { - ret = true; // wait timeout - console.info("testWait01 test.wait_param.201 err:" + err.code); - expect(ret).assertTrue(); - } - }); - } catch (e) { - expect(ret).assertTrue(); - console.info("testWait01 get input error: " + e); - } - setTimeout(function () { - expect(ret).assertTrue(); - done(); - }, '2000'); - console.info('testWait01 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('testWait02', 0, async function (done) { - console.info('testWait02 start'); - let 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("testWait02 test.wait_param.202 success"); - } else { - console.info("testWait02 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('testWait02 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('testWait03', 0, async function (done) { - console.info('testWait03 start'); - let 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("testWait03 test.wait_param.203 success") - } else { - console.info("testWait03 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('testWait03 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('testWait04', 0, async function (done) { - console.info('testWait04 start'); - let 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("testWait04 test.wait_param.204 success") - } else { - ret = false; - console.info("testWait04 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('testWait04 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('testWait05', 0, async function (done) { - console.info('testWait05 start'); - let 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("testWait05 test.wait_param.205 success:" + data) - } else { - console.info("testWait05 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('testWait05 end'); - }) -})} 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 e9b5810c2494e0272493b11c24e7293124d12267..0000000000000000000000000000000000000000 --- a/startup/startup_standard/systemparamter/src/main/resources/base/element/string.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "StartupJSApiTest" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - }, - { - "name": "MainAbility_desc", - "value": "description" - }, - { - "name": "MainAbility_label", - "value": "label" - }, - { - "name": "TestAbility_desc", - "value": "description" - }, - { - "name": "TestAbility_label", - "value": "label" - } - ] -} \ 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