--- a/unittests/index.html Mon Nov 14 17:19:49 2011 +0100
+++ b/unittests/index.html Tue Nov 15 10:52:43 2011 +0100
@@ -2,61 +2,70 @@
<head>
<title>Unit Tests</title>
<!-- the following libs are included only for unit testing -->
- <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">
+ /* global settings for require.js */
+ var require = {
+ baseUrl: "../src/js",
+
+ /* load absolutely everything at once */
+ deps: [/* external libs */
+ "../res/js/jquery.min.js", "../res/js/jquery.tools.min.js", "../res/js/jquery-ui.min.js",
+ "qunit.js", "sinon.js",
+ "sinon-ie.js", "sinon-qunit.js",
+
+ /* source files */
+ "IriSP", "widgets", "utils", "init", "layout", "site", "serializers/JSONSerializer", "widgets/playerWidget",
+ "widgets/annotationsWidget", "widgets/segmentsWidget", "widgets/toooltipWidget", "widgets/polemicWidget",
+ "widgets/sliderWidget",
+
+ /* test fixtures */
+ "mockSerializer.js",
+ "mockTweetSerializer.js",
+
+ /* test files */
+ "tests/dataloader.js", "tests/serializer.js", "tests/serializers/mockSerializer.js", "tests/serializers/mockTweetSerializer.js",
+ "tests/serializers/JSONSerializer.js", "tests/serializerFactory.js", "tests/widget.js", "tests/widgets/playerWidget.js",
+ "tests/widgets/annotationsWidget.js", "tests/widgets/segmentsWidget.js", "tests/layout.js", "tests/init.js",
+ "tests/widgets/tooltipWidget.js", "tests/widgets/polemicWidget.js", "tests/widgets/sliderWidget.js"
+ ],
+ callback: function() {
+ $(document).ready(function(){
+ /* only for unit-testing ! */
+ IriSP.jQuery = jQuery;
+
+ test_dataloader();
+ test_serializer();
+ test_mockSerializer();
+ test_mockTweetSerializer();
+ test_JSONSerializer();
+ test_serializerFactory();
+ test_widget();
+ test_player_widget();
+ test_annotations_widget();
+ test_segments_widget();
+ test_layout();
+ test_init();
+ test_tooltip_widget();
+ test_polemic_widget();
+ test_slider_widget();
+ });
+ }
+ };
+ </script>
+
<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/base/jquery-ui.css" type="text/css" media="screen" />
<!-- -->
- <script src="../build/LdtPlayer-release.js" type="text/javascript"></script>
<link rel="stylesheet" href="../src/css/LdtPlayer.css" type="text/css" media="screen" />
-
- <script src="mockSerializer.js" type="text/javascript"></script>
- <script src="mockTweetSerializer.js" type="text/javascript"></script>
- <script src="qunit.js" type="text/javascript"></script>
- <script src="sinon.js" type="text/javascript"></script>
- <script src="sinon-ie.js" type="text/javascript"></script>
- <script src="sinon-qunit.js" type="text/javascript"></script>
<link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
<!-- tests -->
- <script src="tests/dataloader.js" type="text/javascript"></script>
- <script src="tests/serializer.js" type="text/javascript"></script>
- <script src="tests/serializers/mockSerializer.js" type="text/javascript"></script>
- <script src="tests/serializers/mockTweetSerializer.js" type="text/javascript"></script>
- <script src="tests/serializers/JSONSerializer.js" type="text/javascript"></script>
- <script src="tests/serializerFactory.js" type="text/javascript"></script>
- <script src="tests/widget.js" type="text/javascript"></script>
- <script src="tests/widgets/playerWidget.js" type="text/javascript"></script>
- <script src="tests/widgets/annotationsWidget.js" type="text/javascript"></script>
- <script src="tests/widgets/segmentsWidget.js" type="text/javascript"></script>
- <script src="tests/layout.js" type="text/javascript"></script>
- <script src="tests/init.js" type="text/javascript"></script>
- <script src="tests/widgets/tooltipWidget.js" type="text/javascript"></script>
- <script src="tests/widgets/polemicWidget.js" type="text/javascript"></script>
- <script src="tests/widgets/sliderWidget.js" type="text/javascript"></script>
+ <script src="../src/js/libs/require.js" type="text/javascript"></script>
+
</head>
<script>
- $(document).ready(function(){
- /* only for unit-testing ! */
- IriSP.jQuery = jQuery;
-
- test_dataloader();
- test_serializer();
- test_mockSerializer();
- test_mockTweetSerializer();
- test_JSONSerializer();
- test_serializerFactory();
- test_widget();
- test_player_widget();
- test_annotations_widget();
- test_segments_widget();
- test_layout();
- test_init();
- test_tooltip_widget();
- test_polemic_widget();
- test_slider_widget();
-});
+
</script>
<body>
<h1 id="qunit-header">Metadataplayer Unit Tests</h1>