!8650 应用快速修复支持撤销

Merge pull request !8650 from xinking129/master

ability/ability_runtime/BUILD.gn

@@ -33,6 +33,7 @@ group("ability_runtime") {
       "actsmultiplecall:actsmultiplecall",
       "actsqueryfunctiontest:actsqueryfunctiontest",
       "actsrequestdialogtest:actsrequestdialogtest",
+      "actsrevokequickfixtest:ActsRevokeQuickFixApp",
       "actsserviceabilityclienttest:serviceability",
       "actsshellcommandfunctionalitytest:actsshellcommandfunctionalitytest",
       "actsstartrunnertest:ActsStartRunnerTest",

ability/ability_runtime/actsrevokequickfixtest/AppScope/app.json

+{
+  "app": {
+    "bundleName": "com.acts.actsrevokequickfixapp",
+    "vendor": "example",
+    "versionCode": 1000000,
+    "versionName": "1.0.0",
+    "icon": "$media:app_icon",
+    "label": "$string:app_name",
+    "distributedNotificationEnabled": true,
+    "keepAlive" : true,
+    "singleUser": true,
+    "minAPIVersion": 10,
+    "targetAPIVersion": 10,
+    "car": {
+        "apiCompatibleVersion": 10,
+        "singleUser": false
+     }
+  }
+}

ability/ability_runtime/actsrevokequickfixtest/AppScope/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "ActsRevokeQuickFixApp"
+    }
+  ]
+}

ability/ability_runtime/actsrevokequickfixtest/BUILD.gn

+# Copyright (c) 2023 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("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("ActsRevokeQuickFixApp") {
+  hap_profile = "entry/src/main/module.json"
+  js_build_mode = "debug"
+  deps = [
+    ":actsrevokequickfixapp_js_assets",
+    ":actsrevokequickfixapp_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "signature/openharmony_sx.p7b"
+  hap_name = "ActsRevokeQuickFixApp"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
+}
+
+ohos_app_scope("actsrevokequickfixapp_app_profile") {
+  app_profile = "AppScope/app.json"
+  sources = [ "AppScope/resources" ]
+}
+
+ohos_js_assets("actsrevokequickfixapp_js_assets") {
+  source_dir = "entry/src/main/ets"
+}
+
+ohos_resources("actsrevokequickfixapp_resources") {
+  sources = [ "entry/src/main/resources" ]
+  deps = [ ":actsrevokequickfixapp_app_profile" ]
+  hap_profile = "entry/src/main/module.json"
+}

ability/ability_runtime/actsrevokequickfixtest/Test.json

