GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-08-08 15:13:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: delete useless codes

Browse Source
This commit is contained in:
徐聪
2025-05-07 21:50:27 +08:00
parent 2c206697d6
commit dff083e93f
5 changed files with 41 additions and 41 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-2505072141 v5.0.0-beta-2505072150

10
step_ui.go
View File

@@ -83,9 +83,9 @@ func (s *StepMobile) InstallApp(path string) *StepMobile {
return s return s
} }
func (s *StepMobile) LoginNoneUI(packageName, phoneNumber string, captcha, password string) *StepMobile { func (s *StepMobile) WebLoginNoneUI(packageName, phoneNumber string, captcha, password string) *StepMobile {
s.obj().Actions = append(s.obj().Actions, uixt.MobileAction{ s.obj().Actions = append(s.obj().Actions, uixt.MobileAction{
Method: uixt.ACTION_LoginNoneUI, Method: uixt.ACTION_WebLoginNoneUI,
Params: []string{packageName, phoneNumber, captcha, password}, Params: []string{packageName, phoneNumber, captcha, password},
}) })
return s return s
@@ -298,7 +298,7 @@ func (s *StepMobile) SwipeToTapTexts(texts interface{}, opts ...option.ActionOpt
return s return s
} }
func (s *StepMobile) RightClick(x, y float64, options ...option.ActionOption) *StepMobile { func (s *StepMobile) SecondaryClick(x, y float64, options ...option.ActionOption) *StepMobile {
action := uixt.MobileAction{ action := uixt.MobileAction{
Method: uixt.ACTION_SecondaryClick, Method: uixt.ACTION_SecondaryClick,
Params: []float64{x, y}, Params: []float64{x, y},
@@ -308,7 +308,7 @@ func (s *StepMobile) RightClick(x, y float64, options ...option.ActionOption) *S
return s return s
} }
func (s *StepMobile) RightClickBySelector(selector string, options ...option.ActionOption) *StepMobile { func (s *StepMobile) SecondaryClickBySelector(selector string, options ...option.ActionOption) *StepMobile {
action := uixt.MobileAction{ action := uixt.MobileAction{
Method: uixt.ACTION_SecondaryClickBySelector, Method: uixt.ACTION_SecondaryClickBySelector,
Params: selector, Params: selector,
@@ -338,7 +338,7 @@ func (s *StepMobile) TapBySelector(selector string, options ...option.ActionOpti
return s return s
} }
func (s *StepMobile) ClosePage(idx int, options ...option.ActionOption) *StepMobile { func (s *StepMobile) WebCloseTab(idx int, options ...option.ActionOption) *StepMobile {
action := uixt.MobileAction{ action := uixt.MobileAction{
Method: uixt.ACTION_WebCloseTab, Method: uixt.ACTION_WebCloseTab,
Params: idx, Params: idx,

14
uixt/android_driver_uia2.go
View File

@@ -6,6 +6,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"strings" "strings"
"time"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
@@ -77,12 +78,13 @@ func (ud *UIA2Driver) Setup() error {
// } // }
// start uiautomator2 server // start uiautomator2 server
// go func() { // Todo: keep-alive
// if err := ud.startUIA2Server(); err != nil { go func() {
// log.Fatal().Err(err).Msg("start UIA2 failed") if err := ud.startUIA2Server(); err != nil {
// } log.Fatal().Err(err).Msg("start UIA2 failed")
// }() }
// time.Sleep(5 * time.Second) // wait for uiautomator2 server start }()
time.Sleep(5 * time.Second) // wait for uiautomator2 server start
// create new session // create new session
err = ud.InitSession(nil) err = ud.InitSession(nil)

50
uixt/browser_driver.go
View File

@@ -36,7 +36,6 @@ type CreateBrowserResponse struct {
type BrowserDriver struct { type BrowserDriver struct {
urlPrefix *url.URL urlPrefix *url.URL
sessionId string
Session *DriverSession Session *DriverSession
} }
@@ -100,9 +99,8 @@ func NewBrowserDriver(device *BrowserDevice) (driver *BrowserDriver, err error)
driver.urlPrefix = &url.URL{} driver.urlPrefix = &url.URL{}
driver.urlPrefix.Host = BROWSER_LOCAL_ADDRESS driver.urlPrefix.Host = BROWSER_LOCAL_ADDRESS
driver.urlPrefix.Scheme = "http" driver.urlPrefix.Scheme = "http"
driver.sessionId = device.UUID()
driver.Session = NewDriverSession() driver.Session = NewDriverSession()
driver.Session.ID = driver.sessionId driver.Session.ID = device.UUID()
return driver, nil return driver, nil
} }
@@ -134,7 +132,7 @@ func (wd *BrowserDriver) Drag(fromX, fromY, toX, toY float64, options ...option.
data["duration"] = 0.5 data["duration"] = 0.5
} }
_, err = wd.Session.POST(data, wd.concatURL(wd.sessionId, "ui/drag")) _, err = wd.Session.POST(data, wd.concatURL(wd.Session.ID, "ui/drag"))
return return
} }
@@ -142,12 +140,12 @@ func (wd *BrowserDriver) AppLaunch(packageName string) (err error) {
data := map[string]interface{}{ data := map[string]interface{}{
"url": packageName, "url": packageName,
} }
_, err = wd.Session.POST(data, wd.concatURL(wd.sessionId, "ui/page_launch")) _, err = wd.Session.POST(data, wd.concatURL(wd.Session.ID, "ui/page_launch"))
return err return err
} }
func (wd *BrowserDriver) DeleteSession() (err error) { func (wd *BrowserDriver) DeleteSession() (err error) {
url := wd.concatURL("context", wd.sessionId) url := wd.concatURL("context", wd.Session.ID)
req, err := http.NewRequest("DELETE", url, nil) req, err := http.NewRequest("DELETE", url, nil)
if err != nil { if err != nil {
@@ -181,7 +179,7 @@ func (wd *BrowserDriver) Scroll(delta int) (err error) {
data := map[string]interface{}{ data := map[string]interface{}{
"delta": delta, "delta": delta,
} }
_, err = wd.Session.POST(data, wd.concatURL(wd.sessionId, "ui/scroll")) _, err = wd.Session.POST(data, wd.concatURL(wd.Session.ID, "ui/scroll"))
return err return err
} }
@@ -195,7 +193,7 @@ func (wd *BrowserDriver) CreateNetListener() (*websocket.Conn, error) {
initMessage := fmt.Sprintf(`{ initMessage := fmt.Sprintf(`{
"type":"create_net_listener", "type":"create_net_listener",
"context_id":"%v" "context_id":"%v"
}`, wd.sessionId) }`, wd.Session.ID)
err = c.WriteMessage(websocket.TextMessage, []byte(initMessage)) err = c.WriteMessage(websocket.TextMessage, []byte(initMessage))
return c, err return c, err
} }
@@ -205,7 +203,7 @@ func (wd *BrowserDriver) CloseTab(pageIndex int) (err error) {
"page_index": pageIndex, "page_index": pageIndex,
} }
_, err = wd.Session.POST(data, wd.concatURL(wd.sessionId, "ui/page_close")) _, err = wd.Session.POST(data, wd.concatURL(wd.Session.ID, "ui/page_close"))
return err return err
} }
@@ -217,7 +215,7 @@ func (wd *BrowserDriver) HoverBySelector(selector string, options ...option.Acti
if actionOptions.Index > 0 { if actionOptions.Index > 0 {
data["element_index"] = actionOptions.Index data["element_index"] = actionOptions.Index
} }
_, err = wd.Session.POST(data, wd.concatURL(wd.sessionId, "ui/hover")) _, err = wd.Session.POST(data, wd.concatURL(wd.Session.ID, "ui/hover"))
return err return err
} }
@@ -229,7 +227,7 @@ func (wd *BrowserDriver) TapBySelector(selector string, options ...option.Action
if actionOptions.Index > 0 { if actionOptions.Index > 0 {
data["element_index"] = actionOptions.Index data["element_index"] = actionOptions.Index
} }
_, err = wd.Session.POST(data, wd.concatURL(wd.sessionId, "ui/tap")) _, err = wd.Session.POST(data, wd.concatURL(wd.Session.ID, "ui/tap"))
return err return err
} }
@@ -238,7 +236,7 @@ func (wd *BrowserDriver) SecondaryClick(x, y float64) (err error) {
"x": x, "x": x,
"y": y, "y": y,
} }
_, err = wd.Session.POST(data, wd.concatURL(wd.sessionId, "ui/right_click")) _, err = wd.Session.POST(data, wd.concatURL(wd.Session.ID, "ui/right_click"))
return err return err
} }
@@ -250,13 +248,13 @@ func (wd *BrowserDriver) SecondaryClickBySelector(selector string, options ...op
if actionOptions.Index > 0 { if actionOptions.Index > 0 {
data["element_index"] = actionOptions.Index data["element_index"] = actionOptions.Index
} }
_, err = wd.Session.POST(data, wd.concatURL(wd.sessionId, "ui/right_click")) _, err = wd.Session.POST(data, wd.concatURL(wd.Session.ID, "ui/right_click"))
return err return err
} }
func (wd *BrowserDriver) GetElementTextBySelector(selector string, options ...option.ActionOption) (text string, err error) { func (wd *BrowserDriver) GetElementTextBySelector(selector string, options ...option.ActionOption) (text string, err error) {
actionOptions := option.NewActionOptions(options...) actionOptions := option.NewActionOptions(options...)
baseURL := fmt.Sprintf("http://%s/api/v1/%s/element_text", BROWSER_LOCAL_ADDRESS, wd.sessionId) baseURL := fmt.Sprintf("http://%s/api/v1/%s/element_text", BROWSER_LOCAL_ADDRESS, wd.Session.ID)
// 使用 url.Values 构建查询参数 // 使用 url.Values 构建查询参数
params := url.Values{} params := url.Values{}
@@ -306,7 +304,7 @@ func (wd *BrowserDriver) GetPageUrl(options ...option.ActionOption) (text string
if actionOptions.Index > 0 { if actionOptions.Index > 0 {
uri = uri + "?page_index=" + fmt.Sprintf("%v", actionOptions.Index) uri = uri + "?page_index=" + fmt.Sprintf("%v", actionOptions.Index)
} }
resp, err := wd.Session.GET(wd.concatURL(wd.sessionId, uri)) resp, err := wd.Session.GET(wd.concatURL(wd.Session.ID, uri))
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -336,7 +334,7 @@ func (wd *BrowserDriver) LoginNoneUI(packageName, phoneNumber string, captcha, p
"url": packageName, "url": packageName,
"web_cookie": password, "web_cookie": password,
} }
_, err = wd.Session.POST(data, wd.concatURL(wd.sessionId, "stub/login")) _, err = wd.Session.POST(data, wd.concatURL(wd.Session.ID, "stub/login"))
if err != nil { if err != nil {
return false, err return false, err
} }
@@ -348,7 +346,7 @@ func (wd *BrowserDriver) Hover(x, y float64) (err error) {
"x": x, "x": x,
"y": y, "y": y,
} }
_, err = wd.Session.POST(data, wd.concatURL(wd.sessionId, "ui/hover")) _, err = wd.Session.POST(data, wd.concatURL(wd.Session.ID, "ui/hover"))
return err return err
} }
@@ -356,13 +354,13 @@ func (wd *BrowserDriver) Input(text string, option ...option.ActionOption) (err
data := map[string]interface{}{ data := map[string]interface{}{
"text": text, "text": text,
} }
_, err = wd.Session.POST(data, wd.concatURL(wd.sessionId, "ui/input")) _, err = wd.Session.POST(data, wd.concatURL(wd.Session.ID, "ui/input"))
return err return err
} }
// Source Return application elements tree // Source Return application elements tree
func (wd *BrowserDriver) Source(srcOpt ...option.SourceOption) (string, error) { func (wd *BrowserDriver) Source(srcOpt ...option.SourceOption) (string, error) {
resp, err := wd.Session.GET(wd.concatURL(wd.sessionId, "stub/source")) resp, err := wd.Session.GET(wd.concatURL(wd.Session.ID, "stub/source"))
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -371,7 +369,7 @@ func (wd *BrowserDriver) Source(srcOpt ...option.SourceOption) (string, error) {
} }
func (wd *BrowserDriver) ScreenShot(options ...option.ActionOption) (*bytes.Buffer, error) { func (wd *BrowserDriver) ScreenShot(options ...option.ActionOption) (*bytes.Buffer, error) {
resp, err := wd.Session.GET(wd.concatURL(wd.sessionId, "screenshot")) resp, err := wd.Session.GET(wd.concatURL(wd.Session.ID, "screenshot"))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -419,7 +417,7 @@ func (wd *BrowserDriver) BatteryInfo() (batteryInfo types.BatteryInfo, err error
} }
func (wd *BrowserDriver) WindowSize() (types.Size, error) { func (wd *BrowserDriver) WindowSize() (types.Size, error) {
resp, err := wd.Session.GET(wd.concatURL(wd.sessionId, "window_size")) resp, err := wd.Session.GET(wd.concatURL(wd.Session.ID, "window_size"))
if err != nil { if err != nil {
return types.Size{}, err return types.Size{}, err
} }
@@ -531,7 +529,7 @@ func (wd *BrowserDriver) TapFloat(x, y float64, opts ...option.ActionOption) err
"duration": duration, "duration": duration,
} }
_, err = wd.Session.POST(data, wd.concatURL(wd.sessionId, "ui/tap")) _, err = wd.Session.POST(data, wd.concatURL(wd.Session.ID, "ui/tap"))
return err return err
} }
@@ -547,7 +545,7 @@ func (wd *BrowserDriver) DoubleTap(x, y float64, options ...option.ActionOption)
"y": y, "y": y,
} }
_, err = wd.Session.POST(data, wd.concatURL(wd.sessionId, "ui/double_tap")) _, err = wd.Session.POST(data, wd.concatURL(wd.Session.ID, "ui/double_tap"))
return err return err
} }
@@ -558,7 +556,7 @@ func (wd *BrowserDriver) UploadFile(x, y float64, FileUrl, FileFormat string) (e
"file_url": FileUrl, "file_url": FileUrl,
"file_format": FileFormat, "file_format": FileFormat,
} }
_, err = wd.Session.POST(data, wd.concatURL(wd.sessionId, "ui/upload")) _, err = wd.Session.POST(data, wd.concatURL(wd.Session.ID, "ui/upload"))
return err return err
} }
@@ -604,7 +602,7 @@ func (wd *BrowserDriver) ForegroundInfo() (app types.AppInfo, err error) {
// PressBack Presses the back button // PressBack Presses the back button
func (wd *BrowserDriver) PressBack(options ...option.ActionOption) error { func (wd *BrowserDriver) PressBack(options ...option.ActionOption) error {
_, err := wd.Session.POST(nil, wd.concatURL(wd.sessionId, "ui/back")) _, err := wd.Session.POST(nil, wd.concatURL(wd.Session.ID, "ui/back"))
return err return err
} }
@@ -696,7 +694,7 @@ func (wd *BrowserDriver) TapXY(x, y float64, opts ...option.ActionOption) error
"x": x, "x": x,
"y": y, "y": y,
} }
_, err := wd.Session.POST(data, wd.concatURL(wd.sessionId, "ui/double_tap")) _, err := wd.Session.POST(data, wd.concatURL(wd.Session.ID, "ui/double_tap"))
return err return err
} }

6
uixt/driver_action.go
View File

@@ -20,7 +20,7 @@ const (
ACTION_LOG ActionMethod = "log" ACTION_LOG ActionMethod = "log"
ACTION_AppInstall ActionMethod = "install" ACTION_AppInstall ActionMethod = "install"
ACTION_AppUninstall ActionMethod = "uninstall" ACTION_AppUninstall ActionMethod = "uninstall"
ACTION_LoginNoneUI ActionMethod = "login_none_ui" ACTION_WebLoginNoneUI ActionMethod = "login_none_ui"
ACTION_AppClear ActionMethod = "app_clear" ACTION_AppClear ActionMethod = "app_clear"
ACTION_AppStart ActionMethod = "app_start" ACTION_AppStart ActionMethod = "app_start"
ACTION_AppLaunch ActionMethod = "app_launch" // 启动 app 并堵塞等待 app 首屏加载完成 ACTION_AppLaunch ActionMethod = "app_launch" // 启动 app 并堵塞等待 app 首屏加载完成
@@ -119,13 +119,13 @@ func (dExt *XTDriver) DoAction(action MobileAction) (err error) {
}() }()
switch action.Method { switch action.Method {
case ACTION_LoginNoneUI: case ACTION_WebLoginNoneUI:
if len(action.Params.([]interface{})) == 4 { if len(action.Params.([]interface{})) == 4 {
params := action.Params.([]interface{}) params := action.Params.([]interface{})
_, err = dExt.IDriver.(*BrowserDriver).LoginNoneUI(params[0].(string), params[1].(string), params[2].(string), params[3].(string)) _, err = dExt.IDriver.(*BrowserDriver).LoginNoneUI(params[0].(string), params[1].(string), params[2].(string), params[3].(string))
return err return err
} }
return fmt.Errorf("invalid %s params: %v", ACTION_LoginNoneUI, action.Params) return fmt.Errorf("invalid %s params: %v", ACTION_WebLoginNoneUI, action.Params)
case ACTION_AppInstall: case ACTION_AppInstall:
if app, ok := action.Params.(string); ok { if app, ok := action.Params.(string); ok {
if err = dExt.GetDevice().Install(app, if err = dExt.GetDevice().Install(app,