Commit 4bd9e8d9 authored by Pavel Vainerman's avatar Pavel Vainerman

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

parent c9244f09
...@@ -2,7 +2,7 @@ if HAVE_TESTS ...@@ -2,7 +2,7 @@ if HAVE_TESTS
noinst_PROGRAMS = tests-with-sm 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 \ tests_with_sm_LDADD = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
$(top_builddir)/extensions/ModbusSlave/libUniSet2MBSlave.la \ $(top_builddir)/extensions/ModbusSlave/libUniSet2MBSlave.la \
$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \ $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
......
...@@ -5,6 +5,11 @@ ...@@ -5,6 +5,11 @@
#include "UInterface.h" #include "UInterface.h"
#include "UDPPacket.h" #include "UDPPacket.h"
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// include-ы искплючительно для того, чтобы их обработал gcov (покрытие кода)
#include "UNetReceiver.h"
#include "UNetSender.h"
#include "UNetExchange.h"
// -----------------------------------------------------------------------------
using namespace std; using namespace std;
using namespace UniSetTypes; using namespace UniSetTypes;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
...@@ -230,6 +235,8 @@ TEST_CASE("[UNetUDP]: check receiver","[unetudp][receiver]") ...@@ -230,6 +235,8 @@ TEST_CASE("[UNetUDP]: check receiver","[unetudp][receiver]")
REQUIRE( ui->getValue(9) == -100 ); REQUIRE( ui->getValue(9) == -100 );
REQUIRE( ui->getValue(10) == 1 ); REQUIRE( ui->getValue(10) == 1 );
REQUIRE( ui->getValue(11) == 0 ); REQUIRE( ui->getValue(11) == 0 );
msleep(1000);
REQUIRE( ui->getValue(node2_respond_s) == 1 ); REQUIRE( ui->getValue(node2_respond_s) == 1 );
} }
SECTION("Test: send data pack2..") SECTION("Test: send data pack2..")
......
...@@ -10,4 +10,4 @@ cd - ...@@ -10,4 +10,4 @@ cd -
./uniset2-start.sh -f ./tests-with-sm $* -- --confile unetudp-test-configure.xml --e-startup-pause 10 \ ./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-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
...@@ -8,3 +8,4 @@ m4_include(../tests/tests.at) ...@@ -8,3 +8,4 @@ m4_include(../tests/tests.at)
m4_include(../extensions/tests/extensions-tests.at) m4_include(../extensions/tests/extensions-tests.at)
m4_include(../extensions/LogicProcessor/tests/lproc-tests.at) m4_include(../extensions/LogicProcessor/tests/lproc-tests.at)
m4_include(../extensions/ModbusSlave/tests/mbslave-tests.at) m4_include(../extensions/ModbusSlave/tests/mbslave-tests.at)
m4_include(../extensions/UNetUDP/tests/unetudp-tests.at)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment