refactor: move hrp/ to root folder

This commit is contained in:
lilong.129
2025-02-06 11:03:41 +08:00
parent 9376692b71
commit 1f063dd6f7
221 changed files with 206 additions and 211 deletions
+5 -5
View File
@@ -15,11 +15,11 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v5/hrp/code" "github.com/httprunner/httprunner/v5/code"
"github.com/httprunner/httprunner/v5/hrp/internal/builtin" "github.com/httprunner/httprunner/v5/internal/builtin"
"github.com/httprunner/httprunner/v5/hrp/internal/config" "github.com/httprunner/httprunner/v5/internal/config"
"github.com/httprunner/httprunner/v5/hrp/internal/sdk" "github.com/httprunner/httprunner/v5/internal/sdk"
"github.com/httprunner/httprunner/v5/hrp/internal/version" "github.com/httprunner/httprunner/v5/internal/version"
) )
//go:embed internal/scaffold/templates/plugin/debugtalkPythonTemplate //go:embed internal/scaffold/templates/plugin/debugtalkPythonTemplate
View File
@@ -9,8 +9,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/internal/sdk" "github.com/httprunner/httprunner/v5/internal/sdk"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
func format(data map[string]string) string { func format(data map[string]string) string {
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/pkg/gadb" "github.com/httprunner/httprunner/v5/pkg/gadb"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
var androidRootCmd = &cobra.Command{ var androidRootCmd = &cobra.Command{
@@ -7,8 +7,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/internal/sdk" "github.com/httprunner/httprunner/v5/internal/sdk"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
var ( var (
@@ -8,8 +8,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/internal/builtin" "github.com/httprunner/httprunner/v5/internal/builtin"
"github.com/httprunner/httprunner/v5/hrp/internal/sdk" "github.com/httprunner/httprunner/v5/internal/sdk"
) )
var screencapAndroidDevicesCmd = &cobra.Command{ var screencapAndroidDevicesCmd = &cobra.Command{
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp" hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/hrp/internal/sdk" "github.com/httprunner/httprunner/v5/internal/sdk"
) )
var buildCmd = &cobra.Command{ var buildCmd = &cobra.Command{
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/getsentry/sentry-go" "github.com/getsentry/sentry-go"
"github.com/httprunner/httprunner/v5/hrp/cmd" "github.com/httprunner/httprunner/v5/cmd"
) )
func main() { func main() {
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/code" "github.com/httprunner/httprunner/v5/code"
"github.com/httprunner/httprunner/v5/hrp/internal/builtin" "github.com/httprunner/httprunner/v5/internal/builtin"
"github.com/httprunner/httprunner/v5/hrp/pkg/convert" "github.com/httprunner/httprunner/v5/pkg/convert"
) )
var convertCmd = &cobra.Command{ var convertCmd = &cobra.Command{
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"github.com/mitchellh/mapstructure" "github.com/mitchellh/mapstructure"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/internal/sdk" "github.com/httprunner/httprunner/v5/internal/sdk"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
type Application struct { type Application struct {
@@ -10,8 +10,8 @@ import (
"github.com/danielpaulus/go-ios/ios" "github.com/danielpaulus/go-ios/ios"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/internal/sdk" "github.com/httprunner/httprunner/v5/internal/sdk"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
type Device struct { type Device struct {
+1 -1
View File
@@ -3,7 +3,7 @@ package ios
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
var iosRootCmd = &cobra.Command{ var iosRootCmd = &cobra.Command{
@@ -7,8 +7,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/internal/sdk" "github.com/httprunner/httprunner/v5/internal/sdk"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
var installCmd = &cobra.Command{ var installCmd = &cobra.Command{
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/internal/builtin" "github.com/httprunner/httprunner/v5/internal/builtin"
"github.com/httprunner/httprunner/v5/hrp/internal/sdk" "github.com/httprunner/httprunner/v5/internal/sdk"
) )
// mountCmd represents the mount command // mountCmd represents the mount command
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/internal/sdk" "github.com/httprunner/httprunner/v5/internal/sdk"
) )
var psCmd = &cobra.Command{ var psCmd = &cobra.Command{
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/internal/sdk" "github.com/httprunner/httprunner/v5/internal/sdk"
) )
var rebootCmd = &cobra.Command{ var rebootCmd = &cobra.Command{
@@ -7,8 +7,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/internal/sdk" "github.com/httprunner/httprunner/v5/internal/sdk"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
var uninstallCmd = &cobra.Command{ var uninstallCmd = &cobra.Command{
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/internal/sdk" "github.com/httprunner/httprunner/v5/internal/sdk"
) )
var xctestCmd = &cobra.Command{ var xctestCmd = &cobra.Command{
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/code" "github.com/httprunner/httprunner/v5/code"
"github.com/httprunner/httprunner/v5/hrp/internal/pytest" "github.com/httprunner/httprunner/v5/internal/pytest"
"github.com/httprunner/httprunner/v5/hrp/internal/sdk" "github.com/httprunner/httprunner/v5/internal/sdk"
) )
var pytestCmd = &cobra.Command{ var pytestCmd = &cobra.Command{
+5 -5
View File
@@ -3,11 +3,11 @@ package cmd
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp" hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/hrp/cmd/adb" "github.com/httprunner/httprunner/v5/cmd/adb"
"github.com/httprunner/httprunner/v5/hrp/cmd/ios" "github.com/httprunner/httprunner/v5/cmd/ios"
"github.com/httprunner/httprunner/v5/hrp/code" "github.com/httprunner/httprunner/v5/code"
"github.com/httprunner/httprunner/v5/hrp/internal/version" "github.com/httprunner/httprunner/v5/internal/version"
) )
// rootCmd represents the base command when called without any subcommands // rootCmd represents the base command when called without any subcommands
+1 -1
View File
@@ -3,7 +3,7 @@ package cmd
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp" hrp "github.com/httprunner/httprunner/v5"
) )
// runCmd represents the run command // runCmd represents the run command
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/internal/scaffold" "github.com/httprunner/httprunner/v5/internal/scaffold"
) )
var scaffoldCmd = &cobra.Command{ var scaffoldCmd = &cobra.Command{
+1 -1
View File
@@ -3,7 +3,7 @@ package cmd
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/pkg/server" "github.com/httprunner/httprunner/v5/pkg/server"
) )
// serverCmd represents the server command // serverCmd represents the server command
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/internal/sdk" "github.com/httprunner/httprunner/v5/internal/sdk"
"github.com/httprunner/httprunner/v5/hrp/internal/wiki" "github.com/httprunner/httprunner/v5/internal/wiki"
) )
var wikiCmd = &cobra.Command{ var wikiCmd = &cobra.Command{
View File
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/httprunner/httprunner/v5/hrp/code" "github.com/httprunner/httprunner/v5/code"
"github.com/httprunner/httprunner/v5/hrp/internal/builtin" "github.com/httprunner/httprunner/v5/internal/builtin"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
+2 -2
View File
@@ -3,8 +3,8 @@ package hrp
import ( import (
"reflect" "reflect"
"github.com/httprunner/httprunner/v5/hrp/internal/builtin" "github.com/httprunner/httprunner/v5/internal/builtin"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
type IConfig interface { type IConfig interface {
+1 -1
View File
@@ -1,4 +1,4 @@
# 代码阅读指南golang 部分) # 代码阅读指南
## 核心数据结构 ## 核心数据结构
+2 -2
View File
@@ -3,8 +3,8 @@ package uitest
import ( import (
"testing" "testing"
"github.com/httprunner/httprunner/v5/hrp" hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
func TestAndroidDouyinE2E(t *testing.T) { func TestAndroidDouyinE2E(t *testing.T) {
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
var ( var (
+1 -1
View File
@@ -5,7 +5,7 @@ package main
import ( import (
"testing" "testing"
"github.com/httprunner/httprunner/v5/hrp" hrp "github.com/httprunner/httprunner/v5"
) )
func TestMain(t *testing.T) { func TestMain(t *testing.T) {
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
var ( var (
@@ -5,8 +5,8 @@ package uitest
import ( import (
"testing" "testing"
"github.com/httprunner/httprunner/v5/hrp" hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
func TestAndroidDouyinFeedTest(t *testing.T) { func TestAndroidDouyinFeedTest(t *testing.T) {
@@ -5,8 +5,8 @@ package uitest
import ( import (
"testing" "testing"
"github.com/httprunner/httprunner/v5/hrp" hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
func TestAndroidLiveSwipeTest(t *testing.T) { func TestAndroidLiveSwipeTest(t *testing.T) {
@@ -5,8 +5,8 @@ package uitest
import ( import (
"testing" "testing"
"github.com/httprunner/httprunner/v5/hrp" hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
func TestIOSDouyinFollowLive(t *testing.T) { func TestIOSDouyinFollowLive(t *testing.T) {
+2 -2
View File
@@ -5,8 +5,8 @@ package uitest
import ( import (
"testing" "testing"
"github.com/httprunner/httprunner/v5/hrp" hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
func TestHamonyDouyinFeedTest(t *testing.T) { func TestHamonyDouyinFeedTest(t *testing.T) {
+2 -2
View File
@@ -5,8 +5,8 @@ package uitest
import ( import (
"testing" "testing"
"github.com/httprunner/httprunner/v5/hrp" hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
func TestIOSDouyinLive(t *testing.T) { func TestIOSDouyinLive(t *testing.T) {
+2 -2
View File
@@ -5,8 +5,8 @@ package uitest
import ( import (
"testing" "testing"
"github.com/httprunner/httprunner/v5/hrp" hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
func TestWDALog(t *testing.T) { func TestWDALog(t *testing.T) {
+2 -2
View File
@@ -3,8 +3,8 @@ package uitest
import ( import (
"testing" "testing"
"github.com/httprunner/httprunner/v5/hrp" hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
func TestAndroidExpertTest(t *testing.T) { func TestAndroidExpertTest(t *testing.T) {
+2 -2
View File
@@ -3,8 +3,8 @@ package uitest
import ( import (
"testing" "testing"
"github.com/httprunner/httprunner/v5/hrp" hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
func TestHarmonyDouyinE2E(t *testing.T) { func TestHarmonyDouyinE2E(t *testing.T) {
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
var rootCmd = &cobra.Command{ var rootCmd = &cobra.Command{
+1 -1
View File
@@ -15,7 +15,7 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
func convertTimeToSeconds(timeStr string) (int, error) { func convertTimeToSeconds(timeStr string) (int, error) {
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/httprunner/httprunner/v5/hrp" hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/hrp/pkg/uixt" "github.com/httprunner/httprunner/v5/pkg/uixt"
) )
func TestConvertTimeToSeconds(t *testing.T) { func TestConvertTimeToSeconds(t *testing.T) {
@@ -29,8 +29,8 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
"github.com/httprunner/httprunner/v5/hrp/code" "github.com/httprunner/httprunner/v5/code"
"github.com/httprunner/httprunner/v5/hrp/internal/json" "github.com/httprunner/httprunner/v5/internal/json"
) )
func Dump2JSON(data interface{}, path string) error { func Dump2JSON(data interface{}, path string) error {
@@ -11,12 +11,12 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v5/hrp" hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/hrp/code" "github.com/httprunner/httprunner/v5/code"
"github.com/httprunner/httprunner/v5/hrp/internal/builtin" "github.com/httprunner/httprunner/v5/internal/builtin"
"github.com/httprunner/httprunner/v5/hrp/internal/config" "github.com/httprunner/httprunner/v5/internal/config"
"github.com/httprunner/httprunner/v5/hrp/internal/sdk" "github.com/httprunner/httprunner/v5/internal/sdk"
"github.com/httprunner/httprunner/v5/hrp/internal/version" "github.com/httprunner/httprunner/v5/internal/version"
) )
type PluginType string type PluginType string
@@ -17,7 +17,7 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
uuid "github.com/satori/go.uuid" uuid "github.com/satori/go.uuid"
"github.com/httprunner/httprunner/v5/hrp/internal/version" "github.com/httprunner/httprunner/v5/internal/version"
) )
// Measurement Protocol (Google Analytics 4) docs reference: // Measurement Protocol (Google Analytics 4) docs reference:
@@ -7,7 +7,7 @@ import (
"github.com/getsentry/sentry-go" "github.com/getsentry/sentry-go"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v5/hrp/internal/version" "github.com/httprunner/httprunner/v5/internal/version"
) )
const ( const (
+2 -2
View File
@@ -11,8 +11,8 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"github.com/httprunner/httprunner/v5/hrp/code" "github.com/httprunner/httprunner/v5/code"
"github.com/httprunner/httprunner/v5/hrp/internal/json" "github.com/httprunner/httprunner/v5/internal/json"
) )
// LoadTestCases load testcases from TestCasePath or TestCase // LoadTestCases load testcases from TestCasePath or TestCase
View File
View File
+2 -2
View File
@@ -16,8 +16,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v5/hrp/code" "github.com/httprunner/httprunner/v5/code"
"github.com/httprunner/httprunner/v5/hrp/internal/builtin" "github.com/httprunner/httprunner/v5/internal/builtin"
) )
func newParser() *Parser { func newParser() *Parser {

Some files were not shown because too many files have changed in this diff Show More