refactor: move uixt from hrp internal to pkg

This commit is contained in:
debugtalk
2022-10-10 21:50:07 +08:00
parent f4584db139
commit 59b06fcf65
44 changed files with 54 additions and 21 deletions

View File

@@ -9,7 +9,7 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/httprunner/httprunner/v4/hrp/internal/uixt"
"github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
)
func format(data map[string]string) string {

View File

@@ -9,7 +9,7 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/httprunner/httprunner/v4/hrp/internal/uixt"
"github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
)
type Device struct {

View File

@@ -7,7 +7,7 @@ import (
giDevice "github.com/electricbubble/gidevice"
"github.com/spf13/cobra"
"github.com/httprunner/httprunner/v4/hrp/internal/uixt"
"github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
)
var iosRootCmd = &cobra.Command{

View File

@@ -5,7 +5,7 @@ import (
"time"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/uixt"
"github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
)
// NewConfig returns a new constructed testcase config with specified testcase name.

View File

@@ -1 +1 @@
v4.3.0-beta-10101543
v4.3.0-beta-10102150

View File

@@ -708,7 +708,6 @@ func (ud *uiaDriver) Input(text string, options ...DataOption) (err error) {
return element.SendKeys(text, options...)
}
func (ud *uiaDriver) KeyboardDismiss(keyNames ...string) (err error) {
// TODO
return errDriverNotImplemented

View File

@@ -4,6 +4,7 @@ import (
"bytes"
"encoding/base64"
"encoding/json"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
)
@@ -72,7 +73,7 @@ func (ue uiaElement) TwoFingerTap() (err error) {
}
func (ue uiaElement) TapWithNumberOfTaps(numberOfTaps, numberOfTouches int) (err error) {
//Todo: implement
// Todo: implement
log.Fatal().Msg("not support")
return
}

View File

@@ -105,8 +105,6 @@ func WithDescription(description string) ActionOption {
}
}
func WithMaxRetryTimes(maxRetryTimes int) ActionOption {
return func(o *MobileAction) {
o.MaxRetryTimes = maxRetryTimes
@@ -508,7 +506,7 @@ func (dExt *DriverExt) DoAction(action MobileAction) error {
options = append(options, WithCustomOption("description", action.Description))
}
if action.Identifier != "" {
options = append(options,WithCustomOption("log", map[string]interface{}{
options = append(options, WithCustomOption("log", map[string]interface{}{
"enable": true,
"data": action.Identifier,
}))

View File

@@ -16,7 +16,7 @@ import (
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/json"
"github.com/httprunner/httprunner/v4/hrp/internal/uixt"
"github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
)
var fieldTags = []string{"proto", "status_code", "headers", "cookies", "body", textExtractorSubRegexp}

View File

@@ -20,8 +20,8 @@ import (
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/sdk"
"github.com/httprunner/httprunner/v4/hrp/internal/uixt"
"github.com/httprunner/httprunner/v4/hrp/internal/version"
"github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
)
// Run starts to run API test with default configs.

View File

@@ -3,7 +3,7 @@ package hrp
import (
giDevice "github.com/electricbubble/gidevice"
"github.com/httprunner/httprunner/v4/hrp/internal/uixt"
"github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
)
type StepType string

View File

@@ -4,9 +4,10 @@ import (
"fmt"
"time"
"github.com/httprunner/httprunner/v4/hrp/internal/uixt"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
)
var (
@@ -189,10 +190,10 @@ func (s *StepAndroid) DoubleTap(params string, options ...uixt.ActionOption) *St
return &StepAndroid{step: s.step}
}
func (s *StepAndroid) Swipe(sx, sy, ex, ey int, options ...uixt.ActionOption) *StepAndroid {
func (s *StepAndroid) Swipe(sx, sy, ex, ey float64, options ...uixt.ActionOption) *StepAndroid {
action := uixt.MobileAction{
Method: uixt.ACTION_Swipe,
Params: []int{sx, sy, ex, ey},
Params: []float64{sx, sy, ex, ey},
}
for _, option := range options {
option(&action)

View File

@@ -7,7 +7,7 @@ import (
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v4/hrp/internal/uixt"
"github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
)
var (
@@ -160,10 +160,10 @@ func (s *StepIOS) DoubleTap(params string, options ...uixt.ActionOption) *StepIO
return &StepIOS{step: s.step}
}
func (s *StepIOS) Swipe(sx, sy, ex, ey int, options ...uixt.ActionOption) *StepIOS {
func (s *StepIOS) Swipe(sx, sy, ex, ey float64, options ...uixt.ActionOption) *StepIOS {
action := uixt.MobileAction{
Method: uixt.ACTION_Swipe,
Params: []int{sx, sy, ex, ey},
Params: []float64{sx, sy, ex, ey},
}
for _, option := range options {
option(&action)