diff --git a/OneM2M_Functions.ttcn b/OneM2M_Functions.ttcn
index c2c6ad1d8f30d0f9772b524b0521c4359089f0ea..ac9e7ac46a46dc80e6c24ea4776579546ac67e79 100644
--- a/OneM2M_Functions.ttcn
+++ b/OneM2M_Functions.ttcn
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Functions.ttcn $
- * $Id: OneM2M_Functions.ttcn 97 2016-06-01 15:38:10Z reinaortega $
+ * $Id: OneM2M_Functions.ttcn 98 2016-06-02 07:34:39Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
@@ -70,7 +70,7 @@ module OneM2M_Functions {
if(ischosen(v_response.responsePrimitive_.primitiveContent.any_1[0].AE)) {
vc_aeAux := v_response.responsePrimitive_.primitiveContent.any_1[0].AE;
if(ispresent(vc_aeAux.aE_ID)){
- f_sendAcPrimitive("AE-ID_changed", vc_aeAux.aE_ID);
+ f_sendAcPrimitive("AE-ID_changed", oct2char(unichar2oct(vc_aeAux.aE_ID)));
} else {
f_sendAcPrimitive("AE-ID_changed", "0");
}
@@ -106,7 +106,7 @@ module OneM2M_Functions {
if (PX_RUN_POSTAMBLE) {
if(PX_UNSTRUCTURED)
{
- v_request := m_deleteAe("/" & vc_aeAux.aE_ID);
+ v_request := valueof(m_deleteAe("/" & vc_aeAux.aE_ID));
v_request.from_ := vc_aeAux.aE_ID;
mcaPort.send(m_request(v_request));
} else {
@@ -131,7 +131,7 @@ module OneM2M_Functions {
if(PX_UNSTRUCTURED)
{
- v_request := m_deleteAcp("/" & vc_acpAux.resourceID);
+ v_request := valueof(m_deleteAcp("/" & vc_acpAux.resourceID));
v_request.from_ := PX_AE_ID_STEM;
mcaPort.send(m_request(v_request));
} else {
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index ff1ba254b9c783c0a105b37cce206a62ed84a217..e844dd371d47833048299e265e0cd0ae43395f4f 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- * $Id: OneM2M_Testcases.ttcn 97 2016-06-01 15:38:10Z reinaortega $
+ * $Id: OneM2M_Testcases.ttcn 98 2016-06-02 07:34:39Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
@@ -177,7 +177,7 @@ module OneM2M_Testcases {
f_createResource(p_resourceType, v_aeResourceAddress, p_requestPrimitive);
// Test Body
- v_request := m_retrieveResource(v_aeResourceAddress & "/" & c_defaultResourceName);
+ v_request := valueof(m_retrieveResource(v_aeResourceAddress & "/" & c_defaultResourceName));
v_request.resultContent := int0;//Nothing
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -292,7 +292,7 @@ module OneM2M_Testcases {
f_createResource(p_resourceType, v_aeResourceAddress, p_requestPrimitive);
// Test Body
- v_request := m_retrieveResource(v_aeResourceAddress & "/" & c_defaultResourceName);
+ v_request := valueof(m_retrieveResource(v_aeResourceAddress & "/" & c_defaultResourceName));
v_request.resultContent := int1;//Attributes
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -407,7 +407,7 @@ module OneM2M_Testcases {
f_createResource(p_resourceType, v_aeResourceAddress, p_requestPrimitive);
// Test Body
- v_request := m_retrieveResource(v_aeResourceAddress & "/" & c_defaultResourceName);
+ v_request := valueof(m_retrieveResource(v_aeResourceAddress & "/" & c_defaultResourceName));
v_request.resultContent := int2;//Attributes
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -522,7 +522,7 @@ module OneM2M_Testcases {
f_createResource(p_resourceType, v_aeResourceAddress, p_requestPrimitive);
// Test Body
- v_request := m_retrieveResource(v_aeResourceAddress & "/" & c_defaultResourceName);
+ v_request := valueof(m_retrieveResource(v_aeResourceAddress & "/" & c_defaultResourceName));
v_request.resultContent := int1;//Attributes
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -637,7 +637,7 @@ module OneM2M_Testcases {
f_createResource(p_resourceType, v_aeResourceAddress, p_requestPrimitive);
// Test Body
- v_request := m_retrieveResource(v_aeResourceAddress & "/" & c_defaultResourceName);
+ v_request := valueof(m_retrieveResource(v_aeResourceAddress & "/" & c_defaultResourceName));
v_request.resultContent := int1;//Attributes
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -752,7 +752,7 @@ module OneM2M_Testcases {
f_createResource(p_resourceType, v_aeResourceAddress, p_requestPrimitive);
// Test Body
- v_request := m_retrieveResource(v_aeResourceAddress & "/" & c_defaultResourceName);
+ v_request := valueof(m_retrieveResource(v_aeResourceAddress & "/" & c_defaultResourceName));
v_request.resultContent := int1;//Attributes
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -867,7 +867,7 @@ module OneM2M_Testcases {
f_createResource(p_resourceType, v_aeResourceAddress, p_requestPrimitive);
// Test Body
- v_request := m_retrieveResource(v_aeResourceAddress & "/" & c_defaultResourceName);
+ v_request := valueof(m_retrieveResource(v_aeResourceAddress & "/" & c_defaultResourceName));
v_request.resultContent := int1;//Attributes
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -2323,8 +2323,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Container)) {
- if(v_responsePrimitive.primitiveContent.any_1[0].Container.labels != v_labels_2){
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Container_optional)) {
+ if(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.labels != v_labels_2){
setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
}
}
@@ -2348,8 +2348,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Group)) {
- if(v_responsePrimitive.primitiveContent.any_1[0].Group.labels != v_labels_2){
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Group_optional)) {
+ if(v_responsePrimitive.primitiveContent.any_1[0].Group_optional.labels != v_labels_2){
setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
}
}
@@ -2399,8 +2399,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Schedule)) {
- if(v_responsePrimitive.primitiveContent.any_1[0].Schedule.labels != v_labels_2){
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional)) {
+ if(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional.labels != v_labels_2){
setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
}
}
@@ -2425,8 +2425,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel)) {
- if(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel.labels != v_labels_2){
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional)) {
+ if(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional.labels != v_labels_2){
setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
}
}
@@ -2450,8 +2450,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Subscription)) {
- if(v_responsePrimitive.primitiveContent.any_1[0].Subscription.labels != v_labels_2){
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional)) {
+ if(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional.labels != v_labels_2){
setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
}
}
@@ -2534,8 +2534,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Container)) {
- if(v_responsePrimitive.primitiveContent.any_1[0].Container.labels != v_labels_1){
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Container_optional)) {
+ if(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.labels != v_labels_1){
setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
}
}
@@ -2556,8 +2556,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Group)) {
- if(v_responsePrimitive.primitiveContent.any_1[0].Group.labels != v_labels_1){
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Group_optional)) {
+ if(v_responsePrimitive.primitiveContent.any_1[0].Group_optional.labels != v_labels_1){
setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
}
}
@@ -2578,8 +2578,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy)) {
- if(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy.labels != v_labels_1){
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional)) {
+ if(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.labels != v_labels_1){
setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
}
}
@@ -2600,8 +2600,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Schedule)) {
- if(v_responsePrimitive.primitiveContent.any_1[0].Schedule.labels != v_labels_1){
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional)) {
+ if(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional.labels != v_labels_1){
setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
}
}
@@ -2622,8 +2622,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel)) {
- if(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel.labels != v_labels_1){
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional)) {
+ if(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional.labels != v_labels_1){
setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
}
}
@@ -2644,8 +2644,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Subscription)) {
- if(v_responsePrimitive.primitiveContent.any_1[0].Subscription.labels != v_labels_1){
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional)) {
+ if(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional.labels != v_labels_1){
setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly")
}
}
@@ -2733,8 +2733,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Container)) {
- if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Container.labels)){ // FIXME: CHECK: labels set to empty
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Container_optional)) {
+ if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.labels)){ // FIXME: CHECK: labels set to empty
setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
}
}
@@ -2761,8 +2761,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Group)) {
- if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Group.labels)){
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Group_optional)) {
+ if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Group_optional.labels)){
setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
}
}
@@ -2789,8 +2789,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy)) {
- if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy.labels)){
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional)) {
+ if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.labels)){
setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
}
}
@@ -2817,8 +2817,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Schedule)) {
- if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Schedule.labels)){
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional)) {
+ if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional.labels)){
setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
}
}
@@ -2845,8 +2845,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel)) {
- if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel.labels)){
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional)) {
+ if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional.labels)){
setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
}
}
@@ -2873,8 +2873,8 @@ module OneM2M_Testcases {
if(getverdict == pass){
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Subscription)) {
- if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Subscription.labels)){
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional)) {
+ if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional.labels)){
setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
}
}
@@ -2963,17 +2963,17 @@ module OneM2M_Testcases {
if(getverdict == pass){
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Container)) {
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Container_optional)) {
//Check attribute 1
- if(v_responsePrimitive.primitiveContent.any_1[0].Container.expirationTime != valueof(v_updateRequest.primitiveContent.any_1[0].Container_optional.expirationTime)){
+ if(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.expirationTime != valueof(v_updateRequest.primitiveContent.any_1[0].Container_optional.expirationTime)){
setverdict(fail, testcasename() & ": Error: Expiration Time attribute not updated correctly")
}
//Check attribute 2
- if(v_responsePrimitive.primitiveContent.any_1[0].Container.maxNrOfInstances != valueof(v_updateRequest.primitiveContent.any_1[0].Container_optional.maxNrOfInstances)){
+ if(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.maxNrOfInstances != valueof(v_updateRequest.primitiveContent.any_1[0].Container_optional.maxNrOfInstances)){
setverdict(fail, testcasename() & ": Error: MaxNrOfInstances attribute not updated correctly")
}
//Check attribute 3
- if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Container.labels)){
+ if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.labels)){
setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
}
}
@@ -3006,17 +3006,17 @@ module OneM2M_Testcases {
if(getverdict == pass){
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Group)) {
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Group_optional)) {
//Check attribute 1
- if(not match(v_responsePrimitive.primitiveContent.any_1[0].Group.groupName, valueof(v_updateRequest.primitiveContent.any_1[0].Group_optional.groupName))){
+ if(not match(v_responsePrimitive.primitiveContent.any_1[0].Group_optional.groupName, valueof(v_updateRequest.primitiveContent.any_1[0].Group_optional.groupName))){
setverdict(fail, testcasename() & ": Error: Expiration Time attribute not updated correctly")
}
//Check attribute 2
- if(not match(v_responsePrimitive.primitiveContent.any_1[0].Group.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.any_1[0].Group_optional.accessControlPolicyIDs))){
+ if(not match(v_responsePrimitive.primitiveContent.any_1[0].Group_optional.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.any_1[0].Group_optional.accessControlPolicyIDs))){
setverdict(fail, testcasename() & ": Error: MaxNrOfInstances attribute not updated correctly")
}
//Check attribute 3
- if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Group.labels)){
+ if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Group_optional.labels)){
setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
}
}
@@ -3062,17 +3062,17 @@ module OneM2M_Testcases {
if(getverdict == pass){
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy)) {
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional)) {
//Check attribute 1
- if(not match(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy.privileges, valueof(v_updateRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.privileges))){
+ if(not match(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.privileges, valueof(v_updateRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.privileges))){
setverdict(fail, testcasename() & ": Error: Privileges attribute not updated correctly")
}
//Check attribute 2
- if(not match(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy.announceTo, valueof(v_updateRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.announceTo))){
+ if(not match(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.announceTo, valueof(v_updateRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.announceTo))){
setverdict(fail, testcasename() & ": Error: Expiration Time attribute not updated correctly")
}
//Check attribute 3
- if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy.labels)){
+ if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.labels)){
setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
}
}
@@ -3100,17 +3100,17 @@ module OneM2M_Testcases {
if(getverdict == pass){
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Schedule)) {
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional)) {
//Check attribute 1
- if(v_responsePrimitive.primitiveContent.any_1[0].Schedule.scheduleElement != valueof(v_updateRequest.primitiveContent.any_1[0].Schedule_optional.scheduleElement)){
+ if(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional.scheduleElement != valueof(v_updateRequest.primitiveContent.any_1[0].Schedule_optional.scheduleElement)){
setverdict(fail, testcasename() & ": Error: Expiration Time attribute not updated correctly")
}
//Check attribute 2
- if(v_responsePrimitive.primitiveContent.any_1[0].Schedule.announceTo != valueof(v_updateRequest.primitiveContent.any_1[0].Schedule_optional.announceTo)){
+ if(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional.announceTo != valueof(v_updateRequest.primitiveContent.any_1[0].Schedule_optional.announceTo)){
setverdict(fail, testcasename() & ": Error: MaxNrOfInstances attribute not updated correctly")
}
//Check attribute 3
- if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Schedule.labels)){
+ if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional.labels)){
setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
}
}
@@ -3139,15 +3139,15 @@ module OneM2M_Testcases {
if(getverdict == pass){
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel)) {
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional)) {
//Check attribute 1
//Check attribute 2
- if(not match(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.accessControlPolicyIDs))){
+ if(not match(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.accessControlPolicyIDs))){
setverdict(fail, testcasename() & ": Error: ACPI attribute not added correctly")
}
//Check attribute 3
- if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel.labels)){
+ if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional.labels)){
setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
}
}
@@ -3177,17 +3177,17 @@ module OneM2M_Testcases {
if(getverdict == pass){
if(ispresent(v_responsePrimitive.primitiveContent)) {
- if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Subscription)) {
+ if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional)) {
//Check attribute 1
- if(not match(v_responsePrimitive.primitiveContent.any_1[0].Subscription.labels, valueof(v_updateRequest.primitiveContent.any_1[0].Subscription_optional.labels))){
+ if(not match(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional.labels, valueof(v_updateRequest.primitiveContent.any_1[0].Subscription_optional.labels))){
setverdict(fail, testcasename() & ": Error: Expiration Time attribute not updated correctly")
}
//Check attribute 2
- if(not match(v_responsePrimitive.primitiveContent.any_1[0].Subscription.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.any_1[0].Subscription_optional.accessControlPolicyIDs))){
+ if(not match(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.any_1[0].Subscription_optional.accessControlPolicyIDs))){
setverdict(fail, testcasename() & ": Error: MaxNrOfInstances attribute not updated correctly")
}
//Check attribute 3
- if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Subscription.expirationCounter)){
+ if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional.expirationCounter)){
setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
}
}
diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index bcbe03adf62e1f0ec9390eff3ee503ad8c728092..86ac647b1cb03d9ac47b278e933eab1c647a0f98 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Types.ttcn $
- * $Id: OneM2M_Types.ttcn 97 2016-06-01 15:38:10Z reinaortega $
+ * $Id: OneM2M_Types.ttcn 98 2016-06-02 07:34:39Z reinaortega $
* @desc Test System module for oneM2M
*
*/
@@ -4411,5 +4411,5 @@ with {
encode "XML";
variant "namespace as 'http://www.onem2m.org/xml/protocols' prefix 'm2m'";
variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
- extension "anytype charstring, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, ACP_update_invalid, AE_optional, AE_update_invalid,Container_optional, Container_update_invalid, ContentInstance_optional, ContentInstance_update_invalid, Group_optional, Group_update_invalid, Schedule_optional, Schedule_update_invalid, Subscription_optional, Subscription_update_invalid, PollingChannel_optional, PollingChannel_update_invalid"
+ extension "anytype charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, ACP_update_invalid, AE_optional, AE_update_invalid,Container_optional, Container_update_invalid, ContentInstance_optional, ContentInstance_update_invalid, Group_optional, Group_update_invalid, Schedule_optional, Schedule_update_invalid, Subscription_optional, Subscription_update_invalid, PollingChannel_optional, PollingChannel_update_invalid"
}