Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
1 年多 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts
未验证 提交 00b2ac2a 编写于 作者: O openharmony_ci 提交者： Gitee
浏览文件
操作

!8153 xts-getCurrentTopAbility问题修改 

Merge pull request !8153 from chengxingzhen/OpenHarmony-3.2-Release
上级 afba4bb3 a9c991ff
隐藏空白更改
内联 并排
Showing with 58 addition and 1073 deletion
ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/Ability1/Ability1.ts
浏览文件 @ 00b2ac2a
......@@ -36,6 +36,13 @@ export default class MainAbility extends Ability {
globalThis.ability3Context = this.context
windowStage.setUIContent(this.context, "pages/index1", null)
windowStage.on('windowStageEvent', (data) => {
console.log(`ActsGetCurrentTopAbilityStagebTest onWindwoStage is : ${JSON.stringify(data)}`)
if (data == 2 ) {
console.log(`ActsGetCurrentTopAbilityStagebTest getWindowStageActive is sucess`)
commonEvent.publish("GetCurrentTopAbility", publishCallBackOne);
}
})
}
onWindowStageDestroy() {
......@@ -46,7 +53,6 @@ export default class MainAbility extends Ability {
onForeground() {
// Ability has brought to foreground
console.log("Ability1 onForeground")
commonEvent.publish("GetCurrentTopAbility", publishCallBackOne);
}
......
ability/ability_runtime/apitest/entry/src/main/ets/MainAbility/MainAbility.ts
浏览文件 @ 00b2ac2a
......@@ -37,6 +37,21 @@ export default class TestAbility extends Ability {
onWindowStageCreate(windowStage) {
console.log('TestAbility onWindowStageCreate')
windowStage.setUIContent(this.context, 'MainAbility/pages/index', null)
console.log('TestAbility onWindowStageCreate')
globalThis.onWindowStageActive = false;
let count = 0;
windowStage.setUIContent(this.context, 'MainAbility/pages/index', null)
windowStage.on('windowStageEvent', (data) => {
console.log(`ActsApiTest onWindwoStage is : ${JSON.stringify(data)}`)
if (data == 2 ) {
console.log(`ActsApiTest onWindwoStage count is : ${count}`)
count++;
if (count == 2) {
console.log(`ActsApiTest onWindwoStage count is : ${count}`)
globalThis.onWindowStageActive = true;
}
}
})
}
onWindowStageDestroy() {
......
ability/ability_runtime/apitest/entry/src/main/ets/test/Ability.test.ets
浏览文件 @ 00b2ac2a
......@@ -31,7 +31,18 @@ export default function abilityTest() {
describe('ActsChangeAbilityStagetest', function () {
beforeAll(async function (done) {
console.info('beforeAll called')
await sleep(2000)
let delay = 3000;
let start = new Date().getTime();
while (true) {
if (globalThis.onWindowStageActive) {
console.log(`ActsApiTest getWindwoStageActive is success`)
break;
}
if (new Date().getTime() - start > delay) {
console.log(`ActsApiTest getWindwoStageActive is failed`)
break;
}
}
await globalThis.abilitydelegator.getCurrentTopAbility().then((data) => {
mainability = data
done()
......
ability/ability_runtime/non_concurrent/BUILD.gn
浏览文件 @ 00b2ac2a
......@@ -19,8 +19,6 @@ group("non_concurrent") {
deps = [
"acts_systemappa_test:ActsSystemAppATest",
"acts_systemappone_rely_test:ActsSystemAppOneRelyHap",
"actsthirdappatest:ActsThirdAppATest",
"actsthirdapponerelytest:ActsThirdAppOneRelyHap",
]
}
}
ability/ability_runtime/non_concurrent/actsthirdappatest/AppScope/app.json 已删除 100755 → 0
浏览文件 @ afba4bb3
{
"app": {
"bundleName": "com.example.actsabilitypermissionthirdtest",
"vendor": "example",
"versionCode": 1000000,
"versionName": "1.0.0",
"icon": "$media:app_icon",
"label": "$string:app_name",
"distributedNotificationEnabled": true,
"keepAlive" : true,
"singleUser": true,
"minAPIVersion": 9,
"targetAPIVersion": 9,
"car": {
"apiCompatibleVersion": 9,
"singleUser": false
}
}
}
\ No newline at end of file
ability/ability_runtime/non_concurrent/actsthirdappatest/BUILD.gn 已删除 100755 → 0
浏览文件 @ afba4bb3
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("ActsThirdAppATest") {
hap_profile = "entry/src/main/module.json"
js_build_mode = "debug"
deps = [
":actsthirdappatest_ets_assets",
":actsthirdappatest_resources",
]
ets2abc = true
certificate_profile = "signature/openharmony_sx.p7b"
hap_name = "ActsThirdAppATest"
subsystem_name = "ability"
part_name = "ability_runtime"
}
ohos_app_scope("actsthirdappatest_app_profile") {
app_profile = "AppScope/app.json"
sources = [ "AppScope/resources" ]
}
ohos_js_assets("actsthirdappatest_ets_assets") {
source_dir = "entry/src/main/ets"
}
ohos_resources("actsthirdappatest_resources") {
sources = [ "entry/src/main/resources" ]
deps = [ ":actsthirdappatest_app_profile" ]
hap_profile = "entry/src/main/module.json"
}
ability/ability_runtime/non_concurrent/actsthirdappatest/Test.json 已删除 100755 → 0
浏览文件 @ afba4bb3
{
"description": "Configuration for aceceshi Tests",
"driver": {
"type": "OHJSUnitTest",
"test-timeout": "300000",
"bundle-name": "com.example.actsabilitypermissionthirdtest",
"module-name": "entry",
"shell-timeout": "300000"
},
"kits": [
{
"type": "ShellKit",
"run-command": [
"power-shell setmode 602"
]
},
{
"type": "ShellKit",
"run-command": [
"remount"
]
},
{
"type": "ShellKit",
"run-command": [
"acm create -n 101 -t normal",
"acm switch -i 101"
],
"teardown-command": [
"acm delete -i 101"
]
},
{
"type": "ShellKit",
"run-command": [
"acm switch -i 100"
]
},
{
"type": "PushKit",
"push": [
"ActsThirdAppATest.hap->/data/app/ActsThirdAppATest.hap",
"ActsThirdAppOneRelyHap.hap->/data/app/ActsThirdAppOneRelyHap.hap"
]
},
{
"type": "ShellKit",
"run-command": [
"bm install -u100 -p /data/app/ActsThirdAppATest.hap",
"bm install -u101 -p /data/app/ActsThirdAppOneRelyHap.hap"
],
"teardown-command": [
"bm uninstall -n com.example.actsabilitypermissionthirdtest"
]
},
{
"type": "ShellKit",
"run-command": [
"chmod 644 /data/*.hap"
]
}
]
}
\ No newline at end of file
ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/Application/AbilityStage.ts 已删除 100755 → 0
浏览文件 @ afba4bb3
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import AbilityStage from "@ohos.app.ability.AbilityStage"
export default class MyAbilityStage extends AbilityStage {
onCreate() {
console.log("MyAbilityStage onCreate")
}
}
\ No newline at end of file
ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/MainAbility2/MainAbility2.ts 已删除 100755 → 0
浏览文件 @ afba4bb3
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import Ability from '@ohos.app.ability.UIAbility'
import commonEvent from '@ohos.commonEvent'
function PublishCallBackOne1() {
console.debug("====>Publish CallBack ACTS_ThirdPartyAbilityPermission_0100_CommonEvent====>");
globalThis.ability2Context.terminateSelf();
console.debug("====>close this context====>")
}
export default class MainAbility2 extends Ability {
onCreate(want, launchParam) {
console.log("MainAbility2 onCreate")
}
onDestroy() {
// Ability is destroying, release resources for this ability
console.log("MainAbility2 onDestroy")
}
onWindowStageCreate(windowStage) {
// Main window is created, set main page for this ability
console.log("MainAbility2 onWindowStageCreate")
windowStage.setUIContent(this.context, "pages/index/index2", null)
globalThis.ability2Context = this.context;
commonEvent.publish("ACTS_ThirdPartyAbilityPermission_0100_Start_CommonEvent", PublishCallBackOne1);
}
onWindowStageDestroy() {
// Main window is destroyed, release UI related resources
console.log("MainAbility2 onWindowStageDestroy")
}
onForeground() {
// Ability has brought to foreground
console.log("MainAbility2 onForeground")
}
onBackground() {
// Ability has back to background
console.log("MainAbility2 onBackground")
}
};
ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/TestAbility/TestAbility.ts 已删除 100755 → 0
浏览文件 @ afba4bb3
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import Ability from '@ohos.app.ability.UIAbility'
import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
import { Hypium } from '@ohos/hypium'
import testsuite from '../test/List.test'
export default class TestAbility extends Ability {
onCreate(want, launchParam) {
console.log('TestAbility onCreate')
globalThis.abilityContext = this.context;
}
onDestroy() {
console.log('TestAbility onDestroy')
}
onWindowStageCreate(windowStage) {
console.log('TestAbility onWindowStageCreate')
windowStage.setUIContent(this.context, 'TestAbility/pages/index', null)
var abilityDelegator: any
abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
var abilityDelegatorArguments: any
abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
console.info('start run testcase!!!')
Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
}
onWindowStageDestroy() {
console.log('TestAbility onWindowStageDestroy')
}
onForeground() {
console.log('TestAbility onForeground')
}
onBackground() {
console.log('TestAbility onBackground')
}
};
\ No newline at end of file
ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/TestAbility/pages/index.ets 已删除 100755 → 0
浏览文件 @ afba4bb3
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@Entry
@Component
struct Index {
build() {
Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
Text('页面1')
.fontSize(50)
.fontWeight(FontWeight.Bold)
}
.width('100%')
.height('100%')
}
}
\ No newline at end of file
ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts 已删除 100755 → 0
浏览文件 @ afba4bb3
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import TestRunner from '@ohos.application.testRunner'
import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
var abilityDelegator = undefined
var abilityDelegatorArguments = undefined
function translateParamsToString(parameters) {
const keySet = new Set([
'-s class', '-s notClass', '-s suite', '-s it',
'-s level', '-s testType', '-s size', '-s timeout'
])
let targetParams = '';
for (const key in parameters) {
if (keySet.has(key)) {
targetParams = `${targetParams} ${key} ${parameters[key]}`
}
}
return targetParams.trim()
}
async function onAbilityCreateCallback() {
console.log("onAbilityCreateCallback");
}
async function addAbilityMonitorCallback(err: any) {
console.info("addAbilityMonitorCallback : " + JSON.stringify(err))
}
export default class OpenHarmonyTestRunner implements TestRunner {
constructor() {
}
onPrepare() {
console.info("OpenHarmonyTestRunner OnPrepare ")
}
async onRun() {
console.log('OpenHarmonyTestRunner onRun run')
abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
var testAbilityName = abilityDelegatorArguments.bundleName + '.TestAbility'
let lMonitor = {
abilityName: testAbilityName,
onAbilityCreate: onAbilityCreateCallback,
};
abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
var cmd = 'aa start -d 0 -a TestAbility' + ' -b ' + abilityDelegatorArguments.bundleName
cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
console.info('cmd : '+cmd)
abilityDelegator.executeShellCommand(cmd,
(err: any, d: any) => {
console.info('executeShellCommand : err : ' + JSON.stringify(err));
console.info('executeShellCommand : data : ' + d.stdResult);
console.info('executeShellCommand : data : ' + d.exitCode);
})
console.info('OpenHarmonyTestRunner onRun end')
}
};
\ No newline at end of file
ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/pages/index/index2.ets 已删除 100755 → 0
浏览文件 @ afba4bb3
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@Entry
@Component
struct Index2 {
build() {
Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
Text('页面2')
.fontSize(50)
.fontWeight(FontWeight.Bold)
}
.width('100%')
.height('100%')
}
}
\ No newline at end of file
ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/test/AbilityPermission.test.ets 已删除 100755 → 0
浏览文件 @ afba4bb3
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
import commonEvent from '@ohos.commonEvent'
var AbilityPermission1 = {
events: ["ACTS_ThirdPartyAbilityPermission_0100_Start_CommonEvent"]
}
var AbilityPermission3 = {
events: ["ACTS_ThirdPartyAbilityPermission_0300_Start_CommonEvent"]
}
var AbilityPermission6 = {
events: ["ACTS_ThirdPartyAbilityPermission_0600_Start_CommonEvent"]
}
const START_ABILITY_TIMEOUT = 3000;
export default function abilityPermissionTest() {
describe('ActsAbilityPermissionTest', function () {
var userA=100;
var userB=101;
/*
* @tc.number: ACTS_ThirdPartyAbilityPermission_0100
* @tc.name: In non-concurrent mode, if the target application is not the current user, it is forbidden to start
* @tc.desc: Start an ability that belongs to the current user with the current user
*/
it('ACTS_ThirdPartyAbilityPermission_0100', 0, async function (done) {
console.log("ACTS_ThirdPartyAbilityPermission_0100====>callback start====>")
var Subscriber;
var flag = true;
function SubscribeCallBack(err, data) {
console.debug("ACTS_ThirdPartyAbilityPermission_0100====>Subscribe CallBack data:" + JSON.stringify(data));
expect(data.event == 'ACTS_ThirdPartyAbilityPermission_0100_Start_CommonEvent').assertTrue()
commonEvent.unsubscribe(Subscriber, UnSubscribeCallback);
}
commonEvent.createSubscriber(AbilityPermission1).then(async (data) => {
console.debug("ACTS_ThirdPartyAbilityPermission_0100====>Create Subscriber====>");
Subscriber = data;
commonEvent.subscribe(Subscriber, SubscribeCallBack);
console.debug("====>start startAbility_100====>");
await globalThis.abilityContext.startAbilityWithAccount(
{
bundleName: 'com.example.actsabilitypermissionthirdtest',
abilityName: 'MainAbility2'
}, userA, () => {
console.debug("====>startAbility end_100====>");
})
})
function UnSubscribeCallback() {
flag = false
console.debug("ACTS_ThirdPartyAbilityPermission_0100====>UnSubscribe CallBack====>"+flag);
done();
}
setTimeout(()=>{
if (flag == true) {
expect().assertFail();
console.debug('in ACTS_ThirdPartyAbilityPermission_0100====>timeout====>'+flag);
commonEvent.unsubscribe(Subscriber, UnSubscribeCallback)
}
console.debug('ACTS_ThirdPartyAbilityPermission_0100====>timeout====>');
}, START_ABILITY_TIMEOUT);
})
/*
* @tc.number: ACTS_ThirdPartyAbilityPermission_0300
* @tc.name: In non-concurrent mode, if the target application is not the current user, it is forbidden to start
* @tc.desc: Start an ability under user U101 with the current user
*/
it('ACTS_ThirdPartyAbilityPermission_0300', 0, async function (done) {
console.log("ACTS_ThirdPartyAbilityPermission_0300====>callback start====>")
var Subscriber
var flag = 0;
console.debug("====>get AccountManager finish====");
function SubscribeCallBack(err, data) {
console.debug("ACTS_ThirdPartyAbilityPermission_0300====>Subscribe CallBack data:" + JSON.stringify(data));
expect(data.event == 'ACTS_ThirdPartyAbilityPermission_0300_Start_CommonEvent').assertTrue()
commonEvent.unsubscribe(Subscriber, UnSubscribeCallback)
}
commonEvent.createSubscriber(AbilityPermission3).then(async (data) => {
console.debug("ACTS_ThirdPartyAbilityPermission_0300====>Create Subscriber====>");
Subscriber = data;
commonEvent.subscribe(Subscriber, SubscribeCallBack);
console.debug("====>start startAbility_0300====>");
await globalThis.abilityContext.startAbilityWithAccount(
{
bundleName: 'com.example.actsthirdappuonehundredone',
abilityName: 'MainAbility'
}, userB ).then().catch((err) => {
console.debug("ACTS_ThirdPartyAbilityPermission_0300====>" + err)
console.debug("====>startAbility end_0300====>");
})
})
function UnSubscribeCallback() {
if(flag == 0) {
expect().assertFail();
}
console.debug("ACTS_ThirdPartyAbilityPermission_0300====>UnSubscribe CallBack====>");
done();
}
function timeout() {
console.debug('ACTS_ThirdPartyAbilityPermission_0300====>timeout====>');
if(flag == 0){
flag = 1;
commonEvent.unsubscribe(Subscriber, UnSubscribeCallback)
}
}
setTimeout(timeout, START_ABILITY_TIMEOUT);
})
/*
* @tc.number: ACTS_ThirdPartyAbilityPermission_0600
* @tc.name: In non-concurrent mode, if the target application is not the current user, it is forbidden to start
* @tc.desc: Bind a U101 Ability with the current user
*/
it('ACTS_ThirdPartyAbilityPermission_0600', 0, async function (done) {
console.log("ACTS_ThirdPartyAbilityPermission_0600====>callback start====>")
let Subscriber
let connId
function onConnectCallbackC(element, remote) {
console.log('ACTS_ThirdPartyAbilityPermission_0600_Start_CommonEvent onConnectCallback====>'+
' element=' + JSON.stringify(element));
console.log('ACTS_ThirdPartyAbilityPermission_0600_Start_CommonEvent onConnectCallback====>'+
' remote=' + JSON.stringify(remote));
expect().assertFail();
}
function onDisconnectCallbackC(element) {
console.log('onDisconnectCallback====> element=' + JSON.stringify(element));
}
function onFailedCallbackC(code) {
console.log('onFailedCallback====> code=' + JSON.stringify(code))
}
function SubscribeCallBackF(err, data) {
console.debug("====>0600 Subscribe CallBack data:====>" + JSON.stringify(data));
}
function UnSubscribeCallbackF() {
console.debug("====>UnSubscribeCallback====>");
}
commonEvent.createSubscriber(AbilityPermission6).then(async (data) => {
console.debug("====>Create Subscriber====>");
Subscriber = data;
commonEvent.subscribe(Subscriber, SubscribeCallBackF);
})
console.debug("====>0600start connectAbility====>");
connId = await globalThis.abilityContext.connectAbilityWithAccount(
{
bundleName: 'com.example.actsthirdappuonehundredone',
abilityName: 'ServiceAbility',
action: "StartAbilityPromise"
}, userB, {
onConnect: onConnectCallbackC,
onDisconnect: onDisconnectCallbackC,
onFailed: onFailedCallbackC
})
console.debug("====>number is====>" + JSON.stringify(connId));
setTimeout(() =>{
console.debug('in ACTS_ThirdPartyAbilityPermission_0600_Start_CommonEvent timeout');
commonEvent.unsubscribe(Subscriber, UnSubscribeCallbackF)
done()
}, START_ABILITY_TIMEOUT);
})
})
}
\ No newline at end of file
ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/test/List.test.ets 已删除 100755 → 0
浏览文件 @ afba4bb3
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import abilityPermissionText from './AbilityPermission.test.ets'
export default function testsuite() {
abilityPermissionText()
}
\ No newline at end of file
ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/module.json 已删除 100755 → 0
浏览文件 @ afba4bb3
{
"module": {
"name": "entry",
"type": "entry",
"srcEntrance": "./ets/Application/AbilityStage.ts",
"description": "$string:entry_desc",
"mainElement": "MainAbility",
"deviceTypes": [
"default",
"tablet"
],
"deliveryWithInstall": true,
"installationFree": false,
"pages": "$profile:main_pages",
"uiSyntax": "ets",
"metadata": [
{
"name": "ArkTSPartialUpdate",
"value": "false"
}
],
"abilities": [
{
"name": "TestAbility",
"srcEntrance": "./ets/TestAbility/TestAbility.ts",
"description": "$string:TestAbility_desc",
"icon": "$media:icon",
"label": "$string:TestAbility_label",
"visible": true,
"launchType": "standard",
"skills": [
{
"entities": [
"entity.system.home"
],
"actions": [
"action.system.home"
]
}
]
},
{
"name": "MainAbility2",
"srcEntrance": "./ets/MainAbility2/MainAbility2.ts",
"description": "$string:MainAbility2_desc",
"icon": "$media:icon",
"label": "$string:MainAbility2_label",
"launchType": "standard"
}
]
}
}
ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/resources/base/element/string.json 已删除 100755 → 0
浏览文件 @ afba4bb3
{
"string": [
{
"name": "entry_desc",
"value": "description"
},
{
"name": "entry_test_desc",
"value": "i am an entry for tv"
},
{
"name": "TestAbility_desc",
"value": "description"
},
{
"name": "TestAbility_label",
"value": "label"
},
{
"name": "MainAbility2_desc",
"value": "description"
},
{
"name": "MainAbility2_label",
"value": "label"
},
{
"name": "Service_desc",
"value": "description"
},
{
"name": "Service_label",
"value": "label"
}
]
}
\ No newline at end of file
ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/resources/base/profile/main_pages.json 已删除 100755 → 0
浏览文件 @ afba4bb3
{
"src": [
"pages/index/index2",
"TestAbility/pages/index"
]
}
\ No newline at end of file
ability/ability_runtime/non_concurrent/actsthirdapponerelytest/AppScope/app.json 已删除 100755 → 0
浏览文件 @ afba4bb3
{
"app": {
"bundleName": "com.example.actsthirdappuonehundredone",
"vendor": "example",
"versionCode": 1000000,
"versionName": "1.0.0",
"icon": "$media:app_icon",
"label": "$string:app_name",
"distributedNotificationEnabled": true,
"keepAlive" : true,
"singleUser": true,
"minAPIVersion": 9,
"targetAPIVersion": 9,
"car": {
"apiCompatibleVersion": 9,
"singleUser": false
}
}
}
\ No newline at end of file
ability/ability_runtime/non_concurrent/actsthirdapponerelytest/BUILD.gn 已删除 100755 → 0
浏览文件 @ afba4bb3
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import("//test/xts/tools/build/suite.gni")
ohos_hap_assist_suite("ActsThirdAppOneRelyHap") {
hap_profile = "entry/src/main/module.json"
js_build_mode = "debug"
hap_name = "ActsThirdAppOneRelyHap"
testonly = true
deps = [
":actsthirdapponerelytest_js_assets",
":actsthirdapponerelytest_resources",
]
ets2abc = true
certificate_profile = "signature/openharmony_sx.p7b"
}
ohos_app_scope("actsthirdapponerelytest_app_profile") {
app_profile = "AppScope/app.json"
sources = [ "AppScope/resources" ]
}
ohos_js_assets("actsthirdapponerelytest_js_assets") {
source_dir = "entry/src/main/ets"
}
ohos_resources("actsthirdapponerelytest_resources") {
sources = [ "entry/src/main/resources" ]
deps = [ ":actsthirdapponerelytest_app_profile" ]
hap_profile = "entry/src/main/module.json"
}
ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/ets/Application/AbilityStage.ts 已删除 100755 → 0
浏览文件 @ afba4bb3
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import AbilityStage from "@ohos.app.ability.AbilityStage"
export default class MyAbilityStage extends AbilityStage {
onCreate() {
console.log("MyAbilityStage onCreate")
globalThis.stageOnCreateRun = 1;
globalThis.stageContext = this.context;
}
}
\ No newline at end of file
ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/ets/MainAbility/MainAbility.ts 已删除 100755 → 0
浏览文件 @ afba4bb3
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import Ability from '@ohos.app.ability.UIAbility'
import commonEvent from '@ohos.commonEvent'
function PublishCallBackOne3() {
console.debug("====>Publish CallBack ACTS_ThirdPartyAbilityPermission_0300_CommonEvent====>");
setTimeout(globalThis.abilityContext.terminateSelfWithResult(()=>{
console.debug("====>terminateSelfWithResult succese====>")
}),1000)
}
export default class MainAbility extends Ability {
onCreate(want, launchParam) {
// Ability is creating, initialize resources for this ability
console.log("MainAbility onCreate")
globalThis.abilityWant = want;
}
onDestroy() {
// Ability is destroying, release resources for this ability
console.log("MainAbility onDestroy")
}
onWindowStageCreate(windowStage) {
// Main window is created, set main page for this ability
console.log("MainAbility onWindowStageCreate")
globalThis.abilityContext = this.context
commonEvent.publish("ACTS_ThirdPartyAbilityPermission_0300_Start_CommonEvent", PublishCallBackOne3);
windowStage.setUIContent(this.context, "pages/index", null)
}
onWindowStageDestroy() {
// Main window is destroyed, release UI related resources
console.log("MainAbility onWindowStageDestroy")
}
onForeground() {
// Ability has brought to foreground
console.log("MainAbility onForeground")
}
onBackground() {
// Ability has back to background
console.log("MainAbility onBackground")
}
};
ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/ets/pages/index/index.ets 已删除 100755 → 0
浏览文件 @ afba4bb3
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import router from '@system.router';
async function routePage() {
let options = {
uri: 'pages/second'
}
try {
await router.push(options)
} catch (err) {
console.error(`fail callback, code: ${err.code}, msg: ${err.msg}`)
}
}
@Entry
@Component
struct Index {
build() {
Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
Text('Hello World')
.fontSize(50)
.fontWeight(FontWeight.Bold)
}
.width('100%')
.height('100%')
}
}
\ No newline at end of file
ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/ets/pages/second/second.ets 已删除 100755 → 0
浏览文件 @ afba4bb3
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import router from '@system.router';
@Entry
@Component
struct Second {
private content: string = "Second Page"
build() {
Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
Text(`${this.content}`)
.fontSize(50)
.fontWeight(FontWeight.Bold)
Button() {
Text('back to index')
.fontSize(20)
.fontWeight(FontWeight.Bold)
}.type(ButtonType.Capsule)
.margin({
top: 20
})
.backgroundColor('#0D9FFB')
.onClick(() => {
router.back()
})
}
.width('100%')
.height('100%')
}
}
\ No newline at end of file
ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/module.json 已删除 100755 → 0
浏览文件 @ afba4bb3
{
"module": {
"name": "com.example.actsthirdappuonehundredone",
"type": "entry",
"srcEntrance": "./ets/Application/AbilityStage.ts",
"description": "$string:phone_entry_dsc",
"mainElement": "MainAbility",
"deviceTypes": [
"default",
"tablet"
],
"deliveryWithInstall": true,
"installationFree": false,
"uiSyntax": "ets",
"pages": "$profile:main_pages",
"metadata": [
{
"name": "ArkTSPartialUpdate",
"value": "false"
}
],
"abilities": [
{
"name": "MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main",
"icon": "$media:icon",
"label": "$string:entry_label",
"visible": true,
"orientation": "portrait",
"skills": [
{
"actions": [
"action.system.home"
],
"entities": [
"entity.system.home"
]
}
]
}
]
}
}
ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/resources/base/element/string.json 已删除 100755 → 0
浏览文件 @ afba4bb3
{
"string": [
{
"name": "phone_entry_dsc",
"value": "i am an entry for phone"
},
{
"name": "phone_entry_main",
"value": "the phone entry ability"
},
{
"name": "entry_label",
"value": "ActsContextTest"
},
{
"name": "form_description",
"value": "my form"
},
{
"name": "serviceability_description",
"value": "my whether"
},
{
"name": "description_application",
"value": "demo for test"
},
{
"name": "app_name",
"value": "Demo"
}
]
}
\ No newline at end of file
ability/ability_runtime/want/actsgetwantalltest/src/main/js/test/ActsGetWantAllTest.js
浏览文件 @ 00b2ac2a
......@@ -15,7 +15,7 @@
import featureAbility from '@ohos.ability.featureAbility'
import wantConstant from '@ohos.ability.wantConstant'
import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
import { describe, beforeAll, it, expect } from '@ohos/hypium'
export default function ActsGetWantTest() {
describe('ActsGetWantTest', function () {
beforeAll(async (done) => {
......@@ -23,8 +23,6 @@ describe('ActsGetWantTest', function () {
done();
})
var TIMEOUT_NUMBER = 2500;
// @tc.number: ACTS_GetWant_0100
// @tc.name: getWant : get want in current ability
// @tc.desc:Start the ability through startabilityforresult,
......@@ -68,9 +66,7 @@ describe('ActsGetWantTest', function () {
expect(data.want.parameters.mykey6["subKey1"]).assertEqual("STRING");
expect(data.want.parameters.mykey6["subKey2"]).assertEqual(10);
expect(data.want.parameters.mykey6["subKey3"]).assertEqual(true);
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
}).catch((error) => {
console.log('ACTS_GetWant_0100 error: ' + JSON.stringify(error))
expect.assertFail()
......@@ -118,9 +114,7 @@ describe('ActsGetWantTest', function () {
expect(data.want.parameters.mykey5[0]).assertEqual("str");
expect(data.want.parameters.mykey5[1]).assertEqual("STR");
expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmony");
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
})
})
......@@ -152,9 +146,7 @@ describe('ActsGetWantTest', function () {
},
}).then((data) => {
checkOnAbilityResult0300(data);
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
}).catch((error) => {
console.log('ACTS_GetWant_0300 error: ' + JSON.stringify(error))
expect.assertFail()
......@@ -237,9 +229,7 @@ describe('ActsGetWantTest', function () {
expect(data.want.parameters.mykey5[1]).assertEqual("STR");
expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony");
console.info('====> ACTS_GetWant_0500 before done=====>')
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
}).catch((error) => {
console.log('ACTS_GetWant_0500 error: ' + JSON.stringify(error))
expect.assertFail()
......@@ -297,9 +287,7 @@ describe('ActsGetWantTest', function () {
expect(data.want.parameters.mykey5[1]).assertEqual("STR");
expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony");
console.info('====> ACTS_GetWant_0600 before done=====>')
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
})
})
......@@ -352,9 +340,7 @@ describe('ActsGetWantTest', function () {
expect(data.want.parameters.mykey5[1]).assertEqual("STR");
expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony");
console.info('====> ACTS_GetWant_0700 before done=====>')
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
}).catch((error) => {
console.log('ACTS_GetWant_0700 error: ' + JSON.stringify(error))
expect.assertFail()
......@@ -391,9 +377,7 @@ describe('ActsGetWantTest', function () {
},
(err, data) => {
checkOnAbilityResult0800(data);
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
})
})
......@@ -471,9 +455,7 @@ describe('ActsGetWantTest', function () {
expect(data.want.parameters.mykey5[1]).assertEqual("STR");
expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony");
console.info('====> ACTS_GetWant_0900 before done=====>')
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
}).catch((error) => {
console.log('ACTS_GetWant_0900 error: ' + JSON.stringify(error))
expect.assertFail()
......@@ -510,9 +492,7 @@ describe('ActsGetWantTest', function () {
},
(err, data) => {
checkOnAbilityResult1000(data);
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
})
})
......@@ -568,9 +548,7 @@ describe('ActsGetWantTest', function () {
},
}).then((data) => {
checkOnAbilityResult1100(data);
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
}).catch((error) => {
console.log('ACTS_GetWant_1100 error: ' + JSON.stringify(error))
expect.assertFail()
......@@ -650,9 +628,7 @@ describe('ActsGetWantTest', function () {
expect(data.want.parameters.mykey5[1]).assertEqual("STR");
expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony");
console.info('====> ACTS_GetWant_1200 before done=====>')
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
})
})
......@@ -705,9 +681,7 @@ describe('ActsGetWantTest', function () {
expect(data.want.parameters.mykey5[1]).assertEqual("STR");
expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony");
console.info('====> ACTS_GetWant_1300 before done=====>')
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
}).catch((error) => {
console.log('ACTS_GetWant_1300 error: ' + JSON.stringify(error))
expect.assertFail()
......@@ -744,9 +718,7 @@ describe('ActsGetWantTest', function () {
},
(err, data) => {
checkOnAbilityResult1400(data);
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
})
})
......@@ -803,9 +775,7 @@ describe('ActsGetWantTest', function () {
},
}).then((data) => {
checkOnAbilityResult1500(data);
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
}).catch((error) => {
console.log('ACTS_GetWant_1500 error: ' + JSON.stringify(error))
expect.assertFail()
......@@ -888,9 +858,7 @@ describe('ActsGetWantTest', function () {
expect(data.want.parameters.mykey5[1]).assertEqual("STR");
expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony");
console.info('====> ACTS_GetWant_1600 setTimeout before done.=====>')
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
})
})
......@@ -943,9 +911,7 @@ describe('ActsGetWantTest', function () {
expect(data.want.parameters.mykey5[1]).assertEqual("STR");
expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony");
console.info('====> ACTS_GetWant_1700 setTimeout before done.=====>')
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
}).catch((error) => {
console.log('ACTS_GetWant_1700 error: ' + JSON.stringify(error))
expect.assertFail()
......@@ -981,9 +947,7 @@ describe('ActsGetWantTest', function () {
},
}).then((data) => {
checkOnAbilityResult1900(data);
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
}).catch((error) => {
console.log('ACTS_GetWant_1900 error: ' + JSON.stringify(error))
expect.assertFail()
......@@ -1044,9 +1008,7 @@ describe('ActsGetWantTest', function () {
},
}).then((data) => {
checkOnAbilityResult2100(data);
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
}).catch((error) => {
console.log('ACTS_GetWant_2100 error: ' + JSON.stringify(error))
expect.assertFail()
......@@ -1108,9 +1070,7 @@ describe('ActsGetWantTest', function () {
},
(err, data) => {
checkOnAbilityResult2200(data);
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
})
})
......@@ -1167,9 +1127,7 @@ describe('ActsGetWantTest', function () {
},
}).then((data) => {
checkOnAbilityResult2300(data);
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
}).catch((error) => {
console.log('ACTS_GetWant_2300 error: ' + JSON.stringify(error))
expect.assertFail()
......@@ -1231,9 +1189,7 @@ describe('ActsGetWantTest', function () {
},
(err, data) => {
checkOnAbilityResult2400(data);
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
})
})
......@@ -1292,9 +1248,7 @@ describe('ActsGetWantTest', function () {
},
}).then((data) => {
checkOnAbilityResult2500(data);
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
}).catch((error) => {
console.log('ACTS_GetWant_2500 error: ' + JSON.stringify(error))
expect.assertFail()
......@@ -1358,9 +1312,7 @@ describe('ActsGetWantTest', function () {
},
(err, data) => {
checkOnAbilityResult2600(data);
setTimeout(()=>{
done();
}, TIMEOUT_NUMBER);
done();
})
});
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或