Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit afc6e0b

Browse files
Lorak-mmkdkropachev
authored andcommitted
test_types: Remove unittests asserts
1 parent ba53f59 commit afc6e0b

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

‎tests/unit/test_types.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,9 +1004,9 @@ def test_host_order(self):
10041004
hosts_equal = [Host(addr, SimpleConvictionPolicy) for addr in
10051005
("127.0.0.1", "127.0.0.1")]
10061006
hosts_equal_conviction = [Host("127.0.0.1", SimpleConvictionPolicy), Host("127.0.0.1", ConvictionPolicy)]
1007-
check_sequence_consistency(self, hosts)
1008-
check_sequence_consistency(self, hosts_equal, equal=True)
1009-
check_sequence_consistency(self, hosts_equal_conviction, equal=True)
1007+
check_sequence_consistency(hosts)
1008+
check_sequence_consistency(hosts_equal, equal=True)
1009+
check_sequence_consistency(hosts_equal_conviction, equal=True)
10101010

10111011
def test_date_order(self):
10121012
"""
@@ -1020,8 +1020,8 @@ def test_date_order(self):
10201020
"""
10211021
dates_from_string = [Date("2017年01月01日"), Date("2017年01月05日"), Date("2017年01月09日"), Date("2017年01月13日")]
10221022
dates_from_string_equal = [Date("2017年01月01日"), Date("2017年01月01日")]
1023-
check_sequence_consistency(self, dates_from_string)
1024-
check_sequence_consistency(self, dates_from_string_equal, equal=True)
1023+
check_sequence_consistency(dates_from_string)
1024+
check_sequence_consistency(dates_from_string_equal, equal=True)
10251025

10261026
date_format = "%Y-%m-%d"
10271027

@@ -1031,15 +1031,15 @@ def test_date_order(self):
10311031
for dtstr in ("2017年01月02日", "2017年01月06日", "2017年01月10日", "2017年01月14日")
10321032
]
10331033
dates_from_value_equal = [Date(1), Date(1)]
1034-
check_sequence_consistency(self, dates_from_value)
1035-
check_sequence_consistency(self, dates_from_value_equal, equal=True)
1034+
check_sequence_consistency(dates_from_value)
1035+
check_sequence_consistency(dates_from_value_equal, equal=True)
10361036

10371037
dates_from_datetime = [Date(datetime.datetime.strptime(dtstr, date_format))
10381038
for dtstr in ("2017年01月03日", "2017年01月07日", "2017年01月11日", "2017年01月15日")]
10391039
dates_from_datetime_equal = [Date(datetime.datetime.strptime("2017年01月01日", date_format)),
10401040
Date(datetime.datetime.strptime("2017年01月01日", date_format))]
1041-
check_sequence_consistency(self, dates_from_datetime)
1042-
check_sequence_consistency(self, dates_from_datetime_equal, equal=True)
1041+
check_sequence_consistency(dates_from_datetime)
1042+
check_sequence_consistency(dates_from_datetime_equal, equal=True)
10431043

