(Tests): добавил тесты для MessageTypes.. ненмого модифицировал.

include/MessageType.h

@@ -26,10 +26,11 @@
 #define MessageType_H_
 // --------------------------------------------------------------------------
 #include <sys/time.h>
+#include <ostream>
 #include "Configuration.h"
 #include "UniSetTypes.h"
 #include "IOController_i.hh"
-
+// --------------------------------------------------------------------------
 namespace UniSetTypes
 {
     class Message
@@ -77,6 +78,7 @@ namespace UniSetTypes
             }
     };
 
+    std::ostream& operator<<( std::ostream& os, const Message::TypeOfMessage& t );
 
     class VoidMessage : public Message
     {
@@ -145,6 +147,7 @@ namespace UniSetTypes
         public:
             enum Command
             {
+                Unknown,
                 StartUp,    /*! начать работу */
                 FoldUp,     /*! нет связи с главной станцией */
                 Finish,        /*! завершить работу */
@@ -171,6 +174,8 @@ namespace UniSetTypes
             int command;
             long data[2];
     };
+    std::ostream& operator<<( std::ostream& os, const SystemMessage::Command& c );
+
 
     /*! Собщение о срабатывании таймера */
     class TimerMessage : public Message

src/Various/MessageType.cc

@@ -33,6 +33,26 @@
 namespace UniSetTypes
 {
 //--------------------------------------------------------------------------------------------
+std::ostream& operator<<( std::ostream& os, const Message::TypeOfMessage& t )
+{
+	if( t == Message::Unused )
+		return os << "Unused";
+
+	if( t == Message::SensorInfo )
+		return os << "SensorInfo";
+	
+	if( t == Message::SysCommand )
+		return os << "SysCommand";
+	
+	if( t == Message::Confirm )
+		return os << "Confirm";
+
+	if( t == Message::Timer )
+		return os << "Timer";
+
+	return os << "Unkown";
+}
+//--------------------------------------------------------------------------------------------
 Message::Message():
     type(Unused), priority(Medium),
     node(UniSetTypes::uniset_conf()->getLocalNode()),
@@ -115,7 +135,7 @@ SensorMessage::SensorMessage(const VoidMessage *msg):
 }
 //--------------------------------------------------------------------------------------------
 SystemMessage::SystemMessage():
-    command(SystemMessage::ReConfiguration)
+    command(SystemMessage::Unknown)
 {
     type = Message::SysCommand;
 }
@@ -135,6 +155,28 @@ SystemMessage::SystemMessage(const VoidMessage *msg):
     assert(this->type == Message::SysCommand);
 }
 //--------------------------------------------------------------------------------------------
