diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 346c2dc1505ca17388ae39a0294051ebea48f7a4..b1045d2f285c325e64b3433fba1019c5feccf031 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -8084,6 +8084,264 @@ module OneM2M_PermutationFunctions {
group PollingChannel {
+ function f_CSE_PCH_001() runs on AeSimu {
+ // Local variables
+ var integer v_aeIndex := -1;
+ var integer v_resourceIndex := -1;
+ var RequestPrimitive v_request;
+ var MsgIn v_response;
+ var RequestPrimitive v_requestNotify;
+
+ // Test control
+
+ // Test component configuration
+ f_cf02Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
+ vc_cse1.done;
+
+ v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
+
+ v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
+
+ v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+ mcaPort.send(m_request(v_request));
+
+ v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
+
+ vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
+
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePollingResponse(v_requestNotify))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Polling response received");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePollingResponse)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Content not carrying request targeting AE1");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong status code");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf01Down();
+ } // end TC_CSE_PCH_001
+
+ function f_CSE_PCH_002() runs on AeSimu {
+ // Local variables
+ var integer v_aeIndex := -1;
+ var integer v_resourceIndex := -1;
+ var RequestPrimitive v_request;
+ var MsgIn v_response;
+ var RequestPrimitive v_requestNotify;
+
+ // Test control
+
+ // Test component configuration
+ f_cf02Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
+ vc_cse1.done;
+
+ v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
+
+ v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
+
+ v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
+
+ vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
+
+ v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+ mcaPort.send(m_request(v_request));
+
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePollingResponse(v_requestNotify))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Polling response received");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePollingResponse)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Content not carrying request targeting AE1");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong status code");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf01Down();
+ } // end TC_CSE_PCH_002
+
+ function f_CSE_PCH_003() runs on AeSimu {
+ //Local variables
+ var integer v_aeIndex := -1;
+ var integer v_resourceIndex := -1;
+ var RequestPrimitive v_request;
+ var MsgIn v_response;
+ var RequestPrimitive v_requestNotify;
+
+ // Test control
+
+
+ // Test component configuration
+ f_cf02Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
+ vc_cse1.done;
+
+ v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
+
+ v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
+
+ v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+ mcaPort.send(m_request(v_request));
+
+ v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
+ vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
+
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePollingResponse(v_requestNotify))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Polling response received");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePollingResponse)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Content not carrying request targeting AE1");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong status code");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+ }
+ }
+
+ mcaPort.send(m_request(v_requestNotify));
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf02Down();
+ }
+
+ function f_CSE_PCH_004() runs on CseSimu {
+ //Local variables
+ var integer v_localResourceIndex := -1;
+ var MsgIn v_request_req1, v_request_req3;
+ var RequestPrimitive v_request_req2;
+ var ResponsePrimitive v_response_rsp1;
+ var template UtTriggerPrimitive v_utRequest1 := m_utCreatePollingChannel;
+ var template UtTriggerPrimitive v_utRequest2;
+ var charstring v_action1 := "Please, send a Polling Channel CREATE request";
+ var charstring v_action2 := "Please, send a Polling request (Retrieve PollingChannelURI request)";
+ var RequestPrimitive v_requestNotify;
+
+ //Test control
+
+ // Test component configuration
+ f_cf02UpCseSimuMaster();
+
+ // Test adapter configuration
+
+ // Preamble
+ vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
+
+ //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();
+ }
+
+ //Trigger IUT for sending a polling request (req1)
+ v_utRequest2 := valueof(m_utRetrievePollingChannel(f_getLocalResourceAddress(v_localResourceIndex) & "/" & c_resourceShortNamePollingChannelUri));
+ f_sendUtPrimitive(v_utRequest2,v_action2);
+
+ tc_ac.start;
+ alt {
+ [] mccPortIn.receive(mw_request(mw_retrieve(f_getResourceAddress(v_localResourceIndex) & "/" & c_resourceShortNamePollingChannelUri))) -> value v_request_req1 {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__&":INFO: Polling request received successfuly");
+ v_response_rsp1 := valueof(m_responsePrimitive(int2000,v_request_req1.primitive.requestPrimitive.requestIdentifier));
+ v_response_rsp1.from_ := PX_CSE1_ID;
+ v_response_rsp1.to_ := v_request_req1.primitive.requestPrimitive.from_;
+ //Put in the primitiveContent a Notify request (req2) (simulated) from another node CSE
+ v_request_req2 := valueof(m_notify(f_getResourceAddress(vc_remoteCseIndex)));
+ v_response_rsp1.primitiveContent := { requestPrimitive := v_request_req2 };
+ mccPortIn.send(m_response(v_response_rsp1));
+ }
+ [] tc_ac.timeout {
+ setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type Polling Channel");
+ }
+ }
+
+ tc_ac.start;
+ alt {
+ [] mccPortIn.receive(mw_request(mw_notifyResponsePrimitive(?))) -> value v_request_req3 {
+ tc_ac.stop;
+ //Check that primitiveContent carries the response to req2 (resp2)
+ if(v_request_req3.primitive.requestPrimitive.primitiveContent.responsePrimitive.requestIdentifier == v_request_req2.requestIdentifier) {
+ setverdict(pass, __SCOPE__ & ": NOTIFY request received carrying response (rsp2) to the Notify request (req2)");
+ } else {
+ setverdict(fail, __SCOPE__ & ": NOTIFY request received not carryng the expected response (rsp2) to the Notify request (req2)");
+ }
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No message while expecting NOTIFY request");
+ }
+ }
+
+ //Postamble
+ f_cse_postamble_deleteResourcesCSE();
+
+ // Tear down
+ f_cf02DownCseSimuMaster();
+ }
+
function f_CSE_PCH_005(inout integer p_aeIndex1, inout integer p_aeIndex2, RequestPrimitive p_requestprimitive) runs on AeSimu {
//Local variables
@@ -8122,6 +8380,59 @@ module OneM2M_PermutationFunctions {
}
}
}
+
+ function f_CSE_PCH_006() runs on CseSimu {
+ // Local variables
+ var integer v_aeIndex := -1;
+ var integer v_resourceIndex := -1;
+ var RequestPrimitive v_request;
+ var MsgIn v_response;
+ var RequestPrimitive v_requestNotify;
+
+ // Test control
+
+ // Test component configuration
+ f_cf02UpCseSimuMaster();
+
+ // Test adapter configuration
+
+ // Preamble
+ vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
+
+ 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;
+
+ v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
+ v_request.from_ := PX_CSE1_ID;
+
+ mccPort.send(m_request(v_request));
+ tc_ac.start;
+ alt {
+ [] mccPort.receive(mw_response(mw_responsePrimitive(int4108))) -> value vc_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ":Response status code set to 4108 (REQUEST_TIMEOUT)");
+ }
+ [] mccPort.receive(mw_response()) {
+ tc_ac.stop;
+ setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
+ }
+ [] tc_ac.timeout {
+ setverdict(inconc, __SCOPE__&":INFO: No answer while performing notification");
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResourcesCSE();
+
+ // Tear down
+ f_cf02DownCseSimuMaster();
+ } // end f_CSE_PCH_006
+
} //end group PollingChannel
group Non_Blocking_Requests{
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 2ea56b8d309d12f43d8ebc55f84b4a7ecc7cf9ec..f4bd2fa2fc70a1c00b724a5424ea654a191458c0 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -8591,72 +8591,10 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_PCH_001());
-
+ v_ae1.start(f_CSE_PCH_001());
v_ae1.done;
}
-
- function f_CSE_PCH_001() runs on AeSimu {
- // Local variables
- var integer v_aeIndex := -1;
- var integer v_resourceIndex := -1;
- var RequestPrimitive v_request;
- var MsgIn v_response;
- var RequestPrimitive v_requestNotify;
-
- // Test control
-
- // Test component configuration
- f_cf02Up();
-
- // Test adapter configuration
-
- // Preamble
- vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
- vc_cse1.done;
-
- v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
-
- v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
-
- v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
- mcaPort.send(m_request(v_request));
-
- v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
-
- vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
-
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePollingResponse(v_requestNotify))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Polling response received");
- }
- [] mcaPort.receive(mw_response(mw_responsePollingResponse)) {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Content not carrying request targeting AE1");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong status code");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
- }
- }
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf01Down();
- } // end TC_CSE_PCH_001
-
/**
* @desc Check that the IUT which hosts <pollingChannel> resource forwards a Notify request successfully to a target AE, once the IUT receives a polling request from AE
*
@@ -8665,71 +8603,10 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_PCH_002());
-
+ v_ae1.start(f_CSE_PCH_002());
v_ae1.done;
}
-
- function f_CSE_PCH_002() runs on AeSimu {
- // Local variables
- var integer v_aeIndex := -1;
- var integer v_resourceIndex := -1;
- var RequestPrimitive v_request;
- var MsgIn v_response;
- var RequestPrimitive v_requestNotify;
-
- // Test control
-
- // Test component configuration
- f_cf02Up();
-
- // Test adapter configuration
-
- // Preamble
- vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
- vc_cse1.done;
-
- v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
-
- v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
-
- v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
-
- vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
-
- v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
- mcaPort.send(m_request(v_request));
-
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePollingResponse(v_requestNotify))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Polling response received");
- }
- [] mcaPort.receive(mw_response(mw_responsePollingResponse)) {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Content not carrying request targeting AE1");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong status code");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
- }
- }
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf01Down();
- } // end TC_CSE_PCH_002
/**
* @desc Check that the IUT which hosts <pollingChannel> resource forwards the polling response message to the CSE when receiving a Notify request to the <pollingChannelURI> resource from the AE
@@ -8740,73 +8617,10 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PCH_003());
-
v_ae1.done;
}
- function f_CSE_PCH_003() runs on AeSimu {
- //Local variables
- var integer v_aeIndex := -1;
- var integer v_resourceIndex := -1;
- var RequestPrimitive v_request;
- var MsgIn v_response;
- var RequestPrimitive v_requestNotify;
-
- // Test control
-
-
- // Test component configuration
- f_cf02Up();
-
- // Test adapter configuration
-
- // Preamble
- vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
- vc_cse1.done;
-
- v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
-
- v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
-
- v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
- mcaPort.send(m_request(v_request));
-
- v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
- vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
-
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePollingResponse(v_requestNotify))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Polling response received");
- }
- [] mcaPort.receive(mw_response(mw_responsePollingResponse)) {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Content not carrying request targeting AE1");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong status code");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
- }
- }
-
- mcaPort.send(m_request(v_requestNotify));
-
- //Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf02Down();
- }
-
/**
* @desc Check that the IUT which performs polling sends the Notify request to <pollingChannelURI> Hosting CSE after receiving response using polling channel
*
@@ -8816,86 +8630,9 @@ module OneM2M_Testcases_CSE_Release_2 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_cse1.start(f_CSE_PCH_004());
-
v_cse1.done;
}
- function f_CSE_PCH_004() runs on CseSimu {
- //Local variables
- var integer v_localResourceIndex := -1;
- var MsgIn v_request_req1, v_request_req3;
- var RequestPrimitive v_request_req2;
- var ResponsePrimitive v_response_rsp1;
- var template UtTriggerPrimitive v_utRequest1 := m_utCreatePollingChannel;
- var template UtTriggerPrimitive v_utRequest2;
- var charstring v_action1 := "Please, send a Polling Channel CREATE request";
- var charstring v_action2 := "Please, send a Polling request (Retrieve PollingChannelURI request)";
- var RequestPrimitive v_requestNotify;
-
- //Test control
-
- // Test component configuration
- f_cf02UpCseSimuMaster();
-
- // Test adapter configuration
-
- // Preamble
- vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
-
- //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();
- }
-
- //Trigger IUT for sending a polling request (req1)
- v_utRequest2 := valueof(m_utRetrievePollingChannel(f_getLocalResourceAddress(v_localResourceIndex) & "/" & c_resourceShortNamePollingChannelUri));
- f_sendUtPrimitive(v_utRequest2,v_action2);
-
- tc_ac.start;
- alt {
- [] mccPortIn.receive(mw_request(mw_retrieve(f_getResourceAddress(v_localResourceIndex) & "/" & c_resourceShortNamePollingChannelUri))) -> value v_request_req1 {
- tc_ac.stop;
- setverdict(pass, __SCOPE__&":INFO: Polling request received successfuly");
- v_response_rsp1 := valueof(m_responsePrimitive(int2000,v_request_req1.primitive.requestPrimitive.requestIdentifier));
- v_response_rsp1.from_ := PX_CSE1_ID;
- v_response_rsp1.to_ := v_request_req1.primitive.requestPrimitive.from_;
- //Put in the primitiveContent a Notify request (req2) (simulated) from another node CSE
- v_request_req2 := valueof(m_notify(f_getResourceAddress(vc_remoteCseIndex)));
- v_response_rsp1.primitiveContent := { requestPrimitive := v_request_req2 };
- mccPortIn.send(m_response(v_response_rsp1));
- }
- [] tc_ac.timeout {
- setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type Polling Channel");
- }
- }
-
- tc_ac.start;
- alt {
- [] mccPortIn.receive(mw_request(mw_notifyResponsePrimitive(?))) -> value v_request_req3 {
- tc_ac.stop;
- //Check that primitiveContent carries the response to req2 (resp2)
- if(v_request_req3.primitive.requestPrimitive.primitiveContent.responsePrimitive.requestIdentifier == v_request_req2.requestIdentifier) {
- setverdict(pass, __SCOPE__ & ": NOTIFY request received carrying response (rsp2) to the Notify request (req2)");
- } else {
- setverdict(fail, __SCOPE__ & ": NOTIFY request received not carryng the expected response (rsp2) to the Notify request (req2)");
- }
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No message while expecting NOTIFY request");
- }
- }
-
- //Postamble
- f_cse_postamble_deleteResourcesCSE();
-
- // Tear down
- f_cf02DownCseSimuMaster();
- }
-
/**
* @desc Check that the IUT rejects a <pollingChannel> OPERATION of the AE when AE-ID is not same as the AE-ID of the parent resource
*
@@ -8978,6 +8715,8 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
}
+
+ } //end group g_CSE_PCH_005
/**
* @desc Check that the IUT sends the response with a status to the CSE1 when the request expires according to its Request Expiration Timestamp
@@ -8988,64 +8727,9 @@ module OneM2M_Testcases_CSE_Release_2 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_cse1.start(f_CSE_PCH_006());
-
v_cse1.done;
-
}
-
- function f_CSE_PCH_006() runs on CseSimu {
- // Local variables
- var integer v_aeIndex := -1;
- var integer v_resourceIndex := -1;
- var RequestPrimitive v_request;
- var MsgIn v_response;
- var RequestPrimitive v_requestNotify;
-
- // Test control
-
- // Test component configuration
- f_cf02UpCseSimuMaster();
-
- // Test adapter configuration
-
- // Preamble
- vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
-
- 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;
-
- v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
- v_request.from_ := PX_CSE1_ID;
-
- mccPort.send(m_request(v_request));
- tc_ac.start;
- alt {
- [] mccPort.receive(mw_response(mw_responsePrimitive(int4108))) -> value vc_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ":Response status code set to 4108 (REQUEST_TIMEOUT)");
- }
- [] mccPort.receive(mw_response()) {
- tc_ac.stop;
- setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
- }
- [] tc_ac.timeout {
- setverdict(inconc, __SCOPE__&":INFO: No answer while performing notification");
- }
- }
-
- // Postamble
- f_cse_postamble_deleteResourcesCSE();
-
- // Tear down
- f_cf02DownCseSimuMaster();
- } // end f_CSE_PCH_006
-
- }//end group PollingChannel
+ } //end group PollingChannel
group Non_Blocking_Requests{