Cube serial number

maxcube/cube.py

@@ -144,6 +144,7 @@ def parse_c_message(self, message):
     def parse_h_message(self, message):
         logger.debug('Parsing h_message: ' + message)
         tokens = message.split(',')
+        self.serial = tokens[0]
         self.rf_address = tokens[1]
         self.firmware_version = (tokens[2][0:2]) + '.' + (tokens[2][2:4])
 

sample/sample.py

@@ -12,6 +12,7 @@
 
 cube = MaxCube('192.168.0.20', 62910)
 
+print("Serial: %s" % (cube.serial))
 for room in cube.rooms:
     print("Room: " + room.name)
     for device in cube.devices_by_room(room):

tests/test_connection.py

@@ -23,25 +23,25 @@ def testReadAMessage(self, socketMock):
         self.connect(socketMock)
         self.socket.recv.return_value = b'A:B\r\n'
 
-        self.assertEquals(Message('A', 'B'),
+        self.assertEqual(Message('A', 'B'),
             self.connection.recv(TEST_TIMEOUT.deadline()))
         self.socket.close.assert_not_called()
 
     def testReadPartialLine(self, socketMock):
         self.connect(socketMock)
         self.socket.recv.side_effect = [b'A:', b'B\r\n']
 
-        self.assertEquals(Message('A', 'B'),
+        self.assertEqual(Message('A', 'B'),
             self.connection.recv(TEST_TIMEOUT.deadline()))
 
     def testReadMultipleLines(self, socketMock):
         self.connect(socketMock)
         self.socket.recv.return_value = b'A:B\r\nC\r\n'
 
-        self.assertEquals(Message('A', 'B'),
+        self.assertEqual(Message('A', 'B'),
             self.connection.recv(TEST_TIMEOUT.deadline()))
         self.socket.recv.reset_mock()
-        self.assertEquals(Message('C', ''),
+        self.assertEqual(Message('C', ''),
             self.connection.recv(TEST_TIMEOUT.deadline()))
 
     def testReadAtConnectionClosing(self, socketMock):

tests/test_cube.py

@@ -102,6 +102,7 @@ def init(self, ClassMock, responses):
 
     def test_init(self, ClassMock):
         self.init(ClassMock, INIT_RESPONSE_1)
+        self.assertEqual('KEQ0566338', self.cube.serial)
         self.assertEqual('0b6475', self.cube.rf_address)
         self.assertEqual('Cube', self.cube.name)
         self.assertEqual('01.13', self.cube.firmware_version)
@@ -234,6 +235,7 @@ def test_set_mode_thermostat(self, ClassMock):
 
     def test_init_2(self, ClassMock):
         self.init(ClassMock, INIT_RESPONSE_2)
+        self.assertEqual('JEQ0341267', self.cube.serial)
         self.assertEqual('015d2a', self.cube.rf_address)
         self.assertEqual('Cube', self.cube.name)
         self.assertEqual('01.13', self.cube.firmware_version)

tests/test_deadline.py

@@ -32,14 +32,14 @@ def testDeadlineIsExpired(self, timeMock):
     def testZeroDeadlineIsAlreadyExpired(self, timeMock):
         timeMock.side_effect = [0.0, 0.0]
         deadline = ZERO_TIMEOUT.deadline()
-        self.assertEquals('zero', deadline.fullname())
+        self.assertEqual('zero', deadline.fullname())
         self.assertTrue(deadline.is_expired())
 
     def testSubtimeoutHandling(self, timeMock):
         timeMock.side_effect = [0.0, 0.1, 0.2]
         deadline = ROOT_TIMEOUT.deadline()
         subdeadline = deadline.subtimeout(ONE_TIMEOUT)
-        self.assertEquals('root:one', subdeadline.fullname())
+        self.assertEqual('root:one', subdeadline.fullname())
         self.assertAlmostEqual(0.9, subdeadline.remaining())
 
     def testSubtimeoutHandlingWhenLargerThanTimeout(self, timeMock):
@@ -51,9 +51,9 @@ def testSubtimeoutHandlingWhenLargerThanTimeout(self, timeMock):
     def testToString(self, timeMock):
         timeMock.side_effect = [0.0, 0.1]
         deadline = ONE_TIMEOUT.deadline()
-        self.assertEquals('Deadline one will expire in 0.900 seconds', str(deadline))
+        self.assertEqual('Deadline one will expire in 0.900 seconds', str(deadline))
 
     def testToStringForExpiredDeadline(self, timeMock):
         timeMock.side_effect = [0.0, 1.1]
         deadline = ONE_TIMEOUT.deadline()
-        self.assertEquals('Deadline one expired 0.100 seconds ago', str(deadline))
+        self.assertEqual('Deadline one expired 0.100 seconds ago', str(deadline))

tests/test_message.py

@@ -7,9 +7,9 @@ class TestMessage(TestCase):
     def testDecodeValidMessage(self):
         line = b's:AARAAAAABrxTAWo=\r\n'
         msg = Message.decode(line)
-        self.assertEquals(Message('s', 'AARAAAAABrxTAWo='), msg)
-        self.assertEquals('S', msg.reply_cmd())
-        self.assertEquals(line, msg.encode())
+        self.assertEqual(Message('s', 'AARAAAAABrxTAWo='), msg)
+        self.assertEqual('S', msg.reply_cmd())
+        self.assertEqual(line, msg.encode())
 
     def testDecodeEmptyMessage(self):
-        self.assertEquals(Message(''), Message.decode(b'\r\n'))
+        self.assertEqual(Message(''), Message.decode(b'\r\n'))