GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-08-28 19:47:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename TestcaseParser argument name: variables_binds => variables

Browse Source
This commit is contained in:
httprunner
2017-10-24 16:06:37 +08:00
parent fa82c26e9f
commit 9e17282f3b
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ate/testcase.py
+7 -7
View File
@@ -329,14 +329,14 @@ def substitute_variables_with_mapping(content, mapping):
class TestcaseParser(object): class TestcaseParser(object):
def __init__(self, variables_binds={}, functions_binds={}, file_path=None): def __init__(self, variables={}, functions_binds={}, file_path=None):
self.bind_variables(variables_binds) self.bind_variables(variables)
self.bind_functions(functions_binds) self.bind_functions(functions_binds)
self.file_path = file_path self.file_path = file_path
def bind_variables(self, variables_binds): def bind_variables(self, variables):
""" bind variables to current testcase parser """ bind variables to current testcase parser
@param (dict) variables_binds, variables binds mapping @param (dict) variables, variables binds mapping
{ {
"authorization": "a83de0ff8d2e896dbd8efb81ba14e17d", "authorization": "a83de0ff8d2e896dbd8efb81ba14e17d",
"random": "A2dEx", "random": "A2dEx",
@@ -344,7 +344,7 @@ class TestcaseParser(object):
"uuid": 1000 "uuid": 1000
} }
""" """
self.variables_binds = variables_binds self.variables = variables
def bind_functions(self, functions_binds): def bind_functions(self, functions_binds):
""" bind functions to current testcase parser """ bind functions to current testcase parser
@@ -360,8 +360,8 @@ class TestcaseParser(object):
if item_name in self.functions_binds: if item_name in self.functions_binds:
return self.functions_binds[item_name] return self.functions_binds[item_name]
elif item_type == "variable": elif item_type == "variable":
if item_name in self.variables_binds: if item_name in self.variables:
return self.variables_binds[item_name] return self.variables[item_name]
else: else:
raise exception.ParamsError("bind item should only be function or variable.") raise exception.ParamsError("bind item should only be function or variable.")
tests/test_testcase.py
+12 -12
View File
@@ -63,7 +63,7 @@ class TestcaseParserUnittest(unittest.TestCase):
"var_5": True, "var_5": True,
"var_6": None "var_6": None
} }
testcase_parser = testcase.TestcaseParser(variables_binds=variables) testcase_parser = testcase.TestcaseParser(variables=variables)
self.assertEqual( self.assertEqual(
testcase_parser.eval_content_variables("$var_1"), testcase_parser.eval_content_variables("$var_1"),
"abc" "abc"
@@ -157,11 +157,11 @@ class TestcaseParserUnittest(unittest.TestCase):
) )
def test_parse_content_with_bindings_variables(self): def test_parse_content_with_bindings_variables(self):
variables_binds = { variables = {
"str_1": "str_value1", "str_1": "str_value1",
"str_2": "str_value2" "str_2": "str_value2"
} }
testcase_parser = testcase.TestcaseParser(variables_binds=variables_binds) testcase_parser = testcase.TestcaseParser(variables=variables)
self.assertEqual( self.assertEqual(
testcase_parser.parse_content_with_bindings("$str_1"), testcase_parser.parse_content_with_bindings("$str_1"),
"str_value1" "str_value1"
@@ -184,11 +184,11 @@ class TestcaseParserUnittest(unittest.TestCase):
) )
def test_parse_content_with_bindings_multiple_identical_variables(self): def test_parse_content_with_bindings_multiple_identical_variables(self):
variables_binds = { variables = {
"userid": 100, "userid": 100,
"data": 1498 "data": 1498
} }
testcase_parser = testcase.TestcaseParser(variables_binds=variables_binds) testcase_parser = testcase.TestcaseParser(variables=variables)
content = "/users/$userid/training/$data?userId=$userid&data=$data" content = "/users/$userid/training/$data?userId=$userid&data=$data"
self.assertEqual( self.assertEqual(
testcase_parser.parse_content_with_bindings(content), testcase_parser.parse_content_with_bindings(content),
@@ -196,12 +196,12 @@ class TestcaseParserUnittest(unittest.TestCase):
) )
def test_parse_variables_multiple_identical_variables(self): def test_parse_variables_multiple_identical_variables(self):
variables_binds = { variables = {
"user": 100, "user": 100,
"userid": 1000, "userid": 1000,
"data": 1498 "data": 1498
} }
testcase_parser = testcase.TestcaseParser(variables_binds=variables_binds) testcase_parser = testcase.TestcaseParser(variables=variables)
content = "/users/$user/$userid/$data?userId=$userid&data=$data" content = "/users/$user/$userid/$data?userId=$userid&data=$data"
self.assertEqual( self.assertEqual(
testcase_parser.parse_content_with_bindings(content), testcase_parser.parse_content_with_bindings(content),
@@ -289,7 +289,7 @@ class TestcaseParserUnittest(unittest.TestCase):
self.assertEqual(content, "/api/900150983cd24fb0d6963f7d28e17f72") self.assertEqual(content, "/api/900150983cd24fb0d6963f7d28e17f72")
def test_parse_content_with_bindings_testcase(self): def test_parse_content_with_bindings_testcase(self):
variables_binds = { variables = {
"uid": "1000", "uid": "1000",
"random": "A2dEx", "random": "A2dEx",
"authorization": "a83de0ff8d2e896dbd8efb81ba14e17d", "authorization": "a83de0ff8d2e896dbd8efb81ba14e17d",
@@ -310,7 +310,7 @@ class TestcaseParserUnittest(unittest.TestCase):
}, },
"body": "$data" "body": "$data"
} }
parsed_testcase = testcase.TestcaseParser(variables_binds, functions_binds)\ parsed_testcase = testcase.TestcaseParser(variables, functions_binds)\
.parse_content_with_bindings(testcase_template) .parse_content_with_bindings(testcase_template)
self.assertEqual( self.assertEqual(
@@ -319,15 +319,15 @@ class TestcaseParserUnittest(unittest.TestCase):
) )
self.assertEqual( self.assertEqual(
parsed_testcase["headers"]["authorization"], parsed_testcase["headers"]["authorization"],
variables_binds["authorization"] variables["authorization"]
) )
self.assertEqual( self.assertEqual(
parsed_testcase["headers"]["random"], parsed_testcase["headers"]["random"],
variables_binds["random"] variables["random"]
) )
self.assertEqual( self.assertEqual(
parsed_testcase["body"], parsed_testcase["body"],
variables_binds["data"] variables["data"]
) )
self.assertEqual( self.assertEqual(
parsed_testcase["headers"]["sum"], parsed_testcase["headers"]["sum"],