diff options
| author | Rahul Jha <rj722@protonmail.com> | 2018-09-10 18:21:04 (GMT) |
|---|---|---|
| committer | Ethan Furman <ethan@stoneleaf.us> | 2018-09-10 18:21:04 (GMT) |
| commit | 9430652535f88125d8003f342a8884d34885d876 (patch) | |
| tree | d0b6fff5561ab141a9209c9f78c242979b94e222 /Lib/test/test_enum.py | |
| parent | 51a4743d19abd016f0772a57fb31df7af9220e18 (diff) | |
| download | cpython-9430652535f88125d8003f342a8884d34885d876.zip cpython-9430652535f88125d8003f342a8884d34885d876.tar.gz cpython-9430652535f88125d8003f342a8884d34885d876.tar.bz2 | |
bpo-33217: Raise TypeError for non-Enum lookups in Enums (GH-6651)
* bpo-33217: Raise TypeError for non-Enum lookups in Enums
Diffstat (limited to 'Lib/test/test_enum.py')
| -rw-r--r-- | Lib/test/test_enum.py | 55 |
1 files changed, 52 insertions, 3 deletions
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index 9755971..68483e6 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -325,7 +325,10 @@ class TestEnum(unittest.TestCase): def test_contains(self): Season = self.Season self.assertIn(Season.AUTUMN, Season) - self.assertNotIn(3, Season) + with self.assertRaises(TypeError): + 3 in Season + with self.assertRaises(TypeError): + 'AUTUMN' in Season val = Season(3) self.assertIn(val, Season) @@ -1752,6 +1755,13 @@ class TestFlag(unittest.TestCase): AC = 3 CE = 1<<19 + class Color(Flag): + BLACK = 0 + RED = 1 + GREEN = 2 + BLUE = 4 + PURPLE = RED|BLUE + def test_str(self): Perm = self.Perm self.assertEqual(str(Perm.R), 'Perm.R') @@ -1954,7 +1964,21 @@ class TestFlag(unittest.TestCase): test_pickle_dump_load(self.assertIs, FlagStooges.CURLY|FlagStooges.MOE) test_pickle_dump_load(self.assertIs, FlagStooges) - def test_containment(self): + def test_contains(self): + Open = self.Open + Color = self.Color + self.assertFalse(Color.BLACK in Open) + self.assertFalse(Open.RO in Color) + with self.assertRaises(TypeError): + 'BLACK' in Color + with self.assertRaises(TypeError): + 'RO' in Open + with self.assertRaises(TypeError): + 1 in Color + with self.assertRaises(TypeError): + 1 in Open + + def test_member_contains(self): Perm = self.Perm R, W, X = Perm RW = R | W @@ -2072,6 +2096,13 @@ class TestIntFlag(unittest.TestCase): AC = 3 CE = 1<<19 + class Color(IntFlag): + BLACK = 0 + RED = 1 + GREEN = 2 + BLUE = 4 + PURPLE = RED|BLUE + def test_type(self): Perm = self.Perm Open = self.Open @@ -2340,7 +2371,23 @@ class TestIntFlag(unittest.TestCase): self.assertEqual(len(lst), len(Thing)) self.assertEqual(len(Thing), 0, Thing) - def test_containment(self): + def test_contains(self): + Open = self.Open + Color = self.Color + self.assertTrue(Color.GREEN in Color) + self.assertTrue(Open.RW in Open) + self.assertFalse(Color.GREEN in Open) + self.assertFalse(Open.RW in Color) + with self.assertRaises(TypeError): + 'GREEN' in Color + with self.assertRaises(TypeError): + 'RW' in Open + with self.assertRaises(TypeError): + 2 in Color + with self.assertRaises(TypeError): + 2 in Open + + def test_member_contains(self): Perm = self.Perm R, W, X = Perm RW = R | W @@ -2359,6 +2406,8 @@ class TestIntFlag(unittest.TestCase): self.assertFalse(R in WX) self.assertFalse(W in RX) self.assertFalse(X in RW) + with self.assertRaises(TypeError): + self.assertFalse('test' in RW) def test_bool(self): Perm = self.Perm |