XTS失败用例适配

Signed-off-by: Nchengxingzhen <chengxingzhen@huawei.com>

ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/TestAbility/pages/index.ets

@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import router from '@system.router';
 
 @Entry
 @Component

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

@@ -46,20 +46,6 @@ export default function getHapModuleInfoJsunit() {
       done();
     });
 
-    async function startAbility2() {
-      var str = {
-        "want": {
-          "bundleName": "com.ohos.acecollaboration",
-          "abilityName": "com.ohos.acecollaboration.MainAbility2",
-        },
-      };
-      ability_featureAbility.startAbility(str).then((data) => {
-        console.info('context_getAbilityInfo_test_0300 startMainAbility2 succeeded: ' + JSON.stringify(data));
-      }).catch((error) => {
-        console.error('context_getAbilityInfo_test_0300 startMainAbility2 failed. Cause: ' + JSON.stringify(error));
-      });
-    }
-
     /**
      * @tc.number: context_getAbilityInfo_test_0200
      * @tc.name: getAbilityInfo:Query the current attributionability details.
@@ -88,19 +74,6 @@ export default function getHapModuleInfoJsunit() {
       done();
     })
 
-
-    /**
-     * @tc.number: context_getAbilityInfo_test_0300_1
-     * @tc.name: getAbilityInfo:Query the current attributionability details.
-     * @tc.desc: Check the return value of the interface
-     * @tc.level  0
-     */
-    it('context_getAbilityInfo_test_0300_1', 0, async function (done) {
-      console.info('[context_getAbilityInfo_test_0300] STARTability');
-      startAbility2();
-      done();
-    });
-
     /**
      * @tc.number: context_getAbilityInfo_test_0400
      * @tc.name: getAbilityInfo:Query the current attributionability details.

ability/ability_runtime/actsstserviceabilityclientcase/BUILD.gn

@@ -23,9 +23,12 @@ ohos_js_hap_suite("ActsStServiceAbilityClientCaseTest") {
   hap_name = "ActsStServiceAbilityClientCaseTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/js/default"
+  js2abc = true
+  hap_profile = "./entry/src/main/config.json"
+  source_dir = "./entry/src/main/js"
 }
+
 ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/js/resources" ]
+  sources = [ "./entry/src/main/resources" ]
   hap_profile = "./entry/src/main/config.json"
 }

ability/ability_runtime/actsstserviceabilityclientcase/Test.json

 {
     "description": "Configuration for hjunit demo Tests",
     "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "60000",
-        "package": "com.amsst.actsstserviceabilityclientcasetest",
-        "shell-timeout": "60000"
+        "type": "OHJSUnitTest",
+        "test-timeout": "300000",
+        "bundle-name": "com.amsst.actsstserviceabilityclientcasetest",
+        "package-name": "com.amsst.actsstserviceabilityclientcasetest",
+        "shell-timeout": "600000"
     },
     "kits": [
         {

ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/config.json

@@ -15,14 +15,16 @@
   "deviceConfig": {},
   "module": {
     "package": "com.amsst.actsstserviceabilityclientcasetest",
-    "name": ".MyApplication",
+    "name": ".entry",
+    "mainAbility": "com.amsst.actsstserviceabilityclientcasetest.MainAbility",
     "deviceType": [
       "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
       "moduleName": "entry",
-      "moduleType": "entry"
+      "moduleType": "entry",
+      "installationFree": true
     },
     "abilities": [
       {
@@ -37,12 +39,27 @@
           }
         ],
         "name": "com.amsst.actsstserviceabilityclientcasetest.MainAbility",
+        "srcLanguage": "js",
+        "srcPath": "MainAbility",
         "icon": "$media:icon",
         "description": "$string:mainability_description",
         "label": "$string:app_name",
         "type": "page",
         "launchType": "standard",
         "visible": true
+      },
+      {
+          "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"
       }
     ],
     "reqPermissions": [
@@ -80,12 +97,26 @@
         "pages": [
           "pages/index/index"
         ],
-        "name": "default",
+        "name": ".MainAbility",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      },
+      {
+        "pages": [
+          "pages/index/index"
+        ],
+        "name": ".TestAbility",
         "window": {
           "designWidth": 720,
           "autoDesignWidth": false
         }
       }
-    ]
+    ],
+    "testRunner": {
+        "name": "OpenHarmonyTestRunner",
+        "srcPath": "TestRunner"
+    }
   }
 }

ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/js/default/pages/index/index.js → ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/js/MainAbility/pages/index/index.js

@@ -12,10 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import file from '@system.file'
-import app from '@system.app'
-import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index'
-
+const injectRef = Object.getPrototypeOf(global) || global
+injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
 export default {
     data: {
         title: ""
@@ -24,21 +22,9 @@ export default {
         this.title = this.$t('strings.world');
     },
     onShow() {
-        console.info('====onShow finish====<')
-        const core = Core.getInstance()
-        const expectExtend = new ExpectExtend({
-            'id': 'extend'
-        })
-        const reportExtend = new ReportExtend(file)
-        core.addService('expect', expectExtend)
-        core.addService('report', reportExtend)
-        core.init()
-        const configService = core.getDefaultService('config')
-        configService.setConfig(this)
-
-        require('../../../test/List.test')
-        core.execute()
+        console.info('====onShow start====<')
     },
     onReady() {
+        console.info('onReady');
     },
 }
\ No newline at end of file

ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/js/TestAbility/app.js

+/*
+ * 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 '@ohos/hypium'
+import testsuite from '../test/List.test'
+
+export default {
+    onCreate() {
+        console.info('TestApplication onCreate')
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        console.info('start run testcase!!!')
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+    },
+    onDestroy() {
+        console.info("TestApplication onDestroy");
+    }
+};

ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/js/TestAbility/i18n/en-US.json

+{
+  "strings": {
+    "hello": "Hello",
+    "world": "World"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/js/TestAbility/i18n/zh-CN.json

+{
+  "strings": {
+    "hello": "您好",
+    "world": "世界"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/js/TestAbility/pages/index/index.css

+/*
+ * 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.
+ */
+
+.container {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    left: 0px;
+    top: 0px;
+    width: 100%;
+    height: 100%;
+}
+
+.title {
+    font-size: 60px;
+    text-align: center;
+    width: 100%;
+    height: 40%;
+    margin: 10px;
+}
+.btn {
+    width: 50%;
+    height: 100px;
+    font-size: 40px;
+}
+
+@media screen and (device-type: phone) and (orientation: landscape) {
+    .title {
+        font-size: 60px;
+    }
+}
+
+@media screen and (device-type: tablet) and (orientation: landscape) {
+    .title {
+        font-size: 100px;
+    }
+}
\ No newline at end of file

ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/js/TestAbility/pages/index/index.hml

+<!--
+  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.
+-->
+
+<div class="container" onswipe="touchMove">
+    <text class="title">
+        {{ $t('strings.hello') }} {{title}}
+    </text>
+    <input class="btn" type="button" value="{{ $t('strings.next') }}" onclick="onclick"></input>
+</div>

ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/js/TestAbility/pages/index/index.js

+/*
+ * 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.
+ */
+
+export default {
+    data: {
+        title: ""
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    }
+}
+
+
+

ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/js/TestRunner/OpenHarmonyTestRunner.js

+/*
+ * 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'
+
+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', '-s dryRun'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams += ' ' + key + ' ' + parameters[key]
+        }
+    }
+    return targetParams.trim()
+}
+
+ export default {
+    onPrepare() {
+        console.info('OpenHarmonyTestRunner OnPrepare')
+    },
+    onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+
+        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility'
+
+        var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)
+        var debug = abilityDelegatorArguments.parameters["-D"]
+        console.info('debug value : '+debug)
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        console.info('cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd, (err, data) => {
+            console.info('executeShellCommand : err : ' + JSON.stringify(err));
+            console.info('executeShellCommand : data : ' + data.stdResult);
+            console.info('executeShellCommand : data : ' + data.exitCode);
+        })
+    }
+};

ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/js/test/ActsStServiceAbilityClientCaseTest.test.js

@@ -14,10 +14,11 @@
  */
 import featureAbility from '@ohos.ability.featureAbility'
 import commonEvent from '@ohos.commonEvent'
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 
-const errCode = 1;
 
