Skip to content

GitLab

T
tangled
Commit 5abdda89 authored by Chris Nardi's avatar Chris Nardi Committed by Commit Bot
Browse files
Options

Remove duplicate color parsing tests 

css3/calc/color-{hsl/rgb}.html are already covered by
external/wpt/css/css-values/calc-in-color-001.html, and
fast/css/named-colors.html is already covered by
external/wpt/css/css-color/color-resolving-keywords.html. Remove these
duplicate tests.

Change-Id: I2540ae5a6280bbfad0eb2192862826fc483d8314
Reviewed-on: https://chromium-review.googlesource.com/958285Reviewed-by: default avatarRune Lillesveen <futhark@chromium.org>
Commit-Queue: Chris Nardi <cnardi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542457}
parent 864bf8a0
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 452 deletions
third_party/WebKit/LayoutTests/css3/calc/color-hsl-expected.txt deleted 100644 → 0
View file @ 864bf8a0
Tests that CSS3 calc() can be used with the hsl() and hsla() functions
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
PASS getComputedStyle(document.getElementById("simple"), null).color is "rgb(32, 223, 32)"
PASS getComputedStyle(document.getElementById("alpha"), null).color is "rgba(32, 223, 32, 0.7)"
PASS successfullyParsed is true
TEST COMPLETE
third_party/WebKit/LayoutTests/css3/calc/color-hsl.html deleted 100644 → 0
View file @ 864bf8a0
<!DOCTYPE HTML>
<script src="../../resources/js-test.js"></script>
<style>
#controlsimple { color: hsl(120,75%,50%); }
#simple { color: hsl(calc(120),calc(75%),calc(50%)); }
#controlalpha { color: hsla(120,75%,50%,0.7); }
#alpha { color: hsla(calc(120),calc(75%),calc(50%), calc(0.7)); }
</style>
<div id="test-container">
<hr/>
<div id="controlsimple">These two sentences should be the same color (simple)</div>
<div id="simple">These two sentences should be the same color (simple)</div>
<hr/>
<div id="controlalpha">These two sentences should be the same color (alpha)</div>
<div id="alpha">These two sentences should be the same color (alpha)</div>
</div>
<script>
description("Tests that CSS3 calc() can be used with the hsl() and hsla() functions");
tests = ["simple", "alpha"];
for (i = 0; i < tests.length; i++) {
var test = tests[i];
shouldBeEqualToString('getComputedStyle(document.getElementById("' + test + '"), null).color', getComputedStyle(document.getElementById("control" + test), null).color);
}
if (window.testRunner)
document.body.removeChild(document.getElementById("test-container"));
</script>
third_party/WebKit/LayoutTests/css3/calc/color-rgb-expected.txt deleted 100644 → 0
View file @ 864bf8a0
Tests that CSS3 calc() can be used with the rgb() and rgba() functions
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
PASS getComputedStyle(document.getElementById("simple"), null).color is "rgb(10, 180, 30)"
PASS getComputedStyle(document.getElementById("percentsimple"), null).color is "rgb(26, 242, 77)"
FAIL getComputedStyle(document.getElementById("percentnumber"), null).color should be rgb(26, 240, 80). Was rgb(0, 0, 0).
PASS getComputedStyle(document.getElementById("alpha"), null).color is "rgba(10, 180, 30, 0.7)"
PASS getComputedStyle(document.getElementById("percentalpha"), null).color is "rgba(26, 242, 77, 0.7)"
FAIL getComputedStyle(document.getElementById("percentnumberalpha"), null).color should be rgba(26, 240, 80, 0.5). Was rgb(0, 0, 0).
PASS successfullyParsed is true
TEST COMPLETE
third_party/WebKit/LayoutTests/css3/calc/color-rgb.html deleted 100644 → 0
View file @ 864bf8a0
<!DOCTYPE HTML>
<script src="../../resources/js-test.js"></script>
<style>
#controlsimple { color: rgb(10,180,30); }
#simple { color: rgb(calc(10),calc(18 * 10),calc(30)); }
#controlpercentsimple { color: rgb(10%,95%,30%); }
#percentsimple { color: rgb(calc(2% + 8%),calc(95%),calc(3% * 10)); }
#controlpercentnumber { color: rgb(26,240,80); }
#percentnumber { color: rgb(calc(2% + 8% + 1),calc(95% - 3),calc(3% * 10 + 4)); }
#controlalpha { color: rgba(10,180,30,0.7); }
#alpha { color: rgba(calc(10),calc(180),calc(30), calc(0.35 * 2)); }
#controlpercentalpha { color: rgba(10%,95%,30%,0.7); }
#percentalpha { color: rgba(calc(2 * 5%),calc(100% - 5%),calc(30%),calc(0.2 * 3 + 0.1)); }
#controlpercentnumberalpha { color: rgba(26,240,80, 0.5); }
#percentnumberalpha { color: rgba(calc(2% + 8% + 1),calc(95% - 3),calc(3% * 10 + 4), calc(1.0 / 2)); }
</style>
<div id="test-container">
<hr/>
<div id="controlsimple">These two sentences should be the same color (simple)</div>
<div id="simple">These two sentences should be the same color (simple)</div>
<hr/>
<div id="controlpercentsimple">These two sentences should be the same color (simple percent)</div>
<div id="percentsimple">These two sentences should be the same color (simple percent)</div>
<hr/>
<div id="controlpercentnumber">These two sentences should be the same color (percent number)</div>
<div id="percentnumber">These two sentences should be the same color (percent number)</div>
<hr/>
<div id="controlalpha">These two sentences should be the same color (alpha)</div>
<div id="alpha">These two sentences should be the same color (alpha)</div>
<hr/>
<div id="controlpercentalpha">These two sentences should be the same color (percent alpha)</div>
<div id="percentalpha">These two sentences should be the same color (percent alpha)</div>
<hr/>
<div id="controlpercentnumberalpha">These two sentences should be the same color (percent number alpha)</div>
<div id="percentnumberalpha">These two sentences should be the same color (percent number alpha)</div>
</div>
<script>
description("Tests that CSS3 calc() can be used with the rgb() and rgba() functions");
tests = ["simple", "percentsimple", "percentnumber", "alpha", "percentalpha", "percentnumberalpha"];
for (i = 0; i < tests.length; i++) {
var test = tests[i];
shouldBeEqualToString('getComputedStyle(document.getElementById("' + test + '"), null).color', getComputedStyle(document.getElementById("control" + test), null).color);
}
if (window.testRunner)
document.body.removeChild(document.getElementById("test-container"));
</script>
third_party/WebKit/LayoutTests/external/wpt/css/css-values/calc-in-color-001.html
View file @ 5abdda89
......@@ -12,7 +12,8 @@ const TESTS = {
// specified -> expected
"rgb(calc(0), calc(255 + 0), calc(140 - 139 - 1))": "rgb(0, 255, 0)",
"rgba(calc(0%) calc(100%) calc(0%) / calc(10% * 10))": "rgb(0, 255, 0)",
"hsl(calc(5deg * (360 / 5)), calc(10% * 10), calc(10% * 10))": "rgb(255, 255, 255)"
"hsl(calc(5deg * (360 / 5)), calc(10% * 10), calc(10% * 10))": "rgb(255, 255, 255)",
"hsla(calc(5 * (360 / 5)), calc(10% * 10), calc(10% * 10), calc(1.0))": "rgb(255, 255, 255)"
}
test(function() {
......
third_party/WebKit/LayoutTests/fast/css/named-colors-expected.txt deleted 100644 → 0
View file @ 864bf8a0
PASS aliceblue is 240,248,255
PASS antiquewhite is 250,235,215
PASS aqua is 0,255,255
PASS aquamarine is 127,255,212
PASS azure is 240,255,255
PASS beige is 245,245,220
PASS bisque is 255,228,196
PASS black is 0,0,0
PASS blanchedalmond is 255,235,205
PASS blue is 0,0,255
PASS blueviolet is 138,43,226
PASS brown is 165,42,42
PASS burlywood is 222,184,135
PASS cadetblue is 95,158,160
PASS chartreuse is 127,255,0
PASS chocolate is 210,105,30
PASS coral is 255,127,80
PASS cornflowerblue is 100,149,237
PASS cornsilk is 255,248,220
PASS crimson is 220,20,60
PASS cyan is 0,255,255
PASS darkblue is 0,0,139
PASS darkcyan is 0,139,139
PASS darkgoldenrod is 184,134,11
PASS darkgray is 169,169,169
PASS darkgreen is 0,100,0
PASS darkgrey is 169,169,169
PASS darkkhaki is 189,183,107
PASS darkmagenta is 139,0,139
PASS darkolivegreen is 85,107,47
PASS darkorange is 255,140,0
PASS darkorchid is 153,50,204
PASS darkred is 139,0,0
PASS darksalmon is 233,150,122
PASS darkseagreen is 143,188,143
PASS darkslateblue is 72,61,139
PASS darkslategray is 47,79,79
PASS darkslategrey is 47,79,79
PASS darkturquoise is 0,206,209
PASS darkviolet is 148,0,211
PASS deeppink is 255,20,147
PASS deepskyblue is 0,191,255
PASS dimgray is 105,105,105
PASS dimgrey is 105,105,105
PASS dodgerblue is 30,144,255
PASS firebrick is 178,34,34
PASS floralwhite is 255,250,240
PASS forestgreen is 34,139,34
PASS fuchsia is 255,0,255
PASS gainsboro is 220,220,220
PASS ghostwhite is 248,248,255
PASS gold is 255,215,0
PASS goldenrod is 218,165,32
PASS gray is 128,128,128
PASS green is 0,128,0
PASS greenyellow is 173,255,47
PASS grey is 128,128,128
PASS honeydew is 240,255,240
PASS hotpink is 255,105,180
PASS indianred is 205,92,92
PASS indigo is 75,0,130
PASS ivory is 255,255,240
PASS khaki is 240,230,140
PASS lavender is 230,230,250
PASS lavenderblush is 255,240,245
PASS lawngreen is 124,252,0
PASS lemonchiffon is 255,250,205
PASS lightblue is 173,216,230
PASS lightcoral is 240,128,128
PASS lightcyan is 224,255,255
PASS lightgoldenrodyellow is 250,250,210
PASS lightgray is 211,211,211
PASS lightgreen is 144,238,144
PASS lightgrey is 211,211,211
PASS lightpink is 255,182,193
PASS lightsalmon is 255,160,122
PASS lightseagreen is 32,178,170
PASS lightskyblue is 135,206,250
PASS lightslategray is 119,136,153
PASS lightslategrey is 119,136,153
PASS lightsteelblue is 176,196,222
PASS lightyellow is 255,255,224
PASS lime is 0,255,0
PASS limegreen is 50,205,50
PASS linen is 250,240,230
PASS magenta is 255,0,255
PASS maroon is 128,0,0
PASS mediumaquamarine is 102,205,170
PASS mediumblue is 0,0,205
PASS mediumorchid is 186,85,211
PASS mediumpurple is 147,112,219
PASS mediumseagreen is 60,179,113
PASS mediumslateblue is 123,104,238
PASS mediumspringgreen is 0,250,154
PASS mediumturquoise is 72,209,204
PASS mediumvioletred is 199,21,133
PASS midnightblue is 25,25,112
PASS mintcream is 245,255,250
PASS mistyrose is 255,228,225
PASS moccasin is 255,228,181
PASS navajowhite is 255,222,173
PASS navy is 0,0,128
PASS oldlace is 253,245,230
PASS olive is 128,128,0
PASS olivedrab is 107,142,35
PASS orange is 255,165,0
PASS orangered is 255,69,0
PASS orchid is 218,112,214
PASS palegoldenrod is 238,232,170
PASS palegreen is 152,251,152
PASS paleturquoise is 175,238,238
PASS palevioletred is 219,112,147
PASS papayawhip is 255,239,213
PASS peachpuff is 255,218,185
PASS peru is 205,133,63
PASS pink is 255,192,203
PASS plum is 221,160,221
PASS powderblue is 176,224,230
PASS purple is 128,0,128
PASS rebeccapurple is 102,51,153
PASS red is 255,0,0
PASS rosybrown is 188,143,143
PASS royalblue is 65,105,225
PASS saddlebrown is 139,69,19
PASS salmon is 250,128,114
PASS sandybrown is 244,164,96
PASS seagreen is 46,139,87
PASS seashell is 255,245,238
PASS sienna is 160,82,45
PASS silver is 192,192,192
PASS skyblue is 135,206,235
PASS slateblue is 106,90,205
PASS slategray is 112,128,144
PASS slategrey is 112,128,144
PASS snow is 255,250,250
PASS springgreen is 0,255,127
PASS steelblue is 70,130,180
PASS tan is 210,180,140
PASS teal is 0,128,128
PASS thistle is 216,191,216
PASS tomato is 255,99,71
PASS turquoise is 64,224,208
PASS violet is 238,130,238
PASS wheat is 245,222,179
PASS white is 255,255,255
PASS whitesmoke is 245,245,245
PASS yellow is 255,255,0
PASS yellowgreen is 154,205,50
third_party/WebKit/LayoutTests/fast/css/named-colors.html deleted 100644 → 0
View file @ 864bf8a0
<!DOCTYPE html>
<html>
<head>
<title>Named Colors Test</title>
<script>
if (window.testRunner)
testRunner.dumpAsText();
// Named colors and their rgb values as per the CSS Color specification.
// http://dev.w3.org/csswg/css-color/#named-colors
var colors = [
['aliceblue', '240,248,255'],
['antiquewhite', '250,235,215'],
['aqua', '0,255,255'],
['aquamarine', '127,255,212'],
['azure', '240,255,255'],
['beige', '245,245,220'],
['bisque', '255,228,196'],
['black', '0,0,0'],
['blanchedalmond', '255,235,205'],
['blue', '0,0,255'],
['blueviolet', '138,43,226'],
['brown', '165,42,42'],
['burlywood', '222,184,135'],
['cadetblue', '95,158,160'],
['chartreuse', '127,255,0'],
['chocolate', '210,105,30'],
['coral', '255,127,80'],
['cornflowerblue', '100,149,237'],
['cornsilk', '255,248,220'],
['crimson', '220,20,60'],
['cyan', '0,255,255'],
['darkblue', '0,0,139'],
['darkcyan', '0,139,139'],
['darkgoldenrod', '184,134,11'],
['darkgray', '169,169,169'],
['darkgreen', '0,100,0'],
['darkgrey', '169,169,169'],
['darkkhaki', '189,183,107'],
['darkmagenta', '139,0,139'],
['darkolivegreen', '85,107,47'],
['darkorange', '255,140,0'],
['darkorchid', '153,50,204'],
['darkred', '139,0,0'],
['darksalmon', '233,150,122'],
['darkseagreen', '143,188,143'],
['darkslateblue', '72,61,139'],
['darkslategray', '47,79,79'],
['darkslategrey', '47,79,79'],
['darkturquoise', '0,206,209'],
['darkviolet', '148,0,211'],
['deeppink', '255,20,147'],
['deepskyblue', '0,191,255'],
['dimgray', '105,105,105'],
['dimgrey', '105,105,105'],
['dodgerblue', '30,144,255'],
['firebrick', '178,34,34'],
['floralwhite', '255,250,240'],
['forestgreen', '34,139,34'],
['fuchsia', '255,0,255'],
['gainsboro', '220,220,220'],
['ghostwhite', '248,248,255'],
['gold', '255,215,0'],
['goldenrod', '218,165,32'],
['gray', '128,128,128'],
['green', '0,128,0'],
['greenyellow', '173,255,47'],
['grey', '128,128,128'],
['honeydew', '240,255,240'],
['hotpink', '255,105,180'],
['indianred', '205,92,92'],
['indigo', '75,0,130'],
['ivory', '255,255,240'],
['khaki', '240,230,140'],
['lavender', '230,230,250'],
['lavenderblush', '255,240,245'],
['lawngreen', '124,252,0'],
['lemonchiffon', '255,250,205'],
['lightblue', '173,216,230'],
['lightcoral', '240,128,128'],
['lightcyan', '224,255,255'],
['lightgoldenrodyellow', '250,250,210'],
['lightgray', '211,211,211'],
['lightgreen', '144,238,144'],
['lightgrey', '211,211,211'],
['lightpink', '255,182,193'],
['lightsalmon', '255,160,122'],
['lightseagreen', '32,178,170'],
['lightskyblue', '135,206,250'],
['lightslategray', '119,136,153'],
['lightslategrey', '119,136,153'],
['lightsteelblue', '176,196,222'],
['lightyellow', '255,255,224'],
['lime', '0,255,0'],
['limegreen', '50,205,50'],
['linen', '250,240,230'],
['magenta', '255,0,255'],
['maroon', '128,0,0'],
['mediumaquamarine', '102,205,170'],
['mediumblue', '0,0,205'],
['mediumorchid', '186,85,211'],
['mediumpurple', '147,112,219'],
['mediumseagreen', '60,179,113'],
['mediumslateblue', '123,104,238'],
['mediumspringgreen', '0,250,154'],
['mediumturquoise', '72,209,204'],
['mediumvioletred', '199,21,133'],
['midnightblue', '25,25,112'],
['mintcream', '245,255,250'],
['mistyrose', '255,228,225'],
['moccasin', '255,228,181'],
['navajowhite', '255,222,173'],
['navy', '0,0,128'],
['oldlace', '253,245,230'],
['olive', '128,128,0'],
['olivedrab', '107,142,35'],
['orange', '255,165,0'],
['orangered', '255,69,0'],
['orchid', '218,112,214'],
['palegoldenrod', '238,232,170'],
['palegreen', '152,251,152'],
['paleturquoise', '175,238,238'],
['palevioletred', '219,112,147'],
['papayawhip', '255,239,213'],
['peachpuff', '255,218,185'],
['peru', '205,133,63'],
['pink', '255,192,203'],
['plum', '221,160,221'],
['powderblue', '176,224,230'],
['purple', '128,0,128'],
['rebeccapurple', '102,51,153'],
['red', '255,0,0'],
['rosybrown', '188,143,143'],
['royalblue', '65,105,225'],
['saddlebrown', '139,69,19'],
['salmon', '250,128,114'],
['sandybrown', '244,164,96'],
['seagreen', '46,139,87'],
['seashell', '255,245,238'],
['sienna', '160,82,45'],
['silver', '192,192,192'],
['skyblue', '135,206,235'],
['slateblue', '106,90,205'],
['slategray', '112,128,144'],
['slategrey', '112,128,144'],
['snow', '255,250,250'],
['springgreen', '0,255,127'],
['steelblue', '70,130,180'],
['tan', '210,180,140'],
['teal', '0,128,128'],
['thistle', '216,191,216'],
['tomato', '255,99,71'],
['turquoise', '64,224,208'],
['violet', '238,130,238'],
['wheat', '245,222,179'],
['white', '255,255,255'],
['whitesmoke', '245,245,245'],
['yellow', '255,255,0'],
['yellowgreen', '154,205,50']
];
function testColor(colorName, expected)
{
var element = document.createElement("div");
var statusSpan = document.createElement("span");
element.appendChild(statusSpan);
var colorSpan = document.createElement("span");
colorSpan.appendChild(document.createTextNode(colorName));
colorSpan.style.backgroundColor = colorName;
element.appendChild(colorSpan);
document.body.appendChild(element);
var value = document.defaultView.getComputedStyle(colorSpan, "").getPropertyValue("background-color");
var actual = value.match(/rgb\((\d+),\s*(\d+),\s*(\d+)\)/).splice(1).join(',');
if (actual == expected) {
statusSpan.appendChild(document.createTextNode('PASS '));
element.appendChild(document.createTextNode(' is ' + actual));
} else {
statusSpan.appendChild(document.createTextNode('FAIL '));
element.appendChild(document.createTextNode(' was ' + actual + ', expected ' + expected));
}
}
function test()
{
for (var color, i = 0; color = colors[i]; i++) {
testColor(color[0], color[1]);
}
}
</script>
</head>
<body onload="test()">
</body>
</html>
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