Rewrite assertions to regular/pytest style

Author: akx

qrcode/tests/test_qrcode.py

@@ -1,3 +1,4 @@
+import pytest
 import io
 import unittest
 from unittest import mock
@@ -22,15 +23,18 @@ def test_large(self):
         qr.make(fit=False)
 
     def test_invalid_version(self):
-        self.assertRaises(ValueError, qrcode.QRCode, version=41)
+        with pytest.raises(ValueError):
+            qrcode.QRCode(version=42)
 
     def test_invalid_border(self):
-        self.assertRaises(ValueError, qrcode.QRCode, border=-1)
+        with pytest.raises(ValueError):
+            qrcode.QRCode(border=-1)
 
     def test_overflow(self):
         qr = qrcode.QRCode(version=1)
         qr.add_data("abcdefghijklmno")
-        self.assertRaises(DataOverflowError, qr.make, fit=False)
+        with pytest.raises(DataOverflowError):
+            qr.make(fit=False)
 
     def test_add_qrdata(self):
         qr = qrcode.QRCode(version=1)
@@ -42,71 +46,71 @@ def test_fit(self):
         qr = qrcode.QRCode()
         qr.add_data("a")
         qr.make()
-        self.assertEqual(qr.version, 1)
+        assert qr.version == 1
         qr.add_data("bcdefghijklmno")
         qr.make()
-        self.assertEqual(qr.version, 2)
+        assert qr.version == 2
 
     def test_mode_number(self):
         qr = qrcode.QRCode()
         qr.add_data("1234567890123456789012345678901234", optimize=0)
         qr.make()
-        self.assertEqual(qr.version, 1)
-        self.assertEqual(qr.data_list[0].mode, MODE_NUMBER)
+        assert qr.version == 1
+        assert qr.data_list[0].mode == MODE_NUMBER
 
     def test_mode_alpha(self):
         qr = qrcode.QRCode()
         qr.add_data("ABCDEFGHIJ1234567890", optimize=0)
         qr.make()
-        self.assertEqual(qr.version, 1)
-        self.assertEqual(qr.data_list[0].mode, MODE_ALPHA_NUM)
+        assert qr.version == 1
+        assert qr.data_list[0].mode == MODE_ALPHA_NUM
 
     def test_regression_mode_comma(self):
         qr = qrcode.QRCode()
         qr.add_data(",", optimize=0)
         qr.make()
-        self.assertEqual(qr.data_list[0].mode, MODE_8BIT_BYTE)
+        assert qr.data_list[0].mode == MODE_8BIT_BYTE
 
     def test_mode_8bit(self):
         qr = qrcode.QRCode()
         qr.add_data("abcABC" + UNICODE_TEXT, optimize=0)
         qr.make()
-        self.assertEqual(qr.version, 1)
-        self.assertEqual(qr.data_list[0].mode, MODE_8BIT_BYTE)
+        assert qr.version == 1
+        assert qr.data_list[0].mode == MODE_8BIT_BYTE
 
     def test_mode_8bit_newline(self):
         qr = qrcode.QRCode()
         qr.add_data("ABCDEFGHIJ1234567890\n", optimize=0)
         qr.make()
-        self.assertEqual(qr.data_list[0].mode, MODE_8BIT_BYTE)
+        assert qr.data_list[0].mode == MODE_8BIT_BYTE
 
     def test_make_image_with_wrong_pattern(self):
-        with self.assertRaises(TypeError):
+        with pytest.raises(TypeError):
             qrcode.QRCode(mask_pattern="string pattern")
 
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
             qrcode.QRCode(mask_pattern=-1)
 
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
             qrcode.QRCode(mask_pattern=42)
 
     def test_mask_pattern_setter(self):
         qr = qrcode.QRCode()
 
-        with self.assertRaises(TypeError):
+        with pytest.raises(TypeError):
             qr.mask_pattern = "string pattern"
 
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
             qr.mask_pattern = -1
 
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
             qr.mask_pattern = 8
 
     def test_qrcode_bad_factory(self):
-        with self.assertRaises(TypeError):
+        with pytest.raises(TypeError):
             qrcode.QRCode(image_factory="not_BaseImage")  # type: ignore
 
-        with self.assertRaises(AssertionError):
+        with pytest.raises(AssertionError):
             qrcode.QRCode(image_factory=dict)  # type: ignore
 
     def test_qrcode_factory(self):
@@ -117,69 +121,58 @@ class MockFactory(BaseImage):
         qr = qrcode.QRCode(image_factory=MockFactory)
         qr.add_data(UNICODE_TEXT)
         qr.make_image()
-        self.assertTrue(MockFactory.new_image.called)
-        self.assertTrue(MockFactory.drawrect.called)
+        assert MockFactory.new_image.called
+        assert MockFactory.drawrect.called
 
     def test_optimize(self):
         qr = qrcode.QRCode()
         text = "A1abc12345def1HELLOa"
         qr.add_data(text, optimize=4)
         qr.make()
-        self.assertEqual(
-            [d.mode for d in qr.data_list],
-            [
-                MODE_8BIT_BYTE,
-                MODE_NUMBER,
-                MODE_8BIT_BYTE,
-                MODE_ALPHA_NUM,
-                MODE_8BIT_BYTE,
-            ],
-        )
-        self.assertEqual(qr.version, 2)
+        assert [d.mode for d in qr.data_list] == [MODE_8BIT_BYTE, MODE_NUMBER, MODE_8BIT_BYTE, MODE_ALPHA_NUM, MODE_8BIT_BYTE]
+        assert qr.version == 2
 
     def test_optimize_short(self):
         qr = qrcode.QRCode()
         text = "A1abc1234567def1HELLOa"
         qr.add_data(text, optimize=7)
         qr.make()
-        self.assertEqual(len(qr.data_list), 3)
-        self.assertEqual(
-            [d.mode for d in qr.data_list],
-            [MODE_8BIT_BYTE, MODE_NUMBER, MODE_8BIT_BYTE],
-        )
-        self.assertEqual(qr.version, 2)
+        assert len(qr.data_list) == 3
+        assert [d.mode for d in qr.data_list] == [MODE_8BIT_BYTE, MODE_NUMBER, MODE_8BIT_BYTE]
+        assert qr.version == 2
 
     def test_optimize_longer_than_data(self):
         qr = qrcode.QRCode()
         text = "ABCDEFGHIJK"
         qr.add_data(text, optimize=12)
-        self.assertEqual(len(qr.data_list), 1)
-        self.assertEqual(qr.data_list[0].mode, MODE_ALPHA_NUM)
+        assert len(qr.data_list) == 1
+        assert qr.data_list[0].mode == MODE_ALPHA_NUM
 
     def test_optimize_size(self):
         text = "A1abc12345123451234512345def1HELLOHELLOHELLOHELLOa" * 5
 
         qr = qrcode.QRCode()
         qr.add_data(text)
         qr.make()
-        self.assertEqual(qr.version, 10)
+        assert qr.version == 10
 
         qr = qrcode.QRCode()
         qr.add_data(text, optimize=0)
         qr.make()
-        self.assertEqual(qr.version, 11)
+        assert qr.version == 11
 
     def test_qrdata_repr(self):
         data = b"hello"
         data_obj = qrcode.util.QRData(data)
-        self.assertEqual(repr(data_obj), repr(data))
+        assert repr(data_obj) == repr(data)
 
     def test_print_ascii_stdout(self):
         qr = qrcode.QRCode()
         with mock.patch("sys.stdout") as fake_stdout:
             fake_stdout.isatty.return_value = None
-            self.assertRaises(OSError, qr.print_ascii, tty=True)
-            self.assertTrue(fake_stdout.isatty.called)
+            with pytest.raises(OSError):
+                qr.print_ascii(tty=True)
+            assert fake_stdout.isatty.called
 
     def test_print_ascii(self):
         qr = qrcode.QRCode(border=0)
@@ -188,7 +181,7 @@ def test_print_ascii(self):
         printed = f.getvalue()
         f.close()
         expected = "\u2588\u2580\u2580\u2580\u2580\u2580\u2588"
-        self.assertEqual(printed[: len(expected)], expected)
+        assert printed[:len(expected)] == expected
 
         f = io.StringIO()
         f.isatty = lambda: True
@@ -198,14 +191,14 @@ def test_print_ascii(self):
         expected = (
             "\x1b[48;5;232m\x1b[38;5;255m" + "\xa0\u2584\u2584\u2584\u2584\u2584\xa0"
         )
-        self.assertEqual(printed[: len(expected)], expected)
+        assert printed[:len(expected)] == expected
 
     def test_print_tty_stdout(self):
         qr = qrcode.QRCode()
         with mock.patch("sys.stdout") as fake_stdout:
             fake_stdout.isatty.return_value = None
-            self.assertRaises(OSError, qr.print_tty)
-            self.assertTrue(fake_stdout.isatty.called)
+            pytest.raises(OSError, qr.print_tty)
+            assert fake_stdout.isatty.called
 
     def test_print_tty(self):
         qr = qrcode.QRCode()
@@ -221,23 +214,25 @@ def test_print_tty(self):
         expected = (
             BOLD_WHITE_BG + "  " * 23 + EOL + WHITE_BLOCK + "  " * 7 + WHITE_BLOCK
         )
-        self.assertEqual(printed[: len(expected)], expected)
+        assert printed[:len(expected)] == expected
 
     def test_get_matrix(self):
         qr = qrcode.QRCode(border=0)
         qr.add_data("1")
-        self.assertEqual(qr.get_matrix(), qr.modules)
+        assert qr.get_matrix() == qr.modules
 
     def test_get_matrix_border(self):
         qr = qrcode.QRCode(border=1)
         qr.add_data("1")
         matrix = [row[1:-1] for row in qr.get_matrix()[1:-1]]
-        self.assertEqual(matrix, qr.modules)
+        assert matrix == qr.modules
 
     def test_negative_size_at_construction(self):
-        self.assertRaises(ValueError, qrcode.QRCode, box_size=-1)
+        with pytest.raises(ValueError):
+            qrcode.QRCode(box_size=-1)
 
     def test_negative_size_at_usage(self):
         qr = qrcode.QRCode()
         qr.box_size = -1
-        self.assertRaises(ValueError, qr.make_image)
+        with pytest.raises(ValueError):
+            qr.make_image()

qrcode/tests/test_qrcode_pil.py

@@ -20,7 +20,7 @@ def test_render_pil(self):
         qr.add_data(UNICODE_TEXT)
         img = qr.make_image()
         img.save(io.BytesIO())
-        self.assertIsInstance(img.get_image(), Image.Image)
+        assert isinstance(img.get_image(), Image.Image)
 
     def test_render_pil_with_transparent_background(self):
         qr = qrcode.QRCode()

qrcode/tests/test_script.py

@@ -1,3 +1,4 @@
+import pytest
 import io
 import os
 import sys
@@ -38,7 +39,7 @@ def test_piped(self, mock_stdout):
     def test_stdin(self, mock_stdin, mock_print_ascii):
         mock_stdin.buffer.read.return_value = "testtext"
         main([])
-        self.assertTrue(mock_stdin.buffer.read.called)
+        assert mock_stdin.buffer.read.called
         mock_print_ascii.assert_called_with(tty=True)
 
     @mock.patch("os.isatty", lambda *args: True)
@@ -49,7 +50,8 @@ def test_stdin_py3_unicodedecodeerror(self, mock_print_ascii):
         mock_stdin.read.side_effect = bad_read
         with mock.patch("sys.stdin", mock_stdin):
             # sys.stdin.read() will raise an error...
-            self.assertRaises(UnicodeDecodeError, sys.stdin.read)
+            with pytest.raises(UnicodeDecodeError):
+                sys.stdin.read()
             # ... but it won't be used now.
             main([])
         mock_print_ascii.assert_called_with(tty=True)
@@ -81,25 +83,23 @@ def test_output(self):
     @mock.patch("sys.stderr", new_callable=io.StringIO)
     @unittest.skipIf(not Image, "Requires PIL")
     def test_factory_drawer_none(self, mock_stderr):
-        with self.assertRaises(SystemExit):
+        with pytest.raises(SystemExit):
             main("testtext --factory pil --factory-drawer nope".split())
-        self.assertIn(
-            "The selected factory has no drawer aliases", mock_stderr.getvalue()
-        )
+        assert 'The selected factory has no drawer aliases' in mock_stderr.getvalue()
 
     @mock.patch("sys.stderr", new_callable=io.StringIO)
     def test_factory_drawer_bad(self, mock_stderr):
-        with self.assertRaises(SystemExit):
+        with pytest.raises(SystemExit):
             main("testtext --factory svg --factory-drawer sobad".split())
-        self.assertIn("sobad factory drawer not found", mock_stderr.getvalue())
+        assert 'sobad factory drawer not found' in mock_stderr.getvalue()
 
     @mock.patch("sys.stderr", new_callable=io.StringIO)
     def test_factory_drawer(self, mock_stderr):
         main("testtext --factory svg --factory-drawer circle".split())
 
     def test_commas(self):
-        self.assertEqual(commas([]), "")
-        self.assertEqual(commas(["A"]), "A")
-        self.assertEqual(commas("AB"), "A or B")
-        self.assertEqual(commas("ABC"), "A, B or C")
-        self.assertEqual(commas("ABC", joiner="and"), "A, B and C")
+        assert commas([]) == ''
+        assert commas(['A']) == 'A'
+        assert commas('AB') == 'A or B'
+        assert commas('ABC') == 'A, B or C'
+        assert commas('ABC', joiner='and') == 'A, B and C'

qrcode/tests/test_util.py

@@ -1,12 +1,13 @@
+import pytest
 import unittest
 
 from qrcode import util
 
 
 class UtilTests(unittest.TestCase):
     def test_check_wrong_version(self):
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
             util.check_version(0)
 
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
             util.check_version(41)