Title: [89676] trunk/LayoutTests
Revision
89676
Author
[email protected]
Date
2011-06-24 08:59:55 -0700 (Fri, 24 Jun 2011)

Log Message

2011-06-24  Eric Carlson  <[email protected]>

        Reviewed by Alexey Proskuryakov.
        
        Exit immediately if the last condition tested fails.

        Make <video> app cache test exit immediately on failure
        https://bugs.webkit.org/show_bug.cgi?id=63323

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (89675 => 89676)


--- trunk/LayoutTests/ChangeLog	2011-06-24 15:54:10 UTC (rev 89675)
+++ trunk/LayoutTests/ChangeLog	2011-06-24 15:59:55 UTC (rev 89676)
@@ -1,3 +1,12 @@
+2011-06-24  Eric Carlson  <[email protected]>
+
+        Reviewed by Alexey Proskuryakov.
+        
+        Exit immediately if the last condition tested fails.
+
+        Make <video> app cache test exit immediately on failure
+        https://bugs.webkit.org/show_bug.cgi?id=63323
+
 2011-06-24  Jessie Berlin  <[email protected]>
 
         REGRESSION (r89657): http/tests/inspector/extensions-headers.html,

Modified: trunk/LayoutTests/http/tests/appcache/video.html (89675 => 89676)


--- trunk/LayoutTests/http/tests/appcache/video.html	2011-06-24 15:54:10 UTC (rev 89675)
+++ trunk/LayoutTests/http/tests/appcache/video.html	2011-06-24 15:59:55 UTC (rev 89676)
@@ -21,8 +21,7 @@
                 switch(test)
                 {
                     case 1:
-                        logResult(false, "Failed loading file included in manifest!");
-                        endTest();
+                        failTest(false, "Failed loading file included in manifest!");
                         break;
                     case 2:
                         test3()
@@ -33,6 +32,22 @@
                 }
             }
 
+            function durationchangeEvent()
+            {
+                switch(test)
+                {
+                    case 1:
+                        test2();
+                        break;
+                    case 2:
+                        failTest("<br>Loaded file NOT included in manifest!");
+                        break;
+                    case 3:
+                        failTest("<br>Loaded _javascript_ file as media!");
+                        break;
+                }
+            }
+
             function test3()
             {
                 consoleWrite("*** Setting 'src' to non-media file that is in manifest. This file should fail to load.<br>");
@@ -51,18 +66,6 @@
                 video.src = "" + findMediaFile("audio", "silence");
             }
 
-            function durationchangeEvent()
-            {
-                if (test == 2) {
-                    logResult(false, "<br>Loaded file NOT included in manifest!");
-                    consoleWrite("");
-                    endTest();
-                    return;
-                }
-
-                test2();
-            }
-
             function test1()
             {
                 consoleWrite("*** Setting 'src' to file specified in manifest. This file should load.<br>");
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to