Bug 1514355 [wpt PR 14525] - [LayoutTest] Split animations-parsing.html into two tests, a=testonly
authorXida Chen <xidachen@chromium.org>
Wed, 19 Dec 2018 11:39:11 +0000
changeset 515026 5b91140384aa46aaf31c87d28b19bbdb30b2e3e5
parent 515025 ba204a073a2338fa4f26e97c72361a14d78280a1
child 515027 7d98c8a039785005556251fe5d4b7dcaa4050a27
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1514355, 14525, 772852, 1378230, 616677
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1514355 [wpt PR 14525] - [LayoutTest] Split animations-parsing.html into two tests, a=testonly Automatic update from web-platform-tests [LayoutTest] Split animations-parsing.html into two tests Currently it tests both style.animation and getComputedStyle.animation. This CL splits the test into two tests, one for style.animation, and the other one for getComputedStyle.animation such that each test is minimal. Bug: 772852 Change-Id: I3c3f43305497ffe9d91c4e3806efe2e65ff17806 Reviewed-on: https://chromium-review.googlesource.com/c/1378230 Reviewed-by: Stephen McGruer <smcgruer@chromium.org> Commit-Queue: Xida Chen <xidachen@chromium.org> Cr-Commit-Position: refs/heads/master@{#616677} -- wpt-commits: 3a8ff1cd2f78d58de6ddf4ac0fe13e72e6502229 wpt-pr: 14525
testing/web-platform/tests/css/css-animations/animations-parsing.html
testing/web-platform/tests/css/css-animations/computed-style-animation-parsing.html
testing/web-platform/tests/css/css-animations/style-animation-parsing.html
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-animations/animations-parsing.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Animations: parsing animation</title>
-<link rel="help" href="https://drafts.csswg.org/css-animations/#animation">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="test1"></div>
-<div id="test2"></div>
-<script>
-function testStyle(style1, style2, name) {
-  assert_equals(style1.animationName, name, "style1.animationName");
-  assert_equals(style2.animationName, name, "style2.animationName");
-  assert_equals(style1.animation, style2.animation,
-                "style1 and style2 should have the same animation");
-}
-
-function testComputedStyle(computedStyle1, computedStyle2, name) {
-  assert_equals(computedStyle1.animationName, name, "computedStyle1.animationName");
-  assert_equals(computedStyle2.animationName, name, "computedStyle2.animationName");
-  assert_equals(computedStyle1.animation, computedStyle2.animation,
-                "computedStyle1 and computedStyle2 should have the same animation");
-}
-
-function testAnimation(input, name) {
-  var style1 = test1.style;
-  var style2 = test2.style;
-  var computedStyle1 = getComputedStyle(test1);
-  var computedStyle2 = getComputedStyle(test2);
-
-  style1.animation = input;
-  style2.animation = style1.animation;
-  testStyle(style1, style2, name);
-  testComputedStyle(computedStyle1, computedStyle2, name);
-  style2.animation = computedStyle1.animation;
-  testStyle(style1, style2, name);
-  testComputedStyle(computedStyle1, computedStyle2, name);
-}
-
-test(() => {
-  // We are duplicating the logic of testAnimation because the animationName of
-  // the getComputedStyle is "none" when there is no animation.
-  var style1 = test1.style;
-  var style2 = test2.style;
-  var computedStyle1 = window.getComputedStyle(test1, null);
-  var computedStyle2 = window.getComputedStyle(test2, null);
-
-  style1.animation = "";
-  style2.animation = style1.animation;
-  testStyle(style1, style2, "");
-  testComputedStyle(computedStyle1, computedStyle2, "none");
-  style2.animation = computedStyle1.animation;
-  assert_equals(style2.animationName, "none");
-  assert_equals(computedStyle2.animationName, "none");
-}, "Test animation name being empty.");
-
-test(() => {
-  testAnimation("myShorthandAnim", "myShorthandAnim");
-}, "Test a non-conflicting animation name.");
-
-test(() => {
-  testAnimation("none", "none");
-  testAnimation("forwards", "none");
-  testAnimation("none forwards", "forwards");
-}, "Test an animation name that is the same as a possible animation fill-mode.");
-
-test(() => {
-  testAnimation("normal", "none");
-  testAnimation("reverse", "none");
-  testAnimation("normal normal", "normal");
-  testAnimation("normal reverse", "reverse");
-}, "Test an animation name that is the same as a possible animation direction.");
-
-test(() => {
-  testAnimation("running", "none");
-  testAnimation("paused", "none");
-  testAnimation("running running", "running");
-  testAnimation("running paused", "paused");
-}, "Test an animation name that is the same as a possible running state.");
-</script>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-animations/computed-style-animation-parsing.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Animations: parsing computedStyle.animation</title>
+<link rel="help" href="https://drafts.csswg.org/css-animations/#animation">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="test1"></div>
+<div id="test2"></div>
+<script>
+function testComputedStyle(computedStyle1, computedStyle2, name) {
+  assert_equals(computedStyle1.animationName, name, "computedStyle1.animationName");
+  assert_equals(computedStyle2.animationName, name, "computedStyle2.animationName");
+  assert_equals(computedStyle1.animation, computedStyle2.animation,
+                "computedStyle1 and computedStyle2 should have the same animation");
+}
+
+function testAnimation(input, name) {
+  var style1 = test1.style;
+  var style2 = test2.style;
+  var computedStyle1 = getComputedStyle(test1);
+  var computedStyle2 = getComputedStyle(test2);
+
+  style1.animation = input;
+  style2.animation = style1.animation;
+  testComputedStyle(computedStyle1, computedStyle2, name);
+  style2.animation = computedStyle1.animation;
+  testComputedStyle(computedStyle1, computedStyle2, name);
+}
+
+test(() => {
+  // We are duplicating the logic of testAnimation because the animationName of
+  // the getComputedStyle is "none" when there is no animation.
+  var style1 = test1.style;
+  var style2 = test2.style;
+  var computedStyle1 = getComputedStyle(test1);
+  var computedStyle2 = getComputedStyle(test2);
+
+  style1.animation = "";
+  style2.animation = style1.animation;
+  testComputedStyle(computedStyle1, computedStyle2, "none");
+  style2.animation = computedStyle1.animation;
+  assert_equals(computedStyle2.animationName, "none");
+}, "Test animation name being empty.");
+
+test(() => {
+  testAnimation("myShorthandAnim", "myShorthandAnim");
+}, "Test a non-conflicting animation name.");
+
+test(() => {
+  testAnimation("none", "none");
+  testAnimation("forwards", "none");
+  testAnimation("none forwards", "forwards");
+}, "Test an animation name that is the same as a possible animation fill-mode.");
+
+test(() => {
+  testAnimation("normal", "none");
+  testAnimation("reverse", "none");
+  testAnimation("normal normal", "normal");
+  testAnimation("normal reverse", "reverse");
+}, "Test an animation name that is the same as a possible animation direction.");
+
+test(() => {
+  testAnimation("running", "none");
+  testAnimation("paused", "none");
+  testAnimation("running running", "running");
+  testAnimation("running paused", "paused");
+}, "Test an animation name that is the same as a possible running state.");
+</script>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-animations/style-animation-parsing.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Animations: parsing style.animation</title>
+<link rel="help" href="https://drafts.csswg.org/css-animations/#animation">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="test1"></div>
+<div id="test2"></div>
+<script>
+function testStyle(style1, style2, name) {
+  assert_equals(style1.animationName, name, "style1.animationName");
+  assert_equals(style2.animationName, name, "style2.animationName");
+  assert_equals(style1.animation, style2.animation,
+                "style1 and style2 should have the same animation");
+}
+
+function testAnimation(input, name) {
+  var style1 = test1.style;
+  var style2 = test2.style;
+
+  style1.animation = input;
+  style2.animation = style1.animation;
+  testStyle(style1, style2, name);
+}
+
+test(() => {
+  testAnimation("", "");
+}, "Test animation name being empty.");
+
+test(() => {
+  testAnimation("myShorthandAnim", "myShorthandAnim");
+}, "Test a non-conflicting animation name.");
+
+test(() => {
+  testAnimation("none", "none");
+  testAnimation("forwards", "none");
+  testAnimation("none forwards", "forwards");
+}, "Test an animation name that is the same as a possible animation fill-mode.");
+
+test(() => {
+  testAnimation("normal", "none");
+  testAnimation("reverse", "none");
+  testAnimation("normal normal", "normal");
+  testAnimation("normal reverse", "reverse");
+}, "Test an animation name that is the same as a possible animation direction.");
+
+test(() => {
+  testAnimation("running", "none");
+  testAnimation("paused", "none");
+  testAnimation("running running", "running");
+  testAnimation("running paused", "paused");
+}, "Test an animation name that is the same as a possible running state.");
+</script>