From 93ea8d65ccd0fa8e890db740f358cf4268ad9dd2 Mon Sep 17 00:00:00 2001
From: Naum Spaseski <naum.spaseski@gmail.com>
Date: Wed, 6 Sep 2017 10:39:46 +0200
Subject: [PATCH] STF531: Corrected CSE/REG/CRE/010 and 16
Signed-off-by: Naum Spaseski <naum.spaseski@gmail.com>
---
OneM2M_Testcases.ttcn | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 12b5f67..e3c1b1e 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -1117,9 +1117,8 @@ module OneM2M_Testcases {
v_request := valueof(m_updateAEAnnc(-, -, -, PX_APP_ID, -)); //TODO to double check all parameters
v_request := f_getUpdateRequestPrimitive(f_getAnnouncedResourceType(int2),v_aeAnncIndex, v_request);//TODO
- v_request.from_ := "/S";
+ v_request.from_ := f_getResourceAddress(-1,e_hierarchical, e_absolute) & "/S";
v_request.primitiveContent.aEAnnc.app_ID := PX_APP_ID;
- //v_request.primitiveContent.aEAnnc.nodeLink :=
v_request.primitiveContent.aEAnnc.labels := {"Credential-ID:None"};
mccPort.send(m_request(v_request));
@@ -1182,8 +1181,16 @@ module OneM2M_Testcases {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": AE creation success.");
//continue to test the content
+ if (ischosen(v_response.primitive.responsePrimitive.primitiveContent.aE)){
+ if (v_response.primitive.responsePrimitive.primitiveContent.aE.app_ID == PX_APP_ID){
+ setverdict(pass, __SCOPE__ & ": AE creation success.");
+ }else{
+ setverdict(fail, __SCOPE__ & ": Error in AE content.");
+ }
+ }else{
+ setverdict(fail, __SCOPE__ & ": primitiveContent doesn't exist");
+ }
}
[] mcaPort.receive {
tc_ac.stop;
@@ -1283,14 +1290,17 @@ module OneM2M_Testcases {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2001, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Accepted creation for resource type remoteCSE containing attribute " & p_optionalAttribute.name);
+ f_setResource(v_request.primitiveContent,int16);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveOK(f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
+ f_setResource(v_request.primitiveContent,int16);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Accepted creation for resource type remoteCSE without containing attribute " & p_optionalAttribute.name);
+ f_setResource(v_request.primitiveContent,int16);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
--
GitLab