Commit 0af7848d authored by Yann Garcia's avatar Yann Garcia

Add UEidentityAPI support

parent 3c059675
...@@ -53,6 +53,8 @@ LogEventTypes:= Yes ...@@ -53,6 +53,8 @@ LogEventTypes:= Yes
[EXECUTE] [EXECUTE]
# In this section you can specify what parts of your test suite you want to execute. # In this section you can specify what parts of your test suite you want to execute.
TestCodec_External.tc_encode_LocationInfo TestCodec_External.tc_encode_LocationInfo
TestCodec_External.tc_encode_UserInfo
TestCodec_External.tc_encode_UeIdentityTags
[GROUPS] [GROUPS]
# In this section you can specify groups of hosts. These groups can be used inside the # In this section you can specify groups of hosts. These groups can be used inside the
......
...@@ -51,7 +51,7 @@ find .. -type f -name "*~" -exec rm {} \; ...@@ -51,7 +51,7 @@ find .. -type f -name "*~" -exec rm {} \;
find .. -type f -name "*.bak" -exec rm {} \; find .. -type f -name "*.bak" -exec rm {} \;
find .. -type f -name "*.log" -exec rm {} \; find .. -type f -name "*.log" -exec rm {} \;
REFERENCES="LibCommon LibHttp LibMec LibMec/LocationAPI" REFERENCES="LibCommon LibHttp LibMec LibMec/LocationAPI LibMec/UEidentityAPI"
for i in ${REFERENCES} for i in ${REFERENCES}
do do
# TTCN code # TTCN code
......
...@@ -86,25 +86,25 @@ module LocationAPI_TypesAndValues { ...@@ -86,25 +86,25 @@ module LocationAPI_TypesAndValues {
* @desc The connection type for the access point. * @desc The connection type for the access point.
*/ */
type enumerated ConnectionType { type enumerated ConnectionType {
e_femto, Femto,
e_lte_femto, LTE_femto,
e_smallcell, Smallcell,
e_lte_smallcell, LTE_smallcell,
e_wifi, Wifi,
e_pico, Pico,
e_micro, Micro,
e_macro, Macro,
e_wimax, Wimax,
e_unknown Unknown
} }
/** /**
* @desc The operation status of the access point * @desc The operation status of the access point
*/ */
type enumerated OperationStatus { type enumerated OperationStatus {
e_serviceable, Serviceable,
e_unserviceable, Unserviceable,
e_unknown Unknown
} }
/** /**
......
...@@ -38,8 +38,8 @@ module UEidentityAPI_TypesAndValues { ...@@ -38,8 +38,8 @@ module UEidentityAPI_TypesAndValues {
* @desc Status of the resource ueIdentityTagInfo * @desc Status of the resource ueIdentityTagInfo
*/ */
type enumerated State { type enumerated State {
e_unregistered, UNREGISTERED,
e_registered REGISTERED
} }
/** /**
......
...@@ -3,6 +3,8 @@ module TestCodec_External { ...@@ -3,6 +3,8 @@ module TestCodec_External {
// LibMec // LibMec
import from LocationAPI_TypesAndValues all; import from LocationAPI_TypesAndValues all;
import from LocationAPI_Templates all; import from LocationAPI_Templates all;
import from UEidentityAPI_TypesAndValues all;
import from UEidentityAPI_Templates all;
// TestCodec // TestCodec
import from TestCodec_TestAndSystem all; import from TestCodec_TestAndSystem all;
...@@ -37,4 +39,77 @@ module TestCodec_External { ...@@ -37,4 +39,77 @@ module TestCodec_External {
} }
} // End of testcase tc_encode_LocationInfo } // End of testcase tc_encode_LocationInfo
testcase tc_encode_UserInfo() runs on TCType system TCType {
var UserInfo v_location_info := valueof(m_user_info("acr:10.0.0.1", "001010000000000000000000000000001", "zone01", "http://example.com/exampleAPI/location/v2/users?address=acr%3A10.0.0.1", TimeStamp:{ 1483231138, 0 }));
var UserInfo v_location_info_result;
var universal charstring v_result;
var universal charstring v_expected_result := "{\"address\":\"acr:10.0.0.1\",\"accessPointId\":\"001010000000000000000000000000001\",\"zoneId\":\"zone01\",\"resourceURL\":\"http://example.com/exampleAPI/location/v2/users?address=acr%3A10.0.0.1\",\"timeStamp\":{\"seconds\":1483231138,\"nanoSeconds\":0}}";
var bitstring v_enc_msg;
var integer v_res;
v_enc_msg := encvalue(v_location_info);
v_result := oct2unichar(bit2oct(v_enc_msg), "UTF-8");
log("v_result= ", v_result);
if (match(v_expected_result, v_result)) {
setverdict(pass, "Encoding succeed");
} else {
setverdict(fail, "Encoding failed");
}
v_res := decvalue(v_enc_msg, v_location_info_result);
if (v_res == 0) {
log("v_location_info_result= ", v_location_info_result);
if (match(v_location_info, v_location_info_result)) {
setverdict(pass, "Decoding succeed");
} else {
setverdict(fail, "Decoding failed");
}
} else {
setverdict(fail, "Decoding operation failed");
}
} // End of testcase tc_encode_UserInfo
testcase tc_encode_UeIdentityTags() runs on TCType system TCType {
var UeIdentityTagInfo v_ue_identity_tags_info := valueof(m_ue_identity_tag_info({ m_ue_identity_tag_item("UeTagA", REGISTERED) } ));
var UeIdentityTagInfo v_ue_identity_tags_info_result;
var universal charstring v_result;
var universal charstring v_expected_result := "{\"ueIdentityTags\":[{\"ueIdentityTag\":\"UeTagA\",\"state\":\"REGISTERED\"}]}";
var bitstring v_enc_msg;
var integer v_res;
v_enc_msg := encvalue(v_ue_identity_tags_info);
v_result := oct2unichar(bit2oct(v_enc_msg), "UTF-8");
log("v_result= ", v_result);
if (match(v_expected_result, v_result)) {
setverdict(pass, "Encoding succeed");
} else {
setverdict(fail, "Encoding failed");
}
v_res := decvalue(v_enc_msg, v_ue_identity_tags_info_result);
if (v_res == 0) {
log("v_ue_identity_tags_info_result= ", v_ue_identity_tags_info_result);
if (match(v_ue_identity_tags_info, v_ue_identity_tags_info_result)) {
setverdict(pass, "Decoding succeed");
} else {
setverdict(fail, "Decoding failed");
}
} else {
setverdict(fail, "Decoding operation failed");
}
v_enc_msg := oct2bit(char2oct("{\"ueIdentityTags\": [{ \"ueIdentityTag\": \"UeTagA\",\t\"state\": \"REGISTERED\"}]}"));
v_res := decvalue(v_enc_msg, v_ue_identity_tags_info_result);
if (v_res == 0) {
log("v_ue_identity_tags_info_result (1)= ", v_ue_identity_tags_info_result);
if (match(v_ue_identity_tags_info, v_ue_identity_tags_info_result)) {
setverdict(pass, "Decoding succeed (1)");
} else {
setverdict(fail, "Decoding failed (1)");
}
} else {
setverdict(fail, "Decoding operation failed (1)");
}
} // End of testcase tc_encode_UeIdentityTags
} // End of module TestCodec_External } // End of module TestCodec_External
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