From a1f189b3f4fa54bc164be1149d3a3c74178ff3ce Mon Sep 17 00:00:00 2001
From: xucong053 <xucong053@outlook.com>
Date: Thu, 26 May 2022 20:11:46 +0800
Subject: [PATCH] fix: unittest

---
 examples/demo-with-go-plugin/proj.json        |  6 ++++
 .../testcases/ref_testcase.yml                |  2 +-
 .../testcases/requests.json                   |  4 +--
 .../testcases/requests.yml                    |  4 +--
 examples/demo-with-py-plugin/proj.json        |  6 ++++
 .../testcases/ref_testcase.yml                |  2 +-
 .../testcases/requests.json                   |  4 +--
 .../testcases/requests.yml                    |  4 +--
 examples/demo-without-plugin/proj.json        |  6 ++++
 .../templates/testcases/demo_ref_api.json     | 34 +++++++++----------
 .../templates/testcases/demo_ref_testcase.yml |  2 +-
 .../templates/testcases/demo_requests.json    |  4 +--
 .../templates/testcases/demo_requests.yml     |  4 +--
 13 files changed, 49 insertions(+), 33 deletions(-)
 create mode 100644 examples/demo-with-go-plugin/proj.json
 create mode 100644 examples/demo-with-py-plugin/proj.json
 create mode 100644 examples/demo-without-plugin/proj.json

diff --git a/examples/demo-with-go-plugin/proj.json b/examples/demo-with-go-plugin/proj.json
new file mode 100644
index 00000000..c845ecfa
--- /dev/null
+++ b/examples/demo-with-go-plugin/proj.json
@@ -0,0 +1,6 @@
+{
+    "project_name": "demo-with-go-plugin",
+    "project_path": "/Users/xxxxx/go/src/github.com/httprunner/httprunner/examples/demo-with-go-plugin",
+    "create_time": "2022-05-26T20:08:49.164545+08:00",
+    "hrp_version": "v4.1.0-beta"
+}
\ No newline at end of file
diff --git a/examples/demo-with-go-plugin/testcases/ref_testcase.yml b/examples/demo-with-go-plugin/testcases/ref_testcase.yml
index b904706f..e102b9ec 100644
--- a/examples/demo-with-go-plugin/testcases/ref_testcase.yml
+++ b/examples/demo-with-go-plugin/testcases/ref_testcase.yml
@@ -26,7 +26,7 @@ teststeps:
         headers:
             User-Agent: funplugin/${get_version()}
             Content-Type: "application/x-www-form-urlencoded"
-        data: "foo1=$foo1&foo2=$foo3"
+        body: "foo1=$foo1&foo2=$foo3"
     validate:
         - check: status_code
           assert: equal
diff --git a/examples/demo-with-go-plugin/testcases/requests.json b/examples/demo-with-go-plugin/testcases/requests.json
index 24d3d38d..162632b4 100644
--- a/examples/demo-with-go-plugin/testcases/requests.json
+++ b/examples/demo-with-go-plugin/testcases/requests.json
@@ -76,7 +76,7 @@
                     "User-Agent": "funplugin/${get_version()}",
                     "Content-Type": "text/plain"
                 },
