make variables in testcase template compatible with mapping style:

new mapping style: "variables": { "a": 1, "b": 2 } Also, the former list style is still valid: "variables": [ {"a": 1}, {"b": 2} ]
2026-05-11 18:11:21 +08:00 · 2018-11-28 12:11:50 +08:00
parent fd69d1faf0
commit 2ec2d3c2d8
20 changed files with 141 additions and 142 deletions
--- a/tests/data/bugfix_parameters.yml
+++ b/tests/data/bugfix_parameters.yml
@@ -2,10 +2,10 @@
 - config:
    name: "user management testcase."
    variables:
-        - user_agent: 'iOS/10.3'
-        - device_sn: ${gen_random_string(15)}
-        - os_platform: 'ios'
-        - app_version: '2.8.6'
+        user_agent: 'iOS/10.3'
+        device_sn: ${gen_random_string(15)}
+        os_platform: 'ios'
+        app_version: '2.8.6'
    parameters:
        - user_agent: ['iOS', 'android']
    request:
--- a/tests/data/demo_binds.yml
+++ b/tests/data/demo_binds.yml
@@ -1,10 +1,10 @@
 bind_variables:
    variables:
-        - TOKEN: "debugtalk"
-        - token: $TOKEN
+        TOKEN: "debugtalk"
+        token: $TOKEN

 builtin_functions:
    variables:
-        - length: ${len(debugtalk)}
-        - smallest: ${min(2, 3, 8)}
-        - largest: ${max(2, 3, 8)}
+        length: ${len(debugtalk)}
+        smallest: ${min(2, 3, 8)}
+        largest: ${max(2, 3, 8)}
--- a/tests/data/demo_parameters.yml
+++ b/tests/data/demo_parameters.yml
@@ -1,16 +1,16 @@
 - config:
    name: "user management testcase."
    parameters:
-        - user_agent: ["iOS/10.1", "iOS/10.2", "iOS/10.3"]
-        - username-password:
+        user_agent: ["iOS/10.1", "iOS/10.2", "iOS/10.3"]
+        username-password:
            - ["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
+        username: test1
+        user_agent: "iOS/10.1"
+        device_sn: ${gen_random_string(15)}
+        os_platform: 'ios'
+        app_version: 2.8.5
    base_url: ${get_base_url()}
    output:
        - token
--- a/tests/data/demo_testcase.yml
+++ b/tests/data/demo_testcase.yml
@@ -1,9 +1,9 @@
 - config:
    name: "123$var_a"
    variables:
-        - var_a: 0
-        - var_c: "${sum_two(1, 2)}"
-        - PROJECT_KEY: ${ENV(PROJECT_KEY)}
+        var_a: 0
+        var_c: "${sum_two(1, 2)}"
+        PROJECT_KEY: ${ENV(PROJECT_KEY)}
    # parameters:
    #     - "var_a-var_b":
    #         - [11, 21]
--- a/tests/data/demo_testcase_cli.yml
+++ b/tests/data/demo_testcase_cli.yml
@@ -12,8 +12,8 @@
        json:
            sign: f1219719911caae89ccc301679857ebfda115ca2
    variables:
-        - expect_status_code: 200
-        - token_len: 16
+        expect_status_code: 200
+        token_len: 16
    extract:
        - token: content.token
    validate:
--- a/tests/data/demo_testcase_functions.yml
+++ b/tests/data/demo_testcase_functions.yml
@@ -1,10 +1,10 @@
 - config:
    name: "create user testcases."
    variables:
-        - user_agent: 'iOS/10.3'
-        - device_sn: ${gen_random_string(15)}
-        - os_platform: 'ios'
-        - app_version: '2.8.6'
+        user_agent: 'iOS/10.3'
+        device_sn: ${gen_random_string(15)}
+        os_platform: 'ios'
+        app_version: '2.8.6'
    base_url: ${get_base_url()}

 - test:
@@ -28,8 +28,8 @@
 - test:
    name: create user which does not exist
    variables:
-        - user_name: "user1"
-        - user_password: "123456"
+        user_name: "user1"
+        user_password: "123456"
    request:
        url: /api/users/1000
        method: POST
--- a/tests/data/demo_testcase_hardcode.yml
+++ b/tests/data/demo_testcase_hardcode.yml
@@ -12,8 +12,8 @@
        json:
            sign: f1219719911caae89ccc301679857ebfda115ca2
    variables:
-        - expect_status_code: 200
-        - token_len: 16
+        expect_status_code: 200
+        token_len: 16
    extract:
        - token: content.token
    validate:
--- a/tests/data/demo_testcase_layer.yml
+++ b/tests/data/demo_testcase_layer.yml
@@ -1,10 +1,10 @@
 - config:
    name: "user management testcase."
    variables:
-        - user_agent: 'iOS/10.3'
-        - device_sn: ${gen_random_string(15)}
-        - os_platform: 'ios'
-        - app_version: '2.8.6'
+        user_agent: 'iOS/10.3'
+        device_sn: ${gen_random_string(15)}
+        os_platform: 'ios'
+        app_version: '2.8.6'
    base_url: ${get_base_url()}
    output:
        - token
@@ -23,7 +23,7 @@
    name: reset all users
    api: reset_all
    variables:
-        - token: $token
+        token: $token
    validate:
        - {"check": "status_code", "expect": 200}
        - {"check": "content.success", "expect": true}
@@ -32,8 +32,8 @@
    name: get user that does not exist
    api: get_user
    variables:
-        - uid: 1000
-        - token: $token
+        uid: 1000
+        token: $token
    validate:
        - {"check": "status_code", "expect": 404}
        - {"check": "content.success", "expect": false}
@@ -41,10 +41,10 @@
 - test:
    name: create user which does not exist
    variables:
-        - uid: 1000
-        - user_name: "user1"
-        - user_password: "123456"
-        - token: $token
+        uid: 1000
+        user_name: "user1"
+        user_password: "123456"
+        token: $token
    api: create_user
    validate:
        - {"check": "status_code", "expect": 201}
@@ -54,8 +54,8 @@
    name: get user that has been created
    api: get_user
    variables:
-        - uid: 1000
-        - token: $token
+        uid: 1000
+        token: $token
    validate:
        - {"check": "status_code", "expect": 200}
        - {"check": "content.success", "expect": true}
@@ -64,10 +64,10 @@
 - test:
    name: create user which exists
    variables:
-        - uid: 1000
-        - user_name: "user1"
-        - user_password: "123456"
-        - token: $token
+        uid: 1000
+        user_name: "user1"
+        user_password: "123456"
+        token: $token
    api: create_user
    validate:
        - {"check": "status_code", "expect": 500}
@@ -76,10 +76,10 @@
 - test:
    name: update user which exists
    variables:
-        - uid: 1000
-        - user_name: "user1"
-        - user_password: "654321"
-        - token: $token
+        uid: 1000
+        user_name: "user1"
+        user_password: "654321"
+        token: $token
    api: update_user
    validate:
        - {"check": "status_code", "expect": 200}
@@ -89,8 +89,8 @@
    name: get user that has been updated
    api: get_user
    variables:
-        - uid: 1000
-        - token: $token
+        uid: 1000
+        token: $token
    validate:
        - {"check": "status_code", "expect": 200}
        - {"check": "content.success", "expect": true}
@@ -100,7 +100,7 @@
    name: get users
    api: get_users
    variables:
-        - token: $token
+        token: $token
    validate:
        - {"check": "status_code", "expect": 200}
        - {"check": "content.count", "expect": 1}
@@ -109,8 +109,8 @@
    name: delete user that exists
    api: delete_user
    variables:
-        - uid: 1000
-        - token: $token
+        uid: 1000
+        token: $token
    validate:
        - {"check": "status_code", "expect": 200}
        - {"check": "content.success", "expect": true}
@@ -119,7 +119,7 @@
    name: get users
    api: get_users
    variables:
-        - token: $token
+        token: $token
    validate:
        - {"check": "status_code", "expect": 200}
        - {"check": "content.count", "expect": 0}
@@ -127,10 +127,10 @@
 - test:
    name: create user which has been deleted
    variables:
-        - uid: 1000
-        - user_name: "user1"
-        - user_password: "123456"
-        - token: $token
+        uid: 1000
+        user_name: "user1"
+        user_password: "123456"
+        token: $token
    api: create_user
    validate:
        - {"check": "status_code", "expect": 201}
@@ -140,7 +140,7 @@
    name: get users
    api: get_users
    variables:
-        - token: $token
+        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
@@ -1,16 +1,16 @@
 - config:
    name: "create user testcases."
    variables:
-        - device_sn: 'HZfFBh6tU59EdXJ'
+        device_sn: 'HZfFBh6tU59EdXJ'
    base_url: ${get_base_url()}

 - test:
    name: get token
    variables:
-        - user_agent: 'iOS/10.3'
-        - os_platform: 'ios'
-        - app_version: '2.8.6'
-        - sign: f1219719911caae89ccc301679857ebfda115ca2
+        user_agent: 'iOS/10.3'
+        os_platform: 'ios'
+        app_version: '2.8.6'
+        sign: f1219719911caae89ccc301679857ebfda115ca2
    request:
        url: /api/get-token
        method: POST
@@ -31,8 +31,8 @@
 - test:
    name: create user which does not exist
    variables:
-        - user_name: "user1"
-        - user_password: "123456"
+        user_name: "user1"
+        user_password: "123456"
    request:
        url: /api/users/1000
        method: POST