From 425a3f8f1e817afc3e82716cdcf9dc7cec1073c6 Mon Sep 17 00:00:00 2001
From: Naum Spaseski <naum.spaseski@gmail.com>
Date: Tue, 5 Dec 2017 01:02:13 +0100
Subject: [PATCH] Status code corrections
Signed-off-by: Naum Spaseski <naum.spaseski@gmail.com>
---
LibOneM2M/OneM2M_Functions.ttcn | 4 ++--
OneM2M_Testcases_CSE.ttcn | 18 +++++++++---------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 6361c37..0b11284 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -664,7 +664,7 @@ module OneM2M_Functions {
* @param p_responseStatusCode Response Status Code to be sent in response to the subscription verification request
* @verdict
*/
- function f_cse_preamble_subscriptionVerification(inout integer p_ae2Index, inout template RequestPrimitive p_createRequestPrimitive,in ResourceType p_resourceType, in ResponseStatusCode p_responseStatusCode := int2001) runs on AeSimu {
+ function f_cse_preamble_subscriptionVerification(inout integer p_ae2Index, inout template RequestPrimitive p_createRequestPrimitive,in ResourceType p_resourceType, in ResponseStatusCode p_responseStatusCode := int2000) runs on AeSimu {
if(p_resourceType == int23){
vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", {f_getAnnouncementTargetPoA("HTTP", PX_AE2_ADDRESS, "")}), -1)); // AE2 is registred
@@ -1309,7 +1309,7 @@ module OneM2M_Functions {
* @param p_responseStatusCode Response Status Code to be used for the response to the verification request
* @verdict
*/
- function f_cse_notifyProcedure_subscriptionVerificationHandler(in ResponseStatusCode p_responseStatusCode := int2001) runs on AeSimu {
+ function f_cse_notifyProcedure_subscriptionVerificationHandler(in ResponseStatusCode p_responseStatusCode := int2000) runs on AeSimu {
// Local variables
var ResponsePrimitive v_responsePrimitive;
var template Notification v_notificationRequest := mw_contentNotificationVerification;
diff --git a/OneM2M_Testcases_CSE.ttcn b/OneM2M_Testcases_CSE.ttcn
index 7433551..770c105 100644
--- a/OneM2M_Testcases_CSE.ttcn
+++ b/OneM2M_Testcases_CSE.ttcn
@@ -5666,7 +5666,7 @@ module OneM2M_Testcases_CSE {
var template RequestPrimitive v_createRequest := m_createContainerBase;
const AttributeList c_optionalAttribute := {"creator"};
- v_createRequest.primitiveContent.container.creator := "Unitialized";
+ v_createRequest.primitiveContent.container.creator := "";
v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
v_ae1.done;
@@ -6022,9 +6022,9 @@ module OneM2M_Testcases_CSE {
}
// Test Body
- if((p_optionalAttribute[0] == "creator") and (p_resourceType==int3)) {
- p_requestPrimitive.primitiveContent.container.creator := vc_resourcesList[v_parentIndex].resource.aE.aE_ID;
- }
+// if(p_optionalAttribute[0] == "creator") {
+// p_requestPrimitive.primitiveContent.container.creator := vc_resourcesList[v_parentIndex].resource.aE.aE_ID;
+// }
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
mcaPort.send(m_request(v_request));
@@ -11151,15 +11151,15 @@ module OneM2M_Testcases_CSE {
mcaPort.send(m_request(v_request, p_nullFields));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
}
@@ -11176,7 +11176,7 @@ module OneM2M_Testcases_CSE {
// Tear down
f_cf01Down();
- return vc_response.primitive.responsePrimitive;
+ return v_response.primitive.responsePrimitive;
}//end f_CSE_DMR_UPD_003
@@ -14966,7 +14966,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_016_CNT_ET() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "20001231T012345";
+ var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
--
GitLab