Skip to content

GitLab

T
tangled
Commit cc8c7225 authored by ericwilligers's avatar ericwilligers Committed by Commit bot
Browse files
Options

CSS Animations layout tests: fix flaky animation-direction-normal.html 

We pause the animation, and progress using animationDelay.

animation-direction-normal.html now uses testharness.js

BUG=674123

Review-Url: https://codereview.chromium.org/2580703002
Cr-Commit-Position: refs/heads/master@{#438764}
parent c8b2173b
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 100 deletions
third_party/WebKit/LayoutTests/TestExpectations
View file @ cc8c7225
......@@ -2214,5 +2214,4 @@ crbug.com/673539 [ Linux ] css3/filters/effect-contrast-hw.html [ Pass Failure ]
# Added 2016-12-14
crbug.com/674048 [ Linux ] virtual/mojo-loading/http/tests/navigation/image-load-in-unload-handler.html [ Pass Timeout ]
crbug.com/674123 virtual/threaded/animations/animation-direction-normal.html [ Failure Timeout ]
crbug.com/674396 [ Win ] compositing/reflections/nested-reflection-transition.html [ Pass Failure ]
third_party/WebKit/LayoutTests/animations/animation-direction-normal-expected.html deleted 100644 → 0
View file @ c8b2173b
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Test of animation-direction</title>
<style type="text/css" media="screen">
body {
margin: 0;
}
#box {
position: absolute;
left: 0px;
top: 100px;
height: 100px;
width: 100px;
background-color: red;
margin: 0;
transform: translateX(50px);
}
#safezone {
position: absolute;
top: 100px;
height: 100px;
width: 130px;
left: 30px;
background-color: green;
}
</style>
</script>
</head>
<body>
<!-- This tests the operation of animation-direction. After 1 second the red boxes should be hidden by the green boxes. You should see no red boxes. -->
<div id="box"></div>
<div id="safezone"></div>
<div id="result">
Warning this test is running in real-time and may be flaky.<br>
PASS - "transform" property for "box" element at 0.5s saw something close to: 1,0,0,1,50,0<br>
PASS - "transform" property for "box" element at 1s saw something close to: 1,0,0,1,100,0<br>
PASS - "transform" property for "box" element at 2.5s saw something close to: 1,0,0,1,50,0
</div>
</div>
</body>
</html>
third_party/WebKit/LayoutTests/animations/animation-direction-normal.html
View file @ cc8c7225
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Test of animation-direction</title>
<style type="text/css" media="screen">
body {
margin: 0;
}
#box {
position: absolute;
left: 0px;
top: 100px;
height: 100px;
width: 100px;
background-color: red;
margin: 0;
animation-duration: 2s;
<!DOCTYPE html>
<title>Test of animation-direction</title>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<style>
#target {
animation-direction: normal;
animation-duration: 2s;
animation-iteration-count: 2;
animation-timing-function: linear;
animation-name: move1;
}
#safezone {
animation-play-state: paused;
animation-timing-function: linear;
background-color: red;
height: 100px;
left: 0px;
margin: 0;
position: absolute;
top: 100px;
height: 100px;
width: 130px;
left: 30px;
background-color: green;
width: 100px;
}
@keyframes move1 {
from { transform: translateX(0px); }
to { transform: translateX(200px); }
from { left: 0px; }
to { left: 200px; }
}
</style>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
// [time, element-id, property, expected-value, tolerance]
[0.5, "box", "transform", [1,0,0,1, 50,0], 20],
[1.0, "box", "transform", [1,0,0,1,100,0], 20],
[2.5, "box", "transform", [1,0,0,1, 50,0], 20],
];
function pauseAnimation()
{
document.getElementById("box").style.animationPlayState = "paused";
}
function setTimers()
{
setTimeout(pauseAnimation, 2500);
}
</style>
<div id="target"></div>
<script>
test(function() {
target.style.animationDelay = '-0.5s';
assert_equals(getComputedStyle(target).left, '50px');
runAnimationTest(expectedValues, setTimers, null, true, true);
target.style.animationDelay = '-1s';
assert_equals(getComputedStyle(target).left, '100px');
</script>
</head>
<body>
<!-- This tests the operation of animation-direction. After 1 second the red boxes should be hidden by the green boxes. You should see no red boxes. -->
<div id="box"></div>
<div id="safezone"></div>
<div id="result"></div>
</div>
</body>
</html>
target.style.animationDelay = '-2.5s';
assert_equals(getComputedStyle(target).left, '50px');
}, "animation-direction normal plays forwards");
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment