未验证 提交 b7f12c2c 编写于 作者: O openharmony_ci 提交者: Gitee

!8697 taskpool xts test switch to stage model

Merge pull request !8697 from cwx1148594/master
{
"app": {
"bundleName": "com.example.taskpool",
"vendor": "huawei",
"versionCode": 1000000,
"versionName": "1.0.0",
"icon": "$media:icon",
"label": "$string:app_name",
"distributedNotificationEnabled": true,
"debug": false,
"description": "$string:app_name",
"keepAlive": true,
"singleUser": true,
"minAPIVersion": 9,
"targetAPIVersion": 9,
"car": {
"apiCompatibleVersion": 9,
"singleUser": false
}
}
}
{
"string":[
{
"name":"app_name",
"value":"TaskPoolTest"
}
]
}
\ No newline at end of file
# Copyright (C) 2022 Huawei Device Co., Ltd. # Copyright (c) 2022 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
...@@ -12,27 +12,32 @@ ...@@ -12,27 +12,32 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("taskPool_js_test") { ohos_js_hap_suite("taskPool_js_test") {
hap_profile = "./src/main/config.json" hap_profile = "entry/src/main/module.json"
js2abc = true js_build_mode = "debug"
deps = [ deps = [
":taskPool_js_assets", ":taskpool_js_assets",
":taskPool_resources", ":taskpool_resources",
] ]
ets2abc = true
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "signature/openharmony_sx.p7b"
hap_name = "ActsTaskPoolJSApiTest" hap_name = "ActsTaskPoolJSApiTest"
subsystem_name = "commonlibrary" subsystem_name = "commonlibrary"
part_name = "ets_utils" part_name = "ets_utils"
} }
ohos_js_assets("taskPool_js_assets") { ohos_app_scope("taskpool_app_profile") {
js2abc = true app_profile = "AppScope/app.json"
hap_profile = "./src/main/config.json" sources = [ "AppScope/resources" ]
source_dir = "./src/main/js"
} }
ohos_resources("taskPool_resources") {
sources = [ "./src/main/resources" ] ohos_js_assets("taskpool_js_assets") {
hap_profile = "./src/main/config.json" source_dir = "entry/src/main/ets"
}
ohos_resources("taskpool_resources") {
sources = [ "entry/src/main/resources" ]
deps = [ ":taskpool_app_profile" ]
hap_profile = "entry/src/main/module.json"
} }
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
"driver": { "driver": {
"type": "OHJSUnitTest", "type": "OHJSUnitTest",
"test-timeout": "800000", "test-timeout": "800000",
"shell-timeout": "800000",
"bundle-name": "com.example.taskpool", "bundle-name": "com.example.taskpool",
"package-name": "com.example.taskpool" "module-name": "entry",
"shell-timeout": "800000"
}, },
"kits": [ "kits": [
{ {
......
/* /*
* Copyright (C) 2022 Huawei Device Co., Ltd. * Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the 'License'); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an 'AS IS' BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
export default { import AbilityStage from "@ohos.app.ability.AbilityStage"
var printLog0 = 'TaskPool:AbilityStage:'
export default class MyAbilityStage extends AbilityStage {
onCreate() { onCreate() {
console.info('AceApplication onCreate'); console.info(printLog0 + "onCreate")
},
onDestroy() {
console.info('AceApplication onDestroy');
} }
}; }
\ No newline at end of file
/*
* 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';
var printLog = 'TaskPool:MainAbility:'
export default class MainAbility extends Ability {
onCreate(want, launchParam) {
console.info(printLog + 'onCreate')
}
onDestroy() {
console.info(printLog + 'onDestroy')
}
onWindowStageCreate(windowStage) {
// Main window is created, set main page for this ability
console.info(printLog + 'onWindowStageCreate')
windowStage.loadContent("MainAbility/pages/index", (err, data) => {
if (err.code) {
console.error('Failed to load the content. Cause:' + JSON.stringify(err));
return;
}
console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data))
});
}
onWindowStageDestroy() {
console.info(printLog + 'onWindowStageDestroy')
}
onForeground() {
console.info(printLog + 'onForeground')
}
onBackground() {
console.info(printLog + 'onBackground')
}
};
...@@ -12,20 +12,35 @@ ...@@ -12,20 +12,35 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import router from '@ohos.router';
import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
import { Hypium } from '@ohos/hypium' import { Hypium } from '@ohos/hypium'
import testsuite from '../test/List.test' import testsuite from '../../test/List.test'
@Entry
@Component
struct Index {
@State message: string = 'MainAbility TaskPool'
aboutToAppear() {
console.info("start run testcase!!!!")
var abilityDelegator: any
abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
var abilityDelegatorArguments: any
abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
console.info('start run testcase!!!')
Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
}
export default { build() {
onCreate() { Row() {
console.info('TestApplication onCreate'); Column() {
var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator(); Text(this.message)
var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments(); .fontSize(50)
console.info('start run testcase!!!'); .fontWeight(FontWeight.Bold)
Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite); }
}, .width('100%')
onDestroy() { }
console.info("TestApplication onDestroy"); .height('100%')
} }
}; }
\ No newline at end of file
/* /*
* Copyright (C) 2022 Huawei Device Co., Ltd. * Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the 'License'); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an 'AS IS' BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import Ability from '@ohos.app.ability.UIAbility'
.container { export default class TestAbility extends Ability {
flex-direction: column; onCreate(want, launchParam) {
justify-content: center; console.log('TestAbility onCreate')
align-items: center; }
}
.title { onDestroy() {
font-size: 40px; console.log('TestAbility onDestroy')
color: #000000; }
opacity: 0.9;
}
@media screen and (device-type: tablet) and (orientation: landscape) { onWindowStageCreate(windowStage) {
.title { console.log('TestAbility onWindowStageCreate')
font-size: 100px; windowStage.loadContent("TestAbility/pages/index", (err, data) => {
if (err.code) {
console.error('Failed to load the content. Cause:' + JSON.stringify(err));
return;
} }
} console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data))
});
@media screen and (device-type: wearable) {
.title {
font-size: 28px;
color: #FFFFFF;
} }
}
@media screen and (device-type: tv) { onWindowStageDestroy() {
.container { console.log('TestAbility onWindowStageDestroy')
background-image: url("../../common/images/Wallpaper.png");
background-size: cover;
background-repeat: no-repeat;
background-position: center;
} }
.title { onForeground() {
font-size: 100px; console.log('TestAbility onForeground')
color: #FFFFFF;
} }
}
@media screen and (device-type: phone) and (orientation: landscape) { onBackground() {
.title { console.log('TestAbility onBackground')
font-size: 60px;
} }
} };
\ No newline at end of file
/* /*
* Copyright (C) 2022 Huawei Device Co., Ltd. * Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the 'License'); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an 'AS IS' BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import router from '@ohos.router';
import app from '@system.app' @Entry
import device from '@system.device' @Component
import router from '@system.router' struct Index {
aboutToAppear() {
export default { console.info('TestAbility index aboutToAppear')
data: { }
title: '' @State message: string = 'Hello World'
}, build() {
onInit() { Row() {
this.title = this.$t('strings.world'); Column() {
}, Text(this.message)
onShow() { .fontSize(50)
console.info('onShow finish'); .fontWeight(FontWeight.Bold)
}, Button() {
onReady() { Text('next page')
}, .fontSize(20)
} .fontWeight(FontWeight.Bold)
\ No newline at end of file }.type(ButtonType.Capsule)
.margin({
top: 20
})
.backgroundColor('#0D9FFB')
.width('35%')
.height('5%')
.onClick(()=>{
})
}
.width('100%')
}
.height('100%')
}
}
\ No newline at end of file
...@@ -12,48 +12,67 @@ ...@@ -12,48 +12,67 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import TestRunner from '@ohos.application.testRunner'
import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
var abilityDelegator = undefined
var abilityDelegatorArguments = undefined
function translateParamsToString(parameters) { function translateParamsToString(parameters) {
const keySet = new Set([ const keySet = new Set([
'-s class', '-s notClass', '-s suite', '-s itName', '-s class', '-s notClass', '-s suite', '-s it',
'-s level', '-s testType', '-s size', '-s timeout', '-s level', '-s testType', '-s size', '-s timeout',
'-s package', '-s dryRun' '-s dryRun'
]); ])
let targetParams = ''; let targetParams = '';
for (const key in parameters) { for (const key in parameters) {
if (keySet.has(key)) { if (keySet.has(key)) {
targetParams += ' ' + key + ' ' + parameters[key]; targetParams = `${targetParams} ${key} ${parameters[key]}`
} }
} }
return targetParams.trim(); return targetParams.trim()
} }
export default { async function onAbilityCreateCallback() {
onPrepare() { console.log("onAbilityCreateCallback");
console.info('OpenHarmonyTestRunner OnPrepare'); }
},
onRun() { async function addAbilityMonitorCallback(err: any) {
console.log('OpenHarmonyTestRunner onRun run'); console.info("addAbilityMonitorCallback : " + JSON.stringify(err))
var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments(); }
var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator();
export default class OpenHarmonyTestRunner implements TestRunner {
constructor() {
}
var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility'; onPrepare() {
console.info("OpenHarmonyTestRunner OnPrepare ")
}
var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName; async onRun() {
cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters); console.log('OpenHarmonyTestRunner onRun run')
var debug = abilityDelegatorArguments.parameters["-D"]; abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
console.info('debug value : '+debug); abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility'
let lMonitor = {
abilityName: testAbilityName,
onAbilityCreate: onAbilityCreateCallback,
};
abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
var cmd = 'aa start -d 0 -a com.example.taskpool.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName
cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
var debug = abilityDelegatorArguments.parameters["-D"]
if (debug == 'true') if (debug == 'true')
{ {
cmd += ' -D'; cmd += ' -D'
} }
console.info('cmd : '+cmd); console.info('cmd : '+cmd)
abilityDelegator.executeShellCommand(cmd, (err, data) => { abilityDelegator.executeShellCommand(cmd,
(err: any, d: any) => {
console.info('executeShellCommand : err : ' + JSON.stringify(err)); console.info('executeShellCommand : err : ' + JSON.stringify(err));
console.info('executeShellCommand : data : ' + data.stdResult); console.info('executeShellCommand : data : ' + d.stdResult);
console.info('executeShellCommand : data : ' + data.exitCode); console.info('executeShellCommand : data : ' + d.exitCode);
}) })
console.info('OpenHarmonyTestRunner onRun end')
} }
}; };
\ No newline at end of file
...@@ -13,14 +13,8 @@ ...@@ -13,14 +13,8 @@
* limitations under the License. * limitations under the License.
*/ */
export default { import TaskPoolTest from './TaskPool.test.js'
data: {
title: ""
},
onInit() {
this.title = this.$t('strings.world');
}
}
export default function List() {
TaskPoolTest()
}
\ No newline at end of file
{
"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",
"abilities": [
{
"name": "com.example.taskpool.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:MainAbility_desc",
"icon": "$media:icon",
"label": "$string:MainAbility_label",
"startWindowIcon": "$media:icon",
"startWindowBackground": "$color:white",
"visible": true,
"orientation": "portrait",
"skills": [
{
"entities": [
"entity.system.home"
],
"actions": [
"action.system.home"
]
}
]
}
]
}
}
\ No newline at end of file
{
"color": [
{
"name": "white",
"value": "#FFFFFF"
}
]
}
\ No newline at end of file
{
"string": [
{
"name": "entry_desc",
"value": "description"
},
{
"name": "MainAbility_desc",
"value": "description"
},
{
"name": "MainAbility_label",
"value": "label"
},
{
"name": "form_FormAbility_desc",
"value": "form_description"
},
{
"name": "form_FormAbility_label",
"value": "form_label"
}
]
}
\ No newline at end of file
{
"app": {
"bundleName": "com.example.taskpool",
"vendor": "example",
"version": {
"code": 1000000,
"name": "1.0.0"
},
"apiVersion": {
"compatible": 8,
"target": 9
}
},
"deviceConfig": {},
"module": {
"package": "com.example.taskpool",
"name": ".entry",
"srcPath": "",
"mainAbility": ".MainAbility",
"deviceType": [
"tablet",
"default",
"phone"
],
"distro": {
"deliveryWithInstall": true,
"moduleName": "entry",
"moduleType": "entry",
"installationFree": false
},
"abilities": [
{
"skills": [
{
"entities": [
"entity.system.home"
],
"actions": [
"action.system.home"
]
}
],
"orientation": "unspecified",
"formsEnabled": false,
"name": ".MainAbility",
"srcLanguage": "js",
"srcPath": "MainAbility",
"icon": "$media:icon",
"description": "$string:MainAbility_desc",
"label": "$string:MainAbility_label",
"type": "page",
"visible": true,
"launchType": "standard"
},
{
"orientation": "unspecified",
"formsEnabled": false,
"name": ".TestAbility",
"srcLanguage": "js",
"srcPath": "TestAbility",
"icon": "$media:icon",
"description": "$string:TestAbility_desc",
"label": "$string:TestAbility_label",
"type": "page",
"visible": true,
"launchType": "standard"
}
],
"js": [
{
"pages": [
"pages/index/index"
],
"name": "default",
"window": {
"designWidth": 720,
"autoDesignWidth": true
}
},
{
"pages": [
"pages/index/index"
],
"name": ".TestAbility",
"window": {
"designWidth": 720,
"autoDesignWidth": false
}
}
],
"testRunner": {
"name": "OpenHarmonyTestRunner",
"srcPath": "TestRunner"
}
}
}
\ No newline at end of file
{
"strings": {
"hello": "Hello",
"world": "World"
}
}
\ No newline at end of file
{
"strings": {
"hello": "您好",
"world": "世界"
}
}
\ No newline at end of file
<!--
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.
-->
<div class="container" onswipe="touchMove">
<text class="title">
{{ $t('strings.hello') }} {{title}}
</text>
</div>
\ No newline at end of file
{
"strings": {
"hello": "Hello",
"world": "World"
},
"Files": {
}
}
\ No newline at end of file
{
"strings": {
"hello": "您好",
"world": "世界"
},
"Files": {
}
}
\ No newline at end of file
.container {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
left: 0px;
top: 0px;
width: 100%;
height: 100%;
}
.title {
font-size: 60px;
text-align: center;
width: 100%;
height: 40%;
margin: 10px;
}
@media screen and (device-type: phone) and (orientation: landscape) {
.title {
font-size: 60px;
}
}
@media screen and (device-type: tablet) and (orientation: landscape) {
.title {
font-size: 100px;
}
}
\ No newline at end of file
<div class="container">
<text class="title">
{{ $t('strings.hello') }} {{ title }}
</text>
</div>
/*
* 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 TaskPoolTest from './TaskPool.test.js'
export default function testsuite() {
TaskPoolTest()
}
{
"string": [
{
"name": "entry_MainAbility",
"value": "entry_MainAbility"
},
{
"name": "mainability_description",
"value": "JS_Empty Ability"
},
{
"name": "MainAbility_desc",
"value": "description"
},
{
"name": "MainAbility_label",
"value": "label"
},
{
"name": "TestAbility_desc",
"value": "description"
},
{
"name": "TestAbility_label",
"value": "label"
}
]
}
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册