From 964847b02b1a36bbbd73b2cfce5f745bebf20878 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 6 Apr 2018 12:16:18 +0200
Subject: [PATCH] ScheduleEntry type pattern corrected
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Types.ttcn | 2 +-
OneM2M_Testcases_CSE_Release_2.ttcn | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 6b978c6..aad8070 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -990,7 +990,7 @@ module OneM2M_Types {
};
- type XSD.String ScheduleEntry //TODO To be fixed (pattern "(([*]|[1-5]#(0,1)\d([,-][1-5]#(0,1)\d)*)[\q{0,0,0,20}\q{0,0,0,10}\t\r]+)#(2)([*]|((1#(0,1)\d|2[0-3])([,-](1#(0,1)\d|2[0-3]))*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|(([1-9]|1\d|2\d|3[01])([,-]([1-9]|1\d|2\d|3[01]))*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|(([1-9]|1[0-2])([,-]([1-9]|1[0-2]))*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|([0-6]([,-][0-6])*))")
+ type XSD.String ScheduleEntry (pattern "(([*]|[1-5]#(0,1)\d([,\-][1-5]#(0,1)\d)#(0,))\s#(1,))#2([*]|((1#(0,1)\d|2[0-3])([,\-](1#(0,1)\d|2[0-3]))#(0,)))\s#(1,)([*]|(([1-9]|1\d|2\d|3[01])([,\-]([1-9]|1\d|2\d|3[01]))#(0,)))\s#(1,)([*]|(([1-9]|1[0-2])([,\-]([1-9]|1[0-2]))#(0,)))\s#(1,)([*]|([0-6]([,-][0-6])#(0,)))")
with {
variant "name as uncapitalized";
};
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index fb50475..aeeecb7 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -1448,7 +1448,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createScheduleBase;
var RequestPrimitive v_requestPrimitive;
- var ScheduleEntries scheduleElement := {{"0,0,0 1 2,1,1,*"}};
+ var ScheduleEntries scheduleElement := {{"0 0 0,1,2 1 1 *"}};
v_createRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};
v_createRequest.primitiveContent.schedule.scheduleElement := scheduleElement; //Correct value? Shall be indicated in TP?
@@ -3308,8 +3308,8 @@ module OneM2M_Testcases_CSE_Release_2 {
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
- v_createRequest.primitiveContent.schedule.scheduleElement := {{"0,0,0 1 2,1,1,*"}};//Attribute 1
- v_updateRequest.primitiveContent.schedule.scheduleElement := {{"1,1,1 1 2,1,1,*"}}; //Attribute 1
+ v_createRequest.primitiveContent.schedule.scheduleElement := {{"0 0 0,1,2 1 1 *"}};//Attribute 1
+ v_updateRequest.primitiveContent.schedule.scheduleElement := {{"1 1 1,2 1 1 *"}}; //Attribute 1
v_updateRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2
v_updateRequest.primitiveContent.schedule.labels := v_labels_1;//Attribute 3
--
GitLab