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

r966 - oipf/view
by ygrego＠users.nuiton.org 24 Mar '15

24 Mar '15

Author: ygrego Date: 2015-03-24 12:14:41 +0000 (Tue, 24 Mar 2015) New Revision: 966 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/966 Log: A new javascript source file has been added: "OipfFactoryTest.js" Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-03-24 10:26:35 UTC (rev 965) +++ oipf/view/test.html 2015-03-24 12:14:41 UTC (rev 966) @@ -37,6 +37,7 @@ <script src="../js/test/TestCase.js" type="text/javascript"></script> <script src="../js/test/SearchManagerTest.js" type="text/javascript"></script> <script src="../js/test/VideoBroadcastTest.js" type="text/javascript"></script> + <script src="../js/test/OipfFactoryTest.js" type="text/javascript"></script> <script src="../js/test/Test.js" type="text/javascript"></script> <script src="../data/data.js" type="text/javascript"></script> <script src="../js/initObj/init.js" type="text/javascript"></script>

1 0

r965 - oipf/js/test
by ygrego＠users.nuiton.org 24 Mar '15

24 Mar '15

Author: ygrego Date: 2015-03-24 10:26:35 +0000 (Tue, 24 Mar 2015) New Revision: 965 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/965 Log: Addition of test class about oipf object factory. Added: oipf/js/test/OipfFactoryTest.js Added: oipf/js/test/OipfFactoryTest.js =================================================================== --- oipf/js/test/OipfFactoryTest.js (rev 0) +++ oipf/js/test/OipfFactoryTest.js 2015-03-24 10:26:35 UTC (rev 965) @@ -0,0 +1,123 @@ +/* + * 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 OipfFactoryTest = TestCase.extend({ + + oipfObjectFactory: null, + + init: function() { + this.oipfObjectFactory = new OipfObjectFactory(); + }, + + verifyObjectImplementation: function(methodName, resolve, reject) { + var method = this.oipfObjectFactory[methodName]; + + if(method) { + var object = method(); + + if(this.assertNotNull(object)){ + resolve(); + } else { + reject("The object is null."); + } + } else { + reject("Object not Implemented."); + } + }, + + beforeTest: function(resolve, reject) { + this.verifyObjectImplementation = this.verifyObjectImplementation(resolve, reject); + }, + + testCreateApplicationManagerObject: function(resolve, reject) { + this.verifyObjectImplementation("createApplicationManagerObject"); + }, + + testCreateCapabilitiesObject: function(resolve, reject) { + this.verifyObjectImplementation("createCapabilitiesObject"); + }, + + testCreateChannelConfig: function(resolve, reject) { + this.verifyObjectImplementation("createChannelConfig"); + }, + + testCreateCodManagerObject: function(resolve, reject) { + this.verifyObjectImplementation("createCodManagerObject"); + }, + + testCreateConfigurationObject: function(resolve, reject) { + this.verifyObjectImplementation("createConfigurationObject"); + }, + + testCreateDownloadManagerObject: function(resolve, reject) { + this.verifyObjectImplementation("createDownloadManagerObject"); + }, + + testCreateDownloadTriggerObject: function(resolve, reject) { + this.verifyObjectImplementation("createDownloadTriggerObject"); + }, + + testCreateDrmAgentObject: function(resolve, reject) { + this.verifyObjectImplementation("createDrmAgentObject"); + }, + + testCreateGatewayInfoObject: function(resolve, reject) { + this.verifyObjectImplementation("createGatewayInfoObject"); + }, + + testCreateImsObject: function(resolve, reject) { + this.verifyObjectImplementation("createImsObject"); + }, + + testCreateIsObjectSupported: function(resolve, reject) { + if( this.oipfObjectFactory.isObjectSupported) { + resolve(); + } else { + reject(); + } + }, + + testCreateMdtfObject: function(resolve, reject) { + this.verifyObjectImplementation("createMdtfObject"); + }, + + testCreateNotifSocketObject: function(resolve, reject) { + this.verifyObjectImplementation("createNotifSocketObject"); + }, + + testCreateParentalControlManagerObject: function(resolve, reject) { + this.verifyObjectImplementation("createParentalControlManagerObject"); + }, + + testCreateRecordingSchedulerObject: function(resolve, reject) { + this.verifyObjectImplementation("createRecordingSchedulerObject"); + }, + + testCreateRemoteControlFunctionObject: function(resolve, reject) { + this.verifyObjectImplementation("createRemoteControlFunctionObject"); + }, + + testCreateRemoteManagementObject: function(resolve, reject) { + this.verifyObjectImplementation("createRemoteManagementObject"); + }, + + testCreateSearchManagerObject: function(resolve, reject) { + this.verifyObjectImplementation("createSearchManagerObject"); + }, + + testCreateStatusViewObject: function(resolve, reject) { + this.verifyObjectImplementation("createStatusViewObject"); + }, + + testCreateVideoBroadcastObject: function(resolve, reject) { + this.verifyObjectImplementation("createVideoBroadcastObject"); + }, + + testCreateVideoMpegObject: function() { + this.verifyObjectImplementation("createVideoMpegObject"); + } + +});

1 0

r964 - oipf/js/test
by ygrego＠users.nuiton.org 23 Mar '15

23 Mar '15

Author: ygrego Date: 2015-03-23 16:57:00 +0000 (Mon, 23 Mar 2015) New Revision: 964 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/964 Log: Deletion of field "callBeforeAnyTest" into property "testsObjects". Addition of method "runLoop" in order to launch a set of test in sequence and "run" which perform one test exactly. Modification of method "runAll" which call method "runLoop". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-03-23 16:40:51 UTC (rev 963) +++ oipf/js/test/Test.js 2015-03-23 16:57:00 UTC (rev 964) @@ -7,11 +7,10 @@ testsObjects: [{ name : "VideoBroadcastTest", object: new VideoBroadcastTest(), - callBeforeAnyTest : "beforeAnyTest", tests: [ { label: "Video broadcast creation.", - method: "testVideoBroadcastInit" + method: "testBind2Stop" }, { label: "Bind the current channel stream with a video broadcast object.", @@ -36,7 +35,6 @@ ]},{ name: "SearchManagerTest", object: new SearchManagerTest(), - callBeforeAnyTest : "beforeAnyTest", tests: [ { label: "Search manager creation.", @@ -54,21 +52,36 @@ }, runAll: function() { - for (var i = 0; i < this.testsObjects.length; i++) { - var element = this.testsObjects[i]; - - var object = element["object"]; - - var tests = element["tests"]; - - for (var j = 0; j < tests.length; j++) { - var currentTest = tests[j]; - this.updateTestResult(currentTest, object, element["callBeforeAnyTest"]); - + this.runLoop(0, 0); + }, + + runLoop: function(indexObject, indexTest) { + var element = this.testsObjects[indexObject]; + var object = element.object; + var tests = element.tests; + + var self = this; + var loop = function() { + if (indexTest < tests.length - 1) { + self.runLoop(indexObject, indexTest + 1); + + } else if (indexObject < self.testsObjects.length -1) { + self.runLoop(indexObject + 1, 0); } - } + }; + + this.updateTestResult(tests[indexTest], object) + .then(loop).catch(loop); }, + run: function(indexObject, indexTest) { + var element = this.testsObjects[indexObject]; + var object = element.object; + var tests = element.tests; + + return this.updateTestResult(tests[indexTest], object); + }, + displayInLineArray: function() { var content = "<div id='testsDisplay'>Test Page <button id='runAllBtn'>Run All</button>"; var testsObjects = this.testsObjects; @@ -111,51 +124,45 @@ document.body.innerHTML = content; }, - updateTestResult: function(currentTest, object, methodToCallBeforeAnyTest) { + updateTestResult: function(currentTest, object) { console.group(currentTest["label"]); var timeStart = performance.now(); - var result = false; - object[methodToCallBeforeAnyTest](); - - new Promise(object[currentTest["method"]].bind(object)) + var self = this; + + return new Promise(function(resolve, reject) { + try { + object.beforeTest && object.beforeTest(resolve, reject); + object[currentTest["method"]](resolve, reject); + timeout(5000).then(reject("No result returned.")); + } catch (error) { + reject(error); + } + }) .then(function(val) { console.groupEnd(currentTest["label"]); - result = true; var timeEnd = performance.now(); - document.getElementById(currentTest["method"] + "Result").textContent = val; - document.getElementById(currentTest["method"] + "Result").style.backgroundColor = "limegreen"; - document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; + self.updateTestResultSuccess(timeStart, timeEnd, currentTest, val); }) .catch(function(val) { console.log(val); console.groupEnd(currentTest["label"]); - result = true; var timeEnd = performance.now(); - document.getElementById(currentTest["method"] + "Result").textContent = val; - document.getElementById(currentTest["method"] + "Result").style.backgroundColor = "red"; - document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; + self.updateTestResultError(timeStart, timeEnd, currentTest, val); }); - - var afterTimeOver = function() { - if (!result) { - try { - var message = "Any result have been return."; - var timeEnd = performance.now(); - document.getElementById(currentTest["method"] + "Result").textContent = message; - document.getElementById(currentTest["method"] + "Result").style.backgroundColor = "red"; - document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; - throw new Error(message); - } catch (error) { - console.log("[INFO]", error.message); - console.groupEnd(currentTest["label"]); - } - } - }; - - timeout(5000) - .then(afterTimeOver.bind(afterTimeOver)); - + }, + + updateTestResultSuccess: function(timeStart, timeEnd, currentTest, message) { + document.getElementById(currentTest["method"] + "Result").textContent = message || "Success"; + document.getElementById(currentTest["method"] + "Result").style.backgroundColor = "limegreen"; + document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; +}, + + updateTestResultError: function(timeStart, timeEnd, currentTest, message) { + document.getElementById(currentTest["method"] + "Result").textContent = message || "Error"; + document.getElementById(currentTest["method"] + "Result").style.backgroundColor = "red"; + document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; } + });

1 0

r963 - oipf/js/test
by ygrego＠users.nuiton.org 23 Mar '15

23 Mar '15

Author: ygrego Date: 2015-03-23 16:40:51 +0000 (Mon, 23 Mar 2015) New Revision: 963 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/963 Log: Global refactoring of class about transition verification in each method of test execpted for ("beforeTest" and "testVideoBroadcastInit" ). By using of new methods "onChange (which verify each transition), "addTransition" and "addTransitionWithError". Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-03-20 14:53:32 UTC (rev 962) +++ oipf/js/test/VideoBroadcastTest.js 2015-03-23 16:40:51 UTC (rev 963) @@ -4,240 +4,229 @@ * */ var VideoBroadcastTest = TestCase.extend({ - error: { + + UNREALIZED: 0, + + CONNECTING: 1, + + PRESENTING: 2, + + STOPPED: 3, + + vidBroadObj: null, + + errorMap: { - 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 () { + init: function() { + }, + beforeTest: function(resolve, reject) { + this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); + this.vidBroadObj.addEventListener("PlayStateChange", this.onChangeState.bind(this, resolve, reject)); + this.transitions = []; + this.previousState = this.vidBroadObj.playState; + this.currentIndex = 0; + logTest("State: Pending"); + }, + + onChangeState: function(resolve, reject, newState, errorCode) { + var currentTransition = this.transitions[this.currentIndex]; + var begin = currentTransition.begin; + var end = currentTransition.end; + var error = currentTransition.error; + console.log(this.vidBroadObj.playState); + if (begin == this.previousState && end == newState && error == errorCode) { + currentTransition.callback && currentTransition.callback(); + + this.previousState = newState; + this.currentIndex++; + + } else { + reject("Invalid state"); + } + }, + + addTransition: function(begin, end, callback) { + this.addTransitionWithError(begin, end, null, callback); + }, + + addTransitionWithError: function(begin, end, error, callback) { + this.transitions.push({ + begin: begin, + end: end, + error: error, + callback: callback + }); + }, + /* * 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"); - - 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"); - } - console.log("***************************************************************************************************************************"); - } catch (error) { - console.log(error.message, "Here"); - throw error; + testVideoBroadcastInit: function (resolve, reject) { + + if (this.assertNotNull(this.vidBroadObj) && this.assertNotUndefined(this.vidBroadObj)) { + logTest("State: Successfull"); + resolve("Successfull"); + } else { + logTest("State: Failure"); + reject("Failure"); } }, + testBind2Stop : function (resolve, reject){ + var self = this; + + this.addTransition(this.UNREALIZED, this.CONNECTING, function() { + self.vidBroadObj.bindToCurrentChannel(); + }); + + this.addTransition(this.CONNECTING, this.PRESENTING, resolve); + + this.vidBroadObj.bindToCurrentChannel(); + }, /* * 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"); - - try { - - var videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); - var currentChann = videoBroadcastObject.bindToCurrentChannel(); - - } catch (error) { - console.log(error.message); - throw error; - } - + testBindToCurrentChannel: function(resolve, reject) { var self = this; - videoBroadcastObject.onPlayStateChange = function(state, error) { - var wantedPlayState; - var VerifWantedPlayStateRes; - switch (videoBroadcastObject.playstate) { - - case 0: - wantedPlayState = 2; - VerifWantedPlayStateRes = self.verifWantedPlayState(self, state, wantedPlayState); - //TODO Verification of binding to the necesssary ressources have achieved with success. - break; - - case 1: - - break; - - case 2: - - break; - - case 3: - wantedPlayState = 1; - 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]; - } - - 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"); - success = 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"); - success = false; - errorBind = " In binding to current channel."; - } - - if (error || (!success)) { - var errorText = self.error[error]; - reject("Failure:" + errorBind + " " + errorText + " " + errorPlayState); - } else { - resolve("Successfull"); - } - console.log("***************************************************************************************************************************"); - - }; - + this.addTransition(this.UNREALIZED, this.CONNECTING, function() { + self.vidBroadObj.bindToCurrentChannel(); + }); + + this.addTransition(this.CONNECTING, this.PRESENTING, resolve); + + this.vidBroadObj.bindToCurrentChannel(); }, - testPrevChannel: function(resolve, reject) { - console.log("***************************************************************************************************************************"); - console.log("[TEST-RUNNING][Info] Id: vbTestPrevChannel, Label: Switch to precedent channel in channel list, State: Pending"); + testBindToCurrentChannelInConnecting : function(resolve, reject) { + var self = this; + + this.addTransition(this.UNREALIZED, this.CONNECTING, function() { + self.vidBroadObj.bindToCurrentChannel(); + }); - try { - - var videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); - videoBroadcastObject.playstate = 2; - videoBroadcastObject.currentChannel = videoBroadcastObject.getChannelConfig().currentChannel; - videoBroadcastObject.prevChannel(); - - } catch (error) { - console.log(error.message); - throw error; - } + this.addTransition(this.CONNECTING, this.PRESENTING, resolve); + this.vidBroadObj.bindToCurrentChannel(); + }, + + /* + * Description: + * Nominal Case + */ + testPrevChannel: function(resolve, reject) { var self = this; - videoBroadcastObject.onPlayStateChange = function(state, error) { - if (error) { - var errorText = self.error[error]; - console.log("[TEST-RUNNING][Info] Id: vbTestPrevChannel, Label: Switch to precedent channel in channel list, State: Failure"); + this.addTransition(this.UNREALIZED, this.CONNECTING); - reject("Failure:" + errorText); - } - - }; + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + self.vidBroadObj.prevChannel(); + }); - videoBroadcastObject.onChannelChangeError = function(channel, error) { - var errorText = self.error[error]; - console.log("[TEST-RUNNING][Info] Id: vbTestPrevChannel, Label: Switch to precedent channel in channel list, State: Failure"); + this.addTransition(this.PRESENTING, this.CONNECTING); - reject("Failure:" + errorText); - }; + this.addTransition(this.CONNECTING, this.PRESENTING); - 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); + this.vidBroadObj.onChannelChangeSucceeded = function(channel) { + + if (self.assertNotNull(channel) && self.assertEquals(this.vidBroadObj, this.PRESENTING)) { + logTest("State: Successful"); resolve("Successfull"); } else { - console.log("[TEST-RUNNING][Info] Id: vbTestPrevChannel, Label: Switch to precedent channel in channel list, State: Failure"); - reject("Failure : The channel is null because a unknown reason."); + logTest("State: Failure"); + reject("Failure : The channel is null for a unknown reason or wrong play state."); } - }; - console.log("***************************************************************************************************************************"); - + this.vidBroadObj.bindToCurrentChannel(); + }, + /* + * Description: + * Nominal Case + */ testNextChannel: function(resolve, reject) { - console.log("***************************************************************************************************************************"); - console.log("[TEST-RUNNING][Info] Id: vbTestNextChannel, Label: Switch to next channel in channel list, State: Pending"); - - 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) { - if (error) { - var errorText = self.error[error]; - console.log("[TEST-RUNNING][Info] Id: vbTestNextChannel, Label: Switch to next channel in channel list, State: Failure"); - reject("Failure:" + errorText); - } + this.addTransition(this.UNREALIZED, this.CONNECTING); - }; + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + self.vidBroadObj.nextChannel(); + }); - videoBroadcastObject.onChannelChangeError = function(channel, error) { - var errorText = self.error[error]; - console.log("[TEST-RUNNING][Info] Id: vbTestNextChannel, Label: Switch to next channel in channel list, State: Failure"); + this.addTransition(this.PRESENTING, this.CONNECTING); - reject("Failure:" + errorText); - }; + this.addTransition(this.CONNECTING, this.PRESENTING); - videoBroadcastObject.onChannelChangeSucceeded = function(channel) { - if (self.assertNotNull(channel)) { - console.log("[TEST-RUNNING][Info] Id: vbTestNextChannel, Label: Switch to next channel in channel list, State: Successful"); - console.log(channel.name); + this.vidBroadObj.onChannelChangeSucceeded = function(channel) { + + if (self.assertNotNull(channel) && self.assertEquals(this.vidBroadObj, this.PRESENTING)) { + logTest("State: Successful"); resolve("Successfull"); } else { - console.log("[TEST-RUNNING][Info] Id: vbTestNextChannel, Label: Switch to next channel in channel list, State: Failure"); - reject("Failure : The channel is null for a unknown reason."); + logTest("State: Failure"); + reject("Failure : The channel is null for a unknown reason or wrong play state."); } - }; - console.log("***************************************************************************************************************************"); + this.vidBroadObj.bindToCurrentChannel(); }, - verifWantedPlayState: function (currentObject, receivedPlayState, wantedPlayState) { - if (currentObject.assertEquals(receivedPlayState, wantedPlayState)) { - 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."]; - - } - } -}); + /* + * Description: + * Nominal Case + */ + testRelease: function(resolve, reject) { + var self = this; + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + self.vidBroadObj.release(); + }); + + this.addTransition(this.PRESENTING, this.UNREALIZED, resolve); + + this.vidBroadObj.bindToCurrentChannel(); + }, + + /* + * Description: + * Nominal Case + */ + testStop: function(resolve, reject) { + var self = this; + + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + self.vidBroadObj.stop(); + }); + + this.addTransition(this.PRESENTING, this.STOPPED, resolve); + + this.vidBroadObj.bindToCurrentChannel(); + } +}); \ No newline at end of file

1 0

r962 - oipf/js/utils
by ygrego＠users.nuiton.org 20 Mar '15

20 Mar '15

Author: ygrego Date: 2015-03-20 14:53:32 +0000 (Fri, 20 Mar 2015) New Revision: 962 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/962 Log: Modification in method "verifyASuitableTunerAvailable", use of method "fireEvent" instead of "onChannelChangeError". Modified: oipf/js/utils/ChannelUtils.js Modified: oipf/js/utils/ChannelUtils.js =================================================================== --- oipf/js/utils/ChannelUtils.js 2015-03-20 14:24:13 UTC (rev 961) +++ oipf/js/utils/ChannelUtils.js 2015-03-20 14:53:32 UTC (rev 962) @@ -56,10 +56,12 @@ } if (idType == 40 || idType == 41) { - object.onChannelChangeError && object.onChannelChangeError(null, 8); + timeout(0) + .then(object.fireEvent.bind(object, createCustomEvent("ChannelChangeError", [null, 8]))); } else { //this.onChannelChangeError && this.onChannelChangeError(null, 2); - object.onChannelChangeError && object.onChannelChangeError(null, 0); + timeout(0) + .then(object.fireEvent.bind(object, createCustomEvent("ChannelChangeError", [null, 0]))); } return null; }

1 0

r961 - oipf/js/impl/model
by ygrego＠users.nuiton.org 20 Mar '15

20 Mar '15

Author: ygrego Date: 2015-03-20 14:24:13 +0000 (Fri, 20 Mar 2015) New Revision: 961 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/961 Log: Addition of new property "locked". Modified: oipf/js/impl/model/Channel.js Modified: oipf/js/impl/model/Channel.js =================================================================== --- oipf/js/impl/model/Channel.js 2015-03-19 13:34:16 UTC (rev 960) +++ oipf/js/impl/model/Channel.js 2015-03-20 14:24:13 UTC (rev 961) @@ -118,6 +118,8 @@ * Visibility Type: readonly String */ ipBroadcastID: null, + + locked: null, init: function () { var dispatcher = { 3: "_createChannelATSC_T", 4: "_createChannelDVB_SI_DIRECT", 5: "_createChannelDVBOrISDB", 6: "_createChannelIPTV"};

1 0

r960 - oipf/js/impl
by ygrego＠users.nuiton.org 19 Mar '15

19 Mar '15

Author: ygrego Date: 2015-03-19 13:34:16 +0000 (Thu, 19 Mar 2015) New Revision: 960 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/960 Log: Replacement of method "setTimeout" by "timeout" in all followings methods : "bindToCurrentChannel", "stop", "release", "_channelSwitch" and all content of "setTimeout" have been moved into new method "changePlayState". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-19 13:23:03 UTC (rev 959) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-19 13:34:16 UTC (rev 960) @@ -27,6 +27,14 @@ */ var VideoBroadcastObject = Class.extend({ + _UNREALIZED: 0, + + _CONNECTING: 1, + + _PRESENTING: 2, + + _STOPPED: 3, + /* * Description: * The width of the area used for rendering the video object. This property is only writable if property @@ -35,13 +43,7 @@ * the DOM Level 2 Style interfaces (i.e. CSS2Properties interface style.width ), at least for values * specified in pixels. */ - get width () { - return null; - }, - - set width (val) { - - }, + width: null, /* * Description: * The height of the area used for rendering the video object. This property is only writable if property @@ -140,19 +142,10 @@ console.log("[INFO] createdCallback called."); }, - init: function (requiredCapabilities) { + init: function () { console.log("[INFO] constructor of VideoBroadcast class called."); this.playState = 0; - if (requiredCapabilities) { - this.allocationMethod = STATIC_ALLOCATION_VIDEOBROADCAST; - /* TODO: get scarce resources Scarce resources can be claimed by the video/broadcast or A/V Control object at instantiation time by specifying the - * requiredCapabilities parameter. In this case the STATIC_ALLOCATION method is used and the scarce resources - * are held by the object until it is either destroyed or the release() method is called. - */ - } else { - - this.allocationMethod = DYNAMIC_ALLOCATION_VIDEOBROADCAST; - } + this.listeners = {}; }, /*! @@ -295,41 +288,39 @@ bindToCurrentChannel: function() { var channelConfig = this.getChannelConfig(); var currentChan = channelConfig.currentChannel; - var self = this; + switch (this.playState) { - case 0: + case this._UNREALIZED: //claimed scarce resources //Call method to claim scarces resources - if (currentChan) { - this.currentChannel = currentChan; - - setTimeout(function () { - self.playState = 2; - self.onPlayStateChange && self.onPlayStateChange(self.playState); - }, 0); - + timeout(0) + .then(this.changePlayState.bind(this, this._CONNECTING)) + .then(timeout.bind(timeout, 0)) + .then(this.changePlayState.bind(this, this._PRESENTING, null, currentChan)); + } else { - - setTimeout(function () { - self.playState = 0; - self.onPlayStateChange && self.onPlayStateChange(self.playState, 100); - }, 0); + timeout(0) + .then(this.changePlayState.bind(this, this._UNREALIZED, 100)); } break; - case 3: - setTimeout(function () { - //Make enable video and audio presentation - self.playState = 1; - self.onPlayStateChange && self.onPlayStateChange(self.playState); - }, 0); + case this._STOPPED: + //FIX-ME :Make enable video and audio presentation + timeout(0) + .then(this.changePlayState.bind(this, this._CONNECTING)); break; } return this.currentChannel; }, + + changePlayState: function(state, error, channel) { + this.playState = state; + this.currentChannel = (channel? channel : this.currentChannel); + this.fireEvent(createCustomEvent("PlayStateChange", [this.playState, error])); + }, /* * Description: @@ -540,7 +531,7 @@ */ setChannel: function(channel, trickplay, contentAccessDescriptorURL) { - if ((this.playState >= 1) && (this.playState <= 3) && (!channel)) { + if ((this.playState >= this._CONNECTING) && (this.playState <= this._STOPPED) && (!channel)) { var tuner = verifyASuitableTunerAvailable(this, channel.idType); if (tuner) { @@ -550,11 +541,15 @@ } else { var self = this; - setTimeout(function () { + timeout(0) + .then(this.release.bind(this)) + .then(this.changePlayState.bind(this, this._UNREALIZED)); + + /*setTimeout(function () { self.playState = 0; self.release(); self.onPlayStateChange && self.onPlayStateChange(self.playState); - }, 0); + }, 0);*/ } }, @@ -706,23 +701,15 @@ * the releasing of resources shall change this to DYNAMIC_ALLOCATION . */ release: function() { - if ((this.playState >= 1) && (this.playState <= 3)) { + if ((this.playState >= this._CONNECTING) && (this.playState <= this._STOPPED)) { /* Call method to : * - release tuner used by this video/broadcast object. * - stop visualization of the video. * - and scarce ressources loaded previously. */ - var self = this; - console.log("Hey Hey"); - setTimeout(function () { - self.playState = 0; - self.currentChannel = null; - self.allocationMethod = (self.allocationMethod == STATIC_ALLOCATION_VIDEOBROADCAST) ? DYNAMIC_ALLOCATION_VIDEOBROADCAST : self.allocationMethod; - self.onPlayStateChange && self.onPlayStateChange(self.playState); - }, 0); + timeout(0) + .then(this.changePlayState.bind(this, this._UNREALIZED)); - this.playState = 0; - } }, @@ -737,18 +724,13 @@ * */ stop: function() { - if ((this.playState >= 1) && (this.playState <= 2)) { + if ((this.playState == this._CONNECTING) || (this.playState == this._PRESENTING)) { /* Call method to : * - stop the presentation of the video and audio. * - and scarce ressources loaded previously. */ - this.release(); - var self = this; - console.log("Hey"); - setTimeout(function () { - self.playState = 3; - self.onPlayStateChange && self.onPlayStateChange(self.playState); - }, 0); + timeout(0) + .then(this.changePlayState.bind(this, this._STOPPED)); } }, @@ -764,17 +746,19 @@ //Verify that the currentChannel exists in the channel list of channel configuration if (!channelConfig.channelList.getChannel(object.currentChannel.channelId)) { - var self = object; - setTimeout(function () { + timeout(0) + .then(this.fireEvent.bind(this, createCustomEvent.bind(null, "ChannelChangeError", [null, 100]))); + /*setTimeout(function () { self.onChannelChangeError && self.onChannelChangeError(null, 100); - }, 0); + }, 0);*/ if (object.playState == 1) { - self = object; - setTimeout(function () { + timeout(0) + .then(this.changePlayState.bind(this, this._UNREALIZED, 100)); + /*setTimeout(function () { self.playState = 0; self.onPlayStateChange && self.onPlayStateChange(self.playState, 100); - }, 0); + }, 0);*/ } } else { /* @@ -798,23 +782,29 @@ if (tunerFound) { //ToDO: Error handling, if the switch fail, this instruction correspond to channel switch. object.currentChannel = previousChannel; - self = object; + timeout(0) + .then(this.changePlayState.bind(this, this._CONNECTING)) + .then(timeout.bind(timeout, 0)) + .then(this.changePlayState.bind(this, this._PRESENTING)) + .then(timeout.bind(timeout, 0)) + .then(this.fireEvent.bind(this, createCustomEvent.bind(null, "ChannelChangeSucceeded", [previousChannel]))); + /* setTimeout(function () { self.playState = 1; self.onPlayStateChange && self.onPlayStateChange(self.playState); self.onChannelChangeSucceeded && self.onChannelChangeSucceeded(previousChannel); - }, 0); + }, 0);*/ } } } else { //When the OITF does not maintain channel list or favourite list by itself - self = object; + timeout(0) + .then(this.fireEvent.bind(this, createCustomEvent.bind(null, "ChannelChangeError", [null, 10]))); + /* setTimeout(function () { self.onChannelChangeError && self.onChannelChangeError(null, 10); - }, 0); + }, 0);*/ } } - - }); \ No newline at end of file

1 0

r959 - oipf/js/test
by ygrego＠users.nuiton.org 19 Mar '15

19 Mar '15

Author: ygrego Date: 2015-03-19 13:23:03 +0000 (Thu, 19 Mar 2015) New Revision: 959 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/959 Log: Use a method "timeout" instead of javascript method "setTimeout". The code associated with this "setTimeout" have been moved to method "afterTimeOver". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-03-19 13:08:38 UTC (rev 958) +++ oipf/js/test/Test.js 2015-03-19 13:23:03 UTC (rev 959) @@ -135,8 +135,8 @@ document.getElementById(currentTest["method"] + "Result").style.backgroundColor = "red"; document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; }); - - setTimeout(function() { + + var afterTimeOver = function() { if (!result) { try { var message = "Any result have been return."; @@ -150,7 +150,10 @@ console.groupEnd(currentTest["label"]); } } - }, 10000); + }; + + timeout(5000) + .then(afterTimeOver.bind(afterTimeOver)); }

1 0

r958 - oipf/js/test
by ygrego＠users.nuiton.org 19 Mar '15

19 Mar '15

Author: ygrego Date: 2015-03-19 13:08:38 +0000 (Thu, 19 Mar 2015) New Revision: 958 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/958 Log: Deletion of field "before" into javascript object "testsObjects". In method "updateTestResult" don't call any more a specific method before each test, so this part have been deleted. Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-03-19 09:55:00 UTC (rev 957) +++ oipf/js/test/Test.js 2015-03-19 13:08:38 UTC (rev 958) @@ -7,49 +7,43 @@ testsObjects: [{ name : "VideoBroadcastTest", object: new VideoBroadcastTest(), + callBeforeAnyTest : "beforeAnyTest", tests: [ { label: "Video broadcast creation.", - before: false, method: "testVideoBroadcastInit" }, { label: "Bind the current channel stream with a video broadcast object.", - before: true, method: "testBindToCurrentChannel" }, { label: "Switch to precedent channel in channel list.", - before: true, method: "testPrevChannel" }, { label: "Switch to next channel in channel list.", - before: true, method:"testNextChannel" }, { label: "Release any tuner and/or ressources held by a video broadcast object.", - before: true, method: "testRelease" }, { label: "Stop the video and audio presentation of video broadcast object.", - before: true, method: "testStop" } ]},{ name: "SearchManagerTest", object: new SearchManagerTest(), + callBeforeAnyTest : "beforeAnyTest", tests: [ { label: "Search manager creation.", - before: false, method: "testSearchManagerInit" }, { label: "Obtain current program according to oipf norm.", - before: true, method: "testGetCurrentProgram" } ] @@ -69,7 +63,7 @@ for (var j = 0; j < tests.length; j++) { var currentTest = tests[j]; - this.updateTestResult(currentTest, object); + this.updateTestResult(currentTest, object, element["callBeforeAnyTest"]); } } @@ -117,30 +111,29 @@ document.body.innerHTML = content; }, - updateTestResult: function(currentTest, object) { + updateTestResult: function(currentTest, object, methodToCallBeforeAnyTest) { console.group(currentTest["label"]); var timeStart = performance.now(); - var promise = new Promise(object[currentTest["method"]].bind(object)); var result = false; + object[methodToCallBeforeAnyTest](); - promise.then(function(val) { + new Promise(object[currentTest["method"]].bind(object)) + .then(function(val) { console.groupEnd(currentTest["label"]); result = true; var timeEnd = performance.now(); document.getElementById(currentTest["method"] + "Result").textContent = val; document.getElementById(currentTest["method"] + "Result").style.backgroundColor = "limegreen"; - document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; - - }); - - promise.catch(function(val) { + document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; + }) + .catch(function(val) { + console.log(val); console.groupEnd(currentTest["label"]); result = true; var timeEnd = performance.now(); document.getElementById(currentTest["method"] + "Result").textContent = val; document.getElementById(currentTest["method"] + "Result").style.backgroundColor = "red"; document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; - }); setTimeout(function() {

1 0

r957 - in h2j8test: . src/main/java/org/test
by echatellier＠users.nuiton.org 19 Mar '15

19 Mar '15

Author: echatellier Date: 2015-03-19 09:55:00 +0000 (Thu, 19 Mar 2015) New Revision: 957 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/957 Log: Update hibenrate Modified: h2j8test/pom.xml h2j8test/src/main/java/org/test/H2J8Test.java Modified: h2j8test/pom.xml =================================================================== --- h2j8test/pom.xml 2015-03-19 09:51:42 UTC (rev 956) +++ h2j8test/pom.xml 2015-03-19 09:55:00 UTC (rev 957) @@ -13,7 +13,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>4.3.7.Final</version> + <version>4.3.8.Final</version> </dependency> </dependencies> </project> Modified: h2j8test/src/main/java/org/test/H2J8Test.java =================================================================== --- h2j8test/src/main/java/org/test/H2J8Test.java 2015-03-19 09:51:42 UTC (rev 956) +++ h2j8test/src/main/java/org/test/H2J8Test.java 2015-03-19 09:55:00 UTC (rev 957) @@ -20,7 +20,7 @@ config.setProperty("hibernate.connection.password", "sa"); config.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect"); config.setProperty("hibernate.connection.driver_class", "org.h2.Driver"); - config.setProperty("hibernate.current_session_context_class", "thread"); + //config.setProperty("hibernate.current_session_context_class", "thread"); config.setProperty("hibernate.connection.url", "jdbc:h2:file:./test_" + System.currentTimeMillis() + ";FILE_LOCK=file;DEFAULT_LOCK_TIMEOUT=1000;DB_CLOSE_DELAY=0;LOCK_MODE=3;TRACE_LEVEL_FILE=3;TRACE_LEVEL_SYSTEM_OUT=0;LOG=1;mv_store=false");

1 0