!4697 Adapt to the new framework

Merge pull request !4697 from jiyong/local-20220729-0002

ability/ability_runtime/actscalltest/thirdcalltest/BUILD.gn

@@ -14,7 +14,7 @@
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("ActsThirdCallTest") {
-  hap_profile = "entry/src/main/module.json"
+  hap_profile = "./entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
     ":thirdcalltest_js_assets",
@@ -31,11 +31,11 @@ ohos_app_scope("thirdcalltest_app_profile") {
 }
 
 ohos_js_assets("thirdcalltest_js_assets") {
-  source_dir = "entry/src/main/ets"
+  source_dir = "./entry/src/main/ets"
 }
 
 ohos_resources("thirdcalltest_resources") {
-  sources = [ "entry/src/main/resources" ]
+  sources = [ "./entry/src/main/resources" ]
   deps = [ ":thirdcalltest_app_profile" ]
-  hap_profile = "entry/src/main/module.json"
+  hap_profile = "./entry/src/main/module.json"
 }

ability/ability_runtime/actscalltest/thirdcalltest/Test.json

 {
     "description": "Configuration for hjunit demo Tests",
     "driver": {
-        "type": "JSUnitTest",
+        "type": "OHJSUnitTest",
         "test-timeout": "100000",
-        "package": "com.example.thirdcalltest",
-        "shell-timeout": "60000"
+        "bundle-name": "com.example.thirdcalltest",
+        "module-name": "phone",
+        "shell-timeout": "60000",
+        "testcase-timeout": 100000
     },
     "kits": [
         {

ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/FifthAbility/FifthAbility.ts

@@ -94,7 +94,7 @@ export default class FifthAbility extends Ability {
     onWindowStageCreate(windowStage) {
         // Main window is created, set main page for this ability
         console.log("SystemCallTest FifthAbility onWindowStageCreate")
-        windowStage.setUIContent(this.context, "pages/second/second", null)
+        windowStage.setUIContent(this.context, "MainAbility/pages/second/second", null)
     }
 
     onWindowStageDestroy() {

ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/ForthAbility/ForthAbility.ts

@@ -94,7 +94,7 @@ export default class ForthAbility extends Ability {
     onWindowStageCreate(windowStage) {
         // Main window is created, set main page for this ability
         console.log("SystemCallTest ForthAbility onWindowStageCreate")
-        windowStage.setUIContent(this.context, "pages/second/second", null)
+        windowStage.setUIContent(this.context, "MainAbility/pages/second/second", null)
     }
 
     onWindowStageDestroy() {

ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/MainAbility/MainAbility.ts

@@ -31,7 +31,7 @@ export default class MainAbility extends Ability {
         // Main window is created, set main page for this ability
         console.log("ThirdCallTest MainAbility onWindowStageCreate")
         globalThis.abilityContext = this.context
-        windowStage.setUIContent(this.context, "pages/index/index", null)
+        windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null)
     }
 
     onWindowStageDestroy() {

ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/pages/index/index.ets → ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/MainAbility/pages/index/index.ets

@@ -12,10 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import file from '@system.file';
-
-import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index"
-import testsuite from "../../test/List.test.ets"
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
+import testsuite from '../../../test/List.test'
+import router from '@ohos.router';
 
 
 @Entry
@@ -24,22 +24,12 @@ struct Index {
 
   aboutToAppear(){
     console.info("start run testcase!!!!")
-    const core = Core.getInstance()
-    const expectExtend = new ExpectExtend({
-      'id': 'extend'
-    })
-    core.addService('expect', expectExtend)
-    const reportExtend = new ReportExtend(file)
-
-    core.addService('report', reportExtend)
-    core.init()
-    core.subscribeEvent('task', reportExtend)
-    const configService = core.getDefaultService('config')
-    console.info('parameters---->' + JSON.stringify(globalThis.abilityWant.parameters))
-    globalThis.abilityWant.parameters.timeout = 10000;
-    configService.setConfig(globalThis.abilityWant.parameters)
-    testsuite(globalThis.abilityContext)
-    core.execute()
+    var abilityDelegator: any
+    abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+    var abilityDelegatorArguments: any
+    abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+    console.info('start run testcase!!!')
+    Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
   }
 
   build() {

ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/SecondAbility/SecondAbility.ts

@@ -94,7 +94,7 @@ export default class SecondAbility extends Ability {
     onWindowStageCreate(windowStage) {
         // Main window is created, set main page for this ability
         console.log("SystemCallTest SecondAbility onWindowStageCreate")
-        windowStage.setUIContent(this.context, "pages/second/second", null)
+        windowStage.setUIContent(this.context, "MainAbility/pages/second/second", null)
     }
 
     onWindowStageDestroy() {

ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/TestAbility/TestAbility.ts

+/*
+ * Copyright (c) 2021 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 Ability from '@ohos.application.Ability'
+
+export default class TestAbility extends Ability {
+    onCreate(want, launchParam) {
+        console.log('TestAbility onCreate')
+    }
+
+    onDestroy() {
+        console.log('TestAbility onDestroy')
+    }
+
+    onWindowStageCreate(windowStage) {
+        console.log('TestAbility onWindowStageCreate')
+        windowStage.loadContent("TestAbility/pages/index", (err, data) => {
+            if (err.code) {
+                console.error('Failed to load the content. Cause:' + JSON.stringify(err));
+                return;
+            }
+            console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data))
+        });
+
+        globalThis.abilityContext = this.context;
+    }
+
+    onWindowStageDestroy() {
+        console.log('TestAbility onWindowStageDestroy')
+    }
+
+    onForeground() {
+        console.log('TestAbility onForeground')
+    }
+
+    onBackground() {
+        console.log('TestAbility onBackground')
+    }
+};
\ No newline at end of file

ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/TestAbility/pages/index.ets

+/*
+ * Copyright (c) 2021 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 '@ohos.router';
+
+@Entry
+@Component
+struct Index {
+  aboutToAppear() {
+    console.info('TestAbility index aboutToAppear')
+  }
+ @State message: string = 'Hello World'
+   build() {
+         Row() {
+           Column() {
+             Text(this.message)
+               .fontSize(50)
+               .fontWeight(FontWeight.Bold)
+             Button() {
+               Text('next page')
+                 .fontSize(20)
+                 .fontWeight(FontWeight.Bold)
+             }.type(ButtonType.Capsule)
+             .margin({
+               top: 20
+             })
+             .backgroundColor('#0D9FFB')
+             .width('35%')
+             .height('5%')
+             .onClick(()=>{
+             })
+           }
+             .width('100%')
+         }
+             .height('100%')
+   }
+ }
\ No newline at end of file

ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts

+/*
+ * Copyright (c) 2021 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 TestRunner from '@ohos.application.testRunner'
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+
+var abilityDelegator = undefined
+var abilityDelegatorArguments = undefined
+
+function translateParamsToString(parameters) {
+    const keySet = new Set([
+        '-s class', '-s notClass', '-s suite', '-s it',
+        '-s level', '-s testType', '-s size', '-s timeout',
+        '-s dryRun'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams = `${targetParams} ${key} ${parameters[key]}`
+        }
+    }
+    return targetParams.trim()
+}
+
+async function onAbilityCreateCallback() {
+    console.log("onAbilityCreateCallback");
+}
+
+async function addAbilityMonitorCallback(err: any) {
+    console.info("addAbilityMonitorCallback : " + JSON.stringify(err))
+}
+
+export default class OpenHarmonyTestRunner implements TestRunner {
+    constructor() {
+    }
+
+    onPrepare() {
+        console.info("OpenHarmonyTestRunner OnPrepare ")
+    }
+
+    async onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility'
+        let lMonitor = {
+            abilityName: testAbilityName,
+            onAbilityCreate: onAbilityCreateCallback,
+        };
+        abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
+        var cmd = 'aa start -d 0 -a com.example.thirdcalltest.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
+        var debug = abilityDelegatorArguments.parameters["-D"]
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        console.info('cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd,
+            (err: any, d: any) => {
+                console.info('executeShellCommand : err : ' + JSON.stringify(err));
+                console.info('executeShellCommand : data : ' + d.stdResult);
+                console.info('executeShellCommand : data : ' + d.exitCode);
+            })
+        console.info('OpenHarmonyTestRunner onRun end')
+    }
+};
\ No newline at end of file

ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/ThirdAbility/ThirdAbility.ts

@@ -94,7 +94,7 @@ export default class ThirdAbility extends Ability {
     onWindowStageCreate(windowStage) {
         // Main window is created, set main page for this ability
         console.log("SystemCallTest ThirdAbility onWindowStageCreate")
-        windowStage.setUIContent(this.context, "pages/second/second", null)
+        windowStage.setUIContent(this.context, "MainAbility/pages/second/second", null)
     }
 
     onWindowStageDestroy() {

ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/test/Ability.test.ets

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "deccjsunit/index"
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "@ohos/hypium"
 import commonEvent from '@ohos.commonEvent'
 
 const MAX_MISSION_NUM = 1024;
@@ -73,7 +73,7 @@ function delay(time) {
   for (let start = Date.now(); Date.now() - start <= delta; );
 }
 
-export default function abilityTest(abilityContext) {
+export default function abilityTest() {
   describe('ActsAbilityTest', function () {
 
     beforeEach(async (done) => {

ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/test/List.test.ets

@@ -15,8 +15,8 @@
 import abilityTest from './Ability.test.ets'
 
 
-export default function testsuite(context) {
+export default function testsuite() {
 
-  abilityTest(context)
+  abilityTest()
 
 }
\ No newline at end of file

ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/resources/base/profile/main_pages.json

 {
     "src": [
-        "pages/index/index",
-        "pages/second/second"
+        "MainAbility/pages/index/index",
+        "MainAbility/pages/second/second"
     ]
 }
\ No newline at end of file

ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/BUILD.gn

@@ -14,7 +14,7 @@
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("ActsAmsUsersSystemTest") {
-  hap_profile = "entry/src/main/module.json"
+  hap_profile = "./entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
     ":actsamsuserssystemtest_js_assets",
@@ -31,11 +31,11 @@ ohos_app_scope("actsamsuserssystemtest_app_profile") {
 }
 
 ohos_js_assets("actsamsuserssystemtest_js_assets") {
-  source_dir = "entry/src/main/ets"
+  source_dir = "./entry/src/main/ets"
 }
 
 ohos_resources("actsamsuserssystemtest_resources") {
-  sources = [ "entry/src/main/resources" ]
+  sources = [ "./entry/src/main/resources" ]
   deps = [ ":actsamsuserssystemtest_app_profile" ]
-  hap_profile = "entry/src/main/module.json"
+  hap_profile = "./entry/src/main/module.json"
 }

ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/Test.json

 {
     "description": "Configuration for hjunit demo Tests",
     "driver": {
-        "type": "JSUnitTest",
+        "type": "OHJSUnitTest",
         "test-timeout": "300000",
-        "package": "com.acts.actsinterfacemultiuserstest",
-        "shell-timeout": "300000"
+        "bundle-name": "com.acts.actsinterfacemultiuserstest",
+        "module-name":"phone",
+        "shell-timeout": "300000",
+        "testcase-timeout": 300000
     },
     "kits": [
         {

ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility/MainAbility.ts

@@ -30,7 +30,7 @@ export default class MainAbility extends Ability {
         // Main window is created, set main page for this ability
         console.log("MainAbility onWindowStageCreate")
         globalThis.abilityContext = this.context
-        windowStage.setUIContent(this.context, "pages/index/index", null)
+        windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null)
     }
 
     onWindowStageDestroy() {

ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/pages/index/index.ets → ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility/pages/index/index.ets

@@ -12,31 +12,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import file from '@system.file';
-import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index"
-import testsuite from "../../test/List.test.ets"
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
+import testsuite from '../../../test/List.test'
+import router from '@ohos.router'
+
 @Entry
 @Component
 struct Index {
   aboutToAppear() {
     console.info("start run testcase!!!!")
-    const core = Core.getInstance()
-    const expectExtend = new ExpectExtend({
-      'id': 'extend'
-    })
-    core.addService('expect', expectExtend)
-    const reportExtend = new ReportExtend(file)
+    var abilityDelegator: any
+    abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+    var abilityDelegatorArguments: any
+    abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+    console.info('start run testcase!!!')
+    Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
 
-    core.addService('report', reportExtend)
-    core.init()
-    core.subscribeEvent('task', reportExtend)
-    console.info("subscribeEvent run !!!!")
-    const configService = core.getDefaultService('config')
-    globalThis.abilityWant.parameters['timeout'] = 20000
-    console.info('parameters---->' + JSON.stringify(globalThis.abilityWant.parameters))
-    configService.setConfig(globalThis.abilityWant.parameters)
-    testsuite(globalThis.abilityContext)
-    core.execute()
   }
   build() {
     Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {

ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility2/MainAbility2.ts

@@ -41,7 +41,7 @@ export default class MainAbility2 extends Ability {
         // Main window is created, set main page for this ability
         console.log("MainAbility2 onWindowStageCreate")
         globalThis.abilityContext = this.context
-        windowStage.setUIContent(this.context, "pages/index/second", null)
+        windowStage.setUIContent(this.context, "MainAbility/pages/index/second", null)
         commonEvent.publish("ACTS_InterfaceMultiUsers_0100_Start_CommonEvent", PublishCallBackOne);
     }
 

ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility3/MainAbility3.ts

@@ -29,7 +29,7 @@ export default class MainAbility3 extends Ability {
         // Main window is created, set main page for this ability
         console.log("MainAbility3 onWindowStageCreate")
         globalThis.abilityContext = this.context
-        windowStage.setUIContent(this.context, "pages/index/second", null)
+        windowStage.setUIContent(this.context, "MainAbility/pages/index/second", null)
         globalThis.abilityContext.terminateSelfWithResult(
           {
             resultCode:1,

ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/TestAbility/TestAbility.ts

+/*
+ * 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 Ability from '@ohos.application.Ability'
+
+export default class TestAbility extends Ability {
+    onCreate(want, launchParam) {
+        console.log('TestAbility onCreate')
+    }
+
+    onDestroy() {
+        console.log('TestAbility onDestroy')
+    }
+
+    onWindowStageCreate(windowStage) {
+        console.log('TestAbility onWindowStageCreate')
+        windowStage.loadContent("TestAbility/pages/index", (err, data) => {
+            if (err.code) {
+                console.error('Failed to load the content. Cause:' + JSON.stringify(err));
+                return;
+            }
+            console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data))
+        });
+
+        globalThis.abilityContext = this.context;
+    }
+
+    onWindowStageDestroy() {
+        console.log('TestAbility onWindowStageDestroy')
+    }
+
+    onForeground() {
+        console.log('TestAbility onForeground')
+    }
+
+    onBackground() {
+        console.log('TestAbility onBackground')
+    }
+};
\ No newline at end of file

ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/TestAbility/pages/index.ets

+/*
+ * Copyright (c) 2021 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 '@ohos.router';
+
+@Entry
+@Component
+struct Index {
+  aboutToAppear() {
+    console.info('TestAbility index aboutToAppear')
+  }
+ @State message: string = 'Hello World'
+   build() {
+         Row() {
+           Column() {
+             Text(this.message)
+               .fontSize(50)
+               .fontWeight(FontWeight.Bold)
+             Button() {
+               Text('next page')
+                 .fontSize(20)
+                 .fontWeight(FontWeight.Bold)
+             }.type(ButtonType.Capsule)
+             .margin({
+               top: 20
+             })
+             .backgroundColor('#0D9FFB')
+             .width('35%')
+             .height('5%')
+             .onClick(()=>{
+             })
+           }
+             .width('100%')
+         }
+             .height('100%')
+   }
+ }
\ No newline at end of file

ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts

+/*
+ * 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 TestRunner from '@ohos.application.testRunner'
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+
+var abilityDelegator = undefined
+var abilityDelegatorArguments = undefined
+
+function translateParamsToString(parameters) {
+    const keySet = new Set([
+        '-s class', '-s notClass', '-s suite', '-s it',
+        '-s level', '-s testType', '-s size', '-s timeout',
+        '-s dryRun'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams = `${targetParams} ${key} ${parameters[key]}`
+        }
+    }
+    return targetParams.trim()
+}
+
+async function onAbilityCreateCallback() {
+    console.log("onAbilityCreateCallback");
+}
+
+async function addAbilityMonitorCallback(err: any) {
+    console.info("addAbilityMonitorCallback : " + JSON.stringify(err))
+}
+
+export default class OpenHarmonyTestRunner implements TestRunner {
+    constructor() {
+    }
+
+    onPrepare() {
+        console.info("OpenHarmonyTestRunner OnPrepare ")
+    }
+
+    async onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility'
+        let lMonitor = {
+            abilityName: testAbilityName,
+            onAbilityCreate: onAbilityCreateCallback,
+        };
+        abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
+        var cmd = 'aa start -d 0 -a com.acts.actsinterfacemultiuserstest.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
+        var debug = abilityDelegatorArguments.parameters["-D"]
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        console.info('cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd,
+            (err: any, d: any) => {
+                console.info('executeShellCommand : err : ' + JSON.stringify(err));
+                console.info('executeShellCommand : data : ' + d.stdResult);
+                console.info('executeShellCommand : data : ' + d.exitCode);
+            })
+        console.info('OpenHarmonyTestRunner onRun end')
+    }
+};
\ No newline at end of file

ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/test/Ability.test.ets

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "deccjsunit/index"
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "@ohos/hypium"
 import commonEvent from '@ohos.commonEvent'
 import appManager from '@ohos.application.appManager'
 import osaccount from '@ohos.account.osAccount'
@@ -26,7 +26,7 @@ var subscriberInfo_killprocess ={
 var osAccountManager
 const START_ABILITY_TIMEOUT = 10000;
 console.debug("====>in Ability.test====>");
-export default function abilityTest(abilityContext) {
+export default function abilityTest() {
   console.debug("====>in function abilityTest====>");
   describe('ActsInterfaceMultiUsersTest', function () {
     // afterAll(function() {
@@ -64,7 +64,7 @@ export default function abilityTest(abilityContext) {
           Subscriber = data;
           commonEvent.subscribe(Subscriber, SubscribeCallBack);
           console.debug("====>start startAbility====>");
-          await abilityContext.startAbility(
+          await globalThis.abilityContext.startAbility(
             {
               bundleName: 'com.acts.actsinterfacemultiuserstest',
               abilityName: 'com.acts.actsinterfacemultiuserstest.MainAbility2'
@@ -115,7 +115,7 @@ export default function abilityTest(abilityContext) {
           Subscriber = data;
           commonEvent.subscribe(Subscriber, SubscribeCallBack);
           console.debug("====>start startAbility====>");
-          await abilityContext.startAbility(
+          await globalThis.abilityContext.startAbility(
             {
               bundleName: 'com.acts.error',
               abilityName: 'com.acts.error.MainAbility2'
@@ -165,7 +165,7 @@ export default function abilityTest(abilityContext) {
           Subscriber = data;
           commonEvent.subscribe(Subscriber, SubscribeCallBack);
           console.debug("====>start startAbility====>");
-          abilityContext.startAbility(
+          globalThis.abilityContext.startAbility(
             {
               bundleName: 'com.acts.actsinterfacemultiuserstest',
               abilityName: 'com.acts.actsinterfacemultiuserstest.MainAbility2'
@@ -217,7 +217,7 @@ export default function abilityTest(abilityContext) {
           commonEvent.subscribe(Subscriber, SubscribeCallBack);
         })
         console.debug("====>start startAbility====>");
-        await abilityContext.startAbility(
+        await globalThis.abilityContext.startAbility(
           {
             bundleName: 'com.acts.error',
             abilityName: 'com.acts.error.MainAbility2'
@@ -266,7 +266,7 @@ export default function abilityTest(abilityContext) {
           Subscriber = data;
           commonEvent.subscribe(Subscriber, SubscribeCallBack);
           console.debug("====>start startAbility====>");
-          await abilityContext.startAbility(
+          await globalThis.abilityContext.startAbility(
             {
               bundleName: 'com.acts.actsinterfacemultiuserstest',
               abilityName: 'com.acts.actsinterfacemultiuserstest.MainAbility2'
@@ -315,7 +315,7 @@ export default function abilityTest(abilityContext) {
           Subscriber = data;
           commonEvent.subscribe(Subscriber, SubscribeCallBack);
           console.debug("====>start startAbility====>");
-          await abilityContext.startAbility(
+          await globalThis.abilityContext.startAbility(
             {
               bundleName: 'com.acts.error',
               abilityName: 'com.acts.error.MainAbility2'
@@ -363,7 +363,7 @@ export default function abilityTest(abilityContext) {
           Subscriber = data;
           commonEvent.subscribe(Subscriber, SubscribeCallBack);
           console.debug("====>start startAbility====>");
-          abilityContext.startAbility(
+          globalThis.abilityContext.startAbility(
             {
               bundleName: 'com.acts.actsinterfacemultiuserstest',
               abilityName: 'com.acts.actsinterfacemultiuserstest.MainAbility2'
@@ -413,7 +413,7 @@ export default function abilityTest(abilityContext) {
           commonEvent.subscribe(Subscriber, SubscribeCallBack);
         })
         console.debug("====>start startAbility====>");
-        await abilityContext.startAbility(
+        await globalThis.abilityContext.startAbility(
           {
             bundleName: 'com.acts.error',
             abilityName: 'com.acts.error.MainAbility2'
@@ -461,7 +461,7 @@ export default function abilityTest(abilityContext) {
           Subscriber = data;
           commonEvent.subscribe(Subscriber, SubscribeCallBack);
           console.debug("====>start startAbility====>");
-          await abilityContext.startAbility(
+          await globalThis.abilityContext.startAbility(
             {
               bundleName: 'com.example.userservicesystemapi7',
               abilityName: 'com.example.userservicesystemapi7.ServiceAbility'
@@ -512,7 +512,7 @@ export default function abilityTest(abilityContext) {
           Subscriber = data;
           commonEvent.subscribe(Subscriber, SubscribeCallBack);
           console.debug("====>start startAbility====>");
-          await abilityContext.startAbility(
+          await globalThis.abilityContext.startAbility(
             {
               bundleName: 'com.example.userservicesystemapi7',
               abilityName: 'com.example.userservicesystemapi7.ServiceAbility'
@@ -556,7 +556,7 @@ export default function abilityTest(abilityContext) {
       }
       setTimeout(timeout, START_ABILITY_TIMEOUT);
       console.debug("====>start startAbilityForResult====>");
-      await abilityContext.startAbilityForResult(
+      await globalThis.abilityContext.startAbilityForResult(
         {
           bundleName: 'com.acts.actsinterfacemultiuserstest',
           abilityName: 'com.acts.actsinterfacemultiuserstest.MainAbility3',
@@ -584,7 +584,7 @@ export default function abilityTest(abilityContext) {
       }
       setTimeout(timeout, START_ABILITY_TIMEOUT);
       console.debug("====>start startAbilityForResult====>");
-      await abilityContext.startAbilityForResult(
+      await globalThis.abilityContext.startAbilityForResult(
         {
           bundleName: 'com.acts.error',
           abilityName: 'com.acts.error.MainAbility3',
@@ -615,7 +615,7 @@ export default function abilityTest(abilityContext) {
       }
       setTimeout(timeout, START_ABILITY_TIMEOUT);
       console.debug("====>start startAbilityForResult====>");
-      await abilityContext.startAbilityForResult(
+      await globalThis.abilityContext.startAbilityForResult(
         {
           bundleName: 'com.acts.actsinterfacemultiuserstest',
           abilityName: 'com.acts.actsinterfacemultiuserstest.MainAbility3',
@@ -642,7 +642,7 @@ export default function abilityTest(abilityContext) {
       }
       setTimeout(timeout, START_ABILITY_TIMEOUT);
       console.debug("====>start startAbilityForResult====>");
-      await abilityContext.startAbilityForResult(
+      await globalThis.abilityContext.startAbilityForResult(
         {
           bundleName: 'com.acts.error',
           abilityName: 'com.acts.error.MainAbility3',
@@ -673,7 +673,7 @@ export default function abilityTest(abilityContext) {
       }
       setTimeout(timeout, START_ABILITY_TIMEOUT);
       console.debug("====>start startAbilityForResult====>");
-      await abilityContext.startAbilityForResult(
+      await globalThis.abilityContext.startAbilityForResult(
         {
           bundleName: 'com.acts.actsinterfacemultiuserstest',
           abilityName: 'com.acts.actsinterfacemultiuserstest.MainAbility3',
@@ -699,7 +699,7 @@ export default function abilityTest(abilityContext) {
       }
       setTimeout(timeout, START_ABILITY_TIMEOUT);
       console.debug("====>start startAbilityForResult====>");
-      await abilityContext.startAbilityForResult(
+      await globalThis.abilityContext.startAbilityForResult(
         {
           bundleName: 'com.acts.error',
           abilityName: 'com.acts.error.MainAbility3',
@@ -728,7 +728,7 @@ export default function abilityTest(abilityContext) {
       }
       setTimeout(timeout, START_ABILITY_TIMEOUT);
       console.debug("====>start startAbilityForResult====>");
-      await abilityContext.startAbilityForResult(
+      await globalThis.abilityContext.startAbilityForResult(
         {
           bundleName: 'com.acts.actsinterfacemultiuserstest',
           abilityName: 'com.acts.actsinterfacemultiuserstest.MainAbility3',
@@ -753,7 +753,7 @@ export default function abilityTest(abilityContext) {
       }
       setTimeout(timeout, START_ABILITY_TIMEOUT);
       console.debug("====>start startAbilityForResult====>");
-      await abilityContext.startAbilityForResult(
+      await globalThis.abilityContext.startAbilityForResult(
         {
           bundleName: 'com.acts.error',
           abilityName: 'com.acts.error.MainAbility3',
@@ -792,7 +792,7 @@ export default function abilityTest(abilityContext) {
           Subscriber = data;
           commonEvent.subscribe(Subscriber, SubscribeCallBack);
           console.debug("====>start startAbility====>");
-          await abilityContext.startAbility(
+          await globalThis.abilityContext.startAbility(
             {
               bundleName: 'com.acts.actsinterfacemultiuserstest',
               abilityName: 'com.acts.actsinterfacemultiuserstest.MainAbility2'
@@ -841,7 +841,7 @@ export default function abilityTest(abilityContext) {
           Subscriber = data;
           commonEvent.subscribe(Subscriber, SubscribeCallBack);
           console.debug("====>start startAbility====>");
-          await abilityContext.startAbility(
+          await globalThis.abilityContext.startAbility(
             {
               bundleName: 'com.acts.error',
               abilityName: 'com.acts.error.MainAbility2'
@@ -892,7 +892,7 @@ export default function abilityTest(abilityContext) {
           Subscriber = data;
           commonEvent.subscribe(Subscriber, SubscribeCallBack);
           console.debug("====>start startAbility====>");
-          abilityContext.startAbility(
+          globalThis.abilityContext.startAbility(
             {
               bundleName: 'com.acts.actsinterfacemultiuserstest',
               abilityName: 'com.acts.actsinterfacemultiuserstest.MainAbility2'
@@ -941,7 +941,7 @@ export default function abilityTest(abilityContext) {
           Subscriber = data;
           commonEvent.subscribe(Subscriber, SubscribeCallBack);
           console.debug("====>start startAbility====>");
-          await abilityContext.startAbility(
+          await globalThis.abilityContext.startAbility(
             {
               bundleName: 'com.acts.error',
               abilityName: 'com.acts.error.MainAbility2'
@@ -982,7 +982,7 @@ export default function abilityTest(abilityContext) {
       }
       setTimeout(timeout, START_ABILITY_TIMEOUT);
       console.debug("====>start startAbilityForResult====>");
-      await abilityContext.startAbilityForResult(
+      await globalThis.abilityContext.startAbilityForResult(
         {
           bundleName: 'com.acts.actsinterfacemultiuserstest',
           abilityName: 'com.acts.actsinterfacemultiuserstest.MainAbility3',
@@ -1008,7 +1008,7 @@ export default function abilityTest(abilityContext) {
       }
       setTimeout(timeout, START_ABILITY_TIMEOUT);
       console.debug("====>start startAbilityForResult====>");
-      await abilityContext.startAbilityForResult(
+      await globalThis.abilityContext.startAbilityForResult(
         {
           bundleName: 'com.acts.error',
           abilityName: 'com.acts.error.MainAbility3',
@@ -1037,7 +1037,7 @@ export default function abilityTest(abilityContext) {
       }
       setTimeout(timeout, START_ABILITY_TIMEOUT);
       console.debug("====>start startAbilityForResult====>");
-      await abilityContext.startAbilityForResult(
+      await globalThis.abilityContext.startAbilityForResult(
         {
           bundleName: 'com.acts.actsinterfacemultiuserstest',
           abilityName: 'com.acts.actsinterfacemultiuserstest.MainAbility3',
@@ -1062,7 +1062,7 @@ export default function abilityTest(abilityContext) {
       }
       setTimeout(timeout, START_ABILITY_TIMEOUT);
       console.debug("====>start startAbilityForResult====>");
-      await abilityContext.startAbilityForResult(
+      await globalThis.abilityContext.startAbilityForResult(
         {
           bundleName: 'com.acts.error',
           abilityName: 'com.acts.error.MainAbility3',
@@ -1123,7 +1123,7 @@ export default function abilityTest(abilityContext) {
           Subscriber = data;
           commonEvent.subscribe(Subscriber, SubscribeCallBack);
           console.debug("====>start startAbility====>");
-          await abilityContext.startAbility(
+          await globalThis.abilityContext.startAbility(
             {
               bundleName: 'com.acts.killprocesshap',
               abilityName: 'com.acts.killprocesshap.MainAbility'
@@ -1198,7 +1198,7 @@ export default function abilityTest(abilityContext) {
           Subscriber = data;
           commonEvent.subscribe(Subscriber, SubscribeCallBack);
           console.debug("====>start startAbility====>");
-          await abilityContext.startAbility(
+          await globalThis.abilityContext.startAbility(
             {
               bundleName: 'com.acts.killprocesshap',
               abilityName: 'com.acts.killprocesshap.MainAbility'
@@ -1232,7 +1232,7 @@ export default function abilityTest(abilityContext) {
      */
     it('ACTS_ThirdPartyKillProcess_0100', 0, async function (done) {
       console.debug("====>start startAbility====>");
-      await abilityContext.startAbility(
+      await globalThis.abilityContext.startAbility(
         {
           bundleName: 'com.acts.killprocessthirdhap',
           abilityName: 'com.acts.killprocessthirdhap.MainAbility'
@@ -1278,7 +1278,7 @@ export default function abilityTest(abilityContext) {
      */
     it('ACTS_ThirdPartyKillProcess_0200', 0, async function (done) {
       console.debug("====>start startAbility====>");
-      await abilityContext.startAbility(
+      await globalThis.abilityContext.startAbility(
         {
           bundleName: 'com.acts.killprocessthirdhap2',
           abilityName: 'com.acts.killprocessthirdhap2.MainAbility'

ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/test/List.test.ets

@@ -14,7 +14,7 @@
  */
 import abilityTest from './Ability.test.ets'
 
-export default function testsuite(context) {
+export default function testsuite() {
   console.debug("====>in list.test====>");
-  abilityTest(context)
+  abilityTest()
 }
\ No newline at end of file

ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/resources/base/profile/main_pages.json

 {
     "src": [
-        "pages/index/index",
-        "pages/second/second"
+        "MainAbility/pages/index/index",
+        "MainAbility/pages/second/second"
     ]
 }
\ No newline at end of file