From 845605ce657facb50919a2999c747751f44b5f25 Mon Sep 17 00:00:00 2001 From: zhouke Date: Mon, 20 Mar 2023 09:54:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4.hap=E5=8C=85?= =?UTF-8?q?=E5=88=87=E6=88=90arkui=E6=96=B0=E6=A1=86=E6=9E=B6=E3=80=82Sign?= =?UTF-8?q?ed-off-by:=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhouke --- arkXtest/uitest/src/main/config.json | 6 +- .../uitest/src/main/ets/test/uitest.test.ets | 160 +++++++++--------- arkXtest/uitestScene/src/main/config.json | 6 +- 3 files changed, 86 insertions(+), 86 deletions(-) diff --git a/arkXtest/uitest/src/main/config.json b/arkXtest/uitest/src/main/config.json index 8a4068a6a..10297e2de 100644 --- a/arkXtest/uitest/src/main/config.json +++ b/arkXtest/uitest/src/main/config.json @@ -7,9 +7,9 @@ "name": "1.0.0" }, "apiVersion": { - "compatible": 7, - "releaseType": "Release", - "target": 8 + "compatible": 9, + "releaseType": "beta5", + "target": 9 } }, "deviceConfig": {}, diff --git a/arkXtest/uitest/src/main/ets/test/uitest.test.ets b/arkXtest/uitest/src/main/ets/test/uitest.test.ets index ca4daa284..46f452281 100644 --- a/arkXtest/uitest/src/main/ets/test/uitest.test.ets +++ b/arkXtest/uitest/src/main/ets/test/uitest.test.ets @@ -1363,86 +1363,6 @@ export default function UiTest() { await stopApplication('com.uitestScene.acts') }) - /* - * @tc.number: uiTest_9049 - * @tc.name: testDisplayRotation - * @tc.desc: get the rotation of the device display and set it. - */ - it('testDisplayRotation', 0, async function () { - await startAbility('com.uitestScene.acts', 'com.uitestScene.acts.MainAbility') - let driver = Driver.create() - await driver.delayMs(waitUiReadyMs) - await driver.setDisplayRotation(DisplayRotation.ROTATION_180) - let rotation = await driver.getDisplayRotation() - if (rotation == DisplayRotation.ROTATION_180) { - console.info('The device is displayed in vertical on default') - await driver.setDisplayRotation(DisplayRotation.ROTATION_90) - await driver.delayMs(waitUiReadyMs) - let rotation1 = await driver.getDisplayRotation() - expect(rotation1 == DisplayRotation.ROTATION_90) - await driver.setDisplayRotation(DisplayRotation.ROTATION_180) - await driver.delayMs(waitUiReadyMs) - let rotation2 = await driver.getDisplayRotation() - expect(rotation2 == DisplayRotation.ROTATION_180) - await driver.setDisplayRotation(DisplayRotation.ROTATION_270) - await driver.delayMs(waitUiReadyMs) - let rotation3 = await driver.getDisplayRotation() - expect(rotation3 == DisplayRotation.ROTATION_270) - await driver.setDisplayRotation(DisplayRotation.ROTATION_0) - await driver.delayMs(waitUiReadyMs) - let rotation4 = await driver.getDisplayRotation() - expect(rotation4 == DisplayRotation.ROTATION_0) - } else if (rotation == DisplayRotation.ROTATION_270) { - console.info('The device is displayed in horizontal on default') - await driver.setDisplayRotation(DisplayRotation.ROTATION_90) - await driver.delayMs(waitUiReadyMs) - let rotation1 = await driver.getDisplayRotation() - expect(rotation1 == DisplayRotation.ROTATION_0) - - await driver.setDisplayRotation(DisplayRotation.ROTATION_180) - await driver.delayMs(waitUiReadyMs) - let rotation2 = await driver.getDisplayRotation() - expect(rotation2 == DisplayRotation.ROTATION_270) - - await driver.setDisplayRotation(DisplayRotation.ROTATION_270) - await driver.delayMs(waitUiReadyMs) - let rotation3 = await driver.getDisplayRotation() - expect(rotation3 == DisplayRotation.ROTATION_180) - - await driver.setDisplayRotation(DisplayRotation.ROTATION_0) - await driver.delayMs(waitUiReadyMs) - let rotation4 = await driver.getDisplayRotation() - expect(rotation4 == DisplayRotation.ROTATION_90) - await driver.setDisplayRotation(DisplayRotation.ROTATION_90) - } - await stopApplication('com.uitestScene.acts') - }) - - /* - * @tc.number: uiTest_9050 - * @tc.name: testSetDisplayRotationEnabled - * @tc.desc: enable/disable the rotation of device display. - */ - it('testSetDisplayRotationEnabled', 0, async function () { - await startAbility('com.uitestScene.acts', 'com.uitestScene.acts.MainAbility') - let driver = Driver.create() - await driver.setDisplayRotation(DisplayRotation.ROTATION_180) - let rotation = await driver.getDisplayRotation() - await driver.setDisplayRotationEnabled(true) - await driver.setDisplayRotation(DisplayRotation.ROTATION_90) - await driver.delayMs(waitUiReadyMs) - let rotation2 = await driver.getDisplayRotation() - if (rotation == DisplayRotation.ROTATION_180) { - console.info('The device is displayed in vertical on default') - expect(rotation2 == DisplayRotation.ROTATION_90) - await driver.setDisplayRotation(DisplayRotation.ROTATION_0) - } else { - expect(rotation2 == DisplayRotation.ROTATION_0) - console.info('The device is displayed in horizontal on default') - } - await stopApplication('com.uitestScene.acts') - }) - /* * @tc.number: uiTest_9051 * @tc.name: testWakeUpDisplay @@ -1554,5 +1474,85 @@ export default function UiTest() { } await stopApplication('com.uitestScene.acts') }) + + /* + * @tc.number: uiTest_9049 + * @tc.name: testDisplayRotation + * @tc.desc: get the rotation of the device display and set it. + */ + it('testDisplayRotation', 0, async function () { + await startAbility('com.uitestScene.acts', 'com.uitestScene.acts.MainAbility') + let driver = Driver.create() + await driver.delayMs(waitUiReadyMs) + await driver.setDisplayRotation(DisplayRotation.ROTATION_180) + let rotation = await driver.getDisplayRotation() + if (rotation == DisplayRotation.ROTATION_180) { + console.info('The device is displayed in vertical on default') + await driver.setDisplayRotation(DisplayRotation.ROTATION_90) + await driver.delayMs(waitUiReadyMs) + let rotation1 = await driver.getDisplayRotation() + expect(rotation1 == DisplayRotation.ROTATION_90) + await driver.setDisplayRotation(DisplayRotation.ROTATION_180) + await driver.delayMs(waitUiReadyMs) + let rotation2 = await driver.getDisplayRotation() + expect(rotation2 == DisplayRotation.ROTATION_180) + await driver.setDisplayRotation(DisplayRotation.ROTATION_270) + await driver.delayMs(waitUiReadyMs) + let rotation3 = await driver.getDisplayRotation() + expect(rotation3 == DisplayRotation.ROTATION_270) + await driver.setDisplayRotation(DisplayRotation.ROTATION_0) + await driver.delayMs(waitUiReadyMs) + let rotation4 = await driver.getDisplayRotation() + expect(rotation4 == DisplayRotation.ROTATION_0) + } else if (rotation == DisplayRotation.ROTATION_270) { + console.info('The device is displayed in horizontal on default') + await driver.setDisplayRotation(DisplayRotation.ROTATION_90) + await driver.delayMs(waitUiReadyMs) + let rotation1 = await driver.getDisplayRotation() + expect(rotation1 == DisplayRotation.ROTATION_0) + + await driver.setDisplayRotation(DisplayRotation.ROTATION_180) + await driver.delayMs(waitUiReadyMs) + let rotation2 = await driver.getDisplayRotation() + expect(rotation2 == DisplayRotation.ROTATION_270) + + await driver.setDisplayRotation(DisplayRotation.ROTATION_270) + await driver.delayMs(waitUiReadyMs) + let rotation3 = await driver.getDisplayRotation() + expect(rotation3 == DisplayRotation.ROTATION_180) + + await driver.setDisplayRotation(DisplayRotation.ROTATION_0) + await driver.delayMs(waitUiReadyMs) + let rotation4 = await driver.getDisplayRotation() + expect(rotation4 == DisplayRotation.ROTATION_90) + await driver.setDisplayRotation(DisplayRotation.ROTATION_90) + } + await stopApplication('com.uitestScene.acts') + }) + + /* + * @tc.number: uiTest_9050 + * @tc.name: testSetDisplayRotationEnabled + * @tc.desc: enable/disable the rotation of device display. + */ + it('testSetDisplayRotationEnabled', 0, async function () { + await startAbility('com.uitestScene.acts', 'com.uitestScene.acts.MainAbility') + let driver = Driver.create() + await driver.setDisplayRotation(DisplayRotation.ROTATION_180) + let rotation = await driver.getDisplayRotation() + await driver.setDisplayRotationEnabled(true) + await driver.setDisplayRotation(DisplayRotation.ROTATION_90) + await driver.delayMs(waitUiReadyMs) + let rotation2 = await driver.getDisplayRotation() + if (rotation == DisplayRotation.ROTATION_180) { + console.info('The device is displayed in vertical on default') + expect(rotation2 == DisplayRotation.ROTATION_90) + await driver.setDisplayRotation(DisplayRotation.ROTATION_0) + } else { + expect(rotation2 == DisplayRotation.ROTATION_0) + console.info('The device is displayed in horizontal on default') + } + await stopApplication('com.uitestScene.acts') + }) }) } \ No newline at end of file diff --git a/arkXtest/uitestScene/src/main/config.json b/arkXtest/uitestScene/src/main/config.json index 7fc10ec3a..f38777275 100644 --- a/arkXtest/uitestScene/src/main/config.json +++ b/arkXtest/uitestScene/src/main/config.json @@ -7,9 +7,9 @@ "name": "1.0.0" }, "apiVersion": { - "compatible": 7, - "releaseType": "Release", - "target": 8 + "compatible": 9, + "releaseType": "beta5", + "target": 9 } }, "deviceConfig": {}, -- GitLab