Changeset 147679 in webkit

Timestamp:

Apr 4, 2013 4:35:40 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

Unreviewed, fix a test and some results missed in r147675

• media/media-captions-expected.txt:
• media/video-controls-captions-trackmenu-localized.html:
• platform/mac/media/video-controls-captions-trackmenu-localized-expected.txt:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• media/media-captions-expected.txt (modified) (2 diffs)
• media/video-controls-captions-trackmenu-localized.html (modified) (1 diff)
• platform/mac/media/video-controls-captions-trackmenu-localized-expected.txt (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-04  Eric Carlson  <eric.carlson@apple.com>
+
+        Unreviewed, fix a test and some results missed in r147675
+
+        * media/media-captions-expected.txt:
+        * media/video-controls-captions-trackmenu-localized.html:
+        * platform/mac/media/video-controls-captions-trackmenu-localized-expected.txt:
+
 2013-04-04  Dave Michael  <dmichael@chromium.org>
 

trunk/LayoutTests/media/media-captions-expected.txt

@@ -8 +8 @@
 EVENT(loadstart)
 EVENT(durationchange)
-EVENT(loadedmetadata)
+EVENT(canplaythrough)
 EXPECTED (mediaElement.webkitHasClosedCaptions == 'false') OK
 EXPECTED (mediaElement.webkitClosedCaptionsVisible == 'false') OK
@@ -17 +17 @@
 EVENT(loadstart)
 EVENT(durationchange)
-EVENT(loadedmetadata)
+EVENT(canplaythrough)
 EXPECTED (mediaElement.webkitHasClosedCaptions == 'true') OK
 EXPECTED (mediaElement.webkitClosedCaptionsVisible == 'false') OK

trunk/LayoutTests/media/video-controls-captions-trackmenu-localized.html

@@ -41 +41 @@
 
             item = captionsEntries[1];
-            consoleWrite("<br>Second item in captions menu should be labelled 'English CC'");
+            consoleWrite("<br>Second item in captions menu should be labelled 'Automatic (English)'");
+            testExpected("item.textContent", "Automatic (English)");
+
+
+            item = captionsEntries[2];
+            consoleWrite("<br>Third item in captions menu should be labelled 'English CC'");
             testExpected("item.textContent", "English CC");
 
-            item = captionsEntries[2];
-            consoleWrite("<br>Third item in captions menu should be labelled 'Laugh Track (English-United States)'");
+            item = captionsEntries[3];
+            consoleWrite("<br>Fourth item in captions menu should be labelled 'Laugh Track (English-United States)'");
             testExpected("item.textContent", "Laugh Track (English-United States)");
 
-            item = captionsEntries[3];
-            consoleWrite("<br>Fourth item in captions menu should be labelled 'Unknown SDH'");
+            item = captionsEntries[4];
+            consoleWrite("<br>Fifth item in captions menu should be labelled 'Unknown SDH'");
             testExpected("item.textContent", "Unknown SDH");
 

trunk/LayoutTests/platform/mac/media/video-controls-captions-trackmenu-localized-expected.txt

@@ -11 +11 @@
 EXPECTED (item.textContent == 'Off') OK
 
-Second item in captions menu should be labelled 'English CC'
+Second item in captions menu should be labelled 'Automatic (English)'
+EXPECTED (item.textContent == 'Automatic (English)') OK
+
+Third item in captions menu should be labelled 'English CC'
 EXPECTED (item.textContent == 'English CC'), OBSERVED 'Laugh Track (English-United States)' FAIL
 
-Third item in captions menu should be labelled 'Laugh Track (English-United States)'
+Fourth item in captions menu should be labelled 'Laugh Track (English-United States)'
 EXPECTED (item.textContent == 'Laugh Track (English-United States)'), OBSERVED 'Unknown SDH' FAIL
 
-Fourth item in captions menu should be labelled 'Unknown SDH'
+Fifth item in captions menu should be labelled 'Unknown SDH'
 TypeError: 'undefined' is not an object (evaluating 'item.textContent')
 END OF TEST