From 76cc4c16be5127fadd6479371964333b94ccf03c Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Wed, 1 Apr 2009 14:07:17 +1300
Subject: [PATCH] Bug 475441. Fix tests that assume a 'playing' event will be
 sent when we replay after playback has ended. r=doublec

---
 content/media/video/test/test_bug465498.html     | 1 +
 content/media/video/test/test_bug468190.html     | 3 +--
 content/media/video/test/test_bug468190_wav.html | 3 +--
 content/media/video/test/test_ended2.html        | 3 +--
 content/media/video/test/test_wav_ended2.html    | 3 +--
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/content/media/video/test/test_bug465498.html b/content/media/video/test/test_bug465498.html
index 0b2353d3410..4999abd9ba4 100644
--- a/content/media/video/test/test_bug465498.html
+++ b/content/media/video/test/test_bug465498.html
@@ -24,6 +24,7 @@ function playbackEnded() {
      "Checking currentTime at end: " + v.currentTime);
   ok(v.ended, "Checking playback has ended");
 
+  v.pause();
   v.currentTime = 0;
   ok(!v.ended, "Checking ended is no longer true");
   haveSeeked = true;
diff --git a/content/media/video/test/test_bug468190.html b/content/media/video/test/test_bug468190.html
index 526ec70d0d9..f8171507d08 100644
--- a/content/media/video/test/test_bug468190.html
+++ b/content/media/video/test/test_bug468190.html
@@ -43,9 +43,8 @@ function playbackEnded() {
   ok(v.currentTime >= 3.9 && v.currentTime <= 4.0,
      "Checking currentTime at end: " + v.currentTime);
   ok(v.ended, "Checking playback has ended");
-  ok(playingCount > 0, "Expect at least one playing event");
-  playingCount = 0;
   if (endCount < 2) {
+    ok(playingCount > 0, "Expect at least one playing event");
     v.currentTime = 0;
     ok(v.seeking, "Checking that seeking is now true");
     ok(!v.ended, "Checking ended is no longer set as seeking has begun");
diff --git a/content/media/video/test/test_bug468190_wav.html b/content/media/video/test/test_bug468190_wav.html
index e9ac0a42ca9..78f2ac20f09 100644
--- a/content/media/video/test/test_bug468190_wav.html
+++ b/content/media/video/test/test_bug468190_wav.html
@@ -43,9 +43,8 @@ function playbackEnded() {
   ok(v.currentTime >= 0.9 && v.currentTime <= 1.1,
      "Checking currentTime at end: " + v.currentTime);
   ok(v.ended, "Checking playback has ended");
-  ok(playingCount > 0, "Expect at least one playing event");
-  playingCount = 0;
   if (endCount < 2) {
+    ok(playingCount > 0, "Expect at least one playing event");
     v.currentTime = 0;
     ok(v.seeking, "Checking that seeking is now true");
     ok(!v.ended, "Checking ended is no longer set as seeking has begun");
diff --git a/content/media/video/test/test_ended2.html b/content/media/video/test/test_ended2.html
index b451436fe27..4503722984c 100644
--- a/content/media/video/test/test_ended2.html
+++ b/content/media/video/test/test_ended2.html
@@ -39,9 +39,8 @@ function playbackEnded() {
   ok(v.currentTime >= 3.9 && v.currentTime <= 4.0,
      "Checking currentTime at end: " + v.currentTime);
   ok(v.ended, "Checking playback has ended");
-  ok(playingCount > 0, "Expect at least one playing event");
-  playingCount = 0;
   if (endCount < 2) {
+    ok(playingCount > 0, "Expect at least one playing event");
     v.play();
   } else {
     ok(endCount == 2, "Check playback after ended event");
diff --git a/content/media/video/test/test_wav_ended2.html b/content/media/video/test/test_wav_ended2.html
index ba47ace6207..4a8827bc2c3 100644
--- a/content/media/video/test/test_wav_ended2.html
+++ b/content/media/video/test/test_wav_ended2.html
@@ -40,9 +40,8 @@ function playbackEnded() {
   ok(v.currentTime >= 0.9 && v.currentTime <= 1.1,
      "Checking currentTime at end: " + v.currentTime);
   ok(v.ended, "Checking playback has ended");
-  ok(playingCount > 0, "Expect at least one playing event");
-  playingCount = 0;
   if (endCount < 2) {
+    ok(playingCount > 0, "Expect at least one playing event");
     v.play();
   } else {
     ok(endCount == 2, "Check playback after ended event");