+const errCode = 1;
+export default function ActsStServiceAbilityTest() {
 describe('ActsStServiceAbilityTest', function () {
     let bundleName = "com.amsst.stserviceabilityserver";
     let abilityName = "com.amsst.stserviceabilityserver.ServiceAbility";
@@ -270,6 +271,7 @@ it("ACTS_AAbilityStartSettingNew_0500",0, async function(done){
         console.log('ACTS_AJsServiceAbility_0600====<begin');
         try {
             var mConnIdJsAsyncCallback;
+            var currentAlertTimeout;
             commonEvent.createSubscriber(CommonEventSubscribeInfo0600).then(async (data) => {
                 console.debug("=ACTS_AJsServiceAbility_0600 createSubscriber .then(data)=======>"
                     + ("json data【") + JSON.stringify(data) + (" 】")
@@ -430,3 +432,4 @@ it("ACTS_AAbilityStartSettingNew_0500",0, async function(done){
         }
     })
 })
+}
\ No newline at end of file

ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/js/test/List.test.js

@@ -12,4 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-require('./ActsStServiceAbilityClientCaseTest.test.js')
+import ActsStServiceAbilityTest from './ActsStServiceAbilityClientCaseTest.test.js'
\ No newline at end of file
+
+export default function testsuite() {
+    ActsStServiceAbilityTest()
+}
\ No newline at end of file

ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/js/resources/base/element/string.json → ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/resources/base/element/string.json

@@ -7,6 +7,14 @@
     {
       "name": "mainability_description",
       "value": "JS_Phone_Empty Feature Ability"
+    },
+    {
+        "name": "TestAbility_desc",
+        "value": "description"
+    },
+    {
+        "name": "TestAbility_label",
+        "value": "label"
     }
   ]
 }
\ No newline at end of file

ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/Application/AbilityStage.ts

@@ -18,6 +18,6 @@ export default class MyAbilityStage extends AbilityStage {
     onCreate() {
         console.log("MyAbilityStage onCreate")
 	// globalThis.stageOnCreateRun = 1;
-	globalThis.stageContext = this.context;
+	globalThis.abilityStageContext = this.context;
     }
 }

ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/MainAbility/MainAbility.ts

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

ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/test/Ability.test.ets

@@ -25,7 +25,7 @@ export default function abilityTest() {
          */
         it('ACTS_getApplicationInfo_0300', 0, async function (done) {
             console.log("ACTS_getApplicationInfo_0300 --- start ability=====>'+ abilityContext.applicationInfo")
-            checkApplicationInfo(globalThis.abilityStageContext.applicationInfo);
+            checkApplicationInfo(globalThis.abilityContext.applicationInfo);
             done();
         })
 
@@ -93,33 +93,33 @@ export default function abilityTest() {
             expect(typeof (data.removable)).assertEqual("boolean");
 
             console.log("checkApplicationInfo_expect_typeof_end")
-            expect(data.name).assertEqual("com.example.staticglobalThis.abilityStageContext");
+            expect(data.name).assertEqual("com.example.staticabilitystagecontext");
             expect(data.description).assertEqual("$string:description_application");
             expect(data.descriptionId).assertLarger(0);
             expect(data.systemApp).assertEqual(true);
             expect(data.enabled).assertEqual(true);
             expect(data.label).assertEqual("$string:app_name");
             expect(data.labelId.length).assertLarger(0);
-            expect(data.icon).assertEqual("");
+            expect(data.icon).assertEqual("$media:icon");
             expect(data.iconId.length).assertLarger(0);
             expect(data.process).assertEqual("");
             expect(data.supportedModes).assertEqual(0);
             expect(data.moduleSourceDirs.length).assertEqual(1);
             expect(data.moduleSourceDirs[0]).assertEqual("/data/app/el1/bundle/public/" +
-            "com.example.staticglobalThis.abilityStageContext/com.example.staticglobalThis.abilityStageContext");
+            "com.example.staticabilitystagecontext/com.example.staticabilitystagecontext");
             expect(data.moduleInfos.length).assertEqual(1);
-            expect(data.moduleInfos[0].moduleName).assertEqual("com.example.staticglobalThis.abilityStageContext");
+            expect(data.moduleInfos[0].moduleName).assertEqual("com.example.staticabilitystagecontext");
             expect(data.moduleInfos[0].moduleSourceDir).assertEqual("/data/app/el1/bundle/public/" +
-            "com.example.staticglobalThis.abilityStageContext/com.example.staticglobalThis.abilityStageContext");
+            "com.example.staticabilitystagecontext/com.example.staticabilitystagecontext");
             expect(data.entryDir).assertEqual("/data/app/el1/bundle/public/" +
-            "com.example.staticglobalThis.abilityStageContext/com.example.staticglobalThis.abilityStageContext");
+            "com.example.staticabilitystagecontext/com.example.staticabilitystagecontext");
             expect(data.codePath).assertEqual("/data/app/el1/bundle/public/" +
-            "com.example.staticglobalThis.abilityStageContext");
+            "com.example.staticabilitystagecontext");
             expect(data.removable).assertEqual(true);
             console.log("checkApplicationInfo end  " + data);
         }
         function checkHapModuleInfo(data) {
-            console.log("checkHapModuleInfo start  " + data);
+            console.log("checkHapModuleInfo start  " + JSON.stringify(data));
             console.log("checkHapModuleInfo name : " + data.name);
             console.log("checkHapModuleInfo description : " + data.description);
             console.log("checkHapModuleInfo descriptionId : " + data.descriptionId);
@@ -154,22 +154,23 @@ export default function abilityTest() {
             expect(typeof (data.moduleName)).assertEqual("string");
             expect(typeof (data.mainAbilityName)).assertEqual("string");
             console.log("checkHapModuleInfo_expect_typeof_end")
-            expect(data.name).assertEqual("com.example.staticglobalThis.abilityStageContext");
+            expect(data.name).assertEqual("com.example.staticabilitystagecontext");
             expect(data.description).assertEqual("$string:phone_entry_dsc");
-            expect(data.descriptionId).assertEqual(undefined);
+            expect(data.descriptionId).assertEqual(16777221);
             expect(data.icon).assertEqual("$media:icon");
             expect(data.label).assertEqual("$string:entry_label");
-            expect(data.labelId).assertEqual(undefined);
-            expect(data.iconId).assertEqual(undefined);
+            expect(data.labelId).assertEqual(16777219);
+            expect(data.iconId).assertEqual(16777224);
             expect(data.backgroundImg).assertEqual("");
             expect(data.supportedModes).assertEqual(0);
             expect(data.reqCapabilities.length).assertEqual(0);
-            expect(data.reqCapabilities[0]).assertEqual(undefined);
             expect(data.deviceTypes.length).assertEqual(1);
             expect(data.deviceTypes[0]).assertEqual("phone");
-            expect(data.moduleName).assertEqual("com.example.staticglobalThis.abilityStageContext")
-            expect(data.mainAbilityName).assertEqual("MainAbility");
-            expect(data.installationFree).assertEqual(undefined);
+            expect(data.moduleName).assertEqual("com.example.staticabilitystagecontext")
+            expect(data.mainAbilityName).assertEqual("com.example.staticabilitystagecontext.MainAbility");
+            expect(data.installationFree).assertEqual(false);
+            expect(data.mainElementName).assertEqual('com.example.staticabilitystagecontext.MainAbility');
+            expect(data.hashValue).assertEqual('');
             console.log("checkHapModuleInfo end  " + data);
         }
     })

ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/module.json

