Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/media/track/regions-webvtt/vtt-region-list.html

Issue 1854553003: Convert webvtt regions tests from video-test.js to testharness.js based (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address review comments Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« third_party/WebKit/LayoutTests/media/track/regions-webvtt/vtt-region-dom-layout.html ('K') | « third_party/WebKit/LayoutTests/media/track/regions-webvtt/vtt-region-dom-layout-expected.txt ('k') | third_party/WebKit/LayoutTests/media/track/regions-webvtt/vtt-region-list-expected.txt » ('j') | third_party/WebKit/LayoutTests/media/track/regions-webvtt/vtt-region-parser.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/media/track/regions-webvtt/vtt-region-list.html
diff --git a/third_party/WebKit/LayoutTests/media/track/regions-webvtt/vtt-region-list.html b/third_party/WebKit/LayoutTests/media/track/regions-webvtt/vtt-region-list.html
index 856d7057727b6a126e909aaa6c6ffd3255cd28bb..2d761768bcb6a18a8b20636bf50bf9aba3154030 100644
--- a/third_party/WebKit/LayoutTests/media/track/regions-webvtt/vtt-region-list.html
+++ b/third_party/WebKit/LayoutTests/media/track/regions-webvtt/vtt-region-list.html
@@ -1,103 +1,72 @@
<!DOCTYPE html>
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
- <script src=../../media-file.js></script>
- <!-- TODO(philipj): Convert test to testharness.js. crbug.com/588956
- (Please avoid writing new tests using video-test.js) -->
- <script src=../../video-test.js></script>
- <script>
- var testTrack;
- var region;
- var regions;
- var updatedRegion;
-
- function startTest()
- {
- testTrack = document.getElementsByTagName('track')[0];
-
- consoleWrite("<br>** Implicit mode disabled and the regions attribute is null **");
- testExpected("testTrack.track.mode", "disabled");
- testExpected("testTrack.track.regions", null);
-
- testTrack.track.mode = "hidden";
- regions = testTrack.track.regions;
-
- consoleWrite("<br>** Test instanceof VTTRegionList **");
- testExpected("regions instanceof VTTRegionList", true);
-
- consoleWrite("<br>** The regions attribute should be an empty VTTRegionList **");
- testExpected("regions != null", true);
- testExpected("regions.length", 0);
-
- region = new VTTRegion();
- region.id = "TestId";
-
- consoleWrite("<br>** The default value of the track attribute of the region is null**");
- testExpected("region.track", null);
-
- testTrack.track.addRegion(region);
-
- consoleWrite("<br>** The addRegion() method properly updates the VTTRegionList object **");
- testExpected("regions.length", 1);
- testExpected("regions[0] == region", true);
- testExpected("regions[0].track == testTrack.track", true);
-
- consoleWrite("<br>** The track attribute should correctly reflect the track to which the region was added to**");
- testExpected("region.track == testTrack.track", true);
-
- updatedRegion = new VTTRegion();
- updatedRegion.id = region.id;
- updatedRegion.viewportAnchorX = 59;
- updatedRegion.viewportAnchorY = 68;
- updatedRegion.regionAnchorX = 20;
- updatedRegion.regionAnchorY = 30;
- updatedRegion.height = 5;
- updatedRegion.width = 87;
- updatedRegion.scroll = "up";
-
- consoleWrite("<br>** Adding a region with an existing id should update the existing region **");
- testTrack.track.addRegion(updatedRegion);
- testExpected("regions[0].viewportAnchorX", updatedRegion.viewportAnchorX);
- testExpected("regions[0].viewportAnchorY", updatedRegion.viewportAnchorY);
- testExpected("regions[0].regionAnchorX", updatedRegion.regionAnchorX);
- testExpected("regions[0].regionAnchorY", updatedRegion.regionAnchorY);
- testExpected("regions[0].height", updatedRegion.height);
- testExpected("regions[0].width", updatedRegion.width);
- testExpected("regions[0].scroll", updatedRegion.scroll);
-
- testExpected("regions[0] != updatedRegion", true);
-
- consoleWrite("<br>** Add the region back and check if removeRegion() removes it properly **");
- testTrack.track.addRegion(region);
- testExpected("regions.length", 1);
- testTrack.track.removeRegion(region);
- testExpected("regions.length", 0);
-
- consoleWrite("<br>** In case the region is not found, NotFoundError should be thrown **");
- try {
- testTrack.track.removeRegion(region);
- } catch(e) {
- consoleWrite(e);
- }
-
- // FIXME(109818): Update test for multiple initial regions (after parsing is supported).
-
- consoleWrite("");
- endTest();
- }
-
- function startTestWithDelay()
- {
- setTimeout(startTest, 100);
- }
- </script>
- </head>
- <body onload="startTestWithDelay()">
- <p>Tests VTTRegionList functionality: length, operator[], and getRegionById()</p>
- <video>
- <track id="testTrack" src="captions-webvtt/captions-fast.vtt">
- </video>
- </body>
+<title>Tests VTTRegionList functionality: length, operator[], and getRegionById().</title>
+<script src="../../../resources/testharness.js"></script>
+<script src="../../../resources/testharnessreport.js"></script>
+<video>
+ <track id="testTrack" src="captions-webvtt/captions-fast.vtt">
philipj_slow 2016/04/06 12:40:04 Given that the test is synchronous, does this real
Srirama 2016/04/07 10:40:07 Done.
+</video>
+<script>
+var testTrack;
philipj_slow 2016/04/06 12:40:04 Move in to test?
Srirama 2016/04/07 10:40:07 Done.
+var region;
+var regions;
+var updatedRegion;
+
+test(function() {
+ testTrack = document.querySelector('track');
+
+ assert_equals(testTrack.track.mode, "disabled");
+ assert_equals(testTrack.track.regions, null);
+
+ testTrack.track.mode = "hidden";
+ regions = testTrack.track.regions;
+
+ assert_true(regions instanceof VTTRegionList, 'instanceof');
Srirama 2016/04/01 12:14:23 should i remove these kind of gaurds also? Or its
philipj_slow 2016/04/06 12:19:40 This one seems OK, but you could remove the follow
Srirama 2016/04/07 10:40:07 Done.
+
+ assert_not_equals(regions, null);
+ assert_equals(regions.length, 0);
+
+ region = new VTTRegion();
+ region.id = "TestId";
+
+ assert_equals(region.track, null);
+
+ testTrack.track.addRegion(region);
+
+ assert_equals(regions.length, 1);
+ assert_equals(regions[0], region);
+ assert_equals(regions[0].track, testTrack.track);
+
+ assert_equals(region.track, testTrack.track);
+
+ updatedRegion = new VTTRegion();
+ updatedRegion.id = region.id;
+ updatedRegion.viewportAnchorX = 59;
+ updatedRegion.viewportAnchorY = 68;
+ updatedRegion.regionAnchorX = 20;
+ updatedRegion.regionAnchorY = 30;
+ updatedRegion.height = 5;
+ updatedRegion.width = 87;
+ updatedRegion.scroll = "up";
+
+ testTrack.track.addRegion(updatedRegion);
+ assert_equals(regions[0].viewportAnchorX, updatedRegion.viewportAnchorX);
+ assert_equals(regions[0].viewportAnchorY, updatedRegion.viewportAnchorY);
+ assert_equals(regions[0].regionAnchorX, updatedRegion.regionAnchorX);
+ assert_equals(regions[0].regionAnchorY, updatedRegion.regionAnchorY);
+ assert_equals(regions[0].height, updatedRegion.height);
+ assert_equals(regions[0].width, updatedRegion.width);
+ assert_equals(regions[0].scroll, updatedRegion.scroll);
+
+ assert_not_equals(regions[0], updatedRegion);
+
+ testTrack.track.addRegion(region);
+ assert_equals(regions.length, 1);
+ testTrack.track.removeRegion(region);
+ assert_equals(regions.length, 0);
+
+ assert_throws("NotFoundError", function() { testTrack.track.removeRegion(region); });
+
+ // FIXME(109818): Update test for multiple initial regions (after parsing is supported).
+});
+</script>
</html>
« third_party/WebKit/LayoutTests/media/track/regions-webvtt/vtt-region-dom-layout.html ('K') | « third_party/WebKit/LayoutTests/media/track/regions-webvtt/vtt-region-dom-layout-expected.txt ('k') | third_party/WebKit/LayoutTests/media/track/regions-webvtt/vtt-region-list-expected.txt » ('j') | third_party/WebKit/LayoutTests/media/track/regions-webvtt/vtt-region-parser.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698