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

r1704 - oipf/lib/configuration
by ygrego＠users.nuiton.org 11 Jun '15

11 Jun '15

Author: ygrego Date: 2015-06-11 15:31:19 +0000 (Thu, 11 Jun 2015) New Revision: 1704 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1704 Log: Refactor this class in an ES6 class. Modified: oipf/lib/configuration/CapabilitiesProperties.js Modified: oipf/lib/configuration/CapabilitiesProperties.js =================================================================== --- oipf/lib/configuration/CapabilitiesProperties.js 2015-06-11 14:58:40 UTC (rev 1703) +++ oipf/lib/configuration/CapabilitiesProperties.js 2015-06-11 15:31:19 UTC (rev 1704) @@ -1,157 +1,164 @@ -/* - * The OITF SHALL support following non-visual embedded object with +/* + * The OITF SHALL support following non-visual embedded object with * the mime type application/oipfCapabilities. */ -var CapabilitiesProperties = Class.extend({ - defaultConfig: { - extraSDVideoDecodes: null, - extraHDVideoDecodes: null - }, - - baseUIProfileName: [ - "OITF_SDEU_UIPROF", - "OITF_SD60_UIPROF", - "OITF_SDUS_UIPROF", - "OITF_HD_UIPROF", - "OITF_FULL_HD_UIPROF" - ], - - UIProfileNameFragment: [ - "+TRICKMODE", - "+AVCAD", - "+DL", - "+IPTV_SDS", - "+IPTV_URI", - "+ANA", - "+DVB_C", - "+DVB_T", - "+DVB_S", - "+DVB_C2", - "+DVB_T2", - "+DVB_S2", - "+META_BCG", - "+META_EIT", - "+META_SI", - "+ITV_KEYS", - "+CONTROLLED", - "+PVR", - "+DRM", - "+CommunicationServices", - "+SVG", - "+POINTER", - "+WIDGETS", - "+HTML5_MEDIA", - "+RCF", - "+TELEPHONY", - "+VIDEOTELEPHONY" - ], - - profileNameMapping: { - "+DVB_T": "DVB", - "+META_EIT": "META" - /*"+AVCAD": "DVB", - "+IPTV_SDS": "DVB", - "+IPTV_URI": "DVB", - "+ANA": "DVB", - "+DVB_C": "DVB", - "+DVB_S": "DVB", - "+DVB_C2": "DVB", - "+DVB_T2": "DVB", - "+DVB_S2": "DVB", - "+META_BCG": "META", - "+META_SI": "META"*/ - }, - - roots: "profilelist", - - defaultCapabilities: { - "DVB": { - video_broadcast: { - value: true, - attributes: { - type: "ID_DVB_T ID_DVB_SI_DIRECT", - transport: "", - nrstreams: 1, - scaling: "arbitrary", - minSize: 0, - postList: false, - networkTimeshift: false, - localTimeshift: false +class CapabilitiesProperties { + + constructor() { + this.defaultConfig = { + extraSDVideoDecodes: null, + extraHDVideoDecodes: null + }; + + this.baseUIProfileName = [ + "OITF_SDEU_UIPROF", + "OITF_SD60_UIPROF", + "OITF_SDUS_UIPROF", + "OITF_HD_UIPROF", + "OITF_FULL_HD_UIPROF" + ]; + + this.UIProfileNameFragment = [ + "+TRICKMODE", + "+AVCAD", + "+DL", + "+IPTV_SDS", + "+IPTV_URI", + "+ANA", + "+DVB_C", + "+DVB_T", + "+DVB_S", + "+DVB_C2", + "+DVB_T2", + "+DVB_S2", + "+META_BCG", + "+META_EIT", + "+META_SI", + "+ITV_KEYS", + "+CONTROLLED", + "+PVR", + "+DRM", + "+CommunicationServices", + "+SVG", + "+POINTER", + "+WIDGETS", + "+HTML5_MEDIA", + "+RCF", + "+TELEPHONY", + "+VIDEOTELEPHONY" + ]; + + this.profileNameMapping = { + "+DVB_T": "DVB", + "+META_EIT": "META" + /*"+AVCAD": "DVB", + "+IPTV_SDS": "DVB", + "+IPTV_URI": "DVB", + "+ANA": "DVB", + "+DVB_C": "DVB", + "+DVB_S": "DVB", + "+DVB_C2": "DVB", + "+DVB_T2": "DVB", + "+DVB_S2": "DVB", + "+META_BCG": "META", + "+META_SI": "META"*/ + }; + + this.roots = "profilelist"; + + this.defaultCapabilities = { + "DVB": { + video_broadcast: { + value: true, + attributes: { + type: "ID_DVB_T ID_DVB_SI_DIRECT", + transport: "", + nrstreams: 1, + scaling: "arbitrary", + minSize: 0, + postList: false, + networkTimeshift: false, + localTimeshift: false + } } - } - }, - "OITF_SDEU_UIPROF": { - overlaylocaltuner: { - value: "per-pixel" - } - }, - "+PVR": { - recording: { - value: true, - attributes: { - ipBroadcast: false, - HAS: false, - DASH: false, - manageRecordings: "initiator", - postList: false + }, + "OITF_SDEU_UIPROF": { + overlaylocaltuner: { + value: "per-pixel" } - } - }, - META: { - clientMetadata: { - value: true, - attributes: { - type: "eit-pf" + }, + "+PVR": { + recording: { + value: true, + attributes: { + ipBroadcast: false, + HAS: false, + DASH: false, + manageRecordings: "initiator", + postList: false + } } + }, + META: { + clientMetadata: { + value: true, + attributes: { + type: "eit-pf" + } + } + }, + "+CONTROLLED": { + configurationChanges: { + value: true + } } - }, - "+CONTROLLED": { - configurationChanges: { - value: true - } - } - }, - - rearrangeDefaultProperties: function() { + }; + } + + + + rearrangeDefaultProperties() { var defaultProperties = {}; - + var defaultCapabilitiesKeys = Object.keys(this.defaultCapabilities); - + for (var i = 0, l = defaultCapabilitiesKeys.length; i < l; i++) { var currentKey = defaultCapabilitiesKeys[i]; var currentCapability = this.defaultCapabilities[currentKey]; var currentCapabilityKeysList = Object.keys(currentCapability); - + for (var j = 0, l1 = currentCapabilityKeysList.length; j < l1; j++) { var currentCapabilityKeys = currentCapabilityKeysList[j]; - defaultProperties[currentCapabilityKeys] = + defaultProperties[currentCapabilityKeys] = currentCapability[currentCapabilityKeys]; } } return defaultProperties; - }, - + } + /* * FIXME: * Yannis - 13/05/2015 - Achieved a more detailed verification on capability - * but it's not an obligation + * but it's not an obligation */ - hasCapablity: function(profileName) { + hasCapablity(profileName) { this.defaultCapabilities[profileName]; this.profileNameMapping[profileName]; - - return this.defaultCapabilities[profileName] || + + return this.defaultCapabilities[profileName] || this.profileNameMapping[profileName]; - }, - - searchAnAttributeValue: function(attributeValue) { - - }, - searchATagName: function(tagName) { - - }, - searchAValue: function(value) { - } -}); + searchAnAttributeValue(attributeValue) { + + } + + searchATagName(tagName) { + + } + + searchAValue(value) { + + } +} +

1 0

r1703 - oipf/lib/js/impl/model
by ygrego＠users.nuiton.org 11 Jun '15

11 Jun '15

Author: ygrego Date: 2015-06-11 14:58:40 +0000 (Thu, 11 Jun 2015) New Revision: 1703 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1703 Log: The property _searchManager has been moved on top of contructor because it will be used for the creation of another object. Modified: oipf/lib/js/impl/model/MetadataSearch.js Modified: oipf/lib/js/impl/model/MetadataSearch.js =================================================================== --- oipf/lib/js/impl/model/MetadataSearch.js 2015-06-11 14:41:38 UTC (rev 1702) +++ oipf/lib/js/impl/model/MetadataSearch.js 2015-06-11 14:58:40 UTC (rev 1703) @@ -97,6 +97,8 @@ class MetadataSearch { constructor(searchTarget, searchManager) { + + this._searchManager = searchManager; /* * Description : * The target(s) of the search. Valid values are: @@ -123,9 +125,6 @@ * Visibility Type: readonly SearchResults */ this.result = new SearchResults(this); - - - this._searchManager = searchManager; this._constraints = { channels: [], ratings: []

1 0

r1702 - oipf/lib/js/impl/model
by ygrego＠users.nuiton.org 11 Jun '15

11 Jun '15

Author: ygrego Date: 2015-06-11 14:41:38 +0000 (Thu, 11 Jun 2015) New Revision: 1702 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1702 Log: The element moved on top of contructor will be used for the creation of another object. Modified: oipf/lib/js/impl/model/MetadataSearch.js Modified: oipf/lib/js/impl/model/MetadataSearch.js =================================================================== --- oipf/lib/js/impl/model/MetadataSearch.js 2015-06-11 14:39:32 UTC (rev 1701) +++ oipf/lib/js/impl/model/MetadataSearch.js 2015-06-11 14:41:38 UTC (rev 1702) @@ -97,18 +97,7 @@ class MetadataSearch { constructor(searchTarget, searchManager) { - - this._currentQuery = null; - /* - * Description: - * The subset of search results that has been requested by the application. - * - * Visibility Type: readonly SearchResults - */ - this.result = new SearchResults(this); - - /* * Description : * The target(s) of the search. Valid values are: * @@ -125,6 +114,17 @@ */ this.searchTarget = searchTarget; + this._currentQuery = null; + + /* + * Description: + * The subset of search results that has been requested by the application. + * + * Visibility Type: readonly SearchResults + */ + this.result = new SearchResults(this); + + this._searchManager = searchManager; this._constraints = { channels: [],

1 0

r1701 - oipf/test/js
by ygrego＠users.nuiton.org 11 Jun '15

11 Jun '15

Author: ygrego Date: 2015-06-11 14:39:32 +0000 (Thu, 11 Jun 2015) New Revision: 1701 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1701 Log: Theses tests are dependent on tv's hardwares. Modified: oipf/test/js/TestConfig.js Modified: oipf/test/js/TestConfig.js =================================================================== --- oipf/test/js/TestConfig.js 2015-06-11 13:21:12 UTC (rev 1700) +++ oipf/test/js/TestConfig.js 2015-06-11 14:39:32 UTC (rev 1701) @@ -32,7 +32,7 @@ this.startEndStates = { "00": "unrealizedToUnrealized", - "01": "unrealizedToConnecting", +// "01": "unrealizedToConnecting", "12": "connectingToPresenting", "33": "stopToStop", "nullnull": "noStatesDefined" @@ -42,8 +42,17 @@ this.superBeforeTest = this.beforeTest; this.superOnChangeState = this.onChangeState; + } + testBindToCurrentChannelInStoppedWhenNoTuner(resolve, reject) { + reject("This test depend on tv's hardwares."); + } + + testBindToCurrentChannelWhenNoChannelPresentation(resolve, reject) { + reject("This test depend on tv's hardwares."); + } + onChangeState(resolve, reject, event) { this.superOnChangeState.call(this, resolve, reject, event.state, event.error);

1 0

r1700 - oipf/test/js
by ygrego＠users.nuiton.org 11 Jun '15

11 Jun '15

Author: ygrego Date: 2015-06-11 13:21:12 +0000 (Thu, 11 Jun 2015) New Revision: 1700 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1700 Log: These modifications are necessary in order to the classes 'RecordingSchedulerTest' and 'SearchManagerTest' can be redefined. Modified: oipf/test/js/RecordingSchedulerTest.js oipf/test/js/SearchManagerTest.js oipf/test/js/TestConfig.js Modified: oipf/test/js/RecordingSchedulerTest.js =================================================================== --- oipf/test/js/RecordingSchedulerTest.js 2015-06-11 13:08:57 UTC (rev 1699) +++ oipf/test/js/RecordingSchedulerTest.js 2015-06-11 13:21:12 UTC (rev 1700) @@ -4,7 +4,7 @@ * and open the template in the editor. */ -class RecordingSchedulerTest extends TestCase { +var RecordingSchedulerTest = class extends TestCase { constructor() { super(); @@ -532,6 +532,6 @@ this.transitions = []; this.previousState = null; } -} +}; Modified: oipf/test/js/SearchManagerTest.js =================================================================== --- oipf/test/js/SearchManagerTest.js 2015-06-11 13:08:57 UTC (rev 1699) +++ oipf/test/js/SearchManagerTest.js 2015-06-11 13:21:12 UTC (rev 1700) @@ -3,7 +3,7 @@ * This class gather a set of method necessary to test a search manager object. * */ -class SearchManagerTest extends TestCase { +var SearchManagerTest = class extends TestCase { constructor() { super(); @@ -682,4 +682,4 @@ this.vidBroadObj.bindToCurrentChannel(); } -} +}; Modified: oipf/test/js/TestConfig.js =================================================================== --- oipf/test/js/TestConfig.js 2015-06-11 13:08:57 UTC (rev 1699) +++ oipf/test/js/TestConfig.js 2015-06-11 13:21:12 UTC (rev 1700) @@ -28,7 +28,7 @@ constructor() { super(); - + console.log("VideoBroadcastManager constructor"); this.startEndStates = { "00": "unrealizedToUnrealized", @@ -69,11 +69,12 @@ } connectingToPresenting(begin, end, callback) { - /** + /* * Avoid that the future transition C->P be canceled. * More extend super method beforeTest in order to reset * 'startEndStates' property. */ + if (this.cancel) { callback && this.timeout().then(callback).then(console.log.bind(console, "TOTO")); this.cancel = false; @@ -120,21 +121,24 @@ this.pushTransitionWithError(begin, end, callback, error); } } + console.log("VideoBroadcastManager class defined."); - class VideoBroadcastTest extends VideoBroadcastManager { + var VideoBroadcastTest = class extends VideoBroadcastManager { constructor() { super(); } - } + }; - class SearchManagerTest extends SearchManagerTest { + console.log("VideoBroadcastTest class redefined."); + var SearchManagerTest = class extends SearchManagerTest { + constructor() { super(); - startEndStates = { + this.startEndStates = { "00": "unrealizedToUnrealized", "01": "unrealizedToConnecting", "12": "connectingToPresenting", @@ -161,11 +165,12 @@ } connectingToPresenting(begin, end, callback) { - /** + /* * Avoid that the future transition C->P be canceled. * More extend super method beforeTest in order to reset * 'startEndStates' property. */ + if (this.cancel) { callback && this.timeout().then(callback).then(console.log.bind(console, "TOTO")); this.cancel = false; @@ -199,9 +204,10 @@ addTransitionWithError(begin, end, callback, error) { this.pushTransitionWithError(begin, end, callback, error); } - } + }; + console.log("SearchManagerTest class redefined."); - class RecordingSchedulerTest extends RecordingSchedulerTest { + var RecordingSchedulerTest = class extends RecordingSchedulerTest { constructor() { super(); @@ -225,6 +231,7 @@ this.beforeTest(resolve, reject); } - } + }; + console.log("RecordingSchedulerTest class redefined."); }

1 0

r1699 - oipf/test/js
by ygrego＠users.nuiton.org 11 Jun '15

11 Jun '15

Author: ygrego Date: 2015-06-11 13:08:57 +0000 (Thu, 11 Jun 2015) New Revision: 1699 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1699 Log: Permit the redefinition of VideoBroadcastObject class. Modified: oipf/test/js/VideoBroadcastTest.js Modified: oipf/test/js/VideoBroadcastTest.js =================================================================== --- oipf/test/js/VideoBroadcastTest.js 2015-06-11 08:08:44 UTC (rev 1698) +++ oipf/test/js/VideoBroadcastTest.js 2015-06-11 13:08:57 UTC (rev 1699) @@ -3,8 +3,9 @@ * This class gather a set of method necessary to test a video broadcast object. * */ -class VideoBroadcastTest extends TestCase { +var VideoBroadcastTest = class extends TestCase { + constructor() { super(); this.channel = null; @@ -196,7 +197,11 @@ self.vidBroadObj.bindToCurrentChannel(); }); - this.addTransitionWithError(this.STOPPED, this.STOPPED, 0, resolve); + this.addTransitionWithError(this.STOPPED, this.STOPPED, 0, function() { + self.vidBroadObj._channelService.setCurrentChannel("ARTE"); + console.log("CurrentChannel", self.vidBroadObj.getChannelConfig().currentChannel.name); + resolve(); + }); this.vidBroadObj.bindToCurrentChannel(); } @@ -815,4 +820,5 @@ } -} +}; +

1 0

r1698 - oipf/test/js
by ygrego＠users.nuiton.org 11 Jun '15

11 Jun '15

Author: ygrego Date: 2015-06-11 08:08:44 +0000 (Thu, 11 Jun 2015) New Revision: 1698 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1698 Log: Respect the syntax imposed by the language. Modified: oipf/test/js/Test.js Modified: oipf/test/js/Test.js =================================================================== --- oipf/test/js/Test.js 2015-06-11 08:05:14 UTC (rev 1697) +++ oipf/test/js/Test.js 2015-06-11 08:08:44 UTC (rev 1698) @@ -7,7 +7,7 @@ constructor() { this.testsObjects = [{ - name : "OipfFactoryTest", + name: "OipfFactoryTest", object: new OipfFactoryTest(), tests: [ { @@ -171,7 +171,7 @@ method: "testCreateVideoMpegObject" } ]},{ - name : "VideoBroadcastTest", + name: "VideoBroadcastTest", object: new VideoBroadcastTest(), tests: [ {

1 0

r1697 - oipf/test/js
by ygrego＠users.nuiton.org 11 Jun '15

11 Jun '15

Author: ygrego Date: 2015-06-11 08:05:14 +0000 (Thu, 11 Jun 2015) New Revision: 1697 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1697 Log: The current channel was always undefined. Modified: oipf/test/js/VideoBroadcastTest.js Modified: oipf/test/js/VideoBroadcastTest.js =================================================================== --- oipf/test/js/VideoBroadcastTest.js 2015-06-11 07:37:03 UTC (rev 1696) +++ oipf/test/js/VideoBroadcastTest.js 2015-06-11 08:05:14 UTC (rev 1697) @@ -92,10 +92,14 @@ * @returns {undefined} */ testBindToCurrentChannelWhenNoChannelPresentation(resolve, reject) { + var self = this; //Subject to modification not rigth way failed on the tv plateform. this.vidBroadObj._channelService.currentChannel = null; - this.addTransitionWithError(this.UNREALIZED, this.UNREALIZED, 100, resolve); + this.addTransitionWithError(this.UNREALIZED, this.UNREALIZED, 100, function() { + self.vidBroadObj._channelService.setCurrentChannel("ARTE"); + resolve(); + }); this.vidBroadObj.bindToCurrentChannel(); }

1 0

r1696 - oipf/test/js
by ygrego＠users.nuiton.org 11 Jun '15

11 Jun '15

Author: ygrego Date: 2015-06-11 07:37:03 +0000 (Thu, 11 Jun 2015) New Revision: 1696 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1696 Log: Make tests about STOPPED state succeed. Modified: oipf/test/js/TestCase.js Modified: oipf/test/js/TestCase.js =================================================================== --- oipf/test/js/TestCase.js 2015-06-10 21:21:41 UTC (rev 1695) +++ oipf/test/js/TestCase.js 2015-06-11 07:37:03 UTC (rev 1696) @@ -10,6 +10,7 @@ this.UNREALIZED = videoBroadcastConstants.state.UNREALIZED; this.CONNECTING = videoBroadcastConstants.state.CONNECTING; this.PRESENTING = videoBroadcastConstants.state.PRESENTING; + this.STOPPED = videoBroadcastConstants.state.STOPPED; this.SCHEDULED = recordingConstants.state.SCHEDULED; this.STARTED = recordingConstants.state.STARTED; this.COMPLETED = recordingConstants.state.COMPLETED;

1 0

r1695 - oipf/test/view
by ygrego＠users.nuiton.org 10 Jun '15

10 Jun '15

Author: ygrego Date: 2015-06-10 21:21:41 +0000 (Wed, 10 Jun 2015) New Revision: 1695 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1695 Log: Use of gulp. Modified: oipf/test/view/test.html Modified: oipf/test/view/test.html =================================================================== --- oipf/test/view/test.html 2015-06-10 21:15:55 UTC (rev 1694) +++ oipf/test/view/test.html 2015-06-10 21:21:41 UTC (rev 1695) @@ -13,19 +13,8 @@ <link rel="stylesheet" type="text/css" href="./test/css/test.css"/> <script src="./lib/build/oipf-lib.js" type="text/javascript"></script> + <script src="./test/build/oipf-tests.js" type="text/javascript"></script> - <script src="./test/js/TestCase.js" type="text/javascript"></script> - <script src="./test/js/ApplicationManagerTest.js" type="text/javascript"></script> - <script src="./test/js/CapabilitiesTest.js" type="text/javascript"></script> - <script src="./test/js/ParentalControlManagerTest.js" type="text/javascript"></script> - <script src="./test/js/RecordingSchedulerTest.js" type="text/javascript"></script> - <script src="./test/js/ConfigurationTest.js" type="text/javascript"></script> - <script src="./test/js/SearchManagerTest.js" type="text/javascript"></script> - <script src="./test/js/VideoBroadcastTest.js" type="text/javascript"></script> - <script src="./test/js/OipfFactoryTest.js" type="text/javascript"></script> - <script src="./test/js/TestConfig.js" type="text/javascript"></script> - <script src="./test/js/Test.js" type="text/javascript"></script> - <script> var tests = new Test(); var displayConfig = {

1 0