GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-06-09 17:59:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: validate with builtin assert methods

Browse Source
This commit is contained in:
debugtalk
2020-04-21 14:54:28 +08:00
parent 41f819b9cb
commit 94cf2b074f
2 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
httprunner/v3/response.py
View File

@@ -4,10 +4,10 @@ import jmespath
import requests import requests
from loguru import logger from loguru import logger
from httprunner.v3.exceptions import ParamsError, ValidationFailure from httprunner.v3.exceptions import ValidationFailure
from httprunner.v3.parser import parse_data, parse_string_value from httprunner.v3.parser import parse_data, parse_string_value, get_mapping_function
from httprunner.v3.schema import VariablesMapping, Validators, FunctionsMapping from httprunner.v3.schema import VariablesMapping, Validators, FunctionsMapping
from httprunner.v3.validator import uniform_validator, AssertMethods from httprunner.v3.validator import uniform_validator
class ResponseObject(object): class ResponseObject(object):
@@ -39,11 +39,7 @@ class ResponseObject(object):
msg = f"assert {field} {assert_method} {expect_value}" msg = f"assert {field} {assert_method} {expect_value}"
try: assert_func = get_mapping_function(assert_method, functions_mapping)
assert_func = getattr(AssertMethods, assert_method)
except AttributeError:
raise ParamsError(f"Assert Method not supported: {assert_method}")
actual_value = parse_string_value(actual_value) actual_value = parse_string_value(actual_value)
# parse expected value with config/teststep/extracted variables # parse expected value with config/teststep/extracted variables
expect_value = parse_data(expect_value, variables_mapping, functions_mapping) expect_value = parse_data(expect_value, variables_mapping, functions_mapping)

15
httprunner/v3/validator.py
View File

@@ -89,18 +89,3 @@ def uniform_validator(validator):
"expect": expect_value, "expect": expect_value,
"assert": assert_method "assert": assert_method
} }
class AssertMethods(object):
@staticmethod
def equals(actual_value, expect_value):
assert actual_value == expect_value
@staticmethod
def less_than(actual_value, expect_value):
assert actual_value < expect_value
@staticmethod
def greater_than(actual_value, expect_value):
assert actual_value > expect_value