!7339 元能力api9终审问题修改

Merge pull request !7339 from yangzk/master

ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ApiCoverAbility.test.ets

@@ -27,6 +27,7 @@ import commonEvent from '@ohos.commonEvent';
 import ability from '@ohos.ability.ability';
 import abilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry';
 import common from '@ohos.app.ability.common';
+import contextConstant from "@ohos.app.ability.contextConstant"
 
 var EXTENSION_INFO_ERR = 16000001
 var INNER_ERROR = 16000050
@@ -319,16 +320,13 @@ export default function ApiCoverTest() {
         let appContext: common.ApplicationContext = abilityContext.getApplicationContext();
         let baseContext: common.BaseContext = stageContext;
         let context: common.Context = stageContext;
-        let el1 = common.AreaMode.EL1;
-        let el2 = common.AreaMode.EL2;
+        let el1 = contextConstant.AreaMode.EL1;
+        let el2 = contextConstant.AreaMode.EL2;
         let eventHub: common.EventHub = context.eventHub;
         let abilityResult: common.AbilityResult;
         let connectOptions: common.ConnectOptions;
 
-        appContext.killProcessesBySelf();
-        appContext.killProcessesBySelf((err, data) => {
-            console.log(`killProcessesBySelf, err: ${JSON.stringify(err)}, data: ${JSON.stringify(data)}`);
-        })
+        console.log("killAllProcesses:" + JSON.stringify(appContext.killAllProcesses));
         let abilityDelegator: abilityDelegatorRegistry.AbilityDelegator;
         abilityDelegator = abilityDelegatorRegistry.getAbilityDelegator();
         let abilityDelegatorArgs: abilityDelegatorRegistry.AbilityDelegatorArgs;

ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/test/GetFormsInfoTest.test.ets

@@ -29,7 +29,6 @@ let module1FormInfo: formInfo.FormInfo = {
     isDefault: true,
     updateEnabled: true,
     formVisibleNotify: true,
-    relatedBundleName : "com.example.getformsinfotest",
     scheduledUpdateTime: "10:30",
     formConfigAbility: "ability://xxxxx",
     updateDuration: 1,
@@ -50,7 +49,6 @@ let module2FormInfo: formInfo.FormInfo = {
     isDefault: true,
     updateEnabled: true,
     formVisibleNotify: true,
-    relatedBundleName : "com.example.getformsinfotest",
     scheduledUpdateTime: "10:30",
     formConfigAbility: "ability://xxxxx",
     updateDuration: 1,
@@ -396,8 +394,6 @@ export default function abilityTest() {
         expect(expectInfo.isDefault).assertEqual(result.isDefault);
         console.info("formProvider::GetFormsInfoTest: formVisibleNotify expect " + expectInfo.formVisibleNotify);
         expect(expectInfo.formVisibleNotify).assertEqual(result.formVisibleNotify);
-        console.info("formProvider::GetFormsInfoTest: relatedBundleName expect " + expectInfo.relatedBundleName);
-        expect(expectInfo.relatedBundleName).assertEqual(result.relatedBundleName);
         console.info("formProvider::GetFormsInfoTest: scheduledUpdateTime expect " + expectInfo.scheduledUpdateTime);
         expect(expectInfo.scheduledUpdateTime).assertEqual(result.scheduledUpdateTime);
         console.info("formProvider::GetFormsInfoTest: formConfigAbility expect " + expectInfo.formConfigAbility);