restructure code: move code related to testcase from ate/utils.py to ate/testcase.py

ate/utils.py

@@ -1,4 +1,3 @@
-import ast
 import hashlib
 import hmac
 import json
@@ -18,8 +17,6 @@ except NameError:
     PYTHON_VERSION = 3
 
 SECRET_KEY = "DebugTalk"
-variable_regexp = r"\$([\w_]+)"
-function_regexp = re.compile(r"^\$\{([\w_]+)\(([\$\w_ =,]*)\)\}$")
 
 def gen_random_string(str_len):
     return ''.join(
@@ -117,114 +114,6 @@ def load_testcases_by_path(path):
     else:
         return []
 
-def get_contain_variables(content):
-    """ extract all variable names from content, which is in format $variable
-    @param (str) content
-    @return (list) variable name list
-
-    e.g. $variable => ["variable"]
-         /blog/$postid => ["postid"]
-         /$var1/$var2 => ["var1", "var2"]
-         abc => []
-    """
-    return re.findall(variable_regexp, content)
-
-def parse_variables(content, variable_mapping):
-    """ replace all variables of string content with mapping value.
-    @param (str) content
-    @return (str) parsed content
-
-    e.g.
-        variable_mapping = {
-            "var_1": "abc",
-            "var_2": "def"
-        }
-        $var_1 => "abc"
-        $var_1#XYZ => "abc#XYZ"
-        /$var_1/$var_2/var3 => "/abc/def/var3"
-        ${func($var_1, $var_2, xyz)} => "${func(abc, def, xyz)}"
-    """
-    variable_name_list = get_contain_variables(content)
-    for variable_name in variable_name_list:
-        variable_value = variable_mapping.get(variable_name)
-        if variable_value is None:
-            raise ParamsError(
-                "%s is not defined in bind variables!" % variable_name)
-
-        if "${}".format(variable_name) == content:
-            # content is a variable
-            content = variable_value
-        else:
-            # content contains one or many variables
-            content = content.replace(
-                "${}".format(variable_name),
-                str(variable_value)
-            )
-
-    return content
-
-def is_functon(content):
-    """ check if content is a function, which is in format ${func()}
-    @param (str) content
-    @return (bool) True or False
-
-    e.g. ${func()} => True
-         ${func(5)} => True
-         ${func(1, 2)} => True
-         ${func(a=1, b=2)} => True
-         $abc => False
-         abc => False
-    """
-    matched = function_regexp.match(content)
-    return True if matched else False
-
-def parse_string_value(str_value):
-    """ parse string to number if possible
-    e.g. "123" => 123
-         "12.2" => 12.3
-         "abc" => "abc"
-         "$var" => "$var"
-    """
-    try:
-        return ast.literal_eval(str_value)
-    except ValueError:
-        return str_value
-    except SyntaxError:
-        # e.g. $var, ${func}
-        return str_value
-
-def parse_function(content):
-    """ parse function name and args from string content.
-    @param (str) content
-    @return (dict) function name and args
-
-    e.g. ${func()} => {'func_name': 'func', 'args': [], 'kwargs': {}}
-         ${func(5)} => {'func_name': 'func', 'args': [5], 'kwargs': {}}
-         ${func(1, 2)} => {'func_name': 'func', 'args': [1, 2], 'kwargs': {}}
-         ${func(a=1, b=2)} => {'func_name': 'func', 'args': [], 'kwargs': {'a': 1, 'b': 2}}
-         ${func(1, 2, a=3, b=4)} => {'func_name': 'func', 'args': [1, 2], 'kwargs': {'a':3, 'b':4}}
-    """
-    function_meta = {
-        "args": [],
-        "kwargs": {}
-    }
-    matched = function_regexp.match(content)
-    function_meta["func_name"] = matched.group(1)
-
-    args_str = matched.group(2).replace(" ", "")
-    if args_str == "":
-        return function_meta
-
-    args_list = args_str.split(',')
-    for arg in args_list:
-        if '=' in arg:
-            key, value = arg.split('=')
-            function_meta["kwargs"][key] = parse_string_value(value)
-        else:
-            function_meta["args"].append(parse_string_value(arg))
-
-    return function_meta
-
 def query_json(json_content, query, delimiter='.'):
     """ Do an xpath-like query with json_content.
     @param (json_content) json_content