Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gears.color spec: Don't depend on order of pairs() (FS#1301) 

The previous code assumed that pairs() iterates over the table in a specific
order which is not a safe assumption.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2014-10-15 23:42:24 +02:00
parent d76e20bbce
commit cf9db056f9
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
spec/gears/color_spec.lua
View File

@ -36,16 +36,15 @@ describe("gears.color", function()
end) end)
local function test_pattern_stops(pattern, stops) local function test_pattern_stops(pattern, stops)
local i = 0 for i, stop in pairs(stops) do
for off, stop in pairs(stops) do local status, offset, r, g, b, a = pattern:get_color_stop_rgba(i - 1)
local status, offset, r, g, b, a = pattern:get_color_stop_rgba(i) assert.is.same("SUCCESS", status)
assert.is.same(offset, off) assert.is.same(offset, stop.offset)
assert.is.same({ r, g, b, a }, stop) assert.is.same({ r, g, b, a }, stop.rgba)
i = i + 1
end end
assert.is.same({ pattern:get_color_stop_count() }, assert.is.same({ pattern:get_color_stop_count() },
{ "SUCCESS", i }) { "SUCCESS", #stops })
end end
local function test_linear_pattern(pattern, from, to, stops) local function test_linear_pattern(pattern, from, to, stops)
@ -67,18 +66,18 @@ describe("gears.color", function()
} }
}) })
test_linear_pattern(pattern, { 2, 10 }, { 102, 110}, { test_linear_pattern(pattern, { 2, 10 }, { 102, 110}, {
[0] = { 1, 0, 0, 1 }, { offset = 0, rgba = { 1, 0, 0, 1 }},
[0.5] = { 0, 1, 0, 1 }, { offset = 0.5, rgba = { 0, 1, 0, 1 }},
[1] = { 0, 0, 1, 1 } { offset = 1, rgba = { 0, 0, 1, 1 }}
}) })
end) end)
it("string description", function() it("string description", function()
local pattern = color("linear:2,10:102,110:0,#ff0000:0.5,#00ff00:1,#0000ff") local pattern = color("linear:2,10:102,110:0,#ff0000:0.5,#00ff00:1,#0000ff")
test_linear_pattern(pattern, { 2, 10 }, { 102, 110 }, { test_linear_pattern(pattern, { 2, 10 }, { 102, 110 }, {
[0] = { 1, 0, 0, 1 }, { offset = 0, rgba = { 1, 0, 0, 1 }},
[0.5] = { 0, 1, 0, 1 }, { offset = 0.5, rgba = { 0, 1, 0, 1 }},
[1] = { 0, 0, 1, 1 } { offset = 1, rgba = { 0, 0, 1, 1 }}
}) })
end) end)
end) end)
@ -102,18 +101,18 @@ describe("gears.color", function()
} }
}) })
test_radial_pattern(pattern, { 2, 10, 42 }, { 102, 110, 142 }, { test_radial_pattern(pattern, { 2, 10, 42 }, { 102, 110, 142 }, {
[0] = { 1, 0, 0, 1 }, { offset = 0, rgba = { 1, 0, 0, 1 }},
[0.5] = { 0, 1, 0, 1 }, { offset = 0.5, rgba = { 0, 1, 0, 1 }},
[1] = { 0, 0, 1, 1 } { offset = 1, rgba = { 0, 0, 1, 1 }}
}) })
end) end)
it("string description", function() it("string description", function()
local pattern = color("radial:2,10,42:102,110,142:0,#ff0000:0.5,#00ff00:1,#0000ff") local pattern = color("radial:2,10,42:102,110,142:0,#ff0000:0.5,#00ff00:1,#0000ff")
test_radial_pattern(pattern, { 2, 10, 42 }, { 102, 110, 142 }, { test_radial_pattern(pattern, { 2, 10, 42 }, { 102, 110, 142 }, {
[0] = { 1, 0, 0, 1 }, { offset = 0, rgba = { 1, 0, 0, 1 }},
[0.5] = { 0, 1, 0, 1 }, { offset = 0.5, rgba = { 0, 1, 0, 1 }},
[1] = { 0, 0, 1, 1 } { offset = 1, rgba = { 0, 0, 1, 1 }}
}) })
end) end)
end) end)