!5054 arkXtest窗口操作测试用例调整

Merge pull request !5054 from 周柯/master

arkXtest/uitest/src/main/ets/test/uitest.test.ets

@@ -730,12 +730,20 @@ export default function UiTest() {
       let window1 = await driver.findWindow({bundleName:'com.uitestScene.acts'})
       let mode1 = await window1.getWindowMode()
       expect(mode1 == WindowMode.FULLSCREEN).assertTrue()
+      try {
         await window1.resume()
         let window2 = await driver.findWindow({bundleName:'com.uitestScene.acts'})
         let mode2 = await window2.getWindowMode()
         expect(mode2 == WindowMode.FLOATING).assertTrue()
-      await window2.resume()
         await stopApplication('com.uitestScene.acts')
+      }
+      catch (err) {
+        if (err.message == 'this device can not support this action') {
+          expect(window1 != null).assertTrue()
+        } else {
+          expect(false).assertTrue()
+        }
+      }
     })
 
     /*
@@ -778,6 +786,7 @@ export default function UiTest() {
       let driver = UiDriver.create()
       await driver.delayMs(waitUiReadyMs)
       let window = await driver.findWindow({bundleName:'com.uitestScene.acts'})
+      try{
         await window.resume()
         await driver.delayMs(waitUiReadyMs)
         let window1 = await driver.findWindow({bundleName:'com.uitestScene.acts'})
@@ -788,6 +797,14 @@ export default function UiTest() {
         let bounds2 = await window2.getBounds()
         expect(bounds1 != bounds2).assertTrue()
         await stopApplication('com.uitestScene.acts')
+      }
+      catch (err) {
+        if (err.message == 'this device can not support this action') {
+          expect(window != null).assertTrue()
+        } else {
+          expect(false).assertTrue()
+        }
+      }
     })
 
     /*
@@ -800,6 +817,7 @@ export default function UiTest() {
       let driver = UiDriver.create()
       await driver.delayMs(waitUiReadyMs)
       let window = await driver.findWindow({bundleName:'com.uitestScene.acts'})
+      try{
         await window.resume()
         await driver.delayMs(waitUiReadyMs)
 
@@ -825,6 +843,14 @@ export default function UiTest() {
         let bounds5= await window5.getBounds()
         expect(bounds5 != bounds4).assertTrue()
         await stopApplication('com.uitestScene.acts')
+      }
+      catch (err) {
+        if (err.message == 'this device can not support this action') {
+          expect(window != null).assertTrue()
+        } else {
+          expect(false).assertTrue()
+        }
+      }
     })
 
     it('testWindowResizeB', 0, async function () {
@@ -832,6 +858,7 @@ export default function UiTest() {
       let driver = UiDriver.create()
       await driver.delayMs(waitUiReadyMs)
       let window = await driver.findWindow({bundleName:'com.uitestScene.acts'})
+      try{
         await window.resume()
         await driver.delayMs(waitUiReadyMs)
 
@@ -858,6 +885,14 @@ export default function UiTest() {
         expect(bounds9 != bounds8).assertTrue()
 
         await stopApplication('com.uitestScene.acts')
+      }
+      catch (err) {
+        if (err.message == 'this device can not support this action') {
+          expect(window != null).assertTrue()
+        } else {
+          expect(false).assertTrue()
+        }
+      }
     })
 
     /*
@@ -886,6 +921,7 @@ export default function UiTest() {
       let driver = UiDriver.create()
       await driver.delayMs(waitUiReadyMs)
       let window = await driver.findWindow({bundleName:'com.uitestScene.acts'})
+      try{
         await window.resume()
         let window2 = await driver.findWindow({bundleName:'com.uitestScene.acts'})
         await window2.maximize()
@@ -894,6 +930,14 @@ export default function UiTest() {
         let mode = await window3.getWindowMode()
         expect(mode == WindowMode.FULLSCREEN).assertTrue()
         await stopApplication('com.uitestScene.acts')
+      }
+      catch (err) {
+        if (err.message == 'this device can not support this action') {
+          expect(window != null).assertTrue()
+        } else {
+          expect(false).assertTrue()
+        }
+      }
     })
 
     /*
@@ -906,11 +950,20 @@ export default function UiTest() {
       let driver = UiDriver.create()
       await driver.delayMs(waitUiReadyMs)
       let window = await driver.findWindow({bundleName:'com.uitestScene.acts'})
+      try{
       await window.minimize()
         await driver.delayMs(waitUiReadyMs)
         let window1 = await driver.findWindow({bundleName:'com.uitestScene.acts'})
         expect(window1 == null).assertTrue()
         await stopApplication('com.uitestScene.acts')
+      }
+      catch (err) {
+        if (err.message == 'this device can not support this action') {
+          expect(window != null).assertTrue()
+        } else {
+          expect(false).assertTrue()
+        }
+      }
     })
 
     /*
@@ -923,11 +976,19 @@ export default function UiTest() {
       let driver = UiDriver.create()
       await driver.delayMs(waitUiReadyMs)
       let window = await driver.findWindow({bundleName:'com.uitestScene.acts'})
+      try{
         await window.close()
         await driver.delayMs(waitUiReadyMs)
         let window1 = await driver.findWindow({bundleName:'com.uitestScene.acts'})
         expect(window1 == null).assertTrue()
-      await stopApplication('com.uitestScene.acts')
+      }
+      catch (err) {
+        if (err.message == 'this device can not support this action') {
+          expect(window != null).assertTrue()
+        } else {
+          expect(false).assertTrue()
+        }
+      }
     })
 
     /*