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

r996 - oipf/js/test
by ygrego＠users.nuiton.org 31 Mar '15

31 Mar '15

Author: ygrego Date: 2015-03-31 08:43:55 +0000 (Tue, 31 Mar 2015) New Revision: 996 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/996 Log: Deletion of block "try catch" and method "testSearchManagerInit". Use of method "addEventListener" and current channel of a video-broadcast object compared with Channel config's. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-03-31 08:33:00 UTC (rev 995) +++ oipf/js/test/SearchManagerTest.js 2015-03-31 08:43:55 UTC (rev 996) @@ -5,74 +5,47 @@ */ var SearchManagerTest = TestCase.extend({ + searchManagerObj: null, + init: function () { }, - testInstanceCreation: function (resolve, reject) { + beforeTest: function() { + this.searchManagerObj = oipfObjectFactory.createSearchManagerObject(); + }, + + afterTest: function(resolve, reject) { - var state = "Pending"; - console.log("***************************************************************************************************************************"); - console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: " + state); - - 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); - } else { - state = "Failure"; - console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: " + state); - reject(new Error(state)); - } - console.log("***************************************************************************************************************************"); - }, testGetCurrentProgram: function (resolve, reject) { - var stat = "Pending"; - console.log("***************************************************************************************************************************"); - console.log("[TEST-RUNNING][Info] " + "Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: " + stat); + console.log("[TEST-RUNNING][Info] 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 searchTarget = 1; + var metaDataSearch = this.searchManagerObj.createSearch(searchTarget); + var startTime = null; + metaDataSearch.findProgrammesFromStream(oipfObjectFactory.createVideoBroadcastObject().currentChannel + , startTime); + var offset = 0; + var count = 1; + metaDataSearch.result.getResults(offset, count); + console.log(metaDataSearch.result[0]);//Must return undefined else wrong implementation of getResults method + var self = this; - searchManagerObject.onMetadataSearch = function (search, state) { - + function onMetadataSearch (search, state) { + console.log("[INFO]: onMetadataSearch called"); switch (state) { case 0: if (self.assertNotNull(search.result[0])) { - console.log("[TEST-RUNNING][Info] " + "Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: " + stat); + console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: " + stat); resolve("Successfull"); } else { - console.log("[TEST-RUNNING][Info] " + "Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: " + stat); + console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: " + stat); reject(new Error("Failure")); } break; @@ -91,10 +64,8 @@ console.log("Unknow state"); } - console.log("***************************************************************************************************************************"); - - }; - + } + this.searchManagerObj.addEventListener("MetadataSearch", onMetadataSearch, false); } }); \ No newline at end of file

1 0

r995 - oipf/js/utils
by ygrego＠users.nuiton.org 31 Mar '15

31 Mar '15

Author: ygrego Date: 2015-03-31 08:33:00 +0000 (Tue, 31 Mar 2015) New Revision: 995 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/995 Log: A polyfill of "Promise" object. Useful for embedded tv web browser which doesn't supported "Promise" . Added: oipf/js/utils/es6-promises.js Added: oipf/js/utils/es6-promises.js =================================================================== --- oipf/js/utils/es6-promises.js (rev 0) +++ oipf/js/utils/es6-promises.js 2015-03-31 08:33:00 UTC (rev 995) @@ -0,0 +1,18 @@ +/*! + * @overview es6-promise - a tiny implementation of Promises/A+. + * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald) + * @license Licensed under MIT license + * See https://raw.githubusercontent.com/jakearchibald/es6-promise/master/LICENSE + * @version 2.0.0 + */ + +(function(){function r(a,b){n[l]=a;n[l+1]=b;l+=2;2===l&&A()}function s(a){return"function"===typeof a}function F(){return function(){process.nextTick(t)}}function G(){var a=0,b=new B(t),c=document.createTextNode("");b.observe(c,{characterData:!0});return function(){c.data=a=++a%2}}function H(){var a=new MessageChannel;a.port1.onmessage=t;return function(){a.port2.postMessage(0)}}function I(){return function(){setTimeout(t,1)}}function t(){for(var a=0;a<l;a+=2)(0,n[a])(n[a+1]),n[a]=void 0,n[a+1]=void 0; +l=0}function p(){}function J(a,b,c,d){try{a.call(b,c,d)}catch(e){return e}}function K(a,b,c){r(function(a){var e=!1,f=J(c,b,function(c){e||(e=!0,b!==c?q(a,c):m(a,c))},function(b){e||(e=!0,g(a,b))});!e&&f&&(e=!0,g(a,f))},a)}function L(a,b){1===b.a?m(a,b.b):2===a.a?g(a,b.b):u(b,void 0,function(b){q(a,b)},function(b){g(a,b)})}function q(a,b){if(a===b)g(a,new TypeError("You cannot resolve a promise with itself"));else if("function"===typeof b||"object"===typeof b&&null!==b)if(b.constructor===a.constructor)L(a, +b);else{var c;try{c=b.then}catch(d){v.error=d,c=v}c===v?g(a,v.error):void 0===c?m(a,b):s(c)?K(a,b,c):m(a,b)}else m(a,b)}function M(a){a.f&&a.f(a.b);x(a)}function m(a,b){void 0===a.a&&(a.b=b,a.a=1,0!==a.e.length&&r(x,a))}function g(a,b){void 0===a.a&&(a.a=2,a.b=b,r(M,a))}function u(a,b,c,d){var e=a.e,f=e.length;a.f=null;e[f]=b;e[f+1]=c;e[f+2]=d;0===f&&a.a&&r(x,a)}function x(a){var b=a.e,c=a.a;if(0!==b.length){for(var d,e,f=a.b,g=0;g<b.length;g+=3)d=b[g],e=b[g+c],d?C(c,d,e,f):e(f);a.e.length=0}}function D(){this.error= +null}function C(a,b,c,d){var e=s(c),f,k,h,l;if(e){try{f=c(d)}catch(n){y.error=n,f=y}f===y?(l=!0,k=f.error,f=null):h=!0;if(b===f){g(b,new TypeError("A promises callback cannot return that same promise."));return}}else f=d,h=!0;void 0===b.a&&(e&&h?q(b,f):l?g(b,k):1===a?m(b,f):2===a&&g(b,f))}function N(a,b){try{b(function(b){q(a,b)},function(b){g(a,b)})}catch(c){g(a,c)}}function k(a,b,c,d){this.n=a;this.c=new a(p,d);this.i=c;this.o(b)?(this.m=b,this.d=this.length=b.length,this.l(),0===this.length?m(this.c, +this.b):(this.length=this.length||0,this.k(),0===this.d&&m(this.c,this.b))):g(this.c,this.p())}function h(a){O++;this.b=this.a=void 0;this.e=[];if(p!==a){if(!s(a))throw new TypeError("You must pass a resolver function as the first argument to the promise constructor");if(!(this instanceof h))throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.");N(this,a)}}var E=Array.isArray?Array.isArray:function(a){return"[object Array]"=== +Object.prototype.toString.call(a)},l=0,w="undefined"!==typeof window?window:{},B=w.MutationObserver||w.WebKitMutationObserver,w="undefined"!==typeof Uint8ClampedArray&&"undefined"!==typeof importScripts&&"undefined"!==typeof MessageChannel,n=Array(1E3),A;A="undefined"!==typeof process&&"[object process]"==={}.toString.call(process)?F():B?G():w?H():I();var v=new D,y=new D;k.prototype.o=function(a){return E(a)};k.prototype.p=function(){return Error("Array Methods must be provided an Array")};k.prototype.l= +function(){this.b=Array(this.length)};k.prototype.k=function(){for(var a=this.length,b=this.c,c=this.m,d=0;void 0===b.a&&d<a;d++)this.j(c[d],d)};k.prototype.j=function(a,b){var c=this.n;"object"===typeof a&&null!==a?a.constructor===c&&void 0!==a.a?(a.f=null,this.g(a.a,b,a.b)):this.q(c.resolve(a),b):(this.d--,this.b[b]=this.h(a))};k.prototype.g=function(a,b,c){var d=this.c;void 0===d.a&&(this.d--,this.i&&2===a?g(d,c):this.b[b]=this.h(c));0===this.d&&m(d,this.b)};k.prototype.h=function(a){return a}; +k.prototype.q=function(a,b){var c=this;u(a,void 0,function(a){c.g(1,b,a)},function(a){c.g(2,b,a)})};var O=0;h.all=function(a,b){return(new k(this,a,!0,b)).c};h.race=function(a,b){function c(a){q(e,a)}function d(a){g(e,a)}var e=new this(p,b);if(!E(a))return (g(e,new TypeError("You must pass an array to race.")), e);for(var f=a.length,h=0;void 0===e.a&&h<f;h++)u(this.resolve(a[h]),void 0,c,d);return e};h.resolve=function(a,b){if(a&&"object"===typeof a&&a.constructor===this)return a;var c=new this(p,b); +q(c,a);return c};h.reject=function(a,b){var c=new this(p,b);g(c,a);return c};h.prototype={constructor:h,then:function(a,b){var c=this.a;if(1===c&&!a||2===c&&!b)return this;var d=new this.constructor(p),e=this.b;if(c){var f=arguments[c-1];r(function(){C(c,d,f,e)})}else u(this,d,a,b);return d},"catch":function(a){return this.then(null,a)}};var z={Promise:h,polyfill:function(){var a;a="undefined"!==typeof global?global:"undefined"!==typeof window&&window.document?window:self;"Promise"in a&&"resolve"in +a.Promise&&"reject"in a.Promise&&"all"in a.Promise&&"race"in a.Promise&&function(){var b;new a.Promise(function(a){b=a});return s(b)}()||(a.Promise=h)}};"function"===typeof define&&define.amd?define(function(){return z}):"undefined"!==typeof module&&module.exports?module.exports=z:"undefined"!==typeof this&&(this.ES6Promise=z)}).call(this); \ No newline at end of file

1 0

r994 - oipf/css
by ygrego＠users.nuiton.org 31 Mar '15

31 Mar '15

Author: ygrego Date: 2015-03-31 08:27:46 +0000 (Tue, 31 Mar 2015) New Revision: 994 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/994 Log: Deletion of a rule and addition of new style for "focus". Modified: oipf/css/test.css Modified: oipf/css/test.css =================================================================== --- oipf/css/test.css 2015-03-31 08:25:23 UTC (rev 993) +++ oipf/css/test.css 2015-03-31 08:27:46 UTC (rev 994) @@ -7,6 +7,9 @@ Created on : 26 févr. 2015, 10:03:51 Author : root */ +:focus { + border: 3px navy solid; +} table { font: 1em sans-serif; @@ -24,7 +27,6 @@ margin-bottom: .5em; } - /* shared basics rules */ table th, table td { @@ -38,7 +40,6 @@ padding-left: .5em; } - /* header of table*/ table > thead > tr:first-child > th { text-align: center; @@ -68,10 +69,6 @@ table tbody td:nth-child(5) { text-align: center; } - -table tbody th:after { - content: " :"; - } /* foot of table not used here*/ table tfoot {

1 0

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

31 Mar '15

Author: ygrego Date: 2015-03-31 08:25:23 +0000 (Tue, 31 Mar 2015) New Revision: 993 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/993 Log: Delete severals comments. Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-03-31 08:24:06 UTC (rev 992) +++ oipf/js/impl/model/SearchResults.js 2015-03-31 08:25:23 UTC (rev 993) @@ -160,12 +160,6 @@ } } - -// document.dispatchEvent(new Event('MetadataSearch', { -// 'search': metaDataSearch, -// 'state': 0 -// })); -// console.log(this._search); var self = this; setTimeout(function() { console.log("<<<<<<<<<<<<<<", new Date(), ">>>>>>>>>>>>>>>>", currentProgramIndex);

1 0

r992 - oipf/js/utils
by ygrego＠users.nuiton.org 31 Mar '15

31 Mar '15

Author: ygrego Date: 2015-03-31 08:24:06 +0000 (Tue, 31 Mar 2015) New Revision: 992 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/992 Log: The "currentChannel" pass in argument of method "init" is directly affected to property "currentChannel" of "ChannelService". And the initial test done on this one is deleted now. Modified: oipf/js/utils/ChannelService.js Modified: oipf/js/utils/ChannelService.js =================================================================== --- oipf/js/utils/ChannelService.js 2015-03-31 08:20:32 UTC (rev 991) +++ oipf/js/utils/ChannelService.js 2015-03-31 08:24:06 UTC (rev 992) @@ -11,7 +11,7 @@ }, init: function(currentChannel) { - this.currentChannel && (this.currentChannel = currentChannel || null); + var channelName = "ARTE"; var channelIdType = 12; var channelArte = new Channel(channelIdType, 52, 53, 54, channelName); @@ -22,7 +22,7 @@ channelName = "FRANCE_4"; var channelFrance4 = new Channel(channelIdType, 22, 23, 24, channelName); - this.currentChannel = channelArte; + this.currentChannel = currentChannel || channelArte; this.channelList = new ChannelList(channelArte, channelFrance5, channelFrance4); this.favouriteLists = new FavouriteListCollection(); this.currentFavouriteList = new FavouriteList();

1 0

r991 - oipf/js/impl
by ygrego＠users.nuiton.org 31 Mar '15

31 Mar '15

Author: ygrego Date: 2015-03-31 08:20:32 +0000 (Tue, 31 Mar 2015) New Revision: 991 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/991 Log: Modification of method "createVideoBroadcastObject": an argument is present now in constructor of VideoBroadcastObject. Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-03-31 08:17:33 UTC (rev 990) +++ oipf/js/impl/OipfObjectFactory.js 2015-03-31 08:20:32 UTC (rev 991) @@ -179,7 +179,7 @@ console.log("[INFO] createVideoBroadcastObject() of OipfObjectFactory class called."); if (this.isObjectSupported("video/broadcast")) { - return new VideoBroadcastObject(new ChannelService()); + return new VideoBroadcastObject(new ChannelService(null)); } else { throw new TypeError("This object type is not supported."); }

1 0

r990 - oipf/js/utils
by ygrego＠users.nuiton.org 31 Mar '15

31 Mar '15

Author: ygrego Date: 2015-03-31 08:17:33 +0000 (Tue, 31 Mar 2015) New Revision: 990 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/990 Log: The method "timeout" is added into a namespace. Modified: oipf/js/utils/Utils.js Modified: oipf/js/utils/Utils.js =================================================================== --- oipf/js/utils/Utils.js 2015-03-31 08:15:29 UTC (rev 989) +++ oipf/js/utils/Utils.js 2015-03-31 08:17:33 UTC (rev 990) @@ -2,6 +2,14 @@ * Some code based on RFC 4122, section 4.4 * (Algorithms for Creating a UUID from Truly Random or Pseudo-Random Number). */ +var oipf = { + utils: {} +}; + +oipf.utils.timeout = function(time) { + return new Timeout(time); +}; + function createUUID() { // http://www.ietf.org/rfc/rfc4122.txt var s = []; @@ -39,8 +47,8 @@ return string.charAt(0).toUpperCase() + string.slice(1); } -function logTest(message) { - console.log("[TEST-INFO] "+message); +function logTest() { + console.log.apply(console, arguments); } function createCustomEvent(type, param) {

1 0

r989 - oipf/js/test
by ygrego＠users.nuiton.org 31 Mar '15

31 Mar '15

Author: ygrego Date: 2015-03-31 08:15:29 +0000 (Tue, 31 Mar 2015) New Revision: 989 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/989 Log: -New method added "afterTest". -New tests added about "volume" and "bind to current channel". -The method "onChangeState" has been modified to manage a possible error. -A reference on "onChangeState" is saved in order to remove it in method "afterTest". Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-03-31 08:03:16 UTC (rev 988) +++ oipf/js/test/VideoBroadcastTest.js 2015-03-31 08:15:29 UTC (rev 989) @@ -22,7 +22,7 @@ 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).", + 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.", @@ -34,18 +34,43 @@ }, + 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." + + }, + init: function() { }, beforeTest: function(resolve, reject) { this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); - this.vidBroadObj.addEventListener("PlayStateChange", this.onChangeState.bind(this, resolve, reject)); + this.onPlayStateChange = this.onChangeState.bind(this, resolve, reject); + this.vidBroadObj.addEventListener("PlayStateChange", this.onPlayStateChange, false); this.transitions = []; this.previousState = this.vidBroadObj.playState; this.currentIndex = 0; logTest("State: Pending"); }, + + afterTest: function() { +// this.vidBroadObj.release(); //Useful for test on tv plateform + this.vidBroadObj.removeEventListener("PlayStateChange", this.onPlayStateChange); + }, onChangeState: function(resolve, reject, newState, errorCode) { var currentTransition = this.transitions[this.currentIndex]; @@ -54,11 +79,15 @@ 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++; - + if (this.errorMap[errorCode]) { + console.log(this.errorMap[errorCode]); + reject(this.errorMap[errorCode]); + } else { + currentTransition.callback && currentTransition.callback(); + this.previousState = newState; + this.currentIndex++; + } + } else { reject("Invalid state"); } @@ -76,25 +105,15 @@ callback: callback }); }, - + /* * Descrtiption: - * This method test the initialization of video broadcast object. + * This method test the binding between the video broadcast object and the current program stream. + * ToDO: Extraction of method onPlayStateChange out. */ - 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){ + testBindToCurrentChannel: function(resolve, reject) { var self = this; - + this.addTransition(this.UNREALIZED, this.CONNECTING, function() { self.vidBroadObj.bindToCurrentChannel(); }); @@ -102,15 +121,50 @@ this.addTransition(this.CONNECTING, this.PRESENTING, resolve); this.vidBroadObj.bindToCurrentChannel(); - }, + }, + /* + * This method must throw a error by using the method reject. + * + * @param {type} resolve + * @param {type} reject + * @returns {undefined} + */ + testBindToCurrentChannelWhenNoChannelPresentation: function(resolve, reject) { + //Subject to modification not rigth way failed on the tv plateform. + this.vidBroadObj._channelService.currentChannel = null; + + this.addTransitionWithError(this.UNREALIZED, this.UNREALIZED, 100); + 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) { +// testBindToCurrentChannel: function(resolve, reject) { +// var self = this; +// +// this.addTransition(this.previousState, this.PRESENTING); +// +// this.vidBroadObj.bindToCurrentChannel(); +// }, + + testDoubleBindToCurrentChannel: function(resolve, reject) { var self = this; + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, resolve); + + this.vidBroadObj.bindToCurrentChannel(); + this.vidBroadObj.bindToCurrentChannel(); + }, + + testBindToCurrentChannelInConnecting: function(resolve, reject) { + var self = this; + this.addTransition(this.UNREALIZED, this.CONNECTING, function() { self.vidBroadObj.bindToCurrentChannel(); }); @@ -120,19 +174,69 @@ this.vidBroadObj.bindToCurrentChannel(); }, - testBindToCurrentChannelInConnecting : function(resolve, reject) { + testBindToCurrentChannelInPresenting: function(resolve, reject) { var self = this; - this.addTransition(this.UNREALIZED, this.CONNECTING, function() { + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { self.vidBroadObj.bindToCurrentChannel(); + resolve(); }); + this.vidBroadObj.bindToCurrentChannel(); + }, + + testBindToCurrentChannelInStopped: 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, function() { + self.vidBroadObj.bindToCurrentChannel(); + }); + + this.addTransition(this.STOPPED, this.CONNECTING, resolve); this.addTransition(this.CONNECTING, this.PRESENTING, resolve); this.vidBroadObj.bindToCurrentChannel(); + }, /* + * This method must throw a error by using the method reject. + * @param {type} resolve + * @param {type} reject + * @returns {undefined} + */ + testBindToCurrentChannelInStoppedWhenNoTuner: function(resolve, reject) { + var self = this; + + 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, function() { + //We want test the case where the current channel has a idType whose + //any tuner supporting this kind of channel exist. + //So we create channel of idType "ATSCT". + self.vidBroadObj._channelService.currentChannel = new Channel(ID_ATSC_T, null, null); + self.vidBroadObj.bindToCurrentChannel(); + }); + + this.addTransitionWithError(this.STOPPED, this.STOPPED, 0); + + this.vidBroadObj.bindToCurrentChannel(); + }, + /* * Description: * Nominal Case */ @@ -163,6 +267,28 @@ }, +// testPrevChannel: function(resolve, reject) { +// var self = this; +// +// this.addTransition(this.PRESENTING, this.CONNECTING); +// +// this.addTransition(this.CONNECTING, this.PRESENTING); +// +// this.vidBroadObj.onChannelChangeSucceeded = function(channel) { +// +// if (self.assertNotNull(channel) && self.assertEquals(this.vidBroadObj, this.PRESENTING)) { +// logTest("State: Successful"); +// resolve("Successfull"); +// } else { +// logTest("State: Failure"); +// reject("Failure : The channel is null for a unknown reason or wrong play state."); +// } +// }; +// +// this.vidBroadObj.prevChannel(); +// +// }, + /* * Description: * Nominal Case @@ -190,10 +316,46 @@ reject("Failure : The channel is null for a unknown reason or wrong play state."); } }; + this.addTransition(this.PRESENTING, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING); + this.vidBroadObj.onChannelChangeSucceeded = function(channel) { + + if (self.assertNotNull(channel) && self.assertEquals(this.vidBroadObj, this.PRESENTING)) { + logTest("State: Successful"); + resolve("Successfull"); + } else { + logTest("State: Failure"); + reject("Failure : The channel is null for a unknown reason or wrong play state."); + } + }; + + this.vidBroadObj.prevChannel(); this.vidBroadObj.bindToCurrentChannel(); }, +// testNextChannel: function(resolve, reject) { +// var self = this; +// +// this.addTransition(this.PRESENTING, this.CONNECTING); +// +// this.addTransition(this.CONNECTING, this.PRESENTING); +// +// this.vidBroadObj.onChannelChangeSucceeded = function(channel) { +// +// if (self.assertNotNull(channel) && self.assertEquals(this.vidBroadObj, this.PRESENTING)) { +// logTest("State: Successful"); +// resolve("Successfull"); +// } else { +// logTest("State: Failure"); +// reject("Failure : The channel is null for a unknown reason or wrong play state."); +// } +// }; +// +// this.vidBroadObj.nextChannel(); +// }, + /* * Description: * Nominal Case @@ -212,6 +374,14 @@ this.vidBroadObj.bindToCurrentChannel(); }, +// testRelease: function(resolve, reject) { +// var self = this; +// +// this.addTransition(this.PRESENTING, this.UNREALIZED, resolve); +// +// this.vidBroadObj.release(); +// }, + /* * Description: * Nominal Case @@ -228,5 +398,231 @@ this.addTransition(this.PRESENTING, this.STOPPED, resolve); this.vidBroadObj.bindToCurrentChannel(); + }, + +// testStop: function(resolve, reject) { +// var self = this; +// +// this.addTransition(this.PRESENTING, this.STOPPED, resolve); +// +// this.vidBroadObj.stop(); +// }, + + /* + * Description: + * Nominal Case + */ + testSetVolume: function(resolve, reject) { + var volume = 15; + var self = this; + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + var done = self.vidBroadObj.setVolume(volume); + if (done && self.assertEquals(volume, self.vidBroadObj._volume)) { + resolve(); + } else { + reject(); + } + }); + + this.vidBroadObj.bindToCurrentChannel(); + }, + + testSetVolumeWithoutArgument: function(resolve, reject) { + var self = this; + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + var done = self.vidBroadObj.setVolume(); + if (done) { + reject(); + } else { + reject(); + } + }); + + this.vidBroadObj.bindToCurrentChannel(); + }, + + testSetVolumeWithFloatArgument: function(resolve, reject) { + var volume = 15.8; + var self = this; + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + var done = self.vidBroadObj.setVolume(volume); + if (done || self.assertEquals(volume, self.vidBroadObj._volume)) { + reject("[Stub]Wrong Implementation."); + } else { + reject(); + } + }); + + this.vidBroadObj.bindToCurrentChannel(); + }, + + testSetVolumeWithFloatUnderBoundMin: function(resolve, reject) { + var volume = -15.8; + var self = this; + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + var done = self.vidBroadObj.setVolume(volume); + if (done || self.assertEquals(volume, self.vidBroadObj._volume)) { + reject("[Stub]Wrong Implementation."); + } else { + reject(); + } + }); + + this.vidBroadObj.bindToCurrentChannel(); + }, + + testSetVolumeWithFloatAboveBoundMax: function(resolve, reject) { + var volume = 151.74; + var self = this; + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + var done = self.vidBroadObj.setVolume(volume); + if (done || self.assertEquals(volume, self.vidBroadObj._volume)) { + reject("[Stub]Wrong Implementation."); + } else { + reject(); + } + }); + + this.vidBroadObj.bindToCurrentChannel(); + }, + + testSetVolumeWithValueUnderBoundMin: function(resolve, reject) { + var volume = -15; + var self = this; + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + var done = self.vidBroadObj.setVolume(volume); + if (done && self.assertEquals(volume, self.vidBroadObj._volume)) { + resolve(); + } else { + reject(); + } + }); + + this.vidBroadObj.bindToCurrentChannel(); + }, + + testSetVolumeWithValueAboveBoundMax: function(resolve, reject) { + var volume = 105; + var self = this; + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + var done = self.vidBroadObj.setVolume(volume); + if (done && self.assertEquals(volume, self.vidBroadObj._volume)) { + resolve(); + } else { + reject(); + } + }); + + this.vidBroadObj.bindToCurrentChannel(); + }, + +// testSetVolume: function(resolve, reject) { +// var volume = 15; +// +// var done = this.vidBroadObj.setVolume(volume); +// +// if (done) { +// resolve(); +// } else { +// reject(); +// } +// }, + + /* + * Description: + * Nominal Case + * FIX-ME: Yannis - 24/03/2015 - Exception not throw in callback of method addTransition + */ + testGetVolume: function(resolve, reject) { + var initialVolume = 15; + var self = this; + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + var done = self.vidBroadObj.setVolume(initialVolume); + var finalVolume = self.vidBroadObj.getVolume(); + + if (done && self.assertEquals(initialVolume, self.vidBroadObj._volume) + && self.assertEquals(initialVolume, finalVolume) + && self.assertEquals(self.vidBroadObj._volume, finalVolume)) { + + resolve(); + } else { + reject(); + } + }); + + this.vidBroadObj.bindToCurrentChannel(); + }, + +// testGetVolume: function(resolve, reject) { +// var volume = this.vidBroadObj.getVolume(); +// +// if (volume ) { +// resovle(); +// } else { +// reject(); +// } +// }, + + testSetChannelInPresenting: function(resolve, reject) { + var self = this; + + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + self.vidBroadObj.setChannel(self.channel); + }); + + this.addTransition(this.PRESENTING, this.CONNECTING); + this.addTransition(this.CONNECTING, this.PRESENTING); + + this.vidBroadObj.onChannelChangeSucceeded = function(channel) { + + if (self.assertNotNull(channel) && self.assertEquals(self.vidBroadObj.playState, self.PRESENTING)) { + logTest("State: Successful"); + resolve("Success"); + } else { + logTest("State: Failure"); + reject("Failure : The channel is null for a unknown reason or wrong play state."); + } + }; + + this.vidBroadObj.bindToCurrentChannel(); + }, + + testSetChannelInPresentingWithNull: function(resolve, reject) { + var self = this; + + this.addTransition(this.PRESENTING, this.CONNECTING); + this.addTransition(this.CONNECTING, this.PRESENTING); + + this.vidBroadObj.onChannelChangeSucceeded = function(channel) { + + if (self.assertNotNull(channel) && self.assertEquals(self.vidBroadObj.playState, self.PRESENTING)) { + logTest("State: Successful"); + resolve("Success"); + } else { + logTest("State: Failure"); + reject("Failure : The channel is null for a unknown reason or wrong play state."); + } + }; + + this.vidBroadObj.setChannel(null); + } }); \ No newline at end of file

1 0

r988 - oipf/js/test
by ygrego＠users.nuiton.org 31 Mar '15

31 Mar '15

Author: ygrego Date: 2015-03-31 08:03:16 +0000 (Tue, 31 Mar 2015) New Revision: 988 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/988 Log: New method added: "runSectionTest". Some adjustments have been done in mehtod "displayInLineArray" and method "updateTestResult". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-03-31 07:48:04 UTC (rev 987) +++ oipf/js/test/Test.js 2015-03-31 08:03:16 UTC (rev 988) @@ -1,22 +1,206 @@ /* * 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. + * and open the template in the editor. */ var Test = Class.extend({ testsObjects: [{ + name : "OipfFactoryTest", + object: new OipfFactoryTest(), + tests: [ + { + label: "Call the method 'isObjectSupported' with mime-type 'application/oipfApplicationManager'.", + method: "testIsApplicationManagerObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'application/oipfCapabilities'.", + method: "testIsCapabilitiesObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'channelConfig'.", + method: "testIsChannelConfigSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'application/oipfCodManager'.", + method: "testIsCodManagerObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'application/oipfConfiguration'.", + method: "testIsConfigurationObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'application/oipfDownloadManager'.", + method: "testIsDownloadManagerObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'application/oipfDownloadTrigger'.", + method: "testIsDownloadTriggerObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'application/oipfDrmAgent'.", + method: "testIsDrmAgentObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'application/oipfGatewayInfo'.", + method: "testIsGatewayInfoObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'application/oipfCommunicationServices'.", + method: "testIsIMSObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'application/oipfMDTF'.", + method: "testIsMDTFObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'application/notifsocket'.", + method: "testIsNotifSocketObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'application/oipfParentalControlManager'.", + method: "testIsParentalControlManagerObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'application/oipfRecordingScheduler'.", + method: "testIsRecordingSchedulerObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'application/oipfRemoteControlFunction'.", + method: "testIsRemoteControlFunctionObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'application/oipfRemoteManagement'.", + method: "testIsRemoteManagementObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'application/oipfSearchManager'.", + method: "testIsSearchManagerObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'application/oipfStatusView'.", + method: "testIsStatusViewObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'video/broadcast'.", + method: "testIsVideoBroadcastObjectSupported" + }, + { + label: "Call the method 'isObjectSupported' with mime-type 'video/mpeg'.", + method: "testIsVideoMpegObjectSupported" + }, + { + label: "Call the method 'createApplicationManagerObject of oifp factory.", + method: "testCreateApplicationManagerObject" + }, + { + label: "Call the method createCapabilitiesObject of oifp factory.", + method: "testCreateCapabilitiesObject" + }, + { + label: "Call the method createChannelConfig of oifp factory.", + method: "testCreateChannelConfig" + }, + { + label: "Call the method createCodManagerObject of oifp factory.", + method: "testCreateCodManagerObject" + }, + { + label: "Call the method createConfigurationObject of oifp factory.", + method: "testCreateConfigurationObject" + }, + { + label: "Call the method createDownloadManagerObject of oifp factory.", + method: "testCreateDownloadManagerObject" + }, + { + label: "Call the method createDownloadTriggerObject of oifp factory.", + method: "testCreateDownloadTriggerObject" + }, + { + label: "Call the method createDrmAgentObject of oifp factory.", + method: "testCreateDrmAgentObject" + }, + { + label: "Call the method createGatewayInfoObject of oifp factory.", + method: "testCreateGatewayInfoObject" + }, + { + label: "Call the method createImsObject of oifp factory.", + method: "testCreateIMSObject" + }, + { + label: "Call the method createMdtfObject of oifp factory.", + method: "testCreateMDTFObject" + }, + { + label: "Call the method createNotifSocketObject of oifp factory.", + method: "testCreateNotifSocketObject" + }, + { + label: "Call the method createParentalControlManagerObject of oifp factory.", + method: "testCreateParentalControlManagerObject" + }, + { + label: "Call the method createRecordingSchedulerObject of oifp factory.", + method: "testCreateRecordingSchedulerObject" + }, + { + label: "Call the method createRemoteControlFunctionObject of oifp factory.", + method: "testCreateRemoteControlFunctionObject" + }, + { + label: "Call the method createRemoteManagementObject of oifp factory.", + method: "testCreateRemoteManagementObject" + }, + { + label: "Call the method createSearchManagerObject of oifp factory.", + method: "testCreateSearchManagerObject" + }, + { + label: "Call the method createStatusViewObject of oifp factory.", + method: "testCreateStatusViewObject" + }, + { + label: "Call the method createVideoBroadcastObject of oifp factory.", + method: "testCreateVideoBroadcastObject" + }, + { + label: "Call the method createVideoMpegObject of oifp factory.", + method: "testCreateVideoMpegObject" + } + ]},{ name : "VideoBroadcastTest", object: new VideoBroadcastTest(), tests: [ { - label: "Video broadcast creation.", - method: "testBind2Stop" - }, - { label: "Bind the current channel stream with a video broadcast object.", method: "testBindToCurrentChannel" }, { + label: "Call 'bindToCurrentChannel' when there isn't channel presentation.", + method: "testBindToCurrentChannelWhenNoChannelPresentation" + }, + { + label: "Bind the current channel stream with a video broadcast object while this one is in connecting state.", + method: "testBindToCurrentChannelInConnecting" + }, + { + label: "Bind the current channel stream with a video broadcast object while this one is in presenting state.", + method: "testBindToCurrentChannelInPresenting" + }, + { + label: "Bind the current channel stream with a video broadcast object while this one is in stopped state.", + method: "testBindToCurrentChannelInStopped" + }, + { + label: "Bind the current channel stream with a video broadcast object while this one is in stopped state.", + method: "testBindToCurrentChannelInStoppedWhenNoTuner" + }, + { + label: "Call 'bindToCurrentChannel' twice.", + method: "testDoubleBindToCurrentChannel" + }, + { label: "Switch to precedent channel in channel list.", method: "testPrevChannel" }, @@ -31,16 +215,52 @@ { label: "Stop the video and audio presentation of video broadcast object.", method: "testStop" + }, + { + label: "Set the volume of current VideoBroadcastObject to 15.", + method: "testSetVolume" + }, + { + label: "Don't pass argument to method which set the volume of Video-Broadcast Object.", + method: "testSetVolumeWithoutArgument" + }, + { + label: "Set the volume of current VideoBroadcastObject with a float value.", + method: "testSetVolumeWithFloatArgument" + }, + { + label: "Set the volume of current VideoBroadcastObject with a float value superior of bound max.", + method: "testSetVolumeWithFloatUnderBoundMin" + }, + { + label: "Set the volume of current VideoBroadcastObject with a float value inferior of bound min.", + method: "testSetVolumeWithFloatAboveBoundMax" + }, + { + label: "Set the volume of current VideoBroadcastObject inferior to 0.", + method: "testSetVolumeWithValueUnderBoundMin" + }, + { + label: "Set the volume of current VideoBroadcastObject superior to 100.", + method: "testSetVolumeWithValueAboveBoundMax" + }, + { + label: "Get the volume of current VideoBroadcastObject.", + method: "testGetVolume" + }, + { + label: "Set a channel in presenting state.", + method: "testSetChannelInPresenting" + }, + { + label: "Call method 'setChannel' with null in presenting state.", + method: "testSetChannelInPresentingWithNull" } ]},{ name: "SearchManagerTest", object: new SearchManagerTest(), tests: [ { - label: "Search manager creation.", - method: "testSearchManagerInit" - }, - { label: "Obtain current program according to oipf norm.", method: "testGetCurrentProgram" } @@ -74,6 +294,22 @@ .then(loop).catch(loop); }, + runSectionTest : 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.runSectionTest(indexObject, indexTest + 1); + } + }; + + this.updateTestResult(tests[indexTest], object) + .then(loop).catch(loop); + }, + run: function(indexObject, indexTest) { var element = this.testsObjects[indexObject]; var object = element.object; @@ -83,29 +319,34 @@ }, displayInLineArray: function() { - var content = "<div id='testsDisplay'>Test Page <button id='runAllBtn'>Run All</button>"; + var content = "<div id='testsDisplay'><button id='runAllBtn'>Run All</button>"; 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]; + content += "<div id='" + currentObject.name + "Title'>" + + "Section " + currentObject.name + + "<button id='" + currentObject.name + "HideShowBtn'>Hide/Show</button>" + + "<button id='runAll" + currentObject.name + "Btn'>Run tests of this section</button>"; + content += "</div>"; + content += "<div id='" + currentObject.name + "Section' style='display:none;'>"; + content += "<table id='" + currentObject.name + "Table'>"; + 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>"; + + var currentObject = testsObjects[i]; var tests = currentObject["tests"]; for (var j = 0; j < tests.length; j++) { - + var currentTest = tests[j]; content += "<tr id='" + currentTest["method"] + "'>"; content += "<td>" + currentTest["method"] + "</td>"; @@ -113,41 +354,47 @@ content += "<td id='" + currentTest["method"] + "Duration'>None</td>"; content += "<td id='" + currentTest["method"] + "Result'>None</td>"; content += "<td><button id='" + currentTest["method"] + "Btn" + "'>Run</button></td>"; + content += "</tr>"; } - content += "</tr>"; + content += "</tbody>"; + content += "</table>"; + content += "</div>"; } - content += "</tbody>"; - - content += "</table>"; content += "</div>"; content += "</div>"; document.body.innerHTML = content; }, + + updateTestResult: function(currentTest, object) { console.group(currentTest["label"]); - var timeStart = performance.now(); + var timeStart = new Date(); var self = this; return new Promise(function(resolve, reject) { try { + timeout(5000) + .then(reject.bind(this, "No result returned.")) + .then(object.afterTest.bind(object)); object.beforeTest && object.beforeTest(resolve, reject); - object[currentTest["method"]](resolve, reject); - timeout(5000).then(reject("No result returned.")); + object[currentTest["method"]] && object[currentTest["method"]](resolve, reject); } catch (error) { reject(error); } }) .then(function(val) { console.groupEnd(currentTest["label"]); - var timeEnd = performance.now(); - self.updateTestResultSuccess(timeStart, timeEnd, currentTest, val); + var timeEnd = new Date(); + self.updateTestResultSuccess(timeStart, timeEnd, currentTest, val); + object.afterTest && object.afterTest(); }) .catch(function(val) { console.log(val); console.groupEnd(currentTest["label"]); - var timeEnd = performance.now(); + var timeEnd = new Date(); self.updateTestResultError(timeStart, timeEnd, currentTest, val); + object.afterTest && object.afterTest(); }); }, @@ -155,7 +402,7 @@ 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";

1 0

r987 - oipf/view
by ygrego＠users.nuiton.org 31 Mar '15

31 Mar '15

Author: ygrego Date: 2015-03-31 07:48:04 +0000 (Tue, 31 Mar 2015) New Revision: 987 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/987 Log: New methods added for manage event on page "test.html", and new javscript sources files. Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-03-31 07:45:53 UTC (rev 986) +++ oipf/view/test.html 2015-03-31 07:48:04 UTC (rev 987) @@ -9,11 +9,17 @@ <title>OIPF Tests</title> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link rel="stylesheet" type="text/css" href="css/test.css"/> + <link rel="stylesheet" type="text/css" href="../css/test.css"/> + <script src="../js/utils/es6-promises.js" type="text/javascript"></script> + <script> + var Promise = Promise || ES6Promise.Promise; + </script> <script src="../js/lib/Class.js" type="text/javascript"></script> + <script src="../js/utils/Timeout.js" type="text/javascript"></script> <script src="../js/utils/Calculation.js" type="text/javascript"></script> <script src="../js/utils/ChannelUtils.js" type="text/javascript"></script> <script src="../js/utils/Utils.js" type="text/javascript"></script> + <script src="../js/utils/EventManager.js" type="text/javascript"></script> <script src="../js/impl/model/FavouriteList.js" type="text/javascript"></script> <script src="../js/impl/model/FavouriteListCollection.js" type="text/javascript"></script> <script src="../js/impl/model/IntegerCollection.js" type="text/javascript"></script> @@ -29,43 +35,76 @@ <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/model/constants/IdType.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> <script src="../js/impl/VideoBroadcastObject.js" type="text/javascript"></script> <script src="../js/impl/SearchManagerObject.js" type="text/javascript"></script> + <script src="../js/utils/ChannelService.js" type="text/javascript"></script> + <script src="../data/data.js" type="text/javascript"></script> + <script src="../js/initObj/init.js" type="text/javascript"></script> <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> <script> function start() { var tests = new Test(); tests.displayInLineArray(); - addListenerForEachTestButton(tests); - document.getElementById("runAllBtn").addEventListener("click",tests.runAll.bind(tests),false); + addListenerForButton(tests); + document.getElementById("runAllBtn").onclick = tests.runAll.bind(tests); +// if (ApplicationManager && !ApplicationManager.getWindows()[0].active) { +// ApplicationManager.getWindows()[0].activate(); +// } } + function hideOrShowTestSection(sectionId) { var style = document.getElementById(sectionId).style; style.display = (style.display == "none") ? "block" : "none"; } - function addListenerForEachTestButton(testClass){ + + function runAndShow(i, testClass) { + testClass.runSectionTest(i, 0); + var style = document.getElementById((/runAll(\w+)Btn/g + .exec(document.activeElement.id))[1] + "Section").style; + if (style.display == "none") { + style.display = "block"; + } + } + + function addListenerForButton(testClass){ for (var i = 0, l0 = testClass.testsObjects.length; i < l0; i++) { - var currentElement = testClass.testsObjects[i]; + document.getElementById(currentElement.name + "HideShowBtn").onclick = + hideOrShowTestSection.bind(this, currentElement.name + "Section"); + document.getElementById("runAll" + currentElement.name + "Btn").onclick = + runAndShow.bind(this, i, testClass); + var currentTests = currentElement["tests"]; for (var j = 0, l1 = currentTests.length; j < l1; j++) { var testCase = currentTests[j]; - document.getElementById(testCase["method"] + "Btn").addEventListener("click", testClass.updateTestResult.bind(testClass, testCase, currentElement["object"]), false); + document.getElementById(testCase["method"] + "Btn").onclick = + testClass.updateTestResult.bind(testClass, testCase, currentElement["object"]); } } } + + function onEnter() { + document.activeElement.onclick && document.activeElement.onclick(); + } + + var onEventDo = { + "Enter" : onEnter + }; + + document.onkeydown = function(e) { + onEventDo[e.keyIdentifier] && onEventDo[e.keyIdentifier].call(null); + }; </script> </head> <body onload="start()">

1 0