fix: unittest

hrp/boomer_test.go

@@ -25,7 +25,7 @@ func TestBoomerStandaloneRun(t *testing.T) {
 			NewStep("TestCase3").CallRefCase(&TestCase{Config: NewConfig("TestCase3")}),
 		},
 	}
-	testcase2 := &demoTestCaseWithGoPluginJSONPath
+	testcase2 := &demoTestCaseWithPluginJSONPath
 
 	b := NewBoomer(2, 1)
 	go b.Run(testcase1, testcase2)

hrp/internal/build/main.go

@@ -23,10 +23,10 @@ const (
 	funppy                  = `import funppy`
 	fungo                   = `"github.com/httprunner/funplugin/fungo"`
 	regexPythonFunctionName = `def ([a-zA-Z_]\w*)\(.*\)`
-	regexGoImports          = `import\s*\(\n([\s\S]*)\n\)`
-	regexGoImport           = `import\s*(\"[\s\S]*\")\n`
+	regexGoImports          = `import \(([\s\S]*?)\)`
+	regexGoImport           = `import (\"[\s\S]*\")`
 	regexGoFunctionName     = `func ([A-Z][a-zA-Z_]\w*)\(.*\)`
-	regexGoFunctionContent  = `func [\s\S]*?\n}\n`
+	regexGoFunctionContent  = `func [\s\S]*?\n}`
 )
 
 //go:embed templates/debugtalkPythonTemplate

hrp/internal/build/main_test.go

@@ -1,30 +1,21 @@
 package build
 
 import (
-	"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
 	"regexp"
 	"testing"
 
+	"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
+
 	"github.com/stretchr/testify/assert"
 )
 
 func TestRun(t *testing.T) {
-	err := Run("../../../examples/demo-with-no-fungo/plugin/debugtalk.go", "")
+	err := Run("plugin/debugtalk.go", "./debugtalk_gen.bin")
 	if !assert.Nil(t, err) {
 		t.Fatal()
 	}
 
-	err = Run("../../../examples/demo-with-no-funppy/debugtalk.py", "")
-	if !assert.Nil(t, err) {
-		t.Fatal()
-	}
-
-	err = Run("../../../examples/demo-with-no-fungo/plugin/debugtalk.go", "./debugtalk_gen.bin")
-	if !assert.Nil(t, err) {
-		t.Fatal()
-	}
-
-	err = Run("../../../examples/demo-with-no-funppy/debugtalk.py", "./debugtalk_gen.py")
+	err = Run("plugin/debugtalk.py", "./debugtalk_gen.py")
 	if !assert.Nil(t, err) {
 		t.Fatal()
 	}

hrp/internal/build/plugin/debugtalk.go

@@ -0,0 +1,44 @@
+package noplugin
+
+import (
+	"fmt"
+)
+
+func SumTwoInt(a, b int) int {
+	return a + b
+}
+
+func SumInts(args ...int) int {
+	var sum int
+	for _, arg := range args {
+		sum += arg
+	}
+	return sum
+}
+
+func Sum(args ...interface{}) (interface{}, error) {
+	var sum float64
+	for _, arg := range args {
+		switch v := arg.(type) {
+		case int:
+			sum += float64(v)
+		case float64:
+			sum += v
+		default:
+			return nil, fmt.Errorf("unexpected type: %T", arg)
+		}
+	}
+	return sum, nil
+}
+
+func SetupHookExample(args string) string {
+	return fmt.Sprintf("step name: %v, setup...", args)
+}
+
+func TeardownHookExample(args string) string {
+	return fmt.Sprintf("step name: %v, teardown...", args)
+}
+
+func GetVersion() string {
+	return "v0.4"
+}

hrp/internal/build/plugin/debugtalk.py

@@ -0,0 +1,57 @@
+import logging
+import time
+from typing import List
+
+
+def get_version():
+    return "v0.4"
+
+
+def sleep(n_secs):
+    time.sleep(n_secs)
+
+
+def sum(*args):
+    result = 0
+    for arg in args:
+        result += arg
+    return result
+
+
+def sum_ints(*args: List[int]) -> int:
+    result = 0
+    for arg in args:
+        result += arg
+    return result
+
+
+def sum_two_int(a: int, b: int) -> int:
+    return a + b
+
+
+def sum_two_string(a: str, b: str) -> str:
+    return a + b
+
+
+def sum_strings(*args: List[str]) -> str:
+    result = ""
+    for arg in args:
+        result += arg
+    return result
+
+
+def concatenate(*args: List[str]) -> str:
+    result = ""
+    for arg in args:
+        result += str(arg)
+    return result
+
+
+def setup_hook_example(name):
+    logging.warning("setup_hook_example")
+    return f"setup_hook_example: {name}"
+
+
+def teardown_hook_example(name):
+    logging.warning("teardown_hook_example")
+    return f"teardown_hook_example: {name}"

hrp/internal/scaffold/templates/plugin/debugtalk.go

@@ -46,12 +46,12 @@ func GetVersion() string {
 }
 
 func main() {
-	fungo.Register("GetVersion", GetVersion)
-	fungo.Register("SumInts", SumInts)
-	fungo.Register("SumTwoInt", SumTwoInt)
-	fungo.Register("SumTwoInt", SumTwoInt)
-	fungo.Register("Sum", Sum)
-	fungo.Register("SetupHookExample", SetupHookExample)
-	fungo.Register("TeardownHookExample", TeardownHookExample)
+	fungo.Register("get_version", GetVersion)
+	fungo.Register("sum_ints", SumInts)
+	fungo.Register("sum_two_int", SumTwoInt)
+	fungo.Register("sum_two", SumTwoInt)
+	fungo.Register("sum", Sum)
+	fungo.Register("setup_hook_example", SetupHookExample)
+	fungo.Register("teardown_hook_example", TeardownHookExample)
 	fungo.Serve()
 }

hrp/internal/scaffold/templates/testcases/demo_go_ref_testcase.yml

@@ -1,33 +0,0 @@
-config:
-    name: "request methods testcase: reference testcase"
-    variables:
-        foo1: testsuite_config_bar1
-        expect_foo1: testsuite_config_bar1
-        expect_foo2: config_bar2
-    base_url: "https://postman-echo.com"
-    verify: False
-
-teststeps:
--
-    name: request with functions
-    variables:
-        foo1: testcase_ref_bar1
-        expect_foo1: testcase_ref_bar1
-    testcase: testcases/requests.yml
-    export:
-        - foo3
--
-    name: post form data
-    variables:
-        foo1: bar1
-    request:
-        method: POST
-        url: /post
-        headers:
-            User-Agent: funplugin/${GetVersion()}
-            Content-Type: "application/x-www-form-urlencoded"
-        data: "foo1=$foo1&foo2=$foo3"
-    validate:
-        - eq: ["status_code", 200]
-        - eq: ["body.form.foo1", "bar1"]
-        - eq: ["body.form.foo2", "bar21"]

hrp/internal/scaffold/templates/testcases/demo_go_requests.json

@@ -1,138 +0,0 @@
-{
-    "config": {
-        "name": "request methods testcase with functions",
-        "variables": {
-            "foo1": "config_bar1",
-            "foo2": "config_bar2",
-            "expect_foo1": "config_bar1",
-            "expect_foo2": "config_bar2"
-        },
-        "base_url": "https://postman-echo.com",
-        "verify": false,
-        "export": [
-            "foo3"
-        ]
-    },
-    "teststeps": [
-        {
-            "name": "get with params",
-            "variables": {
-                "foo1": "bar11",
-                "foo2": "bar21",
-                "sum_v": "${SumTwoInt(1, 2)}"
-            },
-            "request": {
-                "method": "GET",
-                "url": "/get",
-                "params": {
-                    "foo1": "$foo1",
-                    "foo2": "$foo2",
-                    "sum_v": "$sum_v"
-                },
-                "headers": {
-                    "User-Agent": "funplugin/${GetVersion()}"
-                }
-            },
-            "extract": {
-                "foo3": "body.args.foo2"
-            },
-            "validate": [
-                {
-                    "eq": [
-                        "status_code",
-                        200
-                    ]
-                },
-                {
-                    "eq": [
-                        "body.args.foo1",
-                        "bar11"
-                    ]
-                },
-                {
-                    "eq": [
-                        "body.args.sum_v",
-                        "3"
-                    ]
-                },
-                {
-                    "eq": [
-                        "body.args.foo2",
-                        "bar21"
-                    ]
-                }
-            ]
-        },
-        {
-            "name": "post raw text",
-            "variables": {
-                "foo1": "bar12",
-                "foo3": "bar32"
-            },
-            "request": {
-                "method": "POST",
-                "url": "/post",
-                "headers": {
-                    "User-Agent": "funplugin/${GetVersion()}",
-                    "Content-Type": "text/plain"
-                },
-                "data": "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
-            },
-            "validate": [
-                {
-                    "eq": [
-                        "status_code",
-                        200
-                    ]
-                },
-                {
-                    "eq": [
-                        "body.data",
-                        "This is expected to be sent back as part of response body: bar12-$expect_foo2-bar32."
-                    ]
-                }
-            ]
-        },
-        {
-            "name": "post form data",
-            "variables": {
-                "foo2": "bar23"
-            },
-            "request": {
-                "method": "POST",
-                "url": "/post",
-                "headers": {
-                    "User-Agent": "funplugin/${GetVersion()}",
-                    "Content-Type": "application/x-www-form-urlencoded"
-                },
-                "data": "foo1=$foo1&foo2=$foo2&foo3=$foo3"
-            },
-            "validate": [
-                {
-                    "eq": [
-                        "status_code",
-                        200
-                    ]
-                },
-                {
-                    "eq": [
-                        "body.form.foo1",
-                        "$expect_foo1"
-                    ]
-                },
-                {
-                    "eq": [
-                        "body.form.foo2",
-                        "bar23"
-                    ]
-                },
-                {
-                    "eq": [
-                        "body.form.foo3",
-                        "bar21"
-                    ]
-                }
-            ]
-        }
-    ]
-}

hrp/internal/scaffold/templates/testcases/demo_go_requests.yml

@@ -1,65 +0,0 @@
-config:
-    name: "request methods testcase with functions"
-    variables:
-        foo1: config_bar1
-        foo2: config_bar2
-        expect_foo1: config_bar1
-        expect_foo2: config_bar2
-    base_url: "https://postman-echo.com"
-    verify: False
-    export: ["foo3"]
-
-teststeps:
--
-    name: get with params
-    variables:
-        foo1: bar11
-        foo2: bar21
-        sum_v: "${SumTwoInt(1, 2)}"
-    request:
-        method: GET
-        url: /get
-        params:
-            foo1: $foo1
-            foo2: $foo2
-            sum_v: $sum_v
-        headers:
-            User-Agent: funplugin/${GetVersion()}
-    extract:
-        foo3: "body.args.foo2"
-    validate:
-        - eq: ["status_code", 200]
-        - eq: ["body.args.foo1", "bar11"]
-        - eq: ["body.args.sum_v", "3"]
-        - eq: ["body.args.foo2", "bar21"]
--
-    name: post raw text
-    variables:
-        foo1: "bar12"
-        foo3: "bar32"
-    request:
-        method: POST
-        url: /post
-        headers:
-            User-Agent: funplugin/${GetVersion()}
-            Content-Type: "text/plain"
-        data: "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
-    validate:
-        - eq: ["status_code", 200]
-        - eq: ["body.data", "This is expected to be sent back as part of response body: bar12-$expect_foo2-bar32."]
--
-    name: post form data
-    variables:
-        foo2: bar23
-    request:
-        method: POST
-        url: /post
-        headers:
-            User-Agent: funplugin/${GetVersion()}
-            Content-Type: "application/x-www-form-urlencoded"
-        data: "foo1=$foo1&foo2=$foo2&foo3=$foo3"
-    validate:
-        - eq: ["status_code", 200]
-        - eq: ["body.form.foo1", "$expect_foo1"]
-        - eq: ["body.form.foo2", "bar23"]
-        - eq: ["body.form.foo3", "bar21"]

hrp/internal/scaffold/templates/testcases/demo_go_with_funplugin.json

@@ -1,176 +0,0 @@
-{
-    "config": {
-        "name": "demo with complex mechanisms",
-        "base_url": "https://postman-echo.com",
-        "variables": {
-            "a": "${Sum(10, 2.3)}",
-            "b": 3.45,
-            "n": "${SumInts(1, 2, 2)}",
-            "varFoo1": "${gen_random_string($n)}",
-            "varFoo2": "${max($a, $b)}"
-        }
-    },
-    "teststeps": [
-        {
-            "name": "transaction 1 start",
-            "transaction": {
-                "name": "tran1",
-                "type": "start"
-            }
-        },
-        {
-            "name": "get with params",
-            "request": {
-                "method": "GET",
-                "url": "/get",
-                "params": {
-                    "foo1": "$varFoo1",
-                    "foo2": "$varFoo2"
-                },
-                "headers": {
-                    "User-Agent": "HttpRunnerPlus"
-                }
-            },
-            "variables": {
-                "b": 34.5,
-                "n": 3,
-                "name": "get with params",
-                "varFoo2": "${max($a, $b)}"
-            },
-            "setup_hooks": [
-                "${SetupHookExample($name)}"
-            ],
-            "teardown_hooks": [
-                "${TeardownHookExample($name)}"
-            ],
-            "extract": {
-                "varFoo1": "body.args.foo1"
-            },
-            "validate": [
-                {
-                    "check": "status_code",
-                    "assert": "equals",
-                    "expect": 200,
-                    "msg": "check response status code"
-                },
-                {
-                    "check": "headers.\"Content-Type\"",
-                    "assert": "startswith",
-                    "expect": "application/json"
-                },
-                {
-                    "check": "body.args.foo1",
-                    "assert": "length_equals",
-                    "expect": 5,
-                    "msg": "check args foo1"
-                },
-                {
-                    "check": "$varFoo1",
-                    "assert": "length_equals",
-                    "expect": 5,
-                    "msg": "check args foo1"
-                },
-                {
-                    "check": "body.args.foo2",
-                    "assert": "equals",
-                    "expect": "34.5",
-                    "msg": "check args foo2"
-                }
-            ]
-        },
-        {
-            "name": "transaction 1 end",
-            "transaction": {
-                "name": "tran1",
-                "type": "end"
-            }
-        },
-        {
-            "name": "post json data",
-            "request": {
-                "method": "POST",
-                "url": "/post",
-                "body": {
-                    "foo1": "$varFoo1",
-                    "foo2": "${max($a, $b)}"
-                }
-            },
-            "validate": [
-                {
-                    "check": "status_code",
-                    "assert": "equals",
-                    "expect": 200,
-                    "msg": "check status code"
-                },
-                {
-                    "check": "body.json.foo1",
-                    "assert": "length_equals",
-                    "expect": 5,
-                    "msg": "check args foo1"
-                },
-                {
-                    "check": "body.json.foo2",
-                    "assert": "equals",
-                    "expect": 12.3,
-                    "msg": "check args foo2"
-                }
-            ]
-        },
-        {
-            "name": "post form data",
-            "request": {
-                "method": "POST",
-                "url": "/post",
-                "headers": {
-                    "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8"
-                },
-                "body": {
-                    "foo1": "$varFoo1",
-                    "foo2": "${max($a, $b)}",
-                    "time": "${get_timestamp()}"
-                }
-            },
-            "extract": {
-                "varTime": "body.form.time"
-            },
-            "validate": [
-                {
-                    "check": "status_code",
-                    "assert": "equals",
-                    "expect": 200,
-                    "msg": "check status code"
-                },
-                {
-                    "check": "body.form.foo1",
-                    "assert": "length_equals",
-                    "expect": 5,
-                    "msg": "check args foo1"
-                },
-                {
-                    "check": "body.form.foo2",
-                    "assert": "equals",
-                    "expect": "12.3",
-                    "msg": "check args foo2"
-                }
-            ]
-        },
-        {
-            "name": "get with timestamp",
-            "request": {
-                "method": "GET",
-                "url": "/get",
-                "params": {
-                    "time": "$varTime"
-                }
-            },
-            "validate": [
-                {
-                    "check": "body.args.time",
-                    "assert": "length_equals",
-                    "expect": 13,
-                    "msg": "check extracted var timestamp"
-                }
-            ]
-        }
-    ]
-}

hrp/parser.go

@@ -252,8 +252,14 @@ func (p *Parser) ParseString(raw string, variablesMapping map[string]interface{}
 // only support return at most one result value
 func (p *Parser) CallFunc(funcName string, arguments ...interface{}) (interface{}, error) {
 	// call with plugin function
-	if p.plugin != nil && p.plugin.Has(funcName) {
-		return p.plugin.Call(funcName, arguments...)
+	if p.plugin != nil {
+		if p.plugin.Has(funcName) {
+			return p.plugin.Call(funcName, arguments...)
+		}
+		commonName := shared.ConvertCommonName(funcName)
+		if p.plugin.Has(commonName) {
+			return p.plugin.Call(commonName, arguments...)
+		}
 	}
 
 	// get builtin function

hrp/plugin.go

@@ -2,7 +2,6 @@ package hrp
 
 import (
 	"fmt"
-	"github.com/httprunner/httprunner/v4/hrp/internal/build"
 	"os"
 	"os/signal"
 	"path/filepath"
@@ -12,6 +11,7 @@ import (
 	"github.com/httprunner/funplugin"
 	"github.com/rs/zerolog/log"
 
+	"github.com/httprunner/httprunner/v4/hrp/internal/build"
 	"github.com/httprunner/httprunner/v4/hrp/internal/sdk"
 )
 
@@ -20,6 +20,7 @@ const (
 	hashicorpGoPluginFile = "debugtalk.bin"    // built from hashicorp go plugin
 	hashicorpPyPluginFile = "debugtalk_gen.py" // used for hashicorp python plugin, automatically generated by HRP
 	debugtalkPyFile       = "debugtalk.py"     // write by user
+	projectInfoFile       = "proj.json"        // used for ensuring root project
 )
 
 func initPlugin(path string, logOn bool) (plugin funplugin.IPlugin, pluginDir string, err error) {

hrp/runner_test.go

@@ -12,18 +12,9 @@ import (
 	"github.com/httprunner/httprunner/v4/hrp/internal/scaffold"
 )
 
-func buildHashicorpGoPluginWithNoFungo() {
-	log.Info().Msg("[init] build hashicorp go plugin")
-	err := build.Run(templatesDir+"noplugin/debugtalk.go", templatesDir+"debugtalk.bin")
-	if err != nil {
-		log.Error().Err(err).Msg("build hashicorp go plugin failed")
-		os.Exit(1)
-	}
-}
-
 func buildHashicorpGoPlugin() {
 	log.Info().Msg("[init] build hashicorp go plugin")
-	err := build.Run(templatesDir+"noplugin/debugtalk.go", templatesDir+"debugtalk.bin")
+	err := build.Run(templatesDir+"plugin/debugtalk.go", templatesDir+"debugtalk.bin")
 	if err != nil {
 		log.Error().Err(err).Msg("build hashicorp go plugin failed")
 		os.Exit(1)
@@ -38,7 +29,7 @@ func removeHashicorpGoPlugin() {
 func buildHashicorpPyPlugin() {
 	log.Info().Msg("[init] prepare hashicorp python plugin")
 	pluginFile := templatesDir + "debugtalk.py"
-	err := scaffold.CopyFile("templates/noplugin/debugtalk.py", pluginFile)
+	err := scaffold.CopyFile("templates/plugin/debugtalk.py", pluginFile)
 	if err != nil {
 		log.Error().Err(err).Msg("build hashicorp python plugin failed")
 		os.Exit(1)
@@ -55,6 +46,17 @@ func TestRunCaseWithGoPlugin(t *testing.T) {
 	buildHashicorpGoPlugin()
 	defer removeHashicorpGoPlugin()
 
+	assertRunTestCases(t)
+}
+
+func TestRunCaseWithPythonPlugin(t *testing.T) {
+	buildHashicorpPyPlugin()
+	defer removeHashicorpPyPlugin()
+
+	assertRunTestCases(t)
+}
+
+func assertRunTestCases(t *testing.T) {
 	testcase1 := &TestCase{
 		Config: NewConfig("TestCase1").
 			SetBaseURL("http://httpbin.org"),
@@ -81,7 +83,7 @@ func TestRunCaseWithGoPlugin(t *testing.T) {
 					},
 				},
 			),
-			NewStep("testcase1-step4").CallRefCase(&demoTestCaseWithGoPluginJSONPath),
+			NewStep("testcase1-step4").CallRefCase(&demoTestCaseWithPluginJSONPath),
 		},
 	}
 	testcase2 := &TestCase{
@@ -96,18 +98,6 @@ func TestRunCaseWithGoPlugin(t *testing.T) {
 	}
 }
 
-func TestRunCaseWithPythonPlugin(t *testing.T) {
-	buildHashicorpPyPlugin()
-	defer removeHashicorpPyPlugin()
-
-	r := NewRunner(t)
-	r.SetPluginLogOn()
-	err := r.Run(&demoTestCaseWithPluginJSONPath)
-	if err != nil {
-		t.Fatalf("run testcase error: %v", err)
-	}
-}
-
 func TestRunCaseWithThinkTime(t *testing.T) {
 	buildHashicorpGoPlugin()
 	defer removeHashicorpGoPlugin()
@@ -170,15 +160,15 @@ func TestRunCaseWithPluginJSON(t *testing.T) {
 	buildHashicorpGoPlugin()
 	defer removeHashicorpGoPlugin()
 
-	err := NewRunner(nil).Run(&demoTestCaseWithGoPluginJSONPath) // hrp.Run(testCase)
+	err := NewRunner(nil).Run(&demoTestCaseWithPluginJSONPath) // hrp.Run(testCase)
 	if err != nil {
 		t.Fatal()
 	}
 }
 
 func TestRunCaseWithPluginYAML(t *testing.T) {
-	buildHashicorpPyPlugin()
-	defer removeHashicorpPyPlugin()
+	buildHashicorpGoPlugin()
+	defer removeHashicorpGoPlugin()
 
 	err := NewRunner(nil).Run(&demoTestCaseWithPluginYAMLPath) // hrp.Run(testCase)
 	if err != nil {

hrp/testcase_test.go

@@ -15,7 +15,6 @@ const (
 
 var (
 	demoTestCaseWithPluginJSONPath    TestCasePath = templatesDir + "testcases/demo_with_funplugin.json"
-	demoTestCaseWithGoPluginJSONPath  TestCasePath = templatesDir + "testcases/demo_go_with_funplugin.json"
 	demoTestCaseWithPluginYAMLPath    TestCasePath = templatesDir + "testcases/demo_with_funplugin.yaml"
 	demoTestCaseWithoutPluginJSONPath TestCasePath = templatesDir + "testcases/demo_without_funplugin.json"
 	demoTestCaseWithoutPluginYAMLPath TestCasePath = templatesDir + "testcases/demo_without_funplugin.yaml"