GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-06 20:32:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove GET/POST methods with base URL, streamline HTTP requests in UIA2 and WDA drivers

Browse Source
This commit is contained in:
lilong.129
2025-06-26 14:18:11 +08:00
parent 2cffdf01b1
commit 88d255bce1
5 changed files with 71 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/version/VERSION
View File

@@ -1 +1 @@
v5.0.0-beta-2506251207
v5.0.0-beta-2506261418

46
uixt/android_driver_uia2.go
View File

@@ -43,7 +43,6 @@ type UIA2Driver struct {
// cache to avoid repeated query
windowSize types.Size
baseURL string // store base URL for building full URLs
}
func (ud *UIA2Driver) Setup() error {
@@ -59,10 +58,9 @@ func (ud *UIA2Driver) Setup() error {
}
// Store base URL for building full URLs
ud.baseURL = fmt.Sprintf("http://forward-to-%d:%d/wd/hub",
baseURL := fmt.Sprintf("http://forward-to-%d:%d/wd/hub",
localPort, ud.Device.Options.UIA2Port)
// Keep the old method call for backward compatibility
ud.Session.SetBaseURL(ud.baseURL)
ud.Session.SetBaseURL(baseURL)
// uiautomator2 server must be started before
@@ -112,7 +110,7 @@ func (ud *UIA2Driver) InitSession(capabilities option.Capabilities) (err error)
} else {
data["capabilities"] = map[string]interface{}{"alwaysMatch": capabilities}
}
if rawResp, err = ud.Session.POSTWithBaseURL(data, ud.baseURL, "/session"); err != nil {
if rawResp, err = ud.Session.POST(data, "/session"); err != nil {
return err
}
reply := new(struct{ Value struct{ SessionId string } })
@@ -128,7 +126,7 @@ func (ud *UIA2Driver) DeleteSession() (err error) {
return nil
}
urlStr := fmt.Sprintf("/session/%s", ud.Session.ID)
if _, err = ud.Session.DELETEWithBaseURL(ud.baseURL, urlStr); err == nil {
if _, err = ud.Session.DELETE(urlStr); err == nil {
ud.Session.ID = ""
}
@@ -139,7 +137,7 @@ func (ud *UIA2Driver) Status() (deviceStatus types.DeviceStatus, err error) {
// register(getHandler, new Status("/wd/hub/status"))
var rawResp DriverRawResponse
// Notice: use Driver.GET instead of httpGET to avoid loop calling
if rawResp, err = ud.Session.GETWithBaseURL(ud.baseURL, "/status"); err != nil {
if rawResp, err = ud.Session.GET("/status"); err != nil {
return types.DeviceStatus{Ready: false}, err
}
reply := new(struct {
@@ -158,7 +156,7 @@ func (ud *UIA2Driver) DeviceInfo() (deviceInfo types.DeviceInfo, err error) {
// register(getHandler, new GetDeviceInfo("/wd/hub/session/:sessionId/appium/device/info"))
var rawResp DriverRawResponse
urlStr := fmt.Sprintf("/session/%s/appium/device/info", ud.Session.ID)
if rawResp, err = ud.Session.GETWithBaseURL(ud.baseURL, urlStr); err != nil {
if rawResp, err = ud.Session.GET(urlStr); err != nil {
return types.DeviceInfo{}, err
}
reply := new(struct{ Value struct{ types.DeviceInfo } })
@@ -173,7 +171,7 @@ func (ud *UIA2Driver) BatteryInfo() (batteryInfo types.BatteryInfo, err error) {
// register(getHandler, new GetBatteryInfo("/wd/hub/session/:sessionId/appium/device/battery_info"))
var rawResp DriverRawResponse
urlStr := fmt.Sprintf("/session/%s/appium/device/battery_info", ud.Session.ID)
if rawResp, err = ud.Session.GETWithBaseURL(ud.baseURL, urlStr); err != nil {
if rawResp, err = ud.Session.GET(urlStr); err != nil {
return types.BatteryInfo{}, err
}
reply := new(struct{ Value struct{ types.BatteryInfo } })
@@ -196,7 +194,7 @@ func (ud *UIA2Driver) WindowSize() (size types.Size, err error) {
var rawResp DriverRawResponse
urlStr := fmt.Sprintf("/session/%s/window/:windowHandle/size", ud.Session.ID)
if rawResp, err = ud.Session.GETWithBaseURL(ud.baseURL, urlStr); err != nil {
if rawResp, err = ud.Session.GET(urlStr); err != nil {
return types.Size{}, errors.Wrap(err, "get window size failed by UIA2 request")
}
reply := new(struct{ Value struct{ types.Size } })
@@ -224,7 +222,7 @@ func (ud *UIA2Driver) Back() (err error) {
log.Info().Msg("UIA2Driver.Back")
// register(postHandler, new PressBack("/wd/hub/session/:sessionId/back"))
urlStr := fmt.Sprintf("/session/%s/back", ud.Session.ID)
_, err = ud.Session.POSTWithBaseURL(nil, ud.baseURL, urlStr)
_, err = ud.Session.POST(nil, urlStr)
return
}
@@ -240,7 +238,7 @@ func (ud *UIA2Driver) PressKeyCodes(keyCode KeyCode, metaState KeyMeta, flags ..
data["flags"] = flags[0]
}
urlStr := fmt.Sprintf("/session/%s/appium/device/press_keycode", ud.Session.ID)
_, err = ud.Session.POSTWithBaseURL(data, ud.baseURL, urlStr)
_, err = ud.Session.POST(data, urlStr)
return
}
@@ -248,7 +246,7 @@ func (ud *UIA2Driver) Orientation() (orientation types.Orientation, err error) {
// [[FBRoute GET:@"/orientation"] respondWithTarget:self action:@selector(handleGetOrientation:)]
var rawResp DriverRawResponse
urlStr := fmt.Sprintf("/session/%s/orientation", ud.Session.ID)
if rawResp, err = ud.Session.GETWithBaseURL(ud.baseURL, urlStr); err != nil {
if rawResp, err = ud.Session.GET(urlStr); err != nil {
return "", err
}
reply := new(struct{ Value types.Orientation })
@@ -286,7 +284,7 @@ func (ud *UIA2Driver) DoubleTap(x, y float64, opts ...option.ActionOption) error
}
urlStr := fmt.Sprintf("/session/%s/actions/tap", ud.Session.ID)
_, err = ud.Session.POSTWithBaseURL(data, ud.baseURL, urlStr)
_, err = ud.Session.POST(data, urlStr)
return err
}
@@ -333,7 +331,7 @@ func (ud *UIA2Driver) TapAbsXY(x, y float64, opts ...option.ActionOption) error
option.MergeOptions(data, opts...)
urlStr := fmt.Sprintf("/session/%s/actions/tap", ud.Session.ID)
_, err = ud.Session.POSTWithBaseURL(data, ud.baseURL, urlStr)
_, err = ud.Session.POST(data, urlStr)
return err
}
@@ -354,7 +352,7 @@ func (ud *UIA2Driver) TouchAndHold(x, y float64, opts ...option.ActionOption) (e
},
}
urlStr := fmt.Sprintf("/session/%s/touch/longclick", ud.Session.ID)
_, err = ud.Session.POSTWithBaseURL(data, ud.baseURL, urlStr)
_, err = ud.Session.POST(data, urlStr)
return
}
@@ -383,7 +381,7 @@ func (ud *UIA2Driver) Drag(fromX, fromY, toX, toY float64, opts ...option.Action
// register(postHandler, new Drag("/wd/hub/session/:sessionId/touch/drag"))
urlStr := fmt.Sprintf("/session/%s/touch/drag", ud.Session.ID)
_, err = ud.Session.POSTWithBaseURL(data, ud.baseURL, urlStr)
_, err = ud.Session.POST(data, urlStr)
return err
}
@@ -426,7 +424,7 @@ func (ud *UIA2Driver) Swipe(fromX, fromY, toX, toY float64, opts ...option.Actio
option.MergeOptions(data, opts...)
urlStr := fmt.Sprintf("/session/%s/actions/swipe", ud.Session.ID)
_, err = ud.Session.POSTWithBaseURL(data, ud.baseURL, urlStr)
_, err = ud.Session.POST(data, urlStr)
return err
}
@@ -447,7 +445,7 @@ func (ud *UIA2Driver) SetPasteboard(contentType types.PasteboardType, content st
}
// register(postHandler, new SetClipboard("/wd/hub/session/:sessionId/appium/device/set_clipboard"))
urlStr := fmt.Sprintf("/session/%s/appium/device/set_clipboard", ud.Session.ID)
_, err = ud.Session.POSTWithBaseURL(data, ud.baseURL, urlStr)
_, err = ud.Session.POST(data, urlStr)
return
}
@@ -461,7 +459,7 @@ func (ud *UIA2Driver) GetPasteboard(contentType types.PasteboardType) (raw *byte
}
var rawResp DriverRawResponse
urlStr := fmt.Sprintf("/session/%s/appium/device/get_clipboard", ud.Session.ID)
if rawResp, err = ud.Session.POSTWithBaseURL(data, ud.baseURL, urlStr); err != nil {
if rawResp, err = ud.Session.POST(data, urlStr); err != nil {
return
}
reply := new(struct{ Value string })
@@ -492,7 +490,7 @@ func (ud *UIA2Driver) Input(text string, opts ...option.ActionOption) (err error
}
option.MergeOptions(data, opts...)
urlStr := fmt.Sprintf("/session/%s/keys", ud.Session.ID)
_, err = ud.Session.POSTWithBaseURL(data, ud.baseURL, urlStr)
_, err = ud.Session.POST(data, urlStr)
return
}
@@ -550,7 +548,7 @@ func (ud *UIA2Driver) SendActionKey(text string, opts ...option.ActionOption) (e
option.MergeOptions(data, opts...)
urlStr := fmt.Sprintf("/session/%s/actions/keys", ud.Session.ID)
_, err = ud.Session.POSTWithBaseURL(data, ud.baseURL, urlStr)
_, err = ud.Session.POST(data, urlStr)
return
}
@@ -558,7 +556,7 @@ func (ud *UIA2Driver) Rotation() (rotation types.Rotation, err error) {
// register(getHandler, new GetRotation("/wd/hub/session/:sessionId/rotation"))
var rawResp DriverRawResponse
urlStr := fmt.Sprintf("/session/%s/rotation", ud.Session.ID)
if rawResp, err = ud.Session.GETWithBaseURL(ud.baseURL, urlStr); err != nil {
if rawResp, err = ud.Session.GET(urlStr); err != nil {
return types.Rotation{}, err
}
reply := new(struct{ Value types.Rotation })
@@ -580,7 +578,7 @@ func (ud *UIA2Driver) Source(srcOpt ...option.SourceOption) (source string, err
// register(getHandler, new Source("/wd/hub/session/:sessionId/source"))
var rawResp DriverRawResponse
urlStr := fmt.Sprintf("/session/%s/source", ud.Session.ID)
if rawResp, err = ud.Session.GETWithBaseURL(ud.baseURL, urlStr); err != nil {
if rawResp, err = ud.Session.GET(urlStr); err != nil {
return "", err
}
reply := new(struct{ Value string })

28
uixt/driver_session.go
View File

@@ -55,6 +55,7 @@ func NewDriverSession() *DriverSession {
type DriverSession struct {
ctx context.Context
ID string
baseUrl string
client *http.Client
timeout time.Duration
maxRetry int
@@ -86,8 +87,7 @@ func (s *DriverSession) GetData(withReset bool) SessionData {
}
func (s *DriverSession) SetBaseURL(baseUrl string) {
// This method is kept for backward compatibility but no longer stores baseUrl
// since we'll pass full URLs directly to GET/POST methods
s.baseUrl = baseUrl
}
func (s *DriverSession) RegisterResetHandler(fn func() error) {
@@ -124,12 +124,6 @@ func (s *DriverSession) GET(fullURL string) (rawResp DriverRawResponse, err erro
return s.RequestWithRetry(http.MethodGet, fullURL, nil)
}
// GETWithBaseURL allows passing baseURL and path separately
func (s *DriverSession) GETWithBaseURL(baseURL, path string) (rawResp DriverRawResponse, err error) {
fullURL := baseURL + path
return s.RequestWithRetry(http.MethodGet, fullURL, nil)
}
func (s *DriverSession) POST(data interface{}, fullURL string) (rawResp DriverRawResponse, err error) {
var bsJSON []byte = nil
if data != nil {
@@ -140,28 +134,10 @@ func (s *DriverSession) POST(data interface{}, fullURL string) (rawResp DriverRa
return s.RequestWithRetry(http.MethodPost, fullURL, bsJSON)
}
// POSTWithBaseURL allows passing baseURL and path separately
func (s *DriverSession) POSTWithBaseURL(data interface{}, baseURL, path string) (rawResp DriverRawResponse, err error) {
var bsJSON []byte = nil
if data != nil {
if bsJSON, err = json.Marshal(data); err != nil {
return nil, err
}
}
fullURL := baseURL + path
return s.RequestWithRetry(http.MethodPost, fullURL, bsJSON)
}
func (s *DriverSession) DELETE(fullURL string) (rawResp DriverRawResponse, err error) {
return s.RequestWithRetry(http.MethodDelete, fullURL, nil)
}
// DELETEWithBaseURL allows passing baseURL and path separately
func (s *DriverSession) DELETEWithBaseURL(baseURL, path string) (rawResp DriverRawResponse, err error) {
fullURL := baseURL + path
return s.RequestWithRetry(http.MethodDelete, fullURL, nil)
}
func (s *DriverSession) RequestWithRetry(method string, urlStr string, rawBody []byte) (
rawResp DriverRawResponse, err error,
) {

4
uixt/driver_session_test.go
View File

@@ -134,7 +134,7 @@ func TestDriverSession(t *testing.T) {
// Test GETWithBaseURL
baseURL := "https://postman-echo.com"
resp, err = session.GETWithBaseURL(baseURL, "/get")
resp, err = session.GET(baseURL + "/get")
assert.Nil(t, err)
t.Log(resp)
@@ -146,7 +146,7 @@ func TestDriverSession(t *testing.T) {
assert.Equal(t, 0, len(driverRequests))
// Test POST with base URL and path
resp, err = session.POSTWithBaseURL(nil, baseURL, "/post")
resp, err = session.POST(nil, baseURL+"/post")
assert.Nil(t, err)
t.Log(resp)

88
uixt/ios_driver_wda.go
View File

@@ -190,7 +190,7 @@ func (wd *WDADriver) Status() (deviceStatus types.DeviceStatus, err error) {
// [[FBRoute GET:@"/status"].withoutSession respondWithTarget:self action:@selector(handleGetStatus:)]
var rawResp DriverRawResponse
// Notice: use Driver.GET instead of httpGET to avoid loop calling
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/status"); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/status"); err != nil {
return types.DeviceStatus{}, err
}
reply := new(struct{ Value struct{ types.DeviceStatus } })
@@ -209,7 +209,7 @@ func (wd *WDADriver) DeviceInfo() (deviceInfo types.DeviceInfo, err error) {
// [[FBRoute GET:@"/wda/device/info"] respondWithTarget:self action:@selector(handleGetDeviceInfo:)]
// [[FBRoute GET:@"/wda/device/info"].withoutSession
var rawResp DriverRawResponse
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/wda/device/info"); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/wda/device/info"); err != nil {
return types.DeviceInfo{}, err
}
reply := new(struct{ Value struct{ types.DeviceInfo } })
@@ -224,7 +224,7 @@ func (wd *WDADriver) Location() (location types.Location, err error) {
// [[FBRoute GET:@"/wda/device/location"] respondWithTarget:self action:@selector(handleGetLocation:)]
// [[FBRoute GET:@"/wda/device/location"].withoutSession
var rawResp DriverRawResponse
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/wda/device/location"); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/wda/device/location"); err != nil {
return types.Location{}, err
}
reply := new(struct{ Value struct{ types.Location } })
@@ -238,7 +238,7 @@ func (wd *WDADriver) Location() (location types.Location, err error) {
func (wd *WDADriver) BatteryInfo() (batteryInfo types.BatteryInfo, err error) {
// [[FBRoute GET:@"/wda/batteryInfo"] respondWithTarget:self action:@selector(handleGetBatteryInfo:)]
var rawResp DriverRawResponse
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/wda/batteryInfo"); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/wda/batteryInfo"); err != nil {
return types.BatteryInfo{}, err
}
reply := new(struct{ Value struct{ types.BatteryInfo } })
@@ -257,7 +257,7 @@ func (wd *WDADriver) WindowSize() (size types.Size, err error) {
}
var rawResp DriverRawResponse
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/wings/window/size"); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/wings/window/size"); err != nil {
return types.Size{}, errors.Wrap(err, "get window size failed by WDA request")
}
reply := new(struct{ Value struct{ types.Size } })
@@ -296,7 +296,7 @@ type Screen struct {
func (wd *WDADriver) Screen() (screen Screen, err error) {
// [[FBRoute GET:@"/wda/screen"] respondWithTarget:self action:@selector(handleGetScreen:)]
var rawResp DriverRawResponse
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/wda/screen"); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/wda/screen"); err != nil {
return Screen{}, err
}
reply := new(struct{ Value struct{ Screen } })
@@ -310,7 +310,7 @@ func (wd *WDADriver) Screen() (screen Screen, err error) {
func (wd *WDADriver) ScreenShot(opts ...option.ActionOption) (raw *bytes.Buffer, err error) {
// [[FBRoute GET:@"/screenshot"] respondWithTarget:self action:@selector(handleGetScreenshot:)]
// [[FBRoute GET:@"/screenshot"].withoutSession respondWithTarget:self action:@selector(handleGetScreenshot:)]
rawResp, err := wd.Session.GETWithBaseURL(wd.baseURL, "/screenshot")
rawResp, err := wd.Session.GET(wd.baseURL + "/screenshot")
if err != nil {
return nil, errors.Wrap(code.DeviceScreenShotError,
fmt.Sprintf("WDA screenshot failed %v", err))
@@ -338,7 +338,7 @@ func (wd *WDADriver) ActiveAppInfo() (info types.AppInfo, err error) {
// [[FBRoute GET:@"/wda/activeAppInfo"] respondWithTarget:self action:@selector(handleActiveAppInfo:)]
// [[FBRoute GET:@"/wda/activeAppInfo"].withoutSession
var rawResp DriverRawResponse
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/wda/activeAppInfo"); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/wda/activeAppInfo"); err != nil {
return types.AppInfo{}, err
}
reply := new(struct{ Value struct{ types.AppInfo } })
@@ -352,7 +352,7 @@ func (wd *WDADriver) ActiveAppInfo() (info types.AppInfo, err error) {
func (wd *WDADriver) ActiveAppsList() (appsList []types.AppBaseInfo, err error) {
// [[FBRoute GET:@"/wda/apps/list"] respondWithTarget:self action:@selector(handleGetActiveAppsList:)]
var rawResp DriverRawResponse
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/wda/apps/list"); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/wda/apps/list"); err != nil {
return nil, err
}
reply := new(struct{ Value []types.AppBaseInfo })
@@ -372,7 +372,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 DriverRawResponse
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/wda/locked"); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/wda/locked"); err != nil {
return false, err
}
if locked, err = rawResp.ValueConvertToBool(); err != nil {
@@ -384,20 +384,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.Session.POSTWithBaseURL(nil, wd.baseURL, "/wda/unlock")
_, err = wd.Session.POST(nil, wd.baseURL+"/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.Session.POSTWithBaseURL(nil, wd.baseURL, "/wda/lock")
_, err = wd.Session.POST(nil, wd.baseURL+"/wda/lock")
return
}
func (wd *WDADriver) Home() (err error) {
// [[FBRoute POST:@"/wda/homescreen"].withoutSession respondWithTarget:self action:@selector(handleHomescreenCommand:)]
_, err = wd.Session.POSTWithBaseURL(nil, wd.baseURL, "/wda/homescreen")
_, err = wd.Session.POST(nil, wd.baseURL+"/wda/homescreen")
return
}
@@ -405,7 +405,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 DriverRawResponse
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/alert/text"); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/alert/text"); err != nil {
return "", err
}
if text, err = rawResp.ValueConvertToString(); err != nil {
@@ -417,7 +417,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 DriverRawResponse
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/wda/alert/buttons"); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/wda/alert/buttons"); err != nil {
return nil, err
}
reply := new(struct{ Value []string })
@@ -435,7 +435,7 @@ func (wd *WDADriver) AlertAccept(label ...string) (err error) {
if len(label) != 0 && label[0] != "" {
data["name"] = label[0]
}
_, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/alert/accept")
_, err = wd.Session.POST(data, wd.baseURL+"/alert/accept")
return
}
@@ -446,14 +446,14 @@ func (wd *WDADriver) AlertDismiss(label ...string) (err error) {
if len(label) != 0 && label[0] != "" {
data["name"] = label[0]
}
_, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/alert/dismiss")
_, err = wd.Session.POST(data, wd.baseURL+"/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.Session.POSTWithBaseURL(data, wd.baseURL, "/alert/text")
_, err = wd.Session.POST(data, wd.baseURL+"/alert/text")
return
}
@@ -465,7 +465,7 @@ func (wd *WDADriver) AppLaunch(bundleId string) (err error) {
data["environment"] = map[string]interface{}{
"SHOW_EXPLORER": "NO",
}
_, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/wings/apps/launch")
_, err = wd.Session.POST(data, wd.baseURL+"/wings/apps/launch")
if err != nil {
return errors.Wrap(code.MobileUILaunchAppError,
fmt.Sprintf("wda launch failed: %v", err))
@@ -477,7 +477,7 @@ func (wd *WDADriver) AppLaunchUnattached(bundleId string) (err error) {
log.Info().Str("bundleId", bundleId).Msg("WDADriver.AppLaunchUnattached")
// [[FBRoute POST:@"/wda/apps/launchUnattached"].withoutSession respondWithTarget:self action:@selector(handleLaunchUnattachedApp:)]
data := map[string]interface{}{"bundleId": bundleId}
_, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/wda/apps/launchUnattached")
_, err = wd.Session.POST(data, wd.baseURL+"/wda/apps/launchUnattached")
if err != nil {
return errors.Wrap(code.MobileUILaunchAppError,
fmt.Sprintf("wda launchUnattached failed: %v", err))
@@ -490,7 +490,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 DriverRawResponse
if rawResp, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/wings/apps/terminate"); err != nil {
if rawResp, err = wd.Session.POST(data, wd.baseURL+"/wings/apps/terminate"); err != nil {
return false, err
}
if successful, err = rawResp.ValueConvertToBool(); err != nil {
@@ -503,7 +503,7 @@ func (wd *WDADriver) AppActivate(bundleId string) (err error) {
log.Info().Str("bundleId", bundleId).Msg("WDADriver.AppActivate")
// [[FBRoute POST:@"/wda/apps/activate"] respondWithTarget:self action:@selector(handleSessionAppActivate:)]
data := map[string]interface{}{"bundleId": bundleId}
_, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/wings/apps/activate")
_, err = wd.Session.POST(data, wd.baseURL+"/wings/apps/activate")
return
}
@@ -566,7 +566,7 @@ func (wd *WDADriver) TapAbsXY(x, y float64, opts ...option.ActionOption) error {
}
option.MergeOptions(data, opts...)
_, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/wings/interaction/tap")
_, err = wd.Session.POST(data, wd.baseURL+"/wings/interaction/tap")
return err
}
@@ -588,7 +588,7 @@ func (wd *WDADriver) DoubleTap(x, y float64, opts ...option.ActionOption) error
"x": x,
"y": y,
}
_, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/wings/interaction/doubleTap")
_, err = wd.Session.POST(data, wd.baseURL+"/wings/interaction/doubleTap")
return err
}
@@ -628,7 +628,7 @@ func (wd *WDADriver) Drag(fromX, fromY, toX, toY float64, opts ...option.ActionO
}
option.MergeOptions(data, opts...)
// wda 43 version
_, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/wings/interaction/drag")
_, err = wd.Session.POST(data, wd.baseURL+"/wings/interaction/drag")
return err
}
@@ -642,7 +642,7 @@ func (wd *WDADriver) SetPasteboard(contentType types.PasteboardType, content str
"contentType": contentType,
"content": base64.StdEncoding.EncodeToString([]byte(content)),
}
_, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/wda/setPasteboard")
_, err = wd.Session.POST(data, wd.baseURL+"/wda/setPasteboard")
return
}
@@ -650,7 +650,7 @@ func (wd *WDADriver) GetPasteboard(contentType types.PasteboardType) (raw *bytes
// [[FBRoute POST:@"/wda/getPasteboard"] respondWithTarget:self action:@selector(handleGetPasteboard:)]
data := map[string]interface{}{"contentType": contentType}
var rawResp DriverRawResponse
if rawResp, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/wda/getPasteboard"); err != nil {
if rawResp, err = wd.Session.POST(data, wd.baseURL+"/wda/getPasteboard"); err != nil {
return nil, err
}
if raw, err = rawResp.ValueDecodeAsBase64(); err != nil {
@@ -668,7 +668,7 @@ func (wd *WDADriver) Input(text string, opts ...option.ActionOption) (err error)
// [[FBRoute POST:@"/wda/keys"] respondWithTarget:self action:@selector(handleKeys:)]
data := map[string]interface{}{"value": strings.Split(text, "")}
option.MergeOptions(data, opts...)
_, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/gtf/interaction/input")
_, err = wd.Session.POST(data, wd.baseURL+"/gtf/interaction/input")
return
}
@@ -679,7 +679,7 @@ func (wd *WDADriver) Backspace(count int, opts ...option.ActionOption) (err erro
}
data := map[string]interface{}{"count": count}
option.MergeOptions(data, opts...)
_, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/gtf/interaction/input/backspace")
_, err = wd.Session.POST(data, wd.baseURL+"/gtf/interaction/input/backspace")
return
}
@@ -701,14 +701,14 @@ func (wd *WDADriver) PressButton(button types.DeviceButton) (err error) {
}
data := map[string]interface{}{"name": button}
_, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/wda/pressButton")
_, err = wd.Session.POST(data, wd.baseURL+"/wda/pressButton")
return
}
func (wd *WDADriver) Orientation() (orientation types.Orientation, err error) {
// [[FBRoute GET:@"/orientation"] respondWithTarget:self action:@selector(handleGetOrientation:)]
var rawResp DriverRawResponse
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/orientation"); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/orientation"); err != nil {
return "", err
}
reply := new(struct{ Value types.Orientation })
@@ -722,14 +722,14 @@ func (wd *WDADriver) Orientation() (orientation types.Orientation, err error) {
func (wd *WDADriver) SetOrientation(orientation types.Orientation) (err error) {
// [[FBRoute POST:@"/orientation"] respondWithTarget:self action:@selector(handleSetOrientation:)]
data := map[string]interface{}{"orientation": orientation}
_, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/orientation")
_, err = wd.Session.POST(data, wd.baseURL+"/orientation")
return
}
func (wd *WDADriver) Rotation() (rotation types.Rotation, err error) {
// [[FBRoute GET:@"/rotation"] respondWithTarget:self action:@selector(handleGetRotation:)]
var rawResp DriverRawResponse
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/rotation"); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/rotation"); err != nil {
return types.Rotation{}, err
}
reply := new(struct{ Value types.Rotation })
@@ -742,7 +742,7 @@ func (wd *WDADriver) Rotation() (rotation types.Rotation, err error) {
func (wd *WDADriver) SetRotation(rotation types.Rotation) (err error) {
// [[FBRoute POST:@"/rotation"] respondWithTarget:self action:@selector(handleSetRotation:)]
_, err = wd.Session.POSTWithBaseURL(rotation, wd.baseURL, "/rotation")
_, err = wd.Session.POST(rotation, wd.baseURL+"/rotation")
return
}
@@ -756,7 +756,7 @@ func (wd *WDADriver) Source(srcOpt ...option.SourceOption) (source string, err e
query = "?" + query
}
var rawResp DriverRawResponse
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/source"+query); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/source" + query); err != nil {
return "", err
}
// json format
@@ -779,7 +779,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 DriverRawResponse
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/wda/accessibleSource"); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/wda/accessibleSource"); err != nil {
return "", err
}
var jr builtinJSON.RawMessage
@@ -792,13 +792,13 @@ 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.Session.GETWithBaseURL(wd.baseURL, "/wda/healthcheck")
_, err = wd.Session.GET(wd.baseURL + "/wda/healthcheck")
return
}
func (wd *WDADriver) IsHealthy() (healthy bool, err error) {
var rawResp DriverRawResponse
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/health"); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/health"); err != nil {
return false, err
}
if string(rawResp) != "I-AM-ALIVE" {
@@ -810,7 +810,7 @@ func (wd *WDADriver) IsHealthy() (healthy bool, err error) {
func (wd *WDADriver) GetAppiumSettings() (settings map[string]interface{}, err error) {
// [[FBRoute GET:@"/appium/settings"] respondWithTarget:self action:@selector(handleGetSettings:)]
var rawResp DriverRawResponse
if rawResp, err = wd.Session.GETWithBaseURL(wd.baseURL, "/appium/settings"); err != nil {
if rawResp, err = wd.Session.GET(wd.baseURL + "/appium/settings"); err != nil {
return nil, err
}
reply := new(struct{ Value map[string]interface{} })
@@ -825,7 +825,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 DriverRawResponse
if rawResp, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/appium/settings"); err != nil {
if rawResp, err = wd.Session.POST(data, wd.baseURL+"/appium/settings"); err != nil {
return nil, err
}
reply := new(struct{ Value map[string]interface{} })
@@ -837,13 +837,13 @@ func (wd *WDADriver) SetAppiumSettings(settings map[string]interface{}) (ret map
}
func (wd *WDADriver) WdaShutdown() (err error) {
_, err = wd.Session.GETWithBaseURL(wd.baseURL, "/wda/shutdown")
_, err = wd.Session.GET(wd.baseURL + "/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.Session.POSTWithBaseURL(data, wd.baseURL, "/gtf/automation/log")
return wd.Session.POST(data, wd.baseURL+"/gtf/automation/log")
}
func (wd *WDADriver) ScreenRecord(opts ...option.ActionOption) (videoPath string, err error) {
@@ -939,7 +939,7 @@ func (wd *WDADriver) PushImage(localPath string) error {
return err
}
_, err = wd.Session.POSTWithBaseURL(data, wd.baseURL, "/gtf/albums/add")
_, err = wd.Session.POST(data, wd.baseURL+"/gtf/albums/add")
return err
}
@@ -952,7 +952,7 @@ func (wd *WDADriver) ClearImages() error {
log.Info().Msg("WDADriver.ClearImages")
data := map[string]interface{}{}
_, err := wd.Session.POSTWithBaseURL(data, wd.baseURL, "/gtf/albums/clear")
_, err := wd.Session.POST(data, wd.baseURL+"/gtf/albums/clear")
return err
}