Title: [187653] trunk/LayoutTests
- Revision
- 187653
- Author
- mra...@apple.com
- Date
- 2015-07-31 09:59:51 -0700 (Fri, 31 Jul 2015)
Log Message
Media Session: add test to ensure next/previous-track event handlers are not fired when they are disabled
https://bugs.webkit.org/show_bug.cgi?id=147477
Reviewed by Eric Carlson.
* media/session/track-media-events-disabled-expected.txt: Added.
* media/session/track-media-events-disabled.html: Added.
* platform/mac/TestExpectations: Media Session support is disabled by default.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (187652 => 187653)
--- trunk/LayoutTests/ChangeLog 2015-07-31 16:51:57 UTC (rev 187652)
+++ trunk/LayoutTests/ChangeLog 2015-07-31 16:59:51 UTC (rev 187653)
@@ -1,5 +1,16 @@
2015-07-30 Matt Rajca <mra...@apple.com>
+ Media Session: add test to ensure next/previous-track event handlers are not fired when they are disabled
+ https://bugs.webkit.org/show_bug.cgi?id=147477
+
+ Reviewed by Eric Carlson.
+
+ * media/session/track-media-events-disabled-expected.txt: Added.
+ * media/session/track-media-events-disabled.html: Added.
+ * platform/mac/TestExpectations: Media Session support is disabled by default.
+
+2015-07-30 Matt Rajca <mra...@apple.com>
+
Media Session: add test to ensure media sessions are in an Idle state after creation
https://bugs.webkit.org/show_bug.cgi?id=147471
Added: trunk/LayoutTests/media/session/track-media-events-disabled-expected.txt (0 => 187653)
--- trunk/LayoutTests/media/session/track-media-events-disabled-expected.txt (rev 0)
+++ trunk/LayoutTests/media/session/track-media-events-disabled-expected.txt 2015-07-31 16:59:51 UTC (rev 187653)
@@ -0,0 +1,16 @@
+Previous/Next Track events should not be fired if previous/nextTrackEnabled are 'false'.
+
+
+EVENT(canplaythrough)
+EXPECTED (video.paused == 'true') OK
+Begin playing media.
+EVENT(playing)
+Media began playing.
+EXPECTED (video.paused == 'false') OK
+EXPECTED (internals.mediaSessionCurrentState(session) == 'active') OK
+Sending Next Track media event.
+RUN(internals.sendMediaControlEvent("next-track"))
+Sending Previous Track media event.
+RUN(internals.sendMediaControlEvent("previous-track"))
+END OF TEST
+
Added: trunk/LayoutTests/media/session/track-media-events-disabled.html (0 => 187653)
--- trunk/LayoutTests/media/session/track-media-events-disabled.html (rev 0)
+++ trunk/LayoutTests/media/session/track-media-events-disabled.html 2015-07-31 16:59:51 UTC (rev 187653)
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <script src=""
+ <script src=""
+ <script type="text/_javascript_">
+ var session, controls;
+
+ function runTest()
+ {
+ session = new MediaSession("content");
+ controls = session.controls;
+ controls.nextTrackEnabled = false;
+ controls.previousTrackEnabled = false;
+ waitForEvent('nexttrack', skipToNextTrack, false, true, controls);
+ waitForEvent('previoustrack', skipToPreviousTrack, false, true, controls);
+
+ findMediaElement();
+ waitForEvent('canplaythrough', beginPlaying);
+ video.src = "" "../content/counting");
+ video.session = session;
+ waitForEvent('playing', beganPlaying, false, true, video);
+ }
+
+ function beginPlaying(event)
+ {
+ testExpected('video.paused', true);
+
+ consoleWrite("Begin playing media.");
+ video.play();
+ }
+
+ function beganPlaying(event)
+ {
+ consoleWrite("Media began playing.");
+ testExpected('video.paused', false);
+
+ if (window.internals) {
+ testExpected('internals.mediaSessionCurrentState(session)', "active");
+
+ consoleWrite("Sending Next Track media event.");
+ run('internals.sendMediaControlEvent("next-track")');
+
+ consoleWrite("Sending Previous Track media event.");
+ run('internals.sendMediaControlEvent("previous-track")');
+
+ window.setTimeout("endTest()", 200);
+ } else {
+ endTest();
+ }
+ }
+
+ function skipToNextTrack(event)
+ {
+ failTest("next-track events should not be fired.");
+ }
+
+ function skipToPreviousTrack(event)
+ {
+ failTest("previous-track events should not be fired.");
+ }
+ </script>
+</head>
+<body _onload_="runTest()">
+ <p>Previous/Next Track events should not be fired if previous/nextTrackEnabled are 'false'.</p>
+ <video id="video" />
+</body>
+</html>
Modified: trunk/LayoutTests/platform/mac/TestExpectations (187652 => 187653)
--- trunk/LayoutTests/platform/mac/TestExpectations 2015-07-31 16:51:57 UTC (rev 187652)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-07-31 16:59:51 UTC (rev 187653)
@@ -1000,6 +1000,7 @@
media/session/play-pause-media-events-in-content-sessions.html
media/session/play-pause-media-events-in-non-content-sessions.html
media/session/session-creation.html
+media/session/track-media-events-disabled.html
media/session/track-media-events-in-content-sessions.html
media/session/transient-interruptions.html
media/session/transient-solo-interruptions.html
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
