HttpRunner 2.0 is comming!

1, new design for testcase format; 2, refactor testcase layer mechanism.
2026-05-11 18:11:21 +08:00 · 2018-11-22 19:20:30 +08:00
parent 82b527d8b2
commit 4099ade49d
31 changed files with 1500 additions and 1303 deletions
--- a/tests/data/bugfix_parameters.yml
+++ b/tests/data/bugfix_parameters.yml
@@ -18,7 +18,7 @@

 - test:
    name: get token with $user_agent, $app_version
-    api: get_token($user_agent, $device_sn, $os_platform, $app_version)
+    api: get_token
    extract:
        - token: content.token
    validate:
--- a/tests/data/demo_parameters.yml
+++ b/tests/data/demo_parameters.yml
@@ -6,20 +6,18 @@
            - ["test1","111111"]
            - ["test2","222222"]
    variables:
+        - username: test1
+        - user_agent: "iOS/10.1"
        - device_sn: ${gen_random_string(15)}
        - os_platform: 'ios'
        - app_version: 2.8.5
-    request:
-        base_url: ${get_base_url()}
-        headers:
-            Content-Type: application/json
-            device_sn: $device_sn
+    base_url: ${get_base_url()}
    output:
        - token

 - test:
    name: get token with $user_agent and $username
-    api: get_token($user_agent, $device_sn, $os_platform, $app_version)
+    api: get_token
    extract:
        - token: content.token
    validate:
--- a/tests/data/demo_testcase.yml
+++ b/tests/data/demo_testcase.yml
@@ -4,12 +4,11 @@
        - var_a: 0
        - var_c: "${sum_two(1, 2)}"
        - PROJECT_KEY: ${ENV(PROJECT_KEY)}
-    parameters:
-        - "var_a-var_b":
-            - [11, 21]
-            - [12, 22]
-        - "app_version": "${gen_app_version()}"
-    request: ${get_default_request()}
+    # parameters:
+    #     - "var_a-var_b":
+    #         - [11, 21]
+    #         - [12, 22]
+    #     - "app_version": "${gen_app_version()}"

 - test:
    name: testcase1-$var_a
--- a/tests/data/demo_testcase_functions.yml
+++ b/tests/data/demo_testcase_functions.yml
@@ -5,11 +5,7 @@
        - device_sn: ${gen_random_string(15)}
        - os_platform: 'ios'
        - app_version: '2.8.6'
-    request:
-        base_url: ${get_base_url()}
-        headers:
-            Content-Type: application/json
-            device_sn: $device_sn
+    base_url: ${get_base_url()}

 - test:
    name: get token
@@ -38,6 +34,8 @@
        url: /api/users/1000
        method: POST
        headers:
+            Content-Type: application/json
+            device_sn: $device_sn
            token: $token
        json:
            name: $user_name
@@ -52,6 +50,8 @@
        url: /api/users/1000
        method: POST
        headers:
+            Content-Type: application/json
+            device_sn: $device_sn
            token: $token
        json:
            name: "user1"
--- a/tests/data/demo_testcase_layer.yml
+++ b/tests/data/demo_testcase_layer.yml
@@ -5,17 +5,13 @@
        - device_sn: ${gen_random_string(15)}
        - os_platform: 'ios'
        - app_version: '2.8.6'
-    request:
-        base_url: ${get_base_url()}
-        headers:
-            Content-Type: application/json
-            device_sn: $device_sn
+    base_url: ${get_base_url()}
    output:
        - token

 - test:
    name: get token with $user_agent, $app_version
-    api: get_token($user_agent, $device_sn, $os_platform, $app_version)
+    api: get_token
    extract:
        - token: content.token
    validate:
@@ -25,14 +21,19 @@

 - test:
    name: reset all users
-    api: reset_all($token)
+    api: reset_all
+    variables:
+        - token: $token
    validate:
        - {"check": "status_code", "expect": 200}
        - {"check": "content.success", "expect": true}

 - test:
    name: get user that does not exist
