Replaced __SCOPE__ by testcasename() (fc3f08f4) · Commits · TTCN-3 Libraries / LibIts

ttcn/DENM/LibItsDenm_Functions.ttcn

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -35,10 +35,10 @@ module LibItsDenm_Functions {
	alt {		alt {
	[] utPort.receive(UtInitializeResult:true) {		[] utPort.receive(UtInitializeResult:true) {
	tc_wait.stop;		tc_wait.stop;
	log("* " & __SCOPE__ & ": INFO: IUT initialized *");		log("* " & testcasename() & ": INFO: IUT initialized *");
	}		}
	[] tc_wait.timeout {		[] tc_wait.timeout {
	log("* " & __SCOPE__ & ": INFO: Could not receive expected UT message from IUT in time *");		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
	f_selfOrClientSyncAndVerdict("error", e_timeout);		f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	[else] { // Shortcut defaults		[else] { // Shortcut defaults
	@@ -67,7 +67,7 @@ module LibItsDenm_Functions {
	f_selfOrClientSyncAndVerdict("DENM Trigger failed", e_timeout);		f_selfOrClientSyncAndVerdict("DENM Trigger failed", e_timeout);
	}		}
	[] tc_wait.timeout {		[] tc_wait.timeout {
	log("* " & __SCOPE__ & ": INFO: Could not receive expected UT message from IUT in time *");		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
	f_selfOrClientSyncAndVerdict("error", e_timeout);		f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	[else] { // Shortcut defaults		[else] { // Shortcut defaults
	@@ -94,7 +94,7 @@ module LibItsDenm_Functions {
	v_actionId := v_result.actionId;		v_actionId := v_result.actionId;
	}		}
	[] tc_wait.timeout {		[] tc_wait.timeout {
	log("* " & __SCOPE__ & ": INFO: Could not receive expected UT message from IUT in time *");		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
	f_selfOrClientSyncAndVerdict("error", e_timeout);		f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	[else] { // Shortcut defaults		[else] { // Shortcut defaults
	@@ -118,7 +118,7 @@ module LibItsDenm_Functions {
	tc_wait.stop;		tc_wait.stop;
	}		}
	[] tc_wait.timeout {		[] tc_wait.timeout {
	log("* " & __SCOPE__ & ": INFO: Could not receive expected UT message from IUT in time *");		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
	f_selfOrClientSyncAndVerdict("error", e_timeout);		f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	[else] { // Shortcut defaults		[else] { // Shortcut defaults
	@@ -141,7 +141,7 @@ module LibItsDenm_Functions {
	tc_wait.stop;		tc_wait.stop;
	}		}
	[] tc_wait.timeout {		[] tc_wait.timeout {
	log("* " & __SCOPE__ & ": INFO: Could not receive expected UT message from IUT in time *");		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
	f_selfOrClientSyncAndVerdict("error", e_timeout);		f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	[else] { // Shortcut defaults		[else] { // Shortcut defaults
	@@ -185,26 +185,26 @@ module LibItsDenm_Functions {
	*/		*/
	altstep a_default() runs on ItsDenm {		altstep a_default() runs on ItsDenm {
	[] denmPort.receive(mw_denmInd(mw_denmPdu(mw_anyDenm))) {		[] denmPort.receive(mw_denmInd(mw_denmPdu(mw_anyDenm))) {
	log("* " & __SCOPE__ & ": INFO: DENM message received in default *");		log("* " & testcasename() & ": INFO: DENM message received in default *");
	vc_denmReceived := true;		vc_denmReceived := true;
	repeat;		repeat;
	}		}
	[] denmPort.receive {		[] denmPort.receive {
	log("* " & __SCOPE__ & ": ERROR: Received an unexpected message *");		log("* " & testcasename() & ": ERROR: Received an unexpected message *");
	f_selfOrClientSyncAndVerdict("error", e_error);		f_selfOrClientSyncAndVerdict("error", e_error);
	}		}
	[] tc_wait.timeout {		[] tc_wait.timeout {
	log("* " & __SCOPE__ & ": INCONC: Timeout while awaiting reaction of the IUT prior to Upper Tester action *");		log("* " & testcasename() & ": INCONC: Timeout while awaiting reaction of the IUT prior to Upper Tester action *");
	f_selfOrClientSyncAndVerdict("error", e_timeout);		f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	[] tc_ac.timeout {		[] tc_ac.timeout {
	log("* " & __SCOPE__ & ": INCONC: Timeout while awaiting the reception of a message *");		log("* " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message *");
	f_selfOrClientSyncAndVerdict("error", e_timeout);		f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	[] a_shutdown() {		[] a_shutdown() {
	f_poDefault();		f_poDefault();
	f_cfDown();		f_cfDown();
	log("* " & __SCOPE__ & ": INFO: TEST COMPONENT NOW STOPPING ITSELF! *");		log("* " & testcasename() & ": INFO: TEST COMPONENT NOW STOPPING ITSELF! *");
	stop;		stop;
	}		}
	}		}
	@@ -221,7 +221,7 @@ module LibItsDenm_Functions {
	}		}
	[] utPort.receive {		[] utPort.receive {
	tc_wait.stop;		tc_wait.stop;
	log("* " & __SCOPE__ & ": INFO: Received unexpected UT message from IUT *");		log("* " & testcasename() & ": INFO: Received unexpected UT message from IUT *");
	f_selfOrClientSyncAndVerdict("error", e_error);		f_selfOrClientSyncAndVerdict("error", e_error);
	}		}
	}		}
	@@ -327,7 +327,7 @@ module LibItsDenm_Functions {
	tc_ac.stop;		tc_ac.stop;
	}		}
	[] tc_ac.timeout {		[] tc_ac.timeout {
	log("* " & __SCOPE__ & ": INFO: Timeout while awaiting the reception of a message *");		log("* " & testcasename() & ": INFO: Timeout while awaiting the reception of a message *");
	f_selfOrClientSyncAndVerdict("error", e_timeout);		f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	}		}

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1125,7 +1125,7 @@ module LibItsGeoNetworking_Functions {
	repeat;		repeat;
	}		}
	[] utPort.receive {		[] utPort.receive {
	log("* " & __SCOPE__ & ": INFO: Received unexpected UT message from IUT *");		log("* " & testcasename() & ": INFO: Received unexpected UT message from IUT *");
	repeat;		repeat;
	}		}
	}		}

ttcn/Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_Functions.ttcn

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -107,7 +107,7 @@ module LibItsIpv6OverGeoNetworking_Functions {
	)		)
	)		)
	) {		) {
	log("* " & __SCOPE__ & ": INFO: Ignoring unsupported IPv6 packet *");		log("* " & testcasename() & ": INFO: Ignoring unsupported IPv6 packet *");
	repeat;		repeat;
	}		}
	[] geoNetworkingPort.receive (		[] geoNetworkingPort.receive (
	@@ -131,11 +131,11 @@ module LibItsIpv6OverGeoNetworking_Functions {
	mw_longPosVectorPosition_withDelta(f_getPosition(c_compNodeB))		mw_longPosVectorPosition_withDelta(f_getPosition(c_compNodeB))
	)		)
	)) {		)) {
	log("* " & __SCOPE__ & ": INFO: Ignoring rebroadcasted IPv6 packet *");		log("* " & testcasename() & ": INFO: Ignoring rebroadcasted IPv6 packet *");
	repeat;		repeat;
	}		}
	else {		else {
	log("* " & __SCOPE__ & ": ERROR: Received an unexpected message *");		log("* " & testcasename() & ": ERROR: Received an unexpected message *");
	f_selfOrClientSyncAndVerdict("error", e_error);		f_selfOrClientSyncAndVerdict("error", e_error);
	}		}
	}		}
	@@ -147,7 +147,7 @@ module LibItsIpv6OverGeoNetworking_Functions {
	? // TODO: rtAdv		? // TODO: rtAdv
	)		)
	) {		) {
	log("* " & __SCOPE__ & ": INFO: Ignoring Router Advertisement *");		log("* " & testcasename() & ": INFO: Ignoring Router Advertisement *");
	repeat;		repeat;
	}		}

	@@ -263,11 +263,11 @@ module LibItsIpv6OverGeoNetworking_Functions {
	}		}
	[] acPort.receive {		[] acPort.receive {
	tc_ac.stop;		tc_ac.stop;
	log("* " & __SCOPE__ & ": ERROR: Received unexpected message *");		log("* " & testcasename() & ": ERROR: Received unexpected message *");
	f_selfOrClientSyncAndVerdict("error", e_error);		f_selfOrClientSyncAndVerdict("error", e_error);
	}		}
	[] tc_ac.timeout {		[] tc_ac.timeout {
	log("* " & __SCOPE__ & ": INCONC: Timeout while waiting for adapter control event result *");		log("* " & testcasename() & ": INCONC: Timeout while waiting for adapter control event result *");
	f_selfOrClientSyncAndVerdict("error", e_timeout);		f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	}		}
	@@ -516,7 +516,7 @@ module LibItsIpv6OverGeoNetworking_Functions {
	var Bit64 v_prefixReadyBits := int2bit(0, 64);		var Bit64 v_prefixReadyBits := int2bit(0, 64);

	if (p_prefixLen > 64) {		if (p_prefixLen > 64) {
	log("* " & __SCOPE__ & ": ERROR: Wrong prefixLen (max 64 bits) *");		log("* " & testcasename() & ": ERROR: Wrong prefixLen (max 64 bits) *");
	return int2oct(0, 8);		return int2oct(0, 8);
	}		}

	@@ -543,7 +543,7 @@ module LibItsIpv6OverGeoNetworking_Functions {
	var Oct8 v_interfaceIdReady := int2oct(0,8);		var Oct8 v_interfaceIdReady := int2oct(0,8);

	if (p_prefixLen > 64) {		if (p_prefixLen > 64) {
	log("* " & __SCOPE__ & ": ERROR: Wrong prefixLen *");		log("* " & testcasename() & ": ERROR: Wrong prefixLen *");
	return '00000000000000000000000000000000'O;		return '00000000000000000000000000000000'O;
	}		}

	@@ -567,7 +567,7 @@ module LibItsIpv6OverGeoNetworking_Functions {
	var Oct8 v_haAnycast := 'FDFFFFFFFFFFFFFE'O;		var Oct8 v_haAnycast := 'FDFFFFFFFFFFFFFE'O;

	if (p_prefixLen != 64) {		if (p_prefixLen != 64) {
	log("* " & __SCOPE__ & ": ERROR: Wrong prefixLen *");		log("* " & testcasename() & ": ERROR: Wrong prefixLen *");
	return '00000000000000000000000000000000'O;		return '00000000000000000000000000000000'O;
	}		}

	@@ -589,7 +589,7 @@ module LibItsIpv6OverGeoNetworking_Functions {
	var Oct3 v_leftPart := 'FF3E00'O;		var Oct3 v_leftPart := 'FF3E00'O;

	if (p_prefixLen>64) {		if (p_prefixLen>64) {
	log("* " & __SCOPE__ & ": ERROR: Wrong prefixLen, max 64 bits allowed *");		log("* " & testcasename() & ": ERROR: Wrong prefixLen, max 64 bits allowed *");
	return int2oct(0, 16);		return int2oct(0, 16);
	}		}

	@@ -609,7 +609,7 @@ module LibItsIpv6OverGeoNetworking_Functions {
	var Bit64 v_interfaceIdentifierField := '11111101'B & int2bit(1, 49) & c_itsGn6aslGeoAnycastID;		var Bit64 v_interfaceIdentifierField := '11111101'B & int2bit(1, 49) & c_itsGn6aslGeoAnycastID;

	if (p_prefixLen>64) {		if (p_prefixLen>64) {
	log("* " & __SCOPE__ & ": ERROR: Wrong prefixLen, max 64 bits allowed *");		log("* " & testcasename() & ": ERROR: Wrong prefixLen, max 64 bits allowed *");
	return int2oct(0, 16);		return int2oct(0, 16);
	}		}

	@@ -708,7 +708,7 @@ module LibItsIpv6OverGeoNetworking_Functions {
	) return Oct2 {		) return Oct2 {
	var Oct2 v_checksum := 'FFFF'O;		var Oct2 v_checksum := 'FFFF'O;

	log("* " & __SCOPE__ & ": INFO: calling fx_computeIPv6CheckSum() *");		log("* " & testcasename() & ": INFO: calling fx_computeIPv6CheckSum() *");
	v_checksum := fx_computeIPv6CheckSum(p_sourceAddress, p_destinationAddress, p_payloadLength, p_payload, p_nextHdr);		v_checksum := fx_computeIPv6CheckSum(p_sourceAddress, p_destinationAddress, p_payloadLength, p_payload, p_nextHdr);

	return v_checksum;		return v_checksum;

Admin message