Bug 1266257 - Split iteration progress tests into 'simple iteration progress' and 'active time' tests
MozReview-Commit-ID: 1fc6Wpi9nN8
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -35253,26 +35253,32 @@
}
],
"html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-4.html": [
{
"path": "html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-4.html",
"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"
}
]
}
},
"reftest_nodes": {
"compat/webkit-text-fill-color-property-002.html": [
{
"path": "compat/webkit-text-fill-color-property-002.html",
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/web-animations/timing-model/active-time.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Active time tests</title>
+<link rel="help" href="https://w3c.github.io/web-animations/#active-time">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../testcommon.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+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');
+
+</script>
+</body>
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
--- 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,13 +1,13 @@
<!DOCTYPE html>
<meta charset=utf-8>
-<title>Iteration progress tests</title>
+<title>Simple iteration progress tests</title>
<link rel="help"
- href="https://w3c.github.io/web-animations/#iteration-progress">
+ href="https://w3c.github.io/web-animations/#simple-iteration-progress">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="../testcommon.js"></script>
<body>
<div id="log"></div>
<script>
'use strict';
@@ -29,26 +29,16 @@ function executeTests(tests, description
anim.finish();
assert_equals(anim.effect.getComputedTiming().progress,
currentTest.after);
}
}, description + testParams);
});
}
-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,
iterationStart: 0,
duration: 0,
delay: 1,
fill: 'both' },
before: 0,