Rearranging code: correcting unittests

led-badge-11x44.py

@@ -57,6 +57,8 @@ import time
 from array import array
 from datetime import datetime
 
+# There are 2 possibilities for accessing the device: using hidapi oer usb-core. Here we just try to import both
+# and decide later which one to use, see below in LedNameBadge._init_class().
 try:
     import pyhidapi
 except:

tests/test_led-badge-11x44.py

@@ -11,13 +11,13 @@ class Test(TestCase):
         self.test_date = datetime.datetime(2022, 11, 13, 17, 38, 24)
 
     def test_header_2msgs(self):
-        buf = testee.header((6, 7), (5, 3), (6, 2), (0, 1), (1, 0), 75, self.test_date)
+        buf = testee.LedNameBadge.header((6, 7), (5, 3), (6, 2), (0, 1), (1, 0), 75, self.test_date)
         self.assertEqual([119, 97, 110, 103, 0, 16, 254, 1, 70, 34, 34, 34, 34, 34, 34, 34, 0, 6, 0, 7, 0, 0, 0, 0, 0,
                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 11, 13, 17, 38, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0], buf)
 
     def test_header_8msgs(self):
-        buf = testee.header((1, 2, 3, 4, 5, 6, 7, 8),
+        buf = testee.LedNameBadge.header((1, 2, 3, 4, 5, 6, 7, 8),
                             (1, 2, 3, 4, 5, 6, 7, 8),
                             (1, 2, 3, 4, 5, 6, 7, 8),
                             (0, 1, 0, 1, 0, 1, 0, 1),
@@ -29,26 +29,26 @@ class Test(TestCase):
                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0], buf)
 
     def test_header_brightness(self):
-        buf = testee.header((6,), (4,), (4,), (0,), (0,), 25, self.test_date)
+        buf = testee.LedNameBadge.header((6,), (4,), (4,), (0,), (0,), 25, self.test_date)
         self.assertEqual([119, 97, 110, 103, 0, 64, 0, 0, 52, 52, 52, 52, 52, 52, 52, 52, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0,
                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 11, 13, 17, 38, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                           0, 0, 0, 0, 0, 0, 0, 0, 0], buf)
-        buf = testee.header((6,), (4,), (4,), (0,), (0,), 26, self.test_date)
+        buf = testee.LedNameBadge.header((6,), (4,), (4,), (0,), (0,), 26, self.test_date)
         self.assertEqual([119, 97, 110, 103, 0, 32, 0, 0, 52, 52, 52, 52, 52, 52, 52, 52, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0,
                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 11, 13, 17, 38, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                           0, 0, 0, 0, 0, 0, 0, 0, 0], buf)
-        buf = testee.header((6,), (4,), (4,), (0,), (0,), 60, self.test_date)
+        buf = testee.LedNameBadge.header((6,), (4,), (4,), (0,), (0,), 60, self.test_date)
         self.assertEqual([119, 97, 110, 103, 0, 16, 0, 0, 52, 52, 52, 52, 52, 52, 52, 52, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0,
                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 11, 13, 17, 38, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                           0, 0, 0, 0, 0, 0, 0, 0, 0], buf)
-        buf = testee.header((6,), (4,), (4,), (0,), (0,), 80, self.test_date)
+        buf = testee.LedNameBadge.header((6,), (4,), (4,), (0,), (0,), 80, self.test_date)
         self.assertEqual([119, 97, 110, 103, 0, 0, 0, 0, 52, 52, 52, 52, 52, 52, 52, 52, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0,
                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 11, 13, 17, 38, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                           0, 0, 0, 0, 0, 0, 0, 0, 0], buf)
 
     def test_header_date(self):
-        buf1 = testee.header((6,), (4,), (4,), (0,), (0,), 100, self.test_date)
+        buf1 = testee.LedNameBadge.header((6,), (4,), (4,), (0,), (0,), 100, self.test_date)
-        buf2 = testee.header((6,), (4,), (4,), (0,), (0,), 100)
+        buf2 = testee.LedNameBadge.header((6,), (4,), (4,), (0,), (0,), 100)
         self.assertEqual(buf1[0:38], buf2[0:38])
         self.assertEqual(buf1[38 + 6:], buf2[38 + 6:])
         self.assertNotEqual(buf1[38:38 + 6], buf2[38:38 + 6])