diff --git a/aafwk/aafwk_standard/BUILD.gn b/aafwk/aafwk_standard/BUILD.gn index 2b4a2beb336235cdbbb9cc698b156cb391d2dfae..438e77b525ecfe035d3bd6d05a54cfb40902532b 100755 --- a/aafwk/aafwk_standard/BUILD.gn +++ b/aafwk/aafwk_standard/BUILD.gn @@ -19,7 +19,6 @@ group("aafwk_standard") { deps = [ "abilitymanager:actsabilitymanagertest", "actsabilitydelegatorcase:ActsAbilityDelegatorCaseTest", - "actsabilitydistributetest:ActsAbilityDistributeTest", "actsabilitylifecyclestatenew:ActsAbilityLifecycleStateNewTest", "actsabilitymanageretstest:ActsAbilityManagerEtsTest", "actsdataabilityjs:ActsDataAbilityJsTest", diff --git a/aafwk/aafwk_standard/actsabilitydistributetest/BUILD.gn b/aafwk/aafwk_standard/actsabilitydistributetest/BUILD.gn deleted file mode 100644 index b46415340da7f48ba6e01b885364f246b71a76a9..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitydistributetest/BUILD.gn +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2020-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("ActsAbilityDistributeTest") { - hap_profile = "./src/main/config.json" - deps = [ - ":hjs_demo_js_assets", - ":hjs_demo_js_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsAbilityDistributeTest" -} -ohos_js_assets("hjs_demo_js_assets") { - source_dir = "./src/main/js/default" -} -ohos_resources("hjs_demo_js_resources") { - sources = [ "./src/main/resources" ] - hap_profile = "./src/main/config.json" -} diff --git a/aafwk/aafwk_standard/actsabilitydistributetest/Test.json b/aafwk/aafwk_standard/actsabilitydistributetest/Test.json deleted file mode 100644 index 776b88009d046d24c37fefce8a86504d1b68d5d2..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitydistributetest/Test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "description" : "Configuration for hjunit demo Test", - "driver": { - "type" : "JSUnitTest", - "test-timeout": "180000", - "package": "com.example.actsabilitydistributetest", - "shell-timeout": "600000" - }, - "kits": [ - { - "test-file-name": [ - "ActsAbilityDistributeTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} \ No newline at end of file diff --git a/aafwk/aafwk_standard/actsabilitydistributetest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/actsabilitydistributetest/signature/openharmony_sx.p7b deleted file mode 100644 index 66b4457a8a81fb8d3356cf46d67226c850944858..0000000000000000000000000000000000000000 Binary files a/aafwk/aafwk_standard/actsabilitydistributetest/signature/openharmony_sx.p7b and /dev/null differ diff --git a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/config.json b/aafwk/aafwk_standard/actsabilitydistributetest/src/main/config.json deleted file mode 100644 index bcfe3d9c9351d5c319385fcc1cd3ce8009418abf..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/config.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "app": { - "bundleName": "com.example.actsabilitydistributetest", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.actsabilitydistributetest", - "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.actsabilitydistributetest.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:app_name", - "type": "page", - "launchType": "standard" - } - ], - "reqPermissions": [ - { - "name": "ohos.permission.INSTALL_BUNDLE", - "reason": "need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } -} diff --git a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/app.js b/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/app.js deleted file mode 100644 index e423f4bce4698ec1d7dc86c3eea3990a5e7b1085..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/app.js +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -}; diff --git a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/i18n/en-US.json deleted file mode 100644 index 25b4997e50df3af032339fe395b293b95a44c275..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/i18n/en-US.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "OpenHarmony" - } -} \ No newline at end of file diff --git a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/i18n/zh-CN.json deleted file mode 100644 index b9543e1912f72ea9075609981bf64496330cbb41..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/i18n/zh-CN.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "您好", - "world": "鸿蒙OS" - } -} \ No newline at end of file diff --git a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/pages/index/index.css deleted file mode 100644 index 6fda792753f2e15f22b529c7b90a82185b2770bf..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/pages/index/index.css +++ /dev/null @@ -1,9 +0,0 @@ -.container { - flex-direction: column; - justify-content: center; - align-items: center; -} - -.title { - font-size: 100px; -} diff --git a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/pages/index/index.hml deleted file mode 100644 index f64b040a5ae394dbaa5e185e1ecd4f4556b92184..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/pages/index/index.hml +++ /dev/null @@ -1,5 +0,0 @@ -
- - {{ $t('strings.hello') }} {{ title }} - -
diff --git a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/pages/index/index.js deleted file mode 100644 index 1202d5deb22a5b236ae6bf9f581ad5ef52c954da..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/pages/index/index.js +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import {Core, ExpectExtend} from 'deccjsunit/index' - -const injectRef = Object.getPrototypeOf(global) || global -injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') - -export default { - data: { - title: '' - }, - onInit() { - this.title = this.$t('strings.world'); - }, - onShow() { - console.info('onShow finish') - const core = Core.getInstance() - const expectExtend = new ExpectExtend({ - id: 'extend' - }) - core.addService('expect', expectExtend) - core.init() - - const configService = core.getDefaultService('config') - configService.setConfig(this) - - require('../../test/List.test') - core.execute() - }, - onReady() { - console.info('onReady'); - }, -} diff --git a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/test/FeatureAbilityDistribute.test.js b/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/test/FeatureAbilityDistribute.test.js deleted file mode 100644 index 76b7dddd058ebf7469bf4f0a0b2bdb45c48303b8..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/test/FeatureAbilityDistribute.test.js +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// @ts-nocheck -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index' -import abilityFeatureAbility from '@ohos.ability.featureAbility' - -var timeSleep = 3000; - -describe('DistributedTest', function(){ - function sleep(time) { - return new Promise((resolve) => setTimeout(resolve, time)); - } - - - /** - * @tc.number SUB_AA_OpenHarmony_ContinueAbility_0300 - * @tc.name testContinueAbility0300 - * @tc.desc T - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 3 - */ - it('testContinueAbility0300', 0, async function (done) { - console.log('testContinueAbility0300 run start'); - abilityFeatureAbility.continueAbility(undefined, (err, data) => { - console.log('testContinueAbility0300 err is :' + JSON.stringify(err) + ', value is :' - + JSON.stringify(data)); - }) - await sleep(timeSleep); - console.log('testContinueAbility0300 run end'); - done(); - }) - - /** - * @tc.number SUB_AA_OpenHarmony_ContinueAbility_0400 - * @tc.name testContinueAbility0200 - * @tc.desc T - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 3 - */ - it('testContinueAbility0400', 0, async function (done) { - console.log('testContinueAbility0400 run start'); - abilityFeatureAbility.continueAbility("", (err, data) => { - console.log('testContinueAbility0400 err is :' + JSON.stringify(err) + ', value is :' - + JSON.stringify(data)); - }) - await sleep(timeSleep); - console.log('testContinueAbility0400 run end'); - done(); - }) - - /** - * @tc.number SUB_AA_OpenHarmony_ContinueAbility_0500 - * @tc.name testContinueAbility0500 - * @tc.desc T - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 3 - */ - it('testContinueAbility0500', 0, async function (done) { - let options = { - deviceId : undefined, - reversible : false, - } - console.log('testContinueAbility0500 run start'); - abilityFeatureAbility.continueAbility(options, (err, data) => { - console.log('testContinueAbility0500 err is :' + JSON.stringify(err) + ', value is :' - + JSON.stringify(data)); - }) - await sleep(timeSleep); - console.log('testContinueAbility0500 run end'); - done(); - }) - - /** - * @tc.number SUB_AA_OpenHarmony_ContinueAbility_0600 - * @tc.name testContinueAbility0600 - * @tc.desc T - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 3 - */ - it('testContinueAbility0600', 0, async function (done) { - let options = { - deviceId : "", - reversible : false, - } - console.log('testContinueAbility0600 run start'); - abilityFeatureAbility.continueAbility(options, (err, data) => { - console.log('testContinueAbility0600 err is :' + JSON.stringify(err) + ', value is :' - + JSON.stringify(data)); - }) - await sleep(timeSleep); - console.log('testContinueAbility0600 run end'); - done(); - }) - - /** - * @tc.number SUB_AA_OpenHarmony_ContinueAbility_0700 - * @tc.name testContinueAbility0700 - * @tc.desc T - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 3 - */ - it('testContinueAbility0700', 0, async function (done) { - let options = { - reversible : false, - } - console.log('testContinueAbility0700 run start'); - abilityFeatureAbility.continueAbility(options, (err, data) => { - console.log('testContinueAbility0700 err is :' + JSON.stringify(err) + ', value is :' - + JSON.stringify(data)); - }) - await sleep(timeSleep); - console.log('testContinueAbility0700 run end'); - done(); - }) - - /** - * @tc.number SUB_AA_OpenHarmony_ContinueAbility_0900 - * @tc.name testContinueAbility0900 - * @tc.desc T - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 3 - */ - it('testContinueAbility0900', 0, async function (done) { - let options = { - deviceId : "2BB6F91131F74C1174904195FE72B6068F8F82280F6CE93BDFE0EFF9B37F9DD26", - reversible : false, - } - console.log('testContinueAbility0900 run start'); - abilityFeatureAbility.continueAbility(options, (err, data) => { - console.log('testContinueAbility0900 err is :' + JSON.stringify(err) + ', value is :' - + JSON.stringify(data)); - }) - await sleep(timeSleep); - console.log('testContinueAbility0900 run end'); - done(); - }) - - /** - * @tc.number SUB_AA_OpenHarmony_ContinueAbility_1000 - * @tc.name testContinueAbility0900 - * @tc.desc T - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 3 - */ - it('testContinueAbility1000', 0, async function (done) { - let options = { - deviceId : "2BB6F91131F74C1174904195FE72B6068F8F82280F6CE93BDFE0EFF9B37F9DD26", - reversible : false, - } - for(var i = 0; i < 10; i++) { - abilityFeatureAbility.continueAbility(options, (err, data) => { - console.log('testContinueAbility1000 err is :' + JSON.stringify(err) + ', value is :' - + JSON.stringify(data)); - }) - } - await sleep(timeSleep); - console.log('testContinueAbility1000 run end'); - done(); - }) -}) \ No newline at end of file diff --git a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/test/List.test.js b/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/test/List.test.js deleted file mode 100644 index 7c7aad9ad6176630c4fff53f609669d7f3e74e7f..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/test/List.test.js +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -require('./FeatureAbilityDistribute.test.js') - diff --git a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/actsabilitydistributetest/src/main/resources/base/element/string.json deleted file mode 100644 index a5239a2b383f65174036cf864f016078bbc4733d..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/resources/base/element/string.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "StartupJSApiTest" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - } - ] -} \ No newline at end of file diff --git a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/actsabilitydistributetest/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/aafwk/aafwk_standard/actsabilitydistributetest/src/main/resources/base/media/icon.png and /dev/null differ diff --git a/aafwk/aafwk_standard/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/entry/src/main/js/test/ActsProcessManageJsTest.test.js b/aafwk/aafwk_standard/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/entry/src/main/js/test/ActsProcessManageJsTest.test.js index fbee3beb2d32dba482950dd7f2deb623614d6706..eb03f484c156dc3f6741831c5c5773a086dab24e 100644 --- a/aafwk/aafwk_standard/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/entry/src/main/js/test/ActsProcessManageJsTest.test.js +++ b/aafwk/aafwk_standard/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/entry/src/main/js/test/ActsProcessManageJsTest.test.js @@ -15,7 +15,7 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "deccjsunit/index" import abilityManager from '@ohos.application.AbilityManager' -import appManager from '@ohos.application.AppManager' +import appManager from '@ohos.application.appManager' describe('ActsAbilityRunningInfosTest', function () {