Test coverage datastore 100%. (#2757)

Author: janiversen

pymodbus/datastore/context.py

@@ -31,7 +31,7 @@ def decode(self, fx):
         :param fx: The function we are working with
         :returns: one of [d(iscretes),i(nputs),h(olding),c(oils)
         """
-        return self._fx_mapper[fx]
+        return self._fx_mapper.get(fx, "x")
 
     async def async_getValues(self, func_code: int, address: int, count: int = 1) -> list[int] | list[bool] | ExcCodes:
         """Get `count` values from datastore.

pymodbus/datastore/remote.py

@@ -1,6 +1,6 @@
 """Remote datastore."""
 from pymodbus.exceptions import NotImplementedException
-from pymodbus.logging import Log
+from pymodbus.pdu import ExceptionResponse
 
 from .context import ModbusBaseDeviceContext
 
@@ -25,8 +25,6 @@ def __init__(self, client, device_id=None):
         self.device_id = device_id
         self.result = None
         self.__build_mapping()
-        if not self.__set_callbacks:
-            Log.error("Init went wrong.")
 
     def reset(self):
         """Reset all the datastores to their default values."""
@@ -79,6 +77,8 @@ def __build_mapping(self):
             "i": lambda a, c: self._client.read_input_registers(
                 a, count=c, **params
             ),
+            "x": lambda a, c: ExceptionResponse(0
+            ),
         }
         self.__set_callbacks = {
             "d5": lambda a, v: self._client.write_coil(
@@ -113,11 +113,10 @@ def __extract_result(self, func_code, result):
 
         TODO make this consistent (values?)
         """
-        if not result.isError():
-            if func_code in {"d", "c"}:
-                return result.bits
-            if func_code in {"h", "i"}:
-                return result.registers
-        else:
-            return result
-        return None
+        if result.isError():
+            return None
+        if func_code in {"d", "c"}:
+            return result.bits
+        if func_code in {"h", "i"}:
+            return result.registers
+        return result

pymodbus/datastore/simulator.py

@@ -487,7 +487,8 @@ def __init__(
         self.action_methods: list[Callable] = []
         self.registerType_name_to_id: dict[str, int] = {}
         self.registerType_id_to_name: list[str] = []
-        Setup(self).setup(config, custom_actions)
+        if config:
+            Setup(self).setup(config, custom_actions)
 
     # --------------------------------------------
     # Simulator server interface
@@ -566,6 +567,8 @@ def loop_validate(self, address, end_address, fx_write):
                 while i < end_address:
                     if self.registers[i].type == CellType.NEXT:
                         i += 1
+                    else:
+                        return False
         return True
 
     def validate(self, func_code, address, count=1):
@@ -708,7 +711,7 @@ def action_increment(cls, registers, inx, cell, minval=None, maxval=None):
             new_regs = cls.build_registers_from_value(value, False)
             reg.value = new_regs[0]
             reg2.value = new_regs[1]
-        elif cell.type == CellType.UINT32:
+        else: # if cell.type == CellType.UINT32:
             tmp_reg = [reg.value, reg2.value]
             value = cls.build_value_from_registers(tmp_reg, True)
             value += 1
@@ -757,7 +760,7 @@ def action_uptime(cls, registers, inx, cell, **_parameters):
             regs = cls.build_registers_from_value(value, False)
             registers[inx].value = regs[0]
             registers[inx + 1].value = regs[1]
-        elif cell.type == CellType.UINT32:
+        else: # if cell.type == CellType.UINT32:
             regs = cls.build_registers_from_value(value, True)
             registers[inx].value = regs[0]
             registers[inx + 1].value = regs[1]

test/CHECK_COVERAGE

@@ -73,9 +73,12 @@ def test_datastore_server_get(self):
         """Test ModbusServerContext."""
         srv = ModbusServerContext()
         assert srv[0] == {}
-        #srv.single = False
-        #with pytest.raises(NoSuchIdException):
-        #    _ = srv[200]
+        assert srv[1] == {}
+        srv = ModbusServerContext(devices={1: {}}, single=False)
+        assert srv[1] == {}
+        with pytest.raises(NoSuchIdException):
+            srv[200]
+        print("jan")
 
     def test_datastore_server_ids(self):
         """Test ModbusServerContext."""

test/datastore/test_context.py

@@ -21,6 +21,10 @@ def test_remote_device_context(self):
         with pytest.raises(NotImplementedException):
             context.reset()
 
+    def test_remote_device(self):
+        """Test a modbus remote device."""
+        RemoteDeviceContext(None, device_id=1)
+
     def test_remote_device_set_values(self):
         """Test setting values against a remote device context."""
         client = mock.MagicMock()
@@ -29,10 +33,8 @@ def test_remote_device_set_values(self):
 
         context = RemoteDeviceContext(client)
         context.setValues(0x0F, 0, [1])
-        # result = context.setValues(0x10, 1, [1])
         context.setValues(0x10, 1, [1])
-        # assert result.exception_code == 0x02
-        # assert result.function_code == 0x90
+        context.setValues(0x05, 1, [1])
 
     async def test_remote_device_async_set_values(self):
         """Test setting values against a remote device context."""
@@ -66,6 +68,11 @@ def test_remote_device_get_values(self):
         result = context.getValues(3, 0, 10)
         assert result != [10] * 10
 
+        result = context.getValues(5, 0, 10)
+        assert result != [10] * 10
+
+        result = context.getValues(17, 0, 10)
+
     async def test_remote_device_async_get_values(self):
         """Test getting values from a remote device context."""
         client = mock.MagicMock()
@@ -87,3 +94,10 @@ async def test_remote_device_async_get_values(self):
 
         result = await context.async_getValues(3, 0, 10)
         assert result != [10] * 10
+
+    def test_remote_device_set_values_wrong(self):
+        """Test setting values against a remote device context."""
+        client = mock.MagicMock()
+        context = RemoteDeviceContext(client)
+        with pytest.raises(ValueError, match="setValues*"):
+            context.setValues(0x01, 0, [1])

test/not_updated/test_remote_datastore.py renamed to test/datastore/test_remote_datastore.py

@@ -0,0 +1,31 @@
+"""Test framers."""
+
+from pymodbus.constants import ExcCodes
+from pymodbus.datastore import ModbusSequentialDataBlock
+
+
+class TestCOntextDataStore:
+    """Unittest for the pymodbus.datastore.remote module."""
+
+    def test_datastore_Sequential(self):
+        """Test ModbusDeviceContext."""
+        ModbusSequentialDataBlock(0x01, [17])
+        ModbusSequentialDataBlock(0x01, 17)
+        ModbusSequentialDataBlock(0x01, 17).default(112)
+
+    def test_datastore_Sequential_get(self):
+        """Test ModbusDeviceContext."""
+        block = ModbusSequentialDataBlock(0x01, [17])
+        assert block.getValues(13) == ExcCodes.ILLEGAL_ADDRESS
+
+    def test_datastore_Sequential_set(self):
+        """Test ModbusDeviceContext."""
+        block = ModbusSequentialDataBlock(0x01, [17])
+        block.setValues(1, [19])
+        block.setValues(1, 19)
+        assert block.setValues(13, [17]) == ExcCodes.ILLEGAL_ADDRESS
+
+    def test_datastore_Sequential_iter(self):
+        """Test check frame."""
+        block = ModbusSequentialDataBlock(0x01, [17])
+        _ = list(block)