diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 5110f4bfe3f3165df0bd3b520013e16730048e02..bae4f0bd6a7a5d1fd84e6d49a2e8c101107e6ae6 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -3321,6 +3321,7 @@ module OneM2M_PermutationFunctions {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Non-existing attribute not found");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
@@ -3373,6 +3374,7 @@ module OneM2M_PermutationFunctions {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Non-existing attribute not found");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
@@ -9050,12 +9052,8 @@ module OneM2M_PermutationFunctions {
//send triggering primitive to SUT
v_localResourceIndex := f_cse_createLocalResource(v_utRequest1,v_action1);
-
- //Check that the created resource is a PollingChannel
- if(not(vc_localResourcesList[v_localResourceIndex].resourceType == int15)) {
- setverdict(inconc, __SCOPE__&":INFO: Polling Channel resource not creaded");
- f_checkCseSimuStatus();
- }
+
+ f_checkCseSimuStatus();
//Trigger IUT for sending a polling request (req1)
v_utRequest2 := valueof(m_utRetrievePollingChannelUri(f_getLocalResourceAddress(v_localResourceIndex) & "/" & c_resourceShortNamePollingChannelUri));
@@ -9078,6 +9076,8 @@ module OneM2M_PermutationFunctions {
setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type Polling Channel");
}
}
+
+ f_checkCseSimuStatus();
tc_ac.start;
alt {
@@ -9123,22 +9123,38 @@ module OneM2M_PermutationFunctions {
// Preamble
v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);//c_CUDNDi)
+ f_checkAeSimuStatus();
+
p_aeIndex1 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
+ f_checkAeSimuStatus();
+
p_aeIndex2 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
+ f_checkAeSimuStatus();
+
//v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
mcaPort.send(f_getMsgOutPrimitive(m_request(p_requestprimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
tc_ac.stop;
- setverdict(pass, __SCOPE__&":INFO: Polling Resource type not created as originator has no privilege");
+ setverdict(pass, __SCOPE__&":INFO: Originator has no privilege");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(?))) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__&":INFO: Wrong response status code when originator has no privilege");
}
[] tc_ac.timeout {
- setverdict(inconc, __SCOPE__&":INFO: No answer while creating polling resource type");
+ setverdict(fail, __SCOPE__&":INFO: No answer while creating polling resource type");
}
}
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf01Down();
}
function f_CSE_PCH_006() runs on CseSimu {
@@ -9159,14 +9175,16 @@ module OneM2M_PermutationFunctions {
// Preamble
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
+ f_checkCseSimuStatus();
+
vc_ae1.start(f_cse_preamble_registerAe());//AE1 is registred;
- vc_ae1.done;
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+
v_aeIndex := f_getResource(vc_ae1);
vc_ae1.start(f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex));//PollingChannel is created;
- vc_ae1.done;
-
+ f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+
v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
v_request.from_ := PX_CSE1_ID;
@@ -9179,10 +9197,10 @@ module OneM2M_PermutationFunctions {
}
[] mccPort.receive(mw_response()) {
tc_ac.stop;
- setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
+ setverdict(fail, __SCOPE__&":INFO: Unexpected message received");
}
[] tc_ac.timeout {
- setverdict(inconc, __SCOPE__&":INFO: No answer while performing notification");
+ setverdict(fail, __SCOPE__&":INFO: No answer while performing notification");
}
}
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 46f084939da217965f9190e9f965aa850041c09a..cf4c5c0b9ef998e6ce0a76ec173497061ad3d21d 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -3083,7 +3083,7 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT responds with an error when the AE tries to retrieve a non-existing attributes of the TARGET_RESOURCE_ADDRESS resource (“multiple†attributes case)
*
*/
- testcase TC_CSE_DMR_RET_008_CNT_AT() runs on Tester system CseSystem {
+ testcase TC_CSE_DMR_RET_008_CNT_LBL_AT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
@@ -3093,7 +3093,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
}
- testcase TC_CSE_DMR_RET_008_GRP_AT() runs on Tester system CseSystem {
+ testcase TC_CSE_DMR_RET_008_GRP_LBL_AT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
@@ -3103,7 +3103,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
}
- testcase TC_CSE_DMR_RET_008_ACP_AT() runs on Tester system CseSystem {
+ testcase TC_CSE_DMR_RET_008_ACP_LBL_AT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
@@ -3113,7 +3113,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
}
- testcase TC_CSE_DMR_RET_008_SCH_AT() runs on Tester system CseSystem {
+ testcase TC_CSE_DMR_RET_008_SCH_LBL_AT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
@@ -3123,17 +3123,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
}
- testcase TC_CSE_DMR_RET_008_PCH_AT() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
- v_ae1.done;
-
- v_ae1.start(f_CSE_DMR_RET_008(int15, m_createPollingChannelBase));//PollingChannel
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_RET_008_SUB_AT() runs on Tester system CseSystem {
+ testcase TC_CSE_DMR_RET_008_SUB_LBL_AT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
@@ -3143,7 +3133,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
}
- testcase TC_CSE_DMR_RET_008_TS_AT() runs on Tester system CseSystem {
+ testcase TC_CSE_DMR_RET_008_TS_LBL_AT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -4370,6 +4360,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
}
+ //Only Release 3
testcase TC_CSE_DMR_RET_024_PCH() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -4463,6 +4454,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
}
+ //Only Release 3
testcase TC_CSE_DMR_RET_025_PCH() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;