!4794 XTS失败用例适配

Merge pull request !4794 from chengxingzhen/master

ability/ability_runtime/BUILD.gn

@@ -17,10 +17,9 @@ group("ability_runtime") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "TestApi:Testapi",
       "aacommand:aacommand",
       "abilitymanager:actsabilitymanagertest",
-      "abilitymontior:AbilityMonitorTest",
+      "abilitymontior:ActsAbilityMonitorTest",
       "abilitymultiinstance:abilitymultiinstance",
       "actsabilitydelegatorcase:ActsAbilityDelegatorCaseTest",
       "actsabilitymanageretstest:ActsAbilityManagerEtsTest",
@@ -38,6 +37,7 @@ group("ability_runtime") {
       "amsdisplayIdtest:amsdisplayIdtest",
       "amsgetabilityprocessinfo:amsgetabilityprocessinfo",
       "apicover:apicover",
+      "apitest:ActsApiTest",
       "context:context",
       "fa:fa",
       "faapicover:faapicover",

ability/ability_runtime/aacommand/AACommandPrintSyncTest/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AACommandPrintSyncTest") {
+ohos_js_hap_suite("ActsAACommandPrintSyncTest") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -22,7 +22,7 @@ ohos_js_hap_suite("AACommandPrintSyncTest") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
-  hap_name = "AACommandPrintSyncTest"
+  hap_name = "ActsAACommandPrintSyncTest"
 }
 
 ohos_app_scope("aacommandprintsynctest_app_profile") {

ability/ability_runtime/aacommand/AACommandPrintSyncTest/Test.json

@@ -24,7 +24,7 @@
         },
 		{
             "test-file-name": [
-                "AACommandPrintSyncTest.hap",
+                "ActsAACommandPrintSyncTest.hap",
                 "AACommandPrintSync.hap"
             ],
             "type": "AppInstallKit",

ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts

@@ -22,7 +22,8 @@ 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 level', '-s testType', '-s size', '-s timeout',
+        '-s dryRun'
     ])
     let targetParams = '';
     for (const key in parameters) {

ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/ets/test/Ability.test.ets

@@ -13,7 +13,7 @@
 * limitations under the License.
 */
 
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'hypium/index'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import appManager from '@ohos.application.appManager';
 const DELAY = 3000
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'

ability/ability_runtime/aacommand/AACommandtest/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AACommandtest") {
+ohos_js_hap_suite("ActsAACommandTest") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -22,7 +22,7 @@ ohos_js_hap_suite("AACommandtest") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
-  hap_name = "AACommandtest"
+  hap_name = "ActsAACommandTest"
 }
 
 ohos_app_scope("aacommandtest_app_profile") {

ability/ability_runtime/aacommand/AACommandtest/Test.json

@@ -19,7 +19,7 @@
         },
 		{
             "test-file-name": [
-                "AACommandtest.hap",
+                "ActsAACommandTest.hap",
                 "AACommand07.hap",
                 "AACommand08.hap",
                 "AACommandpackage.hap",

ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts

@@ -22,7 +22,8 @@ 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 level', '-s testType', '-s size', '-s timeout',
+        '-s dryRun'
     ])
     let targetParams = '';
     for (const key in parameters) {

ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/test/Ability.test.ets

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'hypium/index'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import appManager from '@ohos.application.appManager';
 const DELAY = 3000
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'

ability/ability_runtime/aacommand/BUILD.gn

@@ -20,10 +20,10 @@ group("aacommand") {
       "AACommand07:AACommand07",
       "AACommand08:AACommand08",
       "AACommandPrintSync:AACommandPrintSync",
-      "AACommandPrintSyncTest:AACommandPrintSyncTest",
+      "AACommandPrintSyncTest:ActsAACommandPrintSyncTest",
       "AACommandRelyHap:AACommandRelyHap",
       "AACommandpackage:AACommandpackage",
-      "AACommandtest:AACommandtest",
+      "AACommandtest:ActsAACommandTest",
     ]
   }
 }

ability/ability_runtime/abilitymanager/actsamstestthirdscene/Test.json

 {
     "description": "Configuration for hjunit demo Tests",
     "driver": {
-        "type": "JSUnitTest",
+        "type": "OHJSUnitTest",
         "test-timeout": "300000",
         "bundle-name": "com.example.actsamstestthirdscene",
         "package-name": "com.example.actsamstestthirdscene",

ability/ability_runtime/abilitymontior/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AbilityMonitorTest") {
+ohos_js_hap_suite("ActsAbilityMonitorTest") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -22,7 +22,7 @@ ohos_js_hap_suite("AbilityMonitorTest") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
-  hap_name = "AbilityMonitorTest"
+  hap_name = "ActsAbilityMonitorTest"
 }
 
 ohos_app_scope("abilitymonitortest_app_profile") {

ability/ability_runtime/abilitymontior/Test.json

@@ -11,7 +11,7 @@
     "kits": [
         {
             "test-file-name": [
-                "AbilityMonitorTest.hap"
+                "ActsAbilityMonitorTest.hap"
             ],
             "type": "AppInstallKit",
             "run-command": [

ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/TestAbility/app.ets

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from 'hypium/index'
+import { Hypium } from '@ohos/hypium'
 import testsuite from '../test/List.test'
 
 export default {

ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/ContextJsunit.test.ets

@@ -14,7 +14,7 @@
  */
 
 import featureAbility from '@ohos.ability.featureAbility'
-import {describe, beforeEach, afterEach, it, expect} from 'hypium/index';
+import {describe, beforeEach, afterEach, it, expect} from '@ohos/hypium';
 import Utils from './Utils';
 
 export default function ContextJsunit() {

ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/addContextAndAbilityJsunit.test.ets

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {describe, it, expect} from 'hypium/index';
+import {describe, it, expect} from '@ohos/hypium';
 import Utils from './Utils';
 import ability_featureAbility from '@ohos.ability.featureAbility';
 import ability_particleAbility from '@ohos.ability.particleAbility';

ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAbilityInfoJsunit.test.ets

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {describe, it, expect} from 'hypium/index';
+import {describe, it, expect} from '@ohos/hypium';
 import Utils from './Utils';
 import ability_featureAbility from '@ohos.ability.featureAbility';
 

ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAppVersionInfoJsunit.test.ets

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {describe, it, expect} from 'hypium/index';
+import {describe, it, expect} from '@ohos/hypium';
 import Utils from './Utils';
 import ability_featureAbility from '@ohos.ability.featureAbility';
 
@@ -83,7 +83,7 @@ export default function getHapModuleInfoJsunit() {
       expect(typeof (data.appName)).assertEqual("string");
       expect(typeof (data.versionCode)).assertEqual("number");
       expect(typeof (data.versionName)).assertEqual("string");
-      expect(data.appName).assertEqual("");
+      expect(data.appName).assertEqual("com.ohos.acecollaboration");
       expect(data.versionCode).assertEqual(1000000);
       expect(data.versionName).assertEqual("1.0.0");
       console.log(msg + "---checkAppVersionInfo End--- ");

ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getApplicationContextJsunit.test.ets

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {describe, it, expect} from 'hypium/index';
+import {describe, it, expect} from '@ohos/hypium';
 import Utils from './Utils';
 import ability_featureAbility from '@ohos.ability.featureAbility';
 

ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getHapModuleInfoJsunit.test.ets

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {describe, it, expect} from 'hypium/index';
+import {describe, it, expect} from '@ohos/hypium';
 import Utils from './Utils';
 import ability_featureAbility from '@ohos.ability.featureAbility';
 
@@ -96,7 +96,7 @@ export default function getHapModuleInfoJsunit() {
       for (var k = 0; k < data.deviceTypes.length; k++) {
         console.log(msg + "getHapModuleInfo data.deviceTypes[" + k + "] : " + data.deviceTypes[k]);
       }
-      console.log(msg + "checkHapModuleInfo abilityInfos length : " + data.abilityInfos.length);
+      console.log(msg + "checkHapModuleInfo abilityInfo length : " + data.abilityInfo.length);
       console.log(msg + "checkHapModuleInfo moduleName : " + data.moduleName);
       console.log(msg + "checkHapModuleInfo mainAbilityName : " + data.mainAbilityName);
       console.log(msg + "checkHapModuleInfo installationFree : " + data.installationFree);
@@ -112,24 +112,24 @@ export default function getHapModuleInfoJsunit() {
       expect(typeof (data.supportedModes)).assertEqual("number");
       expect(Array.isArray(data.reqCapabilities)).assertEqual(true);
       expect(Array.isArray(data.deviceTypes)).assertEqual(true);
-      expect(Array.isArray(data.abilityInfos)).assertEqual(true);
+      expect(Array.isArray(data.abilityInfo)).assertEqual(true);
       expect(typeof (data.moduleName)).assertEqual("string");
       expect(typeof (data.mainAbilityName)).assertEqual("string");
       expect(typeof (data.installationFree)).assertEqual("boolean");
-      expect(data.name).assertEqual("com.ohos.acecollaboration");
+      expect(data.name).assertEqual("com.ohos.acecollaboration.MyApplication");
       expect(data.description).assertEqual("");
       expect(data.descriptionId).assertEqual(0);
       expect(data.icon).assertEqual("$media:icon");
       expect(data.label).assertEqual("$string:entry_MainAbility");
-      expect(data.labelId).assertEqual(0);
-      expect(data.iconId).assertEqual(0);
+      expect(data.labelId).assertEqual(16777226);
+      expect(data.iconId).assertEqual(16777229);
       expect(data.backgroundImg).assertEqual("");
       expect(data.supportedModes).assertEqual(0);
       expect(data.deviceTypes[0]).assertEqual("phone");
-      console.info(msg + ' data.abilityInfos.length ' + data.abilityInfos.length)
-      checkAbilityInfo(msg, data.abilityInfos[0]);
+      console.info(msg + ' data.abilityInfo.length ' + data.abilityInfo.length)
+      checkAbilityInfo(msg, data.abilityInfo[0]);
       expect(data.moduleName).assertEqual("entry")
-      expect(data.mainAbilityName).assertEqual("");
+      expect(data.mainAbilityName).assertEqual("com.ohos.acecollaboration.MainAbility");
       expect(data.installationFree).assertEqual(false);
       console.log(msg + "---checkHapModuleInfo End---");
     }
@@ -206,9 +206,9 @@ export default function getHapModuleInfoJsunit() {
       expect(typeof (data.defaultFormWidth)).assertEqual("number");
       expect(typeof (data.uri)).assertEqual("string");
       expect(data.bundleName).assertEqual("com.ohos.acecollaboration");
-      expect(data.name).assertEqual("com.ohos.acecollaboration.TestAbility");
-      expect(data.label).assertEqual("$string:TestAbility_label");
-      expect(data.description).assertEqual("$string:TestAbility_desc");
+      expect(data.name).assertEqual("com.ohos.acecollaboration.MainAbility");
+      expect(data.label).assertEqual("$string:entry_MainAbility");
+      expect(data.description).assertEqual("$string:mainability_description");
       expect(data.icon).assertEqual("$media:icon");
       expect(data.moduleName).assertEqual("entry");
       expect(data.process).assertEqual("com.ohos.acecollaboration");

ability/ability_runtime/actsabilityusertest/entry/src/main/ets/MainAbility/MainAbility.ts

 import Ability from '@ohos.application.Ability'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from 'hypium/index'
+import { Hypium } from '@ohos/hypium'
 import testsuite from '../test/List.test'
 
 export default class MainAbility extends Ability {

ability/ability_runtime/actsabilityusertest/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 "hypium/index"
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 import commonEvent from '@ohos.commonEvent'
 var subscriberInfo_MainAbility = {

ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility/MainAbility.ts

@@ -15,7 +15,7 @@
 
 import Ability from '@ohos.application.Ability'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from 'hypium/index'
+import { Hypium } from '@ohos/hypium'
 import testsuite from '../test/List.test'
 
 export default class MainAbility extends Ability {

ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/test/Ability.test.ets

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // @ts-nocheck
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'hypium/index'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 const START_ABILITY_TIMEOUT = 4000;
 

ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/ets/MainAbility/MainAbility.ts

@@ -15,7 +15,7 @@
 
 import Ability from '@ohos.application.Ability'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from 'hypium/index'
+import { Hypium } from '@ohos/hypium'
 import testsuite from '../test/List.test'
 
 export default class MainAbility extends Ability {

ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/ets/test/Ability.test.ets

@@ -13,7 +13,7 @@
 * limitations under the License.
 */
 
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'hypium/index'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import commonEvent from '@ohos.commonEvent'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 const START_ABILITY_TIMEOUT = 5000;

ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/ets/MainAbility/MainAbility.ts

@@ -15,7 +15,7 @@
 
 import Ability from '@ohos.application.Ability'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from 'hypium/index'
+import { Hypium } from '@ohos/hypium'
 import testsuite from '../test/List.test'
 
 export default class MainAbility extends Ability {

ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/ets/test/Ability.test.ets

@@ -13,7 +13,7 @@
 * limitations under the License.
 */
 
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'hypium/index'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import commonEvent from '@ohos.commonEvent'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 const START_ABILITY_TIMEOUT = 5000;

ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/ets/MainAbility/MainAbility.ts

@@ -15,7 +15,7 @@
 
 import Ability from '@ohos.application.Ability'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from 'hypium/index'
+import { Hypium } from '@ohos/hypium'
 import testsuite from '../test/List.test'
 
 export default class MainAbility extends Ability {

ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/ets/test/Ability.test.ets

@@ -13,7 +13,7 @@
 * limitations under the License.
 */
 
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'hypium/index'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import commonEvent from '@ohos.commonEvent'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 const START_ABILITY_TIMEOUT = 5000;

ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/MainAbility/MainAbility.ts

@@ -15,7 +15,7 @@
 
 import Ability from '@ohos.application.Ability'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from 'hypium/index'
+import { Hypium } from '@ohos/hypium'
 import testsuite from '../test/List.test'
 
 export default class MainAbility extends Ability {

ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/test/Ability.test.ets

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'hypium/index'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import abilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 import commonEvent from "@ohos.commonEvent"
 

ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/MainAbility/MainAbility.ts

@@ -15,7 +15,7 @@
 
 import Ability from '@ohos.application.Ability'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from 'hypium/index'
+import { Hypium } from '@ohos/hypium'
 import testsuite from '../test/List.test'
 
 export default class MainAbility extends Ability {

ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/test/Ability.test.ets

@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'hypium/index'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import abilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 import commonEvent from "@ohos.commonEvent"
 

ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/entry/src/main/ets/MainAbility/MainAbility.ts

@@ -14,7 +14,7 @@
 */
 import Ability from '@ohos.application.Ability'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from 'hypium/index'
+import { Hypium } from '@ohos/hypium'
 import testsuite from '../test/List.test'
 
 export default class TestAbility extends Ability {

ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/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 'hypium/index'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 
 export default function abilityTest() {
     describe('ActsAbilityTest', function () {

ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/entry/src/main/ets/MainAbility/MainAbility.ts

@@ -14,7 +14,7 @@
 */
 import Ability from '@ohos.application.Ability'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from 'hypium/index'
+import { Hypium } from '@ohos/hypium'
 import testsuite from '../test/List.test'
 
 export default class TestAbility extends Ability {

ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/entry/src/main/ets/test/Ability.test.ets

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'hypium/index'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import appManager from '@ohos.application.appManager';
 
 export default function abilityTest() {

ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/MainAbility/MainAbility.ts

 import Ability from '@ohos.application.Ability'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from 'hypium/index'
+import { Hypium } from '@ohos/hypium'
 import testsuite from '../test/List.test'
 
 export default class MainAbility extends Ability {

ability/ability_runtime/actsstartrunnertest/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 "hypium/index"
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 import commonEvent from '@ohos.commonEvent'
 var subscriberInfo_MainAbility = {

ability/ability_runtime/TestApi/BUILD.gn → ability/ability_runtime/apitest/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("Testapi") {
+ohos_js_hap_suite("ActsApiTest") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -22,7 +22,7 @@ ohos_js_hap_suite("Testapi") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
-  hap_name = "Testapi"
+  hap_name = "ActsApiTest"
 }
 
 ohos_app_scope("testapi_app_profile") {

ability/ability_runtime/TestApi/Test.json → ability/ability_runtime/apitest/Test.json

@@ -11,7 +11,7 @@
     "kits": [
         {
             "test-file-name": [
-                "Testapi.hap"
+                "ActsApiTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

ability/ability_runtime/faapicover/BUILD.gn

@@ -17,7 +17,7 @@ group("faapicover") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "faapicoverhaptest:FaApiCoverHapTest",
+      "faapicoverhaptest:ActsFaApiCoverTest",
       "faauxiliary:FaAuxiliary",
     ]
   }

ability/ability_runtime/faapicover/faapicoverhaptest/BUILD.gn

@@ -13,19 +13,23 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("FaApiCoverHapTest") {
+ohos_js_hap_suite("ActsFaApiCoverTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":faapicoverhaptest_ets_assets",
     ":faapicoverhaptest_ets_resources",
+    ":faapicoverhaptest_ets_test_assets",
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FaApiCoverHapTest"
+  hap_name = "ActsFaApiCoverTest"
 }
 ohos_js_assets("faapicoverhaptest_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"
 }
+ohos_js_assets("faapicoverhaptest_ets_test_assets") {
+  source_dir = "./entry/src/main/ets/TestAbility"
+}
 ohos_resources("faapicoverhaptest_ets_resources") {
   sources = [ "./entry/src/main/resources" ]
   hap_profile = "./entry/src/main/config.json"

ability/ability_runtime/faapicover/faapicoverhaptest/Test.json

 {
     "description": "Configuration for hjunit demo Tests",
     "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "180000",
-        "package": "com.example.faapicoverhaptest",
+        "type": "OHJSUnitTest",
+        "test-timeout": "600000",
+        "bundle-name": "com.example.faapicoverhaptest",
+        "package-name": "com.example.faapicoverhaptest",
         "shell-timeout": "600000"
     },
     "kits": [
         {
             "test-file-name": [
-                "FaApiCoverHapTest.hap",
+                "ActsFaApiCoverTest.hap",
                 "FaAuxiliary.hap"
             ],
             "type": "AppInstallKit",

ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/config.json

@@ -41,6 +41,19 @@
         "label": "$string:MainAbility_label",
         "type": "page",
         "launchType": "singleton"
+      },
+      {
+          "orientation": "unspecified",
+          "formsEnabled": false,
+          "name": ".TestAbility",
+          "srcLanguage": "js",
+          "srcPath": "TestAbility",
+          "icon": "$media:icon",
+          "description": "$string:TestAbility_desc",
+          "label": "$string:TestAbility_label",
+          "type": "page",
+          "visible": true,
+          "launchType": "singleton"
       }
     ],
     "distro": {
@@ -66,6 +79,16 @@
           "designWidth": 720,
           "autoDesignWidth": false
         }
+      },
+      {
+        "pages": [
+          "pages/index"
+        ],
+        "name": ".TestAbility",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
       }
     ]
   }

ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/ets/MainAbility/pages/index.ets

@@ -12,32 +12,11 @@
  * 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 list from '../../test/ListTest'
-
 @Entry
 @Component
 struct Index {
   @State message: string = 'Hello World FA MainAbility'
 
-  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');
-    configService.setConfig(this)
-    list();
-    core.execute();
-  }
-
   build() {
     Row() {
       Column() {

ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/ets/TestAbility/app.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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from 'hypium/index'
+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!!!')
+    Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+  },
+  onDestroy() {
+    console.info('Application onDestroy')
+  },
+}
\ No newline at end of file

ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/ets/TestAbility/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';
+
+@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/faapicover/faapicoverhaptest/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 itName',
+        '-s level', '-s testType', '-s size', '-s timeout',
+        '-s package'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            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')
+    }
+
+    onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+
+        let lMonitor = {
+            abilityName: testAbilityName,
+            onAbilityCreate: onAbilityCreateCallback,
+        };
+        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility'
+        abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
+        var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
+        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 call abilityDelegator.getAppContext')
+        var context = abilityDelegator.getAppContext()
+        console.info('getAppContext : ' + JSON.stringify(context))
+        console.info('OpenHarmonyTestRunner onRun end')
+    }
+};
\ No newline at end of file

ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/ets/test/ApiCoverAbility.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 FormInfo from '@ohos.application.formInfo';
 import formError from '@ohos.application.formError';

ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/ets/test/VerificationTest.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 ability_featureAbility from '@ohos.ability.featureAbility';
 import commonEvent from '@ohos.commonEvent';

ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/resources/base/element/string.json

@@ -11,6 +11,14 @@
     {
       "name": "MainAbility_label",
       "value": "FaXts"
+    },
+    {
+        "name": "TestAbility_desc",
+        "value": "description"
+    },
+    {
+        "name": "TestAbility_label",
+        "value": "label"
     }
   ]
 }
\ No newline at end of file

ability/ability_runtime/workercontextcover/BUILD.gn

@@ -16,6 +16,6 @@ import("//test/xts/tools/build/suite.gni")
 group("workercontextcover") {
   testonly = true
   if (is_standard_system) {
-    deps = [ "workercontexttest:WorkerContextTest" ]
+    deps = [ "workercontexttest:ActsWorkerContextTest" ]
   }
 }

ability/ability_runtime/workercontextcover/workercontexttest/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("WorkerContextTest") {
+ohos_js_hap_suite("ActsWorkerContextTest") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [