From 64af6e5ab40e3437858d4668b70a2811ea1e40d5 Mon Sep 17 00:00:00 2001 From: James Bowman Date: Thu, 18 Jan 2024 17:35:14 -0800 Subject: [PATCH] Try all qr_types when automatically sizing Add test coverage adafruit/Adafruit_CircuitPython_miniQR#27 --- adafruit_miniqr.py | 2 +- tests/test_unit.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/adafruit_miniqr.py b/adafruit_miniqr.py index 55b1cae..633fb63 100644 --- a/adafruit_miniqr.py +++ b/adafruit_miniqr.py @@ -95,7 +95,7 @@ def add_data(self, data): self.data_list.append(data) datalen = sum(len(x) for x in self.data_list) if not self.type: - for qr_type in range(1, 6): + for qr_type in range(1, 10): rs_blocks = _get_rs_blocks(qr_type, self.ECC) total_data_count = 0 for block in rs_blocks: diff --git a/tests/test_unit.py b/tests/test_unit.py index 87f7604..218a3de 100644 --- a/tests/test_unit.py +++ b/tests/test_unit.py @@ -59,8 +59,9 @@ def test_qr_pattern_mask(self): def test_qr_auto(self): # Confirm that increasing message size increases the matrix size monotonically sizes = [] - for i in range(14): # size 41 crashes - _m = enc(b"aBc!1234" * i) + for i in range(29): + msg = b"aBc!1234" * i + _m = enc(msg) sizes.append(_m.width) self.assertTrue(len(set(sizes)) > 1) self.assertEqual(sizes, sorted(sizes)) @@ -89,7 +90,7 @@ def test_qr_all(self): def test_qr_maximum(self): msg = bytes([random.randrange(32, 127) for i in range(230)]) - _a = enc(msg, qr_type=9) + _a = enc(msg) self.assertTrue(_a is not None)