From 07a24f58e5c48287f1c47441f0cf2b65f1ecb666 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: Mon, 13 Feb 2023 16:09:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EsetAspectRatio=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=94=A8=E4=BE=8B=E5=92=8CresetAspectRatio=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 华华小仙女 --- .../entry/src/main/ets/test/.idea/misc.xml | 6 ++ .../src/main/ets/test/.idea/workspace.xml | 47 ++++++++++++++++ .../src/main/ets/test/windowCallback.test.ets | 55 +++++++++++++++++++ .../src/main/ets/test/windowPromise.test.ets | 38 +++++++++++++ 4 files changed, 146 insertions(+) create mode 100644 graphic/windowStage/entry/src/main/ets/test/.idea/misc.xml create mode 100644 graphic/windowStage/entry/src/main/ets/test/.idea/workspace.xml diff --git a/graphic/windowStage/entry/src/main/ets/test/.idea/misc.xml b/graphic/windowStage/entry/src/main/ets/test/.idea/misc.xml new file mode 100644 index 000000000..639900d13 --- /dev/null +++ b/graphic/windowStage/entry/src/main/ets/test/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/graphic/windowStage/entry/src/main/ets/test/.idea/workspace.xml b/graphic/windowStage/entry/src/main/ets/test/.idea/workspace.xml new file mode 100644 index 000000000..4a2bf0ed1 --- /dev/null +++ b/graphic/windowStage/entry/src/main/ets/test/.idea/workspace.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 30e00ff02..90a925cda 100644 --- a/graphic/windowStage/entry/src/main/ets/test/windowCallback.test.ets +++ b/graphic/windowStage/entry/src/main/ets/test/windowCallback.test.ets @@ -3491,6 +3491,61 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) return destroy() }) }) + /** + * @tc.number SUB_WINDOW_SETASPECTRATIO_JSAPI_001 + * @tc.name Test setAspectRatioTest1 + * @tc.desc Validate the scenario cancelled after setting the proportion of the content layout of the main window + */ + it('setAspectRatioTest1', 0, async function (done) { + let caseName = 'setAspectRatioTest1'; + let msgStr = 'jsunittest ' + caseName + ' '; + console.log(msgStr + 'begin'); + let mainWnd = null; + await windowStage.getMainWindow().then((data) => { + mainWnd = data; + console.info(msgStr + 'Succeeded in obtaining the main window. Data: ' + JSON.stringify(data)); + }).catch((err) => { + console.error(msgStr + 'Failed to obtain the main window. Cause: ' + JSON.stringify(err)); + }); + function setAspectRatio() { + return new Promise(function (resolve, reject) { + try { + let ratio = 1.0; + mainWnd.setAspectRatio(ratio, (err) => { + if (err.code) { + console.error(msgStr + 'Failed to set the aspect ratio of window. err.code:' + JSON.stringify(err.code)); + } + expect(err.code == 0).assertTrue(); + resolve(true) + }); + } catch (exception) { + console.error(msgStr + 'Failed to set the aspect ratio of window. Cause : ' + JSON.stringify(exception)); + } + }) + } + function resetAspectRatio() { + return new Promise(function (resolve, reject) { + console.info(msgStr + 'Succeeded start'); + try { + mainWnd.resetAspectRatio((err) => { + if (err.code) { + console.error(msgStr + 'Failed to reset the aspect ratio of window. err:' + JSON.stringify(err)); + return; + } + console.info(msgStr + 'Succeeded in resetting aspect ratio of window.'); + done(); + }); + } catch (exception) { + console.error(msgStr + 'Failed to reset the aspect ratio of window. Cause: ' + JSON.stringify(exception)); + } + }) + } + + await setAspectRatio() + await resetAspectRatio() + }) + + } ) } diff --git a/graphic/windowStage/entry/src/main/ets/test/windowPromise.test.ets b/graphic/windowStage/entry/src/main/ets/test/windowPromise.test.ets index bd2750459..80decbed1 100644 --- a/graphic/windowStage/entry/src/main/ets/test/windowPromise.test.ets +++ b/graphic/windowStage/entry/src/main/ets/test/windowPromise.test.ets @@ -1711,5 +1711,43 @@ export default function windowPromiseTest(context, windowStage, abilityStorage) console.error('Failed to hide the window with animation. Cause: ' + JSON.stringify(err)); }) }) + /** + * @tc.number SUB_WINDOW_SETASPECTRATIO_JSAPI_002 + * @tc.name Test setAspectRatioTest2 + * @tc.desc Validate the scenario cancelled after setting the proportion of the content layout of the main window + */ + it('setAspectRatioTest2', 0, async function (done) { + let caseName = 'setAspectRatioTest2'; + let msgStr = 'jsunittest ' + caseName + ' '; + console.log(msgStr + 'begin'); + let mainWnd = null; + await windowStage.getMainWindow().then((data) => { + mainWnd = data; + expect(!!mainWnd).assertTrue(); + console.info(msgStr + 'Succeeded in obtaining the main window. Data: ' + JSON.stringify(data)); + }).catch((err) => { + console.error(msgStr + 'Failed to obtain the main window. Cause: ' + JSON.stringify(err)); + }); + try { + let ratio = 1.0; + await mainWnd.setAspectRatio(ratio).then(() => { + console.info(msgStr + 'Succeeded in setting aspect ratio of window.'); + }).catch((err) => { + console.error(msgStr + 'Failed to set the aspect ratio of window. Cause:' + JSON.stringify(err)); + }); + } catch (exception) { + console.error(msgStr + 'Failed to set the aspect ratio of window. Cause: ' + JSON.stringify(exception)); + } + try { + await mainWnd.resetAspectRatio().then(() => { + console.info(msgStr + 'Succeeded in resetting aspect ratio of window.'); + }).catch((err) => { + console.error(msgStr + 'Failed to reset the aspect ratio of window. Cause:' + JSON.stringify(err)); + }); + } catch (exception) { + console.error(msgStr + 'Failed to reset the aspect ratio of window. Cause: ' + JSON.stringify(exception)); + } + done(); + }) }) } -- GitLab