GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-06-07 16:59:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename webdriver request base method

Browse Source
This commit is contained in:
buyuxiang
2023-07-24 19:34:51 +08:00
parent c91be64240
commit 7fbc54fb4c
2 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
hrp/pkg/uixt/android_uia2_driver.go
View File

@@ -83,7 +83,7 @@ func (bs BatteryStatus) String() string {
}
}
func (ud *uiaDriver) resetUIA2Driver() error {
func (ud *uiaDriver) resetDriver() error {
newUIADriver, err := NewUIADriver(NewCapabilities(), ud.urlPrefix.String())
if err != nil {
return err
@@ -93,17 +93,17 @@ func (ud *uiaDriver) resetUIA2Driver() error {
return nil
}
func (ud *uiaDriver) uia2HttpRequest(method string, rawURL string, rawBody []byte, disableRetry ...bool) (rawResp rawResponse, err error) {
func (ud *uiaDriver) httpRequest(method string, rawURL string, rawBody []byte, disableRetry ...bool) (rawResp rawResponse, err error) {
disableRetryBool := len(disableRetry) > 0 && disableRetry[0]
for retryCount := 1; retryCount <= 5; retryCount++ {
rawResp, err = ud.httpRequest(method, rawURL, rawBody)
rawResp, err = ud.Driver.httpRequest(method, rawURL, rawBody)
if err == nil || disableRetryBool {
return
}
// wait for UIA2 server to resume automatically
time.Sleep(3 * time.Second)
oldSessionID := ud.sessionId
if err = ud.resetUIA2Driver(); err != nil {
if err = ud.resetDriver(); err != nil {
log.Err(err).Msgf("failed to reset uia2 driver, retry count: %v", retryCount)
continue
}
@@ -115,33 +115,33 @@ func (ud *uiaDriver) uia2HttpRequest(method string, rawURL string, rawBody []byt
return
}
func (ud *uiaDriver) uia2HttpGET(pathElem ...string) (rawResp rawResponse, err error) {
return ud.uia2HttpRequest(http.MethodGet, ud.concatURL(nil, pathElem...), nil)
func (ud *uiaDriver) httpGET(pathElem ...string) (rawResp rawResponse, err error) {
return ud.httpRequest(http.MethodGet, ud.concatURL(nil, pathElem...), nil)
}
func (ud *uiaDriver) uia2HttpGETWithRetry(pathElem ...string) (rawResp rawResponse, err error) {
return ud.uia2HttpRequest(http.MethodGet, ud.concatURL(nil, pathElem...), nil, true)
func (ud *uiaDriver) httpGETWithRetry(pathElem ...string) (rawResp rawResponse, err error) {
return ud.httpRequest(http.MethodGet, ud.concatURL(nil, pathElem...), nil, true)
}
func (ud *uiaDriver) uia2HttpPOST(data interface{}, pathElem ...string) (rawResp rawResponse, err error) {
func (ud *uiaDriver) httpPOST(data interface{}, pathElem ...string) (rawResp rawResponse, err error) {
var bsJSON []byte = nil
if data != nil {
if bsJSON, err = json.Marshal(data); err != nil {
return nil, err
}
}
return ud.uia2HttpRequest(http.MethodPost, ud.concatURL(nil, pathElem...), bsJSON)
return ud.httpRequest(http.MethodPost, ud.concatURL(nil, pathElem...), bsJSON)
}
func (ud *uiaDriver) uia2HttpDELETE(pathElem ...string) (rawResp rawResponse, err error) {
return ud.uia2HttpRequest(http.MethodDelete, ud.concatURL(nil, pathElem...), nil)
func (ud *uiaDriver) httpDELETE(pathElem ...string) (rawResp rawResponse, err error) {
return ud.httpRequest(http.MethodDelete, ud.concatURL(nil, pathElem...), nil)
}
func (ud *uiaDriver) NewSession(capabilities Capabilities) (sessionInfo SessionInfo, err error) {
// register(postHandler, new NewSession("/wd/hub/session"))
var rawResp rawResponse
data := map[string]interface{}{"capabilities": capabilities}
if rawResp, err = ud.httpPOST(data, "/session"); err != nil {
if rawResp, err = ud.Driver.httpPOST(data, "/session"); err != nil {
return SessionInfo{SessionId: ""}, err
}
reply := new(struct{ Value struct{ SessionId string } })
@@ -157,7 +157,7 @@ func (ud *uiaDriver) DeleteSession() (err error) {
if ud.sessionId == "" {
return nil
}
if _, err = ud.uia2HttpDELETE("/session", ud.sessionId); err == nil {
if _, err = ud.httpDELETE("/session", ud.sessionId); err == nil {
ud.sessionId = ""
}
@@ -167,7 +167,7 @@ func (ud *uiaDriver) DeleteSession() (err error) {
func (ud *uiaDriver) Status() (deviceStatus DeviceStatus, err error) {
// register(getHandler, new Status("/wd/hub/status"))
var rawResp rawResponse
if rawResp, err = ud.uia2HttpGET("/status"); err != nil {
if rawResp, err = ud.httpGET("/status"); err != nil {
return DeviceStatus{Ready: false}, err
}
reply := new(struct {
@@ -185,7 +185,7 @@ func (ud *uiaDriver) Status() (deviceStatus DeviceStatus, err error) {
func (ud *uiaDriver) DeviceInfo() (deviceInfo DeviceInfo, err error) {
// register(getHandler, new GetDeviceInfo("/wd/hub/session/:sessionId/appium/device/info"))
var rawResp rawResponse
if rawResp, err = ud.uia2HttpGET("/session", ud.sessionId, "appium/device/info"); err != nil {
if rawResp, err = ud.httpGET("/session", ud.sessionId, "appium/device/info"); err != nil {
return DeviceInfo{}, err
}
reply := new(struct{ Value struct{ DeviceInfo } })
@@ -199,7 +199,7 @@ func (ud *uiaDriver) DeviceInfo() (deviceInfo DeviceInfo, err error) {
func (ud *uiaDriver) BatteryInfo() (batteryInfo BatteryInfo, err error) {
// register(getHandler, new GetBatteryInfo("/wd/hub/session/:sessionId/appium/device/battery_info"))
var rawResp rawResponse
if rawResp, err = ud.uia2HttpGET("/session", ud.sessionId, "appium/device/battery_info"); err != nil {
if rawResp, err = ud.httpGET("/session", ud.sessionId, "appium/device/battery_info"); err != nil {
return BatteryInfo{}, err
}
reply := new(struct{ Value struct{ BatteryInfo } })
@@ -216,7 +216,7 @@ func (ud *uiaDriver) BatteryInfo() (batteryInfo BatteryInfo, err error) {
func (ud *uiaDriver) WindowSize() (size Size, err error) {
// register(getHandler, new GetDeviceSize("/wd/hub/session/:sessionId/window/:windowHandle/size"))
var rawResp rawResponse
if rawResp, err = ud.uia2HttpGET("/session", ud.sessionId, "window/:windowHandle/size"); err != nil {
if rawResp, err = ud.httpGET("/session", ud.sessionId, "window/:windowHandle/size"); err != nil {
return Size{}, errors.Wrap(err, "get window size failed with uiautomator2")
}
reply := new(struct{ Value struct{ Size } })
@@ -230,7 +230,7 @@ func (ud *uiaDriver) WindowSize() (size Size, err error) {
// PressBack simulates a short press on the BACK button.
func (ud *uiaDriver) PressBack(options ...ActionOption) (err error) {
// register(postHandler, new PressBack("/wd/hub/session/:sessionId/back"))
_, err = ud.uia2HttpPOST(nil, "/session", ud.sessionId, "back")
_, err = ud.httpPOST(nil, "/session", ud.sessionId, "back")
return
}
@@ -249,7 +249,7 @@ func (ud *uiaDriver) PressKeyCode(keyCode KeyCode, metaState KeyMeta, flags ...K
if len(flags) != 0 {
data["flags"] = flags[0]
}
_, err = ud.uia2HttpPOST(data, "/session", ud.sessionId, "appium/device/press_keycode")
_, err = ud.httpPOST(data, "/session", ud.sessionId, "appium/device/press_keycode")
return
}
@@ -266,7 +266,7 @@ func (ud *uiaDriver) TapFloat(x, y float64, options ...ActionOption) (err error)
// new data options in post data for extra uiautomator configurations
newData := mergeDataWithOptions(data, options...)
_, err = ud.uia2HttpPOST(newData, "/session", ud.sessionId, "appium/tap")
_, err = ud.httpPOST(newData, "/session", ud.sessionId, "appium/tap")
return
}
@@ -286,7 +286,7 @@ func (ud *uiaDriver) TouchAndHoldFloat(x, y float64, second ...float64) (err err
"duration": int(second[0] * 1000),
},
}
_, err = ud.uia2HttpPOST(data, "/session", ud.sessionId, "touch/longclick")
_, err = ud.httpPOST(data, "/session", ud.sessionId, "touch/longclick")
return
}
@@ -310,7 +310,7 @@ func (ud *uiaDriver) DragFloat(fromX, fromY, toX, toY float64, options ...Action
newData := mergeDataWithOptions(data, options...)
// register(postHandler, new Drag("/wd/hub/session/:sessionId/touch/drag"))
_, err = ud.uia2HttpPOST(newData, "/session", ud.sessionId, "touch/drag")
_, err = ud.httpPOST(newData, "/session", ud.sessionId, "touch/drag")
return
}
@@ -335,7 +335,7 @@ func (ud *uiaDriver) SwipeFloat(fromX, fromY, toX, toY float64, options ...Actio
// new data options in post data for extra uiautomator configurations
newData := mergeDataWithOptions(data, options...)
_, err := ud.uia2HttpPOST(newData, "/session", ud.sessionId, "touch/perform")
_, err := ud.httpPOST(newData, "/session", ud.sessionId, "touch/perform")
return err
}
@@ -353,7 +353,7 @@ func (ud *uiaDriver) SetPasteboard(contentType PasteboardType, content string) (
"content": base64.StdEncoding.EncodeToString([]byte(content)),
}
// register(postHandler, new SetClipboard("/wd/hub/session/:sessionId/appium/device/set_clipboard"))
_, err = ud.uia2HttpPOST(data, "/session", ud.sessionId, "appium/device/set_clipboard")
_, err = ud.httpPOST(data, "/session", ud.sessionId, "appium/device/set_clipboard")
return
}
@@ -366,7 +366,7 @@ func (ud *uiaDriver) GetPasteboard(contentType PasteboardType) (raw *bytes.Buffe
"contentType": contentType[0],
}
var rawResp rawResponse
if rawResp, err = ud.uia2HttpPOST(data, "/session", ud.sessionId, "appium/device/get_clipboard"); err != nil {
if rawResp, err = ud.httpPOST(data, "/session", ud.sessionId, "appium/device/get_clipboard"); err != nil {
return
}
reply := new(struct{ Value string })
@@ -391,7 +391,7 @@ func (ud *uiaDriver) SendKeys(text string, options ...ActionOption) (err error)
// new data options in post data for extra uiautomator configurations
newData := mergeDataWithOptions(data, options...)
_, err = ud.uia2HttpPOST(newData, "/session", ud.sessionId, "keys")
_, err = ud.httpPOST(newData, "/session", ud.sessionId, "keys")
return
}
@@ -402,7 +402,7 @@ func (ud *uiaDriver) Input(text string, options ...ActionOption) (err error) {
func (ud *uiaDriver) Rotation() (rotation Rotation, err error) {
// register(getHandler, new GetRotation("/wd/hub/session/:sessionId/rotation"))
var rawResp rawResponse
if rawResp, err = ud.uia2HttpGET("/session", ud.sessionId, "rotation"); err != nil {
if rawResp, err = ud.httpGET("/session", ud.sessionId, "rotation"); err != nil {
return Rotation{}, err
}
reply := new(struct{ Value Rotation })
@@ -417,7 +417,7 @@ func (ud *uiaDriver) Rotation() (rotation Rotation, err error) {
func (ud *uiaDriver) Screenshot() (raw *bytes.Buffer, err error) {
// register(getHandler, new CaptureScreenshot("/wd/hub/session/:sessionId/screenshot"))
var rawResp rawResponse
if rawResp, err = ud.uia2HttpGET("/session", ud.sessionId, "screenshot"); err != nil {
if rawResp, err = ud.httpGET("/session", ud.sessionId, "screenshot"); err != nil {
return nil, errors.Wrap(code.AndroidScreenShotError,
fmt.Sprintf("get UIA screenshot data failed: %v", err))
}
@@ -439,7 +439,7 @@ func (ud *uiaDriver) Screenshot() (raw *bytes.Buffer, err error) {
func (ud *uiaDriver) Source(srcOpt ...SourceOption) (source string, err error) {
// register(getHandler, new Source("/wd/hub/session/:sessionId/source"))
var rawResp rawResponse
if rawResp, err = ud.uia2HttpGET("/session", ud.sessionId, "source"); err != nil {
if rawResp, err = ud.httpGET("/session", ud.sessionId, "source"); err != nil {
return "", err
}
reply := new(struct{ Value string })

116
hrp/pkg/uixt/ios_driver.go
View File

@@ -32,7 +32,7 @@ type wdaDriver struct {
mjpegClient *http.Client
}
func (wd *wdaDriver) resetWDASession() error {
func (wd *wdaDriver) resetSession() error {
capabilities := NewCapabilities()
capabilities.WithDefaultAlertAction(AlertActionAccept)
@@ -44,17 +44,17 @@ func (wd *wdaDriver) resetWDASession() error {
return nil
}
func (wd *wdaDriver) wdaHttpRequest(method string, rawURL string, rawBody []byte, disableRetry ...bool) (rawResp rawResponse, err error) {
func (wd *wdaDriver) httpRequest(method string, rawURL string, rawBody []byte, disableRetry ...bool) (rawResp rawResponse, err error) {
disableRetryBool := len(disableRetry) > 0 && disableRetry[0]
for retryCount := 1; retryCount <= 5; retryCount++ {
rawResp, err = wd.httpRequest(method, rawURL, rawBody)
rawResp, err = wd.Driver.httpRequest(method, rawURL, rawBody)
if err == nil || disableRetryBool {
return
}
// TODO: polling WDA to check if resumed automatically
time.Sleep(5 * time.Second)
oldSessionID := wd.sessionId
if err = wd.resetWDASession(); err != nil {
if err = wd.resetSession(); err != nil {
log.Err(err).Msgf("failed to reset wda driver, retry count: %v", retryCount)
continue
}
@@ -66,26 +66,26 @@ func (wd *wdaDriver) wdaHttpRequest(method string, rawURL string, rawBody []byte
return
}
func (wd *wdaDriver) wdaHttpGET(pathElem ...string) (rawResp rawResponse, err error) {
return wd.wdaHttpRequest(http.MethodGet, wd.concatURL(nil, pathElem...), nil)
func (wd *wdaDriver) httpGET(pathElem ...string) (rawResp rawResponse, err error) {
return wd.httpRequest(http.MethodGet, wd.concatURL(nil, pathElem...), nil)
}
func (wd *wdaDriver) wdaHttpGETWithRetry(pathElem ...string) (rawResp rawResponse, err error) {
return wd.wdaHttpRequest(http.MethodGet, wd.concatURL(nil, pathElem...), nil, true)
func (wd *wdaDriver) httpGETWithRetry(pathElem ...string) (rawResp rawResponse, err error) {
return wd.httpRequest(http.MethodGet, wd.concatURL(nil, pathElem...), nil, true)
}
func (wd *wdaDriver) wdaHttpPOST(data interface{}, pathElem ...string) (rawResp rawResponse, err error) {
func (wd *wdaDriver) httpPOST(data interface{}, pathElem ...string) (rawResp rawResponse, err error) {
var bsJSON []byte = nil
if data != nil {
if bsJSON, err = json.Marshal(data); err != nil {
return nil, err
}
}
return wd.wdaHttpRequest(http.MethodPost, wd.concatURL(nil, pathElem...), bsJSON)
return wd.httpRequest(http.MethodPost, wd.concatURL(nil, pathElem...), bsJSON)
}
func (wd *wdaDriver) wdaHttpDELETE(pathElem ...string) (rawResp rawResponse, err error) {
return wd.wdaHttpRequest(http.MethodDelete, wd.concatURL(nil, pathElem...), nil)
func (wd *wdaDriver) httpDELETE(pathElem ...string) (rawResp rawResponse, err error) {
return wd.httpRequest(http.MethodDelete, wd.concatURL(nil, pathElem...), nil)
}
func (wd *wdaDriver) GetMjpegClient() *http.Client {
@@ -102,7 +102,7 @@ func (wd *wdaDriver) NewSession(capabilities Capabilities) (sessionInfo SessionI
}
var rawResp rawResponse
if rawResp, err = wd.httpPOST(data, "/session"); err != nil {
if rawResp, err = wd.Driver.httpPOST(data, "/session"); err != nil {
return SessionInfo{}, err
}
if sessionInfo, err = rawResp.valueConvertToSessionInfo(); err != nil {
@@ -127,14 +127,14 @@ func (wd *wdaDriver) DeleteSession() (err error) {
}
// [[FBRoute DELETE:@""] respondWithTarget:self action:@selector(handleDeleteSession:)]
_, err = wd.wdaHttpDELETE("/session", wd.sessionId)
_, err = wd.httpDELETE("/session", wd.sessionId)
return
}
func (wd *wdaDriver) Status() (deviceStatus DeviceStatus, err error) {
// [[FBRoute GET:@"/status"].withoutSession respondWithTarget:self action:@selector(handleGetStatus:)]
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/status"); err != nil {
if rawResp, err = wd.httpGET("/status"); err != nil {
return DeviceStatus{}, err
}
reply := new(struct{ Value struct{ DeviceStatus } })
@@ -149,7 +149,7 @@ func (wd *wdaDriver) DeviceInfo() (deviceInfo DeviceInfo, err error) {
// [[FBRoute GET:@"/wda/device/info"] respondWithTarget:self action:@selector(handleGetDeviceInfo:)]
// [[FBRoute GET:@"/wda/device/info"].withoutSession
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/session", wd.sessionId, "/wda/device/info"); err != nil {
if rawResp, err = wd.httpGET("/session", wd.sessionId, "/wda/device/info"); err != nil {
return DeviceInfo{}, err
}
reply := new(struct{ Value struct{ DeviceInfo } })
@@ -164,7 +164,7 @@ func (wd *wdaDriver) Location() (location Location, err error) {
// [[FBRoute GET:@"/wda/device/location"] respondWithTarget:self action:@selector(handleGetLocation:)]
// [[FBRoute GET:@"/wda/device/location"].withoutSession
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/session", wd.sessionId, "/wda/device/location"); err != nil {
if rawResp, err = wd.httpGET("/session", wd.sessionId, "/wda/device/location"); err != nil {
return Location{}, err
}
reply := new(struct{ Value struct{ Location } })
@@ -178,7 +178,7 @@ func (wd *wdaDriver) Location() (location Location, err error) {
func (wd *wdaDriver) BatteryInfo() (batteryInfo BatteryInfo, err error) {
// [[FBRoute GET:@"/wda/batteryInfo"] respondWithTarget:self action:@selector(handleGetBatteryInfo:)]
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/session", wd.sessionId, "/wda/batteryInfo"); err != nil {
if rawResp, err = wd.httpGET("/session", wd.sessionId, "/wda/batteryInfo"); err != nil {
return BatteryInfo{}, err
}
reply := new(struct{ Value struct{ BatteryInfo } })
@@ -192,7 +192,7 @@ func (wd *wdaDriver) BatteryInfo() (batteryInfo BatteryInfo, err error) {
func (wd *wdaDriver) WindowSize() (size Size, err error) {
// [[FBRoute GET:@"/window/size"] respondWithTarget:self action:@selector(handleGetWindowSize:)]
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/session", wd.sessionId, "/window/size"); err != nil {
if rawResp, err = wd.httpGET("/session", wd.sessionId, "/window/size"); err != nil {
return Size{}, errors.Wrap(err, "get window size failed with wda")
}
reply := new(struct{ Value struct{ Size } })
@@ -206,7 +206,7 @@ func (wd *wdaDriver) WindowSize() (size Size, err error) {
func (wd *wdaDriver) Screen() (screen Screen, err error) {
// [[FBRoute GET:@"/wda/screen"] respondWithTarget:self action:@selector(handleGetScreen:)]
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/session", wd.sessionId, "/wda/screen"); err != nil {
if rawResp, err = wd.httpGET("/session", wd.sessionId, "/wda/screen"); err != nil {
return Screen{}, err
}
reply := new(struct{ Value struct{ Screen } })
@@ -239,7 +239,7 @@ func (wd *wdaDriver) ActiveAppInfo() (info AppInfo, err error) {
// [[FBRoute GET:@"/wda/activeAppInfo"] respondWithTarget:self action:@selector(handleActiveAppInfo:)]
// [[FBRoute GET:@"/wda/activeAppInfo"].withoutSession
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/session", wd.sessionId, "/wda/activeAppInfo"); err != nil {
if rawResp, err = wd.httpGET("/session", wd.sessionId, "/wda/activeAppInfo"); err != nil {
return AppInfo{}, err
}
reply := new(struct{ Value struct{ AppInfo } })
@@ -253,7 +253,7 @@ func (wd *wdaDriver) ActiveAppInfo() (info AppInfo, err error) {
func (wd *wdaDriver) ActiveAppsList() (appsList []AppBaseInfo, err error) {
// [[FBRoute GET:@"/wda/apps/list"] respondWithTarget:self action:@selector(handleGetActiveAppsList:)]
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/session", wd.sessionId, "/wda/apps/list"); err != nil {
if rawResp, err = wd.httpGET("/session", wd.sessionId, "/wda/apps/list"); err != nil {
return nil, err
}
reply := new(struct{ Value []AppBaseInfo })
@@ -268,7 +268,7 @@ func (wd *wdaDriver) AppState(bundleId string) (runState AppState, err error) {
// [[FBRoute POST:@"/wda/apps/state"] respondWithTarget:self action:@selector(handleSessionAppState:)]
data := map[string]interface{}{"bundleId": bundleId}
var rawResp rawResponse
if rawResp, err = wd.wdaHttpPOST(data, "/session", wd.sessionId, "/wda/apps/state"); err != nil {
if rawResp, err = wd.httpPOST(data, "/session", wd.sessionId, "/wda/apps/state"); err != nil {
return 0, err
}
reply := new(struct{ Value AppState })
@@ -284,7 +284,7 @@ func (wd *wdaDriver) IsLocked() (locked bool, err error) {
// [[FBRoute GET:@"/wda/locked"] respondWithTarget:self action:@selector(handleIsLocked:)]
// [[FBRoute GET:@"/wda/locked"].withoutSession
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/session", wd.sessionId, "/wda/locked"); err != nil {
if rawResp, err = wd.httpGET("/session", wd.sessionId, "/wda/locked"); err != nil {
return false, err
}
if locked, err = rawResp.valueConvertToBool(); err != nil {
@@ -296,20 +296,20 @@ func (wd *wdaDriver) IsLocked() (locked bool, err error) {
func (wd *wdaDriver) Unlock() (err error) {
// [[FBRoute POST:@"/wda/unlock"] respondWithTarget:self action:@selector(handleUnlock:)]
// [[FBRoute POST:@"/wda/unlock"].withoutSession
_, err = wd.wdaHttpPOST(nil, "/session", wd.sessionId, "/wda/unlock")
_, err = wd.httpPOST(nil, "/session", wd.sessionId, "/wda/unlock")
return
}
func (wd *wdaDriver) Lock() (err error) {
// [[FBRoute POST:@"/wda/lock"] respondWithTarget:self action:@selector(handleLock:)]
// [[FBRoute POST:@"/wda/lock"].withoutSession
_, err = wd.wdaHttpPOST(nil, "/session", wd.sessionId, "/wda/lock")
_, err = wd.httpPOST(nil, "/session", wd.sessionId, "/wda/lock")
return
}
func (wd *wdaDriver) Homescreen() (err error) {
// [[FBRoute POST:@"/wda/homescreen"].withoutSession respondWithTarget:self action:@selector(handleHomescreenCommand:)]
_, err = wd.wdaHttpPOST(nil, "/wda/homescreen")
_, err = wd.httpPOST(nil, "/wda/homescreen")
return
}
@@ -317,7 +317,7 @@ func (wd *wdaDriver) AlertText() (text string, err error) {
// [[FBRoute GET:@"/alert/text"] respondWithTarget:self action:@selector(handleAlertGetTextCommand:)]
// [[FBRoute GET:@"/alert/text"].withoutSession
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/session", wd.sessionId, "/alert/text"); err != nil {
if rawResp, err = wd.httpGET("/session", wd.sessionId, "/alert/text"); err != nil {
return "", err
}
if text, err = rawResp.valueConvertToString(); err != nil {
@@ -329,7 +329,7 @@ func (wd *wdaDriver) AlertText() (text string, err error) {
func (wd *wdaDriver) AlertButtons() (btnLabels []string, err error) {
// [[FBRoute GET:@"/wda/alert/buttons"] respondWithTarget:self action:@selector(handleGetAlertButtonsCommand:)]
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/session", wd.sessionId, "/wda/alert/buttons"); err != nil {
if rawResp, err = wd.httpGET("/session", wd.sessionId, "/wda/alert/buttons"); err != nil {
return nil, err
}
reply := new(struct{ Value []string })
@@ -347,7 +347,7 @@ func (wd *wdaDriver) AlertAccept(label ...string) (err error) {
if len(label) != 0 && label[0] != "" {
data["name"] = label[0]
}
_, err = wd.wdaHttpPOST(data, "/alert/accept")
_, err = wd.httpPOST(data, "/alert/accept")
return
}
@@ -358,14 +358,14 @@ func (wd *wdaDriver) AlertDismiss(label ...string) (err error) {
if len(label) != 0 && label[0] != "" {
data["name"] = label[0]
}
_, err = wd.wdaHttpPOST(data, "/alert/dismiss")
_, err = wd.httpPOST(data, "/alert/dismiss")
return
}
func (wd *wdaDriver) AlertSendKeys(text string) (err error) {
// [[FBRoute POST:@"/alert/text"] respondWithTarget:self action:@selector(handleAlertSetTextCommand:)]
data := map[string]interface{}{"value": strings.Split(text, "")}
_, err = wd.wdaHttpPOST(data, "/session", wd.sessionId, "/alert/text")
_, err = wd.httpPOST(data, "/session", wd.sessionId, "/alert/text")
return
}
@@ -373,7 +373,7 @@ func (wd *wdaDriver) AppLaunch(bundleId string) (err error) {
// [[FBRoute POST:@"/wda/apps/launch"] respondWithTarget:self action:@selector(handleSessionAppLaunch:)]
data := make(map[string]interface{})
data["bundleId"] = bundleId
_, err = wd.wdaHttpPOST(data, "/session", wd.sessionId, "/wda/apps/launch")
_, err = wd.httpPOST(data, "/session", wd.sessionId, "/wda/apps/launch")
if err != nil {
return errors.Wrap(code.MobileUILaunchAppError,
fmt.Sprintf("wda launch failed: %v", err))
@@ -384,7 +384,7 @@ func (wd *wdaDriver) AppLaunch(bundleId string) (err error) {
func (wd *wdaDriver) AppLaunchUnattached(bundleId string) (err error) {
// [[FBRoute POST:@"/wda/apps/launchUnattached"].withoutSession respondWithTarget:self action:@selector(handleLaunchUnattachedApp:)]
data := map[string]interface{}{"bundleId": bundleId}
_, err = wd.wdaHttpPOST(data, "/wda/apps/launchUnattached")
_, err = wd.httpPOST(data, "/wda/apps/launchUnattached")
if err != nil {
return errors.Wrap(code.MobileUILaunchAppError,
fmt.Sprintf("wda launchUnattached failed: %v", err))
@@ -396,7 +396,7 @@ func (wd *wdaDriver) AppTerminate(bundleId string) (successful bool, err error)
// [[FBRoute POST:@"/wda/apps/terminate"] respondWithTarget:self action:@selector(handleSessionAppTerminate:)]
data := map[string]interface{}{"bundleId": bundleId}
var rawResp rawResponse
if rawResp, err = wd.wdaHttpPOST(data, "/session", wd.sessionId, "/wda/apps/terminate"); err != nil {
if rawResp, err = wd.httpPOST(data, "/session", wd.sessionId, "/wda/apps/terminate"); err != nil {
return false, err
}
if successful, err = rawResp.valueConvertToBool(); err != nil {
@@ -408,7 +408,7 @@ func (wd *wdaDriver) AppTerminate(bundleId string) (successful bool, err error)
func (wd *wdaDriver) AppActivate(bundleId string) (err error) {
// [[FBRoute POST:@"/wda/apps/activate"] respondWithTarget:self action:@selector(handleSessionAppActivate:)]
data := map[string]interface{}{"bundleId": bundleId}
_, err = wd.wdaHttpPOST(data, "/session", wd.sessionId, "/wda/apps/activate")
_, err = wd.httpPOST(data, "/session", wd.sessionId, "/wda/apps/activate")
return
}
@@ -418,7 +418,7 @@ func (wd *wdaDriver) AppDeactivate(second float64) (err error) {
second = 3.0
}
data := map[string]interface{}{"duration": second}
_, err = wd.wdaHttpPOST(data, "/session", wd.sessionId, "/wda/deactivateApp")
_, err = wd.httpPOST(data, "/session", wd.sessionId, "/wda/deactivateApp")
return
}
@@ -458,7 +458,7 @@ func (wd *wdaDriver) TapFloat(x, y float64, options ...ActionOption) (err error)
// new data options in post data for extra WDA configurations
newData := mergeDataWithOptions(data, options...)
_, err = wd.wdaHttpPOST(newData, "/session", wd.sessionId, "/wda/tap/0")
_, err = wd.httpPOST(newData, "/session", wd.sessionId, "/wda/tap/0")
return
}
@@ -472,7 +472,7 @@ func (wd *wdaDriver) DoubleTapFloat(x, y float64) (err error) {
"x": wd.toScale(x),
"y": wd.toScale(y),
}
_, err = wd.wdaHttpPOST(data, "/session", wd.sessionId, "/wda/doubleTap")
_, err = wd.httpPOST(data, "/session", wd.sessionId, "/wda/doubleTap")
return
}
@@ -490,7 +490,7 @@ func (wd *wdaDriver) TouchAndHoldFloat(x, y float64, second ...float64) (err err
second = []float64{1.0}
}
data["duration"] = second[0]
_, err = wd.wdaHttpPOST(data, "/session", wd.sessionId, "/wda/touchAndHold")
_, err = wd.httpPOST(data, "/session", wd.sessionId, "/wda/touchAndHold")
return
}
@@ -510,7 +510,7 @@ func (wd *wdaDriver) DragFloat(fromX, fromY, toX, toY float64, options ...Action
// new data options in post data for extra WDA configurations
newData := mergeDataWithOptions(data, options...)
_, err = wd.wdaHttpPOST(newData, "/session", wd.sessionId, "/wda/dragfromtoforduration")
_, err = wd.httpPOST(newData, "/session", wd.sessionId, "/wda/dragfromtoforduration")
return
}
@@ -528,7 +528,7 @@ func (wd *wdaDriver) SetPasteboard(contentType PasteboardType, content string) (
"contentType": contentType,
"content": base64.StdEncoding.EncodeToString([]byte(content)),
}
_, err = wd.wdaHttpPOST(data, "/session", wd.sessionId, "/wda/setPasteboard")
_, err = wd.httpPOST(data, "/session", wd.sessionId, "/wda/setPasteboard")
return
}
@@ -536,7 +536,7 @@ func (wd *wdaDriver) GetPasteboard(contentType PasteboardType) (raw *bytes.Buffe
// [[FBRoute POST:@"/wda/getPasteboard"] respondWithTarget:self action:@selector(handleGetPasteboard:)]
data := map[string]interface{}{"contentType": contentType}
var rawResp rawResponse
if rawResp, err = wd.wdaHttpPOST(data, "/session", wd.sessionId, "/wda/getPasteboard"); err != nil {
if rawResp, err = wd.httpPOST(data, "/session", wd.sessionId, "/wda/getPasteboard"); err != nil {
return nil, err
}
if raw, err = rawResp.valueDecodeAsBase64(); err != nil {
@@ -552,7 +552,7 @@ func (wd *wdaDriver) SendKeys(text string, options ...ActionOption) (err error)
// new data options in post data for extra WDA configurations
newData := mergeDataWithOptions(data, options...)
_, err = wd.wdaHttpPOST(newData, "/session", wd.sessionId, "/wda/keys")
_, err = wd.httpPOST(newData, "/session", wd.sessionId, "/wda/keys")
return
}
@@ -577,14 +577,14 @@ func (wd *wdaDriver) PressBack(options ...ActionOption) (err error) {
// new data options in post data for extra WDA configurations
newData := mergeDataWithOptions(data, options...)
_, err = wd.wdaHttpPOST(newData, "/session", wd.sessionId, "/wda/dragfromtoforduration")
_, err = wd.httpPOST(newData, "/session", wd.sessionId, "/wda/dragfromtoforduration")
return
}
func (wd *wdaDriver) PressButton(devBtn DeviceButton) (err error) {
// [[FBRoute POST:@"/wda/pressButton"] respondWithTarget:self action:@selector(handlePressButtonCommand:)]
data := map[string]interface{}{"name": devBtn}
_, err = wd.wdaHttpPOST(data, "/session", wd.sessionId, "/wda/pressButton")
_, err = wd.httpPOST(data, "/session", wd.sessionId, "/wda/pressButton")
return
}
@@ -608,7 +608,7 @@ func (wd *wdaDriver) StopCamera() (err error) {
func (wd *wdaDriver) Orientation() (orientation Orientation, err error) {
// [[FBRoute GET:@"/orientation"] respondWithTarget:self action:@selector(handleGetOrientation:)]
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/session", wd.sessionId, "/orientation"); err != nil {
if rawResp, err = wd.httpGET("/session", wd.sessionId, "/orientation"); err != nil {
return "", err
}
reply := new(struct{ Value Orientation })
@@ -622,14 +622,14 @@ func (wd *wdaDriver) Orientation() (orientation Orientation, err error) {
func (wd *wdaDriver) SetOrientation(orientation Orientation) (err error) {
// [[FBRoute POST:@"/orientation"] respondWithTarget:self action:@selector(handleSetOrientation:)]
data := map[string]interface{}{"orientation": orientation}
_, err = wd.wdaHttpPOST(data, "/session", wd.sessionId, "/orientation")
_, err = wd.httpPOST(data, "/session", wd.sessionId, "/orientation")
return
}
func (wd *wdaDriver) Rotation() (rotation Rotation, err error) {
// [[FBRoute GET:@"/rotation"] respondWithTarget:self action:@selector(handleGetRotation:)]
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/session", wd.sessionId, "/rotation"); err != nil {
if rawResp, err = wd.httpGET("/session", wd.sessionId, "/rotation"); err != nil {
return Rotation{}, err
}
reply := new(struct{ Value Rotation })
@@ -642,7 +642,7 @@ func (wd *wdaDriver) Rotation() (rotation Rotation, err error) {
func (wd *wdaDriver) SetRotation(rotation Rotation) (err error) {
// [[FBRoute POST:@"/rotation"] respondWithTarget:self action:@selector(handleSetRotation:)]
_, err = wd.wdaHttpPOST(rotation, "/session", wd.sessionId, "/rotation")
_, err = wd.httpPOST(rotation, "/session", wd.sessionId, "/rotation")
return
}
@@ -650,7 +650,7 @@ func (wd *wdaDriver) Screenshot() (raw *bytes.Buffer, err error) {
// [[FBRoute GET:@"/screenshot"] respondWithTarget:self action:@selector(handleGetScreenshot:)]
// [[FBRoute GET:@"/screenshot"].withoutSession respondWithTarget:self action:@selector(handleGetScreenshot:)]
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/session", wd.sessionId, "/screenshot"); err != nil {
if rawResp, err = wd.httpGET("/session", wd.sessionId, "/screenshot"); err != nil {
return nil, errors.Wrap(code.IOSScreenShotError,
fmt.Sprintf("get WDA screenshot data failed: %v", err))
}
@@ -700,7 +700,7 @@ func (wd *wdaDriver) AccessibleSource() (source string, err error) {
// [[FBRoute GET:@"/wda/accessibleSource"] respondWithTarget:self action:@selector(handleGetAccessibleSourceCommand:)]
// [[FBRoute GET:@"/wda/accessibleSource"].withoutSession
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/session", wd.sessionId, "/wda/accessibleSource"); err != nil {
if rawResp, err = wd.httpGET("/session", wd.sessionId, "/wda/accessibleSource"); err != nil {
return "", err
}
var jr builtinJSON.RawMessage
@@ -713,14 +713,14 @@ func (wd *wdaDriver) AccessibleSource() (source string, err error) {
func (wd *wdaDriver) HealthCheck() (err error) {
// [[FBRoute GET:@"/wda/healthcheck"].withoutSession respondWithTarget:self action:@selector(handleGetHealthCheck:)]
_, err = wd.wdaHttpGET("/wda/healthcheck")
_, err = wd.httpGET("/wda/healthcheck")
return
}
func (wd *wdaDriver) GetAppiumSettings() (settings map[string]interface{}, err error) {
// [[FBRoute GET:@"/appium/settings"] respondWithTarget:self action:@selector(handleGetSettings:)]
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/session", wd.sessionId, "/appium/settings"); err != nil {
if rawResp, err = wd.httpGET("/session", wd.sessionId, "/appium/settings"); err != nil {
return nil, err
}
reply := new(struct{ Value map[string]interface{} })
@@ -735,7 +735,7 @@ func (wd *wdaDriver) SetAppiumSettings(settings map[string]interface{}) (ret map
// [[FBRoute POST:@"/appium/settings"] respondWithTarget:self action:@selector(handleSetSettings:)]
data := map[string]interface{}{"settings": settings}
var rawResp rawResponse
if rawResp, err = wd.wdaHttpPOST(data, "/session", wd.sessionId, "/appium/settings"); err != nil {
if rawResp, err = wd.httpPOST(data, "/session", wd.sessionId, "/appium/settings"); err != nil {
return nil, err
}
reply := new(struct{ Value map[string]interface{} })
@@ -748,7 +748,7 @@ func (wd *wdaDriver) SetAppiumSettings(settings map[string]interface{}) (ret map
func (wd *wdaDriver) IsHealthy() (healthy bool, err error) {
var rawResp rawResponse
if rawResp, err = wd.wdaHttpGET("/health"); err != nil {
if rawResp, err = wd.httpGET("/health"); err != nil {
return false, err
}
if string(rawResp) != "I-AM-ALIVE" {
@@ -758,13 +758,13 @@ func (wd *wdaDriver) IsHealthy() (healthy bool, err error) {
}
func (wd *wdaDriver) WdaShutdown() (err error) {
_, err = wd.wdaHttpGET("/wda/shutdown")
_, err = wd.httpGET("/wda/shutdown")
return
}
func (wd *wdaDriver) triggerWDALog(data map[string]interface{}) (rawResp []byte, err error) {
// [[FBRoute POST:@"/gtf/automation/log"].withoutSession respondWithTarget:self action:@selector(handleAutomationLog:)]
return wd.wdaHttpPOST(data, "/gtf/automation/log")
return wd.httpPOST(data, "/gtf/automation/log")
}
func (wd *wdaDriver) StartCaptureLog(identifier ...string) error {