Tests updated

Author: Evgeny Prikhodko

tests/main.cpp

@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 
     QCoreApplication app(argc, argv);
     //    SlaveTcp *s = Factory::createTcpSlave("127.0.0.1", 1502);
-    SlaveRtu *s = Factory::createRtuSlave("/home/prikhodko_ev/ttySimSlave", 9600);
+    std::unique_ptr<SlaveRtu> s = Factory::createRtuSlave("/home/prikhodko_ev/ttySimSlave", 9600);
     s->setAddress(1);
     s->initMap(32, 32, 32, 32);
     s->setValueToInputRegister(8, 0x0102030405060708L);

tests/rtu_read_write_test.cpp

@@ -20,7 +20,7 @@ void libmodbus_cpp::RtuReadWriteTest::initTestCase()
     QThreadPool::globalInstance()->start(m_serverStarter);
     while (!m_serverStarter->isReady())
         QThread::msleep(50);
-    m_master.reset(Factory::createRtuMaster(TEST_MASTER_SERIAL_DEVICE, TEST_BAUD_RATE));
+    m_master.reset(Factory::createRtuMaster(TEST_MASTER_SERIAL_DEVICE, TEST_BAUD_RATE).release());
     m_master->setSlaveAddress(TEST_SLAVE_ADDRESS);
 }
 

tests/rtu_read_write_test.h

@@ -22,7 +22,7 @@ class RtuServerStarter : public QRunnable {
 public:
     void run() {
         using namespace libmodbus_cpp;
-        QScopedPointer<SlaveRtu> s(Factory::createRtuSlave(TEST_SLAVE_SERIAL_DEVICE, TEST_BAUD_RATE));
+        QScopedPointer<SlaveRtu> s(Factory::createRtuSlave(TEST_SLAVE_SERIAL_DEVICE, TEST_BAUD_RATE).release());
         s->setAddress(TEST_SLAVE_ADDRESS);
         s->initMap(TABLE_SIZE, TABLE_SIZE, TABLE_SIZE, TABLE_SIZE);
         for (int i = 0; i < TABLE_SIZE; ++i) {

tests/tcp_read_write_test.cpp

@@ -9,7 +9,7 @@ void libmodbus_cpp::TcpReadWriteTest::initTestCase()
     QThreadPool::globalInstance()->start(m_serverStarter);
     while (!m_serverStarter->isReady())
         QThread::msleep(50);
-    m_master.reset(Factory::createTcpMaster(TEST_IP_ADDRESS, TEST_PORT));
+    m_master.reset(Factory::createTcpMaster(TEST_IP_ADDRESS, TEST_PORT).release());
 }
 
 void libmodbus_cpp::TcpReadWriteTest::cleanupTestCase()

tests/tcp_read_write_test.h

@@ -22,7 +22,7 @@ class TcpServerStarter : public QObject, public QRunnable {
 public:
     void run() {
         using namespace libmodbus_cpp;
-        QScopedPointer<SlaveTcp> s(Factory::createTcpSlave(TEST_IP_ADDRESS, TEST_PORT));
+        QScopedPointer<SlaveTcp> s(Factory::createTcpSlave(TEST_IP_ADDRESS, TEST_PORT).release());
         s->initMap(TABLE_SIZE, TABLE_SIZE, TABLE_SIZE, TABLE_SIZE);
         for (int i = 0; i < TABLE_SIZE; ++i) {
             s->setValueToCoil(i, (bool)(i & 1));