diff --git a/arkui/BUILD.gn b/arkui/BUILD.gn index f8af0fcc3aaf08dd289c2492fe5e2b911f98d565..c28988afc46cb5ad8589dcb1f82761a768cd1db6 100644 --- a/arkui/BUILD.gn +++ b/arkui/BUILD.gn @@ -16,6 +16,7 @@ group("arkui") { deps = [ "ace_ets_component:ActsAceEtsComponentTest", "ace_ets_component_api:ActsAceComponentApi03Test", + "ace_ets_component_api_five:ActsAceComponentApi06Test", "ace_ets_component_api_four:ActsAceComponentApi05Test", "ace_ets_component_api_three:ActsAceComponentApi04Test", "ace_ets_component_api_two:ActsAceComponentApi02Test", diff --git a/arkui/ace_ets_component_api_five/AppScope/app.json b/arkui/ace_ets_component_api_five/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..da4d2d6aafc26d4188e12d9ab64fcea256326666 --- /dev/null +++ b/arkui/ace_ets_component_api_five/AppScope/app.json @@ -0,0 +1,19 @@ +{ + "app": { + "bundleName": "com.open.harmony.componentapi06", + "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_component_api_five/AppScope/resources/base/element/string.json b/arkui/ace_ets_component_api_five/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..30af7cfee6766dda361b893d1565490dc145fdf0 --- /dev/null +++ b/arkui/ace_ets_component_api_five/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_component_api_five/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_component_api_five/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/arkui/ace_ets_component_api_five/AppScope/resources/base/media/app_icon.png differ diff --git a/arkui/ace_ets_component_api_five/BUILD.gn b/arkui/ace_ets_component_api_five/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..5dd9d947bfeca55f7aab29de05435cb88597ee5c --- /dev/null +++ b/arkui/ace_ets_component_api_five/BUILD.gn @@ -0,0 +1,43 @@ +# 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("ActsAceComponentApi06Test") { + hap_profile = "src/main/module.json" + js_build_mode = "debug" + deps = [ + ":ace_ets_component_api_06_js_assets", + ":ace_ets_component_api_06_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsAceComponentApi06Test" + part_name = "ace_engine" + subsystem_name = "arkui" +} + +ohos_app_scope("ace_ets_component_api_06_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("ace_ets_component_api_06_js_assets") { + source_dir = "src/main/ets" +} + +ohos_resources("ace_ets_component_api_06_resources") { + sources = [ "src/main/resources" ] + deps = [ ":ace_ets_component_api_06_profile" ] + hap_profile = "src/main/module.json" +} diff --git a/arkui/ace_ets_component_api_five/Test.json b/arkui/ace_ets_component_api_five/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..8d572a8b3f9031d4bd88ec79708e5bffa19a592c --- /dev/null +++ b/arkui/ace_ets_component_api_five/Test.json @@ -0,0 +1,26 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "600000", + "bundle-name": "com.open.harmony.componentapi06", + "module-name": "entry_test", + "shell-timeout": "600000", + "testcase-timeout": 240000 + }, + "kits": [{ + "test-file-name": [ + "ActsAceComponentApi06Test.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, + { + "type": "ShellKit", + "run-command": [ + "power-shell wakeup", + "power-shell setmode 602" + ] + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_component_api_five/signature/openharmony_sx.p7b b/arkui/ace_ets_component_api_five/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..f1418ad7ca79271d10be19bbc7985a90105cc7b8 Binary files /dev/null and b/arkui/ace_ets_component_api_five/signature/openharmony_sx.p7b differ diff --git a/arkui/ace_ets_component_api_five/src/main/ets/TestAbility/TestAbility.ets b/arkui/ace_ets_component_api_five/src/main/ets/TestAbility/TestAbility.ets new file mode 100644 index 0000000000000000000000000000000000000000..8d65dd2ea8346a8b5d12ac7aff026197a95abaea --- /dev/null +++ b/arkui/ace_ets_component_api_five/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_component_api_five/src/main/ets/TestAbility/pages/Index.ets b/arkui/ace_ets_component_api_five/src/main/ets/TestAbility/pages/Index.ets new file mode 100644 index 0000000000000000000000000000000000000000..fa2844b5987d58ea80ce36def9b6c498e29b1917 --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/ets/TestAbility/pages/Index.ets @@ -0,0 +1,58 @@ +/* + * 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 hilog from '@ohos.hilog'; +import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; +import { Hypium } from '@ohos/hypium'; +import testsuite from '../../test/List.test'; + +@Entry +@Component +struct Index { + aboutToAppear() { + hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility index aboutToAppear'); + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + hilog.info(0x0000, 'testTag', '%{public}s', 'start run testcase!!!'); + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + @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 diff --git a/arkui/ace_ets_component_api_five/src/main/ets/TestAbility/pages/SwiperMargin.ets b/arkui/ace_ets_component_api_five/src/main/ets/TestAbility/pages/SwiperMargin.ets new file mode 100644 index 0000000000000000000000000000000000000000..09fd49bcbda874b4d5d6acdb4de14530cb83e07c --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/ets/TestAbility/pages/SwiperMargin.ets @@ -0,0 +1,130 @@ +/* + * 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. + */ +@Entry +@Component +struct SwiperMargin { + private swiperController: SwiperController = new SwiperController() + private swiperController2: SwiperController = new SwiperController() + private swiperController3: SwiperController = new SwiperController() + private swiperController4: SwiperController = new SwiperController() + private arr: number[] = Array.apply(this, {length: 6}).map((item, i) => (i+1)) + + build() { + Scroll() { + Column() { + Swiper(this.swiperController) { + ForEach(this.arr, (item: number) => { + Text('' + item) + .width('100%') + .height(50) + .backgroundColor(item % 2 == 0 ? 0xAFEEEE : Color.Green) + .textAlign(TextAlign.Center) + .fontSize(25) + }) + } + .cachedCount(2) + .index(0) + .autoPlay(true) + .interval(1000) + .indicator(true) + .loop(true) + .duration(500) + .prevMargin(-10) + .nextMargin(-10) + .vertical(false) + .displayCount(1) + .itemSpace(10) + .curve(Curve.Linear) + .key('SwiperMargin_Swiper1') + + Swiper(this.swiperController2) { + ForEach(this.arr, (item: number) => { + Text('' + item) + .width('100%') + .height(50) + .backgroundColor(item % 2 == 0 ? 0xAFEEEE : Color.Green) + .textAlign(TextAlign.Center) + .fontSize(30) + }) + } + .cachedCount(2) + .index(0) + .autoPlay(true) + .interval(1000) + .indicator(true) + .loop(false) + .duration(500) + .prevMargin(10) + .nextMargin(10) + .vertical(false) + .displayCount(1) + .itemSpace(10) + .curve(Curve.Linear) + .key('SwiperMargin_Swiper2') + + Swiper(this.swiperController3) { + ForEach(this.arr, (item: number) => { + Text('' + item) + .width('100%') + .height(50) + .backgroundColor(item % 2 == 0 ? 0xAFEEEE : Color.Green) + .textAlign(TextAlign.Center) + .fontSize(30) + }) + } + .cachedCount(2) + .index(0) + .autoPlay(false) + .interval(1000) + .indicator(true) + .loop(false) + .duration(500) + .prevMargin('11') + .nextMargin('11') + .vertical(false) + .displayCount(1) + .itemSpace(10) + .curve(Curve.Linear) + .key('SwiperMargin_Swiper3') + + Swiper(this.swiperController4) { + ForEach(this.arr, (item: number) => { + Text('' + item) + .width('100%') + .height(50) + .backgroundColor(item % 2 == 0 ? 0xAFEEEE : Color.Green) + .textAlign(TextAlign.Center) + .fontSize(30) + }) + } + .cachedCount(2) + .index(0) + .autoPlay(false) + .interval(1000) + .indicator(true) + .loop(true) + .duration(500) + .prevMargin($r('app.string.swiper_margin')) + .nextMargin($r('app.string.swiper_margin')) + .vertical(false) + .displayCount(1) + .itemSpace(10) + .curve(Curve.Linear) + .key('SwiperMargin_Swiper4') + + } + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_component_api_five/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_component_api_five/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..9e1abddd7bbe6397074c212e829534c6202bf6b3 --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,84 @@ +/* + * 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): Promise { + 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(); + let testAbilityName = abilityDelegatorArguments.bundleName + '.TestAbility'; + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback); + let cmd = 'aa start -d 0 -a TestAbility' + ' -b ' + abilityDelegatorArguments.bundleName; + cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters); + let 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, d) => { + 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'); + } +} diff --git a/arkui/ace_ets_component_api_five/src/main/ets/test/List.test.ets b/arkui/ace_ets_component_api_five/src/main/ets/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..858998506e693fc2a547b70df29018f8cc279ea7 --- /dev/null +++ b/arkui/ace_ets_component_api_five/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 SwiperMarginTest from './SwiperMargin.test' + +export default function testsuite() { + SwiperMarginTest() +} \ No newline at end of file diff --git a/arkui/ace_ets_component_api_five/src/main/ets/test/SwiperMargin.test.ets b/arkui/ace_ets_component_api_five/src/main/ets/test/SwiperMargin.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..f09467c063baff9cd378081dcbe6fd716628ebc4 --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/ets/test/SwiperMargin.test.ets @@ -0,0 +1,132 @@ +/* + * 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 { describe, beforeEach, afterEach, it, expect } from '@ohos/hypium' +import router from '@ohos.router' +import {UiDriver, UiComponent, BY, Driver, Component, ON} from '@ohos.UiTest' +export default function SwiperMarginTest() { + + const SUITE = 'SwiperMargin' + const waitUiReadyMs = 500; + describe('SwiperMarginTest', function () { + + beforeEach(async function (done) { + let options = { + url: "TestAbility/pages/SwiperMargin", + } + try { + router.clear(); + let pages = router.getState(); + if (pages == null || !("SwiperMargin" == pages.name)) { + await router.pushUrl(options).then(()=>{ + console.info(`${SUITE} router.pushUrl success`); + }).catch(err => { + console.error(`${SUITE} router.pushUrl failed, code is ${err.code}, message is ${err.message}`); + }) + } + } catch (err) { + console.error(`${SUITE} beforeEach error:` + JSON.stringify(err)); + } + done() + }); + + /* + *tc.number ArkUI_Swiper_0100 + *tc.name Set Swiper's nextMargin and prevMargin with negative + *tc.desc Set Swiper's nextMargin and prevMargin with negative + */ + it('ArkUI_Swiper_0100', 0, async function (done) { + let CASE = 'ArkUI_Swiper_0100' + console.info(`${SUITE} ${CASE} START`); + + let driver = Driver.create() + await driver.delayMs(waitUiReadyMs) + let baseKey = 'SwiperMargin_Swiper1' + let strJson = getInspectorByKey(baseKey); + let obj = JSON.parse(strJson); + + expect(obj.$attrs.prevMargin).assertEqual('0.00vp') + expect(obj.$attrs.nextMargin).assertEqual('0.00vp') + console.info(`${SUITE} ${CASE} END`); + + done(); + }); + + /* + *tc.number ArkUI_Swiper_0200 + *tc.name Set Swiper's nextMargin and prevMargin with positive + *tc.desc Set Swiper's nextMargin and prevMargin with positive + */ + it('ArkUI_Swiper_0200', 0, async function (done) { + let CASE = 'ArkUI_Swiper_0200' + console.info(`${SUITE} ${CASE} START`); + + let driver = Driver.create() + await driver.delayMs(waitUiReadyMs) + let baseKey = 'SwiperMargin_Swiper2' + let strJson = getInspectorByKey(baseKey); + let obj = JSON.parse(strJson); + + expect(obj.$attrs.prevMargin).assertEqual('10.00vp') + expect(obj.$attrs.nextMargin).assertEqual('10.00vp') + console.info(`${SUITE} ${CASE} END`); + + done(); + }); + + /* + *tc.number ArkUI_Swiper_0300 + *tc.name Set Swiper's nextMargin and prevMargin with string + *tc.desc Set Swiper's nextMargin and prevMargin with string + */ + it('ArkUI_Swiper_0300', 0, async function (done) { + let CASE = 'ArkUI_Swiper_0300' + console.info(`${SUITE} ${CASE} START`); + + let driver = Driver.create() + await driver.delayMs(waitUiReadyMs) + let baseKey = 'SwiperMargin_Swiper3' + let strJson = getInspectorByKey(baseKey); + let obj = JSON.parse(strJson); + + expect(obj.$attrs.prevMargin).assertEqual('11.00vp') + expect(obj.$attrs.nextMargin).assertEqual('11.00vp') + console.info(`${SUITE} ${CASE} END`); + done(); + }); + + /* + *tc.number ArkUI_Swiper_0400 + *tc.name Set Swiper's nextMargin and prevMargin with Resource + *tc.desc Set Swiper's nextMargin and prevMargin with Resource + */ + it('ArkUI_Swiper_0400', 0, async function (done) { + let CASE = 'ArkUI_Swiper_0400' + console.info(`${SUITE} ${CASE} START`); + + let driver = Driver.create() + await driver.delayMs(waitUiReadyMs) + let baseKey = 'SwiperMargin_Swiper4' + let strJson = getInspectorByKey(baseKey); + let obj = JSON.parse(strJson); + + expect(obj.$attrs.prevMargin).assertEqual('12.00vp') + expect(obj.$attrs.nextMargin).assertEqual('12.00vp') + console.info(`${SUITE} ${CASE} END`); + done(); + }); + + + }) +} diff --git a/arkui/ace_ets_component_api_five/src/main/module.json b/arkui/ace_ets_component_api_five/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..41203db25b2f1fa0a38ba77ab433d414374d1053 --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/module.json @@ -0,0 +1,41 @@ +{ + "module": { + "name": "entry_test", + "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" + ] + } + ] + } + ] + } +} diff --git a/arkui/ace_ets_component_api_five/src/main/resources/base/element/color.json b/arkui/ace_ets_component_api_five/src/main/resources/base/element/color.json new file mode 100644 index 0000000000000000000000000000000000000000..17e37a02eae55b9586ad82ccaedee5c3746090df --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/resources/base/element/color.json @@ -0,0 +1,20 @@ +{ + "color": [ + { + "name": "start_window_background", + "value": "#FFFFFF" + }, + { + "name": "Divider_color", + "value": "#000000" + }, + { + "name": "badge_BorderColor", + "value": "#FFFD0000" + }, + { + "name": "color_red", + "value": "#ffff0000" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_component_api_five/src/main/resources/base/element/string.json b/arkui/ace_ets_component_api_five/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..278a5d8b4494ef6e422a5edb2656c49ff0591083 --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/resources/base/element/string.json @@ -0,0 +1,40 @@ +{ + "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" + }, + { + "name": "badge_Size_test", + "value": "7vp" + }, + { + "name": "swiper_margin", + "value": "12" + }, + { + "name": "test_title", + "value": "test_resource_title" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_component_api_five/src/main/resources/base/media/icon.png b/arkui/ace_ets_component_api_five/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/arkui/ace_ets_component_api_five/src/main/resources/base/media/icon.png differ diff --git a/arkui/ace_ets_component_api_five/src/main/resources/base/profile/test_pages.json b/arkui/ace_ets_component_api_five/src/main/resources/base/profile/test_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..81fcbb6399b029933d4c97a58de97c65b20bc887 --- /dev/null +++ b/arkui/ace_ets_component_api_five/src/main/resources/base/profile/test_pages.json @@ -0,0 +1,6 @@ +{ + "src": [ + "TestAbility/pages/Index", + "TestAbility/pages/SwiperMargin" + ] +}