-    api: get_user(1000, $token)
+    api: get_user
+    variables:
+        - uid: 1000
+        - token: $token
    validate:
        - {"check": "status_code", "expect": 404}
        - {"check": "content.success", "expect": false}
@@ -40,16 +41,21 @@
 - test:
    name: create user which does not exist
    variables:
+        - uid: 1000
        - user_name: "user1"
        - user_password: "123456"
-    api: create_user(1000, $user_name, $user_password, $token)
+        - token: $token
+    api: create_user
    validate:
        - {"check": "status_code", "expect": 201}
        - {"check": "content.success", "expect": true}

 - test:
    name: get user that has been created
-    api: get_user(1000, $token)
+    api: get_user
+    variables:
+        - uid: 1000
+        - token: $token
    validate:
        - {"check": "status_code", "expect": 200}
        - {"check": "content.success", "expect": true}
@@ -58,9 +64,11 @@
 - test:
    name: create user which exists
    variables:
+        - uid: 1000
        - user_name: "user1"
        - user_password: "123456"
-    api: create_user(1000, $user_name, $user_password, $token)
+        - token: $token
+    api: create_user
    validate:
        - {"check": "status_code", "expect": 500}
        - {"check": "content.success", "expect": false}
@@ -68,16 +76,21 @@
 - test:
    name: update user which exists
    variables:
+        - uid: 1000
        - user_name: "user1"
        - user_password: "654321"
-    api: update_user(1000, $user_name, $user_password, $token)
+        - token: $token
+    api: update_user
    validate:
        - {"check": "status_code", "expect": 200}
        - {"check": "content.success", "expect": true}

 - test:
    name: get user that has been updated
-    api: get_user(1000, $token)
+    api: get_user
+    variables:
+        - uid: 1000
+        - token: $token
    validate:
        - {"check": "status_code", "expect": 200}
        - {"check": "content.success", "expect": true}
@@ -85,21 +98,28 @@

 - test:
    name: get users
-    api: get_users($token)
+    api: get_users
+    variables:
+        - token: $token
    validate:
        - {"check": "status_code", "expect": 200}
        - {"check": "content.count", "expect": 1}

 - test:
    name: delete user that exists
-    api: delete_user(1000, $token)
+    api: delete_user
+    variables:
+        - uid: 1000
+        - token: $token
    validate:
        - {"check": "status_code", "expect": 200}
        - {"check": "content.success", "expect": true}

 - test:
    name: get users
-    api: get_users($token)
+    api: get_users
+    variables:
+        - token: $token
    validate:
        - {"check": "status_code", "expect": 200}
        - {"check": "content.count", "expect": 0}
@@ -107,16 +127,20 @@
 - test:
    name: create user which has been deleted
    variables:
+        - uid: 1000
        - user_name: "user1"
        - user_password: "123456"
-    api: create_user(1000, $user_name, $user_password, $token)
+        - token: $token
+    api: create_user
    validate:
        - {"check": "status_code", "expect": 201}
        - {"check": "content.success", "expect": true}

 - test:
    name: get users
-    api: get_users($token)
+    api: get_users
+    variables:
+        - token: $token
    validate:
        - {"check": "status_code", "expect": 200}
        - {"check": "content.count", "expect": 1}
--- a/tests/data/demo_testcase_variables.yml
+++ b/tests/data/demo_testcase_variables.yml
@@ -2,11 +2,7 @@
    name: "create user testcases."
    variables:
        - device_sn: 'HZfFBh6tU59EdXJ'
-    request:
-        base_url: ${get_base_url()}
-        headers:
-            Content-Type: application/json
-            device_sn: $device_sn
+    base_url: ${get_base_url()}

 - test:
    name: get token
@@ -41,6 +37,8 @@
        url: /api/users/1000
        method: POST
        headers:
+            Content-Type: application/json
+            device_sn: $device_sn
            token: $token
        json:
            name: $user_name
@@ -55,6 +53,8 @@
        url: /api/users/1000
        method: POST
        headers:
+            Content-Type: application/json
+            device_sn: $device_sn
            token: $token
        json:
            name: "user1"