Properly handle when parsing other types of SMS PDUs (#16)

Author: DomAmato

Hologram/Network/Modem/Modem.py

@@ -550,9 +550,10 @@ def _parsePDU(self, header, pdu):
 
     # EFFECTS: Parses the rest of the sms pdu (sender).
     def _parse_sender(self, pdu, offset):
-
         sms_deliver = int(pdu[offset],16)
-        if sms_deliver & 0x03 != 0: return None
+        # options are SMS-SUBMIT, SMS-DELIVER or SMS-STATUS-REPORT
+        # we are looking for a deliver, return none for other types
+        if sms_deliver & 0x03 != 0: return None, offset
         offset += 1
         sender_len = int(pdu[offset:offset+2],16)
         offset += 2
@@ -889,4 +890,3 @@ def version(self):
     @property
     def imei(self):
         return self._basic_command('+GSN')
-

tests/Modem/test_Modem.py

@@ -8,6 +8,7 @@
 
 import pytest
 import sys
+from datetime import datetime
 
 sys.path.append(".")
 sys.path.append("..")
@@ -33,6 +34,12 @@ def mock_close_serial_port(modem):
 
 def mock_detect_usable_serial_port(modem, stop_on_first=True):
     return '/dev/ttyUSB0'
+    
+def mock_command_sms(modem, at_command):
+    return (ModemResult.OK, ['+CMGL: 2,1,,26', '0791447779071413040C9144977304250500007160421062944008D4F29C0E8AC966'])
+
+def mock_set_sms(modem, at_command, val):
+    return None
 
 @pytest.fixture
 def no_serial_port(monkeypatch):
@@ -43,6 +50,10 @@ def no_serial_port(monkeypatch):
     monkeypatch.setattr(Modem, 'closeSerialPort', mock_close_serial_port)
     monkeypatch.setattr(Modem, 'detect_usable_serial_port', mock_detect_usable_serial_port)
 
+@pytest.fixture
+def get_sms(monkeypatch):
+    monkeypatch.setattr(Modem, 'command', mock_command_sms)
+    monkeypatch.setattr(Modem, 'set', mock_set_sms)
 
 # CONSTRUCTOR
 
@@ -79,6 +90,14 @@ def test_get_location(no_serial_port):
         assert(modem.location == 'test location')
         assert('This modem does not support this property' in str(e))
 
+# SMS
+
+def test_get_sms(no_serial_port, get_sms):
+    modem = Modem()
+    res = modem.popReceivedSMS()
+    assert(res.sender == '447937405250')
+    assert(res.timestamp == datetime.utcfromtimestamp(1498264009))
+    assert(res.message == 'Test 123')
 
 # DEBUGWRITE