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

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

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