diff --git a/testfwk/uitest/BUILD.gn b/testfwk/uitest/BUILD.gn index 8a920036fa4f017ebcde99c090ff9fcefd9efb9d..61b5b1a651126c84286e49944c1e6cce0769fdc7 100644 --- a/testfwk/uitest/BUILD.gn +++ b/testfwk/uitest/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("ActsUiTest") { ":uitest_ets_resources", ] ets2abc = true - certificate_profile = "//test/xts/acts/testfwk/uitest/signature/auto_ohos_default_com.uitest.test.p7b" + certificate_profile = "../../../../../test/xts/acts/testfwk/uitest/signature/auto_ohos_default_com.uitest.test.p7b" hap_name = "ActsUiTest" part_name = "arkxtest" subsystem_name = "testfwk" diff --git a/testfwk/uitest/src/main/ets/test/uitest.test.ets b/testfwk/uitest/src/main/ets/test/uitest.test.ets index 8ed5eeb449c8de3fa9e81f4e73ad64091ad83d19..46896a12133d68fbee69b9b871cb27b0b90cc85b 100644 --- a/testfwk/uitest/src/main/ets/test/uitest.test.ets +++ b/testfwk/uitest/src/main/ets/test/uitest.test.ets @@ -14,7 +14,7 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' import abilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'; -import { UiComponent, UiDriver, BY, Component, Driver, UiWindow, ON, MatchPattern, DisplayRotation, ResizeDirection, UiDirection, MouseButton, WindowMode, PointerMatrix } from '@ohos.UiTest' +import { UiComponent, UiDriver, BY, Component, Driver, UiWindow, ON, MatchPattern, DisplayRotation, ResizeDirection, UiDirection, MouseButton, WindowMode, PointerMatrix, UIElementInfo, UIEventObserver } from '@ohos.UiTest' import ability_featureAbility from '@ohos.ability.featureAbility'; const delegator = abilityDelegatorRegistry.getAbilityDelegator(); @@ -180,6 +180,52 @@ export default function UiTest() { expect(btn != null).assertTrue() await stopApplication('com.uitestScene.acts') }) + + /* + * @tc.number: uiTest_10008 + * @tc.name: testMonitor1 + * @tc.desc: monitor toast appearance. + */ + + it('testMonitor1', 0, async function () { + await startAbility('com.uitestScene.acts', 'com.uitestScene.acts.MainAbility') + let driver = Driver.create() + await driver.delayMs(waitUiReadyMs) + let observer = await driver.createUIEventObserver() + let callback = (UiElementInfo) => { + expect(UiElementInfo.bundleName == 'com.uitestScene.acts').assertTrue() + expect(UiElementInfo.text == 'toastShow').assertTrue() + expect(UiElementInfo.type == 'Toast').assertTrue() + } + observer.once('toastShow', callback) + let btn = await driver.findComponent(ON.text('toast')) + await btn.click() + await driver.delayMs(waitUiReadyMs) + await stopApplication('com.uitestScene.acts') + }) + + /* + * @tc.number: uiTest_10009 + * @tc.name: testMonitor2 + * @tc.desc: monitor dialog appearance. + */ + + it('testMonitor2', 0, async function () { + await startAbility('com.uitestScene.acts', 'com.uitestScene.acts.MainAbility') + let driver = Driver.create() + await driver.delayMs(waitUiReadyMs) + let observer = await driver.createUIEventObserver() + let callback = (UiElementInfo) => { + expect(UiElementInfo.bundleName == 'com.uitestScene.acts').assertTrue() + expect(UiElementInfo.text == 'dialogShow').assertTrue() + expect(UiElementInfo.type == 'AlertDialog').assertTrue() + } + observer.once('dialogShow', callback) + let btn = await driver.findComponent(ON.text('dialog')) + await btn.click() + await driver.delayMs(waitUiReadyMs) + await stopApplication('com.uitestScene.acts') + }) }) describe('UiTest_API8', function () { @@ -347,9 +393,9 @@ export default function UiTest() { await startAbility('com.uitestScene.acts', 'com.uitestScene.acts.MainAbility') let driver = UiDriver.create() await driver.delayMs(waitUiReadyMs) - let scrollBar = await driver.findComponent(BY.type('Scroll').scrollable(false)) + let scrollBar = await driver.findComponent(BY.type('Scroll')) let scrollable = await scrollBar.isScrollable() - expect(scrollable == false).assertTrue() + expect(scrollable == true).assertTrue() await stopApplication('com.uitestScene.acts') }) @@ -516,7 +562,7 @@ export default function UiTest() { await startAbility('com.uitestScene.acts', 'com.uitestScene.acts.MainAbility') let driver = UiDriver.create() await driver.delayMs(waitUiReadyMs) - await driver.swipe(300, 600, 300, 300) + await driver.swipe(300, 800, 300, 300) let text = await driver.findComponent(BY.text('next page')) expect(text == null).assertTrue() await stopApplication('com.uitestScene.acts') @@ -812,9 +858,9 @@ export default function UiTest() { await startAbility('com.uitestScene.acts', 'com.uitestScene.acts.MainAbility') let driver = Driver.create() await driver.delayMs(waitUiReadyMs) - let scrollBar = await driver.findComponent(ON.type('Scroll').scrollable(false)) + let scrollBar = await driver.findComponent(ON.type('Scroll')) let scrollable = await scrollBar.isScrollable() - expect(scrollable == false).assertTrue() + expect(scrollable == true).assertTrue() await stopApplication('com.uitestScene.acts') }) @@ -1051,7 +1097,7 @@ export default function UiTest() { await startAbility('com.uitestScene.acts', 'com.uitestScene.acts.MainAbility') let driver = Driver.create() await driver.delayMs(waitUiReadyMs) - await driver.swipe(300,600,300,300) + await driver.swipe(300,800,300,300) let text = await driver.findComponent(ON.text('next page')) expect(text == null).assertTrue() let scrollBar = await driver.findComponent(ON.type('Scroll')) @@ -1641,13 +1687,13 @@ export default function UiTest() { let button = await driver.findComponent(ON.text('jump')) await button.longClick() await driver.delayMs(waitUiReadyMs) - let text1 = await driver.findComponent(ON.text('orange')) - let text2 = await driver.findComponent(ON.text('one')) + let text1 = await driver.findComponent(ON.text('one')) + let text2 = await driver.findComponent(ON.text('two')) let point1 = await text1.getBoundsCenter() let point2 = await text2.getBoundsCenter() await driver.drag(point1.x, point1.y, point2.x, point2.y) await driver.delayMs(waitUiReadyMs) - let text = await driver.findComponent(ON.text('four')) + let text = await driver.findComponent(ON.text('one').isBefore(ON.text('two'))) expect(text == null).assertTrue() await stopApplication('com.uitestScene.acts') }) @@ -1664,11 +1710,11 @@ export default function UiTest() { let button = await driver.findComponent(ON.text('jump')) await button.longClick() await driver.delayMs(waitUiReadyMs) - let text1 = await driver.findComponent(ON.text('orange')) - let text2 = await driver.findComponent(ON.text('one')) + let text1 = await driver.findComponent(ON.text('one')) + let text2 = await driver.findComponent(ON.text('two')) await text1.dragTo(text2) await driver.delayMs(waitUiReadyMs) - let text = await driver.findComponent(ON.text('four')) + let text = await driver.findComponent(ON.text('one').isBefore(ON.text('two'))) expect(text == null).assertTrue() await stopApplication('com.uitestScene.acts') }) diff --git a/testfwk/uitestScene/AppScope/app.json b/testfwk/uitestScene/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..f90f96e097197ed8851b2b94ca35cd75933b2207 --- /dev/null +++ b/testfwk/uitestScene/AppScope/app.json @@ -0,0 +1,20 @@ +{ + "app": { + "bundleName": "com.uitestScene.acts", + "vendor": "example", + "versionCode": 1000000, + "versionName": "1.0.0", + "debug": false, + "icon": "$media:icon", + "label": "$string:app_name", + "distributedNotificationEnabled": true, + "keepAlive": true, + "singleUser": true, + "minAPIVersion": 10, + "targetAPIVersion": 10, + "car": { + "apiCompatibleVersion": 10, + "singleUser": false + } + } +} diff --git a/testfwk/uitestScene/AppScope/resources/base/element/string.json b/testfwk/uitestScene/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..ea682e892ad8ffb5e2622647dbd364cd4175158c --- /dev/null +++ b/testfwk/uitestScene/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name":"app_name", + "value":"uitestScene" + } + ] +} \ No newline at end of file diff --git a/testfwk/uitestScene/src/main/resources/base/media/icon.png b/testfwk/uitestScene/AppScope/resources/base/media/icon.png similarity index 100% rename from testfwk/uitestScene/src/main/resources/base/media/icon.png rename to testfwk/uitestScene/AppScope/resources/base/media/icon.png diff --git a/testfwk/uitestScene/BUILD.gn b/testfwk/uitestScene/BUILD.gn index 052ee481b2e2e0b757a3ad7da5073615f42c1599..4230835add47fe098e579ad269d765dff44a157a 100644 --- a/testfwk/uitestScene/BUILD.gn +++ b/testfwk/uitestScene/BUILD.gn @@ -14,25 +14,30 @@ import("//test/xts/tools/build/suite.gni") ohos_hap_assist_suite("ActsUiTestScene") { - hap_profile = "./src/main/config.json" + hap_profile = "entry/src/main/module.json" deps = [ ":uitest_scene_ets_assets", ":uitest_scene_ets_resources", ] ets2abc = true - js_build_mode = "debug" testonly = true - certificate_profile = "//test/xts/acts/testfwk/uitestScene/signature/auto_ohos_default_com.uitestScene.test.p7b" + certificate_profile = "../../../../../test/xts/acts/testfwk/uitestScene/signature/auto_ohos_default_com.uitestScene.test.p7b" hap_name = "ActsUiTestScene" part_name = "arkxtest" subsystem_name = "testfwk" } +ohos_app_scope("uiTestScene_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + ohos_js_assets("uitest_scene_ets_assets") { - source_dir = "./src/main/ets/MainAbility" + source_dir = "entry/src/main/ets" } ohos_resources("uitest_scene_ets_resources") { - sources = [ "./src/main/resources" ] - hap_profile = "./src/main/config.json" + sources = [ "entry/src/main/resources" ] + deps = [ ":uiTestScene_app_profile" ] + hap_profile = "entry/src/main/module.json" } diff --git a/testfwk/uitestScene/entry/src/main/ets/entryability/EntryAbility.ts b/testfwk/uitestScene/entry/src/main/ets/entryability/EntryAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..28ce3bc1d6f0d0d3f1b720ebddf8189e1c279e5d --- /dev/null +++ b/testfwk/uitestScene/entry/src/main/ets/entryability/EntryAbility.ts @@ -0,0 +1,41 @@ +import UIAbility from '@ohos.app.ability.UIAbility'; +import hilog from '@ohos.hilog'; +import window from '@ohos.window'; + +export default class EntryAbility extends UIAbility { + onCreate(want, launchParam) { + hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate'); + } + + onDestroy() { + hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onDestroy'); + } + + onWindowStageCreate(windowStage: window.WindowStage) { + // Main window is created, set main page for this ability + hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate'); + + windowStage.loadContent('pages/Index', (err, data) => { + if (err.code) { + hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? ''); + return; + } + hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? ''); + }); + } + + onWindowStageDestroy() { + // Main window is destroyed, release UI related resources + hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageDestroy'); + } + + onForeground() { + // Ability has brought to foreground + hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onForeground'); + } + + onBackground() { + // Ability has back to background + hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onBackground'); + } +} diff --git a/testfwk/uitestScene/src/main/ets/MainAbility/pages/index.ets b/testfwk/uitestScene/entry/src/main/ets/pages/Index.ets similarity index 73% rename from testfwk/uitestScene/src/main/ets/MainAbility/pages/index.ets rename to testfwk/uitestScene/entry/src/main/ets/pages/Index.ets index 7236f298558a1381fa59b89bf0aac53f25c57b9f..0f25a7432048cbe59f39bd93fed4ec8f4e832950 100644 --- a/testfwk/uitestScene/src/main/ets/MainAbility/pages/index.ets +++ b/testfwk/uitestScene/entry/src/main/ets/pages/Index.ets @@ -13,7 +13,7 @@ * limitations under the License. */ import router from '@system.router'; -import prompt from '@ohos.prompt'; +import promptAction from '@ohos.promptAction'; @Entry @Component @@ -30,6 +30,33 @@ struct ScrollExample { Stack({ alignContent: Alignment.TopStart }) { Scroll(this.scroller) { Column() { + Button('toast').fontSize(25).fontWeight(FontWeight.Bold) + .onClick(() => { + try { + promptAction.showToast({ + message: 'toastShow', + duration: 60000 + }); + } catch (error) { + console.error(`showToast args error code is ${error.code}, message is ${error.message}`); + }; + }) + Button('dialog').fontSize(25).fontWeight(FontWeight.Bold) + .onClick(() => { + AlertDialog.show( + { + title: '', + message: 'dialogShow', + alignment: DialogAlignment.Bottom, + confirm: { + value: 'close', + action: () => { + console.info('close dialog') + } + } + } + ) + }) Button() { Text('next page') .fontSize(25) @@ -42,10 +69,10 @@ struct ScrollExample { router.push({ uri: 'pages/second' }) }) .gesture( - LongPressGesture({ repeat: false }) - .onAction((event: GestureEvent) => { - router.push({ uri: 'pages/fourth' }) - }) + LongPressGesture({ repeat: false }) + .onAction((event: GestureEvent) => { + router.push({ uri: 'pages/fourth' }) + }) ) Button() { Text('Click twice') @@ -55,10 +82,10 @@ struct ScrollExample { .type(ButtonType.Capsule) .margin({ top: 20 }) .gesture( - TapGesture({ count: 1 }) - .onAction(() => { - router.push({ uri: 'pages/third' }) - }) + TapGesture({ count: 1 }) + .onAction(() => { + router.push({ uri: 'pages/third' }) + }) ) Button() { Text(this.hoverText) @@ -71,7 +98,7 @@ struct ScrollExample { if (isHover) { this.hoverText = 'hover' } - }) + }) .onMouse((event: MouseEvent) => { switch (event.button) { case MouseButton.Left : @@ -89,10 +116,10 @@ struct ScrollExample { router.push({ uri: 'pages/screen' }) }) .gesture( - LongPressGesture({ repeat: false }) - .onAction((event: GestureEvent) => { - router.push({ uri: 'pages/drag' }) - }) + LongPressGesture({ repeat: false }) + .onAction((event: GestureEvent) => { + router.push({ uri: 'pages/drag' }) + }) ) Checkbox({ name: 'hi' }) .size({ width: 30, height: 30 }) diff --git a/testfwk/uitestScene/src/main/ets/MainAbility/pages/drag.ets b/testfwk/uitestScene/entry/src/main/ets/pages/drag.ets similarity index 100% rename from testfwk/uitestScene/src/main/ets/MainAbility/pages/drag.ets rename to testfwk/uitestScene/entry/src/main/ets/pages/drag.ets diff --git a/testfwk/uitestScene/src/main/ets/MainAbility/pages/fourth.ets b/testfwk/uitestScene/entry/src/main/ets/pages/fourth.ets similarity index 100% rename from testfwk/uitestScene/src/main/ets/MainAbility/pages/fourth.ets rename to testfwk/uitestScene/entry/src/main/ets/pages/fourth.ets diff --git a/testfwk/uitestScene/src/main/ets/MainAbility/pages/screen.ets b/testfwk/uitestScene/entry/src/main/ets/pages/screen.ets similarity index 97% rename from testfwk/uitestScene/src/main/ets/MainAbility/pages/screen.ets rename to testfwk/uitestScene/entry/src/main/ets/pages/screen.ets index 60049ab74fe08297e6a0b457701e8a1228e8537e..07ded458b69682654d83265a853a52f7a8d48389 100644 --- a/testfwk/uitestScene/src/main/ets/MainAbility/pages/screen.ets +++ b/testfwk/uitestScene/entry/src/main/ets/pages/screen.ets @@ -22,7 +22,7 @@ struct Screen { build() { Column() { - Image($r('app.media.computer')) + Image($r('app.media.test')) .objectFit(ImageFit.Auto) .height(200) .width(200) diff --git a/testfwk/uitestScene/src/main/ets/MainAbility/pages/second.ets b/testfwk/uitestScene/entry/src/main/ets/pages/second.ets similarity index 100% rename from testfwk/uitestScene/src/main/ets/MainAbility/pages/second.ets rename to testfwk/uitestScene/entry/src/main/ets/pages/second.ets diff --git a/testfwk/uitestScene/src/main/ets/MainAbility/pages/third.ets b/testfwk/uitestScene/entry/src/main/ets/pages/third.ets similarity index 100% rename from testfwk/uitestScene/src/main/ets/MainAbility/pages/third.ets rename to testfwk/uitestScene/entry/src/main/ets/pages/third.ets diff --git a/testfwk/uitestScene/entry/src/main/module.json b/testfwk/uitestScene/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..38ea5b4536e0edbd536254c6d45a258b07c4ac65 --- /dev/null +++ b/testfwk/uitestScene/entry/src/main/module.json @@ -0,0 +1,38 @@ +{ + "module": { + "name": "uitestScene", + "type": "entry", + "description": "$string:module_desc", + "mainElement": "MainAbility", + "deviceTypes": [ + "tablet", + "default", + "phone" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:main_pages", + "abilities": [ + { + "name": "com.uitestScene.acts.MainAbility", + "srcEntry": "./ets/entryability/EntryAbility.ts", + "description": "$string:EntryAbility_desc", + "icon": "$media:icon", + "label": "$string:EntryAbility_label", + "startWindowIcon": "$media:icon", + "startWindowBackground": "$color:start_window_background", + "exported": true, + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/testfwk/uitestScene/entry/src/main/resources/base/element/color.json b/testfwk/uitestScene/entry/src/main/resources/base/element/color.json new file mode 100644 index 0000000000000000000000000000000000000000..3c712962da3c2751c2b9ddb53559afcbd2b54a02 --- /dev/null +++ b/testfwk/uitestScene/entry/src/main/resources/base/element/color.json @@ -0,0 +1,8 @@ +{ + "color": [ + { + "name": "start_window_background", + "value": "#FFFFFF" + } + ] +} \ No newline at end of file diff --git a/testfwk/uitestScene/entry/src/main/resources/base/element/string.json b/testfwk/uitestScene/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..f94595515a99e0c828807e243494f57f09251930 --- /dev/null +++ b/testfwk/uitestScene/entry/src/main/resources/base/element/string.json @@ -0,0 +1,16 @@ +{ + "string": [ + { + "name": "module_desc", + "value": "module description" + }, + { + "name": "EntryAbility_desc", + "value": "description" + }, + { + "name": "EntryAbility_label", + "value": "label" + } + ] +} \ No newline at end of file diff --git a/testfwk/uitestScene/entry/src/main/resources/base/media/icon.png b/testfwk/uitestScene/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/testfwk/uitestScene/entry/src/main/resources/base/media/icon.png differ diff --git a/testfwk/uitestScene/entry/src/main/resources/base/media/test.png b/testfwk/uitestScene/entry/src/main/resources/base/media/test.png new file mode 100644 index 0000000000000000000000000000000000000000..b534a4ca73cbd778f1a36fd001a6dcee5e36e332 Binary files /dev/null and b/testfwk/uitestScene/entry/src/main/resources/base/media/test.png differ diff --git a/testfwk/uitestScene/entry/src/main/resources/base/profile/main_pages.json b/testfwk/uitestScene/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..beee71037f31202723d94caee12d2200797a0f65 --- /dev/null +++ b/testfwk/uitestScene/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,10 @@ +{ + "src": [ + "pages/Index", + "pages/second", + "pages/third", + "pages/fourth", + "pages/screen", + "pages/drag" + ] +} diff --git a/testfwk/uitestScene/entry/src/main/resources/en_US/element/string.json b/testfwk/uitestScene/entry/src/main/resources/en_US/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..f94595515a99e0c828807e243494f57f09251930 --- /dev/null +++ b/testfwk/uitestScene/entry/src/main/resources/en_US/element/string.json @@ -0,0 +1,16 @@ +{ + "string": [ + { + "name": "module_desc", + "value": "module description" + }, + { + "name": "EntryAbility_desc", + "value": "description" + }, + { + "name": "EntryAbility_label", + "value": "label" + } + ] +} \ No newline at end of file diff --git a/testfwk/uitestScene/entry/src/main/resources/zh_CN/element/string.json b/testfwk/uitestScene/entry/src/main/resources/zh_CN/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..597ecf95e61d7e30367c22fe2f8638008361b044 --- /dev/null +++ b/testfwk/uitestScene/entry/src/main/resources/zh_CN/element/string.json @@ -0,0 +1,16 @@ +{ + "string": [ + { + "name": "module_desc", + "value": "模块描述" + }, + { + "name": "EntryAbility_desc", + "value": "description" + }, + { + "name": "EntryAbility_label", + "value": "label" + } + ] +} \ No newline at end of file diff --git a/testfwk/uitestScene/src/main/config.json b/testfwk/uitestScene/src/main/config.json deleted file mode 100644 index 7fc10ec3add254a5c9d03165da452be1ba95aeba..0000000000000000000000000000000000000000 --- a/testfwk/uitestScene/src/main/config.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "app": { - "vendor": "open", - "bundleName": "com.uitestScene.acts", - "version": { - "code": 1000000, - "name": "1.0.0" - }, - "apiVersion": { - "compatible": 7, - "releaseType": "Release", - "target": 8 - } - }, - "deviceConfig": {}, - "module": { - "package": "com.uitestScene.acts", - "name": ".MyApplication", - "mainAbility": ".MainAbility", - "srcPath": "MainAbility", - "deviceType": [ - "tablet", - "default", - "phone" - ], - "distro": { - "moduleType": "entry", - "installationFree": false, - "deliveryWithInstall": true, - "moduleName": "entry" - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "orientation": "unspecified", - "visible": true, - "srcPath": "MainAbility", - "name": ".MainAbility", - "srcLanguage": "ets", - "icon": "$media:icon", - "description": "$string:description_mainability", - "formsEnabled": false, - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "singleton" - } - ], - "js": [ - { - "mode": { - "syntax": "ets", - "type": "pageAbility" - }, - "pages": [ - "pages/index", - "pages/second", - "pages/third", - "pages/fourth", - "pages/screen", - "pages/drag" - ], - "name": ".MainAbility", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } -} \ No newline at end of file diff --git a/testfwk/uitestScene/src/main/ets/MainAbility/app.ets b/testfwk/uitestScene/src/main/ets/MainAbility/app.ets deleted file mode 100644 index bce6196d05fb2266ff0a96005f29233e033515c9..0000000000000000000000000000000000000000 --- a/testfwk/uitestScene/src/main/ets/MainAbility/app.ets +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright (c) 2022 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 { - onCreate() { - console.info('Application onCreate') - }, - onDestroy() { - console.info('Application onDestroy') - }, - -} \ No newline at end of file diff --git a/testfwk/uitestScene/src/main/resources/base/element/string.json b/testfwk/uitestScene/src/main/resources/base/element/string.json deleted file mode 100644 index 5ca53e3f38e3ac31b9e2a5791e8d56222001fef3..0000000000000000000000000000000000000000 --- a/testfwk/uitestScene/src/main/resources/base/element/string.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "Scene_MainAbility" - }, - { - "name": "description_mainability", - "value": "Scene_MainAbility" - }, - { - "name": "TestAbility_desc", - "value": "description" - }, - { - "name": "TestAbility_label", - "value": "label" - } - ] -} \ No newline at end of file diff --git a/testfwk/uitestScene/src/main/resources/base/media/computer.png b/testfwk/uitestScene/src/main/resources/base/media/computer.png deleted file mode 100644 index 3f780ef292cc5431d624ab80a491662532863d10..0000000000000000000000000000000000000000 Binary files a/testfwk/uitestScene/src/main/resources/base/media/computer.png and /dev/null differ