Skip to content

GitLab

Commit 7bbc0f28 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Fixed issues after having moved to XSD V2.7.0 


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent b6dd71aa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 229 deletions
LibOneM2M/OneM2M_Templates.ttcn
View file @ 7bbc0f28
This diff is collapsed.
LibOneM2M/OneM2M_Types.ttcn
View file @ 7bbc0f28
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
* $Id: OneM2M_Types.ttcn 106 2016-09-01 06:59:26Z reinaortega $
* $Id: OneM2M_Types.ttcn 112 2016-09-07 14:29:02Z reinaortega $
* @desc Test System module for oneM2M
*
*/
......@@ -6381,6 +6381,7 @@ group optionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.String appName optional,
XSD.String app_ID optional,
XSD.ID aE_ID optional,
......@@ -6389,6 +6390,7 @@ group optionalResourceTypes {
XSD.AnyURI nodeLink optional,
XSD.Boolean requestReachability optional,
Serializations contentSerialization optional,
E2eSecInfo e2eSecInfo optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -6399,10 +6401,16 @@ group optionalResourceTypes {
AccessControlPolicy accessControlPolicy,
AccessControlPolicyAnnc accessControlPolicyAnnc,
Subscription subscription,
ScheduleAnnc scheduleAnnc
ScheduleAnnc scheduleAnnc,
SemanticDescriptor semanticDescriptor,
TimeSeries timeSeries,
TimeSeriesAnnc timeSeriesAnnc,
TrafficPatternAnnc trafficPatternAnnc,
Sg_flexContainerResource_group sg_flexContainerResource,
Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
} choice_list
} choice optional
}
}
with {
variant "element";
variant (resourceName) "attribute";
......@@ -6429,6 +6437,7 @@ group optionalResourceTypes {
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
XSD.String appName optional,
......@@ -6439,6 +6448,7 @@ group optionalResourceTypes {
XSD.AnyURI nodeLink optional,
XSD.Boolean requestReachability optional,
Serializations contentSerialization optional,
E2eSecInfo e2eSecInfo optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -6447,7 +6457,11 @@ group optionalResourceTypes {
AccessControlPolicy accessControlPolicy,
Subscription subscription,
PollingChannel pollingChannel,
Schedule schedule
Schedule schedule,
SemanticDescriptor semanticDescriptor,
TimeSeries timeSeries,
TrafficPattern trafficPattern,
Sg_flexContainerResource_group sg_flexContainerResource
} choice_list
} choice optional
}
......@@ -6514,8 +6528,13 @@ group optionalResourceTypes {
XSD.ID creator optional,
ContentInfo contentInfo optional,
XSD.NonNegativeInteger contentSize optional,
ContentRef contentRef optional,
XSD.AnyURI ontologyRef optional,
XSD.AnyType content optional
XSD.AnyType content optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list
} choice optional
}
with {
variant "name as uncapitalized";
......@@ -6535,6 +6554,7 @@ group optionalResourceTypes {
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
XSD.NonNegativeInteger stateTag optional,
......@@ -6546,14 +6566,15 @@ group optionalResourceTypes {
XSD.NonNegativeInteger currentByteSize optional,
XSD.AnyURI locationID optional,
XSD.AnyURI ontologyRef optional,
XSD.AnyURI latest optional,
XSD.AnyURI oldest optional,
XSD.Boolean disableRetrieval optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
ContentInstance contentInstance,
Container container,
Subscription subscription
Subscription subscription,
SemanticDescriptor semanticDescriptor,
Sg_flexContainerResource_group sg_flexContainerResource
} choice_list
} choice optional
}
......@@ -6586,10 +6607,12 @@ group optionalResourceTypes {
record of ResourceType supportedResourceType optional,
PoaList pointOfAccess optional,
XSD.AnyURI nodeLink optional,
E2eSecInfo e2eSecInfo optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
RemoteCSE remoteCSE,
RemoteCSEAnnc remoteCSEAnnc,
Node node,
AE aE,
Container container,
......@@ -6604,7 +6627,10 @@ group optionalResourceTypes {
Delivery delivery,
Schedule schedule,
M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile,
ServiceSubscribedAppRule serviceSubscribedAppRule
ServiceSubscribedAppRule serviceSubscribedAppRule,
Role role,
XSD.Token token,
Sg_flexContainerResource_group sg_flexContainerResource
} choice_list
} choice optional
}
......@@ -6634,6 +6660,7 @@ group optionalResourceTypes {
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
XSD.ID creator optional,
......@@ -6645,10 +6672,12 @@ group optionalResourceTypes {
XSD.Boolean memberTypeValidated optional,
ConsistencyStrategy consistencyStrategy optional,
XSD.String groupName optional,
XSD.AnyURI fanOutPoint optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of Subscription subscription_list
record length(1 .. infinity) of union {
Subscription subscription,
SemanticDescriptor semanticDescriptor
} choice_list
} choice optional
}
with {
......@@ -6674,9 +6703,7 @@ group optionalResourceTypes {
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
XSD.AnyURI pollingChannelURI optional
Timestamp expirationTime optional
}
with {
variant "name as uncapitalized";
......@@ -6728,6 +6755,7 @@ group optionalResourceTypes {
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfM2MID applicableCredIDs optional,
ListOfM2MID allowedApp_IDs optional,
ListOfM2MID allowedAEs optional,
......@@ -6759,6 +6787,8 @@ group optionalResourceTypes {
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID creator optional,
EventNotificationCriteria eventNotificationCriteria optional,
XSD.PositiveInteger expirationCounter optional,
ListOfURIs notificationURI optional,
......@@ -6772,11 +6802,13 @@ group optionalResourceTypes {
XSD.Boolean latestNotify optional,
NotificationContentType notificationContentType optional,
EventCat notificationEventCat optional,
XSD.ID creator optional,
XSD.AnyURI subscriberURI optional,
union {
ChildResourceRef childResource,
Schedule schedule
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Schedule schedule,
NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef
} choice_list
} choice optional
}
with {
......@@ -6800,6 +6832,7 @@ group optionalResourceTypes {
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
LocationSource locationSource optional,
......@@ -6815,8 +6848,7 @@ group optionalResourceTypes {
Subscription subscription
} choice_list
} choice optional
}
}
with {
variant "name as uncapitalized";
variant "element";
......
OneM2M_Testcases.ttcn
View file @ 7bbc0f28
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
* $Id: OneM2M_Testcases.ttcn 106 2016-09-01 06:59:26Z reinaortega $
* $Id: OneM2M_Testcases.ttcn 112 2016-09-07 14:29:02Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
......@@ -3212,7 +3212,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].PollingChannel_optional.labels := v_labels_1;//Attribute 3
//No Attribute 1
v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.accessControlPolicyIDs := v_acp;//Attribute 2
//v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.accessControlPolicyIDs := v_acp;//Attribute 2 TODO Find another alternative for Attribute 2
v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.labels := v_labels_2;//Attribute 3
v_nullFields := {"labels"};
......@@ -3224,10 +3224,10 @@ module OneM2M_Testcases {
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_optional.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.accessControlPolicyIDs))){
//Check attribute 2 TODO once another alternative is found, activate this checking
/*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_optional.labels)){
setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
......@@ -4250,8 +4250,7 @@ module OneM2M_Testcases {
testcase TC_CSE_GMG_BV_005() runs on CseTester system CseSystem
{
// TODO: use right values for c_fanoutPointAddress and c_RessourceType1
var XSD.AnyURI c_fanoutPointAddress := "FANOUTPOINT_ADDRESS";
// TODO: use right values for c_RessourceType1
var ResourceType c_RessourceType1 := int1;
// Local variables
......@@ -4263,8 +4262,6 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createGroupBase;
v_createRequest.primitiveContent.any_1[0].Group_optional.fanOutPoint := c_fanoutPointAddress;
v_createRequest.primitiveContent.any_1[0].Group_optional.resourceType := c_RessourceType1;
......@@ -4320,8 +4317,7 @@ module OneM2M_Testcases {
// TODO: use right values for c_fanoutPointAddress and c_RessourceType1
var XSD.AnyURI c_fanoutPointAddress := "FANOUTPOINT_ADDRESS";
// TODO: use right values for c_RessourceType1
var ResourceType c_RessourceType1 := int1;
// Local variables
......@@ -4333,7 +4329,6 @@ module OneM2M_Testcases {
v_request := valueof(m_retrieveResource(f_getResourceAddress(-2) & "/" & v_resourceId));
v_request.primitiveContent.any_1[0].Group_optional.fanOutPoint := c_fanoutPointAddress;
// Test control
......@@ -4385,8 +4380,7 @@ module OneM2M_Testcases {
testcase TC_CSE_GMG_BV_007() runs on CseTester system CseSystem
{
// TODO: use right values for c_fanoutPointAddress and c_RessourceType1
var XSD.AnyURI c_fanoutPointAddress := "FANOUTPOINT_ADDRESS";
// TODO: use right values for c_RessourceType1
// Local variables
var MsgIn v_response;
......@@ -4397,9 +4391,6 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
v_updateRequest.primitiveContent.any_1[0].Group_optional.fanOutPoint := c_fanoutPointAddress;
// Test control
// Test component configuration
......@@ -4451,8 +4442,7 @@ module OneM2M_Testcases {
testcase TC_CSE_GMG_BV_008_1() runs on CseTester system CseSystem
{
// TODO: use right values for c_fanoutPointAddress and c_deleteAddress
var XSD.AnyURI c_fanoutPointAddress := "FANOUTPOINT_ADDRESS";
// TODO: use right values for c_deleteAddress
var XSD.ID c_deleteAddress := "DELETE";
//Local variables
......@@ -4466,9 +4456,6 @@ module OneM2M_Testcases {
var template RequestPrimitive v_deleteRequest := m_deleteRequest(c_deleteAddress);
v_deleteRequest.primitiveContent.any_1[0].Group_optional.fanOutPoint := c_fanoutPointAddress;
// Test control
// Test component configuration
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment