work on tests

Author: DomAmato

tests/Cloud/test_Cloud.py

@@ -15,45 +15,43 @@
 from Hologram.Cloud import Cloud
 from Hologram.Network import Network
 
-class TestCloud:
+def mock_scan():
+    return ['MockModem']
 
-    def mock_scan(self, network):
-        return ['MockModem']
+@pytest.fixture
+def no_modem(monkeypatch):
+    monkeypatch.setattr(Network, '_scan_for_modems', mock_scan)
 
-    @pytest.fixture
-    def no_modem(self, monkeypatch):
-        monkeypatch.setattr(Network, '_scan_for_modems', self.mock_scan)
+def test_create_send(no_modem):
+    cloud = Cloud(None, send_host = '127.0.0.1', send_port = 9999)
 
-    def test_create_send(self, no_modem):
-        cloud = Cloud(None, send_host = '127.0.0.1', send_port = 9999)
+    assert cloud.send_host == '127.0.0.1'
+    assert cloud.send_port == 9999
+    assert cloud.receive_host == ''
+    assert cloud.receive_port == 0
 
-        assert cloud.send_host == '127.0.0.1'
-        assert cloud.send_port == 9999
-        assert cloud.receive_host == ''
-        assert cloud.receive_port == 0
+def test_create_receive(no_modem):
+    cloud = Cloud(None, receive_host = '127.0.0.1', receive_port = 9999)
 
-    def test_create_receive(self, no_modem):
-        cloud = Cloud(None, receive_host = '127.0.0.1', receive_port = 9999)
+    assert cloud.send_host == ''
+    assert cloud.send_port == 0
+    assert cloud.receive_host == '127.0.0.1'
+    assert cloud.receive_port == 9999
 
-        assert cloud.send_host == ''
-        assert cloud.send_port == 0
-        assert cloud.receive_host == '127.0.0.1'
-        assert cloud.receive_port == 9999
+def test_invalid_send_message(no_modem):
+    cloud = Cloud(None, receive_host = '127.0.0.1', receive_port = 9999)
 
-    def test_invalid_send_message(self, no_modem):
-        cloud = Cloud(None, receive_host = '127.0.0.1', receive_port = 9999)
+    with pytest.raises(Exception, match = 'Must instantiate a Cloud type'):
+        cloud.sendMessage("hello SMS")
 
-        with pytest.raises(Exception, match = 'Must instantiate a Cloud type'):
-            cloud.sendMessage("hello SMS")
+def test_invalid_send_sms(no_modem):
+    cloud = Cloud(None, send_host = '127.0.0.1', send_port = 9999)
 
-    def test_invalid_send_sms(self, no_modem):
-        cloud = Cloud(None, send_host = '127.0.0.1', send_port = 9999)
+    with pytest.raises(Exception, match = 'Must instantiate a Cloud type'):
+        cloud.sendSMS('+12345678900', 'hello SMS')
 
-        with pytest.raises(Exception, match = 'Must instantiate a Cloud type'):
-            cloud.sendSMS('+12345678900', 'hello SMS')
+# This is good for testing if we updated the internal SDK version numbers before release.
+def test_sdk_version(no_modem):
+    cloud = Cloud(None, send_host = '127.0.0.1', send_port = 9999)
 
-    # This is good for testing if we updated the internal SDK version numbers before release.
-    def test_sdk_version(self, no_modem):
-        cloud = Cloud(None, send_host = '127.0.0.1', send_port = 9999)
-
-        assert cloud.version == '0.9.0'
+    assert cloud.version == '0.9.0'

tests/Cloud/test_CustomCloud.py

@@ -15,48 +15,46 @@
 from Hologram.CustomCloud import CustomCloud
 from Hologram.Network import Network
 
-class TestCustomCloud:
+def mock_scan(self):
+    return ['MockModem']
 
-    def mock_scan(self, network):
-        return ['MockModem']
+@pytest.fixture
+def no_modem(monkeypatch):
+    monkeypatch.setattr(Network, '_scan_for_modems', mock_scan)
 
-    @pytest.fixture
-    def no_modem(self, monkeypatch):
-        monkeypatch.setattr(Network, '_scan_for_modems', self.mock_scan)
+def test_create_send(no_modem):
+    customCloud = CustomCloud(None, send_host='127.0.0.1',
+                                send_port=9999, enable_inbound=False)
 
-    def test_create_send(self, no_modem):
-        customCloud = CustomCloud(None, send_host='127.0.0.1',
-                                  send_port=9999, enable_inbound=False)
+    assert customCloud.send_host == '127.0.0.1'
+    assert customCloud.send_port == 9999
+    assert customCloud.receive_host == ''
+    assert customCloud.receive_port == 0
 
-        assert customCloud.send_host == '127.0.0.1'
-        assert customCloud.send_port == 9999
-        assert customCloud.receive_host == ''
-        assert customCloud.receive_port == 0
+def test_create_receive(no_modem):
+    customCloud = CustomCloud(None, receive_host='127.0.0.1',
+                                receive_port=9999, enable_inbound=False)
 
-    def test_create_receive(self, no_modem):
-        customCloud = CustomCloud(None, receive_host='127.0.0.1',
-                                  receive_port=9999, enable_inbound=False)
+    assert customCloud.send_host == ''
+    assert customCloud.send_port == 0
+    assert customCloud.receive_host == '127.0.0.1'
+    assert customCloud.receive_port == 9999
 
-        assert customCloud.send_host == ''
-        assert customCloud.send_port == 0
-        assert customCloud.receive_host == '127.0.0.1'
-        assert customCloud.receive_port == 9999
+def test_enable_inbound(no_modem):
 
-    def test_enable_inbound(self, no_modem):
+    with pytest.raises(Exception, match='Must set receive host and port for inbound connection'):
+        customCloud = CustomCloud(None, send_host='receive.com',
+                                    send_port=9999, enable_inbound=True)
 
-        with pytest.raises(Exception, match='Must set receive host and port for inbound connection'):
-            customCloud = CustomCloud(None, send_host='receive.com',
-                                      send_port=9999, enable_inbound=True)
+def test_invalid_send_host_and_port(no_modem):
+    customCloud = CustomCloud(None, receive_host='receive.com', receive_port=9999)
 
-    def test_invalid_send_host_and_port(self, no_modem):
-        customCloud = CustomCloud(None, receive_host='receive.com', receive_port=9999)
+    with pytest.raises(Exception, match = 'Send host and port must be set before making this operation'):
+        customCloud.sendMessage("hello")
 
-        with pytest.raises(Exception, match = 'Send host and port must be set before making this operation'):
-            customCloud.sendMessage("hello")
+def test_invalid_send_sms(no_modem):
+    customCloud = CustomCloud(None, 'test.com', 9999)
 
-    def test_invalid_send_sms(self, no_modem):
-        customCloud = CustomCloud(None, 'test.com', 9999)
-
-        temp = "hello"
-        with pytest.raises(NotImplementedError, match='Cannot send SMS via custom cloud'):
-            customCloud.sendSMS('+1234567890', temp)
+    temp = "hello"
+    with pytest.raises(NotImplementedError, match='Cannot send SMS via custom cloud'):
+        customCloud.sendSMS('+1234567890', temp)

tests/Cloud/test_HologramCloud.py

@@ -17,42 +17,40 @@
 
 credentials = {'devicekey':'12345678'}
 
-class TestHologramCloud:
+def mock_scan(network):
+    return ['MockModem']
 
-    def mock_scan(self, network):
-        return ['MockModem']
+@pytest.fixture
+def no_modem(monkeypatch):
+    monkeypatch.setattr(Network, '_scan_for_modems', mock_scan)
 
-    @pytest.fixture
-    def no_modem(self, monkeypatch):
-        monkeypatch.setattr(Network, '_scan_for_modems', self.mock_scan)
+def test_create(no_modem):
+    hologram = HologramCloud(credentials, enable_inbound = False)
 
-    def test_create(self, no_modem):
-        hologram = HologramCloud(credentials, enable_inbound = False)
+    assert hologram.send_host == 'cloudsocket.hologram.io'
+    assert hologram.send_port == 9999
+    assert hologram.receive_host == '0.0.0.0'
+    assert hologram.receive_port == 4010
 
-        assert hologram.send_host == 'cloudsocket.hologram.io'
-        assert hologram.send_port == 9999
-        assert hologram.receive_host == '0.0.0.0'
-        assert hologram.receive_port == 4010
+def test_invalid_sms_length(no_modem):
 
-    def test_invalid_sms_length(self, no_modem):
+    hologram = HologramCloud(credentials, authentication_type='csrpsk', enable_inbound = False)
 
-        hologram = HologramCloud(credentials, authentication_type='csrpsk', enable_inbound = False)
+    temp = '111111111234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890'
+    with pytest.raises(Exception, match = 'SMS cannot be more than 160 characters long'):
+        hologram.sendSMS('+1234567890', temp)
 
-        temp = '111111111234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890'
-        with pytest.raises(Exception, match = 'SMS cannot be more than 160 characters long'):
-            hologram.sendSMS('+1234567890', temp)
+def test_get_result_string(no_modem):
 
-    def test_get_result_string(self, no_modem):
+    hologram = HologramCloud(credentials, enable_inbound = False)
 
-        hologram = HologramCloud(credentials, enable_inbound = False)
-
-        assert hologram.getResultString(-1) == 'Unknown error'
-        assert hologram.getResultString(0) == 'Message sent successfully'
-        assert hologram.getResultString(1) == 'Connection was closed so we couldn\'t read the whole message'
-        assert hologram.getResultString(2) == 'Failed to parse the message'
-        assert hologram.getResultString(3) == 'Auth section of the message was invalid'
-        assert hologram.getResultString(4) == 'Payload type was invalid'
-        assert hologram.getResultString(5) == 'Protocol type was invalid'
-        assert hologram.getResultString(6) == 'Internal error in Hologram Cloud'
-        assert hologram.getResultString(7) == 'Metadata was formatted incorrectly'
-        assert hologram.getResultString(8) == 'Topic was formatted incorrectly'
+    assert hologram.getResultString(-1) == 'Unknown error'
+    assert hologram.getResultString(0) == 'Message sent successfully'
+    assert hologram.getResultString(1) == 'Connection was closed so we couldn\'t read the whole message'
+    assert hologram.getResultString(2) == 'Failed to parse the message'
+    assert hologram.getResultString(3) == 'Auth section of the message was invalid'
+    assert hologram.getResultString(4) == 'Payload type was invalid'
+    assert hologram.getResultString(5) == 'Protocol type was invalid'
+    assert hologram.getResultString(6) == 'Internal error in Hologram Cloud'
+    assert hologram.getResultString(7) == 'Metadata was formatted incorrectly'
+    assert hologram.getResultString(8) == 'Topic was formatted incorrectly'

tests/Network/test_Network.py

@@ -14,17 +14,6 @@
 sys.path.append("../..")
 from Hologram.Network import Network
 
-class TestNetwork:
 
-    def test_create_network(self):
-        network = Network()
-
-    def test_get_invalid_connection_status(self):
-        network = Network()
-        with pytest.raises(Exception, match = 'Must instantiate a defined Network type'):
-            connectionStatus = network.getConnectionStatus()
-
-    def test_get_invalid_signal_strength(self):
-        network = Network()
-        with pytest.raises(Exception, match = 'Must instantiate a defined Network type'):
-            connectionStatus = network.getSignalStrength()
+def test_create_network(self):
+    network = Network()

tests/PPP/test_IPPP.py

@@ -15,7 +15,7 @@
 class TestIPPP:
 
     def test_modem_mode_create(self):
-        modem_mode = IPPP(device_name='/dev/ttyUSB0', baud_rate='9600')
+        modem_mode = IPPP(device_name='/dev/ttyUSB0', baud_rate='9600',chatscript_file='test')
 
         assert modem_mode.device_name == '/dev/ttyUSB0'
         assert modem_mode.baud_rate == '9600'