测试用例执行顺序调整.hap包切成arkui新框架。Signed-off-by: <zhouke35@huawei.com>.

Signed-off-by: Nzhouke <zhouke35@huawei.com>

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": {},

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

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": {},