Peter M. Groen / modbus-cpp

Commit e4b1f579fd0b4072f394b21a08b514c731299d27

Authored by Peter M. Groen
1 parent 749c2724

Added defaults test

Inline Side-by-side
Showing 3 changed files with 30 additions and 9 deletions
src/connectionconfig.h
  View file @e4b1f57
@@ -67,7 +67,7 @@ private: @@ -67,7 +67,7 @@ private:
67 E_PARITY m_parity = E_PARITY::NONE; 67 E_PARITY m_parity = E_PARITY::NONE;
68 int m_dataBits = 8; 68 int m_dataBits = 8;
69 int m_stopBits = 1; 69 int m_stopBits = 1;
70 - std::string m_ipAddress{}; 70 + std::string m_ipAddress = "127.0.0.1";
71 unsigned int m_portNumber = 502; 71 unsigned int m_portNumber = 502;
72 int m_frameTimeOut = -1; 72 int m_frameTimeOut = -1;
73 73
src/modbustcp.h
  View file @e4b1f57
@@ -49,7 +49,7 @@ public: @@ -49,7 +49,7 @@ public:
49 virtual int modbusReceive(uint8_t *buffer) override; 49 virtual int modbusReceive(uint8_t *buffer) override;
50 50
51 private: 51 private:
52 - std::string m_host {}; 52 + std::string m_host {"127.0.0.1"};
53 uint16_t m_port {502}; 53 uint16_t m_port {502};
54 X_SOCKET m_socket {-1}; 54 X_SOCKET m_socket {-1};
55 SOCKADDR_IN m_server {}; 55 SOCKADDR_IN m_server {};
tests/connectionconfigtest.cpp
  View file @e4b1f57
@@ -14,13 +14,13 @@ using namespace osdev::components::modbus; @@ -14,13 +14,13 @@ using namespace osdev::components::modbus;
14 TEST(ConnectionConfigTest, SerialPortConfig) 14 TEST(ConnectionConfigTest, SerialPortConfig)
15 { 15 {
16 ConnectionConfig oConfig; 16 ConnectionConfig oConfig;
17 - oConfig.setBaudRate( B9600 );  
18 - oConfig.setConnectionType( ConnectionConfig::E_CONNECTIONTYPE::SERIAL );  
19 - oConfig.setDataBits( 8 );  
20 - oConfig.setStopBits( 1 );  
21 - oConfig.setFrameTimeout( 10 );  
22 - oConfig.setParity( ConnectionConfig::E_PARITY::NONE );  
23 - oConfig.setPortName( "/dev/ttyUSB0" ); 17 + oConfig.setBaudRate(B9600);
  18 + oConfig.setConnectionType(ConnectionConfig::E_CONNECTIONTYPE::SERIAL);
  19 + oConfig.setDataBits(8);
  20 + oConfig.setStopBits(1);
  21 + oConfig.setFrameTimeout(10);
  22 + oConfig.setParity(ConnectionConfig::E_PARITY::NONE);
  23 + oConfig.setPortName("/dev/ttyUSB0");
24 24
25 // Test all parameters 25 // Test all parameters
26 EXPECT_EQ(oConfig.getBaudRate(), B9600); 26 EXPECT_EQ(oConfig.getBaudRate(), B9600);
@@ -31,3 +31,24 @@ TEST(ConnectionConfigTest, SerialPortConfig) @@ -31,3 +31,24 @@ TEST(ConnectionConfigTest, SerialPortConfig)
31 EXPECT_EQ(oConfig.getParity(), ConnectionConfig::E_PARITY::NONE); 31 EXPECT_EQ(oConfig.getParity(), ConnectionConfig::E_PARITY::NONE);
32 EXPECT_EQ(oConfig.getPortName(), "/dev/ttyUSB0"); 32 EXPECT_EQ(oConfig.getPortName(), "/dev/ttyUSB0");
33 } 33 }
  34 +
  35 +TEST(ConnectionConfigTest, TcpDefaults)
  36 +{
  37 + ConnectionConfig oConfig;
  38 +
  39 + // Do not set any parameters.. Rely on the defaults
  40 + EXPECT_EQ(oConfig.getIpAddress(), "127.0.0.1");
  41 + EXPECT_EQ(oConfig.getPortNumber(), 502);
  42 +}
  43 +
  44 +TEST(ConnectionConfigTest, TcpConfig)
  45 +{
  46 + ConnectionConfig oConfig;
  47 + oConfig.setConnectionType(ConnectionConfig::E_CONNECTIONTYPE::TCP);
  48 + oConfig.setIpAddress("192.168.1.1");
  49 + oConfig.setPortNumber(1024);
  50 +
  51 + // Test TCP parameters
  52 + EXPECT_EQ(oConfig.getIpAddress(), "192.168.1.1");
  53 + EXPECT_EQ(oConfig.getPortNumber(), 1024);
  54 +}