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

r804 - oipf/js/test
by ygrego＠users.nuiton.org 13 Feb '15

13 Feb '15

Author: ygrego Date: 2015-02-13 16:53:08 +0000 (Fri, 13 Feb 2015) New Revision: 804 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/804 Log: Addition of "VideoBroadcastTest.js". Added: oipf/js/test/VideoBroadcastTest.js Added: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js (rev 0) +++ oipf/js/test/VideoBroadcastTest.js 2015-02-13 16:53:08 UTC (rev 804) @@ -0,0 +1,43 @@ +/* + * Description: + * This class gather a set of method necessary to test a video broadcast object. + * + */ +var VideoBroadcastTest = Class.extend({ + + + videoBroadcastObject: null, + + init: function() { + }, + + /* + * Descrtiption: + * This method test the initialization of video broadcast object. + */ + instanceCreation: function() { + var METHOD_NAME = "instanceCreation"; + var ID = INSTANCE_CREATION_TEST_CONSTANTS+" :VB"; + var state = "Pending"; + console.log("[TEST-RUNNING][Info] "+"Id: "+ID+", Label: "+INSTANCE_CREATION_TEST_CONSTANTS+", State: "+state); + this.videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); + if ((this.videoBroadcastObject !== null) && (this.videoBroadcastObject !== undefined)) { + + var result = "Success"; + } else { + result = "Failed"; + } + state = "Finished"; + console.log("[TEST-RUNNING][Info] "+"Id: "+ID+", Label: "+this.INSTANCE_CREATION+", State: "+state); + + var testCase = [{ + "id" : ID, + "label" : this.INSTANCE_CREATION, + "method" : METHOD_NAME, + "result" : result + }]; + + return testCase; + } + +}); \ No newline at end of file

1 0

r803 - oipf/js/test
by ygrego＠users.nuiton.org 13 Feb '15

13 Feb '15

Author: ygrego Date: 2015-02-13 16:52:08 +0000 (Fri, 13 Feb 2015) New Revision: 803 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/803 Log: Addition of "SearchManagerTest.js". Added: oipf/js/test/SearchManagerTest.js Added: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js (rev 0) +++ oipf/js/test/SearchManagerTest.js 2015-02-13 16:52:08 UTC (rev 803) @@ -0,0 +1,111 @@ +/* + * Description: + * This class gather a set of method necessary to test a search manager object. + * + */ +var SearchManagerTest = Class.extend({ + + searchManagerTest: null, + + init: function() { + + }, + + instanceCreation: function() { + var METHOD_NAME = "instanceCreation"; + var ID = INSTANCE_CREATION_TEST_CONSTANTS+" :SM"; + var state = "Pending"; + console.log("[TEST-RUNNING][Info] "+"Id: "+ID+", Label: "+INSTANCE_CREATION_TEST_CONSTANTS+", State: "+state); + this.searchManagerTest = oipfObjectFactory.createSearchManagerObject(); + if ((this.videoBroadcastObject !== null) && (this.videoBroadcastObject !== undefined)) { + + var result = "Success"; + } else { + result = "Failed"; + } + state = "Finished"; + console.log("[TEST-RUNNING][Info] "+"Id: "+ID+", Label: "+this.INSTANCE_CREATION+", State: "+state); + + var testCase = [{ + "id" : ID, + "label" : this.INSTANCE_CREATION, + "method" : METHOD_NAME, + "result" : result + }]; + + return testCase; + }, + + getCurrentProgram: function(searchTarget, channel, startTime, offset, count) { + + var searchManagerObject = oipfObjectFactory.createSearchManagerObject(); + var METHOD_NAME = "instanceCreation"; + var ID = GET_CURR_PROG_TEST_CONSTANTS+" :SM"; + var state = "Pending"; + console.log("[TEST-RUNNING][Info] "+"Id: "+ID+", Label: "+INSTANCE_CREATION_TEST_CONSTANTS+", State: "+state); + searchManagerObject.onMetadataSearch = function(search, state) { + + console.log("[INFO]: onMetadataSearch called"); + + switch(state) { + + case 0: + + console.log("[INFO] Result found."); + console.log(search.result[0]); + for (var i = 0; i< search.result.length; i++) { + var obj = search.result[i]; + console.log(obj); + var keys = Object.keys(obj); + console.log(keys); + //for (var j = 0; j< keys.length; j++) { + for (keys in obj){ + if (obj[keys] instanceof Object) { + + continue; + } + ////Test kind of obj + var h2 = document.createElement("H2"); + var t = document.createTextNode(keys); + h2.appendChild(t); + document.getElementById("prog").appendChild(h2); + var hr = document.createElement("HR"); + var p = document.createElement("P"); + t = document.createTextNode(obj[keys]); + p.appendChild(t); + document.getElementById("prog").appendChild(p); + document.getElementById("prog").appendChild(hr); + //break; + } + break; + } + document.getElementById("prog").style.visibility = "visible"; + + 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; + + default: + console.log("Unknow state"); + + } + }; + var channelConfig = oipfObjectFactory.createChannelConfig(); + var metaDataSearch = searchManagerObject.createSearch(searchTarget); + metaDataSearch.findProgrammesFromStream(channelConfig.currentChannel, startTime); + metaDataSearch.result.getResults(offset, count); + metaDataSearch.result[0];//Must return undefined else wrong behaviour of this method + } + +}); +

1 0

r802 - oipf/js/impl/model/constants
by ygrego＠users.nuiton.org 13 Feb '15

13 Feb '15

Author: ygrego Date: 2015-02-13 16:49:58 +0000 (Fri, 13 Feb 2015) New Revision: 802 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/802 Log: Addition of "TestConstants" will contain somes constants for tests. Added: oipf/js/impl/model/constants/TestConstants.js Added: oipf/js/impl/model/constants/TestConstants.js =================================================================== --- oipf/js/impl/model/constants/TestConstants.js (rev 0) +++ oipf/js/impl/model/constants/TestConstants.js 2015-02-13 16:49:58 UTC (rev 802) @@ -0,0 +1,2 @@ +INSTANCE_CREATION_TEST_CONSTANTS = "Object creation"; +

1 0

r801 - oipf/view
by ygrego＠users.nuiton.org 13 Feb '15

13 Feb '15

Author: ygrego Date: 2015-02-13 16:17:18 +0000 (Fri, 13 Feb 2015) New Revision: 801 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/801 Log: Refactoring pathname of "VideoBroadcastConstants.js". Modified: oipf/view/welcome.html Modified: oipf/view/welcome.html =================================================================== --- oipf/view/welcome.html 2015-02-13 16:08:50 UTC (rev 800) +++ oipf/view/welcome.html 2015-02-13 16:17:18 UTC (rev 801) @@ -6,7 +6,7 @@ <script src="../js/lib/Collection.js" type="text/javascript"></script> <script src="../data/data.js" type="text/javascript"></script> <script src="../js/impl/model/Query.js" type="text/javascript"></script> - <script src="../js/impl/model/VideoBroadcastConstants.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>

1 0

r800 - in oipf/js/impl/model: . constants
by ygrego＠users.nuiton.org 13 Feb '15

13 Feb '15

Author: ygrego Date: 2015-02-13 16:08:50 +0000 (Fri, 13 Feb 2015) New Revision: 800 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/800 Log: Folder addition named "constants" to store files containing globals constants and move of "VideoBroadcastConstants" to this new folder. Added: oipf/js/impl/model/constants/ oipf/js/impl/model/constants/VideoBroadcastConstants.js Removed: oipf/js/impl/model/VideoBroadcastConstants.js Deleted: oipf/js/impl/model/VideoBroadcastConstants.js =================================================================== --- oipf/js/impl/model/VideoBroadcastConstants.js 2015-02-13 14:27:24 UTC (rev 799) +++ oipf/js/impl/model/VideoBroadcastConstants.js 2015-02-13 16:08:50 UTC (rev 800) @@ -1,2 +0,0 @@ -STATIC_ALLOCATION_VIDEOBROADCAST = 1; -DYNAMIC_ALLOCATION_VIDEOBROADCAST = 2; \ No newline at end of file Copied: oipf/js/impl/model/constants/VideoBroadcastConstants.js (from rev 794, oipf/js/impl/model/VideoBroadcastConstants.js) =================================================================== --- oipf/js/impl/model/constants/VideoBroadcastConstants.js (rev 0) +++ oipf/js/impl/model/constants/VideoBroadcastConstants.js 2015-02-13 16:08:50 UTC (rev 800) @@ -0,0 +1,2 @@ +STATIC_ALLOCATION_VIDEOBROADCAST = 1; +DYNAMIC_ALLOCATION_VIDEOBROADCAST = 2; \ No newline at end of file

1 0

r799 - oipf/view/css
by ygrego＠users.nuiton.org 13 Feb '15

13 Feb '15

Author: ygrego Date: 2015-02-13 14:27:24 +0000 (Fri, 13 Feb 2015) New Revision: 799 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/799 Log: Style changement for element with id "video-broadcast" and "#prog". Modified: oipf/view/css/style.css Modified: oipf/view/css/style.css =================================================================== --- oipf/view/css/style.css 2015-02-13 14:25:06 UTC (rev 798) +++ oipf/view/css/style.css 2015-02-13 14:27:24 UTC (rev 799) @@ -5,16 +5,25 @@ background-position: center; } -#center { - - margin-left: auto; - margin-right: auto; - width: 20%; - vertical-align: middle; -} - #video-broadcast { + position: absolute; + z-index: -1; background-image: url("../img/video-broadcast.jpg"); background-size: cover; background-repeat: no-repeat; + margin-left: 11%; + height: 90%; + width: 60%; +} + +#prog { + z-index: 2; + background-color:gray; + height: 40%; + width: 40%; + color:white; + margin-left: 20%; + margin-right: 40%; + overflow-y: auto; + visibility: hidden; } \ No newline at end of file

1 0

r798 - oipf/js/impl/model
by ygrego＠users.nuiton.org 13 Feb '15

13 Feb '15

Author: ygrego Date: 2015-02-13 14:25:06 +0000 (Fri, 13 Feb 2015) New Revision: 798 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/798 Log: Deletion of duplicated variables and addition of javascript operators: "===", "!==". Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-02-13 14:21:13 UTC (rev 797) +++ oipf/js/impl/model/SearchResults.js 2015-02-13 14:25:06 UTC (rev 798) @@ -87,8 +87,8 @@ item = channels[i]; displayName = item[displayNameStr]; - if (displayName == this._currentQuery.channel.name) { - currentChannelId = item[idStr] + if (displayName === this._currentQuery.channel.name) { + currentChannelId = item[idStr]; break; } } @@ -105,7 +105,7 @@ for (var i = 0; i< programs.length; i++) { var item = programs[i]; - if (item[channelStr] == currentChannelId) { // && date + if (item[channelStr] === currentChannelId) { // && date var tmpSSTime = item[startStr]; tmpSSTime = pattern.exec(tmpSSTime); @@ -128,9 +128,6 @@ tmpSSTime = pattern.exec(tmpSSTime); console.log(tmpSSTime); - year = dateTmp.getFullYear(); - month = dateTmp.getUTCMonth(); - day = dateTmp.getUTCDate(); hs = parseInt(tmpSSTime[4]); mins = parseInt(tmpSSTime[5]); secs = parseInt(tmpSSTime[6]); @@ -170,9 +167,9 @@ // console.log(this._search); var self = this; setTimeout(function() { - console.log("<<<<<<<<<<<<<<", new Date(), ">>>>>>>>>>>>>>>>"); + console.log("<<<<<<<<<<<<<<", new Date(), ">>>>>>>>>>>>>>>>", currentProgramIndex); //When user want more than one result into his search. - if (currentProgramIndex) { + if (currentProgramIndex !== undefined) { for (var i = 0; i < count; i++) { self.push(programs[currentProgramIndex]); currentProgramIndex++;

1 0

r797 - oipf/js/impl
by ygrego＠users.nuiton.org 13 Feb '15

13 Feb '15

Author: ygrego Date: 2015-02-13 14:21:13 +0000 (Fri, 13 Feb 2015) New Revision: 797 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/797 Log: Setting of the approprieted documentation for method "prevChannel". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-02-13 14:18:03 UTC (rev 796) +++ oipf/js/impl/VideoBroadcastObject.js 2015-02-13 14:21:13 UTC (rev 797) @@ -146,7 +146,7 @@ */ } else { - this.allocationMethod = DYNAMIC_ALLOCATION_VIDEOBROADCAST + this.allocationMethod = DYNAMIC_ALLOCATION_VIDEOBROADCAST; } }, @@ -378,12 +378,36 @@ /* * Description: - * The function that is called when a request to switch a tuner to another channel has successfully completed. - * This function may be called either in response to a channel change initiated by the application, or a channel - * change initiated by the OITF (see section 7.13.1.1). The specified function is called with argument channel, - * which is defined as follows: + * Requests the OITF to switch the tuner that is currently in use by the video/broadcast + * object to the channel that precedes the current channel in the active favourite list, or, if no + * favourite list is currently selected, to the previous channel in the channel list. If it has reached + * the start of the favourite/channel list, it SHALL cycle to the last channel in the list. * - * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). + * If the current channel is not part of the channel list, it is implementation dependent whether + * the method call succeeds or fails and, if it succeeds, which channel is selected. In both + * cases, all appropriate functions SHALL be called and DOM events dispatched. + * + * TODO: Actually,this specific case will not be taken into consideration. + * If the previous channel is a channel that cannot be received over the tuner currently used by + * the video/broadcast object, the OITF SHALL relay the channel switch request to a local + * physical or logical tuner that is not in use and that can tune to the specified channel. The + * behaviour is defined in more detail in the description of the setChannel method. + * + * If an error occurs during switching to the previous channel, the OITF SHALL trigger the + * function specified by the onChannelChangeError property with the appropriate channel + * and errorState value, and dispatch the corresponding DOM event (see below). + * + * If the OITF does not maintain the channel list and favourite list by itself, the request SHALL + * fail and the OITF SHALL trigger the onChannelChangeError function with the channel + * property having the value null , and errorState=10 (“channel cannot be changed by + * nextChannel()/prevChannel() methods”). + * + * If successful, the OITF SHALL trigger the function specified by the + * onChannelChangeSucceeded property with the appropriate channel value, and also + * dispatch the corresponding DOM event. + * Calls to this method are valid in the Connecting, Presenting and Stopped states. They are + * not valid in the Unrealized state and SHALL fail. + * */ prevChannel: function() {

1 0

r796 - oipf/view
by ygrego＠users.nuiton.org 13 Feb '15

13 Feb '15

Author: ygrego Date: 2015-02-13 14:18:03 +0000 (Fri, 13 Feb 2015) New Revision: 796 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/796 Log: Addition of file "VideoBroadcastConstants.js" in her sources files and a new tag "div" in her body. Modified: oipf/view/welcome.html Modified: oipf/view/welcome.html =================================================================== --- oipf/view/welcome.html 2015-02-13 14:13:36 UTC (rev 795) +++ oipf/view/welcome.html 2015-02-13 14:18:03 UTC (rev 796) @@ -6,6 +6,7 @@ <script src="../js/lib/Collection.js" type="text/javascript"></script> <script src="../data/data.js" type="text/javascript"></script> <script src="../js/impl/model/Query.js" type="text/javascript"></script> + <script src="../js/impl/model/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> @@ -44,8 +45,9 @@ <div id="center"> <object id="video-broadcast" is="video-broadcast"></object> </div> - - + <div id="prog"> + <h2 style="text-align: center">Info</h2> + </div> </body> </html> \ No newline at end of file

1 0

r795 - oipf/js/test
by ygrego＠users.nuiton.org 13 Feb '15

13 Feb '15

Author: ygrego Date: 2015-02-13 14:13:36 +0000 (Fri, 13 Feb 2015) New Revision: 795 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/795 Log: Displaying information of searched program into method testGetCurrentProgram Modified: oipf/js/test/test.js Modified: oipf/js/test/test.js =================================================================== --- oipf/js/test/test.js 2015-02-12 11:24:55 UTC (rev 794) +++ oipf/js/test/test.js 2015-02-13 14:13:36 UTC (rev 795) @@ -84,6 +84,35 @@ console.log("[INFO] Result found."); console.log(search.result[0]); + //for (var keys = Object.keys(search.result) in search.result) { + for (var i = 0; i< search.result.length; i++) { + var obj = search.result[i]; + console.log(obj); + var keys = Object.keys(obj); + console.log(keys); + //for (var j = 0; j< keys.length; j++) { + for (keys in obj){ + if (obj[keys] instanceof Object) { + + continue; + } + ////Test kind of obj + var h2 = document.createElement("H2"); + var t = document.createTextNode(keys); + h2.appendChild(t); + document.getElementById("prog").appendChild(h2); + var hr = document.createElement("HR"); + var p = document.createElement("P"); + t = document.createTextNode(obj[keys]); + p.appendChild(t); + document.getElementById("prog").appendChild(p); + document.getElementById("prog").appendChild(hr); + //break; + } + break; + } + document.getElementById("prog").style.visibility = "visible"; + break; case 3:

1 0