Skip to content

Commit

Permalink
Tidying up
Browse files Browse the repository at this point in the history
  • Loading branch information
@domdfcoding
domdfcoding committed Jun 10, 2020
1 parent 7d51262 commit a1ac890
Show file tree
Hide file tree
Showing 5 changed files with 126 additions and 126 deletions.
114 changes: 57 additions & 57 deletions tests/test_enum.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,28 +140,28 @@ def test_enum_in_enum_out(self):

def test_enum_value(self):
season = self.Season
self.assertEqual(season.SPRING.value, 1)
assert season.SPRING.value == 1

def test_intenum_value(self):
self.assertEqual(IntStooges.CURLY.value, 2)
assert IntStooges.CURLY.value == 2

def test_enum(self):
lst = list(self.Season)
self.assertEqual(len(lst), len(self.Season))
self.assertEqual(len(self.Season), 4, self.Season)
self.assertEqual([self.Season.SPRING, self.Season.SUMMER, self.Season.AUTUMN, self.Season.WINTER], lst)
assert len(lst) == len(self.Season)
assert len(self.Season), 4 == self.Season
assert [self.Season.SPRING, self.Season.SUMMER, self.Season.AUTUMN, self.Season.WINTER] == lst

for i, season in enumerate('SPRING SUMMER AUTUMN WINTER'.split()):
i += 1
e = self.Season(i)
self.assertEqual(e, getattr(self.Season, season))
self.assertEqual(e.value, i)
assert e, getattr(self.Season == season)
assert e.value == i
self.assertNotEqual(e, i)
self.assertEqual(e.name, season)
assert e.name == season
self.assertTrue(e in self.Season)
assert isinstance(e, self.Season)
self.assertTrue(isinstance(e, self.Season))
self.assertEqual(str(e), 'Season.' + season)
assert str(e) == 'Season.' + season
self.assertEqual(
repr(e),
'<Season.%s: %s>' % (season, i),
Expand All @@ -172,13 +172,13 @@ def test_enum_helper(self):
e2 = enum(1, 2, three=9)
e3 = enum(1, 2, 9)
self.assertTrue(e1 is not e2)
self.assertEqual(e1, e2)
assert e1 == e2
self.assertNotEqual(e1, e3)
self.assertNotEqual(e2, e3)

def test_value_name(self):
self.assertEqual(self.Season.SPRING.name, 'SPRING')
self.assertEqual(self.Season.SPRING.value, 1)
assert self.Season.SPRING.name == 'SPRING'
assert self.Season.SPRING.value == 1

def set_name(obj, new_value):
obj.name = new_value
Expand Down Expand Up @@ -289,12 +289,12 @@ def test_member_contains(self):

def test_format_enum(self):
Season = self.Season
self.assertEqual('{0}'.format(Season.SPRING), '{0}'.format(str(Season.SPRING)))
self.assertEqual('{0:}'.format(Season.SPRING), '{0:}'.format(str(Season.SPRING)))
self.assertEqual('{0:20}'.format(Season.SPRING), '{0:20}'.format(str(Season.SPRING)))
self.assertEqual('{0:^20}'.format(Season.SPRING), '{0:^20}'.format(str(Season.SPRING)))
self.assertEqual('{0:>20}'.format(Season.SPRING), '{0:>20}'.format(str(Season.SPRING)))
self.assertEqual('{0:<20}'.format(Season.SPRING), '{0:<20}'.format(str(Season.SPRING)))
assert '{0}'.format(Season.SPRING) == '{0}'.format(str(Season.SPRING))
assert '{0:}'.format(Season.SPRING) == '{0:}'.format(str(Season.SPRING))
assert '{0:20}'.format(Season.SPRING) == '{0:20}'.format(str(Season.SPRING))
assert '{0:^20}'.format(Season.SPRING) == '{0:^20}'.format(str(Season.SPRING))
assert '{0:>20}'.format(Season.SPRING) == '{0:>20}'.format(str(Season.SPRING))
assert '{0:<20}'.format(Season.SPRING) == '{0:<20}'.format(str(Season.SPRING))

def test_format_enum_custom(self):

Expand All @@ -305,10 +305,10 @@ class TestFloat(float, Enum):
def __format__(self, spec):
return 'TestFloat success!'

self.assertEqual('{0}'.format(TestFloat.one), 'TestFloat success!')
assert '{0}'.format(TestFloat.one) == 'TestFloat success!'

def assertFormatIsValue(self, spec, member):
self.assertEqual(spec.format(member), spec.format(member.value))
assert spec.format(member) == spec.format(member.value)

def test_format_enum_date(self):
Holiday = self.Holiday
Expand Down Expand Up @@ -361,7 +361,7 @@ def test_hash(self):
dates[Season.SPRING] = '0315'
dates[Season.SUMMER] = '0704'
dates[Season.AUTUMN] = '1031'
self.assertEqual(dates[Season.AUTUMN], '1031')
assert dates[Season.AUTUMN] == '1031'

def test_enum_duplicates(self):

Expand All @@ -381,11 +381,11 @@ class Season(Enum):
Season.WINTER,
])
self.assertTrue(Season.FALL is Season.AUTUMN)
self.assertEqual(Season.FALL.value, 3)
self.assertEqual(Season.AUTUMN.value, 3)
assert Season.FALL.value == 3
assert Season.AUTUMN.value == 3
self.assertTrue(Season(3) is Season.AUTUMN)
self.assertTrue(Season(1) is Season.SPRING)
self.assertEqual(Season.FALL.name, 'AUTUMN')
assert Season.FALL.name == 'AUTUMN'
self.assertEqual(
set([k for k, v in Season.__members__.items() if v.name != k]),
set(['FALL', 'ANOTHER_SPRING']),
Expand All @@ -403,8 +403,8 @@ class Huh(Enum):
[Huh.name, Huh.value],
)
assert isinstance(Huh.name, Huh)
self.assertEqual(Huh.name.name, 'name')
self.assertEqual(Huh.name.value, 1)
assert Huh.name.name == 'name'
assert Huh.name.value == 1

def test_intenum_from_scratch(self):

Expand Down Expand Up @@ -474,22 +474,22 @@ class WeekDay(IntEnum):
FRIDAY = 6
SATURDAY = 7

self.assertEqual(['a', 'b', 'c'][WeekDay.MONDAY], 'c')
self.assertEqual([i for i in range(WeekDay.TUESDAY)], [0, 1, 2])
assert ['a', 'b', 'c'][WeekDay.MONDAY] == 'c'
assert [i for i in range(WeekDay.TUESDAY)], [0, 1 == 2]

lst = list(WeekDay)
self.assertEqual(len(lst), len(WeekDay))
self.assertEqual(len(WeekDay), 7)
assert len(lst) == len(WeekDay)
assert len(WeekDay) == 7
target = 'SUNDAY MONDAY TUESDAY WEDNESDAY THURSDAY FRIDAY SATURDAY'
target = target.split()
for i, weekday in enumerate(target):
i += 1
e = WeekDay(i)
self.assertEqual(e, i)
self.assertEqual(int(e), i)
self.assertEqual(e.name, weekday)
assert e == i
assert int(e) == i
assert e.name == weekday
self.assertTrue(e in WeekDay)
self.assertEqual(lst.index(e) + 1, i)
assert lst.index(e) + 1 == i
self.assertTrue(0 < e < 8)
assert isinstance(e, WeekDay)
self.assertTrue(isinstance(e, int))
Expand All @@ -508,7 +508,7 @@ class WeekDay(IntEnum):
SATURDAY = 7

self.assertTrue(WeekDay.TEUSDAY is WeekDay.TUESDAY)
self.assertEqual(WeekDay(3).name, 'TUESDAY')
assert WeekDay(3).name == 'TUESDAY'
self.assertEqual([k for k, v in WeekDay.__members__.items() if v.name != k], [
'TEUSDAY',
])
Expand Down Expand Up @@ -896,7 +896,7 @@ class whatever(Enum):
def really(self):
return 'no, not %s' % self.value

self.assertFalse(type(whatever.really) is whatever)
assert not isinstance(whatever.really, whatever)
self.assertEqual(whatever.this.really(), 'no, not that')

def test_wrong_inheritance_order(self):
Expand Down Expand Up @@ -1553,9 +1553,9 @@ class Color(AutoNumber3):
blue = ()

self.assertEqual(len(Color), 3, "wrong number of elements: %d (should be %d)" % (len(Color), 3))
Color.red
Color.green
Color.blue
Color.red # pylint: disable=pointless-statement
Color.green # pylint: disable=pointless-statement
Color.blue # pylint: disable=pointless-statement
self.assertEqual(Color.blue, 13)

def test_equality(self):
Expand Down Expand Up @@ -2920,31 +2920,31 @@ def test_auto_turns_off(self):
with self.assertRaises(NameError):

class Color(Enum, settings=AutoValue):
red
green
blue
red # pylint: disable=pointless-statement
green # pylint: disable=pointless-statement
blue # pylint: disable=pointless-statement

def hello(self):
print('Hello! My serial is %s.' % self.value)
print(f'Hello! My serial is {self.value}.')

rose
rose # pylint: disable=pointless-statement

with self.assertRaises(NameError):

class Color(Enum, settings=AutoValue):
red
green
blue
red # pylint: disable=pointless-statement
green # pylint: disable=pointless-statement
blue # pylint: disable=pointless-statement

def __init__(self, *args):
pass

rose
rose # pylint: disable=pointless-statement

def test_magic(self):

class Color(Enum, settings=AutoValue):
red, green, blue
red, green, blue # pylint: disable=pointless-statement

self.assertEqual(list(Color), [Color.red, Color.green, Color.blue])
self.assertEqual(Color.red.value, 1)
Expand All @@ -2963,7 +2963,7 @@ def shade(self):
def test_magic_start(self):

class Color(Enum, start=0):
red, green, blue
red, green, blue # pylint: disable=pointless-statement

self.assertEqual(list(Color), [Color.red, Color.green, Color.blue])
self.assertEqual(Color.red.value, 0)
Expand Down Expand Up @@ -3157,9 +3157,9 @@ class Color(Enum, settings=(MultiValue, NoAlias)):
def test_multivalue_and_auto(self):

class Color(Enum, settings=(MultiValue, AutoValue)):
red
red # pylint: disable=pointless-statement
green = 3, 'green'
blue
blue # pylint: disable=pointless-statement

self.assertEqual(Color.red.value, 1)
self.assertEqual(Color.green.value, 3)
Expand Down Expand Up @@ -3302,9 +3302,9 @@ def _generate_next_value_(name, start, count, last_values):
def test_autoenum_and_default_ignore(self):

class Color(AutoEnum):
red
green
blue
red # pylint: disable=pointless-statement
green # pylint: disable=pointless-statement
blue # pylint: disable=pointless-statement

@property
def cap_name(self):
Expand Down Expand Up @@ -3347,8 +3347,8 @@ class Auto(Enum, settings=Unique):
with self.assertRaises(ValueError):

class AutoUnique(Auto, settings=AutoValue):
BLAH
BLUH
BLAH # pylint: disable=pointless-statement
BLUH # pylint: disable=pointless-statement
ICK = 1

def test_timedelta(self):
Expand Down
50 changes: 25 additions & 25 deletions tests/test_flags.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,36 +96,36 @@ def test_member_contains(self):

def test_str(self):
Perm = self.Perm
self.assertEqual(str(Perm.R), 'Perm.R')
self.assertEqual(str(Perm.W), 'Perm.W')
self.assertEqual(str(Perm.X), 'Perm.X')
self.assertEqual(str(Perm.R | Perm.W), 'Perm.R|W')
self.assertEqual(str(Perm.R | Perm.W | Perm.X), 'Perm.R|W|X')
self.assertEqual(str(Perm(0)), 'Perm.0')
self.assertEqual(str(~Perm.R), 'Perm.W|X')
self.assertEqual(str(~Perm.W), 'Perm.R|X')
self.assertEqual(str(~Perm.X), 'Perm.R|W')
self.assertEqual(str(~(Perm.R | Perm.W)), 'Perm.X')
self.assertEqual(str(~(Perm.R | Perm.W | Perm.X)), 'Perm.0')
self.assertEqual(str(Perm(~0)), 'Perm.R|W|X')
assert str(Perm.R) == 'Perm.R'
assert str(Perm.W) == 'Perm.W'
assert str(Perm.X) == 'Perm.X'
assert str(Perm.R | Perm.W) == 'Perm.R|W'
assert str(Perm.R | Perm.W | Perm.X) == 'Perm.R|W|X'
assert str(Perm(0)) == 'Perm.0'
assert str(~Perm.R) == 'Perm.W|X'
assert str(~Perm.W) == 'Perm.R|X'
assert str(~Perm.X) == 'Perm.R|W'
assert str(~(Perm.R | Perm.W)) == 'Perm.X'
assert str(~(Perm.R | Perm.W | Perm.X)) == 'Perm.0'
assert str(Perm(~0)) == 'Perm.R|W|X'

Open = self.Open
self.assertEqual(str(Open.RO), 'Open.RO')
self.assertEqual(str(Open.WO), 'Open.WO')
self.assertEqual(str(Open.AC), 'Open.AC')
self.assertEqual(str(Open.RO | Open.CE), 'Open.CE')
self.assertEqual(str(Open.WO | Open.CE), 'Open.CE|WO')
self.assertEqual(str(~Open.RO), 'Open.CE|AC|RW|WO')
self.assertEqual(str(~Open.WO), 'Open.CE|RW')
self.assertEqual(str(~Open.AC), 'Open.CE')
self.assertEqual(str(~(Open.RO | Open.CE)), 'Open.AC')
self.assertEqual(str(~(Open.WO | Open.CE)), 'Open.RW')
assert str(Open.RO) == 'Open.RO'
assert str(Open.WO) == 'Open.WO'
assert str(Open.AC) == 'Open.AC'
assert str(Open.RO | Open.CE) == 'Open.CE'
assert str(Open.WO | Open.CE) == 'Open.CE|WO'
assert str(~Open.RO) == 'Open.CE|AC|RW|WO'
assert str(~Open.WO) == 'Open.CE|RW'
assert str(~Open.AC) == 'Open.CE'
assert str(~(Open.RO | Open.CE)) == 'Open.AC'
assert str(~(Open.WO | Open.CE)) == 'Open.RW'

def test_repr(self):
Perm = self.Perm
self.assertEqual(repr(Perm.R), '<Perm.R: 4>')
self.assertEqual(repr(Perm.W), '<Perm.W: 2>')
self.assertEqual(repr(Perm.X), '<Perm.X: 1>')
assert repr(Perm.R) == '<Perm.R: 4>'
assert repr(Perm.W) == '<Perm.W: 2>'
assert repr(Perm.X) == '<Perm.X: 1>'
self.assertEqual(repr(Perm.R | Perm.W), '<Perm.R|W: 6>')
self.assertEqual(repr(Perm.R | Perm.W | Perm.X), '<Perm.R|W|X: 7>')
self.assertEqual(repr(Perm(0)), '<Perm.0: 0>')
Expand Down
8 changes: 4 additions & 4 deletions tests/test_helpers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def tester(first, op, final, second=None):
left = auto()
value = op(left)
left.value = first
self.assertEqual(value.value, final, "%s %r -> %r != %r" % (op.__name__, first, value, final))
self.assertEqual(value.value, final, f"{op.__name__} {first!r} -> {value!r} != {final!r}")
else:
left = first
right = auto()
Expand All @@ -137,7 +137,7 @@ def tester(first, op, final, second=None):
self.assertEqual(
value.value,
final,
"forward: %r %s %r -> %r != %r" % (first, op.__name__, second, value.value, final)
f"forward: {first!r} {op.__name__} {second!r} -> {value.value!r} != {final!r}"
)
left = auto()
right = second
Expand All @@ -146,7 +146,7 @@ def tester(first, op, final, second=None):
self.assertEqual(
value.value,
final,
"reversed: %r %s %r -> %r != %r" % (second, op.__name__, first, value.value, final)
f"reversed: {second!r} {op.__name__} {first!r} -> {value.value!r} != {final!r}"
)

for args in (
Expand Down Expand Up @@ -177,7 +177,7 @@ def tester(first, op, final, second=None):
right = 'eggs'
value = _mod_(left, right)
left.value = 'I see 17 %s!'
self.assertEqual(value.value, 'I see 17 %s!' % 'eggs')
assert value.value == 'I see 17 %s!' % 'eggs'

def test_constant(self):
errors = []
Expand Down
Loading

0 comments on commit a1ac890

Please sign in to comment.