adjust code structure

This commit is contained in:
debugtalk
2017-09-22 11:48:29 +08:00
parent 7aefc7a13b
commit bcd879db99
3 changed files with 133 additions and 86 deletions

View File

@@ -451,7 +451,7 @@ class TestcaseParserUnittest(unittest.TestCase):
self.assertEqual("", result["request"]["data"]["empty_str"])
def test_load_api_definition(self):
api_dir_dict = testcase.load_api_definition()
api_dir_dict = testcase.load_test_definition("api")
self.assertIn("get_token", api_dir_dict)
self.assertEqual("/api/get-token", api_dir_dict["get_token"]["request"]["url"])
self.assertIn("$user_agent", api_dir_dict["get_token"]["function_meta"]["args"])
@@ -460,9 +460,9 @@ class TestcaseParserUnittest(unittest.TestCase):
def test_get_api_definition(self):
path = os.path.join(
os.getcwd(), 'tests/data')
api_info = testcase.get_api_definition("get_token", path)
api_info = testcase.get_test_definition("get_token", "api", path)
self.assertEqual("/api/get-token", api_info["request"]["url"])
self.assertIn("get_token", testcase.api_overall_dict)
self.assertIn("get_token", testcase.test_def_overall_dict["api"])
with self.assertRaises(ApiNotFound):
testcase.get_api_definition("api_not_exist", path)
testcase.get_test_definition("api_not_exist", "api", path)