Commits

Anonymous committed cc19a67

[svn r9796] FLUID-3577: Uploader tests working with new QUnit.

Comments (0)

Files changed (6)

branches/FLUID-3577/src/webapp/tests/component-tests/uploader/html/DemoUploadManager-test.html

     <title>DemoUploadManager Tests</title>
     
     <!--  This is the jqUnit test css file -->
-    <link rel="Stylesheet" media="screen" href="../../../lib/qunit/css/testsuite.css" />
+    <link rel="Stylesheet" media="screen" href="../../../lib/qunit/css/qunit.css" />
     
     <script type="text/javascript" src="../../../../lib/jquery/core/js/jquery.js"></script>
     <script type="text/javascript" src="../../../../framework/core/js/Fluid.js"></script>
     <script type="text/javascript" src="../../../../components/uploader/js/DemoUploadManager.js"></script>
     
     <!--  These are the jqUnit test js files -->
-    <script type="text/javascript" src="../../../lib/qunit/js/testrunner.js"></script>
+    <script type="text/javascript" src="../../../lib/qunit/js/qunit.js"></script>
     <script type="text/javascript" src="../../../test-core/jqUnit/js/jqUnit.js"></script>
 
     <script type="text/javascript" src="../js/DemoUploadManagerTests.js"></script>
 </head>
 
 <body id="body">
-    <h1 id="header">DemoUploadManager Tests</h1>
-    <h2 id="banner"></h2>
-    <h2 id="userAgent"></h2>
+    <h1 id="qunit-header">DemoUploadManager Tests</h1>
+    <h2 id="qunit-banner"></h2>
+    <div id="qunit-testrunner-toolbar"></div>
+    <h2 id="qunit-userAgent"></h2>
 
     <!-- Test HTML -->
     <div id="main" style="display: none;">
         <span id="swfUploadLovesDestroyingInnocentDomElements"></span>
         <span id="otherPlaceholder"></span>
     </div>
-    <ol id="tests"></ol>
+    <ol id="qunit-tests"></ol>
 </body>
 </html>

branches/FLUID-3577/src/webapp/tests/component-tests/uploader/html/FileQueue-test.html

     <title>FileQueue Tests</title>
     
     <!--  This is the jqUnit test css file -->
-    <link rel="stylesheet" media="screen" href="../../../lib/qunit/css/testsuite.css" />
+    <link rel="stylesheet" media="screen" href="../../../lib/qunit/css/qunit.css" />
     
     <script type="text/javascript" src="../../../../lib/jquery/core/js/jquery.js"></script>
     <script type="text/javascript" src="../../../../framework/core/js/Fluid.js"></script>
     <script type="text/javascript" src="../../../../components/uploader/js/FileQueue.js"></script>
 
     <!--  These are the jqUnit test js files -->
-    <script type="text/javascript" src="../../../lib/qunit/js/testrunner.js"></script>
+    <script type="text/javascript" src="../../../lib/qunit/js/qunit.js"></script>
     <script type="text/javascript" src="../../../test-core/jqUnit/js/jqUnit.js"></script>
 
     <script type="text/javascript" src="../js/FileQueueTests.js"></script>
 </head>
 
 <body id="body">
-    <h1 id="header">FileQueue Tests</h1>
-    <h2 id="banner"></h2>
-    <h2 id="userAgent"></h2>
-
-    <ol id="tests"></ol>
+    <h1 id="qunit-header">FileQueue Tests</h1>
+    <h2 id="qunit-banner"></h2>
+    <div id="qunit-testrunner-toolbar"></div>
+    <h2 id="qunit-userAgent"></h2>
+    <ol id="qunit-tests"></ol>
     
     <!-- Test HTML -->
     <div id="main">

branches/FLUID-3577/src/webapp/tests/component-tests/uploader/html/FileQueueView-test.html

     <title>FileQueue VIEW Tests</title>
     
     <!--  This is the jqUnit test css file -->
-    <link rel="stylesheet" media="screen" href="../../../lib/qunit/css/testsuite.css" />
+    <link rel="stylesheet" media="screen" href="../../../lib/qunit/css/qunit.css" />
     
     <script type="text/javascript" src="../../../../lib/jquery/core/js/jquery.js"></script>
     <script type="text/javascript" src="../../../../lib/jquery/ui/js/jquery.ui.core.js"></script>
     
 
     <!--  These are the jqUnit test js files -->
-    <script type="text/javascript" src="../../../lib/qunit/js/testrunner.js"></script>
+    <script type="text/javascript" src="../../../lib/qunit/js/qunit.js"></script>
     <script type="text/javascript" src="../../../test-core/jqUnit/js/jqUnit.js"></script>
 
     <script type="text/javascript" src="../js/FileQueueViewTests.js"></script>
 </head>
 
 <body id="body">
-    <h1 id="header">FileQueueView Tests</h1>
-    <h2 id="banner"></h2>
-    <h2 id="userAgent"></h2>
-
-    <ol id="tests"></ol>
+    <h1 id="qunit-header">FileQueueView Tests</h1>
+    <h2 id="qunit-banner"></h2>
+    <div id="qunit-testrunner-toolbar"></div>
+    <h2 id="qunit-userAgent"></h2>
+    <ol id="qunit-tests"></ol>
     
     <!-- Test HTML -->
     <div id="main">

