From e4b1f579fd0b4072f394b21a08b514c731299d27 Mon Sep 17 00:00:00 2001 From: Peter M. Groen Date: Wed, 4 Jan 2023 00:37:21 +0100 Subject: [PATCH] Added defaults test --- src/connectionconfig.h | 2 +- src/modbustcp.h | 2 +- tests/connectionconfigtest.cpp | 35 ++++++++++++++++++++++++++++------- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/connectionconfig.h b/src/connectionconfig.h index e6bc562..48bda8a 100644 --- a/src/connectionconfig.h +++ b/src/connectionconfig.h @@ -67,7 +67,7 @@ private: E_PARITY m_parity = E_PARITY::NONE; int m_dataBits = 8; int m_stopBits = 1; - std::string m_ipAddress{}; + std::string m_ipAddress = "127.0.0.1"; unsigned int m_portNumber = 502; int m_frameTimeOut = -1; diff --git a/src/modbustcp.h b/src/modbustcp.h index 1d2e851..1b1da5c 100644 --- a/src/modbustcp.h +++ b/src/modbustcp.h @@ -49,7 +49,7 @@ public: virtual int modbusReceive(uint8_t *buffer) override; private: - std::string m_host {}; + std::string m_host {"127.0.0.1"}; uint16_t m_port {502}; X_SOCKET m_socket {-1}; SOCKADDR_IN m_server {}; diff --git a/tests/connectionconfigtest.cpp b/tests/connectionconfigtest.cpp index 0a46ee4..bc8a1bf 100644 --- a/tests/connectionconfigtest.cpp +++ b/tests/connectionconfigtest.cpp @@ -14,13 +14,13 @@ using namespace osdev::components::modbus; TEST(ConnectionConfigTest, SerialPortConfig) { ConnectionConfig oConfig; - oConfig.setBaudRate( B9600 ); - oConfig.setConnectionType( ConnectionConfig::E_CONNECTIONTYPE::SERIAL ); - oConfig.setDataBits( 8 ); - oConfig.setStopBits( 1 ); - oConfig.setFrameTimeout( 10 ); - oConfig.setParity( ConnectionConfig::E_PARITY::NONE ); - oConfig.setPortName( "/dev/ttyUSB0" ); + oConfig.setBaudRate(B9600); + oConfig.setConnectionType(ConnectionConfig::E_CONNECTIONTYPE::SERIAL); + oConfig.setDataBits(8); + oConfig.setStopBits(1); + oConfig.setFrameTimeout(10); + oConfig.setParity(ConnectionConfig::E_PARITY::NONE); + oConfig.setPortName("/dev/ttyUSB0"); // Test all parameters EXPECT_EQ(oConfig.getBaudRate(), B9600); @@ -31,3 +31,24 @@ TEST(ConnectionConfigTest, SerialPortConfig) EXPECT_EQ(oConfig.getParity(), ConnectionConfig::E_PARITY::NONE); EXPECT_EQ(oConfig.getPortName(), "/dev/ttyUSB0"); } + +TEST(ConnectionConfigTest, TcpDefaults) +{ + ConnectionConfig oConfig; + + // Do not set any parameters.. Rely on the defaults + EXPECT_EQ(oConfig.getIpAddress(), "127.0.0.1"); + EXPECT_EQ(oConfig.getPortNumber(), 502); +} + +TEST(ConnectionConfigTest, TcpConfig) +{ + ConnectionConfig oConfig; + oConfig.setConnectionType(ConnectionConfig::E_CONNECTIONTYPE::TCP); + oConfig.setIpAddress("192.168.1.1"); + oConfig.setPortNumber(1024); + + // Test TCP parameters + EXPECT_EQ(oConfig.getIpAddress(), "192.168.1.1"); + EXPECT_EQ(oConfig.getPortNumber(), 1024); +} -- libgit2 0.21.4