Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TTCN-3 Libraries
LibIts
Commits
ec9eb8a4
Commit
ec9eb8a4
authored
Sep 20, 2017
by
garciay
Browse files
UpperTester changes
parent
99204451
Changes
8
Hide whitespace changes
Inline
Side-by-side
ttcn/CAM/LibItsCam_Functions.ttcn
View file @
ec9eb8a4
...
...
@@ -110,10 +110,10 @@ module LibItsCam_Functions {
[]
utPort
.
receive
(
UtCamResults
:
{
utCamChangePositionResult
:=
true
})
{
tc_wait
.
stop
;
}
[]
utPort
.
receive
(
UtCamResults
:
{
utCamChangePositionResult
:=
false
})
{
tc_wait
.
stop
;
log
(
"*** f_utChangePosition: INFO: IUT position change was not successful ***"
);
f_selfOrClientSyncAndVerdict
(
"error"
,
e_error
);
[]
utPort
.
receive
(
UtCamResults
:
{
utCamChangePositionResult
:=
false
})
{
tc_wait
.
stop
;
log
(
"*** f_utChangePosition: INFO: IUT position change was not successful ***"
);
f_selfOrClientSyncAndVerdict
(
"error"
,
e_error
);
}
[]
a_utDefault
()
{
}
...
...
ttcn/DENM/LibItsDenm_EncdecDeclarations.ttcn
View file @
ec9eb8a4
...
...
@@ -22,4 +22,10 @@ module LibItsDenm_EncdecDeclarations {
external
function
fx_enc_UtDenmInitialize
(
UtDenmInitialize
p
)
return
bitstring
with
{
extension
"prototype(convert) encode(UpperTester)"
}
external
function
fx_enc_UtDenmChangePosition
(
UtDenmChangePosition
p
)
return
bitstring
with
{
extension
"prototype(convert) encode(UpperTester)"
}
external
function
fx_enc_UtDenmChangePseudonym
(
UtDenmChangePseudonym
p
)
return
bitstring
with
{
extension
"prototype(convert) encode(UpperTester)"
}
}
// End of module LibItsDenm_EncdecDeclarations
ttcn/DENM/LibItsDenm_Functions.ttcn
View file @
ec9eb8a4
...
...
@@ -58,7 +58,7 @@ module LibItsDenm_Functions {
log
(
"*** "
&
testcasename
()
&
": INFO: Could not receive expected UT message from IUT in time ***"
);
f_selfOrClientSyncAndVerdict
(
"error"
,
e_timeout
);
}
}
}
//activate denmPort default alts
vc_denmDefaultActive
:=
true
;
...
...
@@ -69,7 +69,7 @@ module LibItsDenm_Functions {
* @desc Requests to change the IUT with a new pseudonym
* @param p_change The change to trigger.
*/
function
f_utChangePseudonym
(
template
(
value
)
UtChangePseudonym
p_change
)
runs
on
ItsDenm
{
function
f_utChangePseudonym
(
template
(
value
)
Ut
Denm
ChangePseudonym
p_change
)
runs
on
ItsDenm
{
//deactivate denmPort default alts
vc_denmDefaultActive
:=
false
;
...
...
@@ -77,11 +77,11 @@ module LibItsDenm_Functions {
utPort
.
send
(
p_change
);
tc_wait
.
start
;
alt
{
[]
utPort
.
receive
(
UtDenmResults
:
{
utChangePseudonymResult
:=
true
})
{
[]
utPort
.
receive
(
UtDenmResults
:
{
ut
Denm
ChangePseudonymResult
:=
true
})
{
tc_wait
.
stop
;
log
(
"*** "
&
testcasename
()
&
": INFO: IUT pseudonym changed ***"
);
}
[]
utPort
.
receive
(
UtDenmResults
:
{
utChangePseudonymResult
:=
false
})
{
[]
utPort
.
receive
(
UtDenmResults
:
{
ut
Denm
ChangePseudonymResult
:=
false
})
{
tc_wait
.
stop
;
log
(
"*** "
&
testcasename
()
&
": INFO: IUT pseudonym changed ***"
);
f_selfOrClientSyncAndVerdict
(
"error"
,
e_error
);
...
...
ttcn/DENM/LibItsDenm_Templates.ttcn
View file @
ec9eb8a4
...
...
@@ -146,7 +146,7 @@ module LibItsDenm_Templates {
/**
* @desc Send template for Upper Tester event changePseudonym
*/
template
(
value
)
UtChangePseudonym
m_utChangePseudonym
:=
{
template
(
value
)
Ut
Denm
ChangePseudonym
m_ut
Denm
ChangePseudonym
:=
{
}
/**
...
...
@@ -231,7 +231,7 @@ module LibItsDenm_Templates {
* @param p_longitude The new longitude
* @param p_elevation The new elevation (Default: 0)
*/
template
(
value
)
UtDenmChangePosition
m_utChangePosition
(
template
(
value
)
UtDenmChangePosition
m_ut
Denm
ChangePosition
(
template
(
value
)
integer
p_latitude
,
template
(
value
)
integer
p_longitude
,
template
(
value
)
integer
p_elevation
:=
0
...
...
ttcn/DENM/LibItsDenm_TestSystem.ttcn
View file @
ec9eb8a4
...
...
@@ -47,7 +47,7 @@ module LibItsDenm_TestSystem {
*/
type
port
UpperTesterPort
message
{
out
UtDenmInitialize
,
UtDenmTrigger
,
UtDenmUpdate
,
UtDenmTermination
,
UtDenmChangePosition
,
UtChangePseudonym
;
UtDenmInitialize
,
UtDenmTrigger
,
UtDenmUpdate
,
UtDenmTermination
,
UtDenmChangePosition
,
Ut
Denm
ChangePseudonym
;
in
UtDenmResults
,
UtDenmEventInd
;
}
// end UpperTesterPort
...
...
ttcn/DENM/LibItsDenm_TypesAndValues.ttcn
View file @
ec9eb8a4
...
...
@@ -80,7 +80,7 @@ module LibItsDenm_TypesAndValues {
* @member utDenmTriggerResult -
* @member utDenmUpdateResult, -
* @member utDenmChangePositionResult -
* @member utChangePseudonymResult -
* @member ut
Denm
ChangePseudonymResult -
*/
type
union
UtDenmResults
{
boolean
utDenmInitializeResult
,
...
...
@@ -88,7 +88,7 @@ module LibItsDenm_TypesAndValues {
UtDenmUpdateResult
utDenmUpdateResult
,
boolean
utDenmTerminationResult
,
boolean
utDenmChangePositionResult
,
boolean
utChangePseudonymResult
boolean
ut
Denm
ChangePseudonymResult
}
with
{
variant
""
}
// End of type UtDenmResults
...
...
@@ -171,7 +171,7 @@ module LibItsDenm_TypesAndValues {
/**
* @desc Upper Tester message to change the pseudonym of the DENM IUT
*/
type
record
UtChangePseudonym
{
type
record
Ut
Denm
ChangePseudonym
{
// empty on purpose
}
with
{
variant
"FIELDORDER(msb)"
...
...
ttcn/GeoNetworking/LibItsGeoNetworking_TestSystem.ttcn
View file @
ec9eb8a4
...
...
@@ -50,9 +50,9 @@ module LibItsGeoNetworking_TestSystem {
*/
type
port
UpperTesterPort
message
{
out
UtGnInitialize
,
UtGnChangePosition
,
UtAutoInteropTrigger
,
UtGnTrigger
;
UtGnInitialize
,
UtGnChangePosition
,
UtAutoInteropTrigger
,
UtGnTrigger
;
// FIXME Remove UtAutoInteropTrigger from GN component, create an AutoInterop component
in
UtGnResults
,
UtGnEventInd
;
UtGnResults
,
UtGnEventInd
;
}
// end UpperTesterPort
}
// end portDefinitions
...
...
ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn
View file @
ec9eb8a4
...
...
@@ -949,7 +949,7 @@ module LibItsGeoNetworking_TypesAndValues {
type
union
UtGnResults
{
boolean
utGnInitializeResult
,
boolean
utGnTriggerResult
,
boolean
ut
Gn
AutoInteropTriggerResult
,
boolean
utAutoInteropTriggerResult
,
// FIXME Remove UtAutoInteropTrigger from GN component, create an AutoInterop component
boolean
utGnChangePositionResult
}
with
{
variant
""
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment