提交 eb795c09 编写于 作者: 华华小仙女

修改showWithAnimationTest1用例,非系统应用不支持showWithAnimation接口

Signed-off-by: N华华小仙女 <zhurong18@h-partners.com>
上级 df68315d
......@@ -2218,41 +2218,47 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
* @tc.desc Displays the current window, playing an animation in the process
*/
it('showWithAnimationTest2', 0, async function (done) {
let caseName = 'showWithAnimationTest2';
let msgStr = 'jsunittest ' + caseName + ' ';
console.log(msgStr + 'begin context==' + JSON.stringify(context));
let wndId = 'showWithAnimationTest2';
let baseType = ohosWindow.WindowType.TYPE_FLOAT;
let tempWnd = null;
function createWin() {
return new Promise(function (resolve, reject) {
ohosWindow.create(context, wndId, baseType, (err, data) => {
if (err && err.code) {
reject(null)
} else {
resolve(data)
}
it('showWithAnimationTest2', 0, async function (done) {
let caseName = 'showWithAnimationTest2';
let msgStr = 'jsunittest ' + caseName + ' ';
console.log(msgStr + 'begin context==' + JSON.stringify(context));
let wndId = 'showWithAnimationTest2';
let baseType = ohosWindow.WindowType.TYPE_FLOAT;
let tempWnd = null;
function createWin() {
return new Promise(function (resolve, reject) {
ohosWindow.create(context, wndId, baseType, (err, data) => {
if (err && err.code) {
reject(null)
} else {
resolve(data)
}
})
})
})
}
tempWnd = await createWin().catch(err => {
console.info(msgStr + `ohosWindow.create failed error: ${JSON.stringify(err)}`)
expect().assertFail();
done();
})
expect(!!tempWnd).assertTrue();
tempWnd.showWithAnimation(async (error, animationData) => {
if (error && error.code) {
unexpectedError(error, caseName, 'Failed to show the window with animation', done);
} else {
console.info('Succeeded in showing the window with animation. Data: ' + JSON.stringify(animationData));
await tempWnd.destroy()
done()
}
await createWin().then((data) => {
console.info(msgStr + `ohosWindow.create success data: ${JSON.stringify(data)}`)
tempWnd = data;
}).catch(err => {
console.info(msgStr + `ohosWindow.create failed error: ${JSON.stringify(err)}`)
expect().assertFail();
done();
})
expect(!!tempWnd).assertTrue();
console.info(msgStr + `ohosWindow.create success tempWnd: ${JSON.stringify(tempWnd)}`)
tempWnd.showWithAnimation(async (error, animationData) => {
if (error && error.code) {
console.info(msgStr + 'showWithAnimation fail. error: ' + JSON.stringify(error));
await tempWnd.destroy()
expectedError(error, caseName, 'tempWnd.showWithAnimation', done, 202);
} else {
console.info(msgStr + 'Succeeded in showing the window with animation. Data: ' + JSON.stringify(animationData));
done()
}
})
})
})
/**
* @tc.number SUB_WINDOW_HIDEWITHANIMATION_JSAPI_002
* @tc.name Test hideWithAnimationTest2
......
......@@ -1598,7 +1598,6 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
tempWnd = data
console.log(msgStr + 'ohosWindow.create ' + baseType + ', tempWnd: ' + JSON.stringify(tempWnd));
expect(!!tempWnd).assertTrue();
console.info('showWithAnimationTest1 ****' + Reflect.has(tempWnd, 'showWithAnimation'))
}).catch((err) => {
unexpectedError(err, caseName, 'ohosWindow.create ' + baseType, done);
});
......@@ -1608,13 +1607,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
}
await tempWnd.showWithAnimation().then((data) => {
console.info('Succeeded in showing the window with animation. Data: ' + JSON.stringify(data));
tempWnd.destroy();
console.info(msgStr + 'Succeeded in showing the window with animation. Data: ' + JSON.stringify(data));
done();
}).catch((err) => {
unexpectedError(err, caseName, 'Failed to show the window with animation', done);
tempWnd.destroy();
expectedError(err, caseName, 'tempWnd.showWithAnimation', done, 202);
})
})
/**
* @tc.number SUB_WINDOW_HIDEWITHANIMATION_JSAPI_001
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册