[librsvg] build: Fix testcases build
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg] build: Fix testcases build
- Date: Mon, 14 Oct 2013 20:10:47 +0000 (UTC)
commit 2bb8b44f5ea8630e55beb9ae6634c7dd3d7abd86
Author: Christian Persch <chpe gnome org>
Date: Mon Oct 14 21:50:21 2013 +0200
build: Fix testcases build
tests/styles.c | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/tests/styles.c b/tests/styles.c
index 81fb50e..837fca6 100644
--- a/tests/styles.c
+++ b/tests/styles.c
@@ -40,9 +40,9 @@ static void
assert_equal_value (FixtureData *fixture, RsvgNode *node)
{
if (g_str_equal (fixture->target_name, "stroke"))
- assert_equal_color (fixture->expected.color, node->state->stroke->core.colour->rgb);
+ assert_equal_color (fixture->expected.color, node->state->stroke->core.colour->argb);
else if (g_str_equal (fixture->target_name, "fill"))
- assert_equal_color (fixture->expected.color, node->state->fill->core.colour->rgb);
+ assert_equal_color (fixture->expected.color, node->state->fill->core.colour->argb);
else if (g_str_equal (fixture->target_name, "stroke-width"))
assert_equal_length (&fixture->expected.length, &node->state->stroke_width);
else
@@ -79,31 +79,31 @@ test_value (FixtureData *fixture)
static const FixtureData fixtures[] =
{
- {"/styles/selectors/type", NULL, "styles/order.svg", "#black", "fill", .expected.color = 0x000000},
- {"/styles/selectors/class", NULL, "styles/order.svg", "#blue", "fill", .expected.color = 0x0000ff},
- {"/styles/selectors/#id", NULL, "styles/order.svg", "#brown", "fill", .expected.color = 0xa52a2a},
- {"/styles/selectors/style", NULL, "styles/order.svg", "#gray", "fill", .expected.color = 0x808080},
- {"/styles/selectors/style property prior than class", NULL, "styles/order.svg", "#red", "fill",
.expected.color = 0xff0000},
- {"/styles/selectors/#id prior than class", NULL, "styles/order.svg", "#green", "fill", .expected.color =
0x008000},
- {"/styles/selectors/type#id prior than class", NULL, "styles/order.svg", "#pink", "fill",
.expected.color = 0xffc0cb},
- {"/styles/selectors/class#id prior than class", NULL, "styles/order.svg", "#yellow", "fill",
.expected.color = 0xffff00},
- {"/styles/selectors/type.class#id prior than class", NULL, "styles/order.svg", "#white", "fill",
.expected.color = 0xffffff},
- {"/styles/selectors/#id prior than type", "418823", "styles/bug418823.svg", "#bla", "fill",
.expected.color = 0x00ff00},
- {"/styles/selectors/comma-separate (fill)", "614643", "styles/bug614643.svg", "#red-rect", "fill",
.expected.color = 0xff0000},
- {"/styles/selectors/comma-separete (stroke)", "614643", "styles/bug614643.svg", "#red-path", "stroke",
.expected.color = 0xff0000},
- {"/styles/override presentation attribute", "614704", "styles/bug614704.svg", "#blue-rect", "fill",
.expected.color = 0x0000ff},
- {"/styles/selectors/2 or more selectors (fill)", "592207", "styles/bug592207.svg", "#target", "fill",
.expected.color = 0xff0000},
- {"/styles/selectors/2 or more selectors (stroke)", "592207", "styles/bug592207.svg", "#target",
"stroke", .expected.color = 0x0000ff},
- {"/styles/svg-element-style", "615701", "styles/svg-class.svg", "#svg", "fill", .expected.color =
0x0000ff},
- {"/styles/presentation attribute in svg element", "620693", "styles/bug620693.svg", "#svg", "stroke",
.expected.color = 0xff0000},
- {"/styles/!important", "379629", "styles/bug379629.svg", "#base_shadow", "stroke", .expected.color =
0xffc0cb /* pink */},
+ {"/styles/selectors/type", NULL, "styles/order.svg", "#black", "fill", .expected.color = 0xff000000},
+ {"/styles/selectors/class", NULL, "styles/order.svg", "#blue", "fill", .expected.color = 0xff0000ff},
+ {"/styles/selectors/#id", NULL, "styles/order.svg", "#brown", "fill", .expected.color = 0xffa52a2a},
+ {"/styles/selectors/style", NULL, "styles/order.svg", "#gray", "fill", .expected.color = 0xff808080},
+ {"/styles/selectors/style property prior than class", NULL, "styles/order.svg", "#red", "fill",
.expected.color = 0xffff0000},
+ {"/styles/selectors/#id prior than class", NULL, "styles/order.svg", "#green", "fill", .expected.color =
0xff008000},
+ {"/styles/selectors/type#id prior than class", NULL, "styles/order.svg", "#pink", "fill",
.expected.color = 0xffffc0cb},
+ {"/styles/selectors/class#id prior than class", NULL, "styles/order.svg", "#yellow", "fill",
.expected.color = 0xffffff00},
+ {"/styles/selectors/type.class#id prior than class", NULL, "styles/order.svg", "#white", "fill",
.expected.color = 0xffffffff},
+ {"/styles/selectors/#id prior than type", "418823", "styles/bug418823.svg", "#bla", "fill",
.expected.color = 0xff00ff00},
+ {"/styles/selectors/comma-separate (fill)", "614643", "styles/bug614643.svg", "#red-rect", "fill",
.expected.color = 0xffff0000},
+ {"/styles/selectors/comma-separete (stroke)", "614643", "styles/bug614643.svg", "#red-path", "stroke",
.expected.color = 0xffff0000},
+ {"/styles/override presentation attribute", "614704", "styles/bug614704.svg", "#blue-rect", "fill",
.expected.color = 0xff0000ff},
+ {"/styles/selectors/2 or more selectors (fill)", "592207", "styles/bug592207.svg", "#target", "fill",
.expected.color = 0xffff0000},
+ {"/styles/selectors/2 or more selectors (stroke)", "592207", "styles/bug592207.svg", "#target",
"stroke", .expected.color = 0xff0000ff},
+ {"/styles/svg-element-style", "615701", "styles/svg-class.svg", "#svg", "fill", .expected.color =
0xff0000ff},
+ {"/styles/presentation attribute in svg element", "620693", "styles/bug620693.svg", "#svg", "stroke",
.expected.color = 0xffff0000},
+ {"/styles/!important", "379629", "styles/bug379629.svg", "#base_shadow", "stroke", .expected.color =
0xffffc0cb /* pink */},
{"/styles/!important", "379629", "styles/bug379629.svg", "#base_shadow", "stroke-width",
.expected.length = {POINTS_LENGTH(5.), 'i'}},
- {"/styles/!important/class", "614606", "styles/bug614606.svg", "#path6306", "fill", .expected.color =
0xff0000 /* red */ },
- {"/styles/!important/element", "614606", "styles/bug614606.svg", "#path6308", "fill", .expected.color =
0x000000},
- {"/styles/!important/#id prior than class", NULL, "styles/important.svg", "#red", "fill",
.expected.color = 0xff0000 },
- {"/styles/!important/class prior than type", NULL, "styles/important.svg", "#blue", "fill",
.expected.color = 0x0000ff },
- {"/styles/!important/presentation attribute is invalid", NULL, "styles/important.svg", "#white", "fill",
.expected.color = 0xffffff },
- {"/styles/!important/style prior than class", NULL, "styles/important.svg", "#pink", "fill",
.expected.color = 0xffc0cb },
+ {"/styles/!important/class", "614606", "styles/bug614606.svg", "#path6306", "fill", .expected.color =
0xffff0000 /* red */ },
+ {"/styles/!important/element", "614606", "styles/bug614606.svg", "#path6308", "fill", .expected.color =
0xff000000},
+ {"/styles/!important/#id prior than class", NULL, "styles/important.svg", "#red", "fill",
.expected.color = 0xffff0000 },
+ {"/styles/!important/class prior than type", NULL, "styles/important.svg", "#blue", "fill",
.expected.color = 0xff0000ff },
+ {"/styles/!important/presentation attribute is invalid", NULL, "styles/important.svg", "#white", "fill",
.expected.color = 0xffffffff },
+ {"/styles/!important/style prior than class", NULL, "styles/important.svg", "#pink", "fill",
.expected.color = 0xffffc0cb },
/* {"/styles/selectors/descendant", "338160", "styles/bug338160.svg", "#base_shadow", "stroke-width",
.expected.length = {2., '\0'}}, */
};
static const gint n_fixtures = G_N_ELEMENTS (fixtures);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]