Rubber-stamped by bdash.

        Improve coverage of these tests.

        * media/video-muted-expected.txt:
        * media/video-muted.html:
        * media/video-volume-expected.txt:
        * media/video-volume.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27912 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7e14eb80f510a88c327abc0df7277284a9412af0..78c8c664a1a9173a5df77e0ebbf46134c29dc532 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-19  Antti Koivisto  <antti@apple.com>
+
+        Rubber-stamped by bdash.
+        
+        Improve coverage of these tests.
+
+        * media/video-muted-expected.txt:
+        * media/video-muted.html:
+        * media/video-volume-expected.txt:
+        * media/video-volume.html:
+
 2007-11-19  Julien Chaffraix  <julien.chaffraix@gmail.com>
 
         Reviewed by Darin.

diff --git a/LayoutTests/media/video-muted-expected.txt b/LayoutTests/media/video-muted-expected.txt
index 90bf7079bf801537d3e462bf8e894984c5234baf..7c8f6af6f4c617db64ec55eb6e6cc195589cd373 100644 (file)
--- a/LayoutTests/media/video-muted-expected.txt
+++ b/LayoutTests/media/video-muted-expected.txt
@@ -1,5 +1,12 @@
+Test 'muted' attribute
+
 TEST(!video.muted) OK
+RUN(video.muted = true)
+TEST(video.muted) OK
+RUN(video.load())
+EVENT(load)
 TEST(video.muted) OK
+RUN(video.muted = false)
 TEST(!video.muted) OK
 END OF TEST
 

diff --git a/LayoutTests/media/video-muted.html b/LayoutTests/media/video-muted.html
index 92d54b4a5565f3b3d47d99eeec8ca70dc52ab322..41ffd452a4dbff0934796c3948453de33af1057a 100644 (file)
--- a/LayoutTests/media/video-muted.html
+++ b/LayoutTests/media/video-muted.html
@@ -1,10 +1,16 @@
 <video></video>
+<p>Test 'muted' attribute<p>
 <script src=video-test.js></script>
 <script>
 test("!video.muted");
-video.muted = true;
+run("video.muted = true");
 test("video.muted");
-video.muted = false;
-test("!video.muted");
-endTest();
+video.src = "content/test.mp4";
+run("video.load()");
+waitForEvent("load", function () {
+    test("video.muted");
+    run("video.muted = false");
+    test("!video.muted");
+    endTest();
+});
 </script>

diff --git a/LayoutTests/media/video-volume-expected.txt b/LayoutTests/media/video-volume-expected.txt
index 83921614552abb02a62ba3c9bbf9b522510e40a9..0c7d0b2c43eef05821ed8d7071ac51200a483877 100644 (file)
--- a/LayoutTests/media/video-volume-expected.txt
+++ b/LayoutTests/media/video-volume-expected.txt
@@ -1,7 +1,18 @@
+Test 'volume' attribute
+
 TEST(video.volume == 0.5) OK
+RUN(video.volume = 1)
 TEST(video.volume == 1) OK
+RUN(video.volume = 0)
 TEST(video.volume == 0) OK
 TEST(video.volume = 1.5) THROWS(DOMException.INDEX_SIZE_ERR) OK
 TEST(video.volume = -0.5) THROWS(DOMException.INDEX_SIZE_ERR) OK
+RUN(video.load())
+EVENT(load)
+TEST(video.volume == 0) OK
+RUN(video.volume = 0.5)
+TEST(video.volume == 0.5) OK
+TEST(video.volume = 1.5) THROWS(DOMException.INDEX_SIZE_ERR) OK
+TEST(video.volume = -0.5) THROWS(DOMException.INDEX_SIZE_ERR) OK
 END OF TEST
 

diff --git a/LayoutTests/media/video-volume.html b/LayoutTests/media/video-volume.html
index b0faa259916d439f49ea918001b77b6b93046c0a..ee9f18df44fab899a6e0229e648cb7b1fa336547 100644 (file)
--- a/LayoutTests/media/video-volume.html
+++ b/LayoutTests/media/video-volume.html
@@ -1,12 +1,22 @@
 <video></video>
+<p>Test 'volume' attribute<p>
 <script src=video-test.js></script>
 <script>
 test("video.volume == 0.5");
-video.volume = 1;
+run("video.volume = 1");
 test("video.volume == 1");
-video.volume = 0;
+run("video.volume = 0");
 test("video.volume == 0");
 testException("video.volume = 1.5", "DOMException.INDEX_SIZE_ERR");
 testException("video.volume = -0.5", "DOMException.INDEX_SIZE_ERR");
-endTest();
+video.src = "content/test.mp4";
+run("video.load()");
+waitForEvent("load", function () {
+    test("video.volume == 0");
+    run("video.volume = 0.5");
+    test("video.volume == 0.5");
+    testException("video.volume = 1.5", "DOMException.INDEX_SIZE_ERR");
+    testException("video.volume = -0.5", "DOMException.INDEX_SIZE_ERR");
+    endTest();
+}); 
 </script>