Integration of test cases and changes applicable to Release 1 from Release 2 trunk

Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parent dcd4424f
This diff is collapsed.
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* @author ETSI * @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $ * @version $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
* $Id: OneM2M_Pixits.ttcn 103 2016-08-30 09:39:32Z reinaortega $ * $Id: OneM2M_Pixits.ttcn 175 2016-11-22 12:39:39Z reinaortega $
* @desc Module containing Pixits for oneM2M * @desc Module containing Pixits for oneM2M
* *
*/ */
...@@ -15,26 +15,32 @@ module OneM2M_Pixits { ...@@ -15,26 +15,32 @@ module OneM2M_Pixits {
import from XSD all; import from XSD all;
import from OneM2M_Types all; import from OneM2M_Types all;
group testAdapterParameters {}
modulepar boolean PX_DELETE_CREATED_RESOURCES := true; modulepar boolean PX_DELETE_CREATED_RESOURCES := true;
modulepar charstring PX_RESOURCE_TO_BE_DELETED := "/ae_test"; modulepar XSD.AnyURI PX_RESOURCE_TO_BE_DELETED := "/ae_test";
modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"/ae_test", "/MyAcp"}; modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"/ae_test", "/MyAcp"};
modulepar charstring PX_HOST_ADDRESS := "127.0.0.1:8080"; modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
modulepar charstring PX_TESTER_ADDRESS := "127.0.0.1:3131";
modulepar charstring PX_XML_NAMESPACE := "om2m=""http://www.onem2m.org/xml/protocols"""; modulepar charstring PX_XML_NAMESPACE := "om2m=""http://www.onem2m.org/xml/protocols""";
modulepar charstring PX_CSE_NAME := "in-cse"; modulepar XSD.ID PX_CSE_NAME := "in-name";
modulepar charstring PX_URI_CSE := "/~/in-cse"; modulepar XSD.AnyURI PX_URI_CSE := "in-name";//TODO to be deleted
modulepar boolean PX_UNSTRUCTURED := false; modulepar boolean PX_UNSTRUCTURED := false;
modulepar charstring PX_AE_ID_STEM := "admin:admin"; modulepar XSD.ID PX_AE_ID_STEM := "";
modulepar XSD.ID PX_SUPER_USER := "admin:admin";
modulepar charstring PX_APP_ID := "myAppId"; modulepar XSD.ID PX_APP_ID := "myAppId";
modulepar boolean PX_RUN_POSTAMBLE := true; modulepar boolean PX_RUN_POSTAMBLE := true;
...@@ -42,25 +48,29 @@ module OneM2M_Pixits { ...@@ -42,25 +48,29 @@ module OneM2M_Pixits {
modulepar AddressingFormat PX_ADDRESSING_FORMAT := e_cseRelative; modulepar AddressingFormat PX_ADDRESSING_FORMAT := e_cseRelative;
modulepar charstring PX_SERIALIZATION := "JSON"; modulepar charstring PX_SERIALIZATION := "XML";
modulepar charstring PX_PROTOCOL_BINDING := "HTTP"; modulepar charstring PX_PROTOCOL_BINDING := "HTTP";
modulepar XSD.ID PX_CSE_ID := "in-cse";
modulepar boolean PX_ACP_SUPPORT := true; modulepar boolean PX_FROM_IS_AE_ID := true;
//@Martin
modulepar charstring PX_CSE_ID := "in-cse"; //for checking whether the locationPolicy creation request is originated from a ASN-AE
//NOTE: Apply to Device-based location request, and this requires Test System (TS) to activate ASN-AE mode to test IUT
modulepar boolean PX_FROM_IS_AE_ID := false; modulepar boolean PX_IUT_IS_ASN_CSE := false; //default //set it to true when running Device-based location testcases
modulepar boolean PX_IUT_IS_MN_CSE := false; //default //set it to true when running Share-based location testcases
//@Martin //@Martin
//constant parameters for LOC //constant parameters for LOC
modulepar LocationSource PX_LOCATION_SOURCE := int1;//network-defined modulepar XSD.Token PX_LOCATION_TARGET_ID := "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
modulepar charstring PX_LOCATION_TARGET_ID := "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER modulepar XSD.AnyURI PX_LOCATION_SERVER_ADDRESS := "{LOCATION-SERVER-ADDRESS}";
modulepar charstring PX_LOCATION_SERVER_ADDRESS := "{LOCATION-SERVER-ADDRESS}";
modulepar charstring PX_LOCATION_UPDATE_PERIOD := "PT10M10S" ;//10 Minute 10 Seconds modulepar charstring PX_LOCATION_UPDATE_PERIOD := "PT10M10S" ;//10 Minute 10 Seconds
modulepar charstring PX_LOCATION_UPDATE_PERIOD_INVALID := "-PT30M10S" ;//duration set to invalid value (minus value) modulepar charstring PX_LOCATION_CONTAINER_NAME := "myLoContainer";
modulepar charstring PX_LOCATION_CONTAINER_NAME := "myLoContainer";
modulepar Labels LABELS := {"VALUE_1"}; modulepar Labels LABELS := {"VALUE_1"};
modulepar boolean PX_IS_LOC_CONTAINER := false;//default //set it to true when the container is created to store location information
} // end of module } // end of module
This diff is collapsed.
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* @author ETSI * @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $ * @version $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $
* $Id: OneM2M_TestSystem.ttcn 105 2016-08-31 13:01:46Z reinaortega $ * $Id: OneM2M_TestSystem.ttcn 175 2016-11-22 12:39:39Z reinaortega $
* @desc Test System module for oneM2M * @desc Test System module for oneM2M
* *
*/ */
...@@ -47,7 +47,7 @@ module OneM2M_TestSystem { ...@@ -47,7 +47,7 @@ module OneM2M_TestSystem {
timer tc_wait; timer tc_wait;
//global variables //global variables
var MyResourcesList vc_resourcesList; var MyResourcesList vc_resourcesList;
var IntegerList vc_resourcesIndexToBeDeleted; var IntegerList vc_resourcesIndexToBeDeleted := {};
} }
type component CseTester extends Tester { type component CseTester extends Tester {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* @author ETSI * @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Types.ttcn $ * @version $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Types.ttcn $
* $Id: OneM2M_Types.ttcn 173 2016-11-22 08:10:48Z reinaortega $ * $Id: OneM2M_Types.ttcn 175 2016-11-22 12:39:39Z reinaortega $
* @desc Test System module for oneM2M * @desc Test System module for oneM2M
* *
*/ */
...@@ -3228,11 +3228,17 @@ with { ...@@ -3228,11 +3228,17 @@ with {
variant (notification_list[-]) "name as 'notification'"; variant (notification_list[-]) "name as 'notification'";
}; };
//FIXME To be added
type union Representation {
anytype resource,
ResponsePrimitive responsePrimitive
};
type record Notification_1 type record Notification_1
{ {
record { record {
XSD.AnyType representation optional, //XSD.AnyType representation optional, To be exchanged by Representation
Representation representation optional,
record { record {
XSD.AnyType representation optional, XSD.AnyType representation optional,
record { record {
...@@ -4664,5 +4670,5 @@ with { ...@@ -4664,5 +4670,5 @@ with {
encode "XML"; encode "XML";
variant "namespace as 'http://www.onem2m.org/xml/protocols' prefix 'm2m'"; variant "namespace as 'http://www.onem2m.org/xml/protocols' prefix 'm2m'";
variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'"; variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
extension "anytype ServiceSubscribedAppRule_optional, charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, ACP_update_invalid, AE_optional, AE_update_invalid,AEAnnc_optional, Container_optional, CSEBase_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, LocationPolicy_optional, LocationPolicy_update_invalid" extension "anytype AggregatedResponse, AggregatedNotification,Notification, ServiceSubscribedAppRule_optional, charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, ACP_update_invalid, AE_optional, AE_update_invalid,AEAnnc_optional, Container_optional, CSEBase_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, LocationPolicy_optional, LocationPolicy_update_invalid"
} }
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* @author ETSI * @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TypesAndValues.ttcn $ * @version $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TypesAndValues.ttcn $
* $Id: OneM2M_TypesAndValues.ttcn 102 2016-08-30 09:28:49Z reinaortega $ * $Id: OneM2M_TypesAndValues.ttcn 175 2016-11-22 12:39:39Z reinaortega $
* @desc Module containing types and values for oneM2M * @desc Module containing types and values for oneM2M
* *
*/ */
...@@ -22,6 +22,7 @@ module OneM2M_TypesAndValues { ...@@ -22,6 +22,7 @@ module OneM2M_TypesAndValues {
const XSD.String c_defaultResourceName := "MyResource"; const XSD.String c_defaultResourceName := "MyResource";
const charstring c_aeAuxName := "MyAe"; const charstring c_aeAuxName := "MyAe";
const XSD.String c_acpAuxName := "MyAcp"; const XSD.String c_acpAuxName := "MyAcp";
const charstring c_invalid_location_update_period := "-PT30M10S" ;//duration set to invalid value (minus value)
//AccessControlOperations //AccessControlOperations
const XSD.Integer c_C := 1; const XSD.Integer c_C := 1;
...@@ -89,6 +90,8 @@ module OneM2M_TypesAndValues { ...@@ -89,6 +90,8 @@ module OneM2M_TypesAndValues {
const XSD.Integer c_CRUDNDi := 63; const XSD.Integer c_CRUDNDi := 63;
type NhURI ParentID; type NhURI ParentID;
type record length(0 .. infinity) of RequestPrimitive RequestPrimitiveList;
type record length(1 .. infinity) of RequestPrimitiveList RequestPrimitiveMatrix;
} }
// end of module // end of module
This diff is collapsed.
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