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

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

arkXtest/BUILD.gn

-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

arkXtest/uitest/src/main/config.json

@@ -89,10 +89,7 @@
           "type": "pageAbility"
         },
         "pages": [
-          "pages/index",
-          "pages/second",
-          "pages/third",
-          "pages/fourth"
+          "pages/index"
         ],
         "name": ".TestAbility",
         "window": {

arkXtest/uitest/src/main/ets/MainAbility/app.ets

@@ -12,11 +12,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
+import testsuite from '../test/List.test'
+
 export default {
   onCreate() {
     console.info('Application onCreate')
+    var abilityDelegator: any
+    abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+    var abilityDelegatorArguments: any
+    abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+    console.info('start run testcase!!!')
+    abilityDelegatorArguments.parameters['-s timeout'] = 3000000
+    Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
   },
   onDestroy() {
     console.info('Application onDestroy')
   },
+
 }
\ No newline at end of file

arkXtest/uitest/src/main/ets/MainAbility/pages/index.ets

+/**
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import router from '@system.router';
 import prompt from '@ohos.prompt';
 
@@ -8,72 +22,86 @@ struct ScrollExample {
   private arr: number[] = [1,2,3,4]
 
   build() {
-    Stack({ alignContent: Alignment.TopStart }) {
-      Scroll(this.scroller) {
-        Column() {
-          Button() {
-            Text('next page')
-              .fontSize(25)
-              .fontWeight(FontWeight.Bold)
-          }.key('my-key')
-          .type(ButtonType.Capsule)
-          .margin({ top: 20 })
-          .onClick(() => {
-            router.push({ uri: 'pages/second' })
-          })
-          .gesture(
-            LongPressGesture({repeat:false})
-              .onAction((event: GestureEvent)=>{
-                router.push({ uri: 'pages/fourth' })
+    Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
+      Text('MainPage')
+        .fontSize(50)
+        .fontWeight(FontWeight.Bold)
+      Stack({ alignContent: Alignment.TopStart }) {
+        Scroll(this.scroller) {
+          Column() {
+            Button() {
+              Text('next page')
+                .fontSize(25)
+                .fontWeight(FontWeight.Bold)
+            }
+            .key('my-key')
+            .type(ButtonType.Capsule)
+            .margin({ top: 20 })
+            .onClick(() => {
+              router.push({ uri: 'pages/second' })
             })
-          )
-          Button() {
-            Text('Click twice')
-              .fontSize(25)
-              .fontWeight(FontWeight.Bold)
-          }
-          .type(ButtonType.Capsule)
-          .margin({top:20})
             .gesture(
-              TapGesture({ count: 2 })
-               .onAction(() => {
-                 router.push({ uri: 'pages/third' })
-                 })
+            LongPressGesture({ repeat: false })
+              .onAction((event: GestureEvent) => {
+                router.push({ uri: 'pages/fourth' })
+              })
+            )
+
+            Button() {
+              Text('Click twice')
+                .fontSize(25)
+                .fontWeight(FontWeight.Bold)
+            }
+            .type(ButtonType.Capsule)
+            .margin({ top: 20 })
+            .gesture(
+            TapGesture({ count: 1 })
+              .onAction(() => {
+                router.push({ uri: 'pages/third' })
+              })
             )
-          Checkbox({name:'hi'})
-          .size({width:30,height:30})
-          TextInput({ placeholder: 'welcome', text: 'Hello World'})
-          .type(InputType.Normal)
-          .width(300)
-          .height(50)
-          .fontSize(40)
-          .enabled(true)
-          .margin({ top: 20 })
-          ForEach(this.arr, (item) => {
-            Text(item.toString())
-              .width('100%').height('30%').backgroundColor(0xFFFFFF)
-              .borderRadius(75).fontSize(80).textAlign(TextAlign.Center)
-              .margin({ top: 10 })
-          }, item => item)
-          Button() {
-            Text('bottom')
-              .fontSize(25)
-              .fontWeight(FontWeight.Bold)
-          }.type(ButtonType.Capsule)
-          .margin({
-            top: 20, left: 150
-          })
-          .onClick(() => {
-            router.push({ uri: 'pages/second' })
-          })
-        }.width('100%')
-      }
-      .scrollable(ScrollDirection.Vertical).scrollBar(BarState.On)
-      .scrollBarColor(Color.Gray).scrollBarWidth(30)
-      .onScroll((xOffset: number, yOffset: number) => {
-        console.info(xOffset + ' ' + yOffset)
-      })
-    }.width('100%').height('100%').backgroundColor(0xDCDCDC)
+
+            Checkbox({ name: 'hi' })
+              .size({ width: 30, height: 30 })
+            TextInput({ placeholder: 'welcome', text: 'Hello World' })
+              .type(InputType.Normal)
+              .width(300)
+              .height(50)
+              .fontSize(40)
+              .enabled(true)
+              .margin({ top: 20 })
+            ForEach(this.arr, (item) => {
+              Text(item.toString())
+                .width('100%')
+                .height('30%')
+                .backgroundColor(0xFFFFFF)
+                .borderRadius(75)
+                .fontSize(80)
+                .textAlign(TextAlign.Center)
+                .margin({ top: 10 })
+            }, item => item)
+            Button() {
+              Text('bottom')
+                .fontSize(25)
+                .fontWeight(FontWeight.Bold)
+            }.type(ButtonType.Capsule)
+            .margin({
+              top: 20, left: 150
+            })
+            .onClick(() => {
+              router.push({ uri: 'pages/second' })
+            })
+          }.width('100%')
+        }
+        .scrollable(ScrollDirection.Vertical)
+        .scrollBar(BarState.On)
+        .scrollBarColor(Color.Gray)
+        .scrollBarWidth(30)
+        .onScroll((xOffset: number, yOffset: number) => {
+          console.info(xOffset + ' ' + yOffset)
+        })
+      }.width('100%').height('100%').backgroundColor(0xDCDCDC)
+    }
   }
 }
 

arkXtest/uitest/src/main/ets/TestAbility/app.ets

@@ -12,20 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from '@ohos/hypium'
-import testsuite from '../test/List.test'
 
 export default {
   onCreate() {
     console.info('Application onCreate')
-    var abilityDelegator: any
-    abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
-    var abilityDelegatorArguments: any
-    abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
-    console.info('start run testcase!!!')
-    abilityDelegatorArguments.parameters['timeout'] = 3000000
-    Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
   },
   onDestroy() {
     console.info('Application onDestroy')

arkXtest/uitest/src/main/ets/TestAbility/pages/fourth.ets

-/**
- * Copyright (c) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import router from '@system.router';
-
-@Entry
-@Component
-struct Fourth
-
-{
-  private content: string = "Fourth Page"
-
-  build() {
-    Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
-      Text(`${this.content}`)
-        .fontSize(50)
-        .fontWeight(FontWeight.Bold)
-      Button() {
-        Text('longClick')
-          .fontSize(20)
-          .fontWeight(FontWeight.Bold)
-      }.type(ButtonType.Capsule)
-      .margin({
-        top: 20
-      })
-      .backgroundColor('#0D9FFB')
-      .onClick(() => {
-        router.back()
-      })
-    }
-    .width('100%')
-    .height('100%')
-  }
-}
\ No newline at end of file

arkXtest/uitest/src/main/ets/TestAbility/pages/index.ets

@@ -22,72 +22,86 @@ struct ScrollExample {
   private arr: number[] = [1,2,3,4]
 
   build() {
-    Stack({ alignContent: Alignment.TopStart }) {
-      Scroll(this.scroller) {
-        Column() {
-          Button() {
-            Text('next page')
-              .fontSize(25)
-              .fontWeight(FontWeight.Bold)
-          }.key('my-key')
-          .type(ButtonType.Capsule)
-          .margin({ top: 20 })
-          .onClick(() => {
-            router.push({ uri: 'pages/second' })
-          })
-          .gesture(
-            LongPressGesture({repeat:false})
-              .onAction((event: GestureEvent)=>{
-                router.push({ uri: 'pages/fourth' })
+    Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
+      Text('MainPage')
+        .fontSize(50)
+        .fontWeight(FontWeight.Bold)
+      Stack({ alignContent: Alignment.TopStart }) {
+        Scroll(this.scroller) {
+          Column() {
+            Button() {
+              Text('next page')
+                .fontSize(25)
+                .fontWeight(FontWeight.Bold)
+            }
+            .key('my-key')
+            .type(ButtonType.Capsule)
+            .margin({ top: 20 })
+            .onClick(() => {
+              router.push({ uri: 'pages/second' })
             })
-          )
-          Button() {
-            Text('Click twice')
-              .fontSize(25)
-              .fontWeight(FontWeight.Bold)
-          }
-          .type(ButtonType.Capsule)
-          .margin({top:20})
             .gesture(
-              TapGesture({ count: 2 })
-               .onAction(() => {
-                 router.push({ uri: 'pages/third' })
-                 })
+            LongPressGesture({ repeat: false })
+              .onAction((event: GestureEvent) => {
+                router.push({ uri: 'pages/fourth' })
+              })
+            )
+
+            Button() {
+              Text('Click twice')
+                .fontSize(25)
+                .fontWeight(FontWeight.Bold)
+            }
+            .type(ButtonType.Capsule)
+            .margin({ top: 20 })
+            .gesture(
+            TapGesture({ count: 1 })
+              .onAction(() => {
+                router.push({ uri: 'pages/third' })
+              })
             )
-          Checkbox({name:'hi'})
-          .size({width:30,height:30})
-          TextInput({ placeholder: 'welcome', text: 'Hello World'})
-          .type(InputType.Normal)
-          .width(300)
-          .height(50)
-          .fontSize(40)
-          .enabled(true)
-          .margin({ top: 20 })
-          ForEach(this.arr, (item) => {
-            Text(item.toString())
-              .width('100%').height('30%').backgroundColor(0xFFFFFF)
-              .borderRadius(75).fontSize(80).textAlign(TextAlign.Center)
-              .margin({ top: 10 })
-          }, item => item)
-          Button() {
-            Text('bottom')
-              .fontSize(25)
-              .fontWeight(FontWeight.Bold)
-          }.type(ButtonType.Capsule)
-          .margin({
-            top: 20, left: 150
-          })
-          .onClick(() => {
-            router.push({ uri: 'pages/second' })
-          })
-        }.width('100%')
-      }
-      .scrollable(ScrollDirection.Vertical).scrollBar(BarState.On)
-      .scrollBarColor(Color.Gray).scrollBarWidth(30)
-      .onScroll((xOffset: number, yOffset: number) => {
-        console.info(xOffset + ' ' + yOffset)
-      })
-    }.width('100%').height('100%').backgroundColor(0xDCDCDC)
+
+            Checkbox({ name: 'hi' })
+              .size({ width: 30, height: 30 })
+            TextInput({ placeholder: 'welcome', text: 'Hello World' })
+              .type(InputType.Normal)
+              .width(300)
+              .height(50)
+              .fontSize(40)
+              .enabled(true)
+              .margin({ top: 20 })
+            ForEach(this.arr, (item) => {
+              Text(item.toString())
+                .width('100%')
+                .height('30%')
+                .backgroundColor(0xFFFFFF)
+                .borderRadius(75)
+                .fontSize(80)
+                .textAlign(TextAlign.Center)
+                .margin({ top: 10 })
+            }, item => item)
+            Button() {
+              Text('bottom')
+                .fontSize(25)
+                .fontWeight(FontWeight.Bold)
+            }.type(ButtonType.Capsule)
+            .margin({
+              top: 20, left: 150
+            })
+            .onClick(() => {
+              router.push({ uri: 'pages/second' })
+            })
+          }.width('100%')
+        }
+        .scrollable(ScrollDirection.Vertical)
+        .scrollBar(BarState.On)
+        .scrollBarColor(Color.Gray)
+        .scrollBarWidth(30)
+        .onScroll((xOffset: number, yOffset: number) => {
+          console.info(xOffset + ' ' + yOffset)
+        })
+      }.width('100%').height('100%').backgroundColor(0xDCDCDC)
+    }
   }
 }
 

arkXtest/uitest/src/main/ets/TestAbility/pages/second.ets

-/**
- * Copyright (c) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import router from '@system.router';
-
-@Entry
-@Component
-struct Second {
-  private content: string = "Second Page"
-
-  build() {
-    Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
-      Text(`${this.content}`)
-        .fontSize(50)
-        .fontWeight(FontWeight.Bold)
-      Button() {
-        Text('back to index')
-          .fontSize(20)
-          .fontWeight(FontWeight.Bold)
-      }.type(ButtonType.Capsule)
-      .margin({
-        top: 20
-      })
-      .backgroundColor('#0D9FFB')
-      .onClick(() => {
-        router.back()
-      })
-    }
-    .width('100%')
-    .height('100%')
-  }
-}
\ No newline at end of file

arkXtest/uitest/src/main/ets/TestAbility/pages/third.ets

-/**
- * Copyright (c) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import router from '@system.router';
-
-@Entry
-@Component
-struct Third{
-  private content: string = "Third Page"
-
-  build() {
-    Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
-      Text(`${this.content}`)
-        .fontSize(50)
-        .fontWeight(FontWeight.Bold)
-      Button() {
-        Text('doubleClick')
-          .fontSize(20)
-          .fontWeight(FontWeight.Bold)
-      }.type(ButtonType.Capsule)
-      .margin({
-        top: 20
-      })
-      .backgroundColor('#0D9FFB')
-      .onClick(() => {
-        router.back()
-      })
-    }
-    .width('100%')
-    .height('100%')
-  }
-}
\ No newline at end of file

arkXtest/uitest/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts

@@ -58,7 +58,7 @@ export default class OpenHarmonyTestRunner implements TestRunner {
             abilityName: testAbilityName,
             onAbilityCreate: onAbilityCreateCallback,
         };
-        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility'
+        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.MainAbility'
         abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
         var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
         cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)