Title: [218232] trunk/LayoutTests
- Revision
- 218232
- Author
- grao...@webkit.org
- Date
- 2017-06-13 18:04:17 -0700 (Tue, 13 Jun 2017)
Log Message
Rebaseline media/modern-media-controls/time-label
https://bugs.webkit.org/show_bug.cgi?id=173219
Reviewed by Dean Jackson.
We update the content of the time-label.html test to be relevant to its new API.
* media/modern-media-controls/time-label/time-label-expected.txt:
* media/modern-media-controls/time-label/time-label.html:
* platform/ios-simulator/TestExpectations:
* platform/mac/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (218231 => 218232)
--- trunk/LayoutTests/ChangeLog 2017-06-14 01:03:31 UTC (rev 218231)
+++ trunk/LayoutTests/ChangeLog 2017-06-14 01:04:17 UTC (rev 218232)
@@ -1,5 +1,19 @@
2017-06-11 Antoine Quint <grao...@apple.com>
+ Rebaseline media/modern-media-controls/time-label
+ https://bugs.webkit.org/show_bug.cgi?id=173219
+
+ Reviewed by Dean Jackson.
+
+ We update the content of the time-label.html test to be relevant to its new API.
+
+ * media/modern-media-controls/time-label/time-label-expected.txt:
+ * media/modern-media-controls/time-label/time-label.html:
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac/TestExpectations:
+
+2017-06-11 Antoine Quint <grao...@apple.com>
+
Rebaseline media/modern-media-controls/fullscreen-support
https://bugs.webkit.org/show_bug.cgi?id=173199
Modified: trunk/LayoutTests/media/modern-media-controls/time-label/time-label-expected.txt (218231 => 218232)
--- trunk/LayoutTests/media/modern-media-controls/time-label/time-label-expected.txt 2017-06-14 01:03:31 UTC (rev 218231)
+++ trunk/LayoutTests/media/modern-media-controls/time-label/time-label-expected.txt 2017-06-14 01:04:17 UTC (rev 218232)
@@ -8,10 +8,33 @@
PASS timeLabel.element.className is "time-label"
PASS style.position is "absolute"
PASS style.fontFamily is "-apple-system-monospaced-numbers"
-PASS style.fontSize is "14px"
-PASS timeLabel.element.textContent is "00:01"
-PASS timeLabelWithNegativeValue.element.textContent is "-01:01"
-PASS timeLabelWithHours.element.textContent is "01:01:01"
+PASS style.fontSize is "12px"
+
+NaNTimeLabel.element.textContent = --:--
+
+PASS elaspedLabel is "Elapsed"
+PASS remainingLabel is "Remaining"
+
+elapsedTimeLabels[3].element.textContent = 0:01
+elapsedTimeLabels[3].width = 27
+remainingTimeLabels[3].element.textContent = -0:01
+remainingTimeLabels[3].width = 33
+
+elapsedTimeLabels[4].element.textContent = 00:01
+elapsedTimeLabels[4].width = 35
+remainingTimeLabels[4].element.textContent = -00:01
+remainingTimeLabels[4].width = 40
+
+elapsedTimeLabels[5].element.textContent = 0:00:01
+elapsedTimeLabels[5].width = 46
+remainingTimeLabels[5].element.textContent = -0:00:01
+remainingTimeLabels[5].width = 52
+
+elapsedTimeLabels[6].element.textContent = 00:00:01
+elapsedTimeLabels[6].width = 54
+remainingTimeLabels[6].element.textContent = -00:00:01
+remainingTimeLabels[6].width = 59
+
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/media/modern-media-controls/time-label/time-label.html (218231 => 218232)
--- trunk/LayoutTests/media/modern-media-controls/time-label/time-label.html 2017-06-14 01:03:31 UTC (rev 218231)
+++ trunk/LayoutTests/media/modern-media-controls/time-label/time-label.html 2017-06-14 01:04:17 UTC (rev 218232)
@@ -14,14 +14,20 @@
shouldBeEqualToString("timeLabel.element.localName", "div");
shouldBeEqualToString("timeLabel.element.className", "time-label");
-timeLabel.value = 1;
timeLabel.element.id = "elasped";
-const timeLabelWithNegativeValue = new TimeLabel;
-timeLabelWithNegativeValue.value = -61;
+const NaNTimeLabel = new TimeLabel;
+NaNTimeLabel.setValueWithNumberOfDigits(NaN, 4);
-const timeLabelWithHours = new TimeLabel;
-timeLabelWithHours.value = 3661;
+const digits = [3, 4, 5, 6];
+let elapsedTimeLabels = new Map;
+let remainingTimeLabels = new Map;
+for (let numberOfDigits of digits) {
+ elapsedTimeLabels[numberOfDigits] = new TimeLabel(TimeLabel.Types.Elapsed);
+ elapsedTimeLabels[numberOfDigits].setValueWithNumberOfDigits(1, numberOfDigits);
+ remainingTimeLabels[numberOfDigits] = new TimeLabel(TimeLabel.Types.Remaining);
+ remainingTimeLabels[numberOfDigits].setValueWithNumberOfDigits(1, numberOfDigits);
+}
const remainingTimeLabel = new TimeLabel(TimeLabel.Types.Remaining);
remainingTimeLabel.element.id = "remaining";
@@ -37,18 +43,28 @@
shouldBeEqualToString("style.position", "absolute");
shouldBeEqualToString("style.fontFamily", "-apple-system-monospaced-numbers");
- shouldBeEqualToString("style.fontSize", "14px");
+ shouldBeEqualToString("style.fontSize", "12px");
+ debug("");
+ debug(`NaNTimeLabel.element.textContent = ${NaNTimeLabel.element.textContent}`);
+
+ debug("");
elaspedLabel = accessibilityController.accessibleElementById('elasped').description.split(": ")[1];
remainingLabel = accessibilityController.accessibleElementById('remaining').description.split(": ")[1];
shouldBeEqualToString("elaspedLabel", "Elapsed");
shouldBeEqualToString("remainingLabel", "Remaining");
timeLabel.element.remove();
+ remainingTimeLabel.element.remove();
- shouldBeEqualToString("timeLabel.element.textContent", "00:01");
- shouldBeEqualToString("timeLabelWithNegativeValue.element.textContent", "-01:01");
- shouldBeEqualToString("timeLabelWithHours.element.textContent", "01:01:01");
+ for (numberOfDigits of digits) {
+ debug("");
+ debug(`elapsedTimeLabels[${numberOfDigits}].element.textContent = ${elapsedTimeLabels[numberOfDigits].element.textContent}`);
+ debug(`elapsedTimeLabels[${numberOfDigits}].width = ${elapsedTimeLabels[numberOfDigits].width}`);
+ debug(`remainingTimeLabels[${numberOfDigits}].element.textContent = ${remainingTimeLabels[numberOfDigits].element.textContent}`);
+ debug(`remainingTimeLabels[${numberOfDigits}].width = ${remainingTimeLabels[numberOfDigits].width}`);
+ }
+ debug("");
finishMediaControlsTest();
};
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (218231 => 218232)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-14 01:03:31 UTC (rev 218231)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-14 01:04:17 UTC (rev 218232)
@@ -89,6 +89,7 @@
media/modern-media-controls/scheduler [ Pass ]
media/modern-media-controls/scrubber [ Pass ]
media/modern-media-controls/skip-forward-button [ Pass ]
+media/modern-media-controls/time-label [ Pass ]
# AirPlay cannot be tested on iOS
webkit.org/b/166062 media/modern-media-controls/airplay-support [ Skip ]
Modified: trunk/LayoutTests/platform/mac/TestExpectations (218231 => 218232)
--- trunk/LayoutTests/platform/mac/TestExpectations 2017-06-14 01:03:31 UTC (rev 218231)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-06-14 01:04:17 UTC (rev 218232)
@@ -1571,6 +1571,7 @@
media/modern-media-controls/scheduler [ Pass ]
media/modern-media-controls/scrubber [ Pass ]
media/modern-media-controls/skip-forward-button [ Pass ]
+media/modern-media-controls/time-label [ Pass ]
media/modern-media-controls/volume-up-support [ Pass ]
# These tests are iOS-specific
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