@@ -4,7 +4,7 @@
         "type": "entry",
         "srcEntrance": "./ets/Application/AbilityStage.ts",
         "description": "$string:phone_entry_dsc",
-        "mainElement": "MainAbility",
+        "mainElement": "com.example.staticabilitystagecontext.MainAbility",
         "deviceTypes": [
             "phone"
         ],

ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/module.json

@@ -4,7 +4,7 @@
     "type": "entry",
     "srcEntrance": "./ets/Application/AbilityStage.ts",
     "description": "$string:phone_entry_dsc",
-    "mainElement": "MainAbility",
+    "mainElement": "com.example.staticextensioninfotest.MainAbility",
     "deviceTypes": [
       "phone"
     ],

ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/Ability.test.ets

@@ -118,20 +118,21 @@ export default function abilityTest() {
         console.log("checkHapModuleInfo_expect_typeof_end")
         expect(data.name).assertEqual("phone");
         expect(data.description).assertEqual("$string:phone_entry_dsc");
-        expect(data.descriptionId).assertEqual(undefined);
+        expect(data.descriptionId).assertEqual(16777221);
         expect(data.icon).assertEqual("$media:icon");
         expect(data.label).assertEqual("$string:entry_label");
-        expect(data.labelId).assertEqual(undefined);
-        expect(data.iconId).assertEqual(undefined);
+        expect(data.labelId).assertEqual(16777219);
+        expect(data.iconId).assertEqual(16777224);
         expect(data.backgroundImg).assertEqual("");
         expect(data.supportedModes).assertEqual(0);
         expect(data.reqCapabilities.length).assertEqual(0);
-        expect(data.reqCapabilities[0]).assertEqual(undefined);
         expect(data.deviceTypes.length).assertEqual(1);
         expect(data.deviceTypes[0]).assertEqual("phone");
         expect(data.moduleName).assertEqual("phone")
-        expect(data.mainAbilityName).assertEqual("MainAbility");
-        expect(data.installationFree).assertEqual(undefined);
+        expect(data.mainAbilityName).assertEqual("com.example.staticextensioninfo.MainAbility");
+        expect(data.installationFree).assertEqual(false);
+        expect(data.mainElementName).assertEqual('com.example.staticextensioninfo.MainAbility');
+        expect(data.hashValue).assertEqual('');
         console.log("checkHapModuleInfo end  " + data);
       }
       function checkApplicationInfo(data) {
@@ -191,7 +192,7 @@ export default function abilityTest() {
         expect(data.enabled).assertEqual(true);
         expect(data.label).assertEqual("$string:app_name");
         expect(data.labelId).assertEqual("16777216");
-        expect(data.icon).assertEqual("");
+        expect(data.icon).assertEqual("$media:icon");
         expect(data.iconId).assertEqual("16777224");
         expect(data.process).assertEqual("");
         expect(data.supportedModes).assertEqual(0);
@@ -299,20 +300,21 @@ export default function abilityTest() {
         console.log("checkHapModuleInfo_expect_typeof_end")
         expect(data.name).assertEqual("phone");
         expect(data.description).assertEqual("$string:phone_entry_dsc");
-        expect(data.descriptionId).assertEqual(undefined);
+        expect(data.descriptionId).assertEqual(16777221);
         expect(data.icon).assertEqual("$media:icon");
         expect(data.label).assertEqual("$string:entry_label");
-        expect(data.labelId).assertEqual(undefined);
-        expect(data.iconId).assertEqual(undefined);
+        expect(data.labelId).assertEqual(16777219);
+        expect(data.iconId).assertEqual(16777224);
         expect(data.backgroundImg).assertEqual("");
         expect(data.supportedModes).assertEqual(0);
         expect(data.reqCapabilities.length).assertEqual(0);
-        expect(data.reqCapabilities[0]).assertEqual(undefined);
         expect(data.deviceTypes.length).assertEqual(1);
         expect(data.deviceTypes[0]).assertEqual("phone");
         expect(data.moduleName).assertEqual("phone")
-        expect(data.mainAbilityName).assertEqual("MainAbility");
-        expect(data.installationFree).assertEqual(undefined);
+        expect(data.mainAbilityName).assertEqual("com.example.staticextensioninfotest.MainAbility");
+        expect(data.installationFree).assertEqual(false);
+        expect(data.mainElementName).assertEqual('com.example.staticextensioninfotest.MainAbility');
+        expect(data.hashValue).assertEqual('');
         console.log("checkHapModuleInfo end  " + data);
       }
       function checkApplicationInfo_0200(data) {
@@ -372,7 +374,7 @@ export default function abilityTest() {
         expect(data.enabled).assertEqual(true);
         expect(data.label).assertEqual("$string:app_name");
         expect(data.labelId.length).assertLarger(0);
-        expect(data.icon).assertEqual("");
+        expect(data.icon).assertEqual("$media:icon");
         expect(data.iconId.length).assertLarger(0);
         expect(data.process).assertEqual("");
         expect(data.supportedModes).assertEqual(0);

ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/module.json

@@ -4,7 +4,7 @@
         "type": "entry",
         "srcEntrance": "./ets/Application/AbilityStage.ts",
         "description": "$string:phone_entry_dsc",
-        "mainElement": "MainAbility",
+        "mainElement": "com.example.staticextensioninfo.MainAbility",
         "deviceTypes": [
             "phone"
         ],

ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/MainAbility/pages/index/index.ets

@@ -12,9 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import file from '@system.file';
 
-import router from '@ohos.router';
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 import { Hypium } from '@ohos/hypium'
 import testsuite from '../../../test/List.test'

ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/test/Ability.test.ets

@@ -20,9 +20,6 @@ import commonEvent from '@ohos.commonEvent'
 var subscriberInfo_MainAbility_ability = {
     events: ["MainAbility_Start_CommonEvent_ability", "SecondAbility_Start_CommonEvent_ability"],
 };
-var subscriberInfo_MainAbility_ability_0300 = {
-    events: ["MainAbility_Start_CommonEvent_ability_0300","SecondAbility_Start_CommonEvent_ability_0300"],
-};
 
 export default function abilityTest() {
     describe('ActsStaticInfoMationQueryTest', function () {
@@ -101,10 +98,10 @@ export default function abilityTest() {
                     commonEvent.unsubscribe(Subscriber, UnSubscribeCallback);
                 }
             }
-            commonEvent.createSubscriber(subscriberInfo_MainAbility_ability).then(async (data) => {
+            await commonEvent.createSubscriber(subscriberInfo_MainAbility_ability).then(async (data) => {
                 console.debug("ACTS_getAbilityInfo_0200====>Create Subscriber====>");
                 Subscriber = data;
-                commonEvent.subscribe(Subscriber, SubscribeCallBack);
+                await commonEvent.subscribe(Subscriber, SubscribeCallBack);
                 Subscriber.getSubscribeInfo().then((data)=>{
                     console.log('ACTS_getAbilityInfo_0200 - Subscriber: ' + JSON.stringify(data))
                 })
@@ -287,7 +284,7 @@ export default function abilityTest() {
             expect(data.enabled).assertEqual(true);
             expect(data.label).assertEqual("$string:app_name");
             expect(data.labelId.length).assertLarger(0);
-            expect(data.icon).assertEqual("");
+            expect(data.icon).assertEqual("$media:icon");
             expect(data.iconId.length).assertLarger(0);
             expect(data.process).assertEqual("");
             expect(data.supportedModes).assertEqual(0);
@@ -343,20 +340,21 @@ export default function abilityTest() {
             console.log("checkHapModuleInfo_expect_typeof_end")
             expect(data.name).assertEqual("com.example.staticinfomationquery");
             expect(data.description).assertEqual("$string:phone_entry_dsc");
-            expect(data.descriptionId).assertEqual(undefined);
+            expect(data.descriptionId).assertEqual(16777221);
             expect(data.icon).assertEqual("$media:icon");
             expect(data.label).assertEqual("$string:entry_label");
-            expect(data.labelId).assertEqual(undefined);
-            expect(data.iconId).assertEqual(undefined);
+            expect(data.labelId).assertEqual(16777219);
+            expect(data.iconId).assertEqual(16777224);
             expect(data.backgroundImg).assertEqual("");
             expect(data.supportedModes).assertEqual(0);
             expect(data.reqCapabilities.length).assertEqual(0);
-            expect(data.reqCapabilities[0]).assertEqual(undefined);
             expect(data.deviceTypes.length).assertEqual(1);
             expect(data.deviceTypes[0]).assertEqual("phone");
             expect(data.moduleName).assertEqual("com.example.staticinfomationquery")
-            expect(data.mainAbilityName).assertEqual("MainAbility");
-            expect(data.installationFree).assertEqual(undefined);
+            expect(data.mainAbilityName).assertEqual("com.example.staticinfomationquery.MainAbility");
+            expect(data.installationFree).assertEqual(false);
+            expect(data.mainElementName).assertEqual('com.example.staticinfomationquery.MainAbility');
+            expect(data.hashValue).assertEqual('');
             console.log("checkHapModuleInfo end  " + data);
         }
     })

ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/module.json

@@ -4,7 +4,7 @@
         "type": "entry",
         "srcEntrance": "./ets/Application/AbilityStage.ts",
         "description": "$string:phone_entry_dsc",
-        "mainElement": "MainAbility",
+        "mainElement": "com.example.staticinfomationquery.MainAbility",
         "deviceTypes": [
             "phone"
         ],

ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/ets/MainAbility/MainAbility.ts

@@ -43,7 +43,7 @@ export default class MainAbility extends Ability {
 
     onForeground() {
         // Ability has brought to foreground
-        if (globalThis.abilityWant.action == 'getAbilityContext') {
+        if (globalThis.abilityWant.action == 'getglobalThis.abilityContext') {
             commonEvent.publish("MainAbility_Start_CommonEvent_ability", {
                 parameters: {
                     hapModuleInfo: JSON.stringify(globalThis.abilityContext.currentHapModuleInfo),

ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/config.json

@@ -20,6 +20,7 @@
   "module": {
     "package": "com.example.actsfeatureabilitytest",
     "name": ".MyApplication",
+    "mainAbility": "com.example.actsfeatureabilitytest.MainAbility",
     "deviceType": [
       "phone"
     ],

ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js

@@ -327,13 +327,13 @@ describe('ActsFeatureAbilityTest', function () {
 
         function SubscribeCallBack(err, data) {
             clearTimeout(id);
+            expect(promise).assertEqual(0);
             expect(data.event).assertEqual("ACTS_StartAbility_0200_CommonEvent");
             console.debug("====>Subscribe CallBack data:====>" + JSON.stringify(data));
             commonEvent.unsubscribe(Subscriber, UnSubscribeCallback)
-            done();
         }
 
-        commonEvent.createSubscriber(subscriberInfoActsStartAbility0200).then(async (data) => {
+        await commonEvent.createSubscriber(subscriberInfoActsStartAbility0200).then(async (data) => {
             console.debug("====>Create Subscriber====>");
             Subscriber = data;
             await commonEvent.subscribe(Subscriber, SubscribeCallBack);
@@ -407,7 +407,6 @@ describe('ActsFeatureAbilityTest', function () {
                 },
             }
         );
-        expect(promise).assertEqual(0);
     })
 
     /**
@@ -687,7 +686,6 @@ describe('ActsFeatureAbilityTest', function () {
             expect(data.event).assertEqual("ACTS_StartAbility_0600_CommonEvent");
             console.debug("====>Subscribe CallBack data:====>" + JSON.stringify(data));
             commonEvent.unsubscribe(Subscriber, UnSubscribeCallback)
-            done();
         }
 
         commonEvent.createSubscriber(subscriberInfoActsStartAbility0600).then(async (data) => {
@@ -1104,7 +1102,7 @@ describe('ActsFeatureAbilityTest', function () {
         expect(data.moduleName).assertEqual("entry");
         expect(data.process).assertEqual("processTestAbility");
         expect(data.targetAbility).assertEqual("");
-        expect(data.backgroundModes).assertEqual(0);
+        expect(data.backgroundModes).assertEqual(1);
         expect(data.isVisible).assertEqual(true);
         expect(data.formEnabled).assertEqual(false);
         expect(data.type).assertEqual(1);
@@ -1185,20 +1183,20 @@ describe('ActsFeatureAbilityTest', function () {
         expect(typeof (data.moduleName)).assertEqual("string");
         expect(typeof (data.mainAbilityName)).assertEqual("string");
         expect(typeof (data.installationFree)).assertEqual("boolean");
-        expect(data.name).assertEqual("com.example.actsfeatureabilitytest");
+        expect(data.name).assertEqual("com.example.actsfeatureabilitytest.MyApplication");
         expect(data.description).assertEqual("descriptionTest");
         expect(data.descriptionId).assertEqual(0);
         expect(data.icon).assertEqual("$media:icon");
         expect(data.label).assertEqual("$string:app_name");
-        expect(data.labelId).assertEqual(0);
-        expect(data.iconId).assertEqual(0);
+        expect(data.labelId).assertEqual(16777216);
+        expect(data.iconId).assertEqual(16777219);
         expect(data.backgroundImg).assertEqual("");
         expect(data.supportedModes).assertEqual(0);
         expect(data.reqCapabilities[0]).assertEqual("reqCapabilitiesTest1");
         expect(data.reqCapabilities[1]).assertEqual("reqCapabilitiesTest2");
         expect(data.deviceTypes[0]).assertEqual("phone");
         expect(data.moduleName).assertEqual("entry")
-        expect(data.mainAbilityName).assertEqual("");
+        expect(data.mainAbilityName).assertEqual("com.example.actsfeatureabilitytest.MainAbility");
         expect(data.installationFree).assertEqual(false);
         console.info("checkHapModuleInfo end  " + data);
     }
@@ -1578,7 +1576,6 @@ describe('ActsFeatureAbilityTest', function () {
                 expect(data.event).assertEqual("ACTS_StartAbility_1300_CommonEvent");
                 console.debug("====>Subscribe CallBack data:====>" + JSON.stringify(data));
                 commonEvent.unsubscribe(Subscriber, UnSubscribeCallback);
-                done();
             }
 
             commonEvent.createSubscriber(subscriberInfoStartAbilityThirteen).then(async (data) => {