From 4417b982937921e7620aacc35c7d8a8abdbe5776 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Tue, 31 Dec 2019 19:03:34 +0800 Subject: [PATCH] refactor: rename to JsonSchemaTestcaseChecker --- httprunner/loader/buildup.py | 4 ++-- httprunner/loader/check.py | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/httprunner/loader/buildup.py b/httprunner/loader/buildup.py index 35d9ebd0..2a0fd08f 100644 --- a/httprunner/loader/buildup.py +++ b/httprunner/loader/buildup.py @@ -2,7 +2,7 @@ import importlib import os from httprunner import exceptions, logger, utils -from httprunner.loader.check import JsonSchemaCommonChecker, JsonSchemaV2Checker +from httprunner.loader.check import JsonSchemaCommonChecker, JsonSchemaTestcaseChecker from httprunner.loader.load import load_module_functions, load_file, load_dot_env_file, \ load_folder_files from httprunner.loader.locate import init_project_working_directory, get_project_working_directory @@ -225,7 +225,7 @@ def load_testcase_v2(raw_testcase): } """ - JsonSchemaV2Checker.validate_testcase_format(raw_testcase) + JsonSchemaTestcaseChecker.validate_testcase_v2_format(raw_testcase) raw_teststeps = raw_testcase.pop("teststeps") raw_testcase["teststeps"] = [ load_teststep(teststep) diff --git a/httprunner/loader/check.py b/httprunner/loader/check.py index 314bb548..60d0db86 100644 --- a/httprunner/loader/check.py +++ b/httprunner/loader/check.py @@ -50,14 +50,16 @@ class JsonSchemaCommonChecker(object): return True -class JsonSchemaV1Checker(JsonSchemaCommonChecker): - pass - - -class JsonSchemaV2Checker(JsonSchemaCommonChecker): +class JsonSchemaTestcaseChecker(JsonSchemaCommonChecker): @staticmethod - def validate_testcase_format(content): + def validate_testcase_v1_format(content): + """ check testcase format v1 if valid + """ + return True + + @staticmethod + def validate_testcase_v2_format(content): """ check testcase format v2 if valid """ try: