Commit b6177f78 authored by garciay's avatar garciay
Browse files

All TCs were tested, two with success

parent 59d23e7f

adapter/Adapter.prj

+28 −32
Original line number Diff line number Diff line 
[Project ID]

Signature=UE Proj: v.1

[Open Files]

Open File0=D:\cygwin\home\yann\dev\g++\STF 370\adapter\src\Capture\PCAPCapture.cpp

Open File0=C:\Program Files\Elvior\MessageMagic5\mmagic_codec_log.txt

Active File Display Mode=3

Open File Pos0=3526

Open File Line0=3368

Open File Window Pos0=0,1,-1,-1,-4,-30,66,87,943,494

Open File1=D:\cygwin\home\yann\dev\g++\STF 370\adapter\src\Logger\Logger.h

Open File Pos1=2464

Open File Line1=1766

Open File Window Pos1=0,1,-1,-1,-4,-30,88,116,965,523

Open File2=D:\cygwin\home\yann\dev\g++\STF 370\adapter\src\Capture\TrafficCapture.cpp

Open File Pos2=0

Open File Line2=0

Open File Window Pos2=0,1,-1,-1,-4,-30,110,145,987,552

Open File3=

Open File Pos3=72227

Open File Line3=71357

Open File Pos0=0

Open File Line0=2663

Open File Window Pos0=2,3,-1,-1,-4,-30,88,116,961,519

Open File1=D:\cygwin\home\yann\dev\g++\STF 370\codec\c++\sip_codets.cpp

Open File Pos1=53160

Open File Line1=52644

Open File Window Pos1=0,1,-1,-1,-4,-30,110,145,987,552

Open File2=D:\cygwin\home\yann\dev\g++\STF 370\adapter\tmp\gen\gen_classes.h

Open File Pos2=64146

Open File Line2=63468

Open File Window Pos2=0,1,-1,-1,-4,-30,132,174,1009,581

Open File3=D:\cygwin\home\yann\dev\g++\STF 370\codec\c++\Regex.h

Open File Pos3=1948

Open File Line3=1835

Active File Index=0

Open File Window Pos3=0,1,-1,-1,-4,-30,88,116,975,523

Open File4=D:\cygwin\usr\local\share\t3devkit\mingw32-mmagic-definitions.mk

Open File Pos4=249

Open File Line4=0

Open File Window Pos4=2,3,-1,-1,-4,-30,110,145,997,552

Open File5=D:\cygwin\usr\local\share\t3devkit\mingw32-mmagic-stage3.mk

Open File Window Pos3=0,1,-1,-1,-4,-30,0,0,877,407

Open File4=

Open File Pos4=14349

Open File Line4=13919

Open File Window Pos4=0,1,-1,-1,-4,-30,22,29,899,436

Open File5=

Open File Pos5=0

Open File Line5=0

Open File Window Pos5=0,1,-1,-1,-4,-30,132,174,1019,581
@@ -57,7 +57,7 @@ Project Tagfile= 
Project Wordfile=

Filter=

Create Tagfile=0

Working Time=883860

Working Time=1030139

[Files]

0=.\src\

1=..\ttcn\
@@ -66,7 +66,7 @@ Working Time=883860 
4=.\validation\

5=.\tmp\gen\

6=..\codec\validation\

7=D:\cygwin\home\yann\dev\g++\STF 370\LibSip\

7=..\LibSip\

[Group Filter]

- src=*.cpp;*.h

- STF 370=*.ttcn
@@ -85,15 +85,11 @@ Working Time=883860 
.\validation\ - AtsImsIot=1

.\validation\ - LibIot=1

..\codec\c++\ - tmp=1

D:\cygwin\home\yann\dev\g++\STF 370\LibSip\=1

..\ttcn\ - LibIot=1

..\ttcn\ - AtsImsIot=1

.\tmp\gen\=1

.\src\=1

.\src\ - UpperTestAdapter - Processors=1

.\src\ - Ports=1

..\ttcn\ - LibIms_ConfigAndTrigger=1

.\src\ - UpperTestAdapter=1

.\src\ - Helper=1

.\src\ - Logger=1

.\src\ - Capture=1
 
.\src\ - UpperTestAdapter - Processors=1

.\src\ - UpperTestAdapter - TriggerCommandsGUI=1

..\LibSip\ - ttcn=1

.\tmp\gen\=1

..\codec\c++\=1

adapter/MMagic/STF370_ATS/STF370_ATS.mmsln

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ 
  <int>1000</int>

 </timer>

 <sut>

  <exe>D:\cygwin\home\yann\dev\g++\STF 370\adapter\TestExecution-SA.exe</exe>

  <port>7777</port>

  <ctime>60</ctime>

  <htime>30</htime>

adapter/MMagic/STF370_ATS/STF370_ATS.mmsln.user

