Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
11 个月 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts

体验新版 GitCode，发现更多精彩内容 >>

提交 6755388a 编写于 作者: M Mupceet
浏览文件
操作

修改编译错误和gesture测试用例框架 

Signed-off-by: NMupceet <laiguizhong@huawei.com>
上级 d7ef83ff
展开全部 隐藏空白更改
内联 并排
Showing with 276 addition and 445 deletion
barrierfree/BUILD.gn
浏览文件 @ 6755388a
......@@ -17,7 +17,9 @@ group("barrierfree") {
testonly = true
if (is_standard_system) {
deps = [
"accessibilityconfig:ActsAccessibilityConfigTest",
"accessibilityelement:ActsAccessibilityElementTest",
"accessibilityevent:ActsAccessibilityEventTest",
"accessibilityextension:ActsAccessibilityExtensionTest",
"accessibilityextensioncontext:ActsAccessibilityExtensionContextTest",
"accessibilitygestureevent:ActsAccessibilityGestureEventTest",
......
barrierfree/accessibilityevent/entry/src/main/ets/test/AccessibilityEventTest.test.ets
浏览文件 @ 6755388a
......@@ -78,9 +78,8 @@ export default function abilityTest() {
*/
it('AccessibilityEventTest_0100', 0, async function (done) {
console.info(`AccessibilityEventTest_0100`);
let eventType = 'accessibilityFocus';
let event = new accessibility.EventInfo({});
event.type = eventType;
event.type = 'accessibilityFocus';
event.bundleName = targetBundleName;
event.triggerAction = 'accessibilityFocus';
await accessibility.sendEvent(event);
......@@ -88,7 +87,7 @@ export default function abilityTest() {
setTimeout(() => {
let findResult = false;
for (let item of events) {
if (item.eventType == eventType) {
if (item.eventType == 'accessibilityFocus') {
findResult = true;
}
}
......@@ -108,9 +107,8 @@ export default function abilityTest() {
*/
it('AccessibilityEventTest_0200', 0, async function (done) {
console.info(`AccessibilityEventTest_0200`);
let eventType = 'accessibilityFocusClear';
let event = new accessibility.EventInfo({});
event.type = eventType;
event.type = 'accessibilityFocusClear';
event.bundleName = targetBundleName;
event.triggerAction = 'clearAccessibilityFocus';
await accessibility.sendEvent(event);
......@@ -118,7 +116,7 @@ export default function abilityTest() {
setTimeout(() => {
let findResult = false;
for (let item of events) {
if (item.eventType == eventType) {
if (item.eventType == 'accessibilityFocusClear') {
findResult = true;
}
}
......@@ -138,9 +136,8 @@ export default function abilityTest() {
*/
it('AccessibilityEventTest_0300', 0, async function (done) {
console.info(`AccessibilityEventTest_0300`);
let eventType = 'click';
let event = new accessibility.EventInfo({});
event.type = eventType;
event.type = 'click';
event.bundleName = targetBundleName;
event.triggerAction = 'click';
await accessibility.sendEvent(event);
......@@ -148,7 +145,7 @@ export default function abilityTest() {
setTimeout(() => {
let findResult = false;
for (let item of events) {
if (item.eventType == eventType) {
if (item.eventType == 'click') {
findResult = true;
}
}
......@@ -168,9 +165,8 @@ export default function abilityTest() {
*/
it('AccessibilityEventTest_0400', 0, async function (done) {
console.info(`AccessibilityEventTest_0400`);
let eventType = 'longClick';
let event = new accessibility.EventInfo({});
event.type = eventType;
event.type = 'longClick';
event.bundleName = targetBundleName;
event.triggerAction = 'longClick';
await accessibility.sendEvent(event);
......@@ -178,7 +174,7 @@ export default function abilityTest() {
setTimeout(() => {
let findResult = false;
for (let item of events) {
if (item.eventType == eventType) {
if (item.eventType == 'longClick') {
findResult = true;
}
}
......@@ -198,9 +194,8 @@ export default function abilityTest() {
*/
it('AccessibilityEventTest_0500', 0, async function (done) {
console.info(`AccessibilityEventTest_0500`);
let eventType = 'focus';
let event = new accessibility.EventInfo({});
event.type = eventType;
event.type = 'focus';
event.bundleName = targetBundleName;
event.triggerAction = 'focus';
await accessibility.sendEvent(event);
......@@ -208,7 +203,7 @@ export default function abilityTest() {
setTimeout(() => {
let findResult = false;
for (let item of events) {
if (item.eventType == eventType) {
if (item.eventType == 'focus') {
findResult = true;
}
}
......@@ -228,9 +223,8 @@ export default function abilityTest() {
*/
it('AccessibilityEventTest_0600', 0, async function (done) {
console.info(`AccessibilityEventTest_0600`);
let eventType = 'select';
let event = new accessibility.EventInfo({});
event.type = eventType;
event.type = 'select';
event.bundleName = targetBundleName;
event.triggerAction = 'select';
await accessibility.sendEvent(event);
......@@ -238,7 +232,7 @@ export default function abilityTest() {
setTimeout(() => {
let findResult = false;
for (let item of events) {
if (item.eventType == eventType) {
if (item.eventType == 'select') {
findResult = true;
}
}
......@@ -258,9 +252,8 @@ export default function abilityTest() {
*/
it('AccessibilityEventTest_0700', 0, async function (done) {
console.info(`AccessibilityEventTest_0700`);
let eventType = 'hoverEnter';
let event = new accessibility.EventInfo({});
event.type = eventType;
event.type = 'hoverEnter';
event.bundleName = targetBundleName;
event.triggerAction = 'focus';
await accessibility.sendEvent(event);
......@@ -268,7 +261,7 @@ export default function abilityTest() {
setTimeout(() => {
let findResult = false;
for (let item of events) {
if (item.eventType == eventType) {
if (item.eventType == 'hoverEnter') {
findResult = true;
}
}
......@@ -288,9 +281,8 @@ export default function abilityTest() {
*/
it('AccessibilityEventTest_0800', 0, async function (done) {
console.info(`AccessibilityEventTest_0800`);
let eventType = 'hoverExit';
let event = new accessibility.EventInfo({});
event.type = eventType;
event.type = 'hoverExit';
event.bundleName = targetBundleName;
event.triggerAction = 'focus';
await accessibility.sendEvent(event);
......@@ -298,7 +290,7 @@ export default function abilityTest() {
setTimeout(() => {
let findResult = false;
for (let item of events) {
if (item.eventType == eventType) {
if (item.eventType == 'hoverExit') {
findResult = true;
}
}
......@@ -318,9 +310,8 @@ export default function abilityTest() {
*/
it('AccessibilityEventTest_0900', 0, async function (done) {
console.info(`AccessibilityEventTest_0900`);
let eventType = 'textUpdate';
let event = new accessibility.EventInfo({});
event.type = eventType;
event.type = 'textUpdate';
event.bundleName = targetBundleName;
event.triggerAction = 'cut';
await accessibility.sendEvent(event);
......@@ -328,7 +319,7 @@ export default function abilityTest() {
setTimeout(() => {
let findResult = false;
for (let item of events) {
if (item.eventType == eventType) {
if (item.eventType == 'textUpdate') {
findResult = true;
}
}
......@@ -348,9 +339,8 @@ export default function abilityTest() {
*/
it('AccessibilityEventTest_1000', 0, async function (done) {
console.info(`AccessibilityEventTest_1000`);
let eventType = 'textSelectionUpdate';
let event = new accessibility.EventInfo({});
event.type = eventType;
event.type = 'textSelectionUpdate';
event.bundleName = targetBundleName;
event.triggerAction = 'setSelection';
await accessibility.sendEvent(event);
......@@ -358,7 +348,7 @@ export default function abilityTest() {
setTimeout(() => {
let findResult = false;
for (let item of events) {
if (item.eventType == eventType) {
if (item.eventType == 'textSelectionUpdate') {
findResult = true;
}
}
......@@ -378,9 +368,8 @@ export default function abilityTest() {
*/
it('AccessibilityEventTest_1100', 0, async function (done) {
console.info(`AccessibilityEventTest_1100`);
let eventType = 'scroll';
let event = new accessibility.EventInfo({});
event.type = eventType;
event.type = 'scroll';
event.bundleName = targetBundleName;
event.triggerAction = 'scrollForward';
await accessibility.sendEvent(event);
......@@ -388,7 +377,7 @@ export default function abilityTest() {
setTimeout(() => {
let findResult = false;
for (let item of events) {
if (item.eventType == eventType) {
if (item.eventType == 'scroll') {
findResult = true;
}
}
......@@ -408,9 +397,8 @@ export default function abilityTest() {
*/
it('AccessibilityEventTest_1200', 0, async function (done) {
console.info(`AccessibilityEventTest_1200`);
let eventType = 'scroll';
let event = new accessibility.EventInfo({});
event.type = eventType;
event.type = 'scroll';
event.bundleName = targetBundleName;
event.triggerAction = 'scrollForward';
await accessibility.sendEvent(event);
......@@ -419,7 +407,7 @@ export default function abilityTest() {
let findResult = false;
for (let item of events) {
console.info(`AccessibilityEventTest_1200 haveTarget: ${item.haveTarget}`);
if (item.eventType == eventType && item.haveTarget) {
if (item.eventType == 'scroll' && item.haveTarget) {
findResult = true;
}
}
......@@ -439,9 +427,8 @@ export default function abilityTest() {
*/
it('AccessibilityEventTest_1300', 0, async function (done) {
console.info(`AccessibilityEventTest_1300`);
let eventType = 'scroll';
let event = new accessibility.EventInfo({});
event.type = eventType;
event.type = 'scroll';
event.bundleName = targetBundleName;
event.triggerAction = 'scrollForward';
await accessibility.sendEvent(event);
......@@ -450,7 +437,7 @@ export default function abilityTest() {
let findResult = false;
for (let item of events) {
console.info(`AccessibilityEventTest_1300 timeStamp: ${item.timeStamp}`);
if (item.eventType == eventType && typeof(item.timeStamp) == 'number') {
if (item.eventType == 'scroll' && typeof(item.timeStamp) == 'number') {
findResult = true;
}
}
......
barrierfree/accessibilitygestureevent/BUILD.gn
浏览文件 @ 6755388a
......@@ -14,7 +14,7 @@
import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("ActsAccessibilityGestureEventTest") {
hap_profile = "entry/src/main/module.json"
hap_profile = "./entry/src/main/module.json"
js_build_mode = "debug"
deps = [
":accessibilitygestureevent_js_assets",
......@@ -33,11 +33,11 @@ ohos_app_scope("accessibilitygestureevent_app_profile") {
}
ohos_js_assets("accessibilitygestureevent_js_assets") {
source_dir = "entry/src/main/ets"
source_dir = "./entry/src/main/ets"
}
ohos_resources("accessibilitygestureevent_resources") {
sources = [ "entry/src/main/resources" ]
sources = [ "./entry/src/main/resources" ]
deps = [ ":accessibilitygestureevent_app_profile" ]
hap_profile = "entry/src/main/module.json"
hap_profile = "./entry/src/main/module.json"
}
barrierfree/accessibilitygestureevent/Test.json
浏览文件 @ 6755388a
{
"description": "Configuration for hjunit demo Tests",
"driver": {
"type": "JSUnitTest",
"type": "OHJSUnitTest",
"test-timeout": "180000",
"package": "com.example.myapplication",
"shell-timeout": "180000"
"bundle-name": "com.example.myapplication",
"module-name": "phone",
"shell-timeout": "180000",
"testcase-timeout": 70000
},
"kits": [
{
......
barrierfree/accessibilitygestureevent/entry/src/main/ets/MainAbility/MainAbility.ts
浏览文件 @ 6755388a
/*
* 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.application.Ability'
import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
import { Hypium } from '@ohos/hypium'
import testsuite from '../test/List.test'
export default class MainAbility extends Ability {
onCreate(want,launchParam){
// Ability is creating, initialize resources for this ability
console.log("[Demo] MainAbility onCreate")
globalThis.abilityWant = want;
var abilityDelegator: any
abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
var abilityDelegatorArguments: any
abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
console.info('start run testcase!!!')
Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
}
onDestroy() {
......@@ -14,11 +37,11 @@ export default class MainAbility extends Ability {
onWindowStageCreate(windowStage) {
// Main window is created, set main page for this ability
console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage)
console.log("[Demo] MainAbility onWindowStageCreate windowStage=" + windowStage)
//globalThis.windowStage = windowStage
//globalThis.abilityStorage = this.storage
globalThis.abilityContext = this.context
windowStage.setUIContent(this.context, "pages/index/index", null)
windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null)
}
onWindowStageDestroy() {
......@@ -35,4 +58,4 @@ export default class MainAbility extends Ability {
// Ability has back to background
console.log("[Demo] MainAbility onBackground")
}
};
};
\ No newline at end of file
barrierfree/accessibilitygestureevent/entry/src/main/ets/pages/index/index.ets → barrierfree/accessibilitygestureevent/entry/src/main/ets/MainAbility/pages/index/index.ets
浏览文件 @ 6755388a
......@@ -12,10 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import file from '@system.file';
import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index"
import testsuite from "../../test/List.test"
import router from '@ohos.router';
@Entry
@Component
......@@ -24,22 +21,6 @@ struct Index {
aboutToAppear(){
console.info("start run testcase!!!!");
const core = Core.getInstance();
const expectExtend = new ExpectExtend({
'id': 'extend'
});
core.addService('expect', expectExtend);
const reportExtend = new ReportExtend(file);
core.addService('report', reportExtend);
core.init();
core.subscribeEvent('task', reportExtend);
const configService = core.getDefaultService('config');
console.info('parameters---->' + JSON.stringify(globalThis.abilityWant.parameters));
globalThis.abilityWant.parameters.timeout = 70000;
configService.setConfig(globalThis.abilityWant.parameters);
testsuite(globalThis.abilityContext);
core.execute();
}
build() {
......
barrierfree/accessibilitygestureevent/entry/src/main/ets/TestAbility/TestAbility.ts 0 → 100644
浏览文件 @ 6755388a
/*
* 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.application.Ability'
export default class TestAbility extends Ability {
onCreate(want, launchParam) {
console.log('TestAbility onCreate')
}
onDestroy() {
console.log('TestAbility onDestroy')
}
onWindowStageCreate(windowStage) {
console.log('TestAbility onWindowStageCreate')
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))
});
globalThis.abilityContext = this.context;
}
onWindowStageDestroy() {
console.log('TestAbility onWindowStageDestroy')
}
onForeground() {
console.log('TestAbility onForeground')
}
onBackground() {
console.log('TestAbility onBackground')
}
};
\ No newline at end of file
barrierfree/accessibilitygestureevent/entry/src/main/ets/TestAbility/pages/index.ets 0 → 100644
浏览文件 @ 6755388a
/*
* 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 '@ohos.router';
@Entry
@Component
struct Index {
aboutToAppear() {
console.info('TestAbility index aboutToAppear')
}
@State message: string = 'Hello World'
build() {
Row() {
Column() {
Text(this.message)
.fontSize(50)
.fontWeight(FontWeight.Bold)
Button() {
Text('next page')
.fontSize(20)
.fontWeight(FontWeight.Bold)
}.type(ButtonType.Capsule)
.margin({
top: 20
})
.backgroundColor('#0D9FFB')
.width('35%')
.height('5%')
.onClick(()=>{
})
}
.width('100%')
}
.height('100%')
}
}
\ No newline at end of file
barrierfree/accessibilitygestureevent/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts 0 → 100644
浏览文件 @ 6755388a
/*
* 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',
'-s dryRun'
])
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 + '.MainAbility'
let lMonitor = {
abilityName: testAbilityName,
onAbilityCreate: onAbilityCreateCallback,
};
abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
var cmd = 'aa start -d 0 -a com.example.myapplication.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName
cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
var debug = abilityDelegatorArguments.parameters["-D"]
if (debug == 'true')
{
cmd += ' -D'
}
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
barrierfree/accessibilitygestureevent/entry/src/main/ets/test/AccessibilityGestureEventTest.test.ets
浏览文件 @ 6755388a
......@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
import commonEvent from '@ohos.commonEvent'
function publishCaseExecute(caseName: string) {
......@@ -25,7 +25,7 @@ function publishCaseExecute(caseName: string) {
});
}
export default function abilityTest(abilityContext) {
export default function abilityTest() {
let gestureEventTypes: Array<string> = [];
describe('AccessibilityGestureEventTest', function () {
let subScriber = undefined;
......@@ -45,7 +45,7 @@ export default function abilityTest(abilityContext) {
}
});
await abilityContext.startAbility({
await globalThis.abilityContext.startAbility({
deviceId: '',
bundleName: 'com.example.acetest',
abilityName: 'MainAbility',
......
barrierfree/accessibilitygestureevent/entry/src/main/ets/test/List.test.ets
浏览文件 @ 6755388a
......@@ -14,6 +14,6 @@
*/
import abilityTest from './AccessibilityGestureEventTest.test.ets'
export default function testsuite(abilityContext) {
abilityTest(abilityContext)
export default function testsuite() {
abilityTest()
}
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或