From d8d051d8a5b5e6a02d5b19a047128b80aa37d183 Mon Sep 17 00:00:00 2001
From: yangzk <yangzhongkai@huawei.com>
Date: Fri, 28 Oct 2022 14:26:44 +0800
Subject: [PATCH] =?UTF-8?q?fixed=200d3e60d=20from=20https://gitee.com/yzkp?=
 =?UTF-8?q?/xts=5Facts/pulls/6213=20IssueNo:=20#I5Y6PR=20Description:=20?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8UIAbility=20Sig:=20SIG=5FApplicationFramework?=
 =?UTF-8?q?=20Feature=20or=20Bugfix:=20Feature=20Binary=20Source:=20No?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangzk <yangzhongkai@huawei.com>
Change-Id: I4c1a5cc85c84a473aecb2e94904ed7d897284c81
---
 .../src/main/ets/test/ApiCoverAbility.test.ets      | 13 +------------
 .../src/main/ets/ModuleAbility/ModuleAbility.ts     |  8 +++-----
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ApiCoverAbility.test.ets b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ApiCoverAbility.test.ets
index fbc7f9b3f..c33356ab8 100644
--- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ApiCoverAbility.test.ets
+++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ApiCoverAbility.test.ets
@@ -315,7 +315,7 @@ export default function ApiCoverTest() {
       try {
         let info: appManager.ProcessRunningInfo;
         let stageContext: common.AbilityStageContext = globalThis.stageContext;
-        let abilityContext: common.AbilityContext = globalThis.abilityContext;
+        let abilityContext: common.UIAbilityContext = globalThis.abilityContext;
         let appContext: common.ApplicationContext = abilityContext.getApplicationContext();
         let baseContext: common.BaseContext = stageContext;
         let context: common.Context = stageContext;
@@ -340,18 +340,7 @@ export default function ApiCoverTest() {
         abilityDelegator.addAbilityMonitor(abilityMonitor, (err, data) => {
           console.log(`printMsg, err: ${JSON.stringify(err)}, data: ${JSON.stringify(data)}`);
         })
-        abilityDelegator.printMsg(undefined);
-        abilityDelegator.printMsg(undefined, (err, data) => {
-          console.log(`printMsg, err: ${JSON.stringify(err)}, data: ${JSON.stringify(data)}`);
-        });
         let shellCmdResult: abilityDelegatorRegistry.ShellCmdResult;
-        shellCmdResult = await abilityDelegator.executeShellCmd(undefined);
-        abilityDelegator.executeShellCmd(undefined, 0, (err, data) => {
-          console.log(`executeShellCmd, err: ${JSON.stringify(err)}, data: ${JSON.stringify(data)}`);
-        });
-        abilityDelegator.executeShellCmd(undefined, (err, data) => {
-          console.log(`executeShellCmd, err: ${JSON.stringify(err)}, data: ${JSON.stringify(data)}`);
-        });
       } catch (err) {
         console.log(`catch code: ${err.code}, message: ${err.message}`);
       }
diff --git a/ability/ability_runtime/apicover/formmodule/entry/src/main/ets/ModuleAbility/ModuleAbility.ts b/ability/ability_runtime/apicover/formmodule/entry/src/main/ets/ModuleAbility/ModuleAbility.ts
index 169bca1f8..f681e8972 100644
--- a/ability/ability_runtime/apicover/formmodule/entry/src/main/ets/ModuleAbility/ModuleAbility.ts
+++ b/ability/ability_runtime/apicover/formmodule/entry/src/main/ets/ModuleAbility/ModuleAbility.ts
@@ -1,8 +1,7 @@
-import Ability from '@ohos.app.ability.Ability'
-import AbilityConstant
-    from "../../../../../../../../../../../../interface/sdk-js/api/@ohos.app.ability.AbilityConstant";
+import UIAbility from '@ohos.app.ability.UIAbility'
+import AbilityConstant from '@ohos.app.ability.AbilityConstant';
 
-export default class ModuleAbility extends Ability {
+export default class ModuleAbility extends UIAbility {
     onCreate(want, launchParam) {
         console.log("[Demo] MainAbility onCreate")
         globalThis.abilityWant = want;
@@ -53,5 +52,4 @@ export default class ModuleAbility extends Ability {
         console.log("[Demo] MainAbility onDump: " + JSON.stringify(param))
         return ["MainAbility"]
     }
-
 };
-- 
GitLab