March 2015 - Sandbox-commits - mailman.cloud.codelutin.com

r946 - oipf/view/css
by ygrego＠users.nuiton.org 12 Mar '15

12 Mar '15

Author: ygrego Date: 2015-03-12 10:42:19 +0000 (Thu, 12 Mar 2015) New Revision: 946 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/946 Log: Modification of rule "table th, table td" in order to add border to table cells. Addition of a rule "table tbody td:nth-child(4)" to add a background color to fourth column of table. Modified: oipf/view/css/test.css Modified: oipf/view/css/test.css =================================================================== --- oipf/view/css/test.css 2015-03-12 10:17:51 UTC (rev 945) +++ oipf/view/css/test.css 2015-03-12 10:42:19 UTC (rev 946) @@ -28,8 +28,9 @@ /* shared basics rules */ table th, table td { - text-align: left; + text-align: center; padding-right: .5em; + border: 1px solid #7a7; } table th { @@ -38,7 +39,7 @@ } -/* header not used*/ +/* header of table*/ table > thead > tr:first-child > th { text-align: center; color: blue; @@ -60,11 +61,15 @@ padding:.5em .5em .5em .3em; } +table tbody td:nth-child(4) { + background-color: gainsboro; + } + table tbody th:after { content: " :"; } -/* foot of table */ +/* foot of table not used here*/ table tfoot { font-weight: bold; }

1 0

r945 - oipf/js/utils
by ygrego＠users.nuiton.org 12 Mar '15

12 Mar '15

Author: ygrego Date: 2015-03-12 10:17:51 +0000 (Thu, 12 Mar 2015) New Revision: 945 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/945 Log: Renaming file "utils.js" in "Utils.js" Added: oipf/js/utils/Utils.js Removed: oipf/js/utils/utils.js Copied: oipf/js/utils/Utils.js (from rev 944, oipf/js/utils/utils.js) =================================================================== --- oipf/js/utils/Utils.js (rev 0) +++ oipf/js/utils/Utils.js 2015-03-12 10:17:51 UTC (rev 945) @@ -0,0 +1,27 @@ +/* + * Some code based on RFC 4122, section 4.4 + * (Algorithms for Creating a UUID from Truly Random or Pseudo-Random Number). + */ + +function createUUID() { + // http://www.ietf.org/rfc/rfc4122.txt + var s = []; + var hexDigits = "0123456789abcdef"; + for (var i = 0; i < 36; i++) { + s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1); + } + s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010 + s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01 + s[8] = s[13] = s[18] = s[23] = "-"; + + var uuid = s.join(""); + return uuid; +} + +/* + * Description: + * Should be use in each test method in anticipation of tests executed on a tv platform. + */ +function isMethodImplemented(object, methodName) { + return object[methodName]; +} Deleted: oipf/js/utils/utils.js =================================================================== --- oipf/js/utils/utils.js 2015-03-12 10:15:02 UTC (rev 944) +++ oipf/js/utils/utils.js 2015-03-12 10:17:51 UTC (rev 945) @@ -1,27 +0,0 @@ -/* - * Some code based on RFC 4122, section 4.4 - * (Algorithms for Creating a UUID from Truly Random or Pseudo-Random Number). - */ - -function createUUID() { - // http://www.ietf.org/rfc/rfc4122.txt - var s = []; - var hexDigits = "0123456789abcdef"; - for (var i = 0; i < 36; i++) { - s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1); - } - s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010 - s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01 - s[8] = s[13] = s[18] = s[23] = "-"; - - var uuid = s.join(""); - return uuid; -} - -/* - * Description: - * Should be use in each test method in anticipation of tests executed on a tv platform. - */ -function isMethodImplemented(object, methodName) { - return object[methodName]; -}

1 0

r944 - oipf/js/utils
by ygrego＠users.nuiton.org 12 Mar '15

12 Mar '15

Author: ygrego Date: 2015-03-12 10:15:02 +0000 (Thu, 12 Mar 2015) New Revision: 944 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/944 Log: Useful methods are present into this file. Added: oipf/js/utils/utils.js Added: oipf/js/utils/utils.js =================================================================== --- oipf/js/utils/utils.js (rev 0) +++ oipf/js/utils/utils.js 2015-03-12 10:15:02 UTC (rev 944) @@ -0,0 +1,27 @@ +/* + * Some code based on RFC 4122, section 4.4 + * (Algorithms for Creating a UUID from Truly Random or Pseudo-Random Number). + */ + +function createUUID() { + // http://www.ietf.org/rfc/rfc4122.txt + var s = []; + var hexDigits = "0123456789abcdef"; + for (var i = 0; i < 36; i++) { + s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1); + } + s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010 + s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01 + s[8] = s[13] = s[18] = s[23] = "-"; + + var uuid = s.join(""); + return uuid; +} + +/* + * Description: + * Should be use in each test method in anticipation of tests executed on a tv platform. + */ +function isMethodImplemented(object, methodName) { + return object[methodName]; +}

1 0

r943 - oipf/js/impl
by ygrego＠users.nuiton.org 12 Mar '15

12 Mar '15

Author: ygrego Date: 2015-03-12 09:51:30 +0000 (Thu, 12 Mar 2015) New Revision: 943 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/943 Log: Reimplementation of method "isObjectSupported" and verify in each method of creation object: if the object is supported by the terminal. Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-03-12 09:10:44 UTC (rev 942) +++ oipf/js/impl/OipfObjectFactory.js 2015-03-12 09:51:30 UTC (rev 943) @@ -1,23 +1,5 @@ -var channelConfig_type = "channelCongig"; //Not a DAE MIME Type -var videoBroadcast_dae_mime_type = "video/broadcast"; -var notifSocket_dae_mime_type = "application/notifsocket"; -var applicationManager_dae_mime_type = "application/oipfApplicationManager"; -var capabilities_dae_mime_type = "application/oipfCapabilities"; -var codManager_dae_mime_type = "application/oipfCodManager"; -var configuration_dae_mime_type = "application/oipfConfiguration"; -var downloadManager_dae_mime_type = "application/oipfDownloadManager"; -var downloadTrigger_dae_mime_type = "application/oipfDownloadTrigger"; -var drmAgent_dae_mime_type = "application/oipfDrmAgent"; -var gatewayInfo_dae_mime_type = "application/oipfGatewayInfo"; -var communicationServices_dae_mime_type = "application/oipfCommunicationServices"; -var mdtf_dae_mime_type = "application/oipfMDTF"; -var parentalControlManager_dae_mime_type = "application/oipfParentalControlManager"; -var recordingScheduler_dae_mime_type = "application/oipfRecordingScheduler"; -var remoteControlFunction_dae_mime_type = "application/oipfRemoteControlFunction"; -var remoteManagement_dae_mime_type = "application/oipfRemoteManagement"; -var searchManager_dae_mime_type = "application/oipfSearchManager"; -var statusView_dae_mime_type = "application/oipfStatusView"; + /*! * \class OipfObjectFactory * \brief Provide access to components of a terminal supporting OIFP specification. @@ -139,10 +121,30 @@ * */ isObjectSupported: function(mimeType) { - var mimeTypeCopy = mimeType; - var pattern = /(application\/oipf)(\w+)/; + + var mimeType_method = { + "application/notifsocket" : "createNotifSocketObject", + "application/oipfApplicationManager" : "createApplicationManagerObject", + "application/oipfCapabilities" : "createCapabilitiesObject", + "application/oipfCodManager" : "createCodManagerObject", + "application/oipfCommunicationServices" : "createCommunicationServicesObject", + "application/oipfConfiguration" : "createConfigurationObject", + "application/oipfDownloadManager" : "createDownloadManagerObject", + "application/oipfDownloadTrigger" : "createDownloadTriggerObject", + "application/oipfDrmAgent" : "createDrmAgentObject", + "application/oipfGatewayInfo" : "createGatewayInfoObject", + "application/oipfMDTF" : "createMDTFObject", + "application/oipfParentalControlManager" : "createParentalControlManagerObject", + "application/oipfRecordingScheduler" : "createRecordingSchedulerObject", + "application/oipfRemoteControlFunction" : "createRemoteControlFunctionObject", + "application/oipfRemoteManagement" : "createRemoteManagementObject", + "application/oipfSearchManager" : "createSearchManagerObject", + "application/oipfStatusView" : "createStatusViewObject", + "video/broadcast" : "createVideoBroadcastObject", + "video/mpeg" : "createVideoMpegObject" + }; - return this[mimeTypeCopy.replace(pattern, 'create$2Object')]; + return this[mimeType_method[mimeType]]; }, /*! @@ -173,10 +175,14 @@ * allocationMethod property SHALL be set to DYNAMIC_ALLOCATION . */ createVideoBroadcastObject: function(requiredCapabilities) { + + console.log("[INFO] createVideoBroadcastObject() of OipfObjectFactory class called."); + if (this.isObjectSupported("video/broadcast")) { + return new VideoBroadcastObject(requiredCapabilities); + } else { + throw new TypeError("This object type is not supported."); + } - console.log("[INFO] createVideoBroadcastObject() of OipfObjectFactory class called."); - return new VideoBroadcastObject(requiredCapabilities); - }, /* @@ -193,10 +199,12 @@ * implements the interface for the specified object. */ createSearchManagerObject: function() { - - console.log("[INFO] createSearchManagerObject() of OipfObjectFactory class called."); - return this.searchManagerObject; - + if (this.isObjectSupported(SEARCH_MANAGER_DAE_MIME_TYPE)) { + console.log("[INFO] createSearchManagerObject() of OipfObjectFactory class called."); + return this.searchManagerObject; + } else { + throw new TypeError("This object type is not supported."); + } }, /* @@ -213,9 +221,12 @@ * implements the interface for the specified object. */ createApplicationManagerObject: function() { - - console.log("[INFO] createApplicationManagerObject() of OipfObjectFactory class called."); - return this.applicationManagerObject; + if (this.isObjectSupported(APPLICATION_MANAGER_DAE_MIME_TYPE)) { + console.log("[INFO] createApplicationManagerObject() of OipfObjectFactory class called."); + return this.applicationManagerObject; + } else { + throw new TypeError("This object type is not supported."); + } }, /* @@ -232,149 +243,320 @@ * implements the interface for the specified object. */ createCapabilitiesObject: function() { - - console.log("[INFO] createCapabilitiesObject() of OipfObjectFactory class called."); - return this.capabilitiesObject; + if (this.isObjectSupported(CAPABILITIES_DAE_MIME_TYPE)) { + console.log("[INFO] createCapabilitiesObject() of OipfObjectFactory class called."); + return this.capabilitiesObject; + } else { + throw new TypeError("This object type is not supported."); + } }, - /*! - * \class - * \brief - */ + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ createChannelConfig: function() { - - console.log("[INFO] createChannelConfigObject() of OipfObjectFactory class called."); - return this.channelConfig; + if (this.isObjectSupported(CHANNEL_CONFIG_TYPE)) { + console.log("[INFO] createChannelConfigObject() of OipfObjectFactory class called."); + return this.channelConfig; + } else { + throw new TypeError("This object type is not supported."); + } }, - /*! - * \class - * \brief - */ + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ createCodManagerObject: function() { - - console.log("[INFO] createCodManagerObject() of OipfObjectFactory class called."); - return this.codManagerObject; + if (this.isObjectSupported(COD_MANAGER_DAE_MIME_TYPE)) { + console.log("[INFO] createCodManagerObject() of OipfObjectFactory class called."); + return this.codManagerObject; + } else { + throw new TypeError("This object type is not supported."); + } }, - /*! - * \class - * \brief - */ + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ createConfigurationObject: function() { - - console.log("[INFO] createConfigurationObject() of OipfObjectFactory class called."); - return this.configurationObject; + if (this.isObjectSupported(CONFIGURATION_DAE_MIME_TYPE)) { + console.log("[INFO] createConfigurationObject() of OipfObjectFactory class called."); + return this.configurationObject; + } else { + throw new TypeError("This object type is not supported."); + } }, - /*! - * \class - * \brief - */ + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ createDownloadManagerObject: function() { - - console.log("[INFO] createDownloadManagerObject() of OipfObjectFactory class called."); - return this.downloadManagerObject; + if (this.isObjectSupported(DOWNLOAD_MANAGER_DAE_MIME_TYPE)) { + console.log("[INFO] createDownloadManagerObject() of OipfObjectFactory class called."); + return this.downloadManagerObject; + } else { + throw new TypeError("This object type is not supported."); + } }, - /*! - * \class - * \brief - */ + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ createDownloadTriggerObject: function() { - - console.log("[INFO] createDownloadTriggerObject() of OipfObjectFactory class called."); - return this.downloadTriggerObject; + if (this.isObjectSupported(DOWNLOAD_TRIGGER_DAE_MIME_TYPE)) { + console.log("[INFO] createDownloadTriggerObject() of OipfObjectFactory class called."); + return this.downloadTriggerObject; + } else { + throw new TypeError("This object type is not supported."); + } }, - /*! - * \class - * \brief - */ + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ createDrmAgentObject: function() { - - console.log("[INFO] createDrmAgentObject() of OipfObjectFactory class called."); - return this.drmAgentObject; + if (this.isObjectSupported(DRM_AGENT_DAE_MIME_TYPE)) { + console.log("[INFO] createDrmAgentObject() of OipfObjectFactory class called."); + return this.drmAgentObject; + } else { + throw new TypeError("This object type is not supported."); + } }, - /*! - * \class - * \brief - */ + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ createGatewayInfoObject: function() { - - console.log("[INFO] createGatewayInfoObject() of OipfObjectFactory class called."); - return this.gatewayInfoObject; + if (this.isObjectSupported(GATEWAY_INFO_DAE_MIME_TYPE)) { + console.log("[INFO] createGatewayInfoObject() of OipfObjectFactory class called."); + return this.gatewayInfoObject; + } else { + throw new TypeError("This object type is not supported."); + } }, - /*! - * \class - * \brief - */ + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ createIMSObject: function() { - - console.log("[INFO] createIMSObject() of OipfObjectFactory class called."); - return this.imsObject; + if (this.isObjectSupported(COMMUNICATION_SERVICES_DAE_MIME_TYPE)) { + console.log("[INFO] createIMSObject() of OipfObjectFactory class called."); + return this.imsObject; + } else { + throw new TypeError("This object type is not supported."); + } }, - /*! - * \class - * \brief - */ + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ createMDTFObject: function() { - - console.log("[INFO] createMDTFObject() of OipfObjectFactory class called."); - return this.mdtfObject; + if (this.isObjectSupported(MDTF_DAE_MIME_TYPE)) { + console.log("[INFO] createMDTFObject() of OipfObjectFactory class called."); + return this.mdtfObject; + } else { + throw new TypeError("This object type is not supported."); + } }, - /*! - * \class - * \brief - */ + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ createNotifSocketObject: function() { - - console.log("[INFO] createNotifSocketObject() of OipfObjectFactory class called."); - return this.notifSocketObject; + if (this.isObjectSupported(NotifSocketObject)) { + console.log("[INFO] createNotifSocketObject() of OipfObjectFactory class called."); + return this.notifSocketObject; + } else { + throw new TypeError("This object type is not supported."); + } }, - /*! - * \class - * \brief - */ - createParentalControlManagerObject: function() { - - console.log("[INFO] createParentalControlManangerObject() of OipfObjectFactory class called."); - return this.parentalControlManagerObject; + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ + createParentalControlManagerObject: function(PARENTAL_CONTROL_MANAGER_DAE_MIME_TYPE) { + if (this.isObjectSupported("video/broadcast")) { + console.log("[INFO] createParentalControlManangerObject() of OipfObjectFactory class called."); + return this.parentalControlManagerObject; + } else { + throw new TypeError("This object type is not supported."); + } }, - /*! - * \class - * \brief - */ + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ createRecordingSchedulerObject: function() { - - console.log("[INFO] createRecordingSchedulerObject() of OipfObjectFactory class called."); - return this.recordingSchedulerObject; + if (this.isObjectSupported(RECORDING_SCHEDULER_DAE_MIME_TYPE)) { + console.log("[INFO] createRecordingSchedulerObject() of OipfObjectFactory class called."); + return this.recordingSchedulerObject; + } else { + throw new TypeError("This object type is not supported."); + } }, - /*! - * \class - * \brief - */ + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ createRemoteControlFunctionObject: function() { - - console.log("[INFO] createRemoteControlFunctionObject() of OipfObjectFactory class called."); - return this.remoteControlFunctionObject; + if (this.isObjectSupported(REMOTE_CONTROL_FUNCTION_DAE_MIME_TYPE)) { + console.log("[INFO] createRemoteControlFunctionObject() of OipfObjectFactory class called."); + return this.remoteControlFunctionObject; + } else { + throw new TypeError("This object type is not supported."); + } }, - /*! - * \class - * \brief - */ + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ createRemoteManagementObject: function() { - - console.log("[INFO] createRemoteManagementObject() of OipfObjectFactory class called."); - return this.remoteManagementObject; + if (this.isObjectSupported(REMOTE_MANAGEMENT_DAE_MIME_TYPE)) { + console.log("[INFO] createRemoteManagementObject() of OipfObjectFactory class called."); + return this.remoteManagementObject; + } else { + throw new TypeError("This object type is not supported."); + } }, /*! @@ -405,10 +587,12 @@ * allocationMethod property SHALL be set to DYNAMIC_ALLOCATION . */ createStatusViewObject: function() { - - console.log("[INFO] createStatusViewObject() of OipfObjectFactory class called."); - return new StatusViewObject(); - + if (this.isObjectSupported(STATUS_VIEW_DAE_MIME_TYPE)) { + console.log("[INFO] createStatusViewObject() of OipfObjectFactory class called."); + return new StatusViewObject(); + } else { + throw new TypeError("This object type is not supported."); + } }, /*! @@ -439,9 +623,11 @@ * allocationMethod property SHALL be set to DYNAMIC_ALLOCATION . */ createVideoMpegObject: function() { - - console.log("[INFO] createVideoMpegObject() of OipfObjectFactory class called."); - return new VideoMpegObject(); - + if (this.isObjectSupported("video/mpeg")) { + console.log("[INFO] createVideoMpegObject() of OipfObjectFactory class called."); + return new VideoMpegObject(); + } else { + throw new TypeError("This object type is not supported."); + } } });

1 0

r942 - oipf/view
by ygrego＠users.nuiton.org 12 Mar '15

12 Mar '15

Author: ygrego Date: 2015-03-12 09:10:44 +0000 (Thu, 12 Mar 2015) New Revision: 942 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/942 Log: Addition of javascript source file "DaeMimeType.js". Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-03-12 09:09:06 UTC (rev 941) +++ oipf/view/test.html 2015-03-12 09:10:44 UTC (rev 942) @@ -24,11 +24,12 @@ <script src="../js/impl/model/AVOutput.js" type="text/javascript"></script> <script src="../js/impl/model/LocalSystem.js" type="text/javascript"></script> <script src="../js/impl/model/TunerCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/VideoBroadcastConstants.js" type="text/javascript"></script> <script src="../js/impl/model/Channel.js" type="text/javascript"></script> <script src="../js/impl/model/ChannelList.js" type="text/javascript"></script> <script src="../js/impl/model/MetadataSearch.js" type="text/javascript"></script> <script src="../js/impl/model/SearchResults.js" type="text/javascript"></script> + <script src="../js/impl/model/constants/VideoBroadcastConstants.js" type="text/javascript"></script> + <script src="../js/impl/model/constants/DaeMimeType.js" type="text/javascript"></script> <script src="../js/impl/OipfObjectFactory.js" type="text/javascript"></script> <script src="../js/impl/ConfigurationObject.js" type="text/javascript"></script> <script src="../js/impl/ChannelConfig.js" type="text/javascript"></script>

1 0

r941 - oipf/js/impl/model/constants
by ygrego＠users.nuiton.org 12 Mar '15

12 Mar '15

Author: ygrego Date: 2015-03-12 09:09:06 +0000 (Thu, 12 Mar 2015) New Revision: 941 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/941 Log: Contains all DAE mime types. Added: oipf/js/impl/model/constants/DaeMimeType.js Added: oipf/js/impl/model/constants/DaeMimeType.js =================================================================== --- oipf/js/impl/model/constants/DaeMimeType.js (rev 0) +++ oipf/js/impl/model/constants/DaeMimeType.js 2015-03-12 09:09:06 UTC (rev 941) @@ -0,0 +1,25 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +var CHANNEL_CONFIG_TYPE = "channelCongig"; //Not a DAE MIME Type +var VIDEO_BROADCAST_DAE_MIME_TYPE = "video/broadcast"; +var NOTIF_SOCKET_DAE_MIME_TYPE = "application/notifsocket"; +var APPLICATION_MANAGER_DAE_MIME_TYPE = "application/oipfApplicationManager"; +var CAPABILITIES_DAE_MIME_TYPE = "application/oipfCapabilities"; +var COD_MANAGER_DAE_MIME_TYPE = "application/oipfCodManager"; +var CONFIGURATION_DAE_MIME_TYPE = "application/oipfConfiguration"; +var DOWNLOAD_MANAGER_DAE_MIME_TYPE = "application/oipfDownloadManager"; +var DOWNLOAD_TRIGGER_DAE_MIME_TYPE = "application/oipfDownloadTrigger"; +var DRM_AGENT_DAE_MIME_TYPE = "application/oipfDrmAgent"; +var GATEWAY_INFO_DAE_MIME_TYPE = "application/oipfGatewayInfo"; +var COMMUNICATION_SERVICES_DAE_MIME_TYPE = "application/oipfCommunicationServices"; +var MDTF_DAE_MIME_TYPE = "application/oipfMDTF"; +var PARENTAL_CONTROL_MANAGER_DAE_MIME_TYPE = "application/oipfParentalControlManager"; +var RECORDING_SCHEDULER_DAE_MIME_TYPE = "application/oipfRecordingScheduler"; +var REMOTE_CONTROL_FUNCTION_DAE_MIME_TYPE = "application/oipfRemoteControlFunction"; +var REMOTE_MANAGEMENT_DAE_MIME_TYPE = "application/oipfRemoteManagement"; +var SEARCH_MANAGER_DAE_MIME_TYPE = "application/oipfSearchManager"; +var STATUS_VIEW_DAE_MIME_TYPE = "application/oipfStatusView"; +

1 0

r940 - oipf/js/test
by ygrego＠users.nuiton.org 11 Mar '15

11 Mar '15

Author: ygrego Date: 2015-03-11 16:30:12 +0000 (Wed, 11 Mar 2015) New Revision: 940 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/940 Log: Addition of block try catch around code subject to cause errors in each test method. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-03-11 16:27:32 UTC (rev 939) +++ oipf/js/test/SearchManagerTest.js 2015-03-11 16:30:12 UTC (rev 940) @@ -4,17 +4,27 @@ * */ var SearchManagerTest = TestCase.extend({ + init: function () { }, + testInstanceCreation: function (resolve, reject) { + var state = "Pending"; console.log("***************************************************************************************************************************"); - console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: " + state); - this.searchManagerTest = oipfObjectFactory.createSearchManagerObject(); - - if (this.assertNotNull(this.searchManagerTest) && this.assertNotUndefined(this.searchManagerTest)) { + + try { + + var searchManagerTest = oipfObjectFactory.createSearchManagerObject(); + + } catch (error) { + console.log(error.message); + throw error; + } + + if (this.assertNotNull(searchManagerTest) && this.assertNotUndefined(searchManagerTest)) { state = "Successfull"; console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: " + state); resolve(state); @@ -26,14 +36,31 @@ console.log("***************************************************************************************************************************"); }, + testGetCurrentProgram: function (resolve, reject) { - var searchManagerObject = oipfObjectFactory.createSearchManagerObject(); + var stat = "Pending"; console.log("***************************************************************************************************************************"); - console.log("[TEST-RUNNING][Info] " + "Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: " + stat); + + try { + var searchManagerObject = oipfObjectFactory.createSearchManagerObject(); + var channelConfig = oipfObjectFactory.createChannelConfig(); + var searchTarget = 1; + var metaDataSearch = searchManagerObject.createSearch(searchTarget); + var startTime = null; + metaDataSearch.findProgrammesFromStream(channelConfig.currentChannel, startTime); + var offset = 0; + var count = 1; + metaDataSearch.result.getResults(offset, count); + //metaDataSearch.result[0];Must return undefined else wrong behaviour of this method + + } catch (error) { + console.log(error.message); + throw error; + } + var self = this; - searchManagerObject.onMetadataSearch = function (search, state) { console.log("[INFO]: onMetadataSearch called"); @@ -42,24 +69,20 @@ case 0: if (self.assertNotNull(search.result[0])) { - stat = "Success"; console.log("[TEST-RUNNING][Info] " + "Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: " + stat); - resolve("Success"); + resolve("Successfull"); } else { - stat = "Failed"; console.log("[TEST-RUNNING][Info] " + "Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: " + stat); - reject(new Error("Failed")); + reject(new Error("Failure")); } break; case 3: - var message = "[INFO] MetadataSearch in Idle state because of either search abort or parameters have been modified (query, constraints or search target)"; console.log(message); break; case 4: - message = "[INFO] The search cannot be complete because of lack of ressources or any other reason."; console.log(message); break; @@ -72,15 +95,6 @@ }; - var channelConfig = oipfObjectFactory.createChannelConfig(); - var searchTarget = 1; - var metaDataSearch = searchManagerObject.createSearch(searchTarget); - var startTime = null; - metaDataSearch.findProgrammesFromStream(channelConfig.currentChannel, startTime); - var offset = 0; - var count = 1; - metaDataSearch.result.getResults(offset, count); - //metaDataSearch.result[0];Must return undefined else wrong behaviour of this method } }); \ No newline at end of file

1 0

r939 - oipf/js/test
by ygrego＠users.nuiton.org 11 Mar '15

11 Mar '15

Author: ygrego Date: 2015-03-11 16:27:32 +0000 (Wed, 11 Mar 2015) New Revision: 939 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/939 Log: Addition of block try catch around code subject to cause errors in each test method. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-03-11 15:05:24 UTC (rev 938) +++ oipf/js/test/VideoBroadcastTest.js 2015-03-11 16:27:32 UTC (rev 939) @@ -6,64 +6,83 @@ var VideoBroadcastTest = TestCase.extend({ error: { - 0: "channel not supported by tuner", - 1: "cannot tune to given transport stream (e.g. no signal)", - 2: "tuner locked by other object.", - 3: "parental lock on channel.", - 4: "encrypted channel, key/module missing.", - 5: "unknown channel (e.g. can’t resolve DVB or ISDB triplet).", - 6: "channel switch interrupted (e.g. because another channel switch was activated before the previous one completed).", - 7: "channel cannot be changed, because it is currently being recorded.", - 8: "cannot resolve URI of referenced IP channel.", - 9: "insufficient bandwidth.", - 10: "channel cannot be changed by nextChannel()/prevChannel() methods either because the OITF does not maintain a favourites or channel list or because the video/broadcast object is in the Unrealized state.", - 11: "insufficient resources are available to present the given channel (e.g. a lack of available codec resources).", - 12: "specified channel not found in transport stream.", - 100: "unidentified error." + 0: "Channel not supported by tuner.", + 1: "Cannot tune to given transport stream (e.g. no signal).", + 2: "Tuner locked by other object.", + 3: "Parental lock on channel.", + 4: "Encrypted channel, key/module missing.", + 5: "Unknown channel (e.g. can’t resolve DVB or ISDB triplet).", + 6: "Channel switch interrupted (e.g. because another channel switch was activated before the previous one completed).", + 7: "Channel cannot be changed, because it is currently being recorded.", + 8: "Cannot resolve URI of referenced IP channel.", + 9: "Insufficient bandwidth.", + 10: "Channel cannot be changed by nextChannel()/prevChannel() methods either because the OITF does not maintain a favourites or channel list or because the video/broadcast object is in the Unrealized state.", + 11: "Insufficient resources are available to present the given channel (e.g. a lack of available codec resources).", + 12: "Specified channel not found in transport stream.", + 100: "Unidentified error." }, + init: function () { }, + /* * Descrtiption: * This method test the initialization of video broadcast object. */ testInstanceCreation: function (resolve, reject) { console.log("***************************************************************************************************************************"); - console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: Pending"); - var videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); + + try { + + var videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); - if (this.assertNotNull(videoBroadcastObject) && this.assertNotUndefined(videoBroadcastObject)) { - console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: Successfull"); - resolve("Successfull"); - } else { - console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: Failure"); - reject("Failure"); + if (this.assertNotNull(videoBroadcastObject) && this.assertNotUndefined(videoBroadcastObject)) { + console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: Successfull"); + resolve("Successfull"); + } else { + console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: Failure"); + reject("Failure"); + } + console.log("***************************************************************************************************************************"); + } catch (error) { + console.log(error.message, "Here"); + throw error; } - console.log("***************************************************************************************************************************"); }, + /* * Descrtiption: * This method test the binding between the video broadcast object and the current program stream. * ToDO: Extraction of method onPlayStateChange out. */ testBindToCurrentChannel: function (resolve, reject) { + console.log("***************************************************************************************************************************"); + console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Pending"); - console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Pending"); + try { + + var videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); + var currentChann = videoBroadcastObject.bindToCurrentChannel(); + + } catch (error) { + console.log(error.message); + throw error; + } + var self = this; - var videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); - videoBroadcastObject.onPlayStateChange = function (state, error) { - + videoBroadcastObject.onPlayStateChange = function(state, error) { + var wantedPlayState; var VerifWantedPlayStateRes; switch (videoBroadcastObject.playstate) { case 0: wantedPlayState = 2; - VerifWantedPlayStateRes = self.verifWantedPlayState(self, videoBroadcastObject, state, wantedPlayState); - //TODO Verfication of binding to the necesssary ressources have achieved with success. + VerifWantedPlayStateRes = self.verifWantedPlayState(self, state, wantedPlayState); + //TODO Verification of binding to the necesssary ressources have achieved with success. break; case 1: @@ -76,21 +95,19 @@ case 3: wantedPlayState = 1; - VerifWantedPlayStateRes = self.verifWantedPlayState(self, videoBroadcastObject, state, wantedPlayState); + VerifWantedPlayStateRes = self.verifWantedPlayState(self, state, wantedPlayState); //TODO Verify that video and audio presentation is enabled break; } - + var success; success = VerifWantedPlayStateRes[0]; var errorPlayState = " "; if (!success) { - errorPlayState = VerifWantedPlayStateRes[1]; - } else { - videoBroadcastObject.playstate = 2; + errorPlayState = VerifWantedPlayStateRes[1]; } - + var errorBind = " "; if (self.assertEquals(videoBroadcastObject.currentChannel, currentChann)) { console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Successfull"); @@ -100,7 +117,7 @@ success = false; errorBind = " In binding to current channel."; } - + if (error || (!success)) { var errorText = self.error[error]; reject("Failure:" + errorBind + " " + errorText + " " + errorPlayState); @@ -111,24 +128,26 @@ }; - var currentChann = videoBroadcastObject.bindToCurrentChannel(); - }, testPrevChannel: function(resolve, reject) { console.log("***************************************************************************************************************************"); - console.log("[TEST-RUNNING][Info] Id: vbTestPrevChannel, Label: Switch to precedent channel in channel list, State: Pending"); - var videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); - videoBroadcastObject.playstate = 2; - videoBroadcastObject.currentChannel = videoBroadcastObject.getChannelConfig().currentChannel; - videoBroadcastObject.prevChannel(); + try { + + var videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); + videoBroadcastObject.playstate = 2; + videoBroadcastObject.currentChannel = videoBroadcastObject.getChannelConfig().currentChannel; + videoBroadcastObject.prevChannel(); + + } catch (error) { + console.log(error.message); + throw error; + } + var self = this; videoBroadcastObject.onPlayStateChange = function(state, error) { - - videoBroadcastObject.playstate = state; - if (error) { var errorText = self.error[error]; console.log("[TEST-RUNNING][Info] Id: vbTestPrevChannel, Label: Switch to precedent channel in channel list, State: Failure"); @@ -148,7 +167,7 @@ videoBroadcastObject.onChannelChangeSucceeded = function(channel) { if (self.assertNotNull(channel)) { console.log("[TEST-RUNNING][Info] Id: vbTestPrevChannel, Label: Switch to precedent channel in channel list, State: Successful"); - console.log(channel.name); + console.log(channel); resolve("Successfull"); } else { console.log("[TEST-RUNNING][Info] Id: vbTestPrevChannel, Label: Switch to precedent channel in channel list, State: Failure"); @@ -163,18 +182,22 @@ testNextChannel: function(resolve, reject) { console.log("***************************************************************************************************************************"); - console.log("[TEST-RUNNING][Info] Id: vbTestNextChannel, Label: Switch to next channel in channel list, State: Pending"); - var videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); - videoBroadcastObject.playstate = 2; - videoBroadcastObject.currentChannel = videoBroadcastObject.getChannelConfig().currentChannel; - videoBroadcastObject.nextChannel(); + try { + + var videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); + videoBroadcastObject.playstate = 2; + videoBroadcastObject.currentChannel = videoBroadcastObject.getChannelConfig().currentChannel; + videoBroadcastObject.nextChannel(); + + } catch (error) { + console.log(error.message); + throw error; + } + var self = this; videoBroadcastObject.onPlayStateChange = function(state, error) { - - videoBroadcastObject.playstate = state; - if (error) { var errorText = self.error[error]; console.log("[TEST-RUNNING][Info] Id: vbTestNextChannel, Label: Switch to next channel in channel list, State: Failure"); @@ -203,19 +226,18 @@ }; console.log("***************************************************************************************************************************"); - }, - verifWantedPlayState: function (currentObject, object,receivedPlayState, wantedPlayState) { + verifWantedPlayState: function (currentObject, receivedPlayState, wantedPlayState) { if (currentObject.assertEquals(receivedPlayState, wantedPlayState)) { - object.playstate = receivedPlayState; return true; + } else { console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Failure"); return [false, "Wrong play state changement."]; + } } - });

1 0

r938 - oipf/js/test
by ygrego＠users.nuiton.org 11 Mar '15

11 Mar '15

Author: ygrego Date: 2015-03-11 15:05:24 +0000 (Wed, 11 Mar 2015) New Revision: 938 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/938 Log: Modification of method "displayInLineArray" in order to display tests in line(test page), one line = one test. Modification of method "updateTestResult" in order to change color of test result field(in test page) according to test result and take account the lack of result from test execution because it can come from asynchronous methods. Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-03-11 14:48:12 UTC (rev 937) +++ oipf/js/test/Test.js 2015-03-11 15:05:24 UTC (rev 938) @@ -153,7 +153,19 @@ var testsObjects = this.testsObjects; content += "<div id=AllTestDiv>"; content += "<table id=AllTestTable>"; + content += "<tbody>"; + + content += "<thead>"; + content += "<tr>"; + content += "<th>Tested Method</th>"; + content += "<th>Label</th>"; + content += "<th>Test duration</th>"; + content += "<th>Result</th>"; + content += "<th>Lauching</th>"; + content += "</tr>"; + content += "</thead>"; + for (var i = 0; i < testsObjects.length; i++) { var currentObject = testsObjects[i]; @@ -164,15 +176,17 @@ var currentTest = tests[j]; content += "<tr id='" + currentTest["id"] + "'>"; - content += "<td>Tested method: " + currentTest["method"] + "</td>"; - content += "<td>Label: " + currentTest["label"] + "</td>"; - content += "<td id='" + currentTest["id"] + "Res'>Result: Test has not been launch.</td>"; + content += "<td>" + currentTest["method"] + "</td>"; + content += "<td>" + currentTest["label"] + "</td>"; + content += "<td id='" + currentTest["id"] + "Duration'>None</td>"; + content += "<td id='" + currentTest["id"] + "Result'>None</td>"; content += "<td><button id='" + currentTest["id"] + "Btn" + "'>Run</button></td>"; } content += "</tr>"; - content += "<tr><td></td><td></td><td></td><td></td></tr>"; //Make a seperation between 2 test section (VideoBroadcast and SearchManager for example) + content += "<tr><td></td><td></td><td></td><td></td><td></td></tr>"; //Make a seperation between 2 test section (VideoBroadcast and SearchManager for example) } content += "</tbody>"; + content += "</table>"; content += "</div>"; content += "</div>"; @@ -180,40 +194,47 @@ }, updateTestResult: function(currentTest, object) { - try { - var timeStart = performance.now(); - var promise = new Promise(object[currentTest["method"]].bind(object)); - var result = false; - - promise.then(function (val) { - result = true; - var timeEnd = performance.now(); - document.getElementById(currentTest["id"] + "Res").textContent = "Result: " + val + " Test-duration: " + (timeEnd - timeStart).toFixed(2) +" ms"; - }); - - promise.catch(function (val) { - result = true; - var timeEnd = performance.now(); - document.getElementById(currentTest["id"] + "Res").textContent = "Result: " + val + " Test-duration: " + (timeEnd - timeStart).toFixed(2) +" ms"; + var timeStart = performance.now(); + var promise = new Promise(object[currentTest["method"]].bind(object)); + var result = false; + + promise.then(function(val) { + result = true; + var timeEnd = performance.now(); + document.getElementById(currentTest["id"] + "Result").textContent = val; + var style = document.getElementById(currentTest["id"] + "Result").style; + style.backgroundColor = "limegreen"; + document.getElementById(currentTest["id"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; - }); - - setTimeout(function () { - console.log("HERE", timeStart); - if (!result) { + }); + + promise.catch(function(val) { + result = true; + var timeEnd = performance.now(); + document.getElementById(currentTest["id"] + "Result").textContent = val; + var style = document.getElementById(currentTest["id"] + "Result").style; + style.backgroundColor = "red"; + document.getElementById(currentTest["id"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; + + }); + + setTimeout(function() { + if (!result) { + try { var message = "Any result have been return."; var timeEnd = performance.now(); - document.getElementById(currentTest["id"] + "Res").textContent = "Result: " + message + " Test-duration: " + (timeEnd - timeStart).toFixed(2) +" ms"; + document.getElementById(currentTest["id"] + "Result").textContent = message; + var style = document.getElementById(currentTest["id"] + "Result").style; + style.backgroundColor = "red"; + document.getElementById(currentTest["id"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; throw new Error(message); - - } - }, 10000); - - } catch (error) { - console.log("[INFO]", error.message); - - } + } catch (error) { + console.log("[INFO]", error.message); + } + } + }, 10000); + } });

1 0

r937 - oipf/js/impl
by ygrego＠users.nuiton.org 11 Mar '15

11 Mar '15

Author: ygrego Date: 2015-03-11 14:48:12 +0000 (Wed, 11 Mar 2015) New Revision: 937 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/937 Log: Implementation method "_createAnyDvbChannelObject". Replacement of all methods calls on object "ChannelTools" by calls of javascript anonymous functions (but they stay the same about name and implementation). Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-11 14:34:47 UTC (rev 936) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-11 14:48:12 UTC (rev 937) @@ -423,17 +423,15 @@ if (CHANNEL_CREATION[idType]) { //Verify a channel of this idType (ID_DVB_SI_DIRECT = 13). - var channelTools = new ChannelTools(); - if (channelTools.isAValidTerrestrialDsd(dsd)) { //Verify the dsd validity. + if (isAValidTerrestrialDsd(dsd)) { //Verify the dsd validity. if ((sid >= 1) && (sid <= 65535)) { //Verify the rigth range of service id. var newChannel = new Channel(idType, dsd, sid, "localChannel" + createUUID()); var channelConfig = this.getChannelConfig(); - channelTools = new ChannelTools(); - if (!channelTools.getChannelByDsd(channelConfig.channelList, dsd)) { + if (getChannelByDsd(channelConfig.channelList, dsd)) { /* Normally channelList is readonly but the method documentation say * that the channel must be add if it not already present. @@ -495,9 +493,35 @@ * argument that SHALL be specified when the idType specifies a channel * of type ID_IPTV_SDS or ID_IPTV_URI and SHALL otherwise be ignored * by the OITF. + * + * Important : We place us into a world without error. And no validation will be done like + * this documentation mention it. This criterion not very useful in our implementation. */ _createAnyDvbChannelObject: function(idType, onid, tsid, sid, sourceID, ipBroadcastID) { + if (CHANNEL_CREATION[idType]) { + if (idType == 13 || idType ==0) { + return null; + } + + if (idType == 30) { + var equivalentChannel = this.getChannelConfig().channelList.getChannelBySourceID(sourceID); + } else if (idType == 40) { + equivalentChannel = getChannelByIpBroadcastID(ipBroadcastID); + } else { + equivalentChannel = this.getChannelConfig().channelList.getChannelByTriplet(onid, tsid, sid); + } + + if (equivalentChannel) { + var newChannel = new Channel(arguments.push(equivalentChannel.name)); + } else { + newChannel = new Channel(arguments.push("localChannel:"+createUUID())); + } + + this.getChannelConfig().channelList.push(newChannel); + } + + return null; }, /* @@ -731,9 +755,11 @@ //Find the previous channel into the current favourite list channelCollection = channelConfig.currentFavouriteLists; } - var _channelTools = new ChannelTools(); - var previousChannel = _channelTools.findChannel(channelCollection, object.currentChannel, step); - var tunerFound = _channelTools.verifyASuitableTunerAvailable(previousChannel.idType, object); + + var previousChannel = findChannel(channelCollection, object.currentChannel, step); + + var tunerFound = verifyASuitableTunerAvailable(previousChannel.idType, object); + if (tunerFound) { //ToDO: Error handling, if the switch fail, this instruction correspond to channel switch. object.currentChannel = previousChannel;

1 0