From ac3a7f077546fbdfb74133b08617094320e6126b Mon Sep 17 00:00:00 2001 From: Bo Jeanes Date: Tue, 30 Aug 2022 17:39:18 +1000 Subject: [PATCH] Fix tests --- modbus-mqtt/src/modbus/config.rs | 4 ++++ modbus-mqtt/src/modbus/mod.rs | 2 +- modbus-mqtt/tests/integration_test.rs | 0 3 files changed, 5 insertions(+), 1 deletion(-) delete mode 100644 modbus-mqtt/tests/integration_test.rs diff --git a/modbus-mqtt/src/modbus/config.rs b/modbus-mqtt/src/modbus/config.rs index 77d3f2c..65d279a 100644 --- a/modbus-mqtt/src/modbus/config.rs +++ b/modbus-mqtt/src/modbus/config.rs @@ -264,6 +264,7 @@ fn default_address_offset() -> i8 { #[test] fn parse_minimal_tcp_connect_config() { let result = serde_json::from_value::(json!({ + "proto": "tcp", "host": "1.1.1.1" })); @@ -280,6 +281,7 @@ fn parse_minimal_tcp_connect_config() { #[test] fn parse_full_tcp_connect_config() { let _ = serde_json::from_value::(json!({ + "proto": "tcp", "host": "10.10.10.219", "unit": 1, "address_offset": -1, @@ -346,6 +348,7 @@ fn parse_full_tcp_connect_config() { #[test] fn parse_minimal_rtu_connect_config() { let result = serde_json::from_value::(json!({ + "proto": "rtu", "tty": "/dev/ttyUSB0", "baud_rate": 9600, })); @@ -369,6 +372,7 @@ fn parse_minimal_rtu_connect_config() { #[test] fn parse_complete_rtu_connect_config() { let result = serde_json::from_value::(json!({ + "proto": "rtu", "tty": "/dev/ttyUSB0", "baud_rate": 12800, diff --git a/modbus-mqtt/src/modbus/mod.rs b/modbus-mqtt/src/modbus/mod.rs index 131b568..daa1a91 100644 --- a/modbus-mqtt/src/modbus/mod.rs +++ b/modbus-mqtt/src/modbus/mod.rs @@ -139,7 +139,7 @@ fn test_parse_1() { swap_words: Swap(false), value_type: RegisterValueType::Numeric { of: config::RegisterNumeric::I32, - adjust: RegisterNumericAdjustment { + adjust: config::RegisterNumericAdjustment { scale: 0, offset: 0, }, diff --git a/modbus-mqtt/tests/integration_test.rs b/modbus-mqtt/tests/integration_test.rs deleted file mode 100644 index e69de29..0000000