From c316784247ccb6bb0c8fe60b7c45fb98688f03d1 Mon Sep 17 00:00:00 2001 From: Brian Birtles Date: Thu, 21 Apr 2016 14:51:36 +0900 Subject: [PATCH] Bug 1266257 - Split iteration progress tests into 'simple iteration progress' and 'active time' tests; r=hiro MozReview-Commit-ID: 1fc6Wpi9nN8 --HG-- rename : testing/web-platform/tests/web-animations/timing-model/iteration-progress.html => testing/web-platform/tests/web-animations/timing-model/simple-iteration-progress.html --- testing/web-platform/meta/MANIFEST.json | 12 +++++++--- .../timing-model/active-time.html | 24 +++++++++++++++++++ ...ss.html => simple-iteration-progress.html} | 14 ++--------- 3 files changed, 35 insertions(+), 15 deletions(-) create mode 100644 testing/web-platform/tests/web-animations/timing-model/active-time.html rename testing/web-platform/tests/web-animations/timing-model/{iteration-progress.html => simple-iteration-progress.html} (94%) diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json index e2e8fc29ffb6..58ad3d4bc9d8 100644 --- a/testing/web-platform/meta/MANIFEST.json +++ b/testing/web-platform/meta/MANIFEST.json @@ -35264,16 +35264,22 @@ "url": "/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-4.html" } ], + "web-animations/timing-model/active-time.html": [ + { + "path": "web-animations/timing-model/active-time.html", + "url": "/web-animations/timing-model/active-time.html" + } + ], "web-animations/timing-model/current-iteration.html": [ { "path": "web-animations/timing-model/current-iteration.html", "url": "/web-animations/timing-model/current-iteration.html" } ], - "web-animations/timing-model/iteration-progress.html": [ + "web-animations/timing-model/simple-iteration-progress.html": [ { - "path": "web-animations/timing-model/iteration-progress.html", - "url": "/web-animations/timing-model/iteration-progress.html" + "path": "web-animations/timing-model/simple-iteration-progress.html", + "url": "/web-animations/timing-model/simple-iteration-progress.html" } ] } diff --git a/testing/web-platform/tests/web-animations/timing-model/active-time.html b/testing/web-platform/tests/web-animations/timing-model/active-time.html new file mode 100644 index 000000000000..095cce7f7b84 --- /dev/null +++ b/testing/web-platform/tests/web-animations/timing-model/active-time.html @@ -0,0 +1,24 @@ + + +Active time tests + + + + + +
+ + diff --git a/testing/web-platform/tests/web-animations/timing-model/iteration-progress.html b/testing/web-platform/tests/web-animations/timing-model/simple-iteration-progress.html similarity index 94% rename from testing/web-platform/tests/web-animations/timing-model/iteration-progress.html rename to testing/web-platform/tests/web-animations/timing-model/simple-iteration-progress.html index 6bd2c18f4efb..7e13e21d52fe 100644 --- a/testing/web-platform/tests/web-animations/timing-model/iteration-progress.html +++ b/testing/web-platform/tests/web-animations/timing-model/simple-iteration-progress.html @@ -1,8 +1,8 @@ -Iteration progress tests +Simple iteration progress tests + href="https://w3c.github.io/web-animations/#simple-iteration-progress"> @@ -34,16 +34,6 @@ function executeTests(tests, description) { }); } -async_test(function(t) { - var div = createDiv(t); - var anim = div.animate({ opacity: [ 0, 1 ] }, { delay: 1 }); - assert_equals(anim.effect.getComputedTiming().progress, null); - anim.finished.then(t.step_func(function() { - assert_equals(anim.effect.getComputedTiming().progress, null); - t.done(); - })); -}, 'Test progress during before and after phase when fill is none'); - var gTests_zero_iterations = [ { input: { iterations: 0,