(UNetUDP): дописываю тесты

extensions/UNetUDP/UDPPacket.h

@@ -79,7 +79,10 @@ namespace UniSetUDP
         size_t addAData( long id, long val );
         bool setAData( size_t index, long val );
 
-        inline bool isFull(){ return ((dcount<MaxDCount) && (acount<MaxACount)); }
+        inline bool isAFull(){ return (acount>=MaxACount); }
+        inline bool isDFull(){ return (dcount>=MaxDCount); }
+
+        inline bool isFull(){ return !((dcount<MaxDCount) && (acount<MaxACount)); }
         inline int dsize(){ return dcount; }
         inline int asize(){ return acount; }
         unsigned short getDataCRC();

extensions/UNetUDP/UNetReceiver.cc

@@ -170,7 +170,7 @@ void UNetReceiver::start()
 // -----------------------------------------------------------------------------
 void UNetReceiver::update()
 {
-    cerr << "******************* update start" << endl;
+    dinfo << myname << "(update): start.." << endl;
     while(activated)
     {
         try

extensions/UNetUDP/tests/Makefile.am

@@ -21,6 +21,7 @@ clean-local:
 	rm -rf $(COVERAGE_REPORT_DIR)
 
 if HAVE_COVERAGE
+# COVERAGE_EXCLUDE_FILES='include/*'
 include $(top_builddir)/testsuite/testsuite-coverage-common.mk
 endif
 

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-recv-timeout 2000 --unet-sendpause 500

testsuite/testsuite-coverage-common.mk

@@ -8,7 +8,7 @@ cov: all
 	make check
 	$(LCOV) -c -d $(abs_srcdir) -o $(abs_srcdir)/.coverage.run
 	$(LCOV) -d $(abs_srcdir) -a $(abs_srcdir)/.coverage.base -a $(abs_srcdir)/.coverage.run -o $(abs_srcdir)/.coverage.total
-	$(LCOV) -r $(abs_srcdir)/.coverage.total '/usr/include/catch.hpp' '/usr/include/*.h' '/usr/include/c++/*' '/usr/include/cc++/*' '/usr/include/omniORB4/*' '/usr/include/sigc++-2.0/sigc++/*'\
+	$(LCOV) -r $(abs_srcdir)/.coverage.total $(COVERAGE_EXCLUDE_FILES) '/usr/include/catch.hpp' '/usr/include/*.h' '/usr/include/c++/*' '/usr/include/cc++/*' '/usr/include/omniORB4/*' '/usr/include/sigc++-2.0/sigc++/*'\
 	'/usr/include/catch.hpp' -d $(abs_srcdir) -o $(abs_srcdir)/.coverage.total
 	$(LCOV_GENHTML) --no-branch-coverage -o $(COVERAGE_REPORT_DIR) $(abs_srcdir)/.coverage.total
 	rm -f $(abs_srcdir)/.coverage.base $(abs_srcdir)/.coverage.run $(abs_srcdir)/.coverage.total