From 11f017c082a06b67778d5e4c3c60b2b44573c05c Mon Sep 17 00:00:00 2001 From: "lilong.129" Date: Fri, 21 Jul 2023 10:32:48 +0800 Subject: [PATCH] change: go fmt --- hrp/parameters.go | 52 +++++++++++++++++------------ hrp/pkg/uixt/android_device.go | 5 +-- hrp/pkg/uixt/android_uia2_driver.go | 3 +- hrp/pkg/uixt/interface.go | 27 ++++++++++----- hrp/pkg/uixt/ocr_vedem.go | 15 ++++----- 5 files changed, 59 insertions(+), 43 deletions(-) diff --git a/hrp/parameters.go b/hrp/parameters.go index 69a35904..2acdc4e1 100644 --- a/hrp/parameters.go +++ b/hrp/parameters.go @@ -27,8 +27,10 @@ const ( /* [ + {"username": "test1", "password": "111111"}, {"username": "test2", "password": "222222"}, + ] */ type Parameters []map[string]interface{} @@ -205,36 +207,38 @@ func genCartesianProduct(multiParameters []Parameters) Parameters { return cartesianProduct } -/* loadParameters loads parameters from multiple sources. +/* + loadParameters loads parameters from multiple sources. parameter value may be in three types: + (1) data list, e.g. ["iOS/10.1", "iOS/10.2", "iOS/10.3"] (2) call built-in parameterize function, "${parameterize(account.csv)}" (3) call custom function in debugtalk.py, "${gen_app_version()}" -configParameters = { - "user_agent": ["iOS/10.1", "iOS/10.2", "iOS/10.3"], // case 1 - "username-password": "${parameterize(account.csv)}", // case 2 - "app_version": "${gen_app_version()}", // case 3 -} + configParameters = { + "user_agent": ["iOS/10.1", "iOS/10.2", "iOS/10.3"], // case 1 + "username-password": "${parameterize(account.csv)}", // case 2 + "app_version": "${gen_app_version()}", // case 3 + } => -{ - "user_agent": [ - {"user_agent": "iOS/10.1"}, - {"user_agent": "iOS/10.2"}, - {"user_agent": "iOS/10.3"}, - ], - "username-password": [ - {"username": "test1", "password": "111111"}, - {"username": "test2", "password": "222222"}, - ], - "app_version": [ - {"app_version": "1.0.0"}, - {"app_version": "1.0.1"}, - ] -} + { + "user_agent": [ + {"user_agent": "iOS/10.1"}, + {"user_agent": "iOS/10.2"}, + {"user_agent": "iOS/10.3"}, + ], + "username-password": [ + {"username": "test1", "password": "111111"}, + {"username": "test2", "password": "222222"}, + ], + "app_version": [ + {"app_version": "1.0.0"}, + {"app_version": "1.0.1"}, + ] + } */ func (p *Parser) loadParameters(configParameters map[string]interface{}, variablesMapping map[string]interface{}) ( map[string]Parameters, error) { @@ -296,19 +300,23 @@ func (p *Parser) loadParameters(configParameters map[string]interface{}, variabl return parsedParameters, nil } -/* convert parameters to standard format +/* + convert parameters to standard format key and parametersRawList may be in three types: case 1: + key = "user_agent" parametersRawList = ["iOS/10.1", "iOS/10.2"] case 2: + key = "username-password" parametersRawList = [{"username": "test1", "password": "111111"}, {"username": "test2", "password": "222222"}] case 3: + key = "username-password" parametersRawList = [["test1", "111111"], ["test2", "222222"]] */ diff --git a/hrp/pkg/uixt/android_device.go b/hrp/pkg/uixt/android_device.go index ef24c637..8ca92d1c 100644 --- a/hrp/pkg/uixt/android_device.go +++ b/hrp/pkg/uixt/android_device.go @@ -555,8 +555,9 @@ func (s UiSelectorHelper) Index(index int) UiSelectorHelper { // 2, the `className(String)` matches the image // widget class, and `enabled(boolean)` is true. // The code would look like this: -// `new UiSelector().className("android.widget.ImageView") -// .enabled(true).instance(2);` +// +// `new UiSelector().className("android.widget.ImageView") +// .enabled(true).instance(2);` func (s UiSelectorHelper) Instance(instance int) UiSelectorHelper { s.value.WriteString(fmt.Sprintf(`.instance(%d)`, instance)) return s diff --git a/hrp/pkg/uixt/android_uia2_driver.go b/hrp/pkg/uixt/android_uia2_driver.go index a6e92334..81fab8ee 100644 --- a/hrp/pkg/uixt/android_uia2_driver.go +++ b/hrp/pkg/uixt/android_uia2_driver.go @@ -263,7 +263,8 @@ func (ud *uiaDriver) DragFloat(fromX, fromY, toX, toY float64, options ...Action // Swipe performs a swipe from one coordinate to another using the number of steps // to determine smoothness and speed. Each step execution is throttled to 5ms // per step. So for a 100 steps, the swipe will take about 1/2 second to complete. -// `steps` is the number of move steps sent to the system +// +// `steps` is the number of move steps sent to the system func (ud *uiaDriver) Swipe(fromX, fromY, toX, toY int, options ...ActionOption) error { return ud.SwipeFloat(float64(fromX), float64(fromY), float64(toX), float64(toY), options...) } diff --git a/hrp/pkg/uixt/interface.go b/hrp/pkg/uixt/interface.go index 0f784231..e9891721 100644 --- a/hrp/pkg/uixt/interface.go +++ b/hrp/pkg/uixt/interface.go @@ -31,7 +31,8 @@ func (caps Capabilities) WithDefaultAlertAction(alertAction AlertAction) Capabil } // WithMaxTypingFrequency -// Defaults to `60`. +// +// Defaults to `60`. func (caps Capabilities) WithMaxTypingFrequency(n int) Capabilities { if n <= 0 { n = 60 @@ -41,21 +42,24 @@ func (caps Capabilities) WithMaxTypingFrequency(n int) Capabilities { } // WithWaitForIdleTimeout -// Defaults to `10` +// +// Defaults to `10` func (caps Capabilities) WithWaitForIdleTimeout(second float64) Capabilities { caps["waitForIdleTimeout"] = second return caps } // WithShouldUseTestManagerForVisibilityDetection If set to YES will ask TestManagerDaemon for element visibility -// Defaults to `false` +// +// Defaults to `false` func (caps Capabilities) WithShouldUseTestManagerForVisibilityDetection(b bool) Capabilities { caps["shouldUseTestManagerForVisibilityDetection"] = b return caps } // WithShouldUseCompactResponses If set to YES will use compact (standards-compliant) & faster responses -// Defaults to `true` +// +// Defaults to `true` func (caps Capabilities) WithShouldUseCompactResponses(b bool) Capabilities { caps["shouldUseCompactResponses"] = b return caps @@ -63,28 +67,32 @@ func (caps Capabilities) WithShouldUseCompactResponses(b bool) Capabilities { // WithElementResponseAttributes If shouldUseCompactResponses == NO, // is the comma-separated list of fields to return with each element. -// Defaults to `type,label`. +// +// Defaults to `type,label`. func (caps Capabilities) WithElementResponseAttributes(s string) Capabilities { caps["elementResponseAttributes"] = s return caps } // WithShouldUseSingletonTestManager -// Defaults to `true` +// +// Defaults to `true` func (caps Capabilities) WithShouldUseSingletonTestManager(b bool) Capabilities { caps["shouldUseSingletonTestManager"] = b return caps } // WithDisableAutomaticScreenshots -// Defaults to `true` +// +// Defaults to `true` func (caps Capabilities) WithDisableAutomaticScreenshots(b bool) Capabilities { caps["disableAutomaticScreenshots"] = b return caps } // WithShouldTerminateApp -// Defaults to `true` +// +// Defaults to `true` func (caps Capabilities) WithShouldTerminateApp(b bool) Capabilities { caps["shouldTerminateApp"] = b return caps @@ -376,7 +384,8 @@ func (opt SourceOption) WithFormatAsDescription() SourceOption { } // WithScope Allows to provide XML scope. -// only `xml` is supported. +// +// only `xml` is supported. func (opt SourceOption) WithScope(scope string) SourceOption { if vFormat, ok := opt["format"]; ok && vFormat != "xml" { return opt diff --git a/hrp/pkg/uixt/ocr_vedem.go b/hrp/pkg/uixt/ocr_vedem.go index 3ce8096a..218b4729 100644 --- a/hrp/pkg/uixt/ocr_vedem.go +++ b/hrp/pkg/uixt/ocr_vedem.go @@ -176,11 +176,12 @@ func newVEDEMImageService(actions ...string) (*veDEMImageService, error) { // veDEMImageService implements IImageService interface // actions: -// ocr - get ocr texts -// upload - get image uploaded url -// liveType - get live type -// popup - get popup windows -// close - get close popup +// +// ocr - get ocr texts +// upload - get image uploaded url +// liveType - get live type +// popup - get popup windows +// close - get close popup type veDEMImageService struct { actions []string } @@ -230,10 +231,6 @@ func (s *veDEMImageService) GetImage(imageBuf *bytes.Buffer) ( req.Header.Add("Agw-Auth-Content", signToken) req.Header.Add("Content-Type", bodyWriter.FormDataContentType()) - // ppe - // req.Header.Add("x-use-ppe", "1") - // req.Header.Add("x-tt-env", "ppe_vedem_algorithm") - var resp *http.Response // retry 3 times for i := 1; i <= 3; i++ {