Author: jruchaud Date: 2015-06-09 12:16:27 +0000 (Tue, 09 Jun 2015) New Revision: 1641 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1641 Log: Fix dependency for test Added: oipf/test/js/TestConfig.js Removed: oipf/lib/configuration/TestConfig.js Modified: oipf/test/server.js oipf/test/view/test.html Deleted: oipf/lib/configuration/TestConfig.js =================================================================== --- oipf/lib/configuration/TestConfig.js 2015-06-09 12:09:46 UTC (rev 1640) +++ oipf/lib/configuration/TestConfig.js 2015-06-09 12:16:27 UTC (rev 1641) @@ -1,226 +0,0 @@ -/* - * 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. - */ - -if (!String.prototype.includes) { - String.prototype.includes = function() {'use strict'; - return String.prototype.indexOf.apply(this, arguments) !== -1; - }; -} - -var userAgent = navigator.userAgent; - -if (userAgent.includes("HbbTV") || userAgent.includes("SmartTv")) { - - console.log("OIPF TESTS ON TV PLATFORM"); - var hbbTv = ApplicationManager.getWindows[2]; - hbbTv && hbbTv.deactivate(); - var ui = ApplicationManager.getWindows()[0]; //or getWindowsByName - ui && ui.keySet.setValue(0x10, []); - !ui.visible && ui.show(); - ui.activate(); - - var VideoBroadcastManager = VideoBroadcastTest.extend({ - - init: function() { -// this.superBeforeTest = VideoBroadcastTest.prototype.super.beforeTest; - this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); - - this.superBeforeTest = this.super.beforeTest; - this.superOnChangeState = this.super.onChangeState; - }, - - onChangeState: function(resolve, reject, event) { - this.superOnChangeState.call(this, - resolve, reject, event.state, event.error); - }, - - beforeTest: function(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; - this.channel = null; - this.timerManager = new TimerManager(); - this.timeout = this.timerManager.createTimer.bind(this.timerManager); - logTest("State: Pending"); - this.cancel = true; - }, - - unrealizedToConnecting: function(begin, end, callback) { - if (callback) { - throw ("Untestable Case."); - } - }, - - connectingToPresenting: function(begin, end, callback) { - /** - * Avoid that the future transition C->P be canceled. - * More extend super method beforeTest in order to reset - * 'startEndStates' property. - */ - if (this.cancel) { - callback && this.timeout().then(callback).then(console.log.bind(console, "TOTO")); - this.cancel = false; - } else { - this.pushTransition(begin, end, callback, null); - } - }, - - unrealizedToUnrealized: function(begin, end, callback) { - this.reject("Untestable Case."); - }, - - stopToStop: function(begin, end, callback) { - this.reject("Untestable Case."); - }, - - noStatesDefined: function(begin, end, callback) { - this.reject("Untestable Case."); - }, - - startEndStates: { - - "00": "unrealizedToUnrealized", - "01": "unrealizedToConnecting", - "12": "connectingToPresenting", - "33": "stopToStop", - "nullnull": "noStatesDefined" - }, - - pushTransition: function(begin, end, callback, error) { - this.transitions.push({ - begin: begin, - end: end, - error: error, - callback: callback - }); - }, - - pushTransitionWithError: function(begin, end, callback, error) { - var method = this.startEndStates[""+begin+end]; - if (method) { - this[method].call(this, begin, end, callback); - } else { - this.pushTransition(begin, end, callback, error); - } - }, - - addTransition: function(begin, end, callback) { - this.addTransitionWithError(begin, end, callback, null); - }, - - addTransitionWithError: function(begin, end, callback, error) { - this.pushTransitionWithError(begin, end, callback, error); - } - }); - - var VideoBroadcastTest = VideoBroadcastManager.extend({ - - init: function() { - this.super.init(); - } - - }); - - var SearchManagerTest = SearchManagerTest.extend({ - init: function() { - this.searchManagerObj = oipfObjectFactory.createSearchManagerObject(); - this.super.init(); - }, - - beforeTest: function(resolve, reject) { - this.super.beforeTest(resolve, reject); - this.cancel = true; - }, - - noStatesDefined: function(begin, end, callback) { - this.reject("Untestable Case."); - }, - - unrealizedToConnecting: function(begin, end, callback) { - if (callback) { - throw ("Untestable Case."); - } - }, - - connectingToPresenting: function(begin, end, callback) { - /** - * Avoid that the future transition C->P be canceled. - * More extend super method beforeTest in order to reset - * 'startEndStates' property. - */ - if (this.cancel) { - callback && this.timeout().then(callback).then(console.log.bind(console, "TOTO")); - this.cancel = false; - } else { - this.pushTransition(begin, end, callback, null); - } - }, - - startEndStates: { - - "00": "unrealizedToUnrealized", - "01": "unrealizedToConnecting", - "12": "connectingToPresenting", - "33": "stopToStop", - "nullnull": "noStatesDefined" - }, - - pushTransition: function(begin, end, callback, error) { - this.transitions.push({ - begin: begin, - end: end, - error: error, - callback: callback - }); - }, - - pushTransitionWithError: function(begin, end, callback, error) { - var method = this.startEndStates[""+begin+end]; - if (method) { - this[method].call(this, begin, end, callback); - } else { - this.pushTransition(begin, end, callback, error); - } - }, - - addTransition: function(begin, end, callback) { - this.addTransitionWithError(begin, end, callback, null); - }, - - addTransitionWithError: function(begin, end, callback, error) { - this.pushTransitionWithError(begin, end, callback, error); - } - }); - - var RecordingSchedulerTest = RecordingSchedulerTest.extend({ - - init: function() { - this.super.init(); - this.blocked = function() {}; - this.bindToCurrentChannel = this.blocked; - this.onChangeState = this.blocked; - this.createVideoBroadcast = function() { - if (!this.vidBroadObj) { - this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); - } - } - }, - - onPVREvent: function(resolve, reject, event) { - console.log("beforeTest"); - this.super.onPVREvent(resolve, reject, event.state, event.recording); - }, - - beforeTest: function(resolve, reject) { - console.log("beforeTest"); - this.super.beforeTest(resolve, reject); - } - - }); - -} Copied: oipf/test/js/TestConfig.js (from rev 1634, oipf/lib/configuration/TestConfig.js) =================================================================== --- oipf/test/js/TestConfig.js (rev 0) +++ oipf/test/js/TestConfig.js 2015-06-09 12:16:27 UTC (rev 1641) @@ -0,0 +1,226 @@ +/* + * 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. + */ + +if (!String.prototype.includes) { + String.prototype.includes = function() {'use strict'; + return String.prototype.indexOf.apply(this, arguments) !== -1; + }; +} + +var userAgent = navigator.userAgent; + +if (userAgent.includes("HbbTV") || userAgent.includes("SmartTv")) { + + console.log("OIPF TESTS ON TV PLATFORM"); + var hbbTv = ApplicationManager.getWindows[2]; + hbbTv && hbbTv.deactivate(); + var ui = ApplicationManager.getWindows()[0]; //or getWindowsByName + ui && ui.keySet.setValue(0x10, []); + !ui.visible && ui.show(); + ui.activate(); + + var VideoBroadcastManager = VideoBroadcastTest.extend({ + + init: function() { +// this.superBeforeTest = VideoBroadcastTest.prototype.super.beforeTest; + this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); + + this.superBeforeTest = this.super.beforeTest; + this.superOnChangeState = this.super.onChangeState; + }, + + onChangeState: function(resolve, reject, event) { + this.superOnChangeState.call(this, + resolve, reject, event.state, event.error); + }, + + beforeTest: function(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; + this.channel = null; + this.timerManager = new TimerManager(); + this.timeout = this.timerManager.createTimer.bind(this.timerManager); + logTest("State: Pending"); + this.cancel = true; + }, + + unrealizedToConnecting: function(begin, end, callback) { + if (callback) { + throw ("Untestable Case."); + } + }, + + connectingToPresenting: function(begin, end, callback) { + /** + * Avoid that the future transition C->P be canceled. + * More extend super method beforeTest in order to reset + * 'startEndStates' property. + */ + if (this.cancel) { + callback && this.timeout().then(callback).then(console.log.bind(console, "TOTO")); + this.cancel = false; + } else { + this.pushTransition(begin, end, callback, null); + } + }, + + unrealizedToUnrealized: function(begin, end, callback) { + this.reject("Untestable Case."); + }, + + stopToStop: function(begin, end, callback) { + this.reject("Untestable Case."); + }, + + noStatesDefined: function(begin, end, callback) { + this.reject("Untestable Case."); + }, + + startEndStates: { + + "00": "unrealizedToUnrealized", + "01": "unrealizedToConnecting", + "12": "connectingToPresenting", + "33": "stopToStop", + "nullnull": "noStatesDefined" + }, + + pushTransition: function(begin, end, callback, error) { + this.transitions.push({ + begin: begin, + end: end, + error: error, + callback: callback + }); + }, + + pushTransitionWithError: function(begin, end, callback, error) { + var method = this.startEndStates[""+begin+end]; + if (method) { + this[method].call(this, begin, end, callback); + } else { + this.pushTransition(begin, end, callback, error); + } + }, + + addTransition: function(begin, end, callback) { + this.addTransitionWithError(begin, end, callback, null); + }, + + addTransitionWithError: function(begin, end, callback, error) { + this.pushTransitionWithError(begin, end, callback, error); + } + }); + + var VideoBroadcastTest = VideoBroadcastManager.extend({ + + init: function() { + this.super.init(); + } + + }); + + var SearchManagerTest = SearchManagerTest.extend({ + init: function() { + this.searchManagerObj = oipfObjectFactory.createSearchManagerObject(); + this.super.init(); + }, + + beforeTest: function(resolve, reject) { + this.super.beforeTest(resolve, reject); + this.cancel = true; + }, + + noStatesDefined: function(begin, end, callback) { + this.reject("Untestable Case."); + }, + + unrealizedToConnecting: function(begin, end, callback) { + if (callback) { + throw ("Untestable Case."); + } + }, + + connectingToPresenting: function(begin, end, callback) { + /** + * Avoid that the future transition C->P be canceled. + * More extend super method beforeTest in order to reset + * 'startEndStates' property. + */ + if (this.cancel) { + callback && this.timeout().then(callback).then(console.log.bind(console, "TOTO")); + this.cancel = false; + } else { + this.pushTransition(begin, end, callback, null); + } + }, + + startEndStates: { + + "00": "unrealizedToUnrealized", + "01": "unrealizedToConnecting", + "12": "connectingToPresenting", + "33": "stopToStop", + "nullnull": "noStatesDefined" + }, + + pushTransition: function(begin, end, callback, error) { + this.transitions.push({ + begin: begin, + end: end, + error: error, + callback: callback + }); + }, + + pushTransitionWithError: function(begin, end, callback, error) { + var method = this.startEndStates[""+begin+end]; + if (method) { + this[method].call(this, begin, end, callback); + } else { + this.pushTransition(begin, end, callback, error); + } + }, + + addTransition: function(begin, end, callback) { + this.addTransitionWithError(begin, end, callback, null); + }, + + addTransitionWithError: function(begin, end, callback, error) { + this.pushTransitionWithError(begin, end, callback, error); + } + }); + + var RecordingSchedulerTest = RecordingSchedulerTest.extend({ + + init: function() { + this.super.init(); + this.blocked = function() {}; + this.bindToCurrentChannel = this.blocked; + this.onChangeState = this.blocked; + this.createVideoBroadcast = function() { + if (!this.vidBroadObj) { + this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); + } + } + }, + + onPVREvent: function(resolve, reject, event) { + console.log("beforeTest"); + this.super.onPVREvent(resolve, reject, event.state, event.recording); + }, + + beforeTest: function(resolve, reject) { + console.log("beforeTest"); + this.super.beforeTest(resolve, reject); + } + + }); + +} Modified: oipf/test/server.js =================================================================== --- oipf/test/server.js 2015-06-09 12:09:46 UTC (rev 1640) +++ oipf/test/server.js 2015-06-09 12:16:27 UTC (rev 1641) @@ -8,4 +8,4 @@ }); app.listen(3000); -console.log("Server running at http://192.168.99.190:3000/"); +console.log("Server running at http://localhost:3000/"); Modified: oipf/test/view/test.html =================================================================== --- oipf/test/view/test.html 2015-06-09 12:09:46 UTC (rev 1640) +++ oipf/test/view/test.html 2015-06-09 12:16:27 UTC (rev 1641) @@ -8,91 +8,24 @@ <head> <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"/> - <script src="../js/utils/es6-promises.js" type="text/javascript"></script> - <script> - var Promise = Promise || ES6Promise.Promise; - </script> - <script src="../js/impl/model/constants/VideoBroadcastConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/ParentalControlManagerConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/RecordingSchedulerConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/ConfigurationConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/MetadataSearchConstants.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/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/utils/TimerManager.js" type="text/javascript"></script> - <script src="../js/utils/TimerRecordingManager.js" type="text/javascript"></script> - <script src="../js/utils/MetadataManager.js" type="text/javascript"></script> - <script src="../js/utils/DateUtils.js" type="text/javascript"></script> - <script src="../js/utils/XmlParser.js" type="text/javascript"></script> - <script src="../js/utils/ProgrammeService.js" type="text/javascript"></script> - <script src="../js/utils/XmlToJson.js" type="text/javascript"></script> - <script src="../js/utils/ProgrammeHelper.js" type="text/javascript"></script> - - <script src="../configuration/ConfigDefaultProperties.js" type="text/javascript"></script> - <script src="../configuration/CapabilitiesProperties.js" type="text/javascript"></script> - <script src="../configuration/OipfConfiguration.js" type="text/javascript"></script> - - <script src="../js/impl/model/Collection.js" type="text/javascript"></script> - <script src="../js/impl/model/SignalInfo.js" type="text/javascript"></script> - <script src="../js/impl/model/LNBInfo.js" type="text/javascript"></script> - <script src="../js/impl/model/NetworkInterface.js" type="text/javascript"></script> - <script src="../js/impl/model/FavouriteList.js" type="text/javascript"></script> - <script src="../js/impl/model/Programme.js" type="text/javascript"></script> - <script src="../js/impl/model/AVOutput.js" type="text/javascript"></script> - <script src="../js/impl/model/Tuner.js" type="text/javascript"></script> - <script src="../js/impl/model/IntegerCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/AVOutputCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/TunerCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/NetworkInterfaceCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/FavouriteListCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/ScheduledRecordingCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/Query.js" type="text/javascript"></script> - <script src="../js/impl/model/Configuration.js" type="text/javascript"></script> - <script src="../js/impl/model/LocalSystem.js" type="text/javascript"></script> - <script src="../js/impl/model/Channel.js" type="text/javascript"></script> - <script src="../js/impl/model/ChannelList.js" type="text/javascript"></script> - <script src="../js/impl/model/MetadataSearch.js" type="text/javascript"></script> - <script src="../js/impl/model/SearchResults.js" type="text/javascript"></script> - <script src="../js/impl/model/ScheduledRecording.js" type="text/javascript"></script> - <script src="../js/impl/model/Recording.js" type="text/javascript"></script> - <script src="../js/impl/model/Application.js" type="text/javascript"></script> - <script src="../js/impl/model/ApplicationCollection.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/impl/RecordingSchedulerObject.js" type="text/javascript"></script> - <script src="../js/impl/CapabilitiesObject.js" type="text/javascript"></script> - <script src="../js/impl/ParentalControlManagerObject.js" type="text/javascript"></script> - <script src="../js/impl/ApplicationManagerObject.js" type="text/javascript"></script> - - <script src="../js/utils/ChannelService.js" type="text/javascript"></script> - <script src="../js/impl/model/ModelFactory.js" type="text/javascript"></script> - <script src="../init/init.js" type="text/javascript"></script> - - <script src="../js/test/TestCase.js" type="text/javascript"></script> - <script src="../js/test/ApplicationManagerTest.js" type="text/javascript"></script> - <script src="../js/test/CapabilitiesTest.js" type="text/javascript"></script> - <script src="../js/test/ParentalControlManagerTest.js" type="text/javascript"></script> - <script src="../js/test/RecordingSchedulerTest.js" type="text/javascript"></script> - <script src="../js/test/ConfigurationTest.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="../configuration/TestConfig.js" type="text/javascript"></script> - <script src="../js/test/Test.js" type="text/javascript"></script> + <script src="../../lib/build/oipf-lib.js" type="text/javascript"></script> + + <script src="../js/TestCase.js" type="text/javascript"></script> + <script src="../js/ApplicationManagerTest.js" type="text/javascript"></script> + <script src="../js/CapabilitiesTest.js" type="text/javascript"></script> + <script src="../js/ParentalControlManagerTest.js" type="text/javascript"></script> + <script src="../js/RecordingSchedulerTest.js" type="text/javascript"></script> + <script src="../js/ConfigurationTest.js" type="text/javascript"></script> + <script src="../js/SearchManagerTest.js" type="text/javascript"></script> + <script src="../js/VideoBroadcastTest.js" type="text/javascript"></script> + <script src="../js/OipfFactoryTest.js" type="text/javascript"></script> + <script src="../js/TestConfig.js" type="text/javascript"></script> + <script src="../js/Test.js" type="text/javascript"></script> + <script> var tests = new Test(); var displayConfig = {