Commit 4e001a3c authored by petersenj's avatar petersenj
Browse files

some changes on test exec

parent 4520051c

ttcn/dPMR_Functions.ttcn

+26 −0
Original line number Diff line number Diff line
@@ -404,6 +404,32 @@ group UtilityFunctions { 
			return v_retcc;

		} // end f_getWrongColourCode



		function f_ConvertDialStringToAddress(DialString p_inDialString)

		return MsAddress {

			var CSFAddress v_csfAddress;

			var MsAddress v_retAdr;

			var integer tempAdr;

			var integer i;

			var integer v_tmpArr[8];

			for (i:=0;i>0;i:=i-1) {

				if (p_inDialString[i-1] == "*") {  v_tmpArr[i] :=10;}

				if (p_inDialString[i-1] == "0") {  v_tmpArr[i] :=0;}

				if (p_inDialString[i-1] == "1") {  v_tmpArr[i] :=1;}

				if (p_inDialString[i-1] == "2") {  v_tmpArr[i] :=2;}

				if (p_inDialString[i-1] == "3") {  v_tmpArr[i] :=3;}

				if (p_inDialString[i-1] == "4") {  v_tmpArr[i] :=4;}

				if (p_inDialString[i-1] == "5") {  v_tmpArr[i] :=5;}

				if (p_inDialString[i-1] == "6") {  v_tmpArr[i] :=6;}

				if (p_inDialString[i-1] == "7") {  v_tmpArr[i] :=7;}

				if (p_inDialString[i-1] == "8") {  v_tmpArr[i] :=8;}

				if (p_inDialString[i-1] == "9") {  v_tmpArr[i] :=9;}

			}

			tempAdr := v_tmpArr[1]*1464100 + v_tmpArr[2]*146410+v_tmpArr[3]*14641+v_tmpArr[4]*1331+v_tmpArr[5]*121+v_tmpArr[6]*11+v_tmpArr[7];

			v_csfAddress := int2bit(tempAdr,24);

			v_retAdr := {csfAddress := v_csfAddress};

			return v_retAdr

		}

	

	} //end UtilityFunctions

ttcn/dPMR_TestExecution.ttcn

+3 −2
Original line number Diff line number Diff line
@@ -78,11 +78,11 @@ module dPMR_TestExecution { 
			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_TYPE_3_DATA_SUPPORT) {execute(TC_PMR_0406_04() );} 



			if ((PIC_ISF_OR_CSF == e_csf) and PIC_MANUAL_DISCONNECTION_REQUEST) {execute(TC_PMR_0407_01() );}

			if (PIC_ISF_OR_CSF == e_csf)  {execute(TC_PMR_0408_01() );}



			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_TYPE_1_DATA_SUPPORT and PIC_AUTOMATIC_DISCONNECTION_REQUEST) {execute(TC_PMR_0407_02() );}

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_TYPE_2_DATA_SUPPORT and PIC_AUTOMATIC_DISCONNECTION_REQUEST) {execute(TC_PMR_0407_03() );}

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_TYPE_3_DATA_SUPPORT and PIC_AUTOMATIC_DISCONNECTION_REQUEST) {execute(TC_PMR_0407_04() );}

			if (PIC_ISF_OR_CSF == e_csf)  {execute(TC_PMR_0408_01() );}
@@ -223,8 +223,8 @@ module dPMR_TestExecution { 
		//		group ISDM_ShortFileTransfer {// Clause 5.2.3.3



				if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0855_01() );}

				if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_TYPE_1_DATA_SUPPORT) {execute(TC_PMR_0857_01() );} 

				if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_TYPE_2_DATA_SUPPORT) {execute(TC_PMR_0856_01() );} 

				if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_TYPE_1_DATA_SUPPORT) {execute(TC_PMR_0857_01() );} 



		//		} // end group ISDM_ShortFileTransfer

		//		group ISDM_StatusMessage {// Clause 5.2.3.4
@@ -250,6 +250,7 @@ module dPMR_TestExecution { 
		//	group Type3Data { // Clause 5.2.7

				if (PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0808_01() );}

				if (PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0817_01() );}

				if (PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0818_01() );}

				if (PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0819_01() );}

				if (PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0820_01() );}

				if (PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0821_01() );}