-                "data": "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
+                "body": "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
             },
             "validate": [
                 {
@@ -105,7 +105,7 @@
                     "User-Agent": "funplugin/${get_version()}",
                     "Content-Type": "application/x-www-form-urlencoded"
                 },
-                "data": "foo1=$foo1&foo2=$foo2&foo3=$foo3"
+                "body": "foo1=$foo1&foo2=$foo2&foo3=$foo3"
             },
             "validate": [
                 {
diff --git a/examples/demo-with-go-plugin/testcases/requests.yml b/examples/demo-with-go-plugin/testcases/requests.yml
index a713830b..988c970f 100644
--- a/examples/demo-with-go-plugin/testcases/requests.yml
+++ b/examples/demo-with-go-plugin/testcases/requests.yml
@@ -54,7 +54,7 @@ teststeps:
         headers:
             User-Agent: funplugin/${get_version()}
             Content-Type: "text/plain"
-        data: "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
+        body: "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
     validate:
         - check: status_code
           assert: equal
@@ -74,7 +74,7 @@ teststeps:
         headers:
             User-Agent: funplugin/${get_version()}
             Content-Type: "application/x-www-form-urlencoded"
-        data: "foo1=$foo1&foo2=$foo2&foo3=$foo3"
+        body: "foo1=$foo1&foo2=$foo2&foo3=$foo3"
     validate:
         - check: status_code
           assert: equal
diff --git a/examples/demo-with-py-plugin/proj.json b/examples/demo-with-py-plugin/proj.json
new file mode 100644
index 00000000..e950c12c
--- /dev/null
+++ b/examples/demo-with-py-plugin/proj.json
@@ -0,0 +1,6 @@
+{
+    "project_name": "demo-with-py-plugin",
+    "project_path": "/Users/xxxxx/go/src/github.com/httprunner/httprunner/examples/demo-with-py-plugin",
+    "create_time": "2022-05-26T20:08:56.909632+08:00",
+    "hrp_version": "v4.1.0-beta"
+}
\ No newline at end of file
diff --git a/examples/demo-with-py-plugin/testcases/ref_testcase.yml b/examples/demo-with-py-plugin/testcases/ref_testcase.yml
index b904706f..e102b9ec 100644
--- a/examples/demo-with-py-plugin/testcases/ref_testcase.yml
+++ b/examples/demo-with-py-plugin/testcases/ref_testcase.yml
@@ -26,7 +26,7 @@ teststeps:
         headers:
             User-Agent: funplugin/${get_version()}
             Content-Type: "application/x-www-form-urlencoded"
-        data: "foo1=$foo1&foo2=$foo3"
+        body: "foo1=$foo1&foo2=$foo3"
     validate:
         - check: status_code
           assert: equal
diff --git a/examples/demo-with-py-plugin/testcases/requests.json b/examples/demo-with-py-plugin/testcases/requests.json
index 24d3d38d..162632b4 100644
--- a/examples/demo-with-py-plugin/testcases/requests.json
+++ b/examples/demo-with-py-plugin/testcases/requests.json
@@ -76,7 +76,7 @@
                     "User-Agent": "funplugin/${get_version()}",
                     "Content-Type": "text/plain"
                 },
-                "data": "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
+                "body": "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
             },
             "validate": [
                 {
@@ -105,7 +105,7 @@
                     "User-Agent": "funplugin/${get_version()}",
                     "Content-Type": "application/x-www-form-urlencoded"
                 },
-                "data": "foo1=$foo1&foo2=$foo2&foo3=$foo3"
+                "body": "foo1=$foo1&foo2=$foo2&foo3=$foo3"
             },
             "validate": [
                 {
diff --git a/examples/demo-with-py-plugin/testcases/requests.yml b/examples/demo-with-py-plugin/testcases/requests.yml
index a713830b..988c970f 100644
--- a/examples/demo-with-py-plugin/testcases/requests.yml
+++ b/examples/demo-with-py-plugin/testcases/requests.yml
@@ -54,7 +54,7 @@ teststeps:
         headers:
             User-Agent: funplugin/${get_version()}
             Content-Type: "text/plain"
-        data: "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
+        body: "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
     validate:
         - check: status_code
           assert: equal
@@ -74,7 +74,7 @@ teststeps:
         headers:
             User-Agent: funplugin/${get_version()}
             Content-Type: "application/x-www-form-urlencoded"
-        data: "foo1=$foo1&foo2=$foo2&foo3=$foo3"
+        body: "foo1=$foo1&foo2=$foo2&foo3=$foo3"
     validate:
         - check: status_code
           assert: equal
diff --git a/examples/demo-without-plugin/proj.json b/examples/demo-without-plugin/proj.json
new file mode 100644
index 00000000..80cc140d
--- /dev/null
+++ b/examples/demo-without-plugin/proj.json
@@ -0,0 +1,6 @@
+{
+    "project_name": "demo-without-plugin",
+    "project_path": "/Users/xxxxx/go/src/github.com/httprunner/httprunner/examples/demo-without-plugin",
+    "create_time": "2022-05-26T20:08:57.501166+08:00",
+    "hrp_version": "v4.1.0-beta"
+}
\ No newline at end of file
diff --git a/hrp/internal/scaffold/templates/testcases/demo_ref_api.json b/hrp/internal/scaffold/templates/testcases/demo_ref_api.json
index 8e69392f..7bc33c5e 100644
--- a/hrp/internal/scaffold/templates/testcases/demo_ref_api.json
+++ b/hrp/internal/scaffold/templates/testcases/demo_ref_api.json
@@ -8,16 +8,14 @@
             "app_version": "2.8.6"
         },
         "base_url": "https://postman-echo.com",
-        "herader": [
-            {
-                "Accept": "*/*",
-                "Accept-Encoding": "gzip, deflate, br",
-                "Cache-Control": "no-cache",
-                "Connection": "keep-alive",
-                "Host": "postman-echo.com",
-                "User-Agent": "PostmanRuntime/7.28.4"
-            }
-        ],
+        "headers": {
+            "Accept": "*/*",
+            "Accept-Encoding": "gzip, deflate, br",
+            "Cache-Control": "no-cache",
+            "Connection": "keep-alive",
+            "Host": "postman-echo.com",
+            "User-Agent": "PostmanRuntime/7.28.4"
+        },
         "verify": false,
         "export": [
             "session_token"
@@ -48,16 +46,16 @@
             },
             "validate": [
                 {
-                    "eq": [
-                        "status_code",
-                        200
-                    ]
+                    "check": "status_code",
+                    "assert": "equal",
+                    "expect": 200,
+                    "msg": "check status_code"
                 },
                 {
-                    "eq": [
-                        "body.headers.postman-token",
-                        "ea19464c-ddd4-4724-abe9-5e2b254c2723"
-                    ]
+                    "check": "body.headers.postman-token",
+                    "assert": "equal",
+                    "expect": "ea19464c-ddd4-4724-abe9-5e2b254c2723",
+                    "msg": "check body.headers.postman-token"
                 }
             ]
         },
diff --git a/hrp/internal/scaffold/templates/testcases/demo_ref_testcase.yml b/hrp/internal/scaffold/templates/testcases/demo_ref_testcase.yml
index b904706f..e102b9ec 100644
--- a/hrp/internal/scaffold/templates/testcases/demo_ref_testcase.yml
+++ b/hrp/internal/scaffold/templates/testcases/demo_ref_testcase.yml
@@ -26,7 +26,7 @@ teststeps:
         headers:
             User-Agent: funplugin/${get_version()}
             Content-Type: "application/x-www-form-urlencoded"
-        data: "foo1=$foo1&foo2=$foo3"
+        body: "foo1=$foo1&foo2=$foo3"
     validate:
         - check: status_code
           assert: equal
diff --git a/hrp/internal/scaffold/templates/testcases/demo_requests.json b/hrp/internal/scaffold/templates/testcases/demo_requests.json
index 24d3d38d..162632b4 100644
--- a/hrp/internal/scaffold/templates/testcases/demo_requests.json
+++ b/hrp/internal/scaffold/templates/testcases/demo_requests.json
@@ -76,7 +76,7 @@
                     "User-Agent": "funplugin/${get_version()}",
                     "Content-Type": "text/plain"
                 },
-                "data": "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
+                "body": "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
             },
             "validate": [
                 {
@@ -105,7 +105,7 @@
                     "User-Agent": "funplugin/${get_version()}",
                     "Content-Type": "application/x-www-form-urlencoded"
                 },
-                "data": "foo1=$foo1&foo2=$foo2&foo3=$foo3"
+                "body": "foo1=$foo1&foo2=$foo2&foo3=$foo3"
             },
             "validate": [
                 {
diff --git a/hrp/internal/scaffold/templates/testcases/demo_requests.yml b/hrp/internal/scaffold/templates/testcases/demo_requests.yml
index a713830b..988c970f 100644
--- a/hrp/internal/scaffold/templates/testcases/demo_requests.yml
+++ b/hrp/internal/scaffold/templates/testcases/demo_requests.yml
@@ -54,7 +54,7 @@ teststeps:
         headers:
             User-Agent: funplugin/${get_version()}
             Content-Type: "text/plain"
-        data: "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
+        body: "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
     validate:
         - check: status_code
           assert: equal
@@ -74,7 +74,7 @@ teststeps:
         headers:
             User-Agent: funplugin/${get_version()}
             Content-Type: "application/x-www-form-urlencoded"
-        data: "foo1=$foo1&foo2=$foo2&foo3=$foo3"
+        body: "foo1=$foo1&foo2=$foo2&foo3=$foo3"
     validate:
         - check: status_code
           assert: equal