Небольшая корректировка тестов, подключил UNetUDP/tests к "глобальному" запуску

extensions/ModbusSlave/tests/Makefile.am

@@ -2,7 +2,7 @@ if HAVE_TESTS
 
 noinst_PROGRAMS = tests-with-sm
 
-tests_with_sm_SOURCES   = tests_with_sm.cc mbslave-tests.cc
+tests_with_sm_SOURCES   = tests_with_sm.cc test_mbslave.cc
 tests_with_sm_LDADD     = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/ModbusSlave/libUniSet2MBSlave.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \

extensions/ModbusSlave/tests/mbslave-tests.cc → extensions/ModbusSlave/tests/test_mbslave.cc

@@ -33,7 +33,7 @@ void InitTest()
     if( mb == nullptr )
     {
         mb = new ModbusTCPMaster();
-        ost::InetAddress ia(addr.c_str()); 
+        ost::InetAddress ia(addr.c_str());
         mb->setTimeout(2000);
         REQUIRE_NOTHROW( mb->connect(ia,port) );
     }
@@ -429,7 +429,7 @@ TEST_CASE("(0x10): write register outputs or memories","[modbus][mbslave][mbtcps
         msg.addData(11);
         msg.addData(12);
         msg.quant-=1;
-        
+
         try
         {
             mb->write10(msg);
@@ -446,7 +446,7 @@ TEST_CASE("(0x10): write register outputs or memories","[modbus][mbslave][mbtcps
         msg.addData(11);
         msg.addData(12);
         msg.bcnt -= 1;
-        
+
         try
         {
             mb->write10(msg);
@@ -854,31 +854,31 @@ TEST_CASE("Write(0x10): vtypes..","[modbus][mbslave][mbtcpslave]")
 #if 0
 TEST_CASE("(0x14): read file record","[modbus][mbslave][mbtcpslave]")
 {
-    
+
 }
 TEST_CASE("(0x15): write file record","[modbus][mbslave][mbtcpslave]")
 {
-    
+
 }
 TEST_CASE("(0x2B): Modbus Encapsulated Interface","[modbus][mbslave][mbtcpslave]")
 {
-    
+
 }
 TEST_CASE("(0x50): set date and time")
 {
-    
+
 }
 TEST_CASE("(0x53): call remote service")
 {
-    
+
 }
 TEST_CASE("(0x65): read,write,delete alarm journal")
 {
-    
+
 }
 TEST_CASE("(0x66): file transfer")
 {
-    
+
 }
 #endif
 
@@ -917,7 +917,7 @@ TEST_CASE("access mode","[modbus][mbslvae][mbtcpslave]")
         {
             REQUIRE( ex.err == ModbusRTU::erBadDataAddress );
         }
-        
+
         // write
         ModbusRTU::WriteOutputMessage msg(slaveaddr,tREG);
         msg.addData(555);

extensions/UNetUDP/tests/test_unetudp.cc

@@ -5,6 +5,11 @@
 #include "UInterface.h"
 #include "UDPPacket.h"
 // -----------------------------------------------------------------------------
+// include-ы искплючительно для того, чтобы их обработал gcov (покрытие кода)
+#include "UNetReceiver.h"
+#include "UNetSender.h"
+#include "UNetExchange.h"
+// -----------------------------------------------------------------------------
 using namespace std;
 using namespace UniSetTypes;
 // -----------------------------------------------------------------------------
@@ -230,6 +235,8 @@ TEST_CASE("[UNetUDP]: check receiver","[unetudp][receiver]")
 		REQUIRE( ui->getValue(9) == -100 );
 		REQUIRE( ui->getValue(10) == 1 );
 		REQUIRE( ui->getValue(11) == 0 );
+
+		msleep(1000);
 		REQUIRE( ui->getValue(node2_respond_s) == 1 );
 	}
 	SECTION("Test: send data pack2..")

extensions/UNetUDP/tests/tests_with_sm.sh

@@ -10,4 +10,4 @@ cd -
 
 ./uniset2-start.sh -f ./tests-with-sm $* -- --confile unetudp-test-configure.xml --e-startup-pause 10 \
 --unet-name UNetExchange --unet-filter-field unet --unet-filter-value 1 --unet-maxdifferense 40 \
---unet-recv-timeout 2000 --unet-sendpause 500
+--unet-recv-timeout 1000 --unet-sendpause 500

testsuite/testsuite.at

@@ -8,3 +8,4 @@ m4_include(../tests/tests.at)
 m4_include(../extensions/tests/extensions-tests.at)
 m4_include(../extensions/LogicProcessor/tests/lproc-tests.at)
 m4_include(../extensions/ModbusSlave/tests/mbslave-tests.at)
+m4_include(../extensions/UNetUDP/tests/unetudp-tests.at)