提交 85f992fe 编写于 作者: Z zhouke

modify.Signed-off-by: <zhouke35@huawei.com>.

Signed-off-by: Nzhouke <zhouke35@huawei.com>
上级 56dfc4f7
...@@ -16,6 +16,6 @@ import("//build/ohos_var.gni") ...@@ -16,6 +16,6 @@ import("//build/ohos_var.gni")
group("arkXtest") { group("arkXtest") {
testonly = true testonly = true
if (is_standard_system) { if (is_standard_system) {
deps = [ "uitest:uitest_xts" ] deps = [ "uitest:uitestActs" ]
} }
} }
# Copyright (C) 2021 Huawei Device Co., Ltd. # Copyright (C) 2022 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("uitest_xts") { ohos_js_hap_suite("uitestActs") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":uitest_ets_assets", ":uitest_ets_assets",
...@@ -22,7 +22,7 @@ ohos_js_hap_suite("uitest_xts") { ...@@ -22,7 +22,7 @@ ohos_js_hap_suite("uitest_xts") {
] ]
ets2abc = true ets2abc = true
certificate_profile = "//test/xts/acts/arkXtest/uitest/signature/auto_ohos_default_com.uitest.test.p7b" certificate_profile = "//test/xts/acts/arkXtest/uitest/signature/auto_ohos_default_com.uitest.test.p7b"
hap_name = "uitest_xts" hap_name = "uitestActs"
} }
ohos_js_assets("uitest_ets_assets") { ohos_js_assets("uitest_ets_assets") {
source_dir = "./src/main/ets/MainAbility" source_dir = "./src/main/ets/MainAbility"
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
"driver": { "driver": {
"type": "OHJSUnitTest", "type": "OHJSUnitTest",
"test-timeout": "1800000", "test-timeout": "1800000",
"bundle-name": "com.uitest.test", "bundle-name": "com.uitest.acts",
"package-name": "com.uitest.test", "package-name": "com.uitest.acts",
"shell-timeout": "60000" "shell-timeout": "60000"
}, },
"kits": [ "kits": [
...@@ -14,6 +14,25 @@ ...@@ -14,6 +14,25 @@
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
},
{
"type": "PushKit",
"push": [
"resource/arkXtest/arkXtest_windowsTest.hap -> /data/local/tmp/arkXtest_windowsTest.hap",
"resource/arkXtest/window_manager_config.xml -> /system/etc/window/resources/window_manager_config.xml"
]
},
{
"type": "ShellKit",
"run-command": [
"power-shell wakeup",
"uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
"power-shell setmode 602",
"bm install -p /data/local/tmp/arkXtest_windowsTest.hap"
],
"teardown-command": [
"bm uninstall -n com.example.windows"
]
} }
] ]
} }
\ No newline at end of file
{ {
"app": { "app": {
"vendor": "open", "vendor": "open",
"bundleName": "com.uitest.test", "bundleName": "com.uitest.acts",
"version": { "version": {
"code": 1000000, "code": 1000000,
"name": "1.0.0" "name": "1.0.0"
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
}, },
"deviceConfig": {}, "deviceConfig": {},
"module": { "module": {
"package": "com.uitest.test", "package": "com.uitest.acts",
"name": ".MyApplication", "name": ".MyApplication",
"mainAbility": ".MainAbility", "mainAbility": ".MainAbility",
"srcPath": "MainAbility", "srcPath": "MainAbility",
......
/**
* 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.
*/
import router from '@system.router'; import router from '@system.router';
import prompt from '@ohos.prompt'; import prompt from '@ohos.prompt';
...@@ -41,7 +27,12 @@ struct ScrollExample { ...@@ -41,7 +27,12 @@ struct ScrollExample {
router.push({ uri: 'pages/fourth' }) router.push({ uri: 'pages/fourth' })
}) })
) )
Button() {
Text('Click twice') Text('Click twice')
.fontSize(25)
.fontWeight(FontWeight.Bold)
}
.type(ButtonType.Capsule)
.margin({top:20}) .margin({top:20})
.gesture( .gesture(
TapGesture({ count: 2 }) TapGesture({ count: 2 })
......
...@@ -25,7 +25,7 @@ struct Third{ ...@@ -25,7 +25,7 @@ struct Third{
.fontSize(50) .fontSize(50)
.fontWeight(FontWeight.Bold) .fontWeight(FontWeight.Bold)
Button() { Button() {
Text('page_3') Text('doubleClick')
.fontSize(20) .fontSize(20)
.fontWeight(FontWeight.Bold) .fontWeight(FontWeight.Bold)
}.type(ButtonType.Capsule) }.type(ButtonType.Capsule)
......
...@@ -41,7 +41,12 @@ struct ScrollExample { ...@@ -41,7 +41,12 @@ struct ScrollExample {
router.push({ uri: 'pages/fourth' }) router.push({ uri: 'pages/fourth' })
}) })
) )
Button() {
Text('Click twice') Text('Click twice')
.fontSize(25)
.fontWeight(FontWeight.Bold)
}
.type(ButtonType.Capsule)
.margin({top:20}) .margin({top:20})
.gesture( .gesture(
TapGesture({ count: 2 }) TapGesture({ count: 2 })
......
...@@ -25,7 +25,7 @@ struct Third{ ...@@ -25,7 +25,7 @@ struct Third{
.fontSize(50) .fontSize(50)
.fontWeight(FontWeight.Bold) .fontWeight(FontWeight.Bold)
Button() { Button() {
Text('page_3') Text('doubleClick')
.fontSize(20) .fontSize(20)
.fontWeight(FontWeight.Bold) .fontWeight(FontWeight.Bold)
}.type(ButtonType.Capsule) }.type(ButtonType.Capsule)
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import abilityTest from './Ability.test' import abilityTest from './uitest.test'
export default function testsuite() { export default function testsuite() {
abilityTest() abilityTest()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册