From 12888d3cccb021ed02c6c7f4896cbc8dbd053609 Mon Sep 17 00:00:00 2001 From: chensi10 Date: Mon, 13 Mar 2023 14:57:28 +0800 Subject: [PATCH] sidebar xts Signed-off-by: chensi10 --- arkui/BUILD.gn | 1 + arkui/ace_ets_components_ux/BUILD.gn | 19 + .../AppScope/app.json | 19 + .../resources/base/element/string.json | 8 + .../resources/base/media/app_icon.png | Bin 0 -> 6790 bytes .../ace_ets_component_sidebar/BUILD.gn | 43 ++ .../ace_ets_component_sidebar/Test.json | 26 + .../signature/openharmony_sx.p7b | Bin 0 -> 3440 bytes .../src/main/ets/TestAbility/TestAbility.ets | 63 +++ .../src/main/ets/TestAbility/pages/Index.ets | 245 ++++++++ .../ets/TestRunner/OpenHarmonyTestRunner.ts | 85 +++ .../src/main/ets/test/List.test.ets | 19 + .../src/main/ets/test/SideBar.ets | 525 ++++++++++++++++++ .../src/main/ets/test/Utils.ets | 26 + .../src/main/module.json | 45 ++ .../main/resources/base/element/color.json | 12 + .../main/resources/base/element/string.json | 28 + .../src/main/resources/base/media/icon.png | Bin 0 -> 6790 bytes .../resources/base/profile/test_pages.json | 5 + 19 files changed, 1169 insertions(+) create mode 100644 arkui/ace_ets_components_ux/BUILD.gn create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/AppScope/app.json create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/AppScope/resources/base/element/string.json create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/AppScope/resources/base/media/app_icon.png create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/BUILD.gn create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/Test.json create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/signature/openharmony_sx.p7b create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/TestAbility/TestAbility.ets create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/TestAbility/pages/Index.ets create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/test/List.test.ets create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/test/SideBar.ets create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/test/Utils.ets create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/module.json create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/resources/base/element/color.json create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/resources/base/element/string.json create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/resources/base/media/icon.png create mode 100644 arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/resources/base/profile/test_pages.json diff --git a/arkui/BUILD.gn b/arkui/BUILD.gn index 888346ca8..0526f836a 100644 --- a/arkui/BUILD.gn +++ b/arkui/BUILD.gn @@ -22,6 +22,7 @@ group("arkui") { "ace_ets_component_three:ActsAceEtsComponentThreeTest", "ace_ets_component_two:ActsAceEtsComponentTwoTest", "ace_ets_component_ui:ActsAceEtsComponentUITest", + "ace_ets_components_ux:componnetUxTest", "ace_ets_dev:ActsAceDevTest", "ace_ets_layout_test:ArkUIActsLayoutTest", "ace_ets_standard:ActsAceEtsStTest", diff --git a/arkui/ace_ets_components_ux/BUILD.gn b/arkui/ace_ets_components_ux/BUILD.gn new file mode 100644 index 000000000..fbbc3d914 --- /dev/null +++ b/arkui/ace_ets_components_ux/BUILD.gn @@ -0,0 +1,19 @@ +# 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. + +group("componnetUxTest") { + testonly = true + if (is_standard_system) { + deps = [ "ace_ets_component_sidebar:ActsAceSideBarTest" ] + } +} diff --git a/arkui/ace_ets_components_ux/ace_ets_component_sidebar/AppScope/app.json b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/AppScope/app.json new file mode 100644 index 000000000..792a5591f --- /dev/null +++ b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/AppScope/app.json @@ -0,0 +1,19 @@ +{ + "app": { + "bundleName": "com.example.acesidebartest", + "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 + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_components_ux/ace_ets_component_sidebar/AppScope/resources/base/element/string.json b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/AppScope/resources/base/element/string.json new file mode 100644 index 000000000..30af7cfee --- /dev/null +++ b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name":"app_name", + "value":"MyApplication" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_components_ux/ace_ets_component_sidebar/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c GIT binary patch literal 6790 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 literal 0 HcmV?d00001 diff --git a/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/TestAbility/TestAbility.ets b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/TestAbility/TestAbility.ets new file mode 100644 index 000000000..8d65dd2ea --- /dev/null +++ b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/TestAbility/TestAbility.ets @@ -0,0 +1,63 @@ +/* + * 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 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) ?? ''); + } + + 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'); + } +} diff --git a/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/TestAbility/pages/Index.ets b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/TestAbility/pages/Index.ets new file mode 100644 index 000000000..fe7c52014 --- /dev/null +++ b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/TestAbility/pages/Index.ets @@ -0,0 +1,245 @@ +/* + * 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 events_emitter from '@ohos.events.emitter'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'; +import { Hypium } from '@ohos/hypium'; +import hilog from '@ohos.hilog'; +import testsuite from '../../test/List.test' +@Entry +@Component +struct SideBarTest { + @State strokeWidthStr: string = '10px' + @State dividerColorStr: string = '#000000' + @State startMarginStr: string = '5px' + @State endMarginStr: string = '5px' + + @State nullFlag: boolean = false + + @State dividerColor: Color = Color.Red + + @State strokeWidthNum: number = 10 + @State dividerColorNum: number = 0x000000 + @State startMarginNum: number = 5 + @State endMarginNum: number = 5 + + @State strokeWidthRes: Resource = $r('app.string.Divider_width') + @State dividerColorRes: Resource = $r('app.color.Divider_color') + @State startMarginRes: Resource = $r('app.string.Divider_startMargin') + @State endMarginRes: Resource = $r('app.string.Divider_endMargin') + + private stateChangCallBack = (eventData) => { + console.info("sideBar page state change called:" + JSON.stringify(eventData)); + if (eventData != null) { + if (eventData.data.dividerColorStr != null) { + this.dividerColorStr = eventData.data.dividerColorStr; + } + if (eventData.data.strokeWidthStr != null) { + this.strokeWidthStr = eventData.data.strokeWidthStr; + } + if (eventData.data.startMarginStr != null) { + this.startMarginStr = eventData.data.startMarginStr; + } + if (eventData.data.endMarginStr != null) { + this.endMarginStr = eventData.data.endMarginStr; + } + if (eventData.data.nullFlag != null) { + this.nullFlag = eventData.data.nullFlag; + } + if (eventData.data.dividerColor != null) { + this.dividerColor = eventData.data.dividerColor; + } + if (eventData.data.strokeWidthNum != null) { + this.strokeWidthNum = eventData.data.strokeWidthNum; + } + if (eventData.data.dividerColorNum != null) { + this.dividerColorNum = eventData.data.dividerColorNum; + } + if (eventData.data.startMarginNum != null) { + this.startMarginNum = eventData.data.startMarginNum; + } + if (eventData.data.endMarginNum != null) { + this.endMarginNum = eventData.data.endMarginNum; + } + + if (eventData.data.dividerColorRes != null) { + this.dividerColorRes = eventData.data.dividerColorRes; + } + if (eventData.data.strokeWidthRes != null) { + this.strokeWidthRes = eventData.data.strokeWidthRes; + } + if (eventData.data.startMarginRes != null) { + this.startMarginRes = eventData.data.startMarginRes; + } + if (eventData.data.endMarginRes != null) { + this.endMarginRes = eventData.data.endMarginRes; + } + } + } + + aboutToAppear(){ + var stateChangeEvent = { + eventId: 183, + priority: events_emitter.EventPriority.LOW + } + events_emitter.on(stateChangeEvent, this.stateChangCallBack); + 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) + } + + build() { + Column() { + SideBarContainer(SideBarContainerType.Embed) + { + Column() {} + Column() {} + } + .showSideBar(true) + .sideBarWidth(120) + .minSideBarWidth(100) + .maxSideBarWidth(150) + .sideBarPosition(SideBarPosition.Start) + .height('200vp') + .key('sideBarTest1') + .controlButton({ + left: 16, top: 48, width: 32, height: 32, + icons: {shown: $r("app.media.icon"), + hidden: $r("app.media.icon"), + switching: $r("app.media.icon")} + }) + + SideBarContainer(SideBarContainerType.Embed) + { + Column() {} + Column() {} + } + .showSideBar(true) + .sideBarWidth(120) + .minSideBarWidth(100) + .maxSideBarWidth(150) + .sideBarPosition(SideBarPosition.Start) + .height('200vp') + .key('sideBarTest2') + .controlButton({ + left: 16, top: 48, width: 32, height: 32, + icons: {shown: $r("app.media.icon"), + hidden: $r("app.media.icon"), + switching: $r("app.media.icon")} + }) + .divider(this.nullFlag ? null : { strokeWidth: this.strokeWidthNum, + color: this.dividerColorNum, + startMargin: this.startMarginNum, + endMargin: this.endMarginNum + }) + + SideBarContainer(SideBarContainerType.Embed) + { + Column() {} + Column() {} + } + .showSideBar(true) + .sideBarWidth(120) + .minSideBarWidth(100) + .maxSideBarWidth(150) + .sideBarPosition(SideBarPosition.Start) + .height('200vp') + .key('sideBarTest3') + .controlButton({ + left: 16, top: 48, width: 32, height: 32, + icons: {shown: $r("app.media.icon"), + hidden: $r("app.media.icon"), + switching: $r("app.media.icon")} + }) + .divider({ strokeWidth: this.strokeWidthStr, + color: this.dividerColorStr, + startMargin: this.startMarginStr, + endMargin: this.endMarginStr + }) + + SideBarContainer(SideBarContainerType.Embed) + { + Column() {} + Column() {} + } + .showSideBar(true) + .sideBarWidth(120) + .minSideBarWidth(100) + .maxSideBarWidth(150) + .sideBarPosition(SideBarPosition.Start) + .height('200vp') + .key('sideBarTest4') + .controlButton({ + left: 16, top: 48, width: 32, height: 32, + icons: {shown: $r("app.media.icon"), + hidden: $r("app.media.icon"), + switching: $r("app.media.icon")} + }) + .divider({ strokeWidth: this.strokeWidthRes, + color: this.dividerColorRes, + startMargin: this.startMarginRes, + endMargin: this.endMarginRes + }) + + SideBarContainer(SideBarContainerType.Embed) + { + Column() {} + Column() {} + } + .showSideBar(true) + .sideBarWidth(120) + .minSideBarWidth(100) + .maxSideBarWidth(150) + .sideBarPosition(SideBarPosition.Start) + .height('200vp') + .key('sideBarTest5') + .controlButton({ + left: 16, top: 48, width: 32, height: 32, + icons: {shown: $r("app.media.icon"), + hidden: $r("app.media.icon"), + switching: $r("app.media.icon")} + }) + .divider({ strokeWidth: this.strokeWidthNum, + color: this.dividerColor, + startMargin: this.startMarginNum, + endMargin: this.endMarginNum + }) + + SideBarContainer(SideBarContainerType.Embed) + { + Column() {} + Column() {} + } + .showSideBar(true) + .sideBarWidth(120) + .minSideBarWidth(100) + .maxSideBarWidth(150) + .sideBarPosition(SideBarPosition.Start) + .height('200vp') + .key('sideBarTest6') + .controlButton({ + left: 16, top: 48, width: 32, height: 32, + icons: {shown: $r("app.media.icon"), + hidden: $r("app.media.icon"), + switching: $r("app.media.icon")} + }) + .divider({ strokeWidth: this.strokeWidthNum }) + } + } +} diff --git a/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 000000000..d6c662824 --- /dev/null +++ b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,85 @@ +/* + * 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 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 diff --git a/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/test/List.test.ets b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/test/List.test.ets new file mode 100644 index 000000000..933cd56e9 --- /dev/null +++ b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/test/List.test.ets @@ -0,0 +1,19 @@ +/* + * 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 sidebar from './SideBar' + +export default function testsuite() { + sidebar() +} \ No newline at end of file diff --git a/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/test/SideBar.ets b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/test/SideBar.ets new file mode 100644 index 000000000..4b7c47ed5 --- /dev/null +++ b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/test/SideBar.ets @@ -0,0 +1,525 @@ +/* + * 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. + */ +// @ts-nocheck +import { describe, beforeEach, afterEach, it, expect } from '@ohos/hypium' +import events_emitter from '@ohos.events.emitter'; +import Utils from './Utils.ets'; +export default function sidebar() { + describe('ActsAceSideBarTest', function () { + beforeEach(async function (done) { + await Utils.sleep(2000); + console.info("sidebar beforeEach start"); + done(); + }) + + afterEach(async function (done) { + console.info("sidebar afterEach start"); + try { + var eventData = { + data: { + "strokeWidthStr": '10px', + "dividerColorStr": '#000000', + "startMarginStr": '5px', + "endMarginStr": '5px', + + "nullFlag": false, + + "dividerColor": Color.Red, + + "strokeWidthNum": 10, + "dividerColorNum": 0x000000, + "startMarginNum": 5, + "endMarginNum": 5, + + "strokeWidthRes": $r('app.string.Divider_width'), + "dividerColorRes": $r('app.color.Divider_color'), + "startMarginRes": $r('app.string.Divider_startMargin'), + "endMarginRes": $r('app.string.Divider_endMargin'), + } + } + var innerEvent = { + eventId: 183, + priority: events_emitter.EventPriority.LOW + } + console.info("[ArkUI_SideBarContainer_Divider] start to publish emit"); + events_emitter.emit(innerEvent, eventData); + } catch (err) { + console.log("[ArkUI_SideBarContainer_Divider] change component data error: " + err.message); + } + await Utils.sleep(2000); + done(); + }) + + /** + * @tc.number ArkUI_SideBarContainer_Divider_0100 + * @tc.name Tests the divider property of the SideBarContainer component + * @tc.desc Gets the default values of divider for the SideBarContainer component + */ + it('ArkUI_SideBarContainer_Divider_0100', 0, async function (done) { + console.info("ArkUI_SideBarContainer_Divider_0100 start"); + let strJson = getInspectorByKey('sideBarTest1'); + console.info("ArkUI_SideBarContainer_Divider_0100: " + JSON.stringify(strJson)) + let obj = JSON.parse(strJson); + console.info("[ArkUI_SideBarContainer_Divider_0100] divider:" + obj.$attrs.divider); + let dividerObject = JSON.parse(obj.$attrs.divider); + expect(dividerObject.strokeWidth).assertEqual("1.00vp"); + expect(dividerObject.color).assertEqual("#08000000"); + expect(dividerObject.startMargin).assertEqual("0.00vp"); + expect(dividerObject.endMargin).assertEqual("0.00vp"); + done(); + }); + + /** + * @tc.number ArkUI_SideBarContainer_Divider_0200 + * @tc.name Tests the divider property of the SideBarContainer component + * @tc.desc Gets the values of divider for the SideBarContainer component, + * and the property values of the divider are of type number. + */ + it('ArkUI_SideBarContainer_Divider_0200', 0, async function (done) { + console.info("ArkUI_SideBarContainer_Divider_0200 start"); + let strJson = getInspectorByKey('sideBarTest2'); + console.info("ArkUI_SideBarContainer_Divider_0200: " + JSON.stringify(strJson)) + let obj = JSON.parse(strJson); + console.info("[ArkUI_SideBarContainer_Divider_0200] divider:" + obj.$attrs.divider); + let dividerObject = JSON.parse(obj.$attrs.divider); + expect(dividerObject.strokeWidth).assertEqual("10.00vp"); + expect(dividerObject.color).assertEqual("#FF000000"); + expect(dividerObject.startMargin).assertEqual("5.00vp"); + expect(dividerObject.endMargin).assertEqual("5.00vp"); + done(); + }); + + /** + * @tc.number ArkUI_SideBarContainer_Divider_0300 + * @tc.name Tests the divider property of the SideBarContainer component + * @tc.desc Gets the values of divider for the SideBarContainer component, + * and the property values of the divider are of type string, + * the units are px. + */ + it('ArkUI_SideBarContainer_Divider_0300', 0, async function (done) { + console.info("ArkUI_SideBarContainer_Divider_0300 start"); + let strJson = getInspectorByKey('sideBarTest3'); + console.info("ArkUI_SideBarContainer_Divider_0300: " + JSON.stringify(strJson)) + let obj = JSON.parse(strJson); + console.info("[ArkUI_SideBarContainer_Divider_0300] divider:" + obj.$attrs.divider); + let dividerObject = JSON.parse(obj.$attrs.divider); + expect(dividerObject.strokeWidth).assertEqual("10.00px"); + expect(dividerObject.color).assertEqual("#FF000000"); + expect(dividerObject.startMargin).assertEqual("5.00px"); + expect(dividerObject.endMargin).assertEqual("5.00px"); + done(); + }); + + /** + * @tc.number ArkUI_SideBarContainer_Divider_0400 + * @tc.name Tests the divider property of the SideBarContainer component + * @tc.desc Gets the values of divider for the SideBarContainer component, + * and the property values of the divider are of type string, + * the units are vp. + */ + it('ArkUI_SideBarContainer_Divider_0400', 0, async function (done) { + console.info("ArkUI_SideBarContainer_Divider_0400 start"); + let strJson = getInspectorByKey('sideBarTest3'); + console.info("ArkUI_SideBarContainer_Divider_0400: " + JSON.stringify(strJson)) + + let strokeWidthStr = '10vp'; + let startMarginStr = '5vp'; + let endMarginStr = '5vp'; + try { + var eventData = { + data: { + "strokeWidthStr": strokeWidthStr, + "startMarginStr": startMarginStr, + "endMarginStr": endMarginStr + } + } + var innerEvent = { + eventId: 183, + priority: events_emitter.EventPriority.LOW + } + console.info("ArkUI_SideBarContainer_Divider_0400 start to publish emit"); + events_emitter.emit(innerEvent, eventData); + } catch (err) { + console.log("ArkUI_SideBarContainer_Divider_0400 change component data error: " + err.message); + } + await Utils.sleep(2000); + + let newJson = getInspectorByKey('sideBarTest3'); + console.info("ArkUI_SideBarContainer_Divider_0400: " + JSON.stringify(newJson)) + let obj = JSON.parse(newJson); + console.info("[ArkUI_SideBarContainer_Divider_0400] divider:" + obj.$attrs.divider); + let dividerObject = JSON.parse(obj.$attrs.divider); + expect(dividerObject.strokeWidth).assertEqual("10.00vp"); + expect(dividerObject.color).assertEqual("#FF000000"); + expect(dividerObject.startMargin).assertEqual("5.00vp"); + expect(dividerObject.endMargin).assertEqual("5.00vp"); + done(); + }); + + /** + * @tc.number ArkUI_SideBarContainer_Divider_0500 + * @tc.name Tests the divider property of the SideBarContainer component + * @tc.desc Gets the values of divider for the SideBarContainer component, + * and the property values of the divider are of type string, + * the units are fp. + */ + it('ArkUI_SideBarContainer_Divider_0500', 0, async function (done) { + console.info("ArkUI_SideBarContainer_Divider_0500 start"); + let strJson = getInspectorByKey('sideBarTest3'); + console.info("ArkUI_SideBarContainer_Divider_0500: " + JSON.stringify(strJson)) + + let strokeWidthStr = '10fp'; + let startMarginStr = '5fp'; + let endMarginStr = '5fp'; + try { + var eventData = { + data: { + "strokeWidthStr": strokeWidthStr, + "startMarginStr": startMarginStr, + "endMarginStr": endMarginStr + } + } + var innerEvent = { + eventId: 183, + priority: events_emitter.EventPriority.LOW + } + console.info("ArkUI_SideBarContainer_Divider_0500 start to publish emit"); + events_emitter.emit(innerEvent, eventData); + } catch (err) { + console.log("ArkUI_SideBarContainer_Divider_0500 change component data error: " + err.message); + } + await Utils.sleep(2000); + + let newJson = getInspectorByKey('sideBarTest3'); + console.info("ArkUI_SideBarContainer_Divider_0500: " + JSON.stringify(newJson)) + let obj = JSON.parse(newJson); + console.info("[ArkUI_SideBarContainer_Divider_0500] divider:" + obj.$attrs.divider); + let dividerObject = JSON.parse(obj.$attrs.divider); + expect(dividerObject.strokeWidth).assertEqual("10.00fp"); + expect(dividerObject.color).assertEqual("#FF000000"); + expect(dividerObject.startMargin).assertEqual("5.00fp"); + expect(dividerObject.endMargin).assertEqual("5.00fp"); + done(); + }); + + /** + * @tc.number ArkUI_SideBarContainer_Divider_0600 + * @tc.name Tests the divider property of the SideBarContainer component + * @tc.desc Gets the values of divider for the SideBarContainer component, + * and the property values of the divider are of type string, + * the units are lpx. + */ + it('ArkUI_SideBarContainer_Divider_0600', 0, async function (done) { + console.info("ArkUI_SideBarContainer_Divider_0600 start"); + let strJson = getInspectorByKey('sideBarTest3'); + console.info("ArkUI_SideBarContainer_Divider_0600: " + JSON.stringify(strJson)) + + let strokeWidthStr = '10lpx'; + let startMarginStr = '5lpx'; + let endMarginStr = '5lpx'; + try { + var eventData = { + data: { + "strokeWidthStr": strokeWidthStr, + "startMarginStr": startMarginStr, + "endMarginStr": endMarginStr + } + } + var innerEvent = { + eventId: 183, + priority: events_emitter.EventPriority.LOW + } + console.info("ArkUI_SideBarContainer_Divider_0600 start to publish emit"); + events_emitter.emit(innerEvent, eventData); + } catch (err) { + console.log("ArkUI_SideBarContainer_Divider_0600 change component data error: " + err.message); + } + await Utils.sleep(2000); + + let newJson = getInspectorByKey('sideBarTest3'); + console.info("ArkUI_SideBarContainer_Divider_0600: " + JSON.stringify(newJson)) + let obj = JSON.parse(newJson); + console.info("[ArkUI_SideBarContainer_Divider_0600] divider:" + obj.$attrs.divider); + let dividerObject = JSON.parse(obj.$attrs.divider); + expect(dividerObject.strokeWidth).assertEqual("10.00lpx"); + expect(dividerObject.color).assertEqual("#FF000000"); + expect(dividerObject.startMargin).assertEqual("5.00lpx"); + expect(dividerObject.endMargin).assertEqual("5.00lpx"); + done(); + }); + + /** + * @tc.number ArkUI_SideBarContainer_Divider_0700 + * @tc.name Tests the divider property of the SideBarContainer component + * @tc.desc Gets the values of divider for the SideBarContainer component, + * and the property values of the divider are of type Resource. + */ + it('ArkUI_SideBarContainer_Divider_0700', 0, async function (done) { + console.info("ArkUI_SideBarContainer_Divider_0700 start"); + let strJson = getInspectorByKey('sideBarTest4'); + console.info("ArkUI_SideBarContainer_Divider_0700: " + JSON.stringify(strJson)) + let obj = JSON.parse(strJson); + console.info("[ArkUI_SideBarContainer_Divider_0700] divider:" + obj.$attrs.divider); + let dividerObject = JSON.parse(obj.$attrs.divider); + expect(dividerObject.strokeWidth).assertEqual("10.00px"); + expect(dividerObject.color).assertEqual("#FF000000"); + expect(dividerObject.startMargin).assertEqual("5.00px"); + expect(dividerObject.endMargin).assertEqual("5.00px"); + done(); + }); + + /** + * @tc.number ArkUI_SideBarContainer_Divider_0800 + * @tc.name Tests the divider property of the SideBarContainer component + * @tc.desc Gets the values of divider for the SideBarContainer component, + * and the color value of the divider is of type Color. + */ + it('ArkUI_SideBarContainer_Divider_0800', 0, async function (done) { + console.info("ArkUI_SideBarContainer_Divider_0800 start"); + let strJson = getInspectorByKey('sideBarTest5'); + console.info("ArkUI_SideBarContainer_Divider_0800: " + JSON.stringify(strJson)) + let obj = JSON.parse(strJson); + console.info("[ArkUI_SideBarContainer_Divider_0800] divider:" + obj.$attrs.divider); + let dividerObject = JSON.parse(obj.$attrs.divider); + expect(dividerObject.strokeWidth).assertEqual("10.00vp"); + expect(dividerObject.color).assertEqual("#FFFF0000"); + expect(dividerObject.startMargin).assertEqual("5.00vp"); + expect(dividerObject.endMargin).assertEqual("5.00vp"); + done(); + }); + + /** + * @tc.number ArkUI_SideBarContainer_Divider_0900 + * @tc.name Tests the divider property of the SideBarContainer component + * @tc.desc Gets the values of divider for the SideBarContainer component, + * when only the strokeWidth value of the divider is set. + */ + it('ArkUI_SideBarContainer_Divider_0900', 0, async function (done) { + console.info("ArkUI_SideBarContainer_Divider_0900 start"); + let strJson = getInspectorByKey('sideBarTest6'); + console.info("ArkUI_SideBarContainer_Divider_0900: " + JSON.stringify(strJson)) + let obj = JSON.parse(strJson); + console.info("[ArkUI_SideBarContainer_Divider_0900] divider:" + obj.$attrs.divider); + let dividerObject = JSON.parse(obj.$attrs.divider); + expect(dividerObject.strokeWidth).assertEqual("10.00vp"); + expect(dividerObject.color).assertEqual("#08000000"); + expect(dividerObject.startMargin).assertEqual("0.00vp"); + expect(dividerObject.endMargin).assertEqual("0.00vp"); + done(); + }); + + /** + * @tc.number ArkUI_SideBarContainer_Divider_1000 + * @tc.name Tests the divider property of the SideBarContainer component + * @tc.desc Gets the strokeWidth of divider for the SideBarContainer component, + * when the value of the divider is null. + */ + it('ArkUI_SideBarContainer_Divider_1000', 0, async function (done) { + console.info("ArkUI_SideBarContainer_Divider_1000 start"); + let strJson = getInspectorByKey('sideBarTest2'); + console.info("ArkUI_SideBarContainer_Divider_1000: " + JSON.stringify(strJson)) + try { + var eventData = { + data: { + "nullFlag": true, + } + } + var innerEvent = { + eventId: 183, + priority: events_emitter.EventPriority.LOW + } + console.info("[ArkUI_SideBarContainer_Divider_1000] start to publish emit"); + events_emitter.emit(innerEvent, eventData); + } catch (err) { + console.log("[ArkUI_SideBarContainer_Divider_1000] change component data error: " + err.message); + } + await Utils.sleep(2000); + let newJson = getInspectorByKey('sideBarTest2'); + let obj = JSON.parse(newJson); + console.info("[ArkUI_SideBarContainer_Divider_1000] divider:" + JSON.stringify(obj.$attrs.divider)); + let dividerObject = JSON.parse(obj.$attrs.divider); + expect(dividerObject.strokeWidth).assertEqual("0.00vp"); + done(); + }); + + /** + * @tc.number ArkUI_SideBarContainer_Divider_1100 + * @tc.name Tests the divider property of the SideBarContainer component + * @tc.desc Gets the strokeWidth of divider for the SideBarContainer component, + * when the strokeWidth value of the divider is set incorrectly. + */ + it('ArkUI_SideBarContainer_Divider_1100', 0, async function (done) { + console.info("ArkUI_SideBarContainer_Divider_1100 start"); + let strJson = getInspectorByKey('sideBarTest2'); + console.info("ArkUI_SideBarContainer_Divider_1100: " + JSON.stringify(strJson)) + let obj = JSON.parse(strJson); + console.info("[ArkUI_SideBarContainer_Divider_1100] divider:" + obj.$attrs.divider); + let dividerObject = JSON.parse(obj.$attrs.divider); + expect(dividerObject.strokeWidth).assertEqual("10.00vp"); + expect(dividerObject.color).assertEqual("#FF000000"); + expect(dividerObject.startMargin).assertEqual("5.00vp"); + expect(dividerObject.endMargin).assertEqual("5.00vp"); + + try { + var eventData = { + data: { + "strokeWidthNum": -1, + } + } + var innerEvent = { + eventId: 183, + priority: events_emitter.EventPriority.LOW + } + console.info("[ArkUI_SideBarContainer_Divider_1100] start to publish emit"); + events_emitter.emit(innerEvent, eventData); + } catch (err) { + console.log("[ArkUI_SideBarContainer_Divider_1100] change component data error: " + err.message); + } + await Utils.sleep(2000); + let newJson = getInspectorByKey('sideBarTest2'); + let newobj = JSON.parse(newJson); + console.info("[ArkUI_SideBarContainer_Divider_1100] divider:" + JSON.stringify(newobj.$attrs.divider)); + let newdividerObject = JSON.parse(newobj.$attrs.divider); + expect(newdividerObject.strokeWidth).assertEqual("1.00vp"); + done(); + }); + + /** + * @tc.number ArkUI_SideBarContainer_Divider_1200 + * @tc.name Tests the divider property of the SideBarContainer component + * @tc.desc Gets the color of divider for the SideBarContainer component, + * when the color value of the divider is set incorrectly. + */ + it('ArkUI_SideBarContainer_Divider_1200', 0, async function (done) { + console.info("ArkUI_SideBarContainer_Divider_1200 start"); + let strJson = getInspectorByKey('sideBarTest3'); + console.info("ArkUI_SideBarContainer_Divider_1200: " + JSON.stringify(strJson)) + let obj = JSON.parse(strJson); + console.info("[ArkUI_SideBarContainer_Divider_1200] divider:" + obj.$attrs.divider); + let dividerObject = JSON.parse(obj.$attrs.divider); + expect(dividerObject.strokeWidth).assertEqual("10.00px"); + expect(dividerObject.color).assertEqual("#FF000000"); + expect(dividerObject.startMargin).assertEqual("5.00px"); + expect(dividerObject.endMargin).assertEqual("5.00px"); + + try { + var eventData = { + data: { + "dividerColorStr": 'aaaaa', + } + } + var innerEvent = { + eventId: 183, + priority: events_emitter.EventPriority.LOW + } + console.info("[ArkUI_SideBarContainer_Divider_1200] start to publish emit"); + events_emitter.emit(innerEvent, eventData); + } catch (err) { + console.log("[ArkUI_SideBarContainer_Divider_1200] change component data error: " + err.message); + } + await Utils.sleep(2000); + let newJson = getInspectorByKey('sideBarTest3'); + let newobj = JSON.parse(newJson); + console.info("[ArkUI_SideBarContainer_Divider_1200] divider:" + JSON.stringify(newobj.$attrs.divider)); + let newdividerObject = JSON.parse(newobj.$attrs.divider); + expect(newdividerObject.color).assertEqual("#08000000"); + done(); + }); + + /** + * @tc.number ArkUI_SideBarContainer_Divider_1300 + * @tc.name Tests the divider property of the SideBarContainer component + * @tc.desc Gets the startMarginNum of divider for the SideBarContainer component, + * when the startMarginNum value of the divider is set incorrectly. + */ + it('ArkUI_SideBarContainer_Divider_1300', 0, async function (done) { + console.info("ArkUI_SideBarContainer_Divider_1300 start"); + let strJson = getInspectorByKey('sideBarTest2'); + console.info("ArkUI_SideBarContainer_Divider_1300: " + JSON.stringify(strJson)) + let obj = JSON.parse(strJson); + console.info("[ArkUI_SideBarContainer_Divider_1300] divider:" + obj.$attrs.divider); + let dividerObject = JSON.parse(obj.$attrs.divider); + expect(dividerObject.strokeWidth).assertEqual("10.00vp"); + expect(dividerObject.color).assertEqual("#FF000000"); + expect(dividerObject.startMargin).assertEqual("5.00vp"); + expect(dividerObject.endMargin).assertEqual("5.00vp"); + + try { + var eventData = { + data: { + "startMarginNum": -1, + } + } + var innerEvent = { + eventId: 183, + priority: events_emitter.EventPriority.LOW + } + console.info("[ArkUI_SideBarContainer_Divider_1300] start to publish emit"); + events_emitter.emit(innerEvent, eventData); + } catch (err) { + console.log("[ArkUI_SideBarContainer_Divider_1300] change component data error: " + err.message); + } + await Utils.sleep(2000); + let newJson = getInspectorByKey('sideBarTest2'); + let newobj = JSON.parse(newJson); + console.info("[ArkUI_SideBarContainer_Divider_1300] divider:" + JSON.stringify(newobj.$attrs.divider)); + let newdividerObject = JSON.parse(newobj.$attrs.divider); + expect(newdividerObject.startMargin).assertEqual("0.00vp"); + done(); + }); + + /** + * @tc.number ArkUI_SideBarContainer_Divider_1400 + * @tc.name Tests the divider property of the SideBarContainer component + * @tc.desc Gets the endMarginNum of divider for the SideBarContainer component, + * when the endMarginNum value of the divider is set incorrectly. + */ + it('ArkUI_SideBarContainer_Divider_1400', 0, async function (done) { + console.info("ArkUI_SideBarContainer_Divider_1400 start"); + let strJson = getInspectorByKey('sideBarTest2'); + console.info("ArkUI_SideBarContainer_Divider_1400: " + JSON.stringify(strJson)) + let obj = JSON.parse(strJson); + console.info("[ArkUI_SideBarContainer_Divider_1400] divider:" + obj.$attrs.divider); + let dividerObject = JSON.parse(obj.$attrs.divider); + expect(dividerObject.strokeWidth).assertEqual("10.00vp"); + expect(dividerObject.color).assertEqual("#FF000000"); + expect(dividerObject.startMargin).assertEqual("5.00vp"); + expect(dividerObject.endMargin).assertEqual("5.00vp"); + + try { + var eventData = { + data: { + "endMarginNum": -1, + } + } + var innerEvent = { + eventId: 183, + priority: events_emitter.EventPriority.LOW + } + console.info("[ArkUI_SideBarContainer_Divider_1400] start to publish emit"); + events_emitter.emit(innerEvent, eventData); + } catch (err) { + console.log("[ArkUI_SideBarContainer_Divider_1400] change component data error: " + err.message); + } + await Utils.sleep(2000); + let newJson = getInspectorByKey('sideBarTest2'); + let newobj = JSON.parse(newJson); + console.info("[ArkUI_SideBarContainer_Divider_1400] divider:" + JSON.stringify(newobj.$attrs.divider)); + let newdividerObject = JSON.parse(newobj.$attrs.divider); + expect(newdividerObject.endMargin).assertEqual("0.00vp"); + done(); + }); + }) +} diff --git a/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/test/Utils.ets b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/test/Utils.ets new file mode 100644 index 000000000..6fecbfe80 --- /dev/null +++ b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/ets/test/Utils.ets @@ -0,0 +1,26 @@ +/* + * 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. + */ + +export default class Utils { + static sleep(time){ + return new Promise((resolve,reject)=>{ + setTimeout(()=>{ + resolve("ok") + },time) + }).then(()=>{ + console.info(`sleep ${time} over...`) + }) + } +} diff --git a/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/module.json b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/module.json new file mode 100644 index 000000000..13a12a383 --- /dev/null +++ b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/module.json @@ -0,0 +1,45 @@ +{ + "module": { + "name": "phone", + "type": "feature", + "description": "$string:module_test_desc", + "mainElement": "TestAbility", + "deviceTypes": [ + "default", + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:test_pages", + "metadata": [{ + "name": "ArkTSPartialUpdate", + "value": "true" + }], + "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" + ] + } + ] + } + ], + "metadata": [{ + "name": "ArkTSPartialUpdate", + "value": "true" + }] + } +} diff --git a/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/resources/base/element/color.json b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/resources/base/element/color.json new file mode 100644 index 000000000..ee90226a5 --- /dev/null +++ b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/resources/base/element/color.json @@ -0,0 +1,12 @@ +{ + "color": [ + { + "name": "start_window_background", + "value": "#FFFFFF" + }, + { + "name": "Divider_color", + "value": "#000000" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/resources/base/element/string.json b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/resources/base/element/string.json new file mode 100644 index 000000000..c17943cb3 --- /dev/null +++ b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/resources/base/element/string.json @@ -0,0 +1,28 @@ +{ + "string": [ + { + "name": "module_test_desc", + "value": "test ability description" + }, + { + "name": "TestAbility_desc", + "value": "the test ability" + }, + { + "name": "TestAbility_label", + "value": "test label" + }, + { + "name": "Divider_width", + "value": "10px" + }, + { + "name": "Divider_startMargin", + "value": "5px" + }, + { + "name": "Divider_endMargin", + "value": "5px" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/resources/base/media/icon.png b/arkui/ace_ets_components_ux/ace_ets_component_sidebar/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c GIT binary patch literal 6790 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