From c9cefc7b9a6c5ceef59348a15de7bbfce573f465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=8E=E5=8D=8E=E5=B0=8F=E4=BB=99=E5=A5=B3?= Date: Sat, 25 Feb 2023 09:57:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=94=99=E8=AF=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 华华小仙女 --- .../src/main/ets/test/windowCallback.test.ets | 82 ++++++++++--------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/graphic/windowStage/entry/src/main/ets/test/windowCallback.test.ets b/graphic/windowStage/entry/src/main/ets/test/windowCallback.test.ets index 0d57effd6..ecc93f862 100644 --- a/graphic/windowStage/entry/src/main/ets/test/windowCallback.test.ets +++ b/graphic/windowStage/entry/src/main/ets/test/windowCallback.test.ets @@ -740,7 +740,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) if (err && err.code) { reject(null) } else { - console.log(msgStr + 'tempWnd.setSystemBarProperties ' + JSON.stringify(systemBarProperties)+ ' success'); + console.log(msgStr + 'tempWnd.setSystemBarProperties ' + JSON.stringify(systemBarProperties) + ' success'); resolve(true) } @@ -766,7 +766,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) isNavigationBarLightIcon: false, navigationBarContentColor: tempColor, }; - await setSystemBarPropertiesFun(tempWnd,systemBarProperties).catch((err) => { + await setSystemBarPropertiesFun(tempWnd, systemBarProperties).catch((err) => { console.info(msgStr + 'setSystemBarProperties error : ' + JSON.stringify(err)); expect().assertFail(); done(); @@ -2218,47 +2218,46 @@ 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) { - 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) - } - }) - }) - } + 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; - 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() - } + function createWin() { + return new Promise(function (resolve, reject) { + ohosWindow.create(context, wndId, baseType, (err, data) => { + if (err && err.code) { + reject(null) + } else { + resolve(data) + } + }) }) + } + + 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 @@ -2335,6 +2334,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) }).catch((err) => { console.error(msgStr + 'Failed to obtain the main window. Cause: ' + JSON.stringify(err)); }); + function setAspectRatio() { return new Promise(function (resolve, reject) { try { @@ -2351,6 +2351,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) } }) } + function resetAspectRatio() { return new Promise(function (resolve, reject) { console.info(msgStr + 'Succeeded start'); @@ -2388,6 +2389,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) }).catch((err) => { console.error(msgStr + 'Failed to obtain the main window. Cause: ' + JSON.stringify(err)); }); + function setAspectRatio() { return new Promise(function (resolve, reject) { try { -- GitLab