Merge branch 'ts_validation' into devel2 (e9b74c98) · Commits · ITS - Intelligent Transport Systems / ttcn / PKI TS 103 525-3

ItsPki_TestCases.ttcn

+9 −8

Original line number	Diff line number	Diff line
		@@ -3127,22 +3127,21 @@ module ItsPki_TestCases {
		v_request2)
		{
		tc_ac.stop;
		log("* " & testcasename() & ": PASS: Same enrolment request received *");
		log("* " & testcasename() & ": PASS: Enrolment request repetition received *");
		// send error respond to prevent future requests
		f_selfOrClientSyncAndVerdictPreamble(c_tbDone, e_success);
		}
		[] a_await_ec_http_request_from_iut(mw_http_ec_request_generic, v_request2) {
		tc_ac.stop;
		log("* " & testcasename() & ": FAIL: 2nd enrolment request is not identical *");
		log("* " & testcasename() & ": FAIL: 2nd enrolment request is not identical to the 1st one *");
		f_selfOrClientSyncAndVerdictPreamble(c_tbDone, e_error);
		}
		[] tc_ac.timeout {
		log("* " & testcasename() & ": INCONC: First enrolment request not received *");
		log("* " & testcasename() & ": INCONC: 2nd enrolment request was not received *");
		f_selfOrClientSyncAndVerdictPreamble(c_tbDone, e_timeout);
		}
		} // End of 'alt' statement

		f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
		f_selfOrClientSyncAndVerdictPreamble(c_tbDone, e_success);

		// Postamble
		f_cfHttpDown();
		@@ -3280,12 +3279,14 @@ module ItsPki_TestCases {
		log("* " & testcasename() & ": FAIL: Repetition request received after response *");
		f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
		}

		[] a_await_ec_http_request_from_iut( mw_http_ec_request_generic, v_request ) {
		tc_ac.stop;
		f_send_500_Internal_Error(v_headers);
		log("* " & testcasename() & ": INCONC: New request received during repetition period *");
		log("* " & testcasename() & ": INCONC: New EC request received during repetition period *");
		f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
		}

		[] tc_ac.timeout {
		if(v_rep_count < c_rep_answer) {
		log("* " & testcasename() & ": INCONC: Timeout occured during the repetition period *");

lib_system/LibItsPki_Functions.ttcn

+9 −9

Original line number	Diff line number	Diff line
		@@ -5365,9 +5365,9 @@ module LibItsPki_Functions {
		PICS_HTTP_POST_URI_EC,
		-,
		mw_http_message_body_binary(
		mw_binary_body_ieee1609dot2_data(
		p_ieee1609dot2_data
		))));
		mw_binary_body_ieee1609dot2_data( p_ieee1609dot2_data)

		)));
		} // End of predefined requests

		function f_await_ec_request_send_response(