From b8b0088acb6bd78969a1f732f658658af0fcc55a Mon Sep 17 00:00:00 2001 From: zhouke Date: Wed, 26 Oct 2022 17:29:33 +0800 Subject: [PATCH] =?UTF-8?q?arkXtest=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E9=80=82=E9=85=8D=E9=BB=84=E5=8C=BA?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=20.Signed-off-by:=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhouke --- arkXtest/uitest/Test.json | 6 ++ .../uitest/src/main/ets/test/uitest.test.ets | 74 +++++++++++++------ 2 files changed, 58 insertions(+), 22 deletions(-) diff --git a/arkXtest/uitest/Test.json b/arkXtest/uitest/Test.json index 551e5894a..817de6e70 100644 --- a/arkXtest/uitest/Test.json +++ b/arkXtest/uitest/Test.json @@ -20,11 +20,17 @@ "type": "ShellKit", "run-command": [ "param set persist.ace.testmode.enabled 1", + "param set persist.sys.suspend_manager_enabled 0", + "reboot", "power-shell wakeup", "hilog -Q pidoff", "hilog -b DEBUG", "uinput -T -d 300 600 -m 300 600 300 100 -u 300 100", "power-shell setmode 602" + ], + "teardown-command": [ + "param set persist.sys.suspend_manager_enabled 1", + "reboot" ] } ] diff --git a/arkXtest/uitest/src/main/ets/test/uitest.test.ets b/arkXtest/uitest/src/main/ets/test/uitest.test.ets index 73be99983..159012fe1 100644 --- a/arkXtest/uitest/src/main/ets/test/uitest.test.ets +++ b/arkXtest/uitest/src/main/ets/test/uitest.test.ets @@ -70,7 +70,7 @@ export default function UiTest() { expect(await Button1.getText() == 'next page').assertTrue() let Button2 = await driver.findComponent(BY.text('next', MatchPattern.STARTS_WITH)) expect(await Button2.getText() == 'next page').assertTrue() - let Button3 = await driver.findComponent(BY.text('page', MatchPattern.ENDS_WITH)) + let Button3 = await driver.findComponent(BY.text('xt page', MatchPattern.ENDS_WITH)) expect(await Button3.getText() == 'next page').assertTrue() let Button4 = await driver.findComponent(BY.text('ext', MatchPattern.CONTAINS)) expect(await Button4.getText() == 'next page').assertTrue() @@ -476,7 +476,7 @@ export default function UiTest() { expect(await Button1.getText() == 'next page').assertTrue() let Button2 = await driver.findComponent(ON.text('next',MatchPattern.STARTS_WITH)) expect(await Button2.getText() == 'next page').assertTrue() - let Button3 = await driver.findComponent(ON.text('page',MatchPattern.ENDS_WITH)) + let Button3 = await driver.findComponent(ON.text('xt page',MatchPattern.ENDS_WITH)) expect(await Button3.getText() == 'next page').assertTrue() let Button4 = await driver.findComponent(ON.text('ext',MatchPattern.CONTAINS)) expect(await Button4.getText() == 'next page').assertTrue() @@ -1372,25 +1372,49 @@ export default function UiTest() { await startAbility('com.uitestScene.acts', 'com.uitestScene.acts.MainAbility') let driver = Driver.create() await driver.delayMs(waitUiReadyMs) - await driver.delayMs(waitUiReadyMs) - await driver.setDisplayRotation(DisplayRotation.ROTATION_90) - let rotation1 = await driver.getDisplayRotation() - expect(rotation1 == DisplayRotation.ROTATION_90).assertTrue() - await driver.delayMs(waitUiReadyMs) - await driver.setDisplayRotation(DisplayRotation.ROTATION_180) - let rotation2 = await driver.getDisplayRotation() - expect(rotation2 == DisplayRotation.ROTATION_180).assertTrue() - await driver.delayMs(waitUiReadyMs) + 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_270) - let rotation3 = await driver.getDisplayRotation() - expect(rotation3 == DisplayRotation.ROTATION_270).assertTrue() - await driver.delayMs(waitUiReadyMs) + 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) - let rotation4 = await driver.getDisplayRotation() - expect(rotation4== DisplayRotation.ROTATION_0).assertTrue() + 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') }) @@ -1402,14 +1426,20 @@ export default function UiTest() { it('testSetDisplayRotationEnabled', 0, async function () { await startAbility('com.uitestScene.acts', 'com.uitestScene.acts.MainAbility') let driver = Driver.create() - await driver.setDisplayRotationEnabled(false) await driver.setDisplayRotation(DisplayRotation.ROTATION_180) - await driver.delayMs(waitUiReadyMs) + let rotation = await driver.getDisplayRotation() await driver.setDisplayRotationEnabled(true) await driver.setDisplayRotation(DisplayRotation.ROTATION_90) + await driver.delayMs(waitUiReadyMs) let rotation2 = await driver.getDisplayRotation() - expect(rotation2 == DisplayRotation.ROTATION_90).assertTrue() - await driver.setDisplayRotation(DisplayRotation.ROTATION_0) + 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') }) -- GitLab