From 29114985a2b465bd1ac8fdac7e2f2b6282bba2e6 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 11 Jul 2016 14:45:40 +0200
Subject: [PATCH] Correction for Issue#3
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_Functions.ttcn | 13 ++-----------
OneM2M_Testcases.ttcn | 3 +--
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/OneM2M_Functions.ttcn b/OneM2M_Functions.ttcn
index 2f112ed..a2d56a3 100644
--- a/OneM2M_Functions.ttcn
+++ b/OneM2M_Functions.ttcn
@@ -191,12 +191,7 @@ module OneM2M_Functions {
p_request.from_ := f_getOriginator(p_parentIndex);
p_request.to_ := f_addPrefix(f_getResourceAddress(p_parentIndex));
-
- //@Martin
- p_request.requestIdentifier := valueof(p_request.from_) & f_rnd(1, 1000000);//p_request.from_ & int2str(float2int(rnd()));
-
- //p_request.name := p_name;
-
+
if (p_resourceType == int1) {//AccessControlPolicy
}
@@ -230,11 +225,7 @@ module OneM2M_Functions {
p_request.from_ := f_getOriginator(p_resourceIndex);
p_request.to_ := f_addPrefix(f_getResourceAddress(p_resourceIndex));
-
- //@Martin
- p_request.requestIdentifier := valueof(p_request.from_) & f_rnd(1, 1000000);//p_request.from_ & int2str(float2int(rnd()));
- //p_request.name := p_name;
-
+
if (p_resourceType == int3) {//Container
//TODO
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 9f8bd62..b8ff145 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -3749,8 +3749,7 @@ module OneM2M_Testcases {
}
[] mcaPort.receive(mw_responseOK) -> value v_response {
tc_ac.stop;
- setverdict(fail, testcasename() & ": Error occurrs with response status code: "& int2str(enum2int(v_response.responsePrimitive_.responseStatusCode)) & "due to IUT failed to handle an invalid locationPolicy update request
- !");
+ setverdict(fail, testcasename() & ": Error occurrs with response status code: "& int2str(enum2int(v_response.responsePrimitive_.responseStatusCode)) & "due to IUT failed to handle an invalid locationPolicy update request");
}
[] tc_ac.timeout {
setverdict(inconc, testcasename() & ": Timeout due to no response from requested server!");
--
GitLab