change: replace with assert err nil

internal/builtin/assertion_test.go

@@ -19,9 +19,7 @@ func TestStartsWith(t *testing.T) {
 	}
 
 	for _, data := range testData {
-		if !assert.True(t, StartsWith(t, data.raw, data.expected)) {
+		assert.True(t, StartsWith(t, data.raw, data.expected))
-			t.Fatal()
-		}
 	}
 }
 
@@ -37,9 +35,7 @@ func TestEndsWith(t *testing.T) {
 	}
 
 	for _, data := range testData {
-		if !assert.True(t, EndsWith(t, data.raw, data.expected)) {
+		assert.True(t, EndsWith(t, data.raw, data.expected))
-			t.Fatal()
-		}
 	}
 }
 
@@ -75,9 +71,7 @@ func TestLessThanLength(t *testing.T) {
 	}
 
 	for _, data := range testData {
-		if !assert.True(t, LessThanLength(t, data.raw, data.expected)) {
+		assert.True(t, LessThanLength(t, data.raw, data.expected))
-			t.Fatal()
-		}
 	}
 }
 
@@ -95,9 +89,7 @@ func TestLessOrEqualsLength(t *testing.T) {
 	}
 
 	for _, data := range testData {
-		if !assert.True(t, LessOrEqualsLength(t, data.raw, data.expected)) {
+		assert.True(t, LessOrEqualsLength(t, data.raw, data.expected))
-			t.Fatal()
-		}
 	}
 }
 
@@ -112,9 +104,7 @@ func TestGreaterThanLength(t *testing.T) {
 	}
 
 	for _, data := range testData {
-		if !assert.True(t, GreaterThanLength(t, data.raw, data.expected)) {
+		assert.True(t, GreaterThanLength(t, data.raw, data.expected))
-			t.Fatal()
-		}
 	}
 }
 
@@ -132,9 +122,7 @@ func TestGreaterOrEqualsLength(t *testing.T) {
 	}
 
 	for _, data := range testData {
-		if !assert.True(t, GreaterOrEqualsLength(t, data.raw, data.expected)) {
+		assert.True(t, GreaterOrEqualsLength(t, data.raw, data.expected))
-			t.Fatal()
-		}
 	}
 }
 
@@ -149,9 +137,7 @@ func TestContainedBy(t *testing.T) {
 	}
 
 	for _, data := range testData {
-		if !assert.True(t, ContainedBy(t, data.raw, data.expected)) {
+		assert.True(t, ContainedBy(t, data.raw, data.expected))
-			t.Fatal()
-		}
 	}
 }
 
@@ -170,9 +156,7 @@ func TestStringEqual(t *testing.T) {
 	}
 
 	for _, data := range testData {
-		if !assert.True(t, StringEqual(t, data.raw, data.expected)) {
+		assert.True(t, StringEqual(t, data.raw, data.expected))
-			t.Fatal()
-		}
 	}
 }
 
@@ -187,9 +171,7 @@ func TestEqualFold(t *testing.T) {
 	}
 
 	for _, data := range testData {
-		if !assert.True(t, EqualFold(t, data.raw, data.expected)) {
+		assert.True(t, EqualFold(t, data.raw, data.expected))
-			t.Fatal()
-		}
 	}
 }
 
@@ -203,8 +185,6 @@ func TestRegexMatch(t *testing.T) {
 	}
 
 	for _, data := range testData {
-		if !assert.True(t, RegexMatch(t, data.raw, data.expected)) {
+		assert.True(t, RegexMatch(t, data.raw, data.expected))
-			t.Fatal()
-		}
 	}
 }

internal/scaffold/templates/debugtalk.py

@@ -0,0 +1,62 @@
+import logging
+import time
+from typing import List
+
+
+# commented out function will be filtered
+# def get_headers():
+#     return {"User-Agent": "hrp"}
+
+
+def get_user_agent():
+    return "hrp/funppy"
+
+
+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}"

internal/version/VERSION

@@ -1 +1 @@
-v5.0.0-beta-2503052228
+v5.0.0-beta-2503052233

tests/extract_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	hrp "github.com/httprunner/httprunner/v5"
+	"github.com/stretchr/testify/assert"
 )
 
 // reference extracted variables for validation in the same step
@@ -37,9 +38,7 @@ func TestCaseExtractStepSingle(t *testing.T) {
 	}
 
 	err := hrp.NewRunner(t).Run(testcase)
-	if err != nil {
+	assert.Nil(t, err)
-		t.Fatalf("run testcase error: %v", err)
-	}
 }
 
 // reference extracted variables from previous step
@@ -79,7 +78,5 @@ func TestCaseExtractStepAssociation(t *testing.T) {
 	}
 
 	err := hrp.NewRunner(t).Run(testcase)
-	if err != nil {
+	assert.Nil(t, err)
-		t.Fatalf("run testcase error: %v", err)
-	}
 }

tests/step_ui_test.go

@@ -7,6 +7,7 @@ import (
 
 	hrp "github.com/httprunner/httprunner/v5"
 	"github.com/httprunner/httprunner/v5/uixt/option"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestIOSSettingsAction(t *testing.T) {
@@ -25,9 +26,7 @@ func TestIOSSettingsAction(t *testing.T) {
 		},
 	}
 	err := hrp.NewRunner(t).Run(testCase)
-	if err != nil {
+	assert.Nil(t, err)
-		t.Fatal(err)
-	}
 }
 
 func TestIOSSearchApp(t *testing.T) {
@@ -43,9 +42,7 @@ func TestIOSSearchApp(t *testing.T) {
 		},
 	}
 	err := hrp.NewRunner(t).Run(testCase)
-	if err != nil {
+	assert.Nil(t, err)
-		t.Fatal(err)
-	}
 }
 
 func TestIOSAppLaunch(t *testing.T) {
@@ -64,9 +61,7 @@ func TestIOSAppLaunch(t *testing.T) {
 		},
 	}
 	err := hrp.NewRunner(t).Run(testCase)
-	if err != nil {
+	assert.Nil(t, err)
-		t.Fatal(err)
-	}
 }
 
 func TestAndroidAction(t *testing.T) {
@@ -83,7 +78,5 @@ func TestAndroidAction(t *testing.T) {
 		},
 	}
 	err := hrp.NewRunner(t).Run(testCase)
-	if err != nil {
+	assert.Nil(t, err)
-		t.Fatal(err)
-	}
 }

tests/summary_test.go

@@ -58,10 +58,6 @@ func TestTestCaseSummary_AddStepResult(t *testing.T) {
 	}
 	caseSummary.AddStepResult(stepResult2)
 
-	if !assert.Equal(t, 2, len(caseSummary.Records)) {
+	assert.Equal(t, 2, len(caseSummary.Records))
-		t.Fatal()
+	assert.False(t, caseSummary.Success)
-	}
-	if !assert.False(t, caseSummary.Success) {
-		t.Fatal()
-	}
 }

tests/testcase_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	hrp "github.com/httprunner/httprunner/v5"
+	"github.com/stretchr/testify/assert"
 )
 
 const (
@@ -155,20 +156,12 @@ var demoTestCaseWithoutPlugin = &hrp.TestCase{
 
 func TestGenDemoTestCase(t *testing.T) {
 	err := demoTestCaseWithPlugin.Dump2JSON(demoTestCaseWithPluginJSONPath)
-	if err != nil {
+	assert.Nil(t, err)
-		t.Fatal()
-	}
 	err = demoTestCaseWithPlugin.Dump2YAML(demoTestCaseWithPluginYAMLPath)
-	if err != nil {
+	assert.Nil(t, err)
-		t.Fatal()
-	}
 
 	err = demoTestCaseWithoutPlugin.Dump2JSON(demoTestCaseWithoutPluginJSONPath)
-	if err != nil {
+	assert.Nil(t, err)
-		t.Fatal()
-	}
 	err = demoTestCaseWithoutPlugin.Dump2YAML(demoTestCaseWithoutPluginYAMLPath)
-	if err != nil {
+	assert.Nil(t, err)
-		t.Fatal()
-	}
 }

uixt/demo/main_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/rs/zerolog/log"
+	"github.com/stretchr/testify/assert"
 
 	"github.com/httprunner/httprunner/v5/uixt"
 	"github.com/httprunner/httprunner/v5/uixt/ai"
@@ -19,14 +19,10 @@ func TestIOSDemo(t *testing.T) {
 		option.WithWDAMjpegPort(8800),
 		option.WithResetHomeOnStartup(false), // not reset home on startup
 	)
-	if err != nil {
+	assert.Nil(t, err)
-		t.Fatal(err)
-	}
 
 	driver, err := device.NewDriver()
-	if err != nil {
+	assert.Nil(t, err)
-		t.Fatal(err)
-	}
 	driverExt := uixt.NewXTDriver(driver,
 		ai.WithCVService(ai.CVServiceTypeVEDEM),
 	)
@@ -40,10 +36,7 @@ func TestIOSDemo(t *testing.T) {
 	for {
 		// take screenshot and get screen texts by OCR
 		ocrTexts, err := driverExt.GetScreenTexts()
-		if err != nil {
+		assert.Nil(t, err)
-			log.Error().Err(err).Msg("OCR GetTexts failed")
-			t.Fatal(err)
-		}
 
 		points, err := ocrTexts.FindTexts([]string{"青少年模式", "我知道了"})
 		if err != nil {
@@ -53,8 +46,6 @@ func TestIOSDemo(t *testing.T) {
 
 		point := points[1].Center()
 		err = driverExt.TapAbsXY(point.X, point.Y)
-		if err != nil {
+		assert.Nil(t, err)
-			t.Fatal(err)
-		}
 	}
 }