Removed obselete function f_utCheck() (0accd8c2) · Commits · TTCN-3 Libraries / LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+24 −40

Original line number	Original line	Diff line number	Diff line
	@@ -105,46 +105,6 @@ module LibItsGeoNetworking_Functions {
	}		}
	}		}

	/**
	* @desc Checks that the event was indicated at the application layer
	* @param p_event The event to check.
	* @param p_discard The event should not appear. Default value: FALSE.
	*/
	function f_utCheckEvent(template (value) UtGnTrigger p_event, boolean p_discard) runs on ItsGeoNetworking {

	utPort.send(p_event);
	tc_wait.start;
	alt {
	[] utPort.receive(UtResult:true) {
	tc_wait.stop;
	if (p_discard == false) {
	log("* f_utCheckEvent: INFO: Event correctly indicated at application layer *");
	}
	else {
	log("* f_utCheckEvent: ERROR: Event indicated at application layer where it should be discarded *");
	f_selfOrClientSyncAndVerdict("error", e_error);
	}
	}
	[] utPort.receive(UtResult:false) {
	tc_wait.stop;
	if (p_discard == false) {
	log("* f_utCheckEvent: ERROR: Event not correctly indicated at application layer *");
	f_selfOrClientSyncAndVerdict("error", e_error);
	}
	else {
	log("* f_utCheckEvent: INFO: Event not indicated at application layer*");
	}
	}
	[] tc_wait.timeout {
	log("* f_utCheckEvent: ERROR: Timeout while waiting for event check result *");
	f_selfOrClientSyncAndVerdict("error", e_timeout);
	}
	[else] { // Shortcut defaults
	repeat;
	}
	}
	}

	} // End of group utFunctions		} // End of group utFunctions

	group geoConfigurationFunctions {		group geoConfigurationFunctions {
	@@ -886,6 +846,30 @@ module LibItsGeoNetworking_Functions {
	}		}
	}		}

			/**
			* @desc The default for handling upper tester messages.
			*/
			altstep a_utDefault() runs on ItsGeoNetworking {
			var UtGnEventInd v_ind;
			[] utPort.receive(UtGnEventInd:?) -> value v_ind {
			//store every upper tester indication received
			vc_utInds[lengthof(vc_utInds)] := v_ind;
			repeat;
			}
			[] utPort.receive {
			tc_wait.stop;
			log("* " & __SCOPE__ & ": INFO: Received unexpected UT message from IUT *");
			f_selfOrClientSyncAndVerdict("error", e_error);
			}
			[] tc_wait.timeout {
			log("* " & __SCOPE__ & ": INFO: Could not receive expected UT message from IUT in time *");
			f_selfOrClientSyncAndVerdict("error", e_timeout);
			}
			[else] { // Shortcut defaults
			repeat;
			}
			}

	/**		/**
	* @desc Default handling cf01 de-initialisation.		* @desc Default handling cf01 de-initialisation.
	*/		*/

ttcn/GeoNetworking/LibItsGeoNetworking_TestSystem.ttcn

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -40,9 +40,9 @@ module LibItsGeoNetworking_TestSystem {
	*/		*/
	type port UpperTesterPort message {		type port UpperTesterPort message {
	out		out
	UtInitialize, UtChangePosition, UtGnTrigger, UtCheck;		UtInitialize, UtChangePosition, UtGnTrigger;
	in		in
	UtInitializeResult, UtChangePositionResult, UtResult;		UtInitializeResult, UtChangePositionResult, UtResult, UtGnEventInd;
	} // end UpperTesterPort		} // end UpperTesterPort

	} // end portDefinitions		} // end portDefinitions
	@@ -117,6 +117,9 @@ module LibItsGeoNetworking_TestSystem {
	var default vc_neighbourDefault;		var default vc_neighbourDefault;
	var integer vc_multipleMessagesCount := f_getMessageCount();		var integer vc_multipleMessagesCount := f_getMessageCount();

			// UT indications
			var UtGnEventIndList vc_utInds := {};

	} // End of component ItsGeoNetworking		} // End of component ItsGeoNetworking

	group networkAndTransportPrimitives {		group networkAndTransportPrimitives {

ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -937,6 +937,18 @@ module LibItsGeoNetworking_TypesAndValues {
	Payload payload		Payload payload
	}		}

			/**
			* @desc Upper Tester message to check Upper Layer message transmission on GN IUT
			*/
			type record UtGnEventInd {
			GeoNetworkingPdu gnPdu
			}

			/**
			* @desc List of Upper Tester messages to check Upper Layer message transmission on GN IUT
			*/
			type record of UtGnEventInd UtGnEventIndList;

	} // end utPrimitives		} // end utPrimitives
	with {		with {
	encode "UpperTester"		encode "UpperTester"