Commit 102bdfb2 authored by Yann Garcia's avatar Yann Garcia
Browse files

Add UEinformationAPI tests

parent d91c2529
......@@ -67,7 +67,7 @@ module AtsMec_LocationAPI_TestCases {
)
)
);
f_selfOrClientSyncAndVerdictTestBody(c_prDone, e_success);
f_selfOrClientSyncAndVerdict(c_prDone, e_success);
// Test Body
tc_ac.start;
......@@ -80,11 +80,11 @@ module AtsMec_LocationAPI_TestCases {
mw_user_info(-, -, PX_ZONE_ID)
))))) -> value v_response {
log("*** " & testcasename() & ": PASS: IUT successfully responds with a ZoneId ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
[] tc_ac.timeout {
log("*** " & testcasename() & ": INCONC: Expected message not received ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);
f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
}
} // End of 'alt' statement
......
......@@ -11,6 +11,7 @@ module AtsMec_TestControl {
// AtsMec
import from AtsMec_LocationAPI_TestCases all;
import from AtsMec_UEidentityAPI_TestCases all;
import from AtsMec_UEinformation_TestCases all;
control {
......@@ -23,6 +24,9 @@ module AtsMec_TestControl {
execute(TC_MEC_PLAT_MP1_UETAG_BV_002());
execute(TC_MEC_PLAT_MP1_UETAG_BV_003());
}
if (PICS_LOCATION_API_SUPPORTED) {
execute(TC_MEC_PLAT_MP1_INF_BV_001());
}
}
}
......
......@@ -67,7 +67,7 @@ module AtsMec_UEidentityAPI_TestCases {
)
)
);
f_selfOrClientSyncAndVerdictTestBody(c_prDone, e_success);
f_selfOrClientSyncAndVerdict(c_prDone, e_success);
// Test Body
tc_ac.start;
......@@ -82,11 +82,11 @@ module AtsMec_UEidentityAPI_TestCases {
)))))) -> value v_response {
log("*** " & testcasename() & ": PASS: IUT successfully responds with a UeIdentityTag ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
[] tc_ac.timeout {
log("*** " & testcasename() & ": INCONC: Expected message not received ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);
f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
}
} // End of 'alt' statement
......@@ -137,7 +137,7 @@ module AtsMec_UEidentityAPI_TestCases {
)
)
);
f_selfOrClientSyncAndVerdictTestBody(c_prDone, e_success);
f_selfOrClientSyncAndVerdict(c_prDone, e_success);
// Test Body
tc_ac.start;
......@@ -151,11 +151,11 @@ module AtsMec_UEidentityAPI_TestCases {
{ *, mw_ue_identity_tag_item(PX_UE_IDENTITY_TAG, REGISTERED), * }
)))))) -> value v_response {
log("*** " & testcasename() & ": PASS: IUT successfully responds with a UeIdentityTag ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
[] tc_ac.timeout {
log("*** " & testcasename() & ": INCONC: Expected message not received ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);
f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
}
} // End of 'alt' statement
......@@ -206,7 +206,7 @@ module AtsMec_UEidentityAPI_TestCases {
)
)
);
f_selfOrClientSyncAndVerdictTestBody(c_prDone, e_success);
f_selfOrClientSyncAndVerdict(c_prDone, e_success);
// Test Body
tc_ac.start;
......@@ -220,11 +220,11 @@ module AtsMec_UEidentityAPI_TestCases {
{ *, mw_ue_identity_tag_item(PX_UE_IDENTITY_TAG, UNREGISTERED), * }
)))))) -> value v_response {
log("*** " & testcasename() & ": PASS: IUT successfully responds with a UeIdentityTag ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
[] tc_ac.timeout {
log("*** " & testcasename() & ": INCONC: Expected message not received ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);
f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
}
} // End of 'alt' statement
......
......@@ -9,16 +9,16 @@ module LocationAPI_Templates {
template (value) UserInfo m_user_info(
in universal charstring p_address := PX_ADDRESS,
in universal charstring p_accessPointId := PX_ACCESS_POINT_ID,
in universal charstring p_zoneId := PX_ZONE_ID,
in universal charstring p_resourceURL := PX_RESOURCE_URL,
in TimeStamp p_timeStamp := PX_TIME_STAMP
in universal charstring p_access_point_id := PX_ACCESS_POINT_ID,
in universal charstring p_zone_id := PX_ZONE_ID,
in universal charstring p_resource_url := PX_RESOURCE_URL,
in TimeStamp p_time_stamp := PX_TIME_STAMP
) := {
address_ := p_address,
accessPointId := p_accessPointId,
zoneId := p_zoneId,
resourceURL := p_resourceURL,
timeStamp := p_timeStamp,
accessPointId := p_access_point_id,
zoneId := p_zone_id,
resourceURL := p_resource_url,
timeStamp := p_time_stamp,
locationInfo := omit,
contextLocationInfo := omit,
ancillaryInfo := omit
......@@ -26,20 +26,36 @@ module LocationAPI_Templates {
template (present) UserInfo mw_user_info(
template (present) universal charstring p_address := ?,
template (present) universal charstring p_accessPointId := ?,
template (present) universal charstring p_zoneId := ?,
template (present) universal charstring p_resourceURL := ?,
template (present) TimeStamp p_timeStamp := ?
template (present) universal charstring p_access_point_id := ?,
template (present) universal charstring p_zone_id := ?,
template (present) universal charstring p_resource_url := ?,
template (present) TimeStamp p_time_stamp := ?
) := {
address_ := p_address,
accessPointId := p_accessPointId,
zoneId := p_zoneId,
resourceURL := p_resourceURL,
timeStamp := p_timeStamp,
accessPointId := p_access_point_id,
zoneId := p_zone_id,
resourceURL := p_resource_url,
timeStamp := p_time_stamp,
locationInfo := *,
contextLocationInfo := *,
ancillaryInfo := *
} // 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(
in float p_latitude,
......@@ -64,31 +80,31 @@ module LocationAPI_Templates {
} // End of template mw_location_info
template (value) ZoneInfo m_zone_info(
in universal charstring p_zoneId := PX_ZONE_ID,
in UInt32 p_numberOfAccessPoints := PX_NB_ACCESS_POINTS,
in UInt32 p_numberOfUnservicableAccessPoints := PX_NB_UNSERVICABLEL_ACCESS_POINTS,
in UInt32 p_numberOfUsers := PX_NB_USERS,
in universal charstring p_resourceURL := PX_RESOURCE_URL
in universal charstring p_zone_id := PX_ZONE_ID,
in UInt32 p_number_of_access_points := PX_NB_ACCESS_POINTS,
in UInt32 p_number_of_unservicable_access_points := PX_NB_UNSERVICABLEL_ACCESS_POINTS,
in UInt32 p_number_of_users := PX_NB_USERS,
in universal charstring p_resource_url := PX_RESOURCE_URL
) := {
zoneId := p_zoneId,
numberOfAccessPoints := p_numberOfAccessPoints,
numberOfUnservicableAccessPoints := p_numberOfUnservicableAccessPoints,
numberOfUsers := p_numberOfUsers,
resourceURL := p_resourceURL
zoneId := p_zone_id,
numberOfAccessPoints := p_number_of_access_points,
numberOfUnservicableAccessPoints := p_number_of_unservicable_access_points,
numberOfUsers := p_number_of_users,
resourceURL := p_resource_url
} // End of template m_zone_info
template (present) ZoneInfo mw_zone_info(
template (present) universal charstring p_zoneId := ?,
template (present) UInt32 p_numberOfAccessPoints := ?,
template (present) UInt32 p_numberOfUnservicableAccessPoints := ?,
template (present) UInt32 p_numberOfUsers := ?,
template (present) universal charstring p_resourceURL := ?
template (present) universal charstring p_zone_id := ?,
template (present) UInt32 p_number_of_access_points := ?,
template (present) UInt32 p_number_of_unservicable_access_points := ?,
template (present) UInt32 p_number_of_users := ?,
template (present) universal charstring p_resource_url := ?
) := {
zoneId := p_zoneId,
numberOfAccessPoints := p_numberOfAccessPoints,
numberOfUnservicableAccessPoints := p_numberOfUnservicableAccessPoints,
numberOfUsers := p_numberOfUsers,
resourceURL := p_resourceURL
zoneId := p_zone_id,
numberOfAccessPoints := p_number_of_access_points,
numberOfUnservicableAccessPoints := p_number_of_unservicable_access_points,
numberOfUsers := p_number_of_users,
resourceURL := p_resource_url
} // End of template mw_zone_info
} // End of module LocationAPI_Templates
......@@ -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_USERS_LIST_URI := "/exampleAPI/location/v2/users";
modulepar charstring PICS_ME_APP_Q_UE_IDENTITY_ID_URI := "/exampleAPI/ui/v2/";
} // End of module LibMec_Pics
......@@ -14,6 +14,7 @@ module LibItsHttp_JsonMessageBodyTypes {
type union JsonBody {
// TODO Add here your custom variants
UserInfo userInfo,
UserList userList,
ZoneInfo zoneInfo,
ProblemDetails problemDetails,
UeIdentityTagInfo ueIdentityTagInfo,
......
......@@ -49,6 +49,18 @@ module LibItsHttp_JsonTemplates {
userInfo := p_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(
in template (value) ZoneInfo p_zone_info
) := {
......
Markdown is supported
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