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

bug fix: 当使用.csv文件内容来做数据驱动测试时, length_xxx函数都会失败

Browse Source
This commit is contained in:
Long
2019-12-11 17:06:40 +08:00
parent 6371ee753b
commit fdd94ce508
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
httprunner/builtin/comparators.py
View File

@@ -37,27 +37,32 @@ def string_equals(check_value, expect_value):
def length_equals(check_value, expect_value): def length_equals(check_value, expect_value):
assert isinstance(expect_value, integer_types) assert isinstance(expect_value, integer_types)
assert len(check_value) == expect_value expect_len = _cast_to_int(expect_value)
assert len(check_value) == expect_len
def length_greater_than(check_value, expect_value): def length_greater_than(check_value, expect_value):
assert isinstance(expect_value, integer_types) assert isinstance(expect_value, integer_types)
assert len(check_value) > expect_value expect_len = _cast_to_int(expect_value)
assert len(check_value) > expect_len
def length_greater_than_or_equals(check_value, expect_value): def length_greater_than_or_equals(check_value, expect_value):
assert isinstance(expect_value, integer_types) assert isinstance(expect_value, integer_types)
assert len(check_value) >= expect_value expect_len = _cast_to_int(expect_value)
assert len(check_value) >= expect_len
def length_less_than(check_value, expect_value): def length_less_than(check_value, expect_value):
assert isinstance(expect_value, integer_types) assert isinstance(expect_value, integer_types)
assert len(check_value) < expect_value expect_len = _cast_to_int(expect_value)
assert len(check_value) < expect_len
def length_less_than_or_equals(check_value, expect_value): def length_less_than_or_equals(check_value, expect_value):
assert isinstance(expect_value, integer_types) assert isinstance(expect_value, integer_types)
assert len(check_value) <= expect_value expect_len = _cast_to_int(expect_value)
assert len(check_value) <= expect_len
def contains(check_value, expect_value): def contains(check_value, expect_value):
@@ -97,3 +102,10 @@ def startswith(check_value, expect_value):
def endswith(check_value, expect_value): def endswith(check_value, expect_value):
assert builtin_str(check_value).endswith(builtin_str(expect_value)) assert builtin_str(check_value).endswith(builtin_str(expect_value))
def _cast_to_int(expect_value):
try:
return int(expect_value)
except Exception:
raise AssertionError("%r can't cast to int" % str(expect_value))

5
tests/test_utils.py
View File

@@ -80,6 +80,11 @@ class TestUtils(ApiServerUnittest):
functions_mapping["not_equals"](123, "123") functions_mapping["not_equals"](123, "123")
functions_mapping["length_equals"]("123", 3) functions_mapping["length_equals"]("123", 3)
# Because the Numbers in a CSV file are by default treated as strings,
# you need to convert them to Numbers, and we'll test that out here.
functions_mapping["length_equals"]("123", '3')
with self.assertRaises(AssertionError):
functions_mapping["length_equals"]("123", 'abc')
functions_mapping["length_greater_than"]("123", 2) functions_mapping["length_greater_than"]("123", 2)
functions_mapping["length_greater_than_or_equals"]("123", 3) functions_mapping["length_greater_than_or_equals"]("123", 3)