change variable marker and function marker:

1, variable marker: ${var} => $var; 2, function marker: {'func': 'gen_random_string', 'args': [5]} => ${gen_random_string(5).
2026-06-13 19:59:37 +08:00 · 2017-07-04 16:45:01 +08:00
parent d941f3a3d5
commit 17bf07f012
11 changed files with 152 additions and 138 deletions
--- a/test/data/demo_binds.yml
+++ b/test/data/demo_binds.yml
@@ -7,15 +7,15 @@ register_variables:
 register_template_variables:
    variable_binds:
        - TOKEN: "debugtalk"
-        - token: ${TOKEN}
+        - token: $TOKEN

 bind_lambda_functions:
    function_binds:
        add_one: "lambda x: x + 1"
        add_two_nums: "lambda x, y: x + y"
    variable_binds:
-        - add1: {"func": "add_one", "args": [2]}
-        - sum2nums: {"func": "add_two_nums", "args": [2, 3]}
+        - add1: ${add_one(2)}
+        - sum2nums: ${add_two_nums(2, 3)}

 bind_lambda_functions_with_import:
    requires:
@@ -27,9 +27,9 @@ bind_lambda_functions_with_import:
        gen_md5: "lambda *str_args: hashlib.md5(''.join(str_args).encode('utf-8')).hexdigest()"
    variable_binds:
        - TOKEN: debugtalk
-        - random: {"func": "gen_random_string", "args": [5]}
+        - random: ${gen_random_string(5)}
        - data: "{'name': 'user', 'password': '123456'}"
-        - authorization: {"func": "gen_md5", "args": ["${TOKEN}", "${data}", "${random}"]}
+        - authorization: ${gen_md5($TOKEN, $data, $random)}

 bind_module_functions:
    function_binds:
@@ -37,6 +37,6 @@ bind_module_functions:
            - test.data.custom_functions
    variable_binds:
        - TOKEN: debugtalk
-        - random: {"func": "gen_random_string", "args": [5]}
+        - random: ${gen_random_string(5)}
        - data: "{'name': 'user', 'password': '123456'}"
-        - authorization: {"func": "gen_md5", "args": ["${TOKEN}", "${data}", "${random}"]}
+        - authorization: ${gen_md5($TOKEN, $data, $random)}
--- a/test/data/demo_import_functions.yml
+++ b/test/data/demo_import_functions.yml
@@ -4,9 +4,9 @@
        - test.data.custom_functions
    variable_binds:
        - TOKEN: debugtalk
-        - json: {"name": "user", "password": "123456"}
-        - random: {"func": "gen_random_string", "args": [5]}
-        - authorization: {"func": "gen_md5", "args": ["${TOKEN}", "${json}", "${random}"]}
+        - json: {}
+        - random: ${gen_random_string(5)}
+        - authorization: ${gen_md5($TOKEN, $json, $random)}

 - test:
    name: create user which does not exist
@@ -17,9 +17,9 @@
        method: POST
        headers:
            Content-Type: application/json
-            authorization: "${authorization}"
-            random: "${random}"
-        json: "${json}"
+            authorization: $authorization
+            random: $random
+        json: $json
    validators:
        - {"check": "status_code", "comparator": "eq", "expected": 201}
        - {"check": "content.success", "comparator": "eq", "expected": true}
@@ -33,9 +33,9 @@
        method: POST
        headers:
            Content-Type: application/json
-            authorization: "${authorization}"
-            random: "${random}"
-        json: "${json}"
+            authorization: $authorization
+            random: $random
+        json: $json
    validators:
        - {"check": "status_code", "comparator": "eq", "expected": 500}
        - {"check": "content.success", "comparator": "eq", "expected": false}
--- a/test/data/demo_template_separate.yml
+++ b/test/data/demo_template_separate.yml
@@ -10,17 +10,17 @@
        gen_md5: "lambda *str_args: hashlib.md5(''.join(str_args).encode('utf-8')).hexdigest()"
    variable_binds:
        - TOKEN: debugtalk
-        - random: {"func": "gen_random_string", "args": [5]}
+        - random: ${gen_random_string(5)}
        - data: '{"name": "user", "password": "123456"}'
-        - authorization: {"func": "gen_md5", "args": ["${TOKEN}", "${data}", "${random}"]}
+        - authorization: ${gen_md5($TOKEN, $data, $random)}
    request:
        url: http://127.0.0.1:5000/api/users/1000
        method: POST
        headers:
            Content-Type: application/json
-            authorization: "${authorization}"
-            random: "${random}"
-        data: "${data}"
+            authorization: $authorization
+            random: $random
+        data: $data
    validators:
        - {"check": "status_code", "comparator": "eq", "expected": 201}
        - {"check": "content.success", "comparator": "eq", "expected": true}
@@ -36,17 +36,17 @@
        gen_md5: "lambda *str_args: hashlib.md5(''.join(str_args).encode('utf-8')).hexdigest()"
    variable_binds:
        - TOKEN: debugtalk
-        - random: {"func": "gen_random_string", "args": [5]}
+        - random: ${gen_random_string(5)}
        - data: '{"name": "user", "password": "123456"}'
-        - authorization: {"func": "gen_md5", "args": ["${TOKEN}", "${data}", "${random}"]}
+        - authorization: ${gen_md5($TOKEN, $data, $random)}
    request:
        url: http://127.0.0.1:5000/api/users/1000
        method: POST
        headers:
            Content-Type: application/json
-            authorization: "${authorization}"
-            random: "${random}"
-        data: "${data}"
+            authorization: $authorization
+            random: $random
+        data: $data
    validators:
        - {"check": "status_code", "comparator": "eq", "expected": 500}
        - {"check": "content.success", "comparator": "eq", "expected": false}
--- a/test/data/demo_template_sets.yml
+++ b/test/data/demo_template_sets.yml
@@ -10,8 +10,8 @@
    variable_binds:
        - TOKEN: debugtalk
        - data: ""
-        - random: {"func": "gen_random_string", "args": [5]}
-        - authorization: {"func": "gen_md5", "args": ["${TOKEN}", "${data}", "${random}"]}
+        - random: ${gen_random_string(5)}
+        - authorization: ${gen_md5($TOKEN, $data, $random)}
    request:
        base_url: http://127.0.0.1:5000

@@ -24,9 +24,9 @@
        method: POST
        headers:
            Content-Type: application/json
-            authorization: "${authorization}"
-            random: "${random}"
-        data: "${data}"
+            authorization: $authorization
+            random: $random
+        data: $data
    validators:
        - {"check": "status_code", "comparator": "eq", "expected": 201}
        - {"check": "content.success", "comparator": "eq", "expected": true}
@@ -41,9 +41,9 @@
        method: POST
        headers:
            Content-Type: application/json
-            authorization: "${authorization}"
-            random: "${random}"
-        data: "${data}"
+            authorization: $authorization
+            random: $random
+        data: $data
    validators:
        - {"check": "status_code", "comparator": "eq", "expected": 500}
        - {"check": "content.success", "comparator": "eq", "expected": false}
--- a/test/test_context.py
+++ b/test/test_context.py
@@ -43,7 +43,7 @@ class VariableBindsUnittest(unittest.TestCase):
        testcase1 = {
            "variable_binds": [
                {"GLOBAL_TOKEN": "debugtalk"},
-                {"token": "${GLOBAL_TOKEN}"}
+                {"token": "$GLOBAL_TOKEN"}
            ]
        }
        testcase2 = self.testcases["register_template_variables"]
@@ -65,8 +65,8 @@ class VariableBindsUnittest(unittest.TestCase):
                "add_two_nums": lambda x, y: x + y
            },
            "variable_binds": [
-                {"add1": {"func": "add_one", "args": [2]}},
-                {"sum2nums": {"func": "add_two_nums", "args": [2, 3]}}
+                {"add1": "${add_one(2)}"},
+                {"sum2nums": "${add_two_nums(2,3)}"}
            ]
        }
        testcase2 = self.testcases["bind_lambda_functions"]