10441044
dates_from_date = [
10451045
Date(datetime.datetime.strptime(dtstr, date_format).date()) for dtstr in
@@ -1048,10 +1048,10 @@ def test_date_order(self):
10481048
dates_from_date_equal = [datetime.datetime.strptime(dtstr, date_format) for dtstr in
10491049
("2017年01月09日", "2017年01月9日")]
10501050

1051-
check_sequence_consistency(self, dates_from_date)
1052-
check_sequence_consistency(self, dates_from_date_equal, equal=True)
1051+
check_sequence_consistency(dates_from_date)
1052+
check_sequence_consistency(dates_from_date_equal, equal=True)
10531053

1054-
check_sequence_consistency(self, self._shuffle_lists(dates_from_string, dates_from_value,
1054+
check_sequence_consistency(self._shuffle_lists(dates_from_string, dates_from_value,
10551055
dates_from_datetime, dates_from_date))
10561056

10571057
def test_timer_order(self):
@@ -1066,23 +1066,23 @@ def test_timer_order(self):
10661066
"""
10671067
time_from_int = [Time(1000), Time(4000), Time(7000), Time(10000)]
10681068
time_from_int_equal = [Time(1), Time(1)]
1069-
check_sequence_consistency(self, time_from_int)
1070-
check_sequence_consistency(self, time_from_int_equal, equal=True)
1069+
check_sequence_consistency(time_from_int)
1070+
check_sequence_consistency(time_from_int_equal, equal=True)
10711071

10721072
time_from_datetime = [Time(datetime.time(hour=0, minute=0, second=0, microsecond=us))
10731073
for us in (2, 5, 8, 11)]
10741074
time_from_datetime_equal = [Time(datetime.time(hour=0, minute=0, second=0, microsecond=us))
10751075
for us in (1, 1)]
1076-
check_sequence_consistency(self, time_from_datetime)
1077-
check_sequence_consistency(self, time_from_datetime_equal, equal=True)
1076+
check_sequence_consistency(time_from_datetime)
1077+
check_sequence_consistency(time_from_datetime_equal, equal=True)
10781078

10791079
time_from_string = [Time("00:00:00.000003000"), Time("00:00:00.000006000"),
10801080
Time("00:00:00.000009000"), Time("00:00:00.000012000")]
10811081
time_from_string_equal = [Time("00:00:00.000004000"), Time("00:00:00.000004000")]
1082-
check_sequence_consistency(self, time_from_string)
1083-
check_sequence_consistency(self, time_from_string_equal, equal=True)
1082+
check_sequence_consistency(time_from_string)
1083+
check_sequence_consistency(time_from_string_equal, equal=True)
10841084

1085-
check_sequence_consistency(self, self._shuffle_lists(time_from_int, time_from_datetime, time_from_string))
1085+
check_sequence_consistency(self._shuffle_lists(time_from_int, time_from_datetime, time_from_string))
10861086

10871087
def test_token_order(self):
10881088
"""
@@ -1096,5 +1096,5 @@ def test_token_order(self):
10961096
"""
10971097
tokens = [Token(1), Token(2), Token(3), Token(4)]
10981098
tokens_equal = [Token(1), Token(1)]
1099-
check_sequence_consistency(self, tokens)
1100-
check_sequence_consistency(self, tokens_equal, equal=True)
1099+
check_sequence_consistency(tokens)
1100+
check_sequence_consistency(tokens_equal, equal=True)

‎tests/unit/util.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
# limitations under the License.
1212

1313

14-
def check_sequence_consistency(unit_test, ordered_sequence, equal=False):
14+
def check_sequence_consistency(ordered_sequence, equal=False):
1515
for i, el in enumerate(ordered_sequence):
1616
for previous in ordered_sequence[:i]:
17-
_check_order_consistency(unit_test, previous, el, equal)
17+
_check_order_consistency(previous, el, equal)
1818
for posterior in ordered_sequence[i + 1:]:
19-
_check_order_consistency(unit_test, el, posterior, equal)
19+
_check_order_consistency(el, posterior, equal)
2020

2121

22-
def _check_order_consistency(unit_test, smaller, bigger, equal=False):
23-
unit_test.assertLessEqual(smaller, bigger)
24-
unit_test.assertGreaterEqual(bigger, smaller)
22+
def _check_order_consistency(smaller, bigger, equal=False):
23+
assertsmaller<=bigger
24+
assertbigger>=smaller
2525
if equal:
26-
unit_test.assertEqual(smaller, bigger)
26+
assertsmaller==bigger
2727
else:
28-
unit_test.assertNotEqual(smaller, bigger)
29-
unit_test.assertLess(smaller, bigger)
30-
unit_test.assertGreater(bigger, smaller)
28+
assertsmaller!=bigger
29+
assertsmaller<bigger
30+
assertbigger>smaller

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /