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

refactor & fix: stub driver and server

Browse Source
This commit is contained in:
lilong.129
2025-03-04 17:26:55 +08:00
parent b195760ed9
commit 7f837c9e36
16 changed files with 75 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/ext/app.go
View File

@@ -7,7 +7,6 @@ import (
"github.com/gin-gonic/gin"
"github.com/httprunner/httprunner/v5/pkg/uixt"
"github.com/httprunner/httprunner/v5/pkg/uixt/driver_ext"
"github.com/httprunner/httprunner/v5/server"
)
@@ -21,7 +20,7 @@ func (r *RouterExt) installAppHandler(c *gin.Context) {
if err != nil {
return
}
err = driver.(*driver_ext.XTDriver).InstallByUrl(appInstallReq.AppUrl)
err = driver.InstallByUrl(appInstallReq.AppUrl)
if err != nil {
server.RenderError(c, err)
return

14
server/ext/context.go
View File

@@ -11,19 +11,24 @@ import (
"github.com/httprunner/httprunner/v5/server"
)
func (p RouterBaseMethodExt) GetDriver(c *gin.Context) (driverExt uixt.IXTDriver, err error) {
platform := c.Param("platform")
func (r *RouterExt) GetDriver(c *gin.Context) (driverExt *driver_ext.StubXTDriver, err error) {
driverObj, exists := c.Get("driver")
if exists {
return driverObj.(*driver_ext.StubXTDriver), nil
}
deviceObj, exists := c.Get("device")
var device uixt.IDevice
var driver driver_ext.IStubDriver
if !exists {
device, err = p.GetDevice(c)
device, err = r.GetDevice(c)
if err != nil {
return nil, err
}
} else {
device = deviceObj.(uixt.IDevice)
}
platform := c.Param("platform")
switch strings.ToLower(platform) {
case "android":
driver, err = driver_ext.NewStubAndroidDriver(device.(*uixt.AndroidDevice))
@@ -36,7 +41,8 @@ func (p RouterBaseMethodExt) GetDriver(c *gin.Context) (driverExt uixt.IXTDriver
server.RenderErrorInitDriver(c, err)
return
}
driverExt = driver_ext.NewXTDriver(driver,
driverExt = driver_ext.NewStubXTDriver(driver,
ai.WithCVService(ai.CVServiceTypeVEDEM))
c.Set("driver", driverExt)
return driverExt, nil

15
server/ext/handler.go
View File

@@ -1,11 +1,11 @@
package server_ext
import (
"github.com/gin-gonic/gin"
"github.com/rs/zerolog/log"
"time"
"github.com/httprunner/httprunner/v5/pkg/uixt/driver_ext"
"github.com/gin-gonic/gin"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v5/server"
)
@@ -20,9 +20,9 @@ func (r *RouterExt) loginHandler(c *gin.Context) {
if err != nil {
return
}
info, err := driver.GetIDriver().(driver_ext.IStubDriver).
LoginNoneUI(loginReq.PackageName, loginReq.PhoneNumber,
loginReq.Captcha, loginReq.Password)
info, err := driver.LoginNoneUI(
loginReq.PackageName, loginReq.PhoneNumber,
loginReq.Captcha, loginReq.Password)
if err != nil {
server.RenderError(c, err)
return
@@ -41,8 +41,7 @@ func (r *RouterExt) logoutHandler(c *gin.Context) {
if err != nil {
return
}
err = driver.GetIDriver().(driver_ext.IStubDriver).
LogoutNoneUI(logoutReq.PackageName)
err = driver.LogoutNoneUI(logoutReq.PackageName)
if err != nil {
server.RenderError(c, err)
return

11
server/ext/main.go
View File

@@ -1,7 +1,6 @@
package server_ext
import (
"github.com/gin-gonic/gin"
"github.com/httprunner/httprunner/v5/server"
)
@@ -9,23 +8,15 @@ type RouterExt struct {
*server.Router
}
type RouterBaseMethodExt struct {
server.RouterBaseMethod
}
func NewExtRouter() *RouterExt {
router := &RouterExt{
Router: &server.Router{
Engine: gin.Default(),
IRouterBaseMethod: &RouterBaseMethodExt{},
},
Router: server.NewRouter(),
}
router.Init()
return router
}
func (r *RouterExt) Init() {
r.Router.Init()
apiV1PlatformSerial := r.Group("/api/v1").Group("/:platform").Group("/:serial")
apiV1PlatformSerial.GET("/stub/source", r.sourceHandler)