renamed and trimmed the integration tests. popcorn-port
authorhamidouk
Wed, 09 Nov 2011 14:46:27 +0100
branchpopcorn-port
changeset 215 e03f5f886f52
parent 214 50c4609e50f4
child 216 d1e891627286
renamed and trimmed the integration tests.
test/integration/html5-video.htm
test/integration/index-jwplayer.htm
test/integration/index-radio.htm
test/integration/index-youtube.htm
test/integration/index.htm
test/integration/init-radio.htm
test/integration/jwplayer-video.htm
test/integration/layout-radio.htm
test/integration/layout-youtube.htm
test/integration/polemic-youtube.htm
test/integration/radio.htm
test/integration/youtube.htm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/integration/html5-video.htm	Wed Nov 09 14:46:27 2011 +0100
@@ -0,0 +1,58 @@
+<!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'}
+              }]},
+						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>
+ </html>
\ No newline at end of file
--- a/test/integration/index-jwplayer.htm	Wed Nov 09 10:26:42 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-<!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'}
-              }]},
-						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>
- </html>
\ No newline at end of file
--- a/test/integration/index-radio.htm	Wed Nov 09 10:26:42 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-<!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 = {
-						metadata:{
-							format:'cinelab',
-							src:'test.json',
-							load:'json'},
-						gui:{
-							width:650,
-							height:1,
-							mode:'video',
-							container:'LdtPlayer',
-							debug:true,
-							css:'../../src/css/LdtPlayer.css'},
-						player:{
-							type:'jwplayer',
-							src:'../libs/player.swf'}
-					};
-		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: "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:'jwplayer', // player type
-				  // 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: 1, 
-				  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>
-	
-	
- </body>
- </html>
\ No newline at end of file
--- a/test/integration/index-youtube.htm	Wed Nov 09 10:26:42 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-<!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 = {
-						metadata:{
-							format:'cinelab',
-							src:'test.json',
-							load:'json'},
-						gui:{
-							width:650,
-							height:64,
-							mode:'radio',
-							container:'LdtPlayer',
-							debug:true,
-							css:'../../src/css/LdtPlayer.css'},
-						player:{
-							type:'jwplayer',
-							src:'../res/swf/player.swf'}
-					};
-		
-		IriSP.loadLibs(IriSP.lib, config.gui.css, function() {});
-		
-		templ = "width: {{width}}px; height: {{height}}px; margin-bottom: 5px;";
-		var str = Mustache.to_html(templ, {width: config.gui.width, height: config.gui.height});    
-		// Popcorn.youtube wants us to specify the size of the player in the style attribute of its container div.
-		IriSP.jQuery("#Ldt-PlaceHolder").attr("style", str);
-		
-		var pop = Popcorn.youtube("#Ldt-PlaceHolder", "http://www.youtube.com/watch?v=lFtNG1wZ4zU", {controls: 0});    
-		var dt = new IriSP.DataLoader();
-		var ser = new IriSP.JSONSerializer(dt, "../test.json");
-		var player = new IriSP.PlayerWidget(pop, config, ser);
-		var annotationWidget = new IriSP.AnnotationsWidget(pop, config, ser);
-		var segmentsWidget = new IriSP.SegmentsWidget(pop, config, ser);
-		ser.sync(function() { player.draw();  annotationWidget.draw(); segmentsWidget.draw();});
-		
-	});
-	</script>
-<div id='Ldt-Root'>
-	<div id='Ldt-PlaceHolder'>
-	</div>
-</div>	
-<!-- END  ################  ###################################### -->
- </body>
- </html>
\ No newline at end of file
--- a/test/integration/index.htm	Wed Nov 09 10:26:42 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-<!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'}
-              }]},
-						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>
- </html>
\ No newline at end of file
--- a/test/integration/init-radio.htm	Wed Nov 09 10:26:42 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-<!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: "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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/integration/jwplayer-video.htm	Wed Nov 09 14:46:27 2011 +0100
@@ -0,0 +1,63 @@
+<!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'}
+              }]},
+						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>
+ </html>
\ No newline at end of file
--- a/test/integration/layout-radio.htm	Wed Nov 09 10:26:42 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-<!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 de gestionnaire de placement.
-	</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 = {
-						metadata:{
-							format:'cinelab',
-							src:'test.json',
-							load:'json'},
-						gui:{
-							width:650,
-							height:1,
-							mode:'video',
-							container:'LdtPlayer',
-							debug:true,
-							css:'../../src/css/LdtPlayer.css'},
-						player:{
-							type:'jwplayer',
-							src:'../libs/player.swf'}
-					};
-		
-		IriSP.loadLibs(IriSP.lib, config.gui.css, function() {});
-		var pop = Popcorn.jwplayer( '#video', "",{file : "video/franceculture/franceculture_retourdudimanche20100620.flv", streamer: "rtmp://media.iri.centrepompidou.fr/ddc_player/", flashplayer : config.player.src,
-                                     live: true, "controlbar.position" : "none", height: config.gui.height, width: config.gui.width, provider: "rtmp"});
-		
-		var dt = new IriSP.DataLoader();
-		var ser = new IriSP.JSONSerializer(dt, "../test.json");
-		var ser2 = new IriSP.JSONSerializer(dt, "../test.json");
-		
-		var lay = new IriSP.LayoutManager({divId : "LdtPlayer"});
-		lay.setPopcornInstance(pop);
-		
-		config.gui.container = lay.createDiv();
-		var player = new IriSP.PlayerWidget(pop, config.gui, ser);
-		
-		config.gui.container = lay.createDiv();
-		var annotationWidget = new IriSP.AnnotationsWidget(pop, config.gui, ser);
-		
-		config.gui.container = lay.createDiv();
-		var segmentsWidget = new IriSP.SegmentsWidget(pop, config.gui, ser);
-		ser.sync(function() { player.draw();  annotationWidget.draw(); segmentsWidget.draw();});
-		});
-	</script>
-	
-	
- </body>
- </html>
\ No newline at end of file
--- a/test/integration/layout-youtube.htm	Wed Nov 09 10:26:42 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-<!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 gestionnaire de placement (avec 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>
-	
-	<script  type="text/javascript">
-	$(document).ready(function() {
-		var config = {
-						metadata:{
-							format:'cinelab',
-							src:'test.json',
-							load:'json'},
-						gui:{
-							width:512,
-							height:384,
-							mode:'radio',
-							container:'LdtPlayer',
-							debug:true,
-							css:'../../src/css/LdtPlayer.css'},
-						player:{
-							type:'jwplayer',
-							src:'../res/swf/player.swf'}
-					};
-		
-		IriSP.loadLibs(IriSP.lib, config.gui.css, function() {});
-		
-		templ = "width: {{width}}px; height: {{height}}px; margin-bottom: 5px;";
-		var str = Mustache.to_html(templ, {width: config.gui.width, height: config.gui.height});    
-		// Popcorn.youtube wants us to specify the size of the player in the style attribute of its container div.
-		IriSP.jQuery("#video").attr("style", str);
-		
-		var pop = Popcorn.youtube("#video", "http://www.youtube.com/watch?v=lFtNG1wZ4zU", {controls: 0, autostart: false});    
-		
-		var dt = new IriSP.DataLoader();
-		var ser = new IriSP.JSONSerializer(dt, "../test.json");
-		var ser2 = new IriSP.JSONSerializer(dt, "../test.json");
-		
-		var lay = new IriSP.LayoutManager({divId : "LdtPlayer"});
-		lay.setPopcornInstance(pop);
-		
-		//config.gui.container = lay.createDiv();
-		var player = new IriSP.PlayerWidget(pop, config, ser);
-		
-		config.gui.container = lay.createDiv();
-		var annotationWidget = new IriSP.AnnotationsWidget(pop, config, ser);
-		
-		config.gui.container = lay.createDiv();
-		var segmentsWidget = new IriSP.SegmentsWidget(pop, config, ser);
-		ser.sync(function() { player.draw();  annotationWidget.draw(); segmentsWidget.draw();});
-		
-	});
-	</script>
-<div id='video'>
-</div>
-
-<div id="LdtPlayer">
-</div>
-<!-- END  ################  ###################################### -->
- </body>
- </html>
\ No newline at end of file
--- a/test/integration/polemic-youtube.htm	Wed Nov 09 10:26:42 2011 +0100
+++ b/test/integration/polemic-youtube.htm	Wed Nov 09 14:46:27 2011 +0100
@@ -66,7 +66,7 @@
 			player:{
 			type:'youtube', // player type
 			  // the rest is player-dependent configuration options.
-			  video: "http://www.youtube.com/watch?v=BeyFG9uQi8E", 
+			  video: "http://www.youtube.com/watch?v=rrkrvAUbU9Y", 
 			  height: 300, 
 			  width: 640, 
             }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/integration/radio.htm	Wed Nov 09 14:46:27 2011 +0100
@@ -0,0 +1,86 @@
+<!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: "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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/integration/youtube.htm	Wed Nov 09 14:46:27 2011 +0100
@@ -0,0 +1,84 @@
+<!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: "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>
+ </html>
\ No newline at end of file