diff --git a/msdp/BUILD.gn b/msdp/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..4207cd91f24a58487b0daffe8d546616ba8971ca --- /dev/null +++ b/msdp/BUILD.gn @@ -0,0 +1,22 @@ +# 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("//build/ohos_var.gni") +group("msdp") { + testonly = true + + if (is_standard_system) { + deps = [ + "msdpdevicestatus:msdp_devicestatus_test", + ] + } +} diff --git a/msdp/msdpdevicestatus/BUILD.gn b/msdp/msdpdevicestatus/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..4f5eef4ab7e0f215ede00227774ce35d29096108 --- /dev/null +++ b/msdp/msdpdevicestatus/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("msdp_devicestatus_test") { + hap_profile = "./src/main/config.json" + deps = [ + ":msdp_devicestatus_js_assets", + ":msdp_devicestatus_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsMsdpDeviceStatusTest" +} +ohos_js_assets("msdp_devicestatus_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("msdp_devicestatus_resources") { + sources = [ "./src/main/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/msdp/msdpdevicestatus/Test.json b/msdp/msdpdevicestatus/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..836f37eef545b581d5b430e69196dfb0ed21829f --- /dev/null +++ b/msdp/msdpdevicestatus/Test.json @@ -0,0 +1,19 @@ +{ + "description": "Configuration for msdp devicestatus Tests", + "driver": { + "type": "JSUnitTest", + "test-timeout": "60000", + "package": "com.example.mydevicestatusapp", + "shell-timeout": "60000" + }, + "kits": [ + { + "test-file-name": [ + "ActsMsdpDeviceStatusTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} + diff --git a/msdp/msdpdevicestatus/signature/openharmony_sx.p7b b/msdp/msdpdevicestatus/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/msdp/msdpdevicestatus/signature/openharmony_sx.p7b differ diff --git a/msdp/msdpdevicestatus/src/main/config.json b/msdp/msdpdevicestatus/src/main/config.json new file mode 100644 index 0000000000000000000000000000000000000000..4fa27dde2d558a6e8136443bdcb39874c6ff64af --- /dev/null +++ b/msdp/msdpdevicestatus/src/main/config.json @@ -0,0 +1,60 @@ +{ + "app": { + "bundleName": "com.example.mydevicestatusapp", + "vendor": "example", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5 + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.mydevicestatusapp", + "name": ".MyApplication", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "abilities": [ + { + "visible": true, + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "name": "com.example.mydevicestatusapp.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/msdp/msdpdevicestatus/src/main/js/default/app.js b/msdp/msdpdevicestatus/src/main/js/default/app.js new file mode 100644 index 0000000000000000000000000000000000000000..f796f6a0d8dde8b67d055b283776f27d4d06ac0f --- /dev/null +++ b/msdp/msdpdevicestatus/src/main/js/default/app.js @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import device from '@system.device'; + +export default { + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } +}; diff --git a/msdp/msdpdevicestatus/src/main/js/default/i18n/en-US.json b/msdp/msdpdevicestatus/src/main/js/default/i18n/en-US.json new file mode 100644 index 0000000000000000000000000000000000000000..e63c70d978a3a53be988388c87182f81785e170c --- /dev/null +++ b/msdp/msdpdevicestatus/src/main/js/default/i18n/en-US.json @@ -0,0 +1,6 @@ +{ + "strings": { + "hello": "Hello", + "world": "World" + } +} \ No newline at end of file diff --git a/msdp/msdpdevicestatus/src/main/js/default/i18n/zh-CN.json b/msdp/msdpdevicestatus/src/main/js/default/i18n/zh-CN.json new file mode 100644 index 0000000000000000000000000000000000000000..de6ee5748322f44942c1b003319d8e66c837675f --- /dev/null +++ b/msdp/msdpdevicestatus/src/main/js/default/i18n/zh-CN.json @@ -0,0 +1,6 @@ +{ + "strings": { + "hello": "您好", + "world": "世界" + } +} \ No newline at end of file diff --git a/msdp/msdpdevicestatus/src/main/js/default/pages/index/index.css b/msdp/msdpdevicestatus/src/main/js/default/pages/index/index.css new file mode 100644 index 0000000000000000000000000000000000000000..6fda792753f2e15f22b529c7b90a82185b2770bf --- /dev/null +++ b/msdp/msdpdevicestatus/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/msdp/msdpdevicestatus/src/main/js/default/pages/index/index.hml b/msdp/msdpdevicestatus/src/main/js/default/pages/index/index.hml new file mode 100644 index 0000000000000000000000000000000000000000..f64b040a5ae394dbaa5e185e1ecd4f4556b92184 --- /dev/null +++ b/msdp/msdpdevicestatus/src/main/js/default/pages/index/index.hml @@ -0,0 +1,5 @@ +
+ + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/msdp/msdpdevicestatus/src/main/js/default/pages/index/index.js b/msdp/msdpdevicestatus/src/main/js/default/pages/index/index.js new file mode 100644 index 0000000000000000000000000000000000000000..a1ba7d09ff11f7ae326654f40f4293578fc4450d --- /dev/null +++ b/msdp/msdpdevicestatus/src/main/js/default/pages/index/index.js @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import app from '@system.app' + +//import {Core, ExpectExtend, ReportExtend, InstrumentLog} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' + +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.addService('report', instrumentLog) + core.init() +// core.subscribeEvent('spec', instrumentLog) +// core.subscribeEvent('suite', instrumentLog) +// core.subscribeEvent('task', instrumentLog) + + const configService = core.getDefaultService('config') + configService.setConfig(this) + + require('../../test/List.test') + core.execute() + }, + onReady() { + }, +} \ No newline at end of file diff --git a/msdp/msdpdevicestatus/src/main/js/default/test/.Geofence.test.js.swp b/msdp/msdpdevicestatus/src/main/js/default/test/.Geofence.test.js.swp new file mode 100644 index 0000000000000000000000000000000000000000..63fbe1feaa4e438cf4878bf1eb4e8799c13d17e7 Binary files /dev/null and b/msdp/msdpdevicestatus/src/main/js/default/test/.Geofence.test.js.swp differ diff --git a/msdp/msdpdevicestatus/src/main/js/default/test/DeviceStatus.test.js b/msdp/msdpdevicestatus/src/main/js/default/test/DeviceStatus.test.js new file mode 100644 index 0000000000000000000000000000000000000000..0690b18b3e58617643fed2c773e70a3fb3c363fa --- /dev/null +++ b/msdp/msdpdevicestatus/src/main/js/default/test/DeviceStatus.test.js @@ -0,0 +1,208 @@ +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import app from '@system.app' +import devicestatus from '@ohos.devicestatus'; +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' + +var reportLatencyNs = 100; + +describe('msdpInfoTest', function () { + + /** + * @tc.number DeviceStatus_001 + * @tc.name + * @tc.callback:AsyncCallback + * Normal + */ + it('msdp_test_devices_status_001',0, async function(done) { + console.log("device_status_type_001 start") + devicestatus.on('still',deviceStatus.ActivityEvent.ENTER,reportLatencyNs,(data) => { + expect(data.ActivityState == 1).assertTrue(); + //unregister + devicestatus.off('still',deviceStatus.ActivityEvent.ENTER,() => { + console.log("msdp_test_devices_status_001 off success"); + done(); + console.log("msdp_test_devices_status_001 success"); + }) + }) + }) + + /** + * @tc.number DeviceStatus_002 + * @tc.name + * @tc.callback:AsyncCallback + * Normal + */ + it('msdp_test_devices_status_002',0, async function(done) { + console.log("device_status_type_002 start") + devicestatus.on('relativeStill',deviceStatus.ActivityEvent.ENTER,reportLatencyNs,(data) => { + expect(data.ActivityState == 1).assertTrue(); + //unregister + devicestatus.off('relativeStill',deviceStatus.ActivityEvent.ENTER,() => { + console.log("msdp_test_devices_status_002 off success"); + done(); + console.log("msdp_test_devices_status_002 success"); + }) + }) + }) + + /** + * @tc.number DeviceStatus_003 + * @tc.name + * @tc.callback:AsyncCallback + * Normal + */ + it('msdp_test_devices_status_003',0, async function(done) { + console.log("device_status_type_003 start") + devicestatus.on('still',deviceStatus.ActivityEvent.EXIT,reportLatencyNs,(data) => { + expect(data.ActivityState == 2).assertTrue(); + //unregister + devicestatus.off('still',deviceStatus.ActivityEvent.EXIT,() => { + console.log("msdp_test_devices_status_003 off success"); + done(); + console.log("msdp_test_devices_status_003 success"); + }) + }) + }) + + /** + * @tc.number DeviceStatus_004 + * @tc.name + * @tc.callback:AsyncCallback + * Normal + */ + it('msdp_test_devices_status_004',0, async function(done) { + console.log("device_status_type_004 start") + devicestatus.on('relativeStill',deviceStatus.ActivityEvent.EXIT,reportLatencyNs,(data) => { + expect(data.ActivityState == 2).assertTrue(); + //unregister + devicestatus.off('relativeStill',deviceStatus.ActivityEvent.EXIT,() => { + console.log("msdp_test_devices_status_004 off success"); + done(); + console.log("msdp_test_devices_status_004 success"); + }) + }) + }) + + /** + * @tc.number DeviceStatus_005 + * @tc.name + * @tc.callback:AsyncCallback + * Normal + */ + it('msdp_test_devices_status_005',0, async function(done) { + console.log("device_status_type_005 start") + devicestatus.on('still',deviceStatus.ActivityEvent.ENTER_EXIT,reportLatencyNs,(data) => { + expect(data.ActivityState !== -1).assertTrue(); + //unregister + devicestatus.off('still',deviceStatus.ActivityEvent.ENTER_EXIT,() => { + console.log("msdp_test_devices_status_005 off success"); + done(); + console.log("msdp_test_devices_status_005 success"); + }) + }) + }) + + /** + * @tc.number DeviceStatus_006 + * @tc.name + * @tc.callback:AsyncCallback + * Normal + */ + it('msdp_test_devices_status_006',0, async function(done) { + console.log("device_status_type_006 start") + devicestatus.on('relativeStill',deviceStatus.ActivityEvent.ENTER_EXIT,reportLatencyNs,(data) => { + expect(data.ActivityState !== -1).assertTrue(); + //unregister + devicestatus.off('relativeStill',deviceStatus.ActivityEvent.ENTER_EXIT,() => { + console.log("msdp_test_devices_status_006 off success"); + done(); + console.log("msdp_test_devices_status_006 success"); + }) + }) + }) + + /** + * @tc.number DeviceStatus_007 + * @tc.name + * @tc.callback:AsyncCallback + * Normal + */ + it('msdp_test_devices_status_007',0, async function(done) { + console.log("device_status_type_007 start") + devicestatus.on('still',deviceStatus.ActivityEvent.ENTER,reportLatencyNs,(data) => { + expect(data.ActivityState == 1).assertTrue(); + //unregister + devicestatus.off('still',deviceStatus.ActivityEvent.ENTER,() => { + console.log("msdp_test_devices_status_007 off success"); + done(); + console.log("msdp_test_devices_status_007 success"); + }) + }) + }) + + /** + * @tc.number DeviceStatus_008 + * @tc.name + * @tc.callback:AsyncCallback + * -1 + */ + it('msdp_test_devices_status_008',0, async function(done) { + console.log("msdp_test_devices_status_008 start"); + devicestatus.once('still',(data) => { + console.log("data="+ JSON.stringify(data)); + expect(data.ActivityState == 1).assertTrue(); + done(); + console.log("msdp_test_devices_status_008 once success"); + }) + }) + + /** + * @tc.number DeviceStatus_009 + * @tc.name + * @tc.callback:AsyncCallback + * Normal + */ + it('msdp_test_devices_status_009',0, async function(done) { + console.log("device_status_type_009 start") + devicestatus.on('relativeStill',deviceStatus.ActivityEvent.EXIT,reportLatencyNs,(data) => { + expect(data.ActivityState == 2).assertTrue(); + //unregister + devicestatus.off('relativeStill',deviceStatus.ActivityEvent.ENTER,() => { + console.log("msdp_test_devices_status_009 off success"); + done(); + console.log("msdp_test_devices_status_009 success"); + }) + }) + }) + + /** + * @tc.number DeviceStatus_010 + * @tc.name + * @tc.callback:AsyncCallback + * -1 + */ + it('msdp_test_devices_status_010',0, async function(done) { + console.log("msdp_test_devices_status_010 start"); + devicestatus.once('relativeStill',(data) => { + console.log("data="+ JSON.stringify(data)); + expect(data.ActivityState == 2).assertTrue(); + done(); + console.log("msdp_test_devices_status_010 once success"); + }) + }) +}) + + diff --git a/msdp/msdpdevicestatus/src/main/js/default/test/List.test.js b/msdp/msdpdevicestatus/src/main/js/default/test/List.test.js new file mode 100644 index 0000000000000000000000000000000000000000..867ae1defda100f7ac61364e037e1027faefaa1d --- /dev/null +++ b/msdp/msdpdevicestatus/src/main/js/default/test/List.test.js @@ -0,0 +1 @@ +require('./DeviceStatus.test.js'); diff --git a/msdp/msdpdevicestatus/src/main/resources/base/element/string.json b/msdp/msdpdevicestatus/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..d7055fd0d27c7ff6efd76154598fc38f34d0a097 --- /dev/null +++ b/msdp/msdpdevicestatus/src/main/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "app_name", + "value": "MyDeviceStatusApp" + }, + { + "name": "mainability_description", + "value": "JS_Phone_Empty Feature Ability" + } + ] +} \ No newline at end of file diff --git a/msdp/msdpdevicestatus/src/main/resources/base/media/icon.png b/msdp/msdpdevicestatus/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/msdp/msdpdevicestatus/src/main/resources/base/media/icon.png differ