SipComponent now extends from SelfSyncComp to allow usage of LibCommon_Sync functionality. (23222faf) · Commits · TTCN-3 Libraries / LibSip

branches/v3/ttcn/LibSip_Interface.ttcn

+1 −6

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ module LibSip_Interface {
		// // general variables
		// var ImsInterfaceProfile vc_interfaceprofile
		// } // end ImsComponent
		type component SipComponent {
		type component SipComponent extends SelfSyncComp {
		// port
		port SipPort SIPP;
		// used for communication with the operator
		@@ -208,11 +208,6 @@ module LibSip_Interface {
		portField := PX_SIP_TS1_PORT
		};*/

		// parts needed for Client/SelfSyncComp type compatibility
		var StringStack vc_stateStack := c_initStringStack;
		port SyncPort syncSendPort;
		port SyncPort syncPort;
		timer tc_sync := PX_TSYNC_TIME_LIMIT;
		// // used for communication with the operator
		// port OperatorPort_SIP opPort;
		} // end SipComponent

branches/v3/ttcn/LibSip_Steps.ttcn

+8 −16

Original line number	Diff line number	Diff line
		@@ -3967,8 +3967,7 @@ module LibSip_Steps {
		// != pass does not work, because in case of "none" execution shall continue
		if (getverdict == inconc or getverdict == fail) {
		log("* f_check2Null: INFO: Verdict evaluated to fail or inconc. Stopping test execution now *");
		//TODO Check this!!! The function call cannot be used as the function f_check2Null runs on SipComponent
		//f_selfOrClientSyncAndVerdict(p_syncPoint, e_error);
		f_selfOrClientSyncAndVerdict(p_syncPoint, e_error);
		} // end if
		}

		@@ -4456,8 +4455,7 @@ module LibSip_Steps {
		};
		}

		//TODO Check this!!! The function call cannot be used as the function f_check2Null runs on SipComponent
		//f_selfOrClientSyncAndVerdict(c_uPlane, f_getVerdict()); // Note: implemented in test bodies
		f_selfOrClientSyncAndVerdict(c_uPlane, f_getVerdict()); // Note: implemented in test bodies
		return;
		} // end of f_check_Conversation

		@@ -4505,8 +4503,7 @@ module LibSip_Steps {
		};
		}

		//TODO Check this!!! The function call cannot be used as the function f_check2Null runs on SipComponent
		//f_selfOrClientSyncAndVerdict(c_Ringing, f_getVerdict());
		f_selfOrClientSyncAndVerdict(c_Ringing, f_getVerdict());
		return;
		} // end of f_check_Ringing

		@@ -4554,8 +4551,7 @@ module LibSip_Steps {
		};
		}

		//TODO Check this!!! The function call cannot be used as the function f_check2Null runs on SipComponent
		//f_selfOrClientSyncAndVerdict(c_annoucA, f_getVerdict());
		f_selfOrClientSyncAndVerdict(c_annoucA, f_getVerdict());
		return;
		} // end of f_check_AnnouncementUE_A

		@@ -4603,8 +4599,7 @@ module LibSip_Steps {
		};
		}

		//TODO Check this!!! The function call cannot be used as the function f_check2Null runs on SipComponent
		//f_selfOrClientSyncAndVerdict(c_annoucB, f_getVerdict());
		f_selfOrClientSyncAndVerdict(c_annoucB, f_getVerdict());
		return;
		} // end of f_check_AnnouncementUE_B

		@@ -4652,8 +4647,7 @@ module LibSip_Steps {
		};
		}

		//TODO Check this!!! The function call cannot be used as the function f_check2Null runs on SipComponent
		//f_selfOrClientSyncAndVerdict(c_annouc, f_getVerdict());
		f_selfOrClientSyncAndVerdict(c_annouc, f_getVerdict());
		return;
		} // end of f_check_Announcement

		@@ -4701,8 +4695,7 @@ module LibSip_Steps {
		};
		}

		//TODO Check this!!! The function call cannot be used as the function f_check2Null runs on SipComponent
		//f_selfOrClientSyncAndVerdict(c_voicem, f_getVerdict());
		f_selfOrClientSyncAndVerdict(c_voicem, f_getVerdict());
		return;
		} // end of f_check_Announcement

		@@ -4750,8 +4743,7 @@ module LibSip_Steps {
		};
		}

		//TODO Check this!!! The function call cannot be used as the function f_check2Null runs on SipComponent
		//f_selfOrClientSyncAndVerdict(c_uPlaneStop, f_getVerdict());
		f_selfOrClientSyncAndVerdict(c_uPlaneStop, f_getVerdict());
		return;
		} // end of f_check_MediaStopped