branches/FLUID-3577/src/webapp/tests/component-tests/uploader/html/SWFUploadManager-test.html

     <title>SWFUploadManager Tests</title>
     
     <!--  This is the jqUnit test css file -->
-    <link rel="Stylesheet" media="screen" href="../../../lib/qunit/css/testsuite.css" />
+    <link rel="Stylesheet" media="screen" href="../../../lib/qunit/css/qunit.css" />
     
     <script type="text/javascript" src="../../../../lib/jquery/core/js/jquery.js"></script>
     <script type="text/javascript" src="../../../../lib/jquery/ui/js/jquery.ui.core.js"></script>
     <script type="text/javascript" src="../../../../components/uploader/js/SWFUploadManager.js"></script>
 
     <!--  These are the jqUnit test js files -->
-    <script type="text/javascript" src="../../../lib/qunit/js/testrunner.js"></script>
+    <script type="text/javascript" src="../../../lib/qunit/js/qunit.js"></script>
     <script type="text/javascript" src="../../../test-core/jqUnit/js/jqUnit.js"></script>
     
     <script type="text/javascript" src="../js/SWFUploadManagerTests.js"></script>
 </head>
 
 <body id="body">
-    <h1 id="header">SWFUploadManager Tests</h1>
-    <h2 id="banner"></h2>
-    <h2 id="userAgent"></h2>
+    <h1 id="qunit-header">SWFUploadManager Tests</h1>
+    <h2 id="qunit-banner"></h2>
+    <div id="qunit-testrunner-toolbar"></div>
+    <h2 id="qunit-userAgent"></h2>
 
     <!-- Test HTML -->
     <div id="main">
             <button class="noId">Browse without ID</button>
         </div>
     </div>
-    <ol id="tests"></ol>
+    <ol id="qunit-tests"></ol>
 </body>
 </html>

branches/FLUID-3577/src/webapp/tests/component-tests/uploader/html/Scroller-test.html

 		<title>Vertical Scroller Tests</title>
         
         <!--  This is the jqUnit test css file -->
-	    <link rel="stylesheet" media="screen" href="../../../lib/qunit/css/testsuite.css" />
+	    <link rel="stylesheet" media="screen" href="../../../lib/qunit/css/qunit.css" />
         
         <!-- Fluid dependencies for the Scroller -->
 	    <script type="text/javascript" src="../../../../lib/jquery/core/js/jquery.js"></script>
 	    <script type="text/javascript" src="../../../../components/uploader/js/Scroller.js"></script>
 
         <!--  These are the jqUnit test js files -->
-	    <script type="text/javascript" src="../../../lib/qunit/js/testrunner.js"></script>
+	    <script type="text/javascript" src="../../../lib/qunit/js/qunit.js"></script>
 	    <script type="text/javascript" src="../../../test-core/jqUnit/js/jqUnit.js"></script>
 
         <!--  These are tests that have been written using this page as data -->
 	</head>
 	<body>
     	<h1 id="header">Vertical Scroller Test Suite</h1>
-        <h2 id="banner"></h2>
-        <h2 id="userAgent"></h2>
-        <ol id="tests"></ol>
+        <h2 id="qunit-banner"></h2>
+        <div id="qunit-testrunner-toolbar"></div>
+        <h2 id="qunit-userAgent"></h2>
+        <ol id="qunit-tests"></ol>
     
         <!-- Test HTML -->
         <div id="main">

branches/FLUID-3577/src/webapp/tests/component-tests/uploader/html/Uploader-test.html

     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>Basic Uploader Tests</title>
     
-    <!--  This is the jqUnit test css file -->
-    <link rel="stylesheet" media="screen" href="../../../lib/qunit/css/testsuite.css" />
+    <!--  This is the QUnit test css file -->
+    <link rel="stylesheet" media="screen" href="../../../lib/qunit/css/qunit.css" />
     
     <script type="text/javascript" src="../../../../lib/jquery/core/js/jquery.js"></script>
     <script type="text/javascript" src="../../../../lib/jquery/ui/js/jquery.ui.core.js"></script>
     <script type="text/javascript" src="../../../../components/progress/js/Progress.js"></script>
     
     <!--  These are the jqUnit test js files -->
-    <script type="text/javascript" src="../../../lib/qunit/js/testrunner.js"></script>
+    <script type="text/javascript" src="../../../lib/qunit/js/qunit.js"></script>
     <script type="text/javascript" src="../../../test-core/jqUnit/js/jqUnit.js"></script>
     
     <script type="text/javascript" src="../js/UploaderTests.js"></script>
 </head>
 
 <body id="body">
-    <h1 id="header">Uploader Basic Tests</h1>
-    <h2 id="banner"></h2>
-    <h2 id="userAgent"></h2>
-   <ol id="tests"></ol>
+    <h1 id="qunit-header">Uploader Basic Tests</h1>
+    <h2 id="qunit-banner"></h2>
+    <div id="qunit-testrunner-toolbar"></div>
+    <h2 id="qunit-userAgent"></h2>
+    <ol id="qunit-tests"></ol>
 
     <!-- Test HTML -->
     <div id="main" style="display: none;">