Title: [147679] trunk/LayoutTests
- Revision
- 147679
- Author
- eric.carl...@apple.com
- Date
- 2013-04-04 16:35:40 -0700 (Thu, 04 Apr 2013)
Log 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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (147678 => 147679)
--- trunk/LayoutTests/ChangeLog 2013-04-04 23:18:16 UTC (rev 147678)
+++ trunk/LayoutTests/ChangeLog 2013-04-04 23:35:40 UTC (rev 147679)
@@ -1,3 +1,11 @@
+2013-04-04 Eric Carlson <eric.carl...@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 <dmich...@chromium.org>
Make fast/events/tabindex-focus-blur-all.html disallow Java so the test runs the same regardless of platform/port
Modified: trunk/LayoutTests/media/media-captions-expected.txt (147678 => 147679)
--- trunk/LayoutTests/media/media-captions-expected.txt 2013-04-04 23:18:16 UTC (rev 147678)
+++ trunk/LayoutTests/media/media-captions-expected.txt 2013-04-04 23:35:40 UTC (rev 147679)
@@ -7,7 +7,7 @@
Loading "content/test.wav". Audio-only file without captions.
EVENT(loadstart)
EVENT(durationchange)
-EVENT(loadedmetadata)
+EVENT(canplaythrough)
EXPECTED (mediaElement.webkitHasClosedCaptions == 'false') OK
EXPECTED (mediaElement.webkitClosedCaptionsVisible == 'false') OK
*** enabling captions
@@ -16,7 +16,7 @@
Loading "content/counting-captioned.mov". QuickTime movie with captions..
EVENT(loadstart)
EVENT(durationchange)
-EVENT(loadedmetadata)
+EVENT(canplaythrough)
EXPECTED (mediaElement.webkitHasClosedCaptions == 'true') OK
EXPECTED (mediaElement.webkitClosedCaptionsVisible == 'false') OK
*** enabling captions
Modified: trunk/LayoutTests/media/video-controls-captions-trackmenu-localized.html (147678 => 147679)
--- trunk/LayoutTests/media/video-controls-captions-trackmenu-localized.html 2013-04-04 23:18:16 UTC (rev 147678)
+++ trunk/LayoutTests/media/video-controls-captions-trackmenu-localized.html 2013-04-04 23:35:40 UTC (rev 147679)
@@ -40,15 +40,20 @@
testExpected("item.textContent", "Off");
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");
endTest();
Modified: trunk/LayoutTests/platform/mac/media/video-controls-captions-trackmenu-localized-expected.txt (147678 => 147679)
--- trunk/LayoutTests/platform/mac/media/video-controls-captions-trackmenu-localized-expected.txt 2013-04-04 23:18:16 UTC (rev 147678)
+++ trunk/LayoutTests/platform/mac/media/video-controls-captions-trackmenu-localized-expected.txt 2013-04-04 23:35:40 UTC (rev 147679)
@@ -10,13 +10,16 @@
First item in captions menu should be labelled 'Off'
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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
