diff -r 892efe407182 -r 2ef47ccb290f unittests/tests/annotationsWidget.js --- a/unittests/tests/annotationsWidget.js Fri Oct 28 16:09:46 2011 +0200 +++ b/unittests/tests/annotationsWidget.js Fri Oct 28 16:43:59 2011 +0200 @@ -7,22 +7,16 @@ this.dt = new IriSP.DataLoader(); this.ser = new IriSP.MockSerializer(this.dt, "/url"); /* dummy serializer */ - + + IriSP.jQuery("#widget-div").append("
"); - IriSP.jQuery("#widget-div").append("
"); this.config = { - metadata:{ - format:'cinelab', - src:'test.json', - load:'json'}, - gui:{ width:650, height:1, mode:'radio', container:'widget-div', debug:true, - css:'../src/css/LdtPlayer.css'}, - }; + css:'../src/css/LdtPlayer.css'}; }, teardown: function() { /* free the popcorn object because it has signal handlers attached to it */ @@ -34,8 +28,8 @@ var widget = new IriSP.AnnotationsWidget(this.Popcorn, this.config, this.ser); widget.draw(); - equal(IriSP.jQuery("#Ldt-Ligne").length, 1, "test if the div has been added correctly"); - equal(IriSP.jQuery("#Ldt-Ligne #Ldt-SaKeyword").length, 1, "test if sub-div has been added correctly"); + equal(widget.selector.children(".Ldt-AnnotationsWidget").length, 1, "test if the div has been added correctly"); + equal(widget.selector.children(".Ldt-AnnotationsWidget").find(".Ldt-SaKeyword").length, 1, "test if sub-div has been added correctly"); }); test("test annotation display function", function() { @@ -43,8 +37,8 @@ widget.draw(); var annotation = {content: {"title": "title", "description": "description", "keywords": "keywords"}}; widget.displayAnnotation(annotation); - equal(IriSP.jQuery("#Ldt-SaTitle").text(), "title", "title set correctly"); - equal(IriSP.jQuery("#Ldt-SaDescription").text(), "description", "description set correctly"); - equal(IriSP.jQuery("#Ldt-SaKeywordText").text(), "Mots clefs : ", "keywords field set correctly"); + equal(widget.selector.find(".Ldt-SaTitle").text(), "title", "title set correctly"); + equal(widget.selector.find(".Ldt-SaDescription").text(), "description", "description set correctly"); + equal(widget.selector.find(".Ldt-SaKeywordText").text(), "", "keywords field set correctly"); }); }; \ No newline at end of file