Merge pull request #1531 from httprunner/wcl

release v4.3.1

- feat: add option WithScreenShot
- feat: run xctest before start ios automation
- feat: run step with specified loop times
- feat: add options for FindTexts
- refactor: move all UI APIs to uixt pkg
- docs: add examples for UI APIs

docs/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Release History
 
+## v4.3.1 (2022-12-15)
+
+**go version**
+
+- feat: add option WithScreenShot
+- feat: run xctest before start ios automation
+- feat: run step with specified loop times
+- feat: add options for FindTexts
+- refactor: move all UI APIs to uixt pkg
+- docs: add examples for UI APIs
+
 ## v4.3.0 (2022-10-27)
 
 Release hrp sub package `uixt` to support iOS/Android UI automation testing 🎉

examples/uitest/demo_android_douyin_test.go

@@ -6,32 +6,33 @@ import (
  "testing"
 
  "github.com/httprunner/httprunner/v4/hrp"
+ "github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
 )
 
 func TestAndroidDouYinLive(t *testing.T) {
  testCase := &hrp.TestCase{
  Config: hrp.NewConfig("通过 feed 头像进入抖音直播间").
- SetAndroid(hrp.WithAdbLogOn(true), hrp.WithSerialNumber("2d06bf70")),
+ SetAndroid(uixt.WithAdbLogOn(true), uixt.WithSerialNumber("2d06bf70")),
  TestSteps: []hrp.IStep{
  hrp.NewStep("启动抖音").
  Android().
  Home().
  AppTerminate("com.ss.android.ugc.aweme"). // 关闭已运行的抖音，确保启动抖音后在「抖音」首页
- SwipeToTapApp("抖音", hrp.WithMaxRetryTimes(5)).
+ SwipeToTapApp("抖音", uixt.WithMaxRetryTimes(5)).
  Sleep(10),
  hrp.NewStep("处理青少年弹窗").
  Android().
  Tap("推荐").
- TapByOCR("我知道了", hrp.WithIgnoreNotFoundError(true)).
+ TapByOCR("我知道了", uixt.WithIgnoreNotFoundError(true)).
  Validate().
  AssertOCRExists("首页", "抖音启动失败，「首页」不存在"),
  hrp.NewStep("在推荐页上划，直到出现 feed 头像「直播」").
  Android().
- SwipeToTapText("直播", hrp.WithMaxRetryTimes(10), hrp.WithIdentifier("进入直播间")),
+ SwipeToTapText("直播", uixt.WithMaxRetryTimes(10), uixt.WithIdentifier("进入直播间")),
  hrp.NewStep("向上滑动，等待 10s").
  Android().
- SwipeUp(hrp.WithIdentifier("第一次上划")).Sleep(10).ScreenShot(). // 上划 1 次，等待 10s，截图保存
- SwipeUp(hrp.WithIdentifier("第二次上划")).Sleep(10).ScreenShot(), // 再上划 1 次，等待 10s，截图保存
+ SwipeUp(uixt.WithIdentifier("第一次上划")).Sleep(10).ScreenShot(). // 上划 1 次，等待 10s，截图保存
+ SwipeUp(uixt.WithIdentifier("第二次上划")).Sleep(10).ScreenShot(), // 再上划 1 次，等待 10s，截图保存
  },
  }
 

examples/uitest/demo_douyin_follow_live_test.go

@@ -6,6 +6,7 @@ import (
  "testing"
 
  "github.com/httprunner/httprunner/v4/hrp"
+ "github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
 )
 
 func TestIOSDouyinFollowLive(t *testing.T) {
@@ -15,31 +16,31 @@ func TestIOSDouyinFollowLive(t *testing.T) {
  "app_name": "抖音",
  }).
  SetIOS(
- hrp.WithLogOn(true),
- hrp.WithWDAPort(8700),
- hrp.WithWDAMjpegPort(8800),
+ uixt.WithWDALogOn(true),
+ uixt.WithWDAPort(8700),
+ uixt.WithWDAMjpegPort(8800),
  ),
  TestSteps: []hrp.IStep{
  hrp.NewStep("启动抖音").
  IOS().
  Home().
  AppTerminate("com.ss.iphone.ugc.Aweme"). // 关闭已运行的抖音
- SwipeToTapApp("$app_name", hrp.WithMaxRetryTimes(5), hrp.WithIdentifier("启动抖音")).Sleep(5).
+ SwipeToTapApp("$app_name", uixt.WithMaxRetryTimes(5), uixt.WithIdentifier("启动抖音")).Sleep(5).
  Validate().
  AssertOCRExists("推荐", "抖音启动失败，「推荐」不存在"),
  hrp.NewStep("处理青少年弹窗").
  IOS().
- TapByOCR("我知道了", hrp.WithIgnoreNotFoundError(true)),
+ TapByOCR("我知道了", uixt.WithIgnoreNotFoundError(true)),
  hrp.NewStep("点击首页").
  IOS().
- TapByOCR("首页", hrp.WithIndex(-1)).Sleep(10),
+ TapByOCR("首页", uixt.WithIndex(-1)).Sleep(10),
  hrp.NewStep("点击关注页").
  IOS().
- TapByOCR("关注", hrp.WithIndex(1)).Sleep(10),
+ TapByOCR("关注", uixt.WithIndex(1)).Sleep(10),
  hrp.NewStep("向上滑动 2 次").
- IOS().SwipeToTapTexts([]string{"理肤泉", "婉宝"}, hrp.WithCustomDirection(0.6, 0.2, 0.2, 0.2), hrp.WithIdentifier("click_live")).Sleep(10).
- Swipe(0.9, 0.7, 0.9, 0.3, hrp.WithIdentifier("slide_in_live")).Sleep(10).ScreenShot(). // 上划 1 次，等待 10s，截图保存
- Swipe(0.9, 0.7, 0.9, 0.3, hrp.WithIdentifier("slide_in_live")).Sleep(10).ScreenShot(), // 再上划 1 次，等待 10s，截图保存
+ IOS().SwipeToTapTexts([]string{"理肤泉", "婉宝"}, uixt.WithCustomDirection(0.6, 0.2, 0.2, 0.2), uixt.WithIdentifier("click_live")).Sleep(10).
+ Swipe(0.9, 0.7, 0.9, 0.3, uixt.WithIdentifier("slide_in_live")).Sleep(10).ScreenShot(). // 上划 1 次，等待 10s，截图保存
+ Swipe(0.9, 0.7, 0.9, 0.3, uixt.WithIdentifier("slide_in_live")).Sleep(10).ScreenShot(), // 再上划 1 次，等待 10s，截图保存
  },
  }
 

examples/uitest/demo_douyin_test.go

@@ -6,6 +6,7 @@ import (
  "testing"
 
  "github.com/httprunner/httprunner/v4/hrp"
+ "github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
 )
 
 func TestIOSDouyinLive(t *testing.T) {
@@ -15,32 +16,32 @@ func TestIOSDouyinLive(t *testing.T) {
  "app_name": "抖音",
  }).
  SetIOS(
- hrp.WithLogOn(true),
- hrp.WithWDAPort(8700),
- hrp.WithWDAMjpegPort(8800),
- hrp.WithPerfOptions(
- hrp.WithPerfSystemCPU(true),
- hrp.WithPerfSystemMem(true),
+ uixt.WithWDALogOn(true),
+ uixt.WithWDAPort(8700),
+ uixt.WithWDAMjpegPort(8800),
+ uixt.WithIOSPerfOptions(
+ uixt.WithIOSPerfSystemCPU(true),
+ uixt.WithIOSPerfSystemMem(true),
  ),
  ),
  TestSteps: []hrp.IStep{
  hrp.NewStep("启动抖音").
  IOS().
  Home().
  AppTerminate("com.ss.iphone.ugc.Aweme"). // 关闭已运行的抖音
- SwipeToTapApp("$app_name", hrp.WithMaxRetryTimes(5), hrp.WithIdentifier("启动抖音")).Sleep(5).
+ SwipeToTapApp("$app_name", uixt.WithMaxRetryTimes(5), uixt.WithIdentifier("启动抖音")).Sleep(5).
  Validate().
  AssertOCRExists("推荐", "抖音启动失败，「推荐」不存在"),
  hrp.NewStep("处理青少年弹窗").
  IOS().
- TapByOCR("我知道了", hrp.WithIgnoreNotFoundError(true)),
+ TapByOCR("我知道了", uixt.WithIgnoreNotFoundError(true)),
  hrp.NewStep("向上滑动 2 次").
  IOS().
- SwipeUp(hrp.WithIdentifier("第一次上划")).Sleep(2).ScreenShot(). // 上划 1 次，等待 2s，截图保存
- SwipeUp(hrp.WithIdentifier("第二次上划")).Sleep(2).ScreenShot(), // 再上划 1 次，等待 2s，截图保存
+ SwipeUp(uixt.WithIdentifier("第一次上划")).Sleep(2).ScreenShot(). // 上划 1 次，等待 2s，截图保存
+ SwipeUp(uixt.WithIdentifier("第二次上划")).Sleep(2).ScreenShot(), // 再上划 1 次，等待 2s，截图保存
  hrp.NewStep("在推荐页上划，直到出现「点击进入直播间」").
  IOS().
- SwipeToTapText("点击进入直播间", hrp.WithMaxRetryTimes(10), hrp.WithIdentifier("进入直播间")),
+ SwipeToTapText("点击进入直播间", uixt.WithMaxRetryTimes(10), uixt.WithIdentifier("进入直播间")),
  },
  }
 

