feat: support HTTP/2.0

2026-07-10 23:12:41 +08:00 · 2022-04-07 21:40:37 +08:00
parent 68a591121a
commit be7f7122d8
9 changed files with 165 additions and 75 deletions
--- a/hrp/tests/protocol_test.go
+++ b/hrp/tests/protocol_test.go
@@ -0,0 +1,54 @@
+package tests
+
+import (
+	"testing"
+
+	"github.com/httprunner/httprunner/hrp"
+)
+
+func TestProtocol(t *testing.T) {
+	testcase := &hrp.TestCase{
+		Config: hrp.NewConfig("run request with different protocol types").
+			SetBaseURL("https://postman-echo.com"),
+		TestSteps: []hrp.IStep{
+			hrp.NewStep("HTTP/1.1 get").
+				GET("/get").
+				WithParams(map[string]interface{}{"foo1": "foo1", "foo2": "foo2"}).
+				WithHeaders(map[string]string{"User-Agent": "HttpRunnerPlus"}).
+				Validate().
+				AssertEqual("status_code", 200, "check status code").
+				AssertEqual("proto", "HTTP/1.1", "check protocol type").
+				AssertLengthEqual("body.args.foo1", 4, "check param foo1"),
+			hrp.NewStep("HTTP/1.1 post").
+				POST("/post").
+				WithHeaders(map[string]string{"User-Agent": "HttpRunnerPlus"}).
+				WithBody(map[string]interface{}{"foo1": "foo1", "foo2": "foo2"}).
+				Validate().
+				AssertEqual("status_code", 200, "check status code").
+				AssertEqual("proto", "HTTP/1.1", "check protocol type").
+				AssertLengthEqual("body.json.foo1", 4, "check body foo1"),
+			hrp.NewStep("HTTP2.0 get").
+				GET("/get").
+				EnableHTTP2().
+				WithParams(map[string]interface{}{"foo1": "foo1", "foo2": "foo2"}).
+				WithHeaders(map[string]string{"User-Agent": "HttpRunnerPlus"}).
+				Validate().
+				AssertEqual("status_code", 200, "check status code").
+				AssertEqual("proto", "HTTP/2.0", "check protocol type").
+				AssertLengthEqual("body.args.foo1", 4, "check param foo1"),
+			hrp.NewStep("HTTP/2.0 post").
+				POST("/post").
+				EnableHTTP2().
+				WithHeaders(map[string]string{"User-Agent": "HttpRunnerPlus"}).
+				WithBody(map[string]interface{}{"foo1": "foo1", "foo2": "foo2"}).
+				Validate().
+				AssertEqual("status_code", 200, "check status code").
+				AssertEqual("proto", "HTTP/2.0", "check protocol type").
+				AssertLengthEqual("body.json.foo1", 4, "check body foo1"),
+		},
+	}
+	err := hrp.NewRunner(t).Run(testcase)
+	if err != nil {
+		t.Fatalf("run testcase error: %v", err)
+	}
+}
--- a/hrp/tests/rendezvous_test.go
+++ b/hrp/tests/rendezvous_test.go
@@ -6,50 +6,47 @@ import (
 	"github.com/httprunner/httprunner/hrp"
 )

-const rendezvousTestJSONPath = "rendezvous_test.json"
-
-var rendezvousTestcase = &hrp.TestCase{
-	Config: hrp.NewConfig("run request with functions").
-		SetBaseURL("https://postman-echo.com").
-		WithVariables(map[string]interface{}{
-			"n": 5,
-			"a": 12.3,
-			"b": 3.45,
-		}),
-	TestSteps: []hrp.IStep{
-		hrp.NewStep("waiting for all users in the beginning").
-			Rendezvous("rendezvous0"),
-		hrp.NewStep("rendezvous before get").
-			Rendezvous("rendezvous1").
-			WithUserNumber(50).
-			WithTimeout(3000),
-		hrp.NewStep("get with params").
-			GET("/get").
-			WithParams(map[string]interface{}{"foo1": "foo1", "foo2": "foo2"}).
-			WithHeaders(map[string]string{"User-Agent": "HttpRunnerPlus"}).
-			Extract().
-			WithJmesPath("body.args.foo1", "varFoo1").
-			Validate().
-			AssertEqual("status_code", 200, "check status code"),
-		hrp.NewStep("rendezvous before post").
-			Rendezvous("rendezvous2").
-			WithUserNumber(20).
-			WithTimeout(2000),
-		hrp.NewStep("post json data with functions").
-			POST("/post").
-			WithHeaders(map[string]string{"User-Agent": "HttpRunnerPlus"}).
-			WithBody(map[string]interface{}{"foo1": "foo1", "foo2": "foo2"}).
-			Validate().
-			AssertEqual("status_code", 200, "check status code").
-			AssertLengthEqual("body.json.foo1", 4, "check args foo1").
-			AssertEqual("body.json.foo2", "foo2", "check args foo2"),
-		hrp.NewStep("waiting for all users in the end").
-			Rendezvous("rendezvous3"),
-	},
-}
-
 func TestRendezvous(t *testing.T) {
-	err := hrp.NewRunner(t).Run(rendezvousTestcase)
+	testcase := &hrp.TestCase{
+		Config: hrp.NewConfig("run request with rendezvous").
+			SetBaseURL("https://postman-echo.com").
+			WithVariables(map[string]interface{}{
+				"n": 5,
+				"a": 12.3,
+				"b": 3.45,
+			}),
+		TestSteps: []hrp.IStep{
+			hrp.NewStep("waiting for all users in the beginning").
+				SetRendezvous("rendezvous0"),
+			hrp.NewStep("rendezvous before get").
+				SetRendezvous("rendezvous1").
+				WithUserNumber(50).
+				WithTimeout(3000),
+			hrp.NewStep("get with params").
+				GET("/get").
+				WithParams(map[string]interface{}{"foo1": "foo1", "foo2": "foo2"}).
+				WithHeaders(map[string]string{"User-Agent": "HttpRunnerPlus"}).
+				Extract().
+				WithJmesPath("body.args.foo1", "varFoo1").
+				Validate().
+				AssertEqual("status_code", 200, "check status code"),
+			hrp.NewStep("rendezvous before post").
+				SetRendezvous("rendezvous2").
+				WithUserNumber(20).
+				WithTimeout(2000),
+			hrp.NewStep("post json data with functions").
+				POST("/post").
+				WithHeaders(map[string]string{"User-Agent": "HttpRunnerPlus"}).
+				WithBody(map[string]interface{}{"foo1": "foo1", "foo2": "foo2"}).
+				Validate().
+				AssertEqual("status_code", 200, "check status code").
+				AssertLengthEqual("body.json.foo1", 4, "check args foo1").
+				AssertEqual("body.json.foo2", "foo2", "check args foo2"),
+			hrp.NewStep("waiting for all users in the end").
+				SetRendezvous("rendezvous3"),
+		},
+	}
+	err := hrp.NewRunner(t).Run(testcase)
 	if err != nil {
 		t.Fatalf("run testcase error: %v", err)
 	}