refactor: add extract_binds and validators

test/data/demo_template_separate.yml

@@ -13,7 +13,6 @@
         - random: {"func": "gen_random_string", "args": [5]}
         - data: '{"name": "user", "password": "123456"}'
         - authorization: {"func": "gen_md5", "args": ["${TOKEN}", "${data}", "${random}"]}
-        - expected_status_code: 201
     request:
         url: http://127.0.0.1:5000/api/users/1000
         method: POST
@@ -22,13 +21,12 @@
             authorization: "${authorization}"
             random: "${random}"
         data: "${data}"
-    response:
-        status_code: "${expected_status_code}"
-        headers:
-            Content-Type: application/json
-        body:
-            success: true
-            msg: user created successfully.
+    extract_binds:
+        resp_status_code: status_code
+        resp_body_success: content.success
+    validators:
+        resp_status_code: {"comparator": "eq", "expected": 201}
+        resp_body_success: {"comparator": "eq", "expected": true}
 
 - test:
     name: create user which does not exist
@@ -44,7 +42,6 @@
         - random: {"func": "gen_random_string", "args": [5]}
         - data: '{"name": "user", "password": "123456"}'
         - authorization: {"func": "gen_md5", "args": ["${TOKEN}", "${data}", "${random}"]}
-        - expected_status_code: 500
     request:
         url: http://127.0.0.1:5000/api/users/1000
         method: POST
@@ -53,10 +50,9 @@
             authorization: "${authorization}"
             random: "${random}"
         data: "${data}"
-    response:
-        status_code: "${expected_status_code}"
-        headers:
-            Content-Type: application/json
-        body:
-            success: false
-            msg: user already existed.
+    extract_binds:
+        resp_status_code: status_code
+        resp_body_success: content.success
+    validators:
+        resp_status_code: {"comparator": "eq", "expected": 500}
+        resp_body_success: {"comparator": "eq", "expected": false}

test/data/demo_template_sets.yml

@@ -17,7 +17,6 @@
     name: create user which does not exist
     variable_binds:
         - data: '{"name": "user", "password": "123456"}'
-        - expected_status_code: 201
     request:
         url: http://127.0.0.1:5000/api/users/1000
         method: POST
@@ -26,13 +25,12 @@
             authorization: "${authorization}"
             random: "${random}"
         data: "${data}"
-    response:
-        status_code: "${expected_status_code}"
-        headers:
-            Content-Type: application/json
-        body:
-            success: true
-            msg: user created successfully.
+    extract_binds:
+        resp_status_code: status_code
+        resp_body_success: content.success
+    validators:
+        resp_status_code: {"comparator": "eq", "expected": 201}
+        resp_body_success: {"comparator": "eq", "expected": true}
 
 - test:
     name: create user which does not exist
@@ -47,10 +45,9 @@
             authorization: "${authorization}"
             random: "${random}"
         data: "${data}"
-    response:
-        status_code: "${expected_status_code}"
-        headers:
-            Content-Type: application/json
-        body:
-            success: false
-            msg: user already existed.
+    extract_binds:
+        resp_status_code: status_code
+        resp_body_success: content.success
+    validators:
+        resp_status_code: {"comparator": "eq", "expected": 500}
+        resp_body_success: {"comparator": "eq", "expected": false}

test/data/simple_demo_auth_hardcode.json

@@ -15,15 +15,14 @@
                     "password": "123456"
                 }
             },
-            "response": {
-                "status_code": 201,
-                "headers": {
-                    "Content-Type": "application/json"
-                },
-                "body": {
-                    "success": true,
-                    "msg": "user created successfully."
-                }
+            "extract_binds": {
+                "resp_status_code": "status_code",
+                "resp_body_success": "content.success",
+                "resp_body_msg": "content.msg"
+            },
+            "validators": {
+                "resp_status_code": {"comparator": "eq", "expected": 201},
+                "resp_body_success": {"comparator": "eq", "expected": true}
             }
         }
     },
@@ -43,15 +42,13 @@
                     "password": "123456"
                 }
             },
-            "response": {
-                "status_code": 500,
-                "headers": {
-                    "Content-Type": "application/json"
-                },
-                "body":{
-                    "success": false,
-                    "msg": "user already existed."
-                }
+            "extract_binds": {
+                "resp_status_code": "status_code",
+                "resp_body_success": "content.success"
+            },
+            "validators": {
+                "resp_status_code": {"comparator": "eq", "expected": 500},
+                "resp_body_success": {"comparator": "eq", "expected": false}
             }
         }
     }

test/data/simple_demo_auth_hardcode.yml

@@ -10,13 +10,13 @@
         json:
             name: "user1"
             password: "123456"
-    response:
-        status_code: 201
-        headers:
-            Content-Type: application/json
-        body:
-            success: true
-            msg: user created successfully.
+    extract_binds:
+        resp_status_code: status_code
+        resp_body_success: content.success
+        resp_body_msg: content.msg
+    validators:
+        resp_status_code: {"comparator": "eq", "expected": 201}
+        resp_body_success: {"comparator": "eq", "expected": true}
 
 - test:
     name: create user which existed
@@ -30,10 +30,9 @@
         json:
             name: "user1"
             password: "123456"
-    response:
-        status_code: 500
-        headers:
-            Content-Type: application/json
-        body:
-            success: false
-            msg: user already existed.
+    extract_binds:
+        resp_status_code: status_code
+        resp_body_success: content.success
+    validators:
+        resp_status_code: {"comparator": "eq", "expected": 500}
+        resp_body_success: {"comparator": "eq", "expected": false}

test/data/simple_demo_no_auth.json

@@ -14,15 +14,14 @@
                     "password": "123456"
                 }
             },
-            "response": {
-                "status_code": 201,
-                "headers": {
-                    "Content-Type": "application/json"
-                },
-                "body": {
-                    "success": true,
-                    "msg": "user created successfully."
-                }
+            "extract_binds": {
+                "resp_status_code": "status_code",
+                "resp_body_success": "content.success",
+                "resp_body_msg": "content.msg"
+            },
+            "validators": {
+                "resp_status_code": {"comparator": "eq", "expected": 201},
+                "resp_body_success": {"comparator": "eq", "expected": true}
             }
         }
     },
@@ -40,15 +39,13 @@
                     "password": "123456"
                 }
             },
-            "response": {
-                "status_code": 500,
-                "headers": {
-                    "Content-Type": "application/json"
-                },
-                "body":{
-                    "success": false,
-                    "msg": "user already existed."
-                }
+            "extract_binds": {
+                "resp_status_code": "status_code",
+                "resp_body_success": "content.success"
+            },
+            "validators": {
+                "resp_status_code": {"comparator": "eq", "expected": 500},
+                "resp_body_success": {"comparator": "eq", "expected": false}
             }
         }
     }

test/data/simple_demo_no_auth.yml

@@ -8,13 +8,14 @@
         json:
             name: user1
             password: 123456
-    response:
-        status_code: 201
-        headers:
-            Content-Type: application/json
-        body:
-            success: true
-            msg: user created successfully.
+    extract_binds:
+        resp_status_code: status_code
+        resp_body_success: content.success
+        resp_headers_content_type: headers.content-type
+    validators:
+        resp_status_code: {"comparator": "eq", "expected": 201}
+        resp_headers_content_type: {"comparator": "eq", "expected": "application/json"}
+        resp_body_success: {"comparator": "eq", "expected": true}
 
 - test:
     name: create user which existed
@@ -26,10 +27,11 @@
         json:
             name: user1
             password: 123456
-    response:
-        status_code: 500
-        headers:
-            Content-Type: application/json
-        body:
-            success: false
-            msg: user already existed.
+    extract_binds:
+        resp_status_code: status_code
+        resp_body_success: content.success
+        resp_headers_content_type: headers.content-type
+    validators:
+        resp_status_code: {"comparator": "eq", "expected": 500}
+        resp_headers_content_type: {"comparator": "eq", "expected": "application/json"}
+        resp_body_success: {"comparator": "eq", "expected": false}