examples/uitest/demo_kuaishou_test.go

@@ -0,0 +1,68 @@
+//go:build localtest
+
+package uitest
+
+import (
+ "testing"
+
+ "github.com/httprunner/httprunner/v4/hrp"
+ "github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
+)
+
+func TestAndroidKuaiShouFeedCardLive(t *testing.T) {
+ testCase := &hrp.TestCase{
+ Config: hrp.NewConfig("直播_快手_Feed卡片_android").
+ WithVariables(map[string]interface{}{
+ "device": "${ENV(SerialNumber)}",
+ }).
+ SetAndroid(
+ uixt.WithSerialNumber("$device"),
+ uixt.WithAdbLogOn(true)),
+ TestSteps: []hrp.IStep{
+ hrp.NewStep("启动快手").
+ Android().
+ AppTerminate("com.smile.gifmaker").
+ AppLaunch("com.smile.gifmaker").
+ Home().
+ SwipeToTapApp("快手", uixt.WithMaxRetryTimes(5)).Sleep(10),
+ hrp.NewStep("处理青少年弹窗").
+ Android().
+ TapByOCR("我知道了", uixt.WithIgnoreNotFoundError(true)).
+ Validate().
+ AssertOCRExists("精选", "进入快手失败"),
+ hrp.NewStep("点击精选").
+ Android().
+ TapByOCR("精选", uixt.WithIndex(-1), uixt.WithOffset(0, -50)).Sleep(10),
+ hrp.NewStep("点击直播标签,进入直播间").
+ Android().
+ SwipeToTapText("点击进入直播间",
+ uixt.WithCustomDirection(0.9, 0.7, 0.9, 0.3),
+ uixt.WithScope(0.2, 0.5, 0.8, 0.8),
+ uixt.WithMaxRetryTimes(20),
+ uixt.WithWaitTime(60),
+ uixt.WithIdentifier("click_live"),
+ ),
+ hrp.NewStep("等待1分钟").
+ Android().
+ Sleep(60),
+ hrp.NewStep("上滑进入下一个直播间").
+ Android().
+ Swipe(0.9, 0.7, 0.9, 0.3, uixt.WithIdentifier("slide_in_live")).Sleep(60),
+ hrp.NewStep("返回主界面，并打开本地时间戳").
+ Android().
+ Home().SwipeToTapApp("local", uixt.WithMaxRetryTimes(5)).Sleep(10).
+ Validate().
+ AssertOCRExists("16", "打开本地时间戳失败"),
+ },
+ }
+
+ if err := testCase.Dump2JSON("android_feed_card_live_test.json"); err != nil {
+ t.Fatal(err)
+ }
+
+ runner := hrp.NewRunner(t).SetSaveTests(true)
+ err := runner.Run(testCase)
+ if err != nil {
+ t.Fatal(err)
+ }
+}