+{
+    "description": "Configuration for aceceshi Tests",
+    "driver": {
+        "type": "OHJSUnitTest",
+        "test-timeout": "600000",
+        "bundle-name": "com.acts.actsrevokequickfixapp",
+        "module-name": "entry_test",
+        "shell-timeout": "600000"
+    },
+    "kits": [
+		{
+            "test-file-name": [
+                "ActsRevokeQuickFixApp.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        },
+        {
+            "type": "ShellKit",
+            "run-command": [
+                "power-shell wakeup",
+                "power-shell setmode 602"
+            ]
+        }
+    ]
+}
\ No newline at end of file

ability/ability_runtime/actsrevokequickfixtest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts

+import hilog from '@ohos.hilog';
+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() {
+    hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+    hilog.info(0x0000, 'testTag', '%{public}s', 'onAbilityCreateCallback');
+}
+
+async function addAbilityMonitorCallback(err: any) {
+    hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+    hilog.info(0x0000, 'testTag', 'addAbilityMonitorCallback : %{public}s', JSON.stringify(err) ?? '');
+}
+
+export default class OpenHarmonyTestRunner implements TestRunner {
+    constructor() {
+    }
+
+    onPrepare() {
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner OnPrepare ');
+    }
+
+    async onRun() {
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun run');
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var testAbilityName = abilityDelegatorArguments.bundleName + '.TestAbility'
+        let lMonitor = {
+            abilityName: testAbilityName,
+            onAbilityCreate: onAbilityCreateCallback,
+        };
+        abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
+        var cmd = 'aa start -d 0 -a TestAbility' + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
+        var debug = abilityDelegatorArguments.parameters['-D']
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', 'cmd : %{public}s', cmd);
+        abilityDelegator.executeShellCommand(cmd,
+            (err: any, d: any) => {
+                hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+                hilog.info(0x0000, 'testTag', 'executeShellCommand : err : %{public}s', JSON.stringify(err) ?? '');
+                hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', d.stdResult ?? '');
+                hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', d.exitCode ?? '');
+            })
+        hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun end');
+    }
+}
\ No newline at end of file

ability/ability_runtime/actsrevokequickfixtest/entry/src/main/ets/test/Ability.test.ets

+/*
+ * Copyright (c) 2023 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 hilog from '@ohos.hilog';
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
+import quickFixManager from '@ohos.app.ability.quickFixManager';
+
+export default function abilityTest() {
+  describe('ActsAbilityTest', function () {
+    beforeAll(function () {})
+    beforeEach(function () {})
+    afterEach(function () {})
+    afterAll(function () {})
+
+    /*
+     * @tc.number: Acts_applyQuickFixRevoke_1300
+     * @tc.name: Apply quick fix to support undo.
+     * @tc.desc: The passed-in exception parameter undefined calls revokeQuickFix, 
+     *           and there is an exception return value.
+     */
+    it('Acts_applyQuickFixRevoke_1300',0, function (done) {
+      hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+      hilog.info(0x0000, 'testTag', '%{public}s', 'it begin');
+      try {
+        quickFixManager.revokeQuickFix(undefined).then(() => {
+          console.info("====>Acts_applyQuickFixRevoke_1300  revokeQuickFix " +" ok");
+        }).catch((err) => {
+          console.info("====>Acts_applyQuickFixRevoke_1300  revokeQuickFix " +" failed, error code is ", JSON.stringify((err)));
+        })
+      } catch (err){
+        console.info("====>Acts_applyQuickFixRevoke_1300  try revokeQuickFix " +" failed, error code is ", JSON.stringify((err)));
+        expect(err.code).assertEqual(401)
+      }
+      done()
+    })
+
+    /*
+     * @tc.number: Acts_applyQuickFixRevoke_1400
+     * @tc.name: Apply quick fix to support undo.
+     * @tc.desc: An exception parameter null is passed in to call revokeQuickFix, 
+     *           and there is an exception return value.
+     */
+    it('Acts_applyQuickFixRevoke_1400',0, function (done) {
+      hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+      hilog.info(0x0000, 'testTag', '%{public}s', 'it begin');
+      try {
+        quickFixManager.revokeQuickFix(null).then(() => {
+          console.info("====>Acts_applyQuickFixRevoke_1400  revokeQuickFix " +" ok");
+        }).catch((err) => {
+          console.info("====>Acts_applyQuickFixRevoke_1400  revokeQuickFix " +" failed, error code is ", JSON.stringify((err)));
+        })
+      } catch (err){
+        console.info("====>Acts_applyQuickFixRevoke_1400   try revokeQuickFix " +" failed, error code is ", JSON.stringify((err)));
+        expect(err.code).assertEqual(401)
+      }
+      done()
+    })
+
+    /*
+     * @tc.number: Acts_applyQuickFixRevoke_1500
+     * @tc.name: Apply quick fix to support undo.
+     * @tc.desc: Non-system application calls revokeQuickFix, with abnormal return value.
+     */
+    it('Acts_applyQuickFixRevoke_1500',0, function (done) {
+      hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+      hilog.info(0x0000, 'testTag', '%{public}s', 'it begin');
+      try {
+        quickFixManager.revokeQuickFix("com.ohos.quickfixno").then(() => {
+          console.info("====>Acts_applyQuickFixRevoke_1500  revokeQuickFix " +" ok");
+        }).catch((err) => {
+          console.info("====>Acts_applyQuickFixRevoke_1500  revokeQuickFix " +" failed, error code is ", JSON.stringify((err)));
+        })
+      } catch (err) {
+        console.info("====>Acts_applyQuickFixRevoke_1500  try revokeQuickFix " +" failed, error code is ", JSON.stringify((err)));
+        expect(err.code).assertEqual(202)
+      }
+      done()
+    })
+
+    /*
+     * @tc.number: Acts_applyQuickFixRevoke_1600
+     * @tc.name: Apply quick fix to support undo.
+     * @tc.desc: The passed-in exception parameter undefined calls revokeQuickFix, 
+     * and there is an exception return value.
+     */
+    it('Acts_applyQuickFixRevoke_1600',0, function (done) {
+      hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+      hilog.info(0x0000, 'testTag', '%{public}s', 'it begin');
+      try {
+        quickFixManager.revokeQuickFix(undefined, (err) => {
+          console.info("====>Acts_applyQuickFixRevoke_1600  revokeQuickFix " + err.code);
+        })
+      } catch (err) {
+        console.info("====>Acts_applyQuickFixRevoke_1600  try revokeQuickFix " + err.code);
+        expect(err.code).assertEqual(401)
+      }
+      done()
+    })
+
+    /*
+     * @tc.number: Acts_applyQuickFixRevoke_1700
+     * @tc.name: Apply quick fix to support undo.
+     * @tc.desc: An exception parameter null is passed in to call revokeQuickFix, 
+     * and there is an exception return value.
+     */
+    it('Acts_applyQuickFixRevoke_1700',0, function (done) {
+      hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+      hilog.info(0x0000, 'testTag', '%{public}s', 'it begin');
+      try {
+        quickFixManager.revokeQuickFix(null, (err) => {
+          console.info("====>Acts_applyQuickFixRevoke_1700  revokeQuickFix " + err.code);
+        })
+      } catch (err) {
+        console.info("====>Acts_applyQuickFixRevoke_1700  try revokeQuickFix " + err.code);
+        expect(err.code).assertEqual(401)
+      }
+      done()
+    })
+
+    /*
+     * @tc.number: Acts_applyQuickFixRevoke_1800
+     * @tc.name: Apply quick fix to support undo.
+     * @tc.desc: Non-system application calls revokeQuickFix, with abnormal return value.
+     */
+    it('Acts_applyQuickFixRevoke_1800',0, function (done) {
+      hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+      hilog.info(0x0000, 'testTag', '%{public}s', 'it begin');
+      try {
+        quickFixManager.revokeQuickFix("com.ohos.quickfixno", (err) => {
+          console.info("====>Acts_applyQuickFixRevoke_1600  revokeQuickFix " + err.code);
+        })
+      } catch (err) {
+        console.info("====>Acts_applyQuickFixRevoke_1600  try revokeQuickFix " + err.code);
+        expect(err.code).assertEqual(202)
+      }
+      done()
+    })
+  })
+}
\ No newline at end of file

ability/ability_runtime/actsrevokequickfixtest/entry/src/main/ets/test/List.test.ets

+/*
+ * Copyright (c) 2023 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 abilityTest from './Ability.test'
+
+export default function testsuite() {
+  abilityTest()
+}
\ No newline at end of file

ability/ability_runtime/actsrevokequickfixtest/entry/src/main/ets/testability/TestAbility.ets

+/*
+ * Copyright (c) 2023 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 hilog from '@ohos.hilog';
+import Ability from '@ohos.app.ability.UIAbility'
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
+import testsuite from '../test/List.test'
+import Window from '@ohos.window'
+
+export default class TestAbility extends Ability {
+    onCreate(want, launchParam) {
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onCreate');
+        hilog.info(0x0000, 'testTag', '%{public}s', 'want param:' + JSON.stringify(want) ?? '');
+        hilog.info(0x0000, 'testTag', '%{public}s', 'launchParam:'+ JSON.stringify(launchParam) ?? '');
+        var abilityDelegator: any
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var abilityDelegatorArguments: any
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'start run testcase!!!');
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+    }
+
+    onDestroy() {
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onDestroy');
+    }
+
+    onWindowStageCreate(windowStage: Window.WindowStage) {
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onWindowStageCreate');
+        windowStage.loadContent('testability/pages/Index', (err, data) => {
+            if (err.code) {
+                hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.ERROR);
+                hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? '');
+                return;
+            }
+            hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+            hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s',
+                JSON.stringify(data) ?? '');
+        });
+    }
+
+    onWindowStageDestroy() {
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onWindowStageDestroy');
+    }
+
+    onForeground() {
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onForeground');
+    }
+
+    onBackground() {
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onBackground');
+    }
+}
\ No newline at end of file

ability/ability_runtime/actsrevokequickfixtest/entry/src/main/ets/testability/pages/Index.ets

+/*
+ * Copyright (c) 2023 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 hilog from '@ohos.hilog';
+
+@Entry
+@Component
+struct Index {
+  aboutToAppear() {
+    hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+    hilog.info(0x0000, 'testTag', '%{public}s', '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/actsrevokequickfixtest/entry/src/main/module.json

+{
+  "module": {
+    "name": "entry_test",
+    "type": "feature",
+    "description": "$string:module_test_desc",
+    "mainElement": "TestAbility",
+    "deviceTypes": [
+      "default",
+      "tablet"
+    ],
+    "deliveryWithInstall": true,
+    "installationFree": false,
+    "pages": "$profile:test_pages",
+    "abilities": [
+      {
+        "name": "TestAbility",
+        "srcEntrance": "./ets/testability/TestAbility.ets",
+        "description": "$string:TestAbility_desc",
+        "icon": "$media:icon",
+        "label": "$string:TestAbility_label",
+        "visible": true,
+        "startWindowIcon": "$media:icon",
+        "startWindowBackground": "$color:start_window_background",
+        "skills": [
+          {
+            "actions": [
+              "action.system.home"
+            ],
+            "entities": [
+              "entity.system.home"
+            ]
+          }
+        ]
+      }
+    ]
+  }
+}

ability/ability_runtime/actsrevokequickfixtest/entry/src/main/resources/base/element/color.json

+{
+  "color": [
+    {
+      "name": "start_window_background",
+      "value": "#FFFFFF"
+    }
+  ]
+}
\ No newline at end of file

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

+{
+  "string": [
+    {
+      "name": "module_test_desc",
+      "value": "test ability description"
+    },
+    {
+      "name": "TestAbility_desc",
+      "value": "the test ability"
+    },
+    {
+      "name": "TestAbility_label",
+      "value": "test label"
+    }
+  ]
+}
\ No newline at end of file

ability/ability_runtime/actsrevokequickfixtest/entry/src/main/resources/base/profile/test_pages.json

+{
+  "src": [
+    "testability/pages/Index"
+  ]
+}

notification/ces_standard/actsCommonEventManagerSupportTest/src/main/js/test/ActsCommonEventManagerSupportTest.js

@@ -381,6 +381,7 @@ export default function ActsCommonEventManagerSupportTest() {
       expect(commonEventManager.Support.COMMON_EVENT_USER_INFO_UPDATED).assertEqual('usual.event.USER_INFO_UPDATED')
       expect(commonEventManager.Support.COMMON_EVENT_HTTP_PROXY_CHANGE).assertEqual('usual.event.HTTP_PROXY_CHANGE')
       expect(commonEventManager.Support.COMMON_EVENT_DOMAIN_ACCOUNT_STATUS_CHANGED ).assertEqual('usual.event.DOMAIN_ACCOUNT_STATUS_CHANGED')
+      expect(commonEventManager.Support.COMMON_EVENT_QUICK_FIX_REVOKE_RESULT ).assertEqual('usual.event.QUICK_FIX_REVOKE_RESULT')
       console.info(`${TAG} SUB_NOTIFICATION_CES_MANAGER_SUPPORT_ENUM_TEST_2000 END`)
     })