Merged branches/Security/ttcn (r1471-1819) to trunk. (d8021f75) · Commits · ITS - Intelligent Transport Systems / ITS

ttcn/AtsCAM/ItsCam_TestCases.ttcn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2817,7 +2817,7 @@ module ItsCam_TestCases {
	//change again the yaw rate value and set the expectation to the measured value		//change again the yaw rate value and set the expectation to the measured value
	v_yawRateVal := v_camInd.msgIn.cam.camParameters.highFrequencyContainer.basicVehicleContainerHighFrequency.yawRate.yawRateValue;		v_yawRateVal := v_camInd.msgIn.cam.camParameters.highFrequencyContainer.basicVehicleContainerHighFrequency.yawRate.yawRateValue;
	if (valueof(v_yawRateVal)>=32767) {		if (valueof(v_yawRateVal)>=32767) {
	v_yawRateVal := -32767;		v_yawRateVal := -32766;
	}		}
	else {		else {
	v_yawRateVal := v_camInd.msgIn.cam.camParameters.highFrequencyContainer.basicVehicleContainerHighFrequency.yawRate.yawRateValue+c_yawRateValOffset;		v_yawRateVal := v_camInd.msgIn.cam.camParameters.highFrequencyContainer.basicVehicleContainerHighFrequency.yawRate.yawRateValue+c_yawRateValOffset;

ttcn/AtsDENM/ItsDenm_TestCases.ttcn

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1976,7 +1976,7 @@ module ItsDenm_TestCases {
	m_situation(c_causeSlowVehicle, c_subCauseCode_Unavailable)		m_situation(c_causeSlowVehicle, c_subCauseCode_Unavailable)
	};		};
	var ActionID v_unknownActionId;		var ActionID v_unknownActionId;
	var ActionIDList v_actionIds := {mw_actionId(f_getIutStationId()), mw_actionId(f_getIutStationId())};		var ActionIDList v_actionIds;
	var DenmInd v_denmInd;		var DenmInd v_denmInd;
	var integer i;		var integer i;

	@@ -1997,12 +1997,12 @@ module ItsDenm_TestCases {
	f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);		f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);

	// Test Body		// Test Body
	v_unknownActionId := m_actionId(		v_unknownActionId := valueof(m_actionId(
	f_increaseSequenceNumber(		f_increaseSequenceNumber(
	v_actionIds[lengthof(v_actionIds)].sequenceNumber		v_actionIds[lengthof(v_actionIds)].sequenceNumber
	),		),
	f_getIutStationId()		f_getIutStationId()
	);		));
	f_utTerminateEvent(m_utEventCancellation(v_unknownActionId));		f_utTerminateEvent(m_utEventCancellation(v_unknownActionId));

	tc_ac.start;		tc_ac.start;
	@@ -2088,7 +2088,7 @@ module ItsDenm_TestCases {
	};		};
	var SequenceNumber v_sequenceNumber := v_initialSequenceNumber;		var SequenceNumber v_sequenceNumber := v_initialSequenceNumber;
	var ActionID v_unknownActionId;		var ActionID v_unknownActionId;
	var ActionIDList v_actionIds := {mw_actionId(f_getIutStationId()), mw_actionId(f_getIutStationId())};		var ActionIDList v_actionIds;
	var DenmInd v_denmInd;		var DenmInd v_denmInd;
	var integer i;		var integer i;

	@@ -2116,12 +2116,12 @@ module ItsDenm_TestCases {
	f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);		f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);

	// Test Body		// Test Body
	v_unknownActionId := m_actionId(		v_unknownActionId := valueof(m_actionId(
	f_increaseSequenceNumber(		f_increaseSequenceNumber(
	v_actionIds[lengthof(v_actionIds)].sequenceNumber		v_actionIds[lengthof(v_actionIds)].sequenceNumber
	),		),
	f_getTsStationId()		f_getTsStationId()
	);		));
	f_utTerminateEvent(m_utEventCancellation(v_unknownActionId));		f_utTerminateEvent(m_utEventCancellation(v_unknownActionId));

	tc_ac.start;		tc_ac.start;
	@@ -3368,7 +3368,7 @@ module ItsDenm_TestCases {
	v_actionId := f_sendDenMessage(v_denm);		v_actionId := f_sendDenMessage(v_denm);

	f_sleep(1.0);		f_sleep(1.0);
	v_detectionTime2 := v_denm.management.detectionTime - 1000;		v_detectionTime2 := valueof(v_denm.management.detectionTime) - 1000;
	v_actionId := f_sendDenMessage(		v_actionId := f_sendDenMessage(
	m_denm(		m_denm(
	m_denmMgmtCon(		m_denmMgmtCon(
	@@ -3478,7 +3478,7 @@ module ItsDenm_TestCases {
	v_actionId := f_sendDenMessage(v_denm);		v_actionId := f_sendDenMessage(v_denm);

	f_sleep(1.0);		f_sleep(1.0);
	v_detectionTime2 := v_denm.management.detectionTime + 1000;		v_detectionTime2 := valueof(v_denm.management.detectionTime) + 1000;
	v_actionId := f_sendDenMessage(		v_actionId := f_sendDenMessage(
	m_denm(		m_denm(
	m_denmMgmtCon(		m_denmMgmtCon(

ttcn/AtsGeoNetworking/ItsGeoNetworking_TestCases.ttcn

+26 −26

Original line number	Original line	Diff line number	Diff line
	@@ -142,7 +142,7 @@ module ItsGeoNetworking_TestCases {

	// Test Body		// Test Body
	v_gnPacket := m_geoNwPdu(m_geoNwShbPacket(v_longPosVectorNodeB));		v_gnPacket := m_geoNwPdu(m_geoNwShbPacket(v_longPosVectorNodeB));
	v_gnPacket.basicHeader.version := v_gnPacket.basicHeader.version + 1;		v_gnPacket.basicHeader.version := valueof(v_gnPacket.basicHeader.version) + 1;

	f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket));		f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket));

	@@ -2002,7 +2002,7 @@ module ItsGeoNetworking_TestCases {
	function f_TP_GEONW_PON_LOT_BV_03_main(in template (value) LongPosVector p_longPosVectorNodeA) runs on ItsGeoNetworking {		function f_TP_GEONW_PON_LOT_BV_03_main(in template (value) LongPosVector p_longPosVectorNodeA) runs on ItsGeoNetworking {

	// Test Body		// Test Body
	if ( not f_utTriggerEvent(m_generateGeoUnicastMessage(p_longPosVectorNodeA.gnAddr)) ) {		if ( not f_utTriggerEvent(m_generateGeoUnicastMessage(valueof(p_longPosVectorNodeA.gnAddr))) ) {
	log("* " & testcasename() & ": INCONC: Trigger failed *");		log("* " & testcasename() & ": INCONC: Trigger failed *");
	f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);
	}		}
	@@ -2014,7 +2014,7 @@ module ItsGeoNetworking_TestCases {
	log("* " & testcasename() & ": FAIL: Received Location Service Request *");		log("* " & testcasename() & ": FAIL: Received Location Service Request *");
	f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
	}		}
	[] a_receiveGeoUnicastWithDestination(mw_shortPosVectorPosition(f_longPosVector2ShortPosVector(p_longPosVectorNodeA))) {		[] a_receiveGeoUnicastWithDestination(mw_shortPosVectorPosition(f_longPosVector2ShortPosVector(valueof(p_longPosVectorNodeA)))) {
	tc_ac.stop;		tc_ac.stop;
	log("* " & testcasename() & ": PASS: GeoUnicast packet received correctly *");		log("* " & testcasename() & ": PASS: GeoUnicast packet received correctly *");
	f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
	@@ -2581,7 +2581,7 @@ module ItsGeoNetworking_TestCases {
	function f_TP_GEONW_PON_LOT_BV_05_main(in template (value) LongPosVector p_longPosVectorNodeB, in template (value) LongPosVector p_obsoleteLongPosVectorNodeB) runs on ItsGeoNetworking {		function f_TP_GEONW_PON_LOT_BV_05_main(in template (value) LongPosVector p_longPosVectorNodeB, in template (value) LongPosVector p_obsoleteLongPosVectorNodeB) runs on ItsGeoNetworking {

	// Test Body		// Test Body
	if ( not f_utTriggerEvent(m_generateGeoUnicastMessage(p_longPosVectorNodeB.gnAddr)) ) {		if ( not f_utTriggerEvent(m_generateGeoUnicastMessage(valueof(p_longPosVectorNodeB.gnAddr)))) {
	log("* " & testcasename() & ": INCONC: Trigger failed *");		log("* " & testcasename() & ": INCONC: Trigger failed *");
	f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);
	}		}
	@@ -2593,12 +2593,12 @@ module ItsGeoNetworking_TestCases {
	log("* " & testcasename() & ": FAIL: Received Location Service Request *");		log("* " & testcasename() & ": FAIL: Received Location Service Request *");
	f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
	}		}
	[] a_receiveGeoUnicastWithDestination(mw_shortPosVectorPosition(f_longPosVector2ShortPosVector(p_obsoleteLongPosVectorNodeB))) {		[] a_receiveGeoUnicastWithDestination(mw_shortPosVectorPosition(f_longPosVector2ShortPosVector(valueof(p_obsoleteLongPosVectorNodeB)))) {
	tc_ac.stop;		tc_ac.stop;
	log("* " & testcasename() & ": FAIL: GeoUnicast received with obsolete Destination Position Vector *");		log("* " & testcasename() & ": FAIL: GeoUnicast received with obsolete Destination Position Vector *");
	f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
	}		}
	[] a_receiveGeoUnicastWithDestination(mw_shortPosVectorPosition(f_longPosVector2ShortPosVector(p_longPosVectorNodeB))) {		[] a_receiveGeoUnicastWithDestination(mw_shortPosVectorPosition(f_longPosVector2ShortPosVector(valueof(p_longPosVectorNodeB)))) {
	tc_ac.stop;		tc_ac.stop;
	log("* " & testcasename() & ": PASS: GeoUnicast packet received correctly *");		log("* " & testcasename() & ": PASS: GeoUnicast packet received correctly *");
	f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
	@@ -6141,7 +6141,7 @@ module ItsGeoNetworking_TestCases {
	// Test Body		// Test Body
	if(not f_utTriggerEvent(m_generateGeoUnicastMessageWithTrafficClass(		if(not f_utTriggerEvent(m_generateGeoUnicastMessageWithTrafficClass(
	v_longPosVectorNodeA.gnAddr,		v_longPosVectorNodeA.gnAddr,
	m_trafficClass(e_scfDisabled)))) {		valueof(m_trafficClass(e_scfDisabled))))) {
	log("* " & testcasename() & ": INCONC: Trigger failed *");		log("* " & testcasename() & ": INCONC: Trigger failed *");
	f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);
	}		}
	@@ -6286,7 +6286,7 @@ module ItsGeoNetworking_TestCases {
	// Test Body		// Test Body
	if(not f_utTriggerEvent(m_generateGeoAnycastMessageWithTrafficClass(		if(not f_utTriggerEvent(m_generateGeoAnycastMessageWithTrafficClass(
	f_getArea(c_area2),		f_getArea(c_area2),
	m_trafficClass(e_scfDisabled)))) {		valueof(m_trafficClass(e_scfDisabled))))) {
	log("* " & testcasename() & ": INCONC: Trigger failed *");		log("* " & testcasename() & ": INCONC: Trigger failed *");
	f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);
	}		}
	@@ -6431,7 +6431,7 @@ module ItsGeoNetworking_TestCases {
	// Test Body		// Test Body
	if(not f_utTriggerEvent(m_generateGeoBroadcastMessageWithTrafficClass(		if(not f_utTriggerEvent(m_generateGeoBroadcastMessageWithTrafficClass(
	f_getArea(c_area2),		f_getArea(c_area2),
	m_trafficClass(e_scfDisabled)))) {		valueof(m_trafficClass(e_scfDisabled))))) {
	log("* " & testcasename() & ": INCONC: Trigger failed *");		log("* " & testcasename() & ": INCONC: Trigger failed *");
	f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);
	}		}
	@@ -6572,7 +6572,7 @@ module ItsGeoNetworking_TestCases {
	f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);		f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);

	// Test Body		// Test Body
	if(not f_utTriggerEvent(m_generateTsbMessageWithTrafficClass(m_trafficClass(e_scfDisabled)))) {		if(not f_utTriggerEvent(valueof(m_generateTsbMessageWithTrafficClass(valueof(m_trafficClass(e_scfDisabled)))))) {
	log("* " & testcasename() & ": INCONC: Trigger failed *");		log("* " & testcasename() & ": INCONC: Trigger failed *");
	f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);
	}		}
	@@ -6712,7 +6712,7 @@ module ItsGeoNetworking_TestCases {
	f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);		f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);

	// Test Body		// Test Body
	if(not f_utTriggerEvent(m_generateShbMessageWithTrafficClass(m_trafficClass(e_scfDisabled)))) {		if(not f_utTriggerEvent(valueof(m_generateShbMessageWithTrafficClass(valueof(m_trafficClass(e_scfDisabled)))))) {
	log("* " & testcasename() & ": INCONC: Trigger failed *");		log("* " & testcasename() & ": INCONC: Trigger failed *");
	f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);
	}		}
	@@ -10678,7 +10678,7 @@ module ItsGeoNetworking_TestCases {
	}		}

	// Test Body		// Test Body
	v_gnPacket.basicHeader.routerHopLimit := v_gnPacket.basicHeader.routerHopLimit / 2;		v_gnPacket.basicHeader.routerHopLimit := valueof(v_gnPacket.basicHeader.routerHopLimit) / 2;
	f_sleep(PX_TAC);		f_sleep(PX_TAC);
	for(i:=0; i < lengthof(vc_utInds) and not match(vc_utInds[i].rawPayload, v_gnPacket.gnPacket.packet.payload.rawPayload); i:=i+1) {		for(i:=0; i < lengthof(vc_utInds) and not match(vc_utInds[i].rawPayload, v_gnPacket.gnPacket.packet.payload.rawPayload); i:=i+1) {
	// empty on purpose		// empty on purpose
	@@ -10729,7 +10729,7 @@ module ItsGeoNetworking_TestCases {
	}		}

	// Test Body		// Test Body
	v_msgInd.msgIn.basicHeader.routerHopLimit := v_msgInd.msgIn.basicHeader.routerHopLimit / 2;		v_msgInd.msgIn.basicHeader.routerHopLimit := valueof(v_msgInd.msgIn.basicHeader.routerHopLimit) / 2;
	f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn));		f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn));
	f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);

	@@ -11962,7 +11962,7 @@ module ItsGeoNetworking_TestCases {
	}		}

	// Test Body		// Test Body
	v_msgInd.msgIn.basicHeader.routerHopLimit := v_msgInd.msgIn.basicHeader.routerHopLimit -1;		v_msgInd.msgIn.basicHeader.routerHopLimit := valueof(v_msgInd.msgIn.basicHeader.routerHopLimit) -1;
	f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn));		f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn));

	tc_noac.start;		tc_noac.start;
	@@ -12564,7 +12564,7 @@ module ItsGeoNetworking_TestCases {
	}		}

	// Test Body		// Test Body
	v_msgInd.msgIn.basicHeader.routerHopLimit := v_msgInd.msgIn.basicHeader.routerHopLimit - 1;		v_msgInd.msgIn.basicHeader.routerHopLimit := valueof(v_msgInd.msgIn.basicHeader.routerHopLimit) - 1;
	v_gnPacket := v_msgInd.msgIn;		v_gnPacket := v_msgInd.msgIn;
	f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn));		f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn));
	f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);

ttcn/AtsGeoNetworking/ItsGeoNetworking_TestControl.ttcn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,7 @@ module ItsGeoNetworking_TestControl {
	// ATS GeoNetworking		// ATS GeoNetworking
	import from ItsGeoNetworking_TestCases {testcase all};		import from ItsGeoNetworking_TestCases {testcase all};

	// LibIts		// LibItsGeoNetworking
	import from LibItsGeoNetworking_Pics all;		import from LibItsGeoNetworking_Pics all;
	import from LibItsGeoNetworking_TypesAndValues all;		import from LibItsGeoNetworking_TypesAndValues all;

ttcn/AtsSecurity/AtsSecurity_Functions.ttcn3

0 → 100644

+320 −0

File added.

Preview size limit exceeded, changes collapsed.

Admin message