From 71e112583cb0e28d4eac7fbbf212b318e7cb808a Mon Sep 17 00:00:00 2001 From: xialiangwei Date: Mon, 28 Aug 2023 09:09:56 +0000 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0UIExtension=E4=B8=ADXTS?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xialiangwei Change-Id: I56a1cfb6074ba55d486a8c3848b211aed3904dda --- .../actsabilityusertest/BUILD.gn | 2 +- .../entry/src/main/ets/MainAbility/MainAbility.ts | 14 ++++++++++++++ .../entry/src/main/ets/MainAbility/pages/index.ets | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/MainAbility3/MainAbility3.ts | 2 +- .../entry/src/main/ets/pages/index.ets | 2 +- .../entry/src/main/ets/pages/index2.ets | 2 +- .../entry/src/main/ets/pages/index3.ets | 2 +- .../entry/src/main/ets/pages/index.ets | 2 -- .../actsuiextensiontest/uiextensiontest/Test.json | 2 +- .../entry/src/main/ets/test/Ability.test.ets | 1 - 11 files changed, 22 insertions(+), 11 deletions(-) diff --git a/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/BUILD.gn b/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/BUILD.gn index 2cee5e6e7..75fb41d51 100644 --- a/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/BUILD.gn +++ b/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Huawei Device Co., Ltd. +# 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 diff --git a/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/MainAbility/MainAbility.ts index ed9f3fe31..79ba798ea 100644 --- a/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,3 +1,17 @@ +/* + * 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 Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { diff --git a/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/MainAbility/pages/index.ets index 9d55879f3..b59fce0fd 100644 --- a/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/MainAbility/pages/index.ets @@ -1,5 +1,5 @@ /* -* Copyright (c) 2022 Huawei Device Co., Ltd. +* 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 diff --git a/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/MainAbility2/MainAbility2.ts index 486375552..206293c06 100644 --- a/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * 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 diff --git a/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/MainAbility3/MainAbility3.ts index 389e95b22..28df4e28d 100644 --- a/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * 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 diff --git a/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/pages/index.ets index 3bb1376bf..b2ec8539b 100644 --- a/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/pages/index.ets +++ b/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/pages/index.ets @@ -1,5 +1,5 @@ /* -* Copyright (c) 2022 Huawei Device Co., Ltd. +* 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 diff --git a/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/pages/index2.ets b/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/pages/index2.ets index 3677a8602..7102122d0 100644 --- a/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/pages/index2.ets +++ b/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/pages/index2.ets @@ -1,5 +1,5 @@ /* -* Copyright (c) 2022 Huawei Device Co., Ltd. +* 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 diff --git a/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/pages/index3.ets b/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/pages/index3.ets index ae4dc0258..288d67612 100644 --- a/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/pages/index3.ets +++ b/ability/ability_runtime/actsuiextensiontest/actsabilityusertest/entry/src/main/ets/pages/index3.ets @@ -1,5 +1,5 @@ /* -* Copyright (c) 2022 Huawei Device Co., Ltd. +* 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 diff --git a/ability/ability_runtime/actsuiextensiontest/uiextensionprovider/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/actsuiextensiontest/uiextensionprovider/entry/src/main/ets/pages/index.ets index eefcadbf1..6fa75d76b 100644 --- a/ability/ability_runtime/actsuiextensiontest/uiextensionprovider/entry/src/main/ets/pages/index.ets +++ b/ability/ability_runtime/actsuiextensiontest/uiextensionprovider/entry/src/main/ets/pages/index.ets @@ -18,8 +18,6 @@ import commonEventManager from '@ohos.commonEventManager' import Logger from '../model/Logger' import common from '@ohos.app.ability.common'; let context= getContext(this) as common.UIExtensionContext; -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' -import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' const TAG: string = '[UIExtAbility]' const sleepTimeOne = 1000; diff --git a/ability/ability_runtime/actsuiextensiontest/uiextensiontest/Test.json b/ability/ability_runtime/actsuiextensiontest/uiextensiontest/Test.json index ddc28846d..b94f41d9a 100644 --- a/ability/ability_runtime/actsuiextensiontest/uiextensiontest/Test.json +++ b/ability/ability_runtime/actsuiextensiontest/uiextensiontest/Test.json @@ -12,7 +12,7 @@ { "test-file-name": [ "UIExtensionTest.hap", - "UIextensionProvider.hap", + "UIExtensionProvider.hap", "StartAbilityByUIContentSession.hap" ], "type": "AppInstallKit", diff --git a/ability/ability_runtime/actsuiextensiontest/uiextensiontest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/actsuiextensiontest/uiextensiontest/entry/src/main/ets/test/Ability.test.ets index 7a0ece51d..7512b60fa 100644 --- a/ability/ability_runtime/actsuiextensiontest/uiextensiontest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/actsuiextensiontest/uiextensiontest/entry/src/main/ets/test/Ability.test.ets @@ -22,7 +22,6 @@ export default function abilityTest() { describe('ACTS_UIExtension', function () { let TAG = ""; let sleepTimeOne = 1000; - let abilityContext = globalThis.abilityContext; // Defines a test suite. Two parameters are supported: test suite name and test suite function. beforeAll(function () { // Presets an action, which is performed only once before all test cases of the test suite start. -- GitLab