implement TapByUITypes using WithScreenShotUITypes

This commit is contained in:
buyuxiang
2023-08-25 14:01:46 +08:00
parent 30da13891e
commit 4dace0f589
7 changed files with 194 additions and 213 deletions

View File

@@ -49,9 +49,7 @@
{
"method": "swipe_to_tap_app",
"params": "$app_name",
"options": {
}
"options": {}
},
{
"method": "sleep",
@@ -147,9 +145,7 @@
},
{
"method": "back",
"options": {
}
"options": {}
},
{
"method": "sleep",
@@ -222,9 +218,7 @@
{
"method": "tap_ocr",
"params": "直播",
"options": {
}
"options": {}
},
{
"method": "sleep",
@@ -243,9 +237,7 @@
0.5,
0.5
],
"options": {
}
"options": {}
},
{
"method": "sleep",
@@ -260,12 +252,12 @@
"actions": [
{
"method": "tap_cv",
"params": [
"dyhouse",
"shoppingbag"
],
"options": {
"identifier": "click_sales_rack"
"identifier": "click_sales_rack",
"screenshot_with_ui_types": [
"dyhouse",
"shoppingbag"
]
}
},
{
@@ -354,78 +346,78 @@
"method": "video_crawler",
"params": {
"feed": {
"sleep_random": [
0,
5,
0.6,
5,
15,
0.2,
15,
50,
0.2
],
"target_count": 10,
"target_labels": [
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^广告$"
},
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^图文$"
},
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^特效\\|"
},
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^模板\\|"
},
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^购物\\|"
}
]
},
"sleep_random": [
0,
5,
0.6,
5,
15,
0.2,
15,
50,
0.2
],
"target_count": 10,
"target_labels": [
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^广告$"
},
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^图文$"
},
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^特效\\|"
},
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^模板\\|"
},
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^购物\\|"
}
]
},
"live": {
"sleep_random": [
20,
20
],
"target_count": 0
},
"sleep_random": [
20,
20
],
"target_count": 0
},
"timeout": 600
}
}
@@ -466,7 +458,8 @@
"android": {
"actions": [
{
"method": "screenshot"
"method": "screenshot",
"options": {}
},
{
"method": "sleep_random",
@@ -480,4 +473,4 @@
"loops": 3
}
]
}
}

View File

@@ -24,13 +24,13 @@ func TestAndroidExpertTest(t *testing.T) {
uixt.WithUIA2(true),
),
TestSteps: []hrp.IStep{
// 温启动
hrp.NewStep("app_launch 以及 ui_foreground_app equal 断言").
Android().
AppLaunch("$bundle_id").
Sleep(2).
Validate().
AssertAppInForeground("$bundle_id"),
// 直播赛道
hrp.NewStep("home 以及 swipe_to_tap_app 默认配置").
Android().
Home().
@@ -44,6 +44,7 @@ func TestAndroidExpertTest(t *testing.T) {
).
Validate().
AssertOCRExists("推荐", "进入抖音失败"),
// 直播赛道
hrp.NewStep("【直播】feed头像或卡片进房 swipe_to_tap_texts 自定义配置").
Android().
SwipeToTapTexts(
@@ -93,19 +94,19 @@ func TestAndroidExpertTest(t *testing.T) {
Android().
TapByOCR("直播").
Sleep(5),
// 生活服务赛道
hrp.NewStep("【生活服务】进入直播间 tap_xy").
Android().
TapXY(0.5, 0.5).
Sleep(5),
// 生活服务赛道
hrp.NewStep("【生活服务】点击货架商品 tap_ocr 自定义配置").
Android().
TapByUITypes(
[]string{"dyhouse", "shoppingbag"},
uixt.WithScreenShotUITypes("dyhouse", "shoppingbag"),
uixt.WithIdentifier("click_sales_rack"),
).
Sleep(5),
// 重新进入应用程序
// 冷启动
hrp.NewStep("app_terminate 以及 ui_foreground_app not_equal 断言").
Android().
AppTerminate("$bundle_id").
@@ -182,12 +183,12 @@ func TestIOSExpertTest(t *testing.T) {
uixt.WithWDAMjpegPort(8800),
),
TestSteps: []hrp.IStep{
hrp.NewStep("app_launch 以及 ui_foreground_app equal 断言").
// 温启动
// iOS 不支持前台 App 断言操作
hrp.NewStep("启动应用程序 app_launch").
IOS().
AppLaunch("$bundle_id").
Sleep(2),
// iOS 不支持前台 App 断言操作
// 直播赛道
hrp.NewStep("home 以及 swipe_to_tap_app 默认配置").
IOS().
Home().
@@ -201,6 +202,7 @@ func TestIOSExpertTest(t *testing.T) {
).
Validate().
AssertOCRExists("推荐", "进入抖音失败"),
// 直播赛道
hrp.NewStep("【直播】feed头像或卡片进房 swipe_to_tap_texts 自定义配置").
IOS().
SwipeToTapTexts(
@@ -246,6 +248,7 @@ func TestIOSExpertTest(t *testing.T) {
uixt.WithIndex(0),
).
Sleep(5),
// 生活服务赛道
hrp.NewStep("选择直播页签 tap_ocr 默认配置").
IOS().
TapByOCR("直播").
@@ -254,20 +257,19 @@ func TestIOSExpertTest(t *testing.T) {
IOS().
TapXY(0.5, 0.5).
Sleep(5),
// 生活服务赛道
hrp.NewStep("【生活服务】点击货架商品 tap_ocr 自定义配置").
IOS().
TapByUITypes(
[]string{"dyhouse", "shoppingbag"},
uixt.WithScreenShotUITypes("dyhouse", "shoppingbag"),
uixt.WithIdentifier("click_sales_rack"),
).
Sleep(5),
// 重新进入应用程序
hrp.NewStep("app_terminate 以及 ui_foreground_app not_equal 断言").
// 冷启动
// iOS 不支持前台 App 断言操作
hrp.NewStep("终止应用程序 app_terminate").
IOS().
AppTerminate("$bundle_id").
Sleep(2),
// iOS 不支持前台 App 断言操作
hrp.NewStep("home 以及 swipe_to_tap_app 自定义配置").
IOS().
Home().

View File

@@ -18,7 +18,7 @@
},
"teststeps": [
{
"name": "app_launch 以及 ui_foreground_app equal 断言",
"name": "启动应用程序 app_launch",
"ios": {
"actions": [
{
@@ -42,9 +42,7 @@
{
"method": "swipe_to_tap_app",
"params": "$app_name",
"options": {
}
"options": {}
},
{
"method": "sleep",
@@ -140,9 +138,7 @@
},
{
"method": "back",
"options": {
}
"options": {}
},
{
"method": "sleep",
@@ -215,9 +211,7 @@
{
"method": "tap_ocr",
"params": "直播",
"options": {
}
"options": {}
},
{
"method": "sleep",
@@ -236,9 +230,7 @@
0.5,
0.5
],
"options": {
}
"options": {}
},
{
"method": "sleep",
@@ -253,12 +245,12 @@
"actions": [
{
"method": "tap_cv",
"params": [
"dyhouse",
"shoppingbag"
],
"options": {
"identifier": "click_sales_rack"
"identifier": "click_sales_rack",
"screenshot_with_ui_types": [
"dyhouse",
"shoppingbag"
]
}
},
{
@@ -269,7 +261,7 @@
}
},
{
"name": "app_terminate 以及 ui_foreground_app not_equal 断言",
"name": "终止应用程序 app_terminate",
"ios": {
"actions": [
{
@@ -339,78 +331,78 @@
"method": "video_crawler",
"params": {
"feed": {
"sleep_random": [
0,
5,
0.6,
5,
15,
0.2,
15,
50,
0.2
],
"target_count": 10,
"target_labels": [
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^广告$"
},
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^图文$"
},
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^特效\\|"
},
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^模板\\|"
},
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^购物\\|"
}
]
},
"sleep_random": [
0,
5,
0.6,
5,
15,
0.2,
15,
50,
0.2
],
"target_count": 10,
"target_labels": [
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^广告$"
},
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^图文$"
},
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^特效\\|"
},
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^模板\\|"
},
{
"regex": true,
"scope": [
0,
0.5,
1,
1
],
"text": "^购物\\|"
}
]
},
"live": {
"sleep_random": [
20,
20
],
"target_count": 0
},
"sleep_random": [
20,
20
],
"target_count": 0
},
"timeout": 600
}
}
@@ -451,7 +443,8 @@
"ios": {
"actions": [
{
"method": "screenshot"
"method": "screenshot",
"options": {}
},
{
"method": "sleep_random",
@@ -465,4 +458,4 @@
"loops": 3
}
]
}
}