TCP read/write test improved

Author: Evgeny Prikhodko

tests/tcp_read_write_test.cpp

@@ -1,15 +1,12 @@
 #include "tcp_read_write_test.h"
-#include "factory.h"
 
 void libmodbus_cpp::TcpReadWriteTest::initTestCase()
 {
-    //        m_slaveBackend = new libmodbus_cpp::SlaveTcpBackend("127.0.0.1", 1502);
-    //        m_slaveBackend->initMap(TABLE_SIZE, TABLE_SIZE, TABLE_SIZE, TABLE_SIZE);
-    //        m_slave = new libmodbus_cpp::SlaveTcp(m_slaveBackend);
-
-    //        m_masterBackend = new libmodbus_cpp::MasterTcpBackend("127.0.0.1", 1502);
-    //        m_master = new libmodbus_cpp::MasterTcp(m_masterBackend);
-    m_master = Factory::createTcpMaster("127.0.0.1", 1502);
+    m_serverStarter.reset(new ServerStarter);
+    QThreadPool::globalInstance()->start(m_serverStarter.data());
+    while (!m_serverStarter->isReady())
+        QThread::msleep(50);
+    m_master.reset(Factory::createTcpMaster("127.0.0.1", 1502));
 }
 
 void libmodbus_cpp::TcpReadWriteTest::testConnection()
@@ -270,15 +267,10 @@ void libmodbus_cpp::TcpReadWriteTest::writeReadHoldingRegisters_double()
 
 void libmodbus_cpp::TcpReadWriteTest::cleanupTestCase()
 {
-    delete m_master;
-    //    delete m_slave;
 }
 
 void libmodbus_cpp::TcpReadWriteTest::connect()
 {
-    //    bool serverSocketCreated = m_slaveBackend->startListen(1);
-    //    QCOMPARE(serverSocketCreated, true);
-
     bool masterConnected = m_master->connect();
     QCOMPARE(masterConnected, true);
 }

tests/tcp_read_write_test.h

@@ -3,18 +3,43 @@
 
 #include <QObject>
 #include <QtTest/QtTest>
+#include <atomic>
+#include <QThreadPool>
+
+#include "factory.h"
 #include "slave_tcp.h"
 #include "master_tcp.h"
 
+class ServerStarter : public QRunnable {
+    std::atomic_bool m_ready { false };
+public:
+    void run() {
+        using namespace libmodbus_cpp;
+        QScopedPointer<SlaveTcp> s(Factory::createTcpSlave("127.0.0.1", 1502));
+        s->initMap(64, 64, 64, 64);
+        for (int i = 0; i < 64; ++i) {
+            s->setValueToCoil(i, (bool)(i & 1));
+            s->setValueToDiscreteInput(i, !(bool)(i & 1));
+            s->setValueToHoldingRegister(i, (uint16_t)1);
+            s->setValueToInputRegister(i, (uint16_t)1);
+        }
+        s->startListen(10);
+        m_ready = true;
+        QEventLoop().exec();
+    }
+    bool isReady() const {
+        return m_ready;
+    }
+};
+
 namespace libmodbus_cpp {
 
 class TcpReadWriteTest : public QObject
 {
     Q_OBJECT
     static const int TABLE_SIZE = 64;
-    //    libmodbus_cpp::SlaveTcpBackend *m_slaveBackend = Q_NULLPTR;
-    //    libmodbus_cpp::SlaveTcp *m_slave = Q_NULLPTR;
-    libmodbus_cpp::MasterTcp *m_master = Q_NULLPTR;
+    QScopedPointer<ServerStarter> m_serverStarter;
+    QScopedPointer<libmodbus_cpp::MasterTcp> m_master;
 
 private slots:
     void initTestCase();