fix(modbus): enforce region/type compatibility at the tag factory
P6: Coils/DiscreteInputs carry only Bool and register regions never Bool; the factory (and so the deploy-gate Inspect and the AdminUI parse consult) refuses a mismatch, and an absent dataType defaults per region (Bool for a bit region). A HoldingRegisters+Bool tag used to throw out of the coalescing planner and stall every tag of the subscription; the planner also skips any incompatible pair defensively. The tag editor keeps the type compatible when the region changes; the CLI refuses the pair up front. The array-write parity test records the Coils divergence from DriverArrayWriteSupport (owned outside this lane) as follow-up F1. Refs #741 Claude-Session: https://claude.ai/code/session_01Ub9hGmYLQvn9XETzw7CMsT
This commit is contained in:
@@ -121,4 +121,24 @@ public sealed class ModbusTagConfigModelTests
|
||||
[InlineData("""{"region":3,"address":1,"dataType":true}""")]
|
||||
public void Validate_accepts_every_enum_value_the_driver_accepts(string json)
|
||||
=> ModbusTagConfigModel.FromJson(json).Validate().ShouldBeNull();
|
||||
|
||||
/// <summary>Review 07 P6: switching region keeps the data type one the driver accepts for it.</summary>
|
||||
[Theory]
|
||||
[InlineData(ModbusDataType.Int16, ModbusRegion.Coils, ModbusDataType.Bool)]
|
||||
[InlineData(ModbusDataType.Float32, ModbusRegion.DiscreteInputs, ModbusDataType.Bool)]
|
||||
[InlineData(ModbusDataType.Bool, ModbusRegion.HoldingRegisters, ModbusDataType.Int16)]
|
||||
[InlineData(ModbusDataType.Float32, ModbusRegion.InputRegisters, ModbusDataType.Float32)]
|
||||
public void SetRegion_keeps_the_type_compatible(ModbusDataType from, ModbusRegion region, ModbusDataType expected)
|
||||
{
|
||||
var m = new ModbusTagConfigModel { DataType = from };
|
||||
m.SetRegion(region);
|
||||
m.Region.ShouldBe(region);
|
||||
m.DataType.ShouldBe(expected);
|
||||
ModbusTagConfigModel.FromJson(m.ToJson()).Validate().ShouldBeNull();
|
||||
}
|
||||
|
||||
/// <summary>A Coils + Int16 blob (CSV / API) is refused at authoring, matching the driver.</summary>
|
||||
[Fact]
|
||||
public void Validate_refuses_an_incompatible_region_and_type()
|
||||
=> ModbusTagConfigModel.FromJson("""{"region":"Coils","address":1,"dataType":"Int16"}""").Validate().ShouldNotBeNull();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user