refactor: ensure_file_path_valid

This commit is contained in:
debugtalk
2020-06-06 00:32:38 +08:00
parent 98a787d787
commit 91a8bcc78c
13 changed files with 168 additions and 256 deletions

View File

@@ -142,30 +142,30 @@ class TestCompat(unittest.TestCase):
)
def test_ensure_cli_args(self):
args1 = ["examples/postman_echo/request_methods/hardcode.yml", "--failfast"]
args1 = ["examples/postman-echo/request.methods/hardcode.yml", "--failfast"]
self.assertEqual(
compat.ensure_cli_args(args1),
["examples/postman_echo/request_methods/hardcode.yml"],
["examples/postman-echo/request.methods/hardcode.yml"],
)
args2 = ["examples/postman_echo/request_methods/hardcode.yml", "--save-tests"]
args2 = ["examples/postman-echo/request.methods/hardcode.yml", "--save-tests"]
self.assertEqual(
compat.ensure_cli_args(args2),
["examples/postman_echo/request_methods/hardcode.yml"],
["examples/postman-echo/request.methods/hardcode.yml"],
)
self.assertTrue(
os.path.isfile("examples/postman_echo/request_methods/conftest.py")
)
args3 = [
"examples/postman_echo/request_methods/hardcode.yml",
"examples/postman-echo/request.methods/hardcode.yml",
"--report-file",
"report.html",
]
self.assertEqual(
compat.ensure_cli_args(args3),
[
"examples/postman_echo/request_methods/hardcode.yml",
"examples/postman-echo/request.methods/hardcode.yml",
"--html",
"report.html",
"--self-contained-html",
@@ -173,7 +173,7 @@ class TestCompat(unittest.TestCase):
)
args4 = [
"examples/postman_echo/request_methods/hardcode.yml",
"examples/postman-echo/request.methods/hardcode.yml",
"--failfast",
"--save-tests",
"--report-file",
@@ -182,7 +182,7 @@ class TestCompat(unittest.TestCase):
self.assertEqual(
compat.ensure_cli_args(args4),
[
"examples/postman_echo/request_methods/hardcode.yml",
"examples/postman-echo/request.methods/hardcode.yml",
"--html",
"report.html",
"--self-contained-html",

View File

@@ -6,7 +6,7 @@ from httprunner import exceptions, loader
class TestLoader(unittest.TestCase):
def test_load_testcase_file(self):
path = "examples/postman_echo/request_methods/request_with_variables.yml"
path = "examples/postman-echo/request.methods/request_with_variables.yml"
testcase_obj = loader.load_testcase_file(path)
self.assertEqual(
testcase_obj.config.name, "request methods testcase with variables"

View File

@@ -8,12 +8,13 @@ from httprunner.make import (
make_config_chain_style,
make_teststep_chain_style,
pytest_files_run_set,
ensure_file_path_valid,
)
class TestMake(unittest.TestCase):
def test_make_testcase(self):
path = ["examples/postman_echo/request_methods/request_with_variables.yml"]
path = ["examples/postman-echo/request.methods/request_with_variables.yml"]
testcase_python_list = main_make(path)
self.assertEqual(
testcase_python_list[0],
@@ -25,7 +26,7 @@ class TestMake(unittest.TestCase):
def test_make_testcase_with_ref(self):
path = [
"examples/postman_echo/request_methods/request_with_testcase_reference.yml"
"examples/postman-echo/request.methods/request_with_testcase_reference.yml"
]
pytest_files_made_cache_mapping.clear()
pytest_files_run_set.clear()
@@ -56,7 +57,7 @@ from examples.postman_echo.request_methods.request_with_functions_test import (
)
def test_make_testcase_folder(self):
path = ["examples/postman_echo/request_methods/"]
path = ["examples/postman-echo/request.methods/"]
testcase_python_list = main_make(path)
self.assertIn(
os.path.join(
@@ -66,42 +67,58 @@ from examples.postman_echo.request_methods.request_with_functions_test import (
testcase_python_list,
)
def test_ensure_file_path_valid(self):
self.assertEqual(
ensure_file_path_valid(
"examples/postman-echo/request.methods/hardcode.yml"
),
os.path.join(
os.getcwd(), "examples/postman_echo/request_methods/hardcode.yml"
),
)
self.assertEqual(
ensure_file_path_valid(
os.path.join(os.getcwd(), "postman-echo/request.methods/hardcode.yml")
),
os.path.join(os.getcwd(), "postman_echo/request_methods/hardcode.yml"),
)
self.assertEqual(
ensure_file_path_valid(
"examples/postman echo/request methods/hardcode.yml"
),
os.path.join(
os.getcwd(), "examples/postman_echo/request_methods/hardcode.yml"
),
)
self.assertEqual(
ensure_file_path_valid("1/2B/3.yml"),
os.path.join(os.getcwd(), "T1/T2B/T3.yml"),
)
def test_convert_testcase_path(self):
self.assertEqual(
convert_testcase_path("mubu.login.yml")[0], "mubu_login_test.py"
convert_testcase_path("mubu.login.yml"),
(os.path.join(os.getcwd(), "mubu_login_test.py"), "MubuLogin"),
)
self.assertEqual(
convert_testcase_path("/path/to/mubu.login.yml")[0],
"/path/to/mubu_login_test.py",
convert_testcase_path(os.path.join(os.getcwd(), "path/to/mubu.login.yml")),
(os.path.join(os.getcwd(), "path/to/mubu_login_test.py"), "MubuLogin"),
)
self.assertEqual(
convert_testcase_path("/path/to 2/mubu.login.yml")[0],
"/path/to 2/mubu_login_test.py",
convert_testcase_path("path/to 2/mubu.login.yml"),
(os.path.join(os.getcwd(), "path/to_2/mubu_login_test.py"), "MubuLogin"),
)
self.assertEqual(
convert_testcase_path("/path/to 2/mubu.login.yml")[1], "MubuLogin"
convert_testcase_path("path/to-2/mubu login.yml"),
(os.path.join(os.getcwd(), "path/to_2/mubu_login_test.py"), "MubuLogin"),
)
self.assertEqual(
convert_testcase_path("mubu login.yml")[0], "mubu_login_test.py"
convert_testcase_path("path/to.2/幕布login.yml"),
(os.path.join(os.getcwd(), "path/to_2/幕布login_test.py"), "幕布Login"),
)
self.assertEqual(
convert_testcase_path("/path/to 2/mubu login.yml")[1], "MubuLogin"
)
self.assertEqual(
convert_testcase_path("/path/to 2/mubu-login.yml")[0],
"/path/to 2/mubu_login_test.py",
)
self.assertEqual(
convert_testcase_path("/path/to 2/mubu-login.yml")[1], "MubuLogin"
)
self.assertEqual(
convert_testcase_path("/path/to 2/幕布login.yml")[0],
"/path/to 2/幕布login_test.py",
)
self.assertEqual(convert_testcase_path("/path/to/幕布login.yml")[1], "幕布Login")
def test_make_testsuite(self):
path = ["examples/postman_echo/request_methods/demo_testsuite.yml"]
path = ["examples/postman-echo/request.methods/demo_testsuite.yml"]
pytest_files_made_cache_mapping.clear()
pytest_files_run_set.clear()
testcase_python_list = main_make(path)

View File

@@ -9,7 +9,7 @@ class TestHttpRunner(unittest.TestCase):
def test_run_testcase_by_path_request_only(self):
self.runner.run_path(
"examples/postman_echo/request_methods/request_with_functions.yml"
"examples/postman-echo/request.methods/request_with_functions.yml"
)
result = self.runner.get_summary()
self.assertTrue(result.success)
@@ -19,7 +19,7 @@ class TestHttpRunner(unittest.TestCase):
def test_run_testcase_by_path_ref_testcase(self):
self.runner.run_path(
"examples/postman_echo/request_methods/request_with_testcase_reference.yml"
"examples/postman-echo/request.methods/request_with_testcase_reference.yml"
)
result = self.runner.get_summary()
self.assertTrue(result.success)