Skip to content

X
Xts Acts

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

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

!9612 优化用例 

Merge pull request !9612 from 姚翠/master
上级 84b88df5 95bf3554
显示空白变更内容
内联 并排
Showing with 138 addition and 137 deletion
graphic/windowStage/entry/src/main/ets/MainAbility/pages/second/pageTwo.ets
浏览文件 @ e0ad68d5
......@@ -19,7 +19,7 @@ struct PageTwo {
build() {
Row(){
Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Start }) {
Text(`${this.content}`)
.fontSize(50)
.fontWeight(FontWeight.Bold)
......
graphic/windowStage/entry/src/main/ets/test/parameterVerificationIsOptional.test.ets
浏览文件 @ e0ad68d5
......@@ -336,141 +336,6 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
done();
}
})
/**
* @tc.number SUB_WINDOW_WINDOWOFFKEYBOARDHEIGHTCHANGE_JSAPI_001
* @tc.name Test window_off_keyboardHeightChange_Test_001
* @tc.desc Turn off listening for keyboard height changes
*/
it('window_off_keyboardHeightChange_Test_001', 0, async function (done) {
let caseName = 'window_off_keyboardHeightChange_Test_001';
let msgStr = 'jsunittest ' + caseName + ' ';
console.log(msgStr + 'begin');
let firstListenFlag = false
let secondListenFlag = false
let windowId = 'window_off_keyboardHeightChange_Test_001';
let windowConfig = {
name: windowId, windowType: ohosWindow.WindowType.TYPE_SYSTEM_ALERT, ctx: context
};
let tempWnd = null;
tempWnd = await ohosWindow.createWindow(windowConfig).catch((err) => {
unexpectedError(err, caseName, 'ohosWindow.createWindow', done);
});
expect(!!tempWnd).assertTrue();
await tempWnd.loadContent('MainAbility/pages/second/pageTwo').catch((err) => {
unexpectedError(err, caseName, 'tempWnd.loadContent', done);
});
await tempWnd.resize(800, 800).catch((err) => {
unexpectedError(err, caseName, 'tempWnd.resetSize', done);
});
await tempWnd.moveWindowTo(100, 100).catch((err) => {
unexpectedError(err, caseName, 'tempWnd.moveWindowTo ', done);
});
await tempWnd.showWindow().catch((err) => {
unexpectedError(err, caseName, 'tempWnd.showWindow', done);
});
tempWnd.on('keyboardHeightChange', (data) => {
console.info(msgStr + "first listener trigger");
firstListenFlag = true
});
tempWnd.on('keyboardHeightChange', (data) => {
console.info(msgStr + "second listener trigger");
secondListenFlag = true
});
await inputClick('pageTwoinput', msgStr).catch(async err => {
console.info(msgStr + err);
await tempWnd.destroyWindow();
expect(TRUE_FLAG).assertFail();
done();
})
await sleep(1000);
tempWnd.off('keyboardHeightChange');
firstListenFlag = false
secondListenFlag = false
await inputClick('pageTwoinputSecond', msgStr).catch(async err => {
console.info(msgStr + err);
await tempWnd.destroyWindow();
expect(TRUE_FLAG).assertFail();
done();
})
await sleep(2000);
if (firstListenFlag === false && secondListenFlag === false) {
await tempWnd.destroyWindow();
done();
}
})
/**
* @tc.number SUB_WINDOW_WINDOWOFFKEYBOARDHEIGHTCHANGE_JSAPI_002
* @tc.name Test window_off_keyboardHeightChange_Test_002
* @tc.desc Turn off listening for keyboard height changes
*/
it('window_off_keyboardHeightChange_Test_002', 0, async function (done) {
let caseName = 'window_off_keyboardHeightChange_Test_002';
let msgStr = 'jsunittest ' + caseName + ' ';
console.log(msgStr + 'begin');
let firstListenFlag = false
let secondListenFlag = false
function firstCall() {
console.log(msgStr + "first listener trigger")
firstListenFlag = true
}
function secondCall() {
console.log(msgStr + "second listener trigger")
secondListenFlag = true
}
let windowId = 'window_off_keyboardHeightChange_Test_002';
let windowConfig = {
name: windowId, windowType: ohosWindow.WindowType.TYPE_SYSTEM_ALERT, ctx: context
};
let tempWnd = null;
tempWnd = await ohosWindow.createWindow(windowConfig).catch((err) => {
unexpectedError(err, caseName, 'ohosWindow.createWindow', done);
});
expect(!!tempWnd).assertTrue();
await tempWnd.loadContent('MainAbility/pages/second/pageTwo').catch((err) => {
unexpectedError(err, caseName, 'tempWnd.loadContent', done);
});
await tempWnd.resize(800, 800).catch((err) => {
unexpectedError(err, caseName, 'tempWnd.resetSize', done);
});
await tempWnd.moveWindowTo(100, 100).catch((err) => {
unexpectedError(err, caseName, 'tempWnd.moveWindowTo ', done);
});
await tempWnd.showWindow().catch((err) => {
unexpectedError(err, caseName, 'tempWnd.showWindow', done);
});
tempWnd.on('keyboardHeightChange', firstCall);
tempWnd.on('keyboardHeightChange', secondCall);
await inputClick('pageTwoinput', msgStr).catch(async err => {
console.info(msgStr + err);
await tempWnd.destroyWindow();
expect(TRUE_FLAG).assertFail();
done();
})
await sleep(1000);
tempWnd.off('keyboardHeightChange', firstCall);
firstListenFlag = false
secondListenFlag = false
await inputClick('pageTwoinputSecond', msgStr).catch(async err => {
console.info(msgStr + err);
await tempWnd.destroyWindow();
expect(TRUE_FLAG).assertFail();
done();
})
await sleep(2000);
if (!firstListenFlag && secondListenFlag) {
tempWnd.off('keyboardHeightChange');
await tempWnd.destroyWindow();
done();
} else {
tempWnd.off('keyboardHeightChange');
await tempWnd.destroyWindow();
expect(TRUE_FLAG).assertFail();
done();
}
})
/**
* @tc.number SUB_WINDOW_WINDOWOFFSCREENSHOT_JSAPI_001
......@@ -744,6 +609,142 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
done();
}
})
/**
* @tc.number SUB_WINDOW_WINDOWOFFKEYBOARDHEIGHTCHANGE_JSAPI_001
* @tc.name Test window_off_keyboardHeightChange_Test_001
* @tc.desc Turn off listening for keyboard height changes
*/
it('window_off_keyboardHeightChange_Test_001', 0, async function (done) {
let caseName = 'window_off_keyboardHeightChange_Test_001';
let msgStr = 'jsunittest ' + caseName + ' ';
console.log(msgStr + 'begin');
let firstListenFlag = false
let secondListenFlag = false
let windowId = 'window_off_keyboardHeightChange_Test_001';
let windowConfig = {
name: windowId, windowType: ohosWindow.WindowType.TYPE_DIALOG, ctx: context
};
let tempWnd = null;
tempWnd = await ohosWindow.createWindow(windowConfig).catch((err) => {
unexpectedError(err, caseName, 'ohosWindow.createWindow', done);
});
expect(!!tempWnd).assertTrue();
await tempWnd.loadContent('MainAbility/pages/second/pageTwo').catch((err) => {
unexpectedError(err, caseName, 'tempWnd.loadContent', done);
});
await tempWnd.resize(800, 1000).catch((err) => {
unexpectedError(err, caseName, 'tempWnd.resetSize', done);
});
await tempWnd.moveWindowTo(0, 0).catch((err) => {
unexpectedError(err, caseName, 'tempWnd.moveWindowTo ', done);
});
await tempWnd.showWindow().catch((err) => {
unexpectedError(err, caseName, 'tempWnd.showWindow', done);
});
tempWnd.on('keyboardHeightChange', (data) => {
console.info(msgStr + "first listener trigger");
firstListenFlag = true
});
tempWnd.on('keyboardHeightChange', (data) => {
console.info(msgStr + "second listener trigger");
secondListenFlag = true
});
await inputClick('pageTwoinput', msgStr).catch(async err => {
console.info(msgStr + err);
await tempWnd.destroyWindow();
expect(TRUE_FLAG).assertFail();
done();
})
await sleep(1000);
tempWnd.off('keyboardHeightChange');
firstListenFlag = false
secondListenFlag = false
await inputClick('pageTwoinputSecond', msgStr).catch(async err => {
console.info(msgStr + err);
await tempWnd.destroyWindow();
expect(TRUE_FLAG).assertFail();
done();
})
await sleep(2000);
if (firstListenFlag === false && secondListenFlag === false) {
await tempWnd.destroyWindow();
done();
}
})
/**
* @tc.number SUB_WINDOW_WINDOWOFFKEYBOARDHEIGHTCHANGE_JSAPI_002
* @tc.name Test window_off_keyboardHeightChange_Test_002
* @tc.desc Turn off listening for keyboard height changes
*/
it('window_off_keyboardHeightChange_Test_002', 0, async function (done) {
let caseName = 'window_off_keyboardHeightChange_Test_002';
let msgStr = 'jsunittest ' + caseName + ' ';
console.log(msgStr + 'begin');
let firstListenFlag = false
let secondListenFlag = false
function firstCall() {
console.log(msgStr + "first listener trigger")
firstListenFlag = true
}
function secondCall() {
console.log(msgStr + "second listener trigger")
secondListenFlag = true
}
let windowId = 'window_off_keyboardHeightChange_Test_002';
let windowConfig = {
name: windowId, windowType: ohosWindow.WindowType.TYPE_DIALOG, ctx: context
};
let tempWnd = null;
tempWnd = await ohosWindow.createWindow(windowConfig).catch((err) => {
unexpectedError(err, caseName, 'ohosWindow.createWindow', done);
});
expect(!!tempWnd).assertTrue();
await tempWnd.loadContent('MainAbility/pages/second/pageTwo').catch((err) => {
unexpectedError(err, caseName, 'tempWnd.loadContent', done);
});
await tempWnd.resize(800, 1000).catch((err) => {
unexpectedError(err, caseName, 'tempWnd.resetSize', done);
});
await tempWnd.moveWindowTo(0, 0).catch((err) => {
unexpectedError(err, caseName, 'tempWnd.moveWindowTo ', done);
});
await tempWnd.showWindow().catch((err) => {
unexpectedError(err, caseName, 'tempWnd.showWindow', done);
});
tempWnd.on('keyboardHeightChange', firstCall);
tempWnd.on('keyboardHeightChange', secondCall);
await inputClick('pageTwoinput', msgStr).catch(async err => {
console.info(msgStr + err);
await tempWnd.destroyWindow();
expect(TRUE_FLAG).assertFail();
done();
})
await sleep(1000);
tempWnd.off('keyboardHeightChange', firstCall);
firstListenFlag = false
secondListenFlag = false
await inputClick('pageTwoinputSecond', msgStr).catch(async err => {
console.info(msgStr + err);
await tempWnd.destroyWindow();
expect(TRUE_FLAG).assertFail();
done();
})
await sleep(2000);
if (!firstListenFlag && secondListenFlag) {
tempWnd.off('keyboardHeightChange');
await tempWnd.destroyWindow();
done();
} else {
tempWnd.off('keyboardHeightChange');
await tempWnd.destroyWindow();
expect(TRUE_FLAG).assertFail();
done();
}
})
/**
* @tc.number SUB_WINDOW_WINDOWSTAGEOFFWINDOWSTAGEVENT_JSAPI_001
* @tc.name Test windowStage_off_windowStageEvent_Test_001
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或