diff --git a/startup/BUILD.gn b/startup/BUILD.gn old mode 100755 new mode 100644 index 77c28f985d519af873a6cdd4faaf264b3576ef9a..8b6453b68bee36bc84bf5f41999fb685a0c79da6 --- a/startup/BUILD.gn +++ b/startup/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# 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 @@ -16,6 +16,6 @@ import("//build/ohos_var.gni") group("startup") { testonly = true if (is_standard_system) { - deps = [ "startup_standard:startup_js_test" ] + deps = [ "startup_standard:startup_standard" ] } } diff --git a/startup/startup_standard/BUILD.gn b/startup/startup_standard/BUILD.gn old mode 100755 new mode 100644 index 16368c5234afe36654f00b15e650d7f416683b18..928cdcbb59b9875c9b94f3f53f1ebfba04b4f751 --- a/startup/startup_standard/BUILD.gn +++ b/startup/startup_standard/BUILD.gn @@ -11,21 +11,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//test/xts/tools/build/suite.gni") +import("//build/ohos_var.gni") -ohos_js_hap_suite("startup_js_test") { - hap_profile = "./src/main/config.json" - deps = [ - ":startup_js_assets", - ":startup_js_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsStartupJSApiTest" -} -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" +group("startup_standard") { + testonly = true + if (is_standard_system) { + deps = [ + "deviceinfo:startup_deviceinfo_js_test", + "systemparamter:startup_sysparam_js_test", + ] + } } diff --git a/startup/startup_standard/deviceinfo/BUILD.gn b/startup/startup_standard/deviceinfo/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..921593b83224b5993cbc9c0fc9d7023602d66a38 --- /dev/null +++ b/startup/startup_standard/deviceinfo/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("startup_deviceinfo_js_test") { + hap_profile = "./src/main/config.json" + deps = [ + ":startup_js_assets", + ":startup_js_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "StartupDeviceInfoApiTest" +} +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/Test.json b/startup/startup_standard/deviceinfo/Test.json old mode 100755 new mode 100644 similarity index 100% rename from startup/startup_standard/Test.json rename to startup/startup_standard/deviceinfo/Test.json diff --git a/startup/startup_standard/signature/openharmony_sx.p7b b/startup/startup_standard/deviceinfo/signature/openharmony_sx.p7b similarity index 100% rename from startup/startup_standard/signature/openharmony_sx.p7b rename to startup/startup_standard/deviceinfo/signature/openharmony_sx.p7b diff --git a/startup/startup_standard/src/main/config.json b/startup/startup_standard/deviceinfo/src/main/config.json similarity index 100% rename from startup/startup_standard/src/main/config.json rename to startup/startup_standard/deviceinfo/src/main/config.json diff --git a/startup/startup_standard/src/main/js/default/app.js b/startup/startup_standard/deviceinfo/src/main/js/default/app.js similarity index 100% rename from startup/startup_standard/src/main/js/default/app.js rename to startup/startup_standard/deviceinfo/src/main/js/default/app.js diff --git a/startup/startup_standard/src/main/js/default/i18n/en-US.json b/startup/startup_standard/deviceinfo/src/main/js/default/i18n/en-US.json similarity index 60% rename from startup/startup_standard/src/main/js/default/i18n/en-US.json rename to startup/startup_standard/deviceinfo/src/main/js/default/i18n/en-US.json index e63c70d978a3a53be988388c87182f81785e170c..25b4997e50df3af032339fe395b293b95a44c275 100644 --- a/startup/startup_standard/src/main/js/default/i18n/en-US.json +++ b/startup/startup_standard/deviceinfo/src/main/js/default/i18n/en-US.json @@ -1,6 +1,6 @@ { "strings": { "hello": "Hello", - "world": "World" + "world": "OpenHarmony" } } \ No newline at end of file diff --git a/startup/startup_standard/src/main/js/default/i18n/zh-CN.json b/startup/startup_standard/deviceinfo/src/main/js/default/i18n/zh-CN.json similarity index 63% rename from startup/startup_standard/src/main/js/default/i18n/zh-CN.json rename to startup/startup_standard/deviceinfo/src/main/js/default/i18n/zh-CN.json index de6ee5748322f44942c1b003319d8e66c837675f..b9543e1912f72ea9075609981bf64496330cbb41 100644 --- a/startup/startup_standard/src/main/js/default/i18n/zh-CN.json +++ b/startup/startup_standard/deviceinfo/src/main/js/default/i18n/zh-CN.json @@ -1,6 +1,6 @@ { "strings": { "hello": "您好", - "world": "世界" + "world": "鸿蒙OS" } } \ No newline at end of file diff --git a/startup/startup_standard/src/main/js/default/pages/index/index.css b/startup/startup_standard/deviceinfo/src/main/js/default/pages/index/index.css similarity index 100% rename from startup/startup_standard/src/main/js/default/pages/index/index.css rename to startup/startup_standard/deviceinfo/src/main/js/default/pages/index/index.css diff --git a/startup/startup_standard/src/main/js/default/pages/index/index.hml b/startup/startup_standard/deviceinfo/src/main/js/default/pages/index/index.hml similarity index 100% rename from startup/startup_standard/src/main/js/default/pages/index/index.hml rename to startup/startup_standard/deviceinfo/src/main/js/default/pages/index/index.hml diff --git a/startup/startup_standard/src/main/js/default/pages/index/index.js b/startup/startup_standard/deviceinfo/src/main/js/default/pages/index/index.js similarity index 100% rename from startup/startup_standard/src/main/js/default/pages/index/index.js rename to startup/startup_standard/deviceinfo/src/main/js/default/pages/index/index.js diff --git a/startup/startup_standard/src/main/js/default/test/DeviceInfoJsUnit.test.js b/startup/startup_standard/deviceinfo/src/main/js/default/test/DeviceInfoJsUnit.test.js similarity index 99% rename from startup/startup_standard/src/main/js/default/test/DeviceInfoJsUnit.test.js rename to startup/startup_standard/deviceinfo/src/main/js/default/test/DeviceInfoJsUnit.test.js index a07c494a4e839d8f2a3e60ccfacf2f8dde5ca9c0..6d5602bff8777378a686f2df0540c1828ed56ec4 100644 --- a/startup/startup_standard/src/main/js/default/test/DeviceInfoJsUnit.test.js +++ b/startup/startup_standard/deviceinfo/src/main/js/default/test/DeviceInfoJsUnit.test.js @@ -42,6 +42,7 @@ describe('DeviceInfoTest', function () { }) console.info('start################################start'); + /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0100 * @tc.name testGetDeviceType01 @@ -90,6 +91,7 @@ describe('DeviceInfoTest', function () { expect(manufactureInfo).assertEqual(bufferstr); console.info('device_info_test_002 ：end'); }) + /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0300 * @tc.name testGetBrand01 @@ -118,7 +120,6 @@ describe('DeviceInfoTest', function () { console.info('testGetDeviceBrand01 ：end'); }) - /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0400 * @tc.name testGetMarketName01 @@ -332,7 +333,6 @@ describe('DeviceInfoTest', function () { console.info('testGetBootLoaderVersion01 ：end') }) - /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0130 * @tc.name testGetabiList01 @@ -361,7 +361,6 @@ describe('DeviceInfoTest', function () { console.info('testGetabiList01 ：end'); }) - /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0140 * @tc.name testGetSecurityPatchTag01 @@ -411,6 +410,7 @@ describe('DeviceInfoTest', function () { expect(ret).assertTrue(); console.info('testGetDisplayVersion01 ：end'); }) + /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0160 * @tc.name testGetIncrementalVersion01 @@ -492,7 +492,7 @@ describe('DeviceInfoTest', function () { let bufferstr = arr.join(''); console.info('the value of the bufferstr is :' + bufferstr); expect(osFullNameInfo).assertEqual(bufferstr); - + console.info('testGetOSFullName01 ：end'); }) @@ -515,11 +515,11 @@ describe('DeviceInfoTest', function () { ret = true; } expect(ret).assertTrue(); - + let str = /[\w-\.\(\)]/g; let arr = majorVersionInfo.toString().match(str); - let substr = arr.join(''); - let numstr =parseInt(substr); + let substr = arr.join(''); + let numstr = parseInt(substr); console.info('the value of the bufferstr is :' + numstr); expect(majorVersionInfo).assertEqual(numstr); console.info('testGetMajorVersion01 ：end'); @@ -547,8 +547,8 @@ describe('DeviceInfoTest', function () { let str = /[\w-\.\(\)]/g; let arr = seniorVersionInfo.toString().match(str); - let substr = arr.join(''); - let numstr =parseInt(substr); + let substr = arr.join(''); + let numstr = parseInt(substr); console.info('the value of the bufferstr is :' + numstr); expect(seniorVersionInfo).assertEqual(numstr); console.info('testGetSeniorVersion01 ：end'); @@ -569,15 +569,15 @@ describe('DeviceInfoTest', function () { console.info('the value of the deviceinfo featureVersion is :' + featureVersionInfo); expect(featureVersionInfo).assertInstanceOf('Number'); - if ((featureVersionInfo >= 1 && featureVersionInfo <= 99) || featureVersionInfo == 0 ) { + if ((featureVersionInfo >= 1 && featureVersionInfo <= 99) || featureVersionInfo == 0) { ret = true; } expect(ret).assertTrue(); let str = /[\w-\.\(\)]/g; let arr = featureVersionInfo.toString().match(str); - let substr = arr.join(''); - let numstr =parseInt(substr); + let substr = arr.join(''); + let numstr = parseInt(substr); console.info('the value of the bufferstr is :' + numstr); expect(featureVersionInfo).assertEqual(numstr); console.info('testGetFeatureVersion01 ：end'); @@ -605,8 +605,8 @@ describe('DeviceInfoTest', function () { let str = /[\w-\.\(\)]/g; let arr = buildVersionInfo.toString().match(str); - let substr = arr.join(''); - let numstr =parseInt(substr); + let substr = arr.join(''); + let numstr = parseInt(substr); console.info('the value of the bufferstr is :' + numstr); expect(buildVersionInfo).assertEqual(numstr); @@ -635,8 +635,8 @@ describe('DeviceInfoTest', function () { let str = /[\w-\.\(\)]/g; let arr = sdkApiVersionInfo.toString().match(str); - let substr = arr.join(''); - let numstr =parseInt(substr); + let substr = arr.join(''); + let numstr = parseInt(substr); console.info('the value of the bufferstr is :' + numstr); expect(sdkApiVersionInfo).assertEqual(numstr); @@ -662,11 +662,11 @@ describe('DeviceInfoTest', function () { ret = true; } expect(ret).assertTrue(); - + let str = /[\w-\.\(\)]/g; let arr = firstApiVersionInfo.toString().match(str); - let substr = arr.join(''); - let numstr =parseInt(substr); + let substr = arr.join(''); + let numstr = parseInt(substr); console.info('the value of the bufferstr is :' + numstr); expect(firstApiVersionInfo).assertEqual(numstr); @@ -744,6 +744,7 @@ describe('DeviceInfoTest', function () { expect(ret).assertTrue(); console.info('testGetBuildUser01 ：end'); }) + /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0290 * @tc.name testGetBuildHost01 @@ -1053,7 +1054,7 @@ describe('DeviceInfoTest', function () { let bufferstr = arr.join(''); console.info('the value of the bufferstr is :' + bufferstr); expect(serialInfo).assertEqual(bufferstr); - + console.info('device_info_test_039 ：end'); }) @@ -1075,6 +1076,7 @@ describe('DeviceInfoTest', function () { expect(len).assertLess(MAX_CHARACTERS_NUM_TWO); console.info('device_info_test_040 ：end'); }) + /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0450 * @tc.name testGetOsFullName02 @@ -1100,6 +1102,7 @@ describe('DeviceInfoTest', function () { console.info('device_info_test_041 ：end'); }) + /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0460 * @tc.name testGetVersionId02 @@ -1143,6 +1146,7 @@ describe('DeviceInfoTest', function () { console.info('device_info_test_043 ：end') }) + /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0480 * @tc.name testGetBuildHost02 @@ -1204,7 +1208,7 @@ describe('DeviceInfoTest', function () { let len = manufactureInfo.length console.info('the value of the manufacture characters is :' + len) expect(len).assertLarger(MAX_CHARACTERS_NUM); - + let str = /[\w-\.\(\)]/g; let arr = manufactureInfo.match(str); let bufferstr = arr.join(''); @@ -1213,6 +1217,7 @@ describe('DeviceInfoTest', function () { console.info('device_info_test_046 ：end') }) + /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0520 * @tc.name testGetProductBrand03 @@ -1238,6 +1243,7 @@ describe('DeviceInfoTest', function () { console.info('device_info_test_047 ：end'); }) + /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0530 * @tc.name testGetMarketName03 @@ -1328,6 +1334,7 @@ describe('DeviceInfoTest', function () { console.info('device_info_test_036 ：end') }) + /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0570 * @tc.name testGetHardwareModel03 @@ -1402,9 +1409,10 @@ describe('DeviceInfoTest', function () { let bufferstr = arr.join(''); console.info('the value of the bufferstr is :' + bufferstr); expect(serialInfo).assertEqual(bufferstr); - + console.info('device_info_test_054 ：end'); }) + /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0610 * @tc.name testGetDisplayVersion03 @@ -1424,6 +1432,7 @@ describe('DeviceInfoTest', function () { console.info('device_info_test_055 ：end'); }) + /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0620 * @tc.name testGetIncrementalVersionInfo02 @@ -1475,6 +1484,7 @@ describe('DeviceInfoTest', function () { console.info('device_info_test_057 ：end') }) + /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0640 * @tc.name testGetVersionId03 @@ -1531,6 +1541,7 @@ describe('DeviceInfoTest', function () { expect(len).assertLarger(MAX_CHARACTERS_NUM); console.info('device_info_test_060 ：end'); }) + /** * @tc.number SUB_STARTUP_JS_DEVCEINFO_0670 * @tc.name testGetSecurityPatchTag02 @@ -1548,10 +1559,10 @@ describe('DeviceInfoTest', function () { let reFormat = /^(\d{4})-(\d{2})-(\d{2})$/; let re = securityPatchTagInfo.match(reFormat); - if (re != null){ + if (re != null) { ret = true; expect(ret).assertTrue(); - }else{ + } else { console.info('the return formate is not yy--mm--dd'); } diff --git a/startup/startup_standard/src/main/js/default/test/List.test.js b/startup/startup_standard/deviceinfo/src/main/js/default/test/List.test.js similarity index 93% rename from startup/startup_standard/src/main/js/default/test/List.test.js rename to startup/startup_standard/deviceinfo/src/main/js/default/test/List.test.js index 656fbf59d3cfb2e3f3b7a043cc7f0c89e62e30b1..4d7877737e077ebb2c5b1e5def497702efaf5c86 100644 --- a/startup/startup_standard/src/main/js/default/test/List.test.js +++ b/startup/startup_standard/deviceinfo/src/main/js/default/test/List.test.js @@ -14,7 +14,4 @@ */ require('./DeviceInfoJsUnit.test.js') -//require('./ParametersJsUnit.test.js') - - - +require('./ParametersJsUnit.test.js') diff --git a/startup/startup_standard/src/main/js/default/test/ParametersJsUnit.test.js b/startup/startup_standard/deviceinfo/src/main/js/default/test/ParametersJsUnit.test.js similarity index 53% rename from startup/startup_standard/src/main/js/default/test/ParametersJsUnit.test.js rename to startup/startup_standard/deviceinfo/src/main/js/default/test/ParametersJsUnit.test.js index 820bed7a6ced7abbc45d0ce7f3f33ef832de421a..e616a980e2bfc3635be38f4227603a9e1663f097 100644 --- a/startup/startup_standard/src/main/js/default/test/ParametersJsUnit.test.js +++ b/startup/startup_standard/deviceinfo/src/main/js/default/test/ParametersJsUnit.test.js @@ -42,7 +42,7 @@ describe('SystemParameterTest', function () { expect(ret).assertTrue(); } else { console.info('system_parameter_test_0100 set callback hw_sc.build.os.version value err:' - + err.code); + + err.code); } }); done(); @@ -66,7 +66,7 @@ describe('SystemParameterTest', function () { console.info('system_parameter_test_0110 set callback hw_sc.build.os.version value success'); } else { console.info('system_parameter_test_0110 set callback hw_sc.build.os.version value err:' - + err.code) + + err.code) } }); @@ -94,7 +94,7 @@ describe('SystemParameterTest', function () { } else { ret = true; console.info('system_parameter_test_0120 set callback hw_sc.build.os.version value err:' + - err.code); + err.code); expect(ret).assertTrue(); done(); } @@ -215,7 +215,7 @@ describe('SystemParameterTest', function () { sysValue = value; if (sysValue === PROPERTY_MAX_VALUE) { console.info('system_parameter_test_0310 promise setSynchw_sc.build.os.version failed :' - + sysValue); + + sysValue); } else { console.info('system_parameter_test_0310 promise setSync hw_sc.build.os.version: ' + sysValue); ret = true; @@ -294,7 +294,7 @@ describe('SystemParameterTest', function () { parameterInfo.then(function (value) { ret = true; console.info(' system_parameter_test_0400 promise get hw_sc.build.os.version success: ' + value); - expect(ret).assertTrue(); + expect(ret).assertTrue(); done(); }).catch(function (err) { console.info(' system_parameter_test_0400 promise get hw_sc.build.os.version error: ' + err.code); @@ -323,7 +323,7 @@ describe('SystemParameterTest', function () { } return p; }) - setTimeout(function(){ + setTimeout(function () { let parameterInfo = systemparameter.get('hw_sc.build.os.version'); parameterInfo.then(function (value) { if (value === '1.1.1.1') { @@ -401,7 +401,7 @@ describe('SystemParameterTest', function () { } catch (err) { console.info('system_parameter_test_0430 promise catch get failed ' + err); } - setTimeout(function(){ + setTimeout(function () { expect(ret).assertTrue(); done(); }, '1000'); @@ -428,7 +428,7 @@ describe('SystemParameterTest', function () { } catch (err) { console.info('system_parameter_test_0440 promise setSync hw_sc.build.os.version: ' + err); } - setTimeout(function(){ + setTimeout(function () { expect(ret).assertTrue(); done(); }, '1000'); @@ -455,7 +455,7 @@ describe('SystemParameterTest', function () { } catch (err) { console.info('system_parameter_test_0450 promise setSync a.b.b.c error: ' + err); } - setTimeout(function(){ + setTimeout(function () { expect(ret).assertTrue(); done(); }, '1000'); @@ -483,7 +483,7 @@ describe('SystemParameterTest', function () { } catch (err) { console.log('system_parameter_test_0500 get unexpected error: ' + err); } - setTimeout(function(){ + setTimeout(function () { expect(ret).assertTrue(); done(); }, '1000'); @@ -517,7 +517,7 @@ describe('SystemParameterTest', function () { } catch (err) { console.info('system_parameter_test_0510 promise get input error: ' + err); } - setTimeout(function(){ + setTimeout(function () { expect(ret).assertTrue(); done(); }, '1000'); @@ -545,7 +545,7 @@ describe('SystemParameterTest', function () { } catch (err) { console.info('system_parameter_test_0520 promise get input error: ' + err); } - setTimeout(function(){ + setTimeout(function () { expect(ret).assertTrue(); done(); }, '1000'); @@ -573,7 +573,7 @@ describe('SystemParameterTest', function () { } catch (err) { console.info('system_parameter_test_0530 promise get input error: ' + err); } - setTimeout(function(){ + setTimeout(function () { expect(ret).assertTrue(); done(); }, '1000'); @@ -593,17 +593,17 @@ describe('SystemParameterTest', function () { if (err == undefined && data === '1.1.1.1') { ret = true; console.info('system_parameter_test_0600 get systemparameter hw_sc.build.os.version sucess: ' - + data); + + data); expect(ret).assertTrue(); } else { console.info('system_parameter_test_0600 get systemparameter hw_sc.build.os.version failed: ' - + err.code); + + err.code); } }) } catch (err) { console.info('system_parameter_test_0600 get systemparameter hw_sc.build.os.version abnormal: ', err); } - setTimeout(function(){ + setTimeout(function () { expect(ret).assertTrue(); done(); }, '1000'); @@ -622,17 +622,17 @@ describe('SystemParameterTest', function () { systemparameter.get('hw_sc.build.os.version', 111, (err, data) => { if (err == undefined && data === 111) { console.info('system_parameter_test_0610 get systemparameter hw_sc.build.os.version sucess: ' - + data); + + data); } else { console.info('system_parameter_test_0610 get systemparameter hw_sc.build.os.version failed: ' - + err.code); + + err.code); } }) } catch (err) { ret = true; console.info('system_parameter_test_0610 get systemparameter hw_sc.build.os.version abnormal: ', err); done(); - setTimeout(function(){ + setTimeout(function () { expect(ret).assertTrue(); }, '1000'); } @@ -652,16 +652,16 @@ describe('SystemParameterTest', function () { if (err == undefined) { ret = true; console.info('system_parameter_test_0620 get systemparameter hw_sc.build.os.version sucess: ' - + data); + + data); } else { console.info('system_parameter_test_0620 get systemparameter hw_sc.build.os.version failed: ' - + err.code); + + err.code); } }) } catch (err) { console.info('system_parameter_test_0620 get systemparameter hw_sc.build.os.version abnormal: ', err); } - setTimeout(function(){ + setTimeout(function () { expect(ret).assertTrue(); done(); }, '1000'); @@ -683,7 +683,7 @@ describe('SystemParameterTest', function () { systemparameter.get('b.b.b.b.b', PROPERTY_MAX_VALUE, (err, data) => { if (err == undefined) { console.info('system_parameter_test_0640 get systemparameter b.b.b.b.b sucess: ' - + data); + + data); } else { ret = true; console.info('system_parameter_test_0640 get systemparameter b.b.b.b.b failed: ' + err.code); @@ -692,7 +692,7 @@ describe('SystemParameterTest', function () { } catch (err) { console.info('system_parameter_test_0640 get systemparameter b.b.b.b.b abnormal: ', err); } - setTimeout(function(){ + setTimeout(function () { expect(ret).assertTrue(); done(); }, '1000'); @@ -800,742 +800,4 @@ describe('SystemParameterTest', function () { expect(ret).assertTrue(); console.info('system_parameter_test_0740 : end'); }) - - 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'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0811 - * @tc.name testWatcher01 - * @tc.desc Watch the value of the attribute with the specified key. - */ - it('system_parameter_test_0811', 0, function () { - console.info('system_parameter_test_0811 start'); - var ret = true; - try { - let watcher = systemparameter.getWatcher("test.watcher_param.205"); - console.info('system_parameter_test_0811 watcher' + watcher); - if (watcher === undefined) { - ret = false; - } - } catch (e) { - ret = false; - console.info("input error: " + e); - } - expect(ret).assertTrue(); - console.info('system_parameter_test_0811 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0812 - * @tc.name testWatcher02 - * @tc.desc Watch the value of the attribute with the specified key. - */ - it('system_parameter_test_0812', 0, function () { - console.info('system_parameter_test_0812 start'); - var ret = true; - try { - let watcher = systemparameter.getWatcher("test.watch_param.205", -1); - console.info('system_parameter_test_0812 watcher' + watcher); - if (watcher === undefined) { - ret = false; - } - } catch (e) { - ret = false; - console.info("input error: " + e); - } - expect(ret).assertTrue(); - console.info('system_parameter_test_0812 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0813 - * @tc.name testWatcher03 - * @tc.desc Watch the value of the attribute with the specified key. - */ - it('system_parameter_test_0813', 0, function () { - console.info('system_parameter_test_0813 start'); - var ret = false; - try { - ret = true; - let watcher = systemparameter.getWatcher(""); - if (watcher === undefined) { - ret = false; - } - } catch (e) { - ret = true; - console.info("input error: " + e); - } - expect(ret).assertTrue(); - console.info('system_parameter_test_0813 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0814 - * @tc.name testWatcher04 - * @tc.desc Watch the value of the attribute with the specified key. - */ - it('system_parameter_test_0814', 0, function () { - console.info('system_parameter_test_0814 start'); - var ret = false; - try { - ret = true; - let watcher = systemparameter.getWatcher("test.watcher.304^^^^"); - if (watcher === undefined) { - ret = false; - } - } catch (e) { - ret = true; - console.info("input error: " + e); - } - expect(ret).assertTrue(); - console.info('system_parameter_test_0814 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0815 - * @tc.name testWatcher05 - * @tc.desc Watch the value of the attribute with the specified key. - */ - it('system_parameter_test_0815', 0, function () { - console.info('system_parameter_test_0815 start'); - var ret = true; - try { - let watcher = systemparameter.getWatcher("test.watcher.304"); - console.info('system_parameter_test_0815 start watcher ' + watcher); - if (watcher === undefined) { - ret = false; - } - } catch (e) { - ret = false; - console.info("input error: " + e); - } - expect(ret).assertTrue(); - console.info('system_parameter_test_0815 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0816 - * @tc.name testWatcherOn01 - * @tc.desc Watch the value of the attribute with the specified key. - */ - it('system_parameter_test_0816', 0, function () { - console.info('system_parameter_test_0816 start'); - var ret = true; - let key = "test.watcher.401"; - try { - let watcher = systemparameter.getWatcher(key); - if (watcher === undefined) { - ret = false; - expect(ret).assertTrue(); - } else { - watcher.on("valueChange", function (key, value) { - ret = true; - console.info("system_parameter_test_0816 callback key: " + key); - console.info("system_parameter_test_0816 callback value: " + value); - }); - SetParameter(key); - } - } catch (e) { - ret = true; - console.info("input error: " + e); - } - expect(ret).assertTrue(); - console.info('system_parameter_test_0816 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0817 - * @tc.name testWatcherOn02 - * @tc.desc Watch the value of the attribute with the specified key. - */ - it('system_parameter_test_0817', 0, async function (done) { - console.info('system_parameter_test_0817 start'); - var ret = true; - let key = "test.watcher.402"; - try { - let watcher = systemparameter.getWatcher(key); - if (watcher === undefined) { - ret = false; - } else { - watcher.on("valueChange", function (key, value) { // no callback - ret = true; - console.info("system_parameter_test_0817 callback key: " + key); - console.info("system_parameter_test_0817 callback value: " + value); - }); - } - } catch (e) { - ret = false; - console.info("input error: " + e); - } - expect(ret).assertTrue(); - done(); - console.info('system_parameter_test_0817 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0818 - * @tc.name testWatcherOn03 - * @tc.desc Watch the value of the attribute with the specified key. - */ - it('system_parameter_test_0818', 0, function () { - console.info('system_parameter_test_0818 start'); - var ret = true; - let key = "test.watcher.403"; - try { - let watcher = systemparameter.getWatcher(key + "*"); - if (watcher === undefined) { - ret = false; - } else { - watcher.on("valueChange", function (key, value) { - ret = true; - console.info("system_parameter_test_0818 callback key: " + key); - console.info("system_parameter_test_0818 callback value: " + value); - }); - SetParameter("test.watcher.403.404"); - } - } catch (e) { - ret = false; - console.info("input error: " + e); - } - expect(ret).assertTrue(); - console.info('system_parameter_test_0818 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0819 - * @tc.name testWatcherOn04 - * @tc.desc Watch the value of the attribute with the specified key. - */ - it('system_parameter_test_0819', 0, async function (done) { - console.info('system_parameter_test_0819 start'); - var ret = false; - try { - let watcher = systemparameter.getWatcher("*"); - if (watcher != undefined) { - let code = watcher.on("valueChange", function (key, value) { // fail - ret = true; - console.info("system_parameter_test_0819 callback key: " + key); - console.info("system_parameter_test_0819 callback value: " + value); - }); - console.info("system_parameter_test_0819 code: " + code); - } else { - ret = true; - } - } catch (e) { - ret = true; - console.info("system_parameter_test_0819 error: " + e); - } - expect(ret).assertTrue(); - done(); - console.info('system_parameter_test_0819 end'); - }) - - function callback1 (key, value) { - console.info("callback1 Watch callback key: " + key); - console.info("callback1 Watch callback value: " + value); - } - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0820 - * @tc.name testWatcherOn05 - * @tc.desc Watch the value of the attribute with the specified key. - */ - it('system_parameter_test_0820', 0, async function (done) { - console.info('system_parameter_test_0820 start'); - var ret = true; - let key = "test.watcher.405"; - try { - let watcher = systemparameter.getWatcher(key); - if (watcher === undefined) { - ret = false; - } else { - ret = false; - let code = watcher.on("valueChange", callback1); - if (code === 0) { - ret = true; - } - code = watcher.on("valueChange", callback1); - if (code === 0) { - ret = true; - } - } - } catch (e) { - ret = true; - console.info("system_parameter_test_0820 input error: " + e); - } - expect(ret).assertTrue(); - done(); - console.info('system_parameter_test_0820 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0821 - * @tc.name testWatcherOff01 - * @tc.desc Watch the value of the attribute with the specified key. - */ - it('system_parameter_test_0821', 0, async function (done) { - console.info('system_parameter_test_0821 start'); - var ret = false; - let key = "test.watcher.501"; - try { - let watcher = systemparameter.getWatcher(key); - if (watcher === undefined) { - ret = false; - } else { - ret = true; - let code = watcher.on("valueChange", callback1); - SetParameter(key); - code = watcher.off("valueChange", callback1); - if (code === 0) { - ret = true; - } - } - } catch (e) { - ret = false; - console.info("input error: " + e); - } - setTimeout(function(){ - expect(ret).assertTrue(); - done(); - }, '1000'); - console.info('system_parameter_test_0821 end '); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0822 - * @tc.name testWatcherOff02 - * @tc.desc Watch the value of the attribute with the specified key. - */ - it('system_parameter_test_0822', 0, function () { - console.info('system_parameter_test_0822 start'); - var ret = true; - let key = "test.watcher.502"; - try { - let watcher = systemparameter.getWatcher(key); - if (watcher === undefined) { - ret = false; - } else { - let code = watcher.on("valueChange222", callback1); - if (code === 0) { - ret = false; - } - code = watcher.off("valueChange222", callback1); - if (code === 0) { - ret = false; - } - } - } catch (e) { - ret = false; - console.info("input error: " + e); - } - expect(ret).assertTrue(); - console.info('system_parameter_test_0822 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0823 - * @tc.name testWatcherOff03 - * @tc.desc Watch the value of the attribute with the specified key. - */ - it('system_parameter_test_0823', 0, function () { - console.info('system_parameter_test_0823 start'); - var ret = false; - let key = "test.watcher.503"; - try { - let watcher = systemparameter.getWatcher(key); - if (watcher === undefined) { - ret = false; - } else { - ret = false; - let code = watcher.on("valueChange", function (key, value) { - console.info("system_parameter_test_0823 callback key: " + key); - console.info("system_parameter_test_0823 callback value: " + value); - let code = watcher.off("valueChange"); - if (code === 0) { - ret = true; - } - }); - if (code === 0) { - ret = true; - } - SetParameter(key); - } - } catch (e) { - ret = false; - console.info("input error: " + e); - } - expect(ret).assertTrue(); - console.info('system_parameter_test_0823 end'); - }) - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0824 - * @tc.name testWatcherOff04 - * @tc.desc Watch the value of the attribute with the specified key. - */ - it('system_parameter_test_0824', 0, function () { - console.info('system_parameter_test_0824 start'); - var ret = false; - let key = "test.watcher.504"; - try { - let watcher = systemparameter.getWatcher(key); - if (watcher === undefined) { - ret = false; - } else { - ret = false; - let code = watcher.on("valueChange", callback1); - if (code === 0) { - ret = true; - } - code = watcher.off("valueChange", callback1); - console.info("system_parameter_test_0824 " + code); - if (code === 0) { - ret = true; - } - code = watcher.off("valueChange", callback1); - console.info("system_parameter_test_0824 " + code); - if (code != 0) { - ret = true; - } - } - } catch (e) { - ret = false; - console.info("input error: " + e); - } - expect(ret).assertTrue(); - console.info('system_parameter_test_0824 end'); - }) - - function callback3(key, value) { - console.info("system_parameter_test_0825 callback key: " + key); - console.info("system_parameter_test_0825 callback value: " + value); - } - - /** - * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0825 - * @tc.name testWatcherOff05 - * @tc.desc Watch the value of the attribute with the specified key. - */ - it('system_parameter_test_0825', 0, async function (done) { - console.info('system_parameter_test_0825 start'); - var ret = false; - let key = "test.watcher.505"; - try { - let watcher = systemparameter.getWatcher(key); - if (watcher === undefined) { - ret = false; - } else { - ret = false; - let code = watcher.on("valueChange", callback3); - if (code === 0) { - ret = true; - } - SetParameter(key); - } - } catch (e) { - ret = false; - console.info("input error: " + e); - } - expect(ret).assertTrue(); - done(); - console.info('system_parameter_test_0825 end'); - }) }) \ No newline at end of file diff --git a/startup/startup_standard/src/main/resources/base/element/string.json b/startup/startup_standard/deviceinfo/src/main/resources/base/element/string.json similarity index 100% rename from startup/startup_standard/src/main/resources/base/element/string.json rename to startup/startup_standard/deviceinfo/src/main/resources/base/element/string.json diff --git a/startup/startup_standard/src/main/resources/base/media/icon.png b/startup/startup_standard/deviceinfo/src/main/resources/base/media/icon.png similarity index 100% rename from startup/startup_standard/src/main/resources/base/media/icon.png rename to startup/startup_standard/deviceinfo/src/main/resources/base/media/icon.png diff --git a/startup/startup_standard/systemparamter/BUILD.gn b/startup/startup_standard/systemparamter/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..2f88f1099b5dee4b844d168a9c35362185788e1d --- /dev/null +++ b/startup/startup_standard/systemparamter/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("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 = "StartupSysParamApiTest" +} +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 new file mode 100644 index 0000000000000000000000000000000000000000..cbe03df0aa1526d94a5ff0ebc0c19d6198ac20af --- /dev/null +++ b/startup/startup_standard/systemparamter/Test.json @@ -0,0 +1,18 @@ +{ + "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": [ + "StartupSysParamApiTest.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 new file mode 100644 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/startup/startup_standard/systemparamter/signature/openharmony_sx.p7b differ diff --git a/startup/startup_standard/systemparamter/src/main/config.json b/startup/startup_standard/systemparamter/src/main/config.json new file mode 100644 index 0000000000000000000000000000000000000000..d0745842e2b0cf82a1cae511c669f8f7cee2d59d --- /dev/null +++ b/startup/startup_standard/systemparamter/src/main/config.json @@ -0,0 +1,60 @@ +{ + "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 new file mode 100644 index 0000000000000000000000000000000000000000..e423f4bce4698ec1d7dc86c3eea3990a5e7b1085 --- /dev/null +++ b/startup/startup_standard/systemparamter/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('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 new file mode 100644 index 0000000000000000000000000000000000000000..25b4997e50df3af032339fe395b293b95a44c275 --- /dev/null +++ b/startup/startup_standard/systemparamter/src/main/js/default/i18n/en-US.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000000000000000000000000000000000000..b9543e1912f72ea9075609981bf64496330cbb41 --- /dev/null +++ b/startup/startup_standard/systemparamter/src/main/js/default/i18n/zh-CN.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000000000000000000000000000000000000..6fda792753f2e15f22b529c7b90a82185b2770bf --- /dev/null +++ b/startup/startup_standard/systemparamter/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/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 new file mode 100644 index 0000000000000000000000000000000000000000..f64b040a5ae394dbaa5e185e1ecd4f4556b92184 --- /dev/null +++ b/startup/startup_standard/systemparamter/src/main/js/default/pages/index/index.hml @@ -0,0 +1,5 @@ +
+ + {{ $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 new file mode 100644 index 0000000000000000000000000000000000000000..0c564bb030d56eb17a14063cee23df41abced5ba --- /dev/null +++ b/startup/startup_standard/systemparamter/src/main/js/default/pages/index/index.js @@ -0,0 +1,45 @@ +/* + * 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 new file mode 100644 index 0000000000000000000000000000000000000000..3539e473f3657303d47750af91c3e99566e61ecf --- /dev/null +++ b/startup/startup_standard/systemparamter/src/main/js/default/test/List.test.js @@ -0,0 +1,18 @@ +/* + * 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 new file mode 100644 index 0000000000000000000000000000000000000000..134754a7b9a6f0fb31be434041fe513f3c262e40 --- /dev/null +++ b/startup/startup_standard/systemparamter/src/main/js/default/test/SysParametersJs.test.js @@ -0,0 +1,762 @@ +/* + * 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'); + }) + + /** + * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0811 + * @tc.name testWatcher01 + * @tc.desc Watch the value of the attribute with the specified key. + */ + it('system_parameter_test_0811', 0, function () { + console.info('system_parameter_test_0811 start'); + var ret = true; + try { + let watcher = systemparameter.getWatcher("test.watcher_param.205"); + console.info('system_parameter_test_0811 watcher' + watcher); + if (watcher === undefined) { + ret = false; + } + } catch (e) { + ret = false; + console.info("input error: " + e); + } + expect(ret).assertTrue(); + console.info('system_parameter_test_0811 end'); + }) + + /** + * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0812 + * @tc.name testWatcher02 + * @tc.desc Watch the value of the attribute with the specified key. + */ + it('system_parameter_test_0812', 0, function () { + console.info('system_parameter_test_0812 start'); + var ret = true; + try { + let watcher = systemparameter.getWatcher("test.watch_param.205", -1); + console.info('system_parameter_test_0812 watcher' + watcher); + if (watcher === undefined) { + ret = false; + } + } catch (e) { + ret = false; + console.info("input error: " + e); + } + expect(ret).assertTrue(); + console.info('system_parameter_test_0812 end'); + }) + + /** + * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0813 + * @tc.name testWatcher03 + * @tc.desc Watch the value of the attribute with the specified key. + */ + it('system_parameter_test_0813', 0, function () { + console.info('system_parameter_test_0813 start'); + var ret = false; + try { + ret = true; + let watcher = systemparameter.getWatcher(""); + if (watcher === undefined) { + ret = false; + } + } catch (e) { + ret = true; + console.info("input error: " + e); + } + expect(ret).assertTrue(); + console.info('system_parameter_test_0813 end'); + }) + + /** + * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0814 + * @tc.name testWatcher04 + * @tc.desc Watch the value of the attribute with the specified key. + */ + it('system_parameter_test_0814', 0, function () { + console.info('system_parameter_test_0814 start'); + var ret = false; + try { + ret = true; + let watcher = systemparameter.getWatcher("test.watcher.304^^^^"); + if (watcher === undefined) { + ret = false; + } + } catch (e) { + ret = true; + console.info("input error: " + e); + } + expect(ret).assertTrue(); + console.info('system_parameter_test_0814 end'); + }) + + /** + * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0815 + * @tc.name testWatcher05 + * @tc.desc Watch the value of the attribute with the specified key. + */ + it('system_parameter_test_0815', 0, function () { + console.info('system_parameter_test_0815 start'); + var ret = true; + try { + let watcher = systemparameter.getWatcher("test.watcher.304"); + console.info('system_parameter_test_0815 start watcher ' + watcher); + if (watcher === undefined) { + ret = false; + } + } catch (e) { + ret = false; + console.info("input error: " + e); + } + expect(ret).assertTrue(); + console.info('system_parameter_test_0815 end'); + }) + + /** + * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0816 + * @tc.name testWatcherOn01 + * @tc.desc Watch the value of the attribute with the specified key. + */ + it('system_parameter_test_0816', 0, function () { + console.info('system_parameter_test_0816 start'); + var ret = true; + let key = "test.watcher.401"; + try { + let watcher = systemparameter.getWatcher(key); + if (watcher === undefined) { + ret = false; + expect(ret).assertTrue(); + } else { + watcher.on("valueChange", function (key, value) { + ret = true; + console.info("system_parameter_test_0816 callback key: " + key); + console.info("system_parameter_test_0816 callback value: " + value); + }); + SetParameter(key); + } + } catch (e) { + ret = true; + console.info("input error: " + e); + } + expect(ret).assertTrue(); + console.info('system_parameter_test_0816 end'); + }) + + /** + * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0817 + * @tc.name testWatcherOn02 + * @tc.desc Watch the value of the attribute with the specified key. + */ + it('system_parameter_test_0817', 0, async function (done) { + console.info('system_parameter_test_0817 start'); + var ret = true; + let key = "test.watcher.402"; + try { + let watcher = systemparameter.getWatcher(key); + if (watcher === undefined) { + ret = false; + } else { + watcher.on("valueChange", function (key, value) { // no callback + ret = true; + console.info("system_parameter_test_0817 callback key: " + key); + console.info("system_parameter_test_0817 callback value: " + value); + }); + } + } catch (e) { + ret = false; + console.info("input error: " + e); + } + expect(ret).assertTrue(); + done(); + console.info('system_parameter_test_0817 end'); + }) + + /** + * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0818 + * @tc.name testWatcherOn03 + * @tc.desc Watch the value of the attribute with the specified key. + */ + it('system_parameter_test_0818', 0, function () { + console.info('system_parameter_test_0818 start'); + var ret = true; + let key = "test.watcher.403"; + try { + let watcher = systemparameter.getWatcher(key + "*"); + if (watcher === undefined) { + ret = false; + } else { + watcher.on("valueChange", function (key, value) { + ret = true; + console.info("system_parameter_test_0818 callback key: " + key); + console.info("system_parameter_test_0818 callback value: " + value); + }); + SetParameter("test.watcher.403.404"); + } + } catch (e) { + ret = false; + console.info("input error: " + e); + } + expect(ret).assertTrue(); + console.info('system_parameter_test_0818 end'); + }) + + /** + * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0819 + * @tc.name testWatcherOn04 + * @tc.desc Watch the value of the attribute with the specified key. + */ + it('system_parameter_test_0819', 0, async function (done) { + console.info('system_parameter_test_0819 start'); + var ret = false; + try { + let watcher = systemparameter.getWatcher("*"); + if (watcher != undefined) { + let code = watcher.on("valueChange", function (key, value) { // fail + ret = true; + console.info("system_parameter_test_0819 callback key: " + key); + console.info("system_parameter_test_0819 callback value: " + value); + }); + console.info("system_parameter_test_0819 code: " + code); + } else { + ret = true; + } + } catch (e) { + ret = true; + console.info("system_parameter_test_0819 error: " + e); + } + expect(ret).assertTrue(); + done(); + console.info('system_parameter_test_0819 end'); + }) + + function callback1(key, value) { + console.info("callback1 Watch callback key: " + key); + console.info("callback1 Watch callback value: " + value); + } + + /** + * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0820 + * @tc.name testWatcherOn05 + * @tc.desc Watch the value of the attribute with the specified key. + */ + it('system_parameter_test_0820', 0, async function (done) { + console.info('system_parameter_test_0820 start'); + var ret = true; + let key = "test.watcher.405"; + try { + let watcher = systemparameter.getWatcher(key); + if (watcher === undefined) { + ret = false; + } else { + ret = false; + let code = watcher.on("valueChange", callback1); + if (code === 0) { + ret = true; + } + code = watcher.on("valueChange", callback1); + if (code === 0) { + ret = true; + } + } + } catch (e) { + ret = true; + console.info("system_parameter_test_0820 input error: " + e); + } + expect(ret).assertTrue(); + done(); + console.info('system_parameter_test_0820 end'); + }) + + /** + * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0821 + * @tc.name testWatcherOff01 + * @tc.desc Watch the value of the attribute with the specified key. + */ + it('system_parameter_test_0821', 0, async function (done) { + console.info('system_parameter_test_0821 start'); + var ret = false; + let key = "test.watcher.501"; + try { + let watcher = systemparameter.getWatcher(key); + if (watcher === undefined) { + ret = false; + } else { + ret = true; + let code = watcher.on("valueChange", callback1); + SetParameter(key); + code = watcher.off("valueChange", callback1); + if (code === 0) { + ret = true; + } + } + } catch (e) { + ret = false; + console.info("input error: " + e); + } + setTimeout(function () { + expect(ret).assertTrue(); + done(); + }, '1000'); + console.info('system_parameter_test_0821 end '); + }) + + /** + * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0822 + * @tc.name testWatcherOff02 + * @tc.desc Watch the value of the attribute with the specified key. + */ + it('system_parameter_test_0822', 0, function () { + console.info('system_parameter_test_0822 start'); + var ret = true; + let key = "test.watcher.502"; + try { + let watcher = systemparameter.getWatcher(key); + if (watcher === undefined) { + ret = false; + } else { + let code = watcher.on("valueChange222", callback1); + if (code === 0) { + ret = false; + } + code = watcher.off("valueChange222", callback1); + if (code === 0) { + ret = false; + } + } + } catch (e) { + ret = false; + console.info("input error: " + e); + } + expect(ret).assertTrue(); + console.info('system_parameter_test_0822 end'); + }) + + /** + * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0823 + * @tc.name testWatcherOff03 + * @tc.desc Watch the value of the attribute with the specified key. + */ + it('system_parameter_test_0823', 0, function () { + console.info('system_parameter_test_0823 start'); + var ret = false; + let key = "test.watcher.503"; + try { + let watcher = systemparameter.getWatcher(key); + if (watcher === undefined) { + ret = false; + } else { + ret = false; + let code = watcher.on("valueChange", function (key, value) { + console.info("system_parameter_test_0823 callback key: " + key); + console.info("system_parameter_test_0823 callback value: " + value); + let code = watcher.off("valueChange"); + if (code === 0) { + ret = true; + } + }); + if (code === 0) { + ret = true; + } + SetParameter(key); + } + } catch (e) { + ret = false; + console.info("input error: " + e); + } + expect(ret).assertTrue(); + console.info('system_parameter_test_0823 end'); + }) + + /** + * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0824 + * @tc.name testWatcherOff04 + * @tc.desc Watch the value of the attribute with the specified key. + */ + it('system_parameter_test_0824', 0, function () { + console.info('system_parameter_test_0824 start'); + var ret = false; + let key = "test.watcher.504"; + try { + let watcher = systemparameter.getWatcher(key); + if (watcher === undefined) { + ret = false; + } else { + ret = false; + let code = watcher.on("valueChange", callback1); + if (code === 0) { + ret = true; + } + code = watcher.off("valueChange", callback1); + console.info("system_parameter_test_0824 " + code); + if (code === 0) { + ret = true; + } + code = watcher.off("valueChange", callback1); + console.info("system_parameter_test_0824 " + code); + if (code != 0) { + ret = true; + } + } + } catch (e) { + ret = false; + console.info("input error: " + e); + } + expect(ret).assertTrue(); + console.info('system_parameter_test_0824 end'); + }) + + function callback3(key, value) { + console.info("system_parameter_test_0825 callback key: " + key); + console.info("system_parameter_test_0825 callback value: " + value); + } + + /** + * @tc.number SUB_STARTUP_JS_SYSTEM_PARAMETER_0825 + * @tc.name testWatcherOff05 + * @tc.desc Watch the value of the attribute with the specified key. + */ + it('system_parameter_test_0825', 0, async function (done) { + console.info('system_parameter_test_0825 start'); + var ret = false; + let key = "test.watcher.505"; + try { + let watcher = systemparameter.getWatcher(key); + if (watcher === undefined) { + ret = false; + } else { + ret = false; + let code = watcher.on("valueChange", callback3); + if (code === 0) { + ret = true; + } + SetParameter(key); + } + } catch (e) { + ret = false; + console.info("input error: " + e); + } + expect(ret).assertTrue(); + done(); + console.info('system_parameter_test_0825 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 new file mode 100644 index 0000000000000000000000000000000000000000..a5239a2b383f65174036cf864f016078bbc4733d --- /dev/null +++ b/startup/startup_standard/systemparamter/src/main/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "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 new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/startup/startup_standard/systemparamter/src/main/resources/base/media/icon.png differ