+4 −26
Original line number Diff line number Diff line
@@ -2,42 +2,20 @@ 
<user_space>

 <logs>

  <items>

   <log>TestingEnvironment1_200909181529461\ttcn3_log.xmmlog</log>

   <log>TestingEnvironment1_200909251138282\ttcn3_log.xmmlog</log>

  </items>

 </logs>

 <open>

  <metaclasses />

  <tes />

  <scripts>

   <item>

    <name>AtsImsIot_Behavior</name>

    <tab>

     <pos>3</pos>

     <ln>3169</ln>

    </tab>

   </item>

   <item>

    <name>LibIot_PIXITS</name>

    <tab>

     <pos>0</pos>

     <ln>361</ln>

    </tab>

   </item>

   <item>

    <name>AtsImsIot_TestControl</name>

    <tab>

     <pos>1</pos>

     <ln>0</ln>

    </tab>

   </item>

  </scripts>

  <scripts />

  <scenarios />

  <mis />

  <logs>

   <item>

    <name>TestingEnvironment1_200909181529461\ttcn3_log.xmmlog</name>

    <name>TestingEnvironment1_200909251138282\ttcn3_log.xmmlog</name>

    <tab>

     <pos>2</pos>

     <pos>0</pos>

     <active />

    </tab>

   </item>

adapter/MMagic/TestExecution.mmsln.user

+2 −12
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<user_space>

 <logs>

  <items>

   <log>TestingEnvironment1_200909021438125\ttcn3_log.xmmlog</log>

  </items>

  <items />

 </logs>

 <open>

  <metaclasses />
@@ -11,15 +9,7 @@ 
  <scripts />

  <scenarios />

  <mis />

  <logs>

   <item>

    <name>TestingEnvironment1_200909021438125\ttcn3_log.xmmlog</name>

    <tab>

     <pos>1</pos>

     <active />

    </tab>

   </item>

  </logs>

  <logs />

 </open>

 <main_script>TestExecution</main_script>

 <campaigns />

adapter/mm/Adapter.cpp

+32 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ extern "C" 
#include <boost/thread/condition.hpp>

#include "tri-sa.h"

#include "tri-pa.h"

#include "Logger/Logger.h"

#include <iostream>



static boost::mutex exitMutex;

static boost::condition exitCondition;
@@ -27,14 +29,26 @@ int main(int argc, char **argv) 
		std::cout << "-a address       Specifies MessageMagic IP address. 127.0.0.1 is used by" << std::endl;

		std::cout << "                 default." << std::endl;

		std::cout << "-p port_number   Specifies MessageMagic port. 7777 is used by default." << std::endl;

		std::cout << "-L*              Sets the log level. Log levels can be combined together." << std::endl;

		std::cout << "                 The following log levels are available:" << std::endl;

		std::cout << "   -Linfo        Displays information messages" << std::endl;

		std::cout << "   -Lerr         Displays errors" << std::endl;

		std::cout << "   -Lwarn        Displays warnings" << std::endl;

		std::cout << "   -Ldebug       Displays debugging information" << std::endl;

		std::cout << "   -Lall         Displays all information" << std::endl;

		std::cout << "   -Lnone        No messages are displayed" << std::endl;

		return 0;

	}



	int nLogMode = 0;

	bool bLogModeSet = false;

	bool bError = false;

	Logger::Instance().SetLoggingMode(Logger::LOG_ERRORS);

	char * pszAddr = "127.0.0.1";

	int nPort = 7777;

	for (int i = 1; i < argc; ++i)

	{

		bool bLog = false;

		char * pszArg = argv[i];

		if (strcmp(pszArg, "-p") == 0)

		{
@@ -56,6 +70,18 @@ int main(int argc, char **argv) 
				pszAddr = pszArg;

			}

		}

		else if (bLog = strcmp(pszArg, "-Linfo") == 0)

			nLogMode |= Logger::LOG_INFO;

		else if (bLog = strcmp(pszArg, "-Lerr") == 0)

			nLogMode |= Logger::LOG_ERRORS;

		else if (bLog = strcmp(pszArg, "-Lwarn") == 0)

			nLogMode |= Logger::LOG_WARNINGS;

		else if (bLog = strcmp(pszArg, "-Ldebug") == 0)

			nLogMode |= Logger::LOG_DEBUG | Logger::LOG_INFO;

		else if (bLog = strcmp(pszArg, "-Lall") == 0)

			nLogMode = Logger::LOG_ALL;

		else if (bLog = strcmp(pszArg, "-Lnone") == 0)

			nLogMode = Logger::LOG_NOTHING;

		else

		{

			bError = true;
@@ -64,9 +90,15 @@ int main(int argc, char **argv) 
			s += "\"";

			std::cout << s << std::endl;

		}

		if (bLog)

			bLogModeSet = true;

	}

	if (bError)

		return 1;

	if (!bLogModeSet)

		nLogMode = Logger::LOG_INFO | Logger::LOG_ERRORS;

	Logger::Instance().SetLoggingMode(nLogMode);

	Logger::Instance().LogDebug("Command line parameters processed successfully");





#ifdef WIN32