Diff
Modified: trunk/LayoutTests/ChangeLog (219714 => 219715)
--- trunk/LayoutTests/ChangeLog 2017-07-21 06:28:34 UTC (rev 219714)
+++ trunk/LayoutTests/ChangeLog 2017-07-21 06:29:25 UTC (rev 219715)
@@ -1,5 +1,19 @@
2017-07-20 Antoine Quint <grao...@apple.com>
+ Turn tests at media/modern-media-controls/time-labels-support back on
+ https://bugs.webkit.org/show_bug.cgi?id=174688
+
+ Reviewed by Dean Jackson.
+
+ * media/modern-media-controls/time-labels-support/elapsed-time-expected.txt:
+ * media/modern-media-controls/time-labels-support/elapsed-time.html:
+ * media/modern-media-controls/time-labels-support/remaining-time-expected.txt:
+ * media/modern-media-controls/time-labels-support/remaining-time.html:
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac/TestExpectations:
+
+2017-07-20 Antoine Quint <grao...@apple.com>
+
Turn tests at media/modern-media-controls/status-support back on
https://bugs.webkit.org/show_bug.cgi?id=174687
Modified: trunk/LayoutTests/media/modern-media-controls/time-labels-support/elapsed-time-expected.txt (219714 => 219715)
--- trunk/LayoutTests/media/modern-media-controls/time-labels-support/elapsed-time-expected.txt 2017-07-21 06:28:34 UTC (rev 219714)
+++ trunk/LayoutTests/media/modern-media-controls/time-labels-support/elapsed-time-expected.txt 2017-07-21 06:29:25 UTC (rev 219715)
@@ -4,7 +4,7 @@
timeupdate event was dispatched
-PASS mediaController.controls.timeControl.elapsedTimeLabel.value is media.currentTime
+PASS mediaController.controls.timeControl.elapsedTimeLabel.value became media.currentTime
PASS successfullyParsed is true
Modified: trunk/LayoutTests/media/modern-media-controls/time-labels-support/elapsed-time.html (219714 => 219715)
--- trunk/LayoutTests/media/modern-media-controls/time-labels-support/elapsed-time.html 2017-07-21 06:28:34 UTC (rev 219714)
+++ trunk/LayoutTests/media/modern-media-controls/time-labels-support/elapsed-time.html 2017-07-21 06:29:25 UTC (rev 219715)
@@ -15,12 +15,12 @@
media.addEventListener("timeupdate", function() {
debug("timeupdate event was dispatched");
- shouldBe("mediaController.controls.timeControl.elapsedTimeLabel.value", "media.currentTime");
-
- debug("");
- shadowRoot.host.remove();
- media.remove();
- finishJSTest();
+ shouldBecomeEqual("mediaController.controls.timeControl.elapsedTimeLabel.value", "media.currentTime", () => {
+ debug("");
+ shadowRoot.host.remove();
+ media.remove();
+ finishJSTest();
+ });
});
media.addEventListener("loadedmetadata", event => media.currentTime = 2);
Modified: trunk/LayoutTests/media/modern-media-controls/time-labels-support/remaining-time-expected.txt (219714 => 219715)
--- trunk/LayoutTests/media/modern-media-controls/time-labels-support/remaining-time-expected.txt 2017-07-21 06:28:34 UTC (rev 219714)
+++ trunk/LayoutTests/media/modern-media-controls/time-labels-support/remaining-time-expected.txt 2017-07-21 06:29:25 UTC (rev 219715)
@@ -4,10 +4,10 @@
durationchange event was dispatched
-PASS mediaController.controls.timeControl.remainingTimeLabel.value is -media.duration
+PASS mediaController.controls.timeControl.remainingTimeLabel.value became -media.duration
timeupdate event was dispatched
-PASS mediaController.controls.timeControl.remainingTimeLabel.value is media.currentTime - media.duration
+PASS mediaController.controls.timeControl.remainingTimeLabel.value became media.currentTime - media.duration
PASS successfullyParsed is true
Modified: trunk/LayoutTests/media/modern-media-controls/time-labels-support/remaining-time.html (219714 => 219715)
--- trunk/LayoutTests/media/modern-media-controls/time-labels-support/remaining-time.html 2017-07-21 06:28:34 UTC (rev 219714)
+++ trunk/LayoutTests/media/modern-media-controls/time-labels-support/remaining-time.html 2017-07-21 06:29:25 UTC (rev 219715)
@@ -16,18 +16,19 @@
media.addEventListener("timeupdate", (event) => {
debug("");
debug("timeupdate event was dispatched");
- shouldBe("mediaController.controls.timeControl.remainingTimeLabel.value", "media.currentTime - media.duration");
-
- debug("");
- shadowRoot.host.remove();
- media.remove();
- finishJSTest();
+ shouldBecomeEqual("mediaController.controls.timeControl.remainingTimeLabel.value", "media.currentTime - media.duration", () => {
+ debug("");
+ shadowRoot.host.remove();
+ media.remove();
+ finishJSTest();
+ });
});
media.addEventListener("durationchange", event => {
debug("durationchange event was dispatched");
- shouldBe("mediaController.controls.timeControl.remainingTimeLabel.value", "-media.duration");
- media.currentTime = 2;
+ shouldBecomeEqual("mediaController.controls.timeControl.remainingTimeLabel.value", "-media.duration", () => {
+ media.currentTime = 2;
+ });
});
</script>
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (219714 => 219715)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-07-21 06:28:34 UTC (rev 219714)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-07-21 06:29:25 UTC (rev 219715)
@@ -104,6 +104,7 @@
media/modern-media-controls/status-support [ Pass ]
media/modern-media-controls/time-control [ Pass ]
media/modern-media-controls/time-label [ Pass ]
+media/modern-media-controls/time-labels-support [ Pass ]
media/modern-media-controls/tracks-button [ Pass ]
# AirPlay cannot be tested on iOS
Modified: trunk/LayoutTests/platform/mac/TestExpectations (219714 => 219715)
--- trunk/LayoutTests/platform/mac/TestExpectations 2017-07-21 06:28:34 UTC (rev 219714)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-07-21 06:29:25 UTC (rev 219715)
@@ -1585,6 +1585,7 @@
media/modern-media-controls/status-support [ Pass ]
media/modern-media-controls/time-control [ Pass ]
media/modern-media-controls/time-label [ Pass ]
+media/modern-media-controls/time-labels-support [ Pass ]
media/modern-media-controls/tracks-panel/tracks-panel-up-click-outside-media-does-not-dimiss-media-controls-when-media-is-paused.html [ Pass ]
media/modern-media-controls/tracks-panel/tracks-panel-up-click-over-media-does-not-dimiss-media-controls-when-media-is-playing.html [ Pass ]
media/modern-media-controls/tracks-button [ Pass ]