TestRunner: change method name

This commit is contained in:
debugtalk
2017-06-26 11:58:07 +08:00
parent 56c2f0decf
commit 668e17d45a
3 changed files with 14 additions and 14 deletions

View File

@@ -31,7 +31,7 @@ class TestRunner(object):
)
return parsed_testcase
def run_single_testcase(self, testcase):
def run_test(self, testcase):
testcase = self.prepare(testcase)
req_kwargs = testcase['request']
@@ -47,8 +47,8 @@ class TestRunner(object):
success = False if diff_content else True
return success, diff_content
def run_testcase_suite(self, testcase_sets):
def run_testsets(self, testsets):
return [
self.run_single_testcase(testcase)
for testcase in testcase_sets
self.run_test(testcase)
for testcase in testsets
]

View File

@@ -17,7 +17,7 @@ class TestRunner(ApiServerUnittest):
def test_run_single_testcase_success(self):
testcase_file_path = os.path.join(os.getcwd(), 'test/data/simple_demo_no_auth.json')
testcases = utils.load_testcases(testcase_file_path)
success, _ = self.test_runner.run_single_testcase(testcases[0])
success, _ = self.test_runner.run_test(testcases[0])
self.assertTrue(success)
def test_run_single_testcase_fail(self):
@@ -45,7 +45,7 @@ class TestRunner(ApiServerUnittest):
}
}
}
success, diff_content = self.test_runner.run_single_testcase(testcase)
success, diff_content = self.test_runner.run_test(testcase)
self.assertFalse(success)
self.assertEqual(
diff_content['status_code'],
@@ -72,13 +72,13 @@ class TestRunner(ApiServerUnittest):
def test_run_testcase_suite_json_success(self):
testcase_file_path = os.path.join(os.getcwd(), 'test/data/simple_demo_no_auth.json')
testcases = utils.load_testcases(testcase_file_path)
result = self.test_runner.run_testcase_suite(testcases)
result = self.test_runner.run_testsets(testcases)
self.assertEqual(len(result), 2)
self.assertEqual(result, [(True, {}), (True, {})])
def test_run_testcase_suite_yaml_success(self):
testcase_file_path = os.path.join(os.getcwd(), 'test/data/simple_demo_no_auth.yml')
testcases = utils.load_testcases(testcase_file_path)
result = self.test_runner.run_testcase_suite(testcases)
result = self.test_runner.run_testsets(testcases)
self.assertEqual(len(result), 2)
self.assertEqual(result, [(True, {}), (True, {})])

View File

@@ -20,21 +20,21 @@ class TestRunnerV2(ApiServerUnittest):
testcase_file_path = os.path.join(
os.getcwd(), 'test/data/simple_demo_auth_hardcode.yml')
testcases = utils.load_testcases(testcase_file_path)
success, _ = self.test_runner.run_single_testcase(testcases[0])
success, _ = self.test_runner.run_test(testcases[0])
self.assertTrue(success)
def test_run_single_testcase_json(self):
testcase_file_path = os.path.join(
os.getcwd(), 'test/data/simple_demo_auth_hardcode.json')
testcases = utils.load_testcases(testcase_file_path)
success, _ = self.test_runner.run_single_testcase(testcases[0])
success, _ = self.test_runner.run_test(testcases[0])
self.assertTrue(success)
def test_run_testcase_auth_suite_yaml(self):
testcase_file_path = os.path.join(
os.getcwd(), 'test/data/simple_demo_auth_hardcode.yml')
testcases = utils.load_testcases(testcase_file_path)
result = self.test_runner.run_testcase_suite(testcases)
result = self.test_runner.run_testsets(testcases)
self.assertEqual(len(result), 2)
self.assertEqual(result, [(True, {}), (True, {})])
@@ -42,7 +42,7 @@ class TestRunnerV2(ApiServerUnittest):
testcase_file_path = os.path.join(
os.getcwd(), 'test/data/simple_demo_auth_hardcode.json')
testcases = utils.load_testcases(testcase_file_path)
result = self.test_runner.run_testcase_suite(testcases)
result = self.test_runner.run_testsets(testcases)
self.assertEqual(len(result), 2)
self.assertEqual(result, [(True, {}), (True, {})])
@@ -50,7 +50,7 @@ class TestRunnerV2(ApiServerUnittest):
testcase_file_path = os.path.join(
os.getcwd(), 'test/data/demo_template_separate.yml')
testcases = utils.load_testcases(testcase_file_path)
success, _ = self.test_runner.run_single_testcase(testcases[0])
success, _ = self.test_runner.run_test(testcases[0])
self.assertTrue(success)
success, _ = self.test_runner.run_single_testcase(testcases[1])
success, _ = self.test_runner.run_test(testcases[1])
self.assertFalse(success)