+std::ostream& operator<<( std::ostream& os, const SystemMessage::Command& c )
+{
+	if( c == SystemMessage::Unknown )
+		return os << "Unknown";
+	if( c == SystemMessage::StartUp )
+		return os << "StartUp";
+	if( c == SystemMessage::FoldUp )
+		return os << "FoldUp";
+	if( c == SystemMessage::Finish )
+		return os << "Finish";
+	if( c == SystemMessage::WatchDog )
+		return os << "WatchDog";
+	if( c == SystemMessage::ReConfiguration )
+		return os << "ReConfiguration";
+	if( c == SystemMessage::NetworkInfo )
+		return os << "NetworkInfo";
+	if( c == SystemMessage::LogRotate )
+		return os << "LogRotate";
+
+	return os << "";
+}
+//--------------------------------------------------------------------------------------------
 TimerMessage::TimerMessage():
     id(UniSetTypes::DefaultTimerId)
 {

tests/Makefile.am

@@ -13,7 +13,7 @@ tests_SOURCES = tests.cc passivetimer.cc hourglass.cc delaytimer.cc unixml.cc ss
 tests_LDADD 	= $(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS) $(COMCPP_LIBS)
 tests_CPPFLAGS	= -I$(top_builddir)/include $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
 
-tests_with_conf_SOURCES = tests_with_conf.cc conftest.cc ui.cc iorfile.cc
+tests_with_conf_SOURCES = tests_with_conf.cc conftest.cc ui.cc iorfile.cc messagetype.cc 
 tests_with_conf_LDADD   = $(top_builddir)/lib/libUniSet2.la
 tests_with_conf_CPPFLAGS = -I$(top_builddir)/include
      

tests/iorfile.cc

@@ -7,7 +7,7 @@
 using namespace std;
 using namespace UniSetTypes;
 
-TEST_CASE("IORFile", "[iorfile]" ) 
+TEST_CASE("IORFile", "[iorfile][basic]" ) 
 {
 	CHECK( uniset_conf()!=nullptr );
 

tests/messagetype.cc

+#include <catch.hpp>
+// ---------------------------------------------------------------
+#include "MessageType.h"
+#include "UniSetTypes.h"
+// ---------------------------------------------------------------
+using namespace std;
+using namespace UniSetTypes;
+// ---------------------------------------------------------------
+TEST_CASE("Message", "[basic][message types][Message]" )
+{
+	CHECK( uniset_conf()!=nullptr );
+	
+	auto conf = uniset_conf();
+
+	Message m;
+	CHECK( m.type == Message::Unused );
+	CHECK( m.priority == Message::Medium );
+	CHECK( m.node == conf->getLocalNode() );
+	CHECK( m.supplier == DefaultObjectId );
+	CHECK( m.consumer == DefaultObjectId );
+}
+// ---------------------------------------------------------------
+TEST_CASE("VoidMessage", "[basic][message types][VoidMessage]" )
+{
+	CHECK( uniset_conf()!=nullptr );
+
+	auto conf = uniset_conf();
+
+	VoidMessage vm;
+	CHECK( vm.type == Message::Unused );
+	CHECK( vm.priority == Message::Medium );
+	CHECK( vm.node == conf->getLocalNode() );
+	CHECK( vm.supplier == DefaultObjectId );
+	CHECK( vm.consumer == DefaultObjectId );
+}
+// ---------------------------------------------------------------
+TEST_CASE("SensorMessage", "[basic][message types][SensorMessage]" )
+{
+	CHECK( uniset_conf()!=nullptr );
+
+	auto conf = uniset_conf();
+
+	SECTION("Default consturctor")
+	{
+		SensorMessage sm;
+		CHECK( sm.type == Message::SensorInfo );
+		CHECK( sm.priority == Message::Medium );
+		CHECK( sm.node == conf->getLocalNode() );
+		CHECK( sm.supplier == DefaultObjectId );
+		CHECK( sm.consumer == DefaultObjectId );
+		CHECK( sm.id == DefaultObjectId );
+		CHECK( sm.value == 0 );
+		CHECK( sm.undefined == false );
+//		CHECK( sm.sm_tv_sec == );
+//		CHECK( sm.sm_tv_usec == );
+
+		CHECK( sm.sensor_type == UniversalIO::DI ); // UnknownIOType
+		CHECK( sm.ci.precision == 0 );
+		CHECK( sm.ci.minRaw == 0 );
+		CHECK( sm.ci.maxRaw == 0 );
+		CHECK( sm.ci.minCal == 0 );
+		CHECK( sm.ci.maxCal == 0 );
+		CHECK( sm.threshold == 0 );
+		CHECK( sm.tid == UniSetTypes::DefaultThresholdId );
+	}
+
+	SECTION("Default SensorMessage")
+	{
+		ObjectId sid = 1;
+		long val = 100;
+		SensorMessage sm(sid,val);
+		REQUIRE( sm.id == sid );
+		REQUIRE( sm.value == val );
+		REQUIRE( sm.sensor_type == UniversalIO::AI );
+	}
+
+	SECTION("Transport SensorMessage")
+	{
+		ObjectId sid = 1;
+		long val = 100;
+		SensorMessage sm(sid,val);
+		REQUIRE( sm.id == sid );
+		REQUIRE( sm.value == val );
+		REQUIRE( sm.sensor_type == UniversalIO::AI );
+
+		auto tm = sm.transport_msg();
+		
+		VoidMessage vm(tm);
+		REQUIRE(vm.type == Message::SensorInfo );
+		
+		SensorMessage sm2(&vm);
+		REQUIRE( sm2.type == Message::SensorInfo );
+		REQUIRE( sm2.id == sid );
+		REQUIRE( sm2.value == val );
+		REQUIRE( sm2.sensor_type == UniversalIO::AI );
+	}
+}
+// ---------------------------------------------------------------
+TEST_CASE("SystemMessage", "[basic][message types][SystemMessage]" )
+{
+	CHECK( uniset_conf()!=nullptr );
+	auto conf = uniset_conf();
+
+	SECTION("Default consturctor")
+	{
+		SystemMessage sm;
+		CHECK( sm.type == Message::SysCommand );
+		CHECK( sm.priority == Message::Medium );
+		CHECK( sm.node == conf->getLocalNode() );
+		CHECK( sm.supplier == DefaultObjectId );
+		CHECK( sm.consumer == DefaultObjectId );
+		CHECK( sm.command == SystemMessage::Unknown );
+		CHECK( sm.data[0] == 0 );
+		CHECK( sm.data[1] == 0 );
+	}
+
+	SECTION("Default SystemMessage")
+	{
+		SystemMessage::Command cmd = SystemMessage::StartUp;
+		SystemMessage sm(cmd);
+		REQUIRE( sm.command == cmd );
+		CHECK( sm.priority == Message::High );
+	}
+
+	SECTION("Transport SystemMessage")
+	{
+		SystemMessage::Command cmd = SystemMessage::StartUp;
+		int dat = 100;
+		SystemMessage sm(cmd);
+		sm.data[0] = dat;
+		REQUIRE( sm.command == cmd );
+
+		auto tm = sm.transport_msg();
+		
+		VoidMessage vm(tm);
+		REQUIRE(vm.type == Message::SysCommand );
+		
+		SystemMessage sm2(&vm);
+		REQUIRE( sm2.type == Message::SysCommand );
+		REQUIRE( sm2.command == cmd );
+		REQUIRE( sm2.data[0] == dat );
+	}
+}
+// ---------------------------------------------------------------
+TEST_CASE("TimerMessage", "[basic][message types][TimerMessage]" )
+{
+	CHECK( uniset_conf()!=nullptr );
+	auto conf = uniset_conf();
+
+	SECTION("Default consturctor")
+	{
+		TimerMessage tm;
+		CHECK( tm.type == Message::Timer );
+		CHECK( tm.priority == Message::Medium );
+		CHECK( tm.node == conf->getLocalNode() );
+		CHECK( tm.supplier == DefaultObjectId );
+		CHECK( tm.consumer == DefaultObjectId );
+		CHECK( tm.id == UniSetTypes::DefaultTimerId );
+	}
+
+	SECTION("Default TimerMessage")
+	{
+		int tid=100;
+		TimerMessage tm(tid);
+		REQUIRE( tm.id == tid );
+	}
+
+	SECTION("Transport TimerMessage")
+	{
+		int tid = 100;
+		TimerMessage tm(tid);
+		REQUIRE( tm.id == tid );
+
+		auto m = tm.transport_msg();
+		
+		VoidMessage vm(m);
+		REQUIRE(vm.type == Message::Timer );
+		
+		TimerMessage tm2(&vm);
+		REQUIRE( tm2.type == Message::Timer );
+		REQUIRE( tm2.id == tid );
+	}
+}
+// ---------------------------------------------------------------
+TEST_CASE("ConfirmMessage", "[basic][message types][ConfirmMessage]" )
+{
+	CHECK( uniset_conf()!=nullptr );
+	auto conf = uniset_conf();
+
+	ObjectId sid = 1;
+	double val = 100;
+	time_t t_sec = 10;
+	time_t t_usec = 300;
+	time_t t_confirm = 10;
+	  	
+	SECTION("Default consturctor")
+	{
+		ConfirmMessage cm(sid,val,t_sec,t_usec,t_confirm);
+		CHECK( cm.type == Message::Confirm );
+		CHECK( cm.priority == Message::Medium );
+		CHECK( cm.node == conf->getLocalNode() );
+		CHECK( cm.supplier == DefaultObjectId );
+		CHECK( cm.consumer == DefaultObjectId );
+		REQUIRE( cm.sensor_id == sid );
+		REQUIRE( cm.value == val );
+		REQUIRE( cm.time == t_sec );
+		REQUIRE( cm.time_usec == t_usec );
+		REQUIRE( cm.confirm == t_confirm );
+        CHECK( cm.broadcast == false );
+		CHECK( cm.route == false );
+	}
+
+	SECTION("Transport ConfirmMessage")
+	{
+	   	ConfirmMessage cm(sid,val,t_sec,t_usec,t_confirm);
+		REQUIRE( cm.sensor_id == sid );
+		REQUIRE( cm.value == val );
+		REQUIRE( cm.time == t_sec );
+		REQUIRE( cm.time_usec == t_usec );
+		REQUIRE( cm.confirm == t_confirm );
+
+		auto tm = cm.transport_msg();
+		
+		VoidMessage vm(tm);
+		REQUIRE(vm.type == Message::Confirm );
+		
+		ConfirmMessage cm2(&vm);
+		REQUIRE( cm2.sensor_id == sid );
+		REQUIRE( cm2.value == val );
+		REQUIRE( cm2.time == t_sec );
+		REQUIRE( cm2.time_usec == t_usec );
+		REQUIRE( cm2.confirm == t_confirm );
+	}
+}
+// ---------------------------------------------------------------