@@ -93,9 +93,9 @@ class VariableBindsUnittest(unittest.TestCase):
            },
            "variable_binds": [
                {"TOKEN": "debugtalk"},
-                {"random": {"func": "gen_random_string", "args": [5]}},
+                {"random": "${gen_random_string(5)}"},
                {"data": '{"name": "user", "password": "123456"}'},
-                {"authorization": {"func": "gen_md5", "args": ["${TOKEN}", "${data}", "${random}"]}}
+                {"authorization": "${gen_md5($TOKEN, $data, $random)}"}
            ]
        }
        testcase2 = self.testcases["bind_lambda_functions_with_import"]
@@ -130,9 +130,9 @@ class VariableBindsUnittest(unittest.TestCase):
            "import_module_functions": ["test.data.custom_functions"],
            "variable_binds": [
                {"TOKEN": "debugtalk"},
-                {"random": {"func": "gen_random_string", "args": [5]}},
+                {"random": "${gen_random_string(5)}"},
                {"data": '{"name": "user", "password": "123456"}'},
-                {"authorization": {"func": "gen_md5", "args": ["${TOKEN}", "${data}", "${random}"]}}
+                {"authorization": "${gen_md5($TOKEN, $data, $random)}"}
            ]
        }
        testcase2 = self.testcases["bind_module_functions"]
@@ -165,19 +165,19 @@ class VariableBindsUnittest(unittest.TestCase):
            "import_module_functions": ["test.data.custom_functions"],
            "variable_binds": [
                {"TOKEN": "debugtalk"},
-                {"random": {"func": "gen_random_string", "args": [5]}},
+                {"random": "${gen_random_string(5)}"},
                {"data": '{"name": "user", "password": "123456"}'},
-                {"authorization": {"func": "gen_md5", "args": ["${TOKEN}", "${data}", "${random}"]}}
+                {"authorization": "${gen_md5($TOKEN, $data, $random)}"}
            ],
            "request": {
                "url": "http://127.0.0.1:5000/api/users/1000",
                "method": "POST",
                "headers": {
                    "Content-Type": "application/json",
-                    "authorization": "${authorization}",
-                    "random": "${random}"
+                    "authorization": "$authorization",
+                    "random": "$random"
                },
-                "data": "${data}"
+                "data": "$data"
            }
        }
        test_runner.init_config(testcase, level="testcase")
@@ -194,14 +194,14 @@ class VariableBindsUnittest(unittest.TestCase):
            "str_1": "str_value1",
            "str_2": "str_value2"
        }
-        self.assertEqual(self.context.get_eval_value("${str_1}"), "str_value1")
-        self.assertEqual(self.context.get_eval_value("${str_2}"), "str_value2")
+        self.assertEqual(self.context.get_eval_value("$str_1"), "str_value1")
+        self.assertEqual(self.context.get_eval_value("$str_2"), "str_value2")
        self.assertEqual(
-            self.context.get_eval_value(["${str_1}", "str3"]),
+            self.context.get_eval_value(["$str_1", "str3"]),
            ["str_value1", "str3"]
        )
        self.assertEqual(
-            self.context.get_eval_value({"key": "${str_1}"}),
+            self.context.get_eval_value({"key": "$str_1"}),
            {"key": "str_value1"}
        )

@@ -209,6 +209,10 @@ class VariableBindsUnittest(unittest.TestCase):
        self.context.testcase_config["functions"]["gen_random_string"] = \
            lambda str_len: ''.join(random.choice(string.ascii_letters + string.digits) \
                for _ in range(str_len))
-        result = self.context.get_eval_value(
-            {"func": "gen_random_string", "args": [5]})
+        result = self.context.get_eval_value("${gen_random_string(5)}")
        self.assertEqual(len(result), 5)
+
+        add_two_nums = lambda a, b=1: a + b
+        self.context.testcase_config["functions"]["add_two_nums"] = add_two_nums
+        self.assertEqual(self.context.get_eval_value("${add_two_nums(1)}"), 2)
+        self.assertEqual(self.context.get_eval_value("${add_two_nums(1, 2)}"), 3)
--- a/test/test_testcase.py
+++ b/test/test_testcase.py
@@ -1,6 +1,6 @@
 import unittest

-from ate.testcase import parse_template
+from ate.testcase import parse_template, parse_content_with_variables
 from ate import exception


@@ -22,22 +22,22 @@ class TestcaseParserUnittest(unittest.TestCase):
    def test_parse_testcase_template(self):
        testcase = {
            "request": {
-                "url": "http://127.0.0.1:5000/api/users/${uid}",
+                "url": "http://127.0.0.1:5000/api/users/$uid",
                "method": "POST",
                "headers": {
                    "Content-Type": "application/json",
-                    "authorization": "${authorization}",
-                    "random": "${random}"
+                    "authorization": "$authorization",
+                    "random": "$random"
                },
-                "body": "${json}"
+                "body": "$json"
            },
            "response": {
-                "status_code": "${expected_status}",
+                "status_code": "$expected_status",
                "headers": {
                    "Content-Type": "application/json"
                },
                "body": {
-                    "success": "${expected_success}",
+                    "success": "$expected_success",
                    "msg": "user created successfully."
                }
            }
@@ -72,8 +72,8 @@ class TestcaseParserUnittest(unittest.TestCase):
    def test_parse_testcase_template_miss_bind_variable(self):
        testcase = {
            "request": {
-                "url": "http://127.0.0.1:5000/api/users/${uid}",
-                "method": "${method}"
+                "url": "http://127.0.0.1:5000/api/users/$uid",
+                "method": "$method"
            }
        }
        with self.assertRaises(exception.ParamsError):
@@ -82,8 +82,8 @@ class TestcaseParserUnittest(unittest.TestCase):
    def test_parse_testcase_with_new_variable_binds(self):
        testcase = {
            "request": {
-                "url": "http://127.0.0.1:5000/api/users/${uid}",
-                "method": "${method}"
+                "url": "http://127.0.0.1:5000/api/users/$uid",
+                "method": "$method"
            }
        }
        new_variable_binds = {
@@ -96,3 +96,25 @@ class TestcaseParserUnittest(unittest.TestCase):
            parsed_testcase["request"]["method"],
            new_variable_binds["method"]
        )
+
+    def test_parse_content_with_variables(self):
+        content = "$var"
+        variables_binds = {
+            "var": "abc"
+        }
+        result = parse_content_with_variables(content, variables_binds)
+        self.assertEqual(result, "abc")
+
+        content = "123$var/456"
+        variables_binds = {
+            "var": "abc"
+        }
+        result = parse_content_with_variables(content, variables_binds)
+        self.assertEqual(result, "123abc/456")
+
+        content = "$var1"
+        variables_binds = {
+            "var2": "abc"
+        }
+        with self.assertRaises(exception.ParamsError):
+            parse_content_with_variables(content, variables_binds)
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -115,28 +115,6 @@ class TestUtils(ApiServerUnittest):
        testset_list_3 = utils.load_testcases_by_path(path)
        self.assertEqual(testset_list_3, [])

-    def test_parse_content_with_variables(self):
-        content = "${var}"
-        variables_binds = {
-            "var": "abc"
-        }
-        result = utils.parse_content_with_variables(content, variables_binds)
-        self.assertEqual(result, "abc")
-
-        content = "123${var}456"
-        variables_binds = {
-            "var": "abc"
-        }
-        result = utils.parse_content_with_variables(content, variables_binds)
-        self.assertEqual(result, "123abc456")
-
-        content = "${var1}"
-        variables_binds = {
-            "var2": "abc"
-        }
-        with self.assertRaises(exception.ParamsError):
-            utils.parse_content_with_variables(content, variables_binds)
-
    def test_is_variable(self):
        content = "$var"
        self.assertTrue(utils.is_variable(content))