From 597d40537850a91804c3cd30d9199a0568881b50 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Mon, 29 Oct 2018 13:01:30 +0800
Subject: [PATCH] refactor _load_test_file

---
 httprunner/loader.py | 29 +++++++++++++++--------------
 tests/test_loader.py |  3 ++-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/httprunner/loader.py b/httprunner/loader.py
index d7f51502..59b8203a 100644
--- a/httprunner/loader.py
+++ b/httprunner/loader.py
@@ -315,11 +315,11 @@ def get_module_item(module_mapping, item_type, item_name):
 ##   testcase loader
 ###############################################################################
 
-def _load_test_file(file_path, project_mapping):
-    """ load testcase file or testsuite file
+def _load_testcase(raw_testcase, project_mapping):
+    """ load testcase/testsuite with api/testcase references
 
     Args:
-        file_path (str): absolute valid file path. file_path should be in the following format:
+        raw_testcase (list): raw testcase content loaded from JSON/YAML file:
             [
                 {
                     "config": {
@@ -353,29 +353,29 @@ def _load_test_file(file_path, project_mapping):
         project_mapping (dict): project_mapping
 
     Returns:
-        dict: testcase dict
+        dict: loaded testcase content
             {
                 "config": {},
                 "teststeps": [teststep11, teststep12]
             }
 
     """
-    testcase = {
+    loaded_testcase = {
         "config": {},
         "teststeps": []
     }
 
-    for item in load_file(file_path):
+    for item in raw_testcase:
         # TODO: add json schema validation
         if not isinstance(item, dict) or len(item) != 1:
-            raise exceptions.FileFormatError("Testcase format error: {}".format(file_path))
+            raise exceptions.FileFormatError("Testcase format error: {}".format(item))
 
         key, test_block = item.popitem()
         if not isinstance(test_block, dict):
-            raise exceptions.FileFormatError("Testcase format error: {}".format(file_path))
+            raise exceptions.FileFormatError("Testcase format error: {}".format(item))
 
         if key == "config":
-            testcase["config"].update(test_block)
+            loaded_testcase["config"].update(test_block)
 
         elif key == "test":
 
@@ -387,7 +387,7 @@ def _load_test_file(file_path, project_mapping):
             # reference api
             if "api" in test_block:
                 extend_api_definition(test_block)
-                testcase["teststeps"].append(test_block)
+                loaded_testcase["teststeps"].append(test_block)
 
             # reference testcase
             elif "suite" in test_block: # TODO: replace suite with testcase
@@ -397,18 +397,18 @@ def _load_test_file(file_path, project_mapping):
                 for teststep in block["teststeps"]:
                     if "api" in teststep:
                         extend_api_definition(teststep)
-                    testcase["teststeps"].append(teststep)
+                    loaded_testcase["teststeps"].append(teststep)
 
             # define directly
             else:
-                testcase["teststeps"].append(test_block)
+                loaded_testcase["teststeps"].append(test_block)
 
         else:
             logger.log_warning(
                 "unexpected block key: {}. block key should only be 'config' or 'test'.".format(key)
             )
 
-    return testcase
+    return loaded_testcase
 
 
 def _get_block_by_name(ref_call, ref_type, project_mapping):
@@ -956,8 +956,9 @@ def load_tests(path, dot_env_path=None):
 
     elif os.path.isfile(path):
         try:
+            raw_testcase = load_file(path)
             project_mapping = load_project_tests(path, dot_env_path)
-            testcase = _load_test_file(path, project_mapping)
+            testcase = _load_testcase(raw_testcase, project_mapping)
             testcase["config"]["path"] = path
             testcase["config"]["refs"] = project_mapping
             testcases_list = [testcase]
diff --git a/tests/test_loader.py b/tests/test_loader.py
index ff2bd996..ebeff85c 100644
--- a/tests/test_loader.py
+++ b/tests/test_loader.py
@@ -284,7 +284,8 @@ class TestSuiteLoader(unittest.TestCase):
         cls.project_mapping = loader.load_project_tests(os.path.join(os.getcwd(), "tests"))
 
     def test_load_test_file_testcase(self):
-        testcase = loader._load_test_file("tests/testcases/smoketest.yml", self.project_mapping)
+        raw_testcase = loader.load_file("tests/testcases/smoketest.yml")
+        testcase = loader._load_testcase(raw_testcase, self.project_mapping)
         self.assertEqual(testcase["config"]["name"], "smoketest")
         self.assertIn("device_sn", testcase["config"]["variables"][0])
         self.assertEqual(len(testcase["teststeps"]), 8)