Test coverage global 100%. (#2764)

Author: janiversen

test/global/test_exceptions.py

@@ -3,8 +3,10 @@
 
 from pymodbus.exceptions import (
     ConnectionException,
+    MessageRegisterException,
     ModbusException,
     ModbusIOException,
+    NoSuchIdException,
     NotImplementedException,
     ParameterException,
 )
@@ -19,6 +21,8 @@ class TestExceptions:  # pylint: disable=too-few-public-methods
         ParameterException("bad parameter"),
         NotImplementedException("bad function"),
         ConnectionException("bad connection"),
+        NoSuchIdException("no id"),
+        MessageRegisterException("Wrong message"),
     ]
 
     def test_exceptions(self):

test/global/test_logging.py

@@ -4,7 +4,11 @@
 
 import pytest
 
-from pymodbus.logging import Log, pymodbus_apply_logging_config
+from pymodbus.logging import (
+    Log,
+    pymodbus_apply_logging_config,
+    pymodbus_get_last_frames,
+)
 
 
 class TestLogging:
@@ -47,31 +51,73 @@ def test_apply_logging(self):
         pymodbus_apply_logging_config("info")
         pymodbus_apply_logging_config(logging.NOTSET)
         Log.debug("test 1no")
+        pymodbus_apply_logging_config(logging.CRITICAL)
+        Log.debug("test 1no")
         pymodbus_apply_logging_config("debug")
         Log.debug("test 1")
         Log.debug("test 1")
         Log.debug("test 1")
-        pymodbus_apply_logging_config(logging.NOTSET)
+        Log.error("get frames")
+        Log.critical("get frames")
+        pymodbus_apply_logging_config(logging.CRITICAL)
         Log.warning("test 2no")
         pymodbus_apply_logging_config("warning")
         Log.warning("test 2")
         Log.warning("test 2")
         Log.warning("test 2")
-        pymodbus_apply_logging_config(logging.NOTSET)
+        pymodbus_apply_logging_config(logging.CRITICAL)
         Log.critical("test 3no")
         pymodbus_apply_logging_config("critical")
         Log.critical("test 3")
         Log.critical("test 3")
         Log.critical("test 3")
-        pymodbus_apply_logging_config(logging.NOTSET)
+        pymodbus_apply_logging_config(logging.CRITICAL)
         Log.error("test 4no")
         pymodbus_apply_logging_config("error")
         Log.error("test 4")
         Log.error("test 4")
         Log.error("test 4")
-        pymodbus_apply_logging_config(logging.NOTSET)
+        pymodbus_apply_logging_config(logging.CRITICAL)
         Log.info("test 5no")
         pymodbus_apply_logging_config("info")
         Log.info("test 5")
         Log.info("test 5")
         Log.info("test 5")
+
+    def test_apply_build_no(self):
+        """Test pymodbus_apply_logging_config."""
+        with mock.patch("pymodbus.logging.Log.build_msg") as build:
+            build.return_value = None
+            Log.critical("test 0")
+            pymodbus_apply_logging_config("debug")
+            Log.debug("test 1")
+            pymodbus_apply_logging_config("warning")
+            Log.warning("test 2")
+            pymodbus_apply_logging_config("critical")
+            pymodbus_apply_logging_config("error")
+            Log.error("test 4")
+            pymodbus_apply_logging_config("info")
+            Log.info("test 5")
+
+    def test_log_get_frames(self):
+        """Test get_frames."""
+        pymodbus_get_last_frames()
+        for _ in range(100):
+            Log.transport_dump(Log.SEND_DATA, b'678', b'9')
+        pymodbus_get_last_frames()
+
+    def test_transport_dump(self):
+        """Test transport_dump."""
+        pymodbus_apply_logging_config("error")
+        Log.transport_dump(Log.SEND_DATA, b'123', b'4')
+        for _ in range(100):
+            Log.transport_dump(Log.SEND_DATA, b'678', b'9')
+        pymodbus_apply_logging_config("debug")
+        Log.transport_dump(Log.SEND_DATA, b'123', b'4')
+
+    def test_build_frame_log_line(self):
+        """Test build_frame_log_line."""
+        Log.build_frame_log_line(Log.SEND_DATA, b'123', b'4')
+        Log.build_frame_log_line(Log.RECV_DATA, b'123', b'4')
+        Log.build_frame_log_line("Unknown", b'123', b'4')
+

test/global/test_utilities.py

@@ -1,7 +1,7 @@
 """Test utilities."""
 import struct
 
-from pymodbus.utilities import dict_property
+from pymodbus.utilities import dict_property, hexlify_packets
 
 
 _test_master = {4: "d"}
@@ -58,3 +58,8 @@ def test_dict_property(self):
         assert result.s_1 == "x"
         assert result.s_2 == "x"
         assert result.g_1 == "x"
+
+    def test_hexlify_packets(self):
+        """Test hexlify_packets."""
+        assert hexlify_packets(b'123') == "0x31 0x32 0x33"
+        assert hexlify_packets(None) == ""