Skip to content
GitLab
Commit 102bdfb2 authored by Yann Garcia's avatar Yann Garcia
Browse files

Add UEinformationAPI tests

parent d91c2529
Show whitespace changes
Inline Side-by-side
ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn
View file @ 102bdfb2
...@@ -67,7 +67,7 @@ module AtsMec_LocationAPI_TestCases { ...@@ -67,7 +67,7 @@ module AtsMec_LocationAPI_TestCases {
) )
) )
); );
f_selfOrClientSyncAndVerdictTestBody(c_prDone, e_success); f_selfOrClientSyncAndVerdict(c_prDone, e_success);
// Test Body // Test Body
tc_ac.start; tc_ac.start;
...@@ -80,11 +80,11 @@ module AtsMec_LocationAPI_TestCases { ...@@ -80,11 +80,11 @@ module AtsMec_LocationAPI_TestCases {
mw_user_info(-, -, PX_ZONE_ID) mw_user_info(-, -, PX_ZONE_ID)
))))) -> value v_response { ))))) -> value v_response {
log("*** " & testcasename() & ": PASS: IUT successfully responds with a ZoneId ***"); log("*** " & testcasename() & ": PASS: IUT successfully responds with a ZoneId ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success); f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
} }
[] tc_ac.timeout { [] tc_ac.timeout {
log("*** " & testcasename() & ": INCONC: Expected message not received ***"); log("*** " & testcasename() & ": INCONC: Expected message not received ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout); f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
} }
} // End of 'alt' statement } // End of 'alt' statement
......
ttcn/AtsMec/AtsMec_TestControl.ttcn
View file @ 102bdfb2
...@@ -11,6 +11,7 @@ module AtsMec_TestControl { ...@@ -11,6 +11,7 @@ module AtsMec_TestControl {
// AtsMec // AtsMec
import from AtsMec_LocationAPI_TestCases all; import from AtsMec_LocationAPI_TestCases all;
import from AtsMec_UEidentityAPI_TestCases all; import from AtsMec_UEidentityAPI_TestCases all;
import from AtsMec_UEinformation_TestCases all;
control { control {
...@@ -23,6 +24,9 @@ module AtsMec_TestControl { ...@@ -23,6 +24,9 @@ module AtsMec_TestControl {
execute(TC_MEC_PLAT_MP1_UETAG_BV_002()); execute(TC_MEC_PLAT_MP1_UETAG_BV_002());
execute(TC_MEC_PLAT_MP1_UETAG_BV_003()); execute(TC_MEC_PLAT_MP1_UETAG_BV_003());
} }
if (PICS_LOCATION_API_SUPPORTED) {
execute(TC_MEC_PLAT_MP1_INF_BV_001());
}
} }
} }
......
ttcn/AtsMec/AtsMec_UEidentityAPI.ttcn
View file @ 102bdfb2
...@@ -67,7 +67,7 @@ module AtsMec_UEidentityAPI_TestCases { ...@@ -67,7 +67,7 @@ module AtsMec_UEidentityAPI_TestCases {
) )
) )
); );
f_selfOrClientSyncAndVerdictTestBody(c_prDone, e_success); f_selfOrClientSyncAndVerdict(c_prDone, e_success);
// Test Body // Test Body
tc_ac.start; tc_ac.start;
...@@ -82,11 +82,11 @@ module AtsMec_UEidentityAPI_TestCases { ...@@ -82,11 +82,11 @@ module AtsMec_UEidentityAPI_TestCases {
)))))) -> value v_response { )))))) -> value v_response {
log("*** " & testcasename() & ": PASS: IUT successfully responds with a UeIdentityTag ***"); log("*** " & testcasename() & ": PASS: IUT successfully responds with a UeIdentityTag ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success); f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
} }
[] tc_ac.timeout { [] tc_ac.timeout {
log("*** " & testcasename() & ": INCONC: Expected message not received ***"); log("*** " & testcasename() & ": INCONC: Expected message not received ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout); f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
} }
} // End of 'alt' statement } // End of 'alt' statement
...@@ -137,7 +137,7 @@ module AtsMec_UEidentityAPI_TestCases { ...@@ -137,7 +137,7 @@ module AtsMec_UEidentityAPI_TestCases {
) )
) )
); );
f_selfOrClientSyncAndVerdictTestBody(c_prDone, e_success); f_selfOrClientSyncAndVerdict(c_prDone, e_success);
// Test Body // Test Body
tc_ac.start; tc_ac.start;
...@@ -151,11 +151,11 @@ module AtsMec_UEidentityAPI_TestCases { ...@@ -151,11 +151,11 @@ module AtsMec_UEidentityAPI_TestCases {
{ *, mw_ue_identity_tag_item(PX_UE_IDENTITY_TAG, REGISTERED), * } { *, mw_ue_identity_tag_item(PX_UE_IDENTITY_TAG, REGISTERED), * }
)))))) -> value v_response { )))))) -> value v_response {
log("*** " & testcasename() & ": PASS: IUT successfully responds with a UeIdentityTag ***"); log("*** " & testcasename() & ": PASS: IUT successfully responds with a UeIdentityTag ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success); f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
} }
[] tc_ac.timeout { [] tc_ac.timeout {
log("*** " & testcasename() & ": INCONC: Expected message not received ***"); log("*** " & testcasename() & ": INCONC: Expected message not received ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout); f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
} }
} // End of 'alt' statement } // End of 'alt' statement
...@@ -206,7 +206,7 @@ module AtsMec_UEidentityAPI_TestCases { ...@@ -206,7 +206,7 @@ module AtsMec_UEidentityAPI_TestCases {
) )
) )
); );
f_selfOrClientSyncAndVerdictTestBody(c_prDone, e_success); f_selfOrClientSyncAndVerdict(c_prDone, e_success);
// Test Body // Test Body
tc_ac.start; tc_ac.start;
...@@ -220,11 +220,11 @@ module AtsMec_UEidentityAPI_TestCases { ...@@ -220,11 +220,11 @@ module AtsMec_UEidentityAPI_TestCases {
{ *, mw_ue_identity_tag_item(PX_UE_IDENTITY_TAG, UNREGISTERED), * } { *, mw_ue_identity_tag_item(PX_UE_IDENTITY_TAG, UNREGISTERED), * }
)))))) -> value v_response { )))))) -> value v_response {
log("*** " & testcasename() & ": PASS: IUT successfully responds with a UeIdentityTag ***"); log("*** " & testcasename() & ": PASS: IUT successfully responds with a UeIdentityTag ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success); f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
} }
[] tc_ac.timeout { [] tc_ac.timeout {
log("*** " & testcasename() & ": INCONC: Expected message not received ***"); log("*** " & testcasename() & ": INCONC: Expected message not received ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout); f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
} }
} // End of 'alt' statement } // End of 'alt' statement
......
ttcn/LibMec/LocationAPI/ttcn/LocationAPI_Templates.ttcn
View file @ 102bdfb2
...@@ -9,16 +9,16 @@ module LocationAPI_Templates { ...@@ -9,16 +9,16 @@ module LocationAPI_Templates {
template (value) UserInfo m_user_info( template (value) UserInfo m_user_info(
in universal charstring p_address := PX_ADDRESS, in universal charstring p_address := PX_ADDRESS,
in universal charstring p_accessPointId := PX_ACCESS_POINT_ID, in universal charstring p_access_point_id := PX_ACCESS_POINT_ID,
in universal charstring p_zoneId := PX_ZONE_ID, in universal charstring p_zone_id := PX_ZONE_ID,
in universal charstring p_resourceURL := PX_RESOURCE_URL, in universal charstring p_resource_url := PX_RESOURCE_URL,
in TimeStamp p_timeStamp := PX_TIME_STAMP in TimeStamp p_time_stamp := PX_TIME_STAMP
) := { ) := {
address_ := p_address, address_ := p_address,
accessPointId := p_accessPointId, accessPointId := p_access_point_id,
zoneId := p_zoneId, zoneId := p_zone_id,
resourceURL := p_resourceURL, resourceURL := p_resource_url,
timeStamp := p_timeStamp, timeStamp := p_time_stamp,
locationInfo := omit, locationInfo := omit,
contextLocationInfo := omit, contextLocationInfo := omit,
ancillaryInfo := omit ancillaryInfo := omit
...@@ -26,21 +26,37 @@ module LocationAPI_Templates { ...@@ -26,21 +26,37 @@ module LocationAPI_Templates {
template (present) UserInfo mw_user_info( template (present) UserInfo mw_user_info(
template (present) universal charstring p_address := ?, template (present) universal charstring p_address := ?,
template (present) universal charstring p_accessPointId := ?, template (present) universal charstring p_access_point_id := ?,
template (present) universal charstring p_zoneId := ?, template (present) universal charstring p_zone_id := ?,
template (present) universal charstring p_resourceURL := ?, template (present) universal charstring p_resource_url := ?,
template (present) TimeStamp p_timeStamp := ? template (present) TimeStamp p_time_stamp := ?
) := { ) := {
address_ := p_address, address_ := p_address,
accessPointId := p_accessPointId, accessPointId := p_access_point_id,
zoneId := p_zoneId, zoneId := p_zone_id,
resourceURL := p_resourceURL, resourceURL := p_resource_url,
timeStamp := p_timeStamp, timeStamp := p_time_stamp,
locationInfo := *, locationInfo := *,
contextLocationInfo := *, contextLocationInfo := *,
ancillaryInfo := * ancillaryInfo := *
} // End of template mw_user_info } // End of template mw_user_info
template (omit) UserList m_user_list(
in template (omit) UserInfos p_userInfo := omit,
in universal charstring p_resource_url
) := {
user := p_userInfo,
resourceURL := p_resource_url
} // End of template m_user_list
template UserList mw_user_list(
template UserInfos p_userInfo := *,
template (present) universal charstring p_resource_url := ?
) := {
user := p_userInfo,
resourceURL := p_resource_url
} // End of template mw_user_list
template (value) LocationInfo m_location_info( template (value) LocationInfo m_location_info(
in float p_latitude, in float p_latitude,
in float p_longitude, in float p_longitude,
...@@ -64,31 +80,31 @@ module LocationAPI_Templates { ...@@ -64,31 +80,31 @@ module LocationAPI_Templates {
} // End of template mw_location_info } // End of template mw_location_info
template (value) ZoneInfo m_zone_info( template (value) ZoneInfo m_zone_info(
in universal charstring p_zoneId := PX_ZONE_ID, in universal charstring p_zone_id := PX_ZONE_ID,
in UInt32 p_numberOfAccessPoints := PX_NB_ACCESS_POINTS, in UInt32 p_number_of_access_points := PX_NB_ACCESS_POINTS,
in UInt32 p_numberOfUnservicableAccessPoints := PX_NB_UNSERVICABLEL_ACCESS_POINTS, in UInt32 p_number_of_unservicable_access_points := PX_NB_UNSERVICABLEL_ACCESS_POINTS,
in UInt32 p_numberOfUsers := PX_NB_USERS, in UInt32 p_number_of_users := PX_NB_USERS,
in universal charstring p_resourceURL := PX_RESOURCE_URL in universal charstring p_resource_url := PX_RESOURCE_URL
) := { ) := {
zoneId := p_zoneId, zoneId := p_zone_id,
numberOfAccessPoints := p_numberOfAccessPoints, numberOfAccessPoints := p_number_of_access_points,
numberOfUnservicableAccessPoints := p_numberOfUnservicableAccessPoints, numberOfUnservicableAccessPoints := p_number_of_unservicable_access_points,
numberOfUsers := p_numberOfUsers, numberOfUsers := p_number_of_users,
resourceURL := p_resourceURL resourceURL := p_resource_url
} // End of template m_zone_info } // End of template m_zone_info
template (present) ZoneInfo mw_zone_info( template (present) ZoneInfo mw_zone_info(
template (present) universal charstring p_zoneId := ?, template (present) universal charstring p_zone_id := ?,
template (present) UInt32 p_numberOfAccessPoints := ?, template (present) UInt32 p_number_of_access_points := ?,
template (present) UInt32 p_numberOfUnservicableAccessPoints := ?, template (present) UInt32 p_number_of_unservicable_access_points := ?,
template (present) UInt32 p_numberOfUsers := ?, template (present) UInt32 p_number_of_users := ?,
template (present) universal charstring p_resourceURL := ? template (present) universal charstring p_resource_url := ?
) := { ) := {
zoneId := p_zoneId, zoneId := p_zone_id,
numberOfAccessPoints := p_numberOfAccessPoints, numberOfAccessPoints := p_number_of_access_points,
numberOfUnservicableAccessPoints := p_numberOfUnservicableAccessPoints, numberOfUnservicableAccessPoints := p_number_of_unservicable_access_points,
numberOfUsers := p_numberOfUsers, numberOfUsers := p_number_of_users,
resourceURL := p_resourceURL resourceURL := p_resource_url
} // End of template mw_zone_info } // End of template mw_zone_info
} // End of module LocationAPI_Templates } // End of module LocationAPI_Templates
ttcn/LibMec/ttcn/LibMec_Pics.ttcn
View file @ 102bdfb2
...@@ -7,6 +7,8 @@ module LibMec_Pics { ...@@ -7,6 +7,8 @@ module LibMec_Pics {
modulepar charstring PICS_ME_APP_Q_ZONE_ID_URI := "/exampleAPI/location/v2/zones/"; modulepar charstring PICS_ME_APP_Q_ZONE_ID_URI := "/exampleAPI/location/v2/zones/";
modulepar charstring PICS_ME_APP_Q_USERS_LIST_URI := "/exampleAPI/location/v2/users";
modulepar charstring PICS_ME_APP_Q_UE_IDENTITY_ID_URI := "/exampleAPI/ui/v2/"; modulepar charstring PICS_ME_APP_Q_UE_IDENTITY_ID_URI := "/exampleAPI/ui/v2/";
} // End of module LibMec_Pics } // End of module LibMec_Pics
ttcn/patch_lib_http/LibItsHttp_JsonMessageBodyTypes.ttcn
View file @ 102bdfb2
...@@ -14,6 +14,7 @@ module LibItsHttp_JsonMessageBodyTypes { ...@@ -14,6 +14,7 @@ module LibItsHttp_JsonMessageBodyTypes {
type union JsonBody { type union JsonBody {
// TODO Add here your custom variants // TODO Add here your custom variants
UserInfo userInfo, UserInfo userInfo,
UserList userList,
ZoneInfo zoneInfo, ZoneInfo zoneInfo,
ProblemDetails problemDetails, ProblemDetails problemDetails,
UeIdentityTagInfo ueIdentityTagInfo, UeIdentityTagInfo ueIdentityTagInfo,
......
ttcn/patch_lib_http/LibItsHttp_JsonTemplates.ttcn
View file @ 102bdfb2
...@@ -49,6 +49,18 @@ module LibItsHttp_JsonTemplates { ...@@ -49,6 +49,18 @@ module LibItsHttp_JsonTemplates {
userInfo := p_user_info userInfo := p_user_info
} // End of template mw_body_json_user_info } // End of template mw_body_json_user_info
template (value) JsonBody m_body_json_user_list(
in template (value) UserList p_user_list
) := {
userList := p_user_list
} // End of template m_body_json_user_list
template (present) JsonBody mw_body_json_user_list(
template (present) UserList p_user_list := ?
) := {
userList := p_user_list
} // End of template mw_body_json_user_list
template (value) JsonBody m_body_json_zone_info( template (value) JsonBody m_body_json_zone_info(
in template (value) ZoneInfo p_zone_info in template (value) ZoneInfo p_zone_info
) := { ) := {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment