updated the integration tests and changed their line endings to unix.
--- a/test/integration/html5-video.htm Wed Dec 14 11:26:15 2011 +0100
+++ b/test/integration/html5-video.htm Wed Dec 14 11:26:44 2011 +0100
@@ -1,65 +1,65 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html dir="ltr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml" lang="fr">
-
-<head>
-
-</head>
-
-<body>
-
- <div style="width:650px;font-family: 'Trebuchet MS', 'Helvetica', 'Arial', 'Verdana', 'sans-serif';">
- <h1>MetaDataPlayer </h1>
- Test d'intégration du widget du player avec Popcorn (jwplayer).
- </div>
-
-
- <!-- START Integration ###################################### -->
- <!-- SIMPLE PLAYER EXPERIMENTATION -->
- <script type="text/javascript" src="../../build/LdtPlayer-release.js"></script>
- <script src="../../res/js/jquery.min.js"></script>
- <script src="../../res/js/jquery.tools.min.js"></script>
- <script src="../../res/js/jquery-ui.min.js"></script>
- <div id="LdtPlayer"></div>
-
- <script type="text/javascript">
- $(document).ready(function() {
- var config = {
- gui:{
- width:650,
- height:1,
- mode:'video',
- container:'LdtPlayer',
- debug:true,
- css:'../../src/css/LdtPlayer.css',
- widgets : [{
- type: "PlayerWidget", // please note that type refers directly to the constructor of the widget.
- mode: "radio",
- metadata:{
- format:'cinelab',
- src:'../test.json',
- type:'json'}
- },
- {type: "SliderWidget",
- metadata:{
- format:'cinelab',
- src:'../test.json',
- type:'json'}
- },
- ]},
- player:{
- type:'html5',
- file:'../trailer.ogv',
- duration: 50}
- };
-
- IriSP.loadLibs(IriSP.lib, config.gui.css, function() {
- var layoutManager = new IriSP.LayoutManager(config.gui.container);
- var pop = IriSP.configurePopcorn(layoutManager, config.player);
-
- var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); });
-
- });
- </script>
-
- </body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html dir="ltr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml" lang="fr">
+
+<head>
+
+</head>
+
+<body>
+
+ <div style="width:650px;font-family: 'Trebuchet MS', 'Helvetica', 'Arial', 'Verdana', 'sans-serif';">
+ <h1>MetaDataPlayer </h1>
+ Test d'intégration du widget du player avec Popcorn (jwplayer).
+ </div>
+
+
+ <!-- START Integration ###################################### -->
+ <!-- SIMPLE PLAYER EXPERIMENTATION -->
+ <script type="text/javascript" src="../../build/LdtPlayer-release.js"></script>
+ <script src="../../res/js/jquery.min.js"></script>
+ <script src="../../res/js/jquery.tools.min.js"></script>
+ <script src="../../res/js/jquery-ui.min.js"></script>
+ <div id="LdtPlayer"></div>
+
+ <script type="text/javascript">
+ $(document).ready(function() {
+ var config = {
+ gui:{
+ width:650,
+ height:1,
+ mode:'video',
+ container:'LdtPlayer',
+ debug:true,
+ css:'../../src/css/LdtPlayer.css',
+ widgets : [{
+ type: "PlayerWidget", // please note that type refers directly to the constructor of the widget.
+ mode: "radio",
+ metadata:{
+ format:'cinelab',
+ src:'../test.json',
+ type:'json'}
+ },
+ {type: "SliderWidget",
+ metadata:{
+ format:'cinelab',
+ src:'../test.json',
+ type:'json'}
+ },
+ ]},
+ player:{
+ type:'html5',
+ file:'../trailer.ogv',
+ duration: 50}
+ };
+
+ IriSP.loadLibs(IriSP.lib, config.gui.css, '../test.json', function() {
+ var layoutManager = new IriSP.LayoutManager(config.gui.container);
+ var pop = IriSP.configurePopcorn(layoutManager, config.player);
+
+ var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); });
+
+ });
+ </script>
+
+ </body>
</html>
\ No newline at end of file
--- a/test/integration/jwplayer-video.htm Wed Dec 14 11:26:15 2011 +0100
+++ b/test/integration/jwplayer-video.htm Wed Dec 14 11:26:44 2011 +0100
@@ -1,70 +1,70 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html dir="ltr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml" lang="fr">
-
-<head>
-
-</head>
-
-<body>
-
- <div style="width:650px;font-family: 'Trebuchet MS', 'Helvetica', 'Arial', 'Verdana', 'sans-serif';">
- <h1>MetaDataPlayer </h1>
- Test d'intégration du widget du player avec Popcorn (jwplayer).
- </div>
-
-
- <!-- START Integration ###################################### -->
- <!-- SIMPLE PLAYER EXPERIMENTATION -->
- <script type="text/javascript" src="../../build/LdtPlayer-release.js" type="text/javascript"></script>
- <script src="../../res/js/jquery.min.js" type="text/javascript"></script>
- <script src="../../res/js/jquery.tools.min.js" type="text/javascript"></script>
- <script src="../../res/js/jquery-ui.min.js" type="text/javascript"></script>
-
- <div id="video"></div>
- <div id="LdtPlayer"></div>
-
- <script type="text/javascript">
- $(document).ready(function() {
- var config = {
- gui:{
- width:650,
- height:1,
- mode:'video',
- container:'LdtPlayer',
- debug:true,
- css:'../../src/css/LdtPlayer.css',
- widgets : [{
- type: "PlayerWidget", // please note that type refers directly to the constructor of the widget.
- mode: "radio",
- metadata:{
- format:'cinelab',
- src:'../test.json',
- type:'json'}
- },
- {type: "SliderWidget",
- metadata:{
- format:'cinelab',
- src:'../test.json',
- type:'json'}
- }
- ],
- player:{
- type:'jwplayer',
- flashplayer:'../../res/swf/player.swf',
- file:'http://127.0.0.1/mdp/test/trailer.mp4',
- provider:'video',
- duration: 50}
- };
-
- IriSP.loadLibs(IriSP.lib, config.gui.css, function() {
- var layoutManager = new IriSP.LayoutManager(config.gui.container);
- var pop = IriSP.configurePopcorn(layoutManager, config.player);
-
- var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); });
-
- });
- </script>
-
-
- </body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html dir="ltr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml" lang="fr">
+
+<head>
+
+</head>
+
+<body>
+
+ <div style="width:650px;font-family: 'Trebuchet MS', 'Helvetica', 'Arial', 'Verdana', 'sans-serif';">
+ <h1>MetaDataPlayer </h1>
+ Test d'intégration du widget du player avec Popcorn (jwplayer).
+ </div>
+
+
+ <!-- START Integration ###################################### -->
+ <!-- SIMPLE PLAYER EXPERIMENTATION -->
+ <script type="text/javascript" src="../../build/LdtPlayer-release.js" type="text/javascript"></script>
+ <script src="../../res/js/jquery.min.js" type="text/javascript"></script>
+ <script src="../../res/js/jquery.tools.min.js" type="text/javascript"></script>
+ <script src="../../res/js/jquery-ui.min.js" type="text/javascript"></script>
+
+ <div id="video"></div>
+ <div id="LdtPlayer"></div>
+
+ <script type="text/javascript">
+ $(document).ready(function() {
+ var config = {
+ gui:{
+ width:650,
+ height:1,
+ mode:'video',
+ container:'LdtPlayer',
+ debug:true,
+ css:'../../src/css/LdtPlayer.css',
+ widgets : [{
+ type: "PlayerWidget", // please note that type refers directly to the constructor of the widget.
+ mode: "radio",
+ metadata:{
+ format:'cinelab',
+ src:'../test.json',
+ type:'json'}
+ },
+ {type: "SliderWidget",
+ metadata:{
+ format:'cinelab',
+ src:'../test.json',
+ type:'json'}
+ }
+ ]},
+ player:{
+ type:'jwplayer',
+ flashplayer:'../../res/swf/player.swf',
+ file:'../trailer.mp4',
+ provider:'video',
+ duration: 50}
+ };
+
+ IriSP.loadLibs(IriSP.lib, config.gui.css, "../test.json", function() {
+ var layoutManager = new IriSP.LayoutManager(config.gui.container);
+ var pop = IriSP.configurePopcorn(layoutManager, config.player);
+
+ var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); });
+
+ });
+ </script>
+
+
+ </body>
</html>
\ No newline at end of file
--- a/test/integration/polemic-youtube.htm Wed Dec 14 11:26:15 2011 +0100
+++ b/test/integration/polemic-youtube.htm Wed Dec 14 11:26:44 2011 +0100
@@ -109,7 +109,7 @@
}
};
- IriSP.loadLibs(IriSP.lib, config.gui.css,
+ IriSP.loadLibs(IriSP.lib, config.gui.css, "polemic_fr.json",
function() {
var layoutManager = new IriSP.LayoutManager(config.gui.container);
var pop = IriSP.configurePopcorn(layoutManager, config.player);
--- a/test/integration/radio.htm Wed Dec 14 11:26:15 2011 +0100
+++ b/test/integration/radio.htm Wed Dec 14 11:26:44 2011 +0100
@@ -1,92 +1,87 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html dir="ltr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml" lang="fr">
-
-<head>
-<title>Test d'intégration de l'initialisation</title>
-</head>
-
-<body>
-
- <div style="width:650px;font-family: 'Trebuchet MS', 'Helvetica', 'Arial', 'Verdana', 'sans-serif';">
- <h1>MetaDataPlayer </h1>
- Test d'intégration de l'initialisation.
- </div>
-
-
- <!-- START Integration ###################################### -->
- <!-- SIMPLE PLAYER EXPERIMENTATION -->
- <script type="text/javascript" src="../../build/LdtPlayer-release.js" type="text/javascript"></script>
- <script type="text/javascript" src="../../unittests/mockSerializer.js" type="text/javascript"></script>
- <script src="../../res/js/jquery.min.js" type="text/javascript"></script>
- <script src="../../res/js/jquery.tools.min.js" type="text/javascript"></script>
- <script src="../../res/js/jquery-ui.min.js" type="text/javascript"></script>
-
- <div id="video"></div>
- <div id="LdtPlayer"></div>
-
- <script type="text/javascript">
- $(document).ready(function() {
- var config = {
- gui:{
- width:650,
- height:2100,
- container:'LdtPlayer',
- css:'../../src/css/LdtPlayer.css',
- widgets: [
- {type: "PlayerWidget", // please note that type refers directly to the constructor of the widget.
- mode: "radio",
- metadata:{
- format:'cinelab',
- src:'../test.json',
- type:'json'}
- },
- {type: "SliderWidget",
- metadata:{
- format:'cinelab',
- src:'../test.json',
- type:'json'}
- },
- {type: "AnnotationsWidget",
- metadata:{
- format:'cinelab',
- src:'../test.json',
- type:'json'}
- },
- {type: "SegmentsWidget",
- metadata:{
- format:'cinelab',
- src:'../test.json',
- type:'json'}
- },
-
- ]
- },
- player:{
- type:'jwplayer', // player type
- container: 'PopcornContainer',
- // the rest is player-dependent configuration options.
- file : "video/franceculture/franceculture_retourdudimanche20100620.flv",
- streamer: "rtmp://media.iri.centrepompidou.fr/ddc_player/",
- flashplayer : '../libs/player.swf',
- live: true,
- "controlbar.position" : "none",
- height: 300,
- width: 200,
- provider: "rtmp"
- }
- };
-
- IriSP.loadLibs(IriSP.lib, config.gui.css,
- function() {
- var layoutManager = new IriSP.LayoutManager(config.gui.container);
- var pop = IriSP.configurePopcorn(layoutManager, config.player);
-
- var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); });
-
- });
- </script>
-
-
- </body>
- <div id="PopcornContainer"></div>
- </html>
\ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html dir="ltr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml" lang="fr">
+
+<head>
+<title>Test d'intégration de l'initialisation</title>
+</head>
+
+<body>
+
+ <div style="width:650px;font-family: 'Trebuchet MS', 'Helvetica', 'Arial', 'Verdana', 'sans-serif';">
+ <h1>MetaDataPlayer </h1>
+ Test d'intégration de l'initialisation.
+ </div>
+
+
+ <!-- START Integration ###################################### -->
+ <!-- SIMPLE PLAYER EXPERIMENTATION -->
+ <script type="text/javascript" src="../../build/LdtPlayer-release.js" type="text/javascript"></script>
+ <script type="text/javascript" src="../../unittests/mockSerializer.js" type="text/javascript"></script>
+ <script src="../../res/js/jquery.min.js" type="text/javascript"></script>
+ <script src="../../res/js/jquery.tools.min.js" type="text/javascript"></script>
+ <script src="../../res/js/jquery-ui.min.js" type="text/javascript"></script>
+
+ <div id="video"></div>
+ <div id="LdtPlayer"></div>
+
+ <script type="text/javascript">
+ $(document).ready(function() {
+ var config = {
+ gui:{
+ width:650,
+ height:2100,
+ container:'LdtPlayer',
+ css:'../../src/css/LdtPlayer.css',
+ widgets: [
+ {type: "PlayerWidget", // please note that type refers directly to the constructor of the widget.
+ mode: "radio",
+ metadata:{
+ format:'cinelab',
+ src:'../test.json',
+ type:'json'}
+ },
+ {type: "SliderWidget",
+ metadata:{
+ format:'cinelab',
+ src:'../test.json',
+ type:'json'}
+ },
+ {type: "AnnotationsWidget",
+ metadata:{
+ format:'cinelab',
+ src:'../test.json',
+ type:'json'}
+ },
+ {type: "SegmentsWidget",
+ metadata:{
+ format:'cinelab',
+ src:'../test.json',
+ type:'json'}
+ },
+
+ ]
+ },
+ player:{
+ type:'jwplayer', // player type
+ flashplayer : '../libs/player.swf',
+ live: true,
+ "controlbar.position" : "none",
+ height: 1, /* jwplayer doesn't want it to be 0 */
+ width: 200,
+ provider: "rtmp"
+ }
+ };
+
+ IriSP.loadLibs(IriSP.lib, config.gui.css, "../test.json",
+ function() {
+ var layoutManager = new IriSP.LayoutManager(config.gui.container);
+ var pop = IriSP.configurePopcorn(layoutManager, config.player);
+
+ var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); });
+
+ });
+ </script>
+
+
+ </body>
+ </html>
--- a/test/integration/youtube.htm Wed Dec 14 11:26:15 2011 +0100
+++ b/test/integration/youtube.htm Wed Dec 14 11:26:44 2011 +0100
@@ -1,90 +1,90 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html dir="ltr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml" lang="fr">
-
-<head>
-
-</head>
-
-<body>
-
- <div style="width:650px;font-family: 'Trebuchet MS', 'Helvetica', 'Arial', 'Verdana', 'sans-serif';">
- <h1>MetaDataPlayer </h1>
- Test d'intégration du widget du player avec Popcorn (Youtube).
- </div>
-
-
- <!-- START Integration ###################################### -->
- <!-- SIMPLE PLAYER EXPERIMENTATION -->
- <script type="text/javascript" src="../../build/LdtPlayer-release.js"></script>
- <script src="../../res/js/jquery.min.js"></script>
- <script src="../../res/js/jquery.tools.min.js"></script>
- <script src="../../res/js/jquery-ui.min.js"></script>
- <div id="LdtPlayer"></div>
-
- <script type="text/javascript">
- $(document).ready(function() {
- var config = {
- gui:{
- width:650,
- height:2100,
- container:'LdtPlayer',
- css:'../../src/css/LdtPlayer.css',
- widgets: [
- {type: "PlayerWidget", // please note that type refers directly to the constructor of the widget.
- mode: "radio",
- metadata:{
- format:'cinelab',
- src:'../test.json',
- type:'json'}
- },
- {type: "SliderWidget",
- metadata:{
- format:'cinelab',
- src:'../test.json',
- type:'json'}
- },
-
- {type: "SegmentsWidget", // please note that type refers directly to the constructor of the widget.
- mode: "radio",
- metadata:{
- format:'cinelab',
- src:'../test.json',
- type:'json'}
- },
-
- {type: "AnnotationsWidget", // please note that type refers directly to the constructor of the widget.
- mode: "radio",
- metadata:{
- format:'cinelab',
- src:'../test.json',
- type:'json'}
- },
-
- ]
- },
- player:{
- type:'youtube', // player type
- // the rest is player-dependent configuration options.
- video: "http://www.youtube.com/watch?v=rrkrvAUbU9Y",
- height: 400,
- width: 640,
- provider: "rtmp"
- }
- };
-
- IriSP.loadLibs(IriSP.lib, config.gui.css,
- function() {
- var layoutManager = new IriSP.LayoutManager(config.gui.container);
- var pop = IriSP.configurePopcorn(layoutManager, config.player);
-
- var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); });
-
- });
- </script>
-<div id='Ldt-Root'>
- <div id='Ldt-PlaceHolder'>
- </div>
-</div>
-<!-- END ################ ###################################### -->
- </body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html dir="ltr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml" lang="fr">
+
+<head>
+
+</head>
+
+<body>
+
+ <div style="width:650px;font-family: 'Trebuchet MS', 'Helvetica', 'Arial', 'Verdana', 'sans-serif';">
+ <h1>MetaDataPlayer </h1>
+ Test d'intégration du widget du player avec Popcorn (Youtube).
+ </div>
+
+
+ <!-- START Integration ###################################### -->
+ <!-- SIMPLE PLAYER EXPERIMENTATION -->
+ <script type="text/javascript" src="../../build/LdtPlayer-release.js"></script>
+ <script src="../../res/js/jquery.min.js"></script>
+ <script src="../../res/js/jquery.tools.min.js"></script>
+ <script src="../../res/js/jquery-ui.min.js"></script>
+ <div id="LdtPlayer"></div>
+
+ <script type="text/javascript">
+ $(document).ready(function() {
+ var config = {
+ gui:{
+ width:650,
+ height:2100,
+ container:'LdtPlayer',
+ css:'../../src/css/LdtPlayer.css',
+ widgets: [
+ {type: "PlayerWidget", // please note that type refers directly to the constructor of the widget.
+ mode: "radio",
+ metadata:{
+ format:'cinelab',
+ src:'../test.json',
+ type:'json'}
+ },
+ {type: "SliderWidget",
+ metadata:{
+ format:'cinelab',
+ src:'../test.json',
+ type:'json'}
+ },
+
+ {type: "SegmentsWidget", // please note that type refers directly to the constructor of the widget.
+ mode: "radio",
+ metadata:{
+ format:'cinelab',
+ src:'../test.json',
+ type:'json'}
+ },
+
+ {type: "AnnotationsWidget", // please note that type refers directly to the constructor of the widget.
+ mode: "radio",
+ metadata:{
+ format:'cinelab',
+ src:'../test.json',
+ type:'json'}
+ },
+
+ ]
+ },
+ player:{
+ type:'youtube', // player type
+ // the rest is player-dependent configuration options.
+ video: "http://www.youtube.com/watch?v=rrkrvAUbU9Y",
+ height: 400,
+ width: 640,
+ provider: "rtmp"
+ }
+ };
+
+ IriSP.loadLibs(IriSP.lib, config.gui.css, '../test.json',
+ function() {
+ var layoutManager = new IriSP.LayoutManager(config.gui.container);
+ var pop = IriSP.configurePopcorn(layoutManager, config.player);
+
+ var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); });
+
+ });
+ </script>
+<div id='Ldt-Root'>
+ <div id='Ldt-PlaceHolder'>
+ </div>
+</div>
+<!-- END ################ ###################################### -->
+ </body>
</html>
\ No newline at end of file