Renamed messaging module

pyproject.toml

@@ -45,4 +45,4 @@ markers = [
 ]
 
 [tool.coverage.run]
-omit = ["*example.py", "*__init__.py"]
+omit = ["*example.py", "*__init__.py", "queries.py"]

src/iotdevicesimulator/devices.py

@@ -3,7 +3,7 @@
 import logging
 from iotdevicesimulator.queries import CosmosQuery
 from iotdevicesimulator.db import Oracle
-from iotdevicesimulator.mqtt.aws import IotCoreMQTTConnection
+from iotdevicesimulator.messaging.aws import IotCoreMQTTConnection
 import random
 
 logger = logging.getLogger(__name__)

src/iotdevicesimulator/example.py

@@ -2,7 +2,7 @@
 
 from iotdevicesimulator.queries import CosmosQuery
 from iotdevicesimulator.swarm import CosmosSwarm
-from iotdevicesimulator.mqtt.aws import IotCoreMQTTConnection
+from iotdevicesimulator.messaging.aws import IotCoreMQTTConnection
 import asyncio
 import config
 from pathlib import Path

src/iotdevicesimulator/mqtt/aws.py → src/iotdevicesimulator/messaging/aws.py

@@ -6,7 +6,7 @@
 import time
 import json
 from awscrt.exceptions import AwsCrtError
-from iotdevicesimulator.mqtt.core import MessagingBaseClass
+from iotdevicesimulator.messaging.core import MessagingBaseClass
 import backoff
 import logging
 
@@ -157,18 +157,20 @@ def _on_connection_closed(connection, callback_data):  # pragma: no cover
         print("Connection closed")
 
     @backoff.on_exception(backoff.expo, exception=AwsCrtError, logger=logger)
-    def _connect(self):
+    def _connect(self):  # pragma: no cover
         connect_future = self.connection.connect()
         connect_future.result()
         print("Connected!")
 
     @backoff.on_exception(backoff.expo, exception=AwsCrtError, logger=logger)
-    def _disconnect(self):
+    def _disconnect(self):  # pragma: no cover
         print("Disconnecting...")
         disconnect_future = self.connection.disconnect()
         disconnect_future.result()
 
-    def send_message(self, message: str, topic: str, count: int = 1) -> None:
+    def send_message(
+        self, message: str, topic: str, count: int = 1
+    ) -> None:  # pragma: no cover
         """Sends a message to the endpoint.
 
         Args:

src/iotdevicesimulator/swarm.py

@@ -3,7 +3,7 @@
 from iotdevicesimulator.devices import SensorSite
 from iotdevicesimulator.db import Oracle
 from iotdevicesimulator.queries import CosmosQuery
-from iotdevicesimulator.mqtt.core import MessagingBaseClass
+from iotdevicesimulator.messaging.core import MessagingBaseClass
 import logging.config
 from typing import List
 from pathlib import Path

src/tests/test_devices.py

@@ -4,7 +4,7 @@
 from iotdevicesimulator.devices import SensorSite
 from iotdevicesimulator.db import Oracle
 from iotdevicesimulator.queries import CosmosQuery
-from iotdevicesimulator.mqtt.core import MockMessageConnection
+from iotdevicesimulator.messaging.core import MockMessageConnection
 from parameterized import parameterized
 import pathlib, config
 

src/tests/test_messaging.py

@@ -2,8 +2,8 @@
 import pytest
 import unittest
 from unittest.mock import patch
-from iotdevicesimulator.mqtt.core import MockMessageConnection, MessagingBaseClass
-from iotdevicesimulator.mqtt.aws import IotCoreMQTTConnection
+from iotdevicesimulator.messaging.core import MockMessageConnection, MessagingBaseClass
+from iotdevicesimulator.messaging.aws import IotCoreMQTTConnection
 from config import Config
 from pathlib import Path
 import awscrt.mqtt
@@ -62,7 +62,7 @@ def test_instantiation(self):
     def test_non_string_arguments(self):
 
         with self.assertRaises(TypeError):
-            instance = IotCoreMQTTConnection(
+            IotCoreMQTTConnection(
                 1,
                 self.config["cert_path"],
                 self.config["key_path"],
@@ -71,16 +71,16 @@ def test_non_string_arguments(self):
             )
 
         with self.assertRaises(TypeError):
-            instance = IotCoreMQTTConnection(
+            IotCoreMQTTConnection(
                 self.config["endpoint"],
-                self.config["cert_path"],
                 1,
+                self.config["key_path"],
                 self.config["ca_cert_path"],
                 "client_id",
             )
 
         with self.assertRaises(TypeError):
-            instance = IotCoreMQTTConnection(
+            IotCoreMQTTConnection(
                 self.config["endpoint"],
                 self.config["cert_path"],
                 1,
@@ -89,7 +89,7 @@ def test_non_string_arguments(self):
             )
 
         with self.assertRaises(TypeError):
-            instance = IotCoreMQTTConnection(
+            IotCoreMQTTConnection(
                 self.config["endpoint"],
                 self.config["cert_path"],
                 self.config["key_path"],
@@ -98,7 +98,7 @@ def test_non_string_arguments(self):
             )
 
         with self.assertRaises(TypeError):
-            instance = IotCoreMQTTConnection(
+            IotCoreMQTTConnection(
                 self.config["endpoint"],
                 self.config["cert_path"],
                 self.config["key_path"],

src/tests/test_swarm.py

@@ -5,7 +5,7 @@
 from iotdevicesimulator.db import Oracle
 from iotdevicesimulator.devices import SensorSite
 from iotdevicesimulator.queries import CosmosQuery
-from iotdevicesimulator.mqtt.core import MockMessageConnection
+from iotdevicesimulator.messaging.core import MockMessageConnection
 
 from pathlib import Path
 from config import Config