[cairo] [PATCH 2/4] test: Comma separate keywords

Bryce W. Harrington b.harrington at samsung.com
Thu Sep 12 15:55:02 PDT 2013


The parser accepts spaces as separtors between keywords, so this is nit
picky.  But only a minority of tests don't follow the comma convention,
so change them to be consistent.

Signed-off-by: Bryce Harrington <b.harrington at samsung.com>
---
 test/a1-bug.c                 |    2 +-
 test/arc-direction.c          |    2 +-
 test/caps-joins-curve.c       |    2 +-
 test/caps-tails-curve.c       |    2 +-
 test/caps.c                   |    8 ++++----
 test/clip-empty-group.c       |    2 +-
 test/drunkard-tails.c         |    2 +-
 test/joins.c                  |    2 +-
 test/partial-coverage.c       |   22 +++++++++++-----------
 test/rectilinear-dash-scale.c |    4 ++--
 test/rectilinear-dash.c       |    2 +-
 test/scale-offset-image.c     |    2 +-
 test/scale-offset-similar.c   |    2 +-
 test/unclosed-strokes.c       |    2 +-
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/test/a1-bug.c b/test/a1-bug.c
index 9166ff5..8e00d40 100644
--- a/test/a1-bug.c
+++ b/test/a1-bug.c
@@ -55,7 +55,7 @@ draw (cairo_t *cr, int width, int height)
 
 CAIRO_TEST (a1_bug,
 	    "Check the fidelity of the rasterisation.",
-	    "a1 raster", /* keywords */
+	    "a1, raster", /* keywords */
 	    "target=raster", /* requirements */
 	    1000, 800,
 	    NULL, draw)
diff --git a/test/arc-direction.c b/test/arc-direction.c
index fddb528..92c1a8d 100644
--- a/test/arc-direction.c
+++ b/test/arc-direction.c
@@ -98,7 +98,7 @@ draw (cairo_t *cr, int width, int height)
 
 CAIRO_TEST (arc_direction,
 	    "Test drawing positive/negative arcs",
-	    "arc fill", /* keywords */
+	    "arc, fill", /* keywords */
 	    NULL, /* requirements */
 	    2*(3*PAD + 2*SIZE), 2*(3*PAD + 2*SIZE),
 	    NULL, draw)
diff --git a/test/caps-joins-curve.c b/test/caps-joins-curve.c
index 1b2fc7f..cf19754 100644
--- a/test/caps-joins-curve.c
+++ b/test/caps-joins-curve.c
@@ -103,7 +103,7 @@ draw (cairo_t *cr, int width, int height)
 
 CAIRO_TEST (caps_joins_curve,
 	    "Test caps and joins on curves",
-	    "stroke cap join", /* keywords */
+	    "stroke, cap, join", /* keywords */
 	    NULL, /* requirements */
 	    3 * (PAD + SIZE) + PAD,
 	    2 * (PAD + SIZE) + PAD,
diff --git a/test/caps-tails-curve.c b/test/caps-tails-curve.c
index 0dc8b31..25e5819 100644
--- a/test/caps-tails-curve.c
+++ b/test/caps-tails-curve.c
@@ -119,7 +119,7 @@ draw (cairo_t *cr, int width, int height)
 
 CAIRO_TEST (caps_tails_curve,
 	    "Test caps and joins on short tail segments",
-	    "stroke cap join", /* keywords */
+	    "stroke, cap, join", /* keywords */
 	    NULL, /* requirements */
 	    9 * (PAD + SIZE) + 4*PAD,
 	    12 * (PAD + SIZE) + PAD,
diff --git a/test/caps.c b/test/caps.c
index cde2773..87f008a 100644
--- a/test/caps.c
+++ b/test/caps.c
@@ -106,7 +106,7 @@ draw_05 (cairo_t *cr, int width, int height)
 
 CAIRO_TEST (caps,
 	    "Test caps",
-	    "stroke caps", /* keywords */
+	    "stroke, caps", /* keywords */
 	    NULL, /* requirements */
 	    PAD + SIZE + PAD,
 	    3 * (PAD + SIZE) + PAD,
@@ -114,7 +114,7 @@ CAIRO_TEST (caps,
 
 CAIRO_TEST (caps_2,
 	    "Test normal caps",
-	    "stroke caps", /* keywords */
+	    "stroke, caps", /* keywords */
 	    NULL, /* requirements */
 	    PAD + SIZE + PAD,
 	    3 * (PAD + SIZE) + PAD,
@@ -122,7 +122,7 @@ CAIRO_TEST (caps_2,
 
 CAIRO_TEST (caps_1,
 	    "Test hairline caps",
-	    "stroke caps", /* keywords */
+	    "stroke, caps", /* keywords */
 	    NULL, /* requirements */
 	    PAD + SIZE + PAD,
 	    3 * (PAD + SIZE) + PAD,
@@ -130,7 +130,7 @@ CAIRO_TEST (caps_1,
 
 CAIRO_TEST (caps_05,
 	    "Test fine caps",
-	    "stroke caps", /* keywords */
+	    "stroke, caps", /* keywords */
 	    NULL, /* requirements */
 	    PAD + SIZE + PAD,
 	    3 * (PAD + SIZE) + PAD,
diff --git a/test/clip-empty-group.c b/test/clip-empty-group.c
index 20e95c2..3829c88 100644
--- a/test/clip-empty-group.c
+++ b/test/clip-empty-group.c
@@ -59,7 +59,7 @@ draw (cairo_t *cr, int width, int height)
 
 CAIRO_TEST (clip_empty_group,
 	    "Test handling of groups with everything clipped",
-	    "clip group", /* keywords */
+	    "clip, group", /* keywords */
 	    NULL, /* requirements */
 	    40, 40,
 	    NULL, draw)
diff --git a/test/drunkard-tails.c b/test/drunkard-tails.c
index 3d3e09a..f55c7be 100644
--- a/test/drunkard-tails.c
+++ b/test/drunkard-tails.c
@@ -127,7 +127,7 @@ draw (cairo_t *cr, int width, int height)
 
 CAIRO_TEST (drunkard_tails,
 	    "Test caps and joins on short tail segments",
-	    "stroke cap join", /* keywords */
+	    "stroke, cap, join", /* keywords */
 	    NULL, /* requirements */
 	    3 * (PAD + SIZE) + PAD,
 	    2 * (PAD + SIZE) + PAD,
diff --git a/test/joins.c b/test/joins.c
index 66847dc..40ef72e 100644
--- a/test/joins.c
+++ b/test/joins.c
@@ -101,7 +101,7 @@ draw (cairo_t *cr, int width, int height)
 
 CAIRO_TEST (joins,
 	    "Test joins",
-	    "stroke joins", /* keywords */
+	    "stroke, joins", /* keywords */
 	    NULL, /* requirements */
 	    3 * (PAD + SIZE) + PAD,
 	    3 * (PAD + SIZE) + PAD,
diff --git a/test/partial-coverage.c b/test/partial-coverage.c
index 0b5cbdc..7e67a5e 100644
--- a/test/partial-coverage.c
+++ b/test/partial-coverage.c
@@ -611,70 +611,70 @@ intersecting_triangles (cairo_t *cr, int width, int height)
 
 CAIRO_TEST (partial_coverage_rectangles,
 	    "Check the fidelity of the rasterisation.",
-	    "coverage raster", /* keywords */
+	    "coverage, raster", /* keywords */
 	    "target=raster slow", /* requirements */
 	    SIZE, SIZE,
 	    NULL, rectangles)
 
 CAIRO_TEST (partial_coverage_intersecting_quads,
 	    "Check the fidelity of the rasterisation.",
-	    "coverage raster", /* keywords */
+	    "coverage, raster", /* keywords */
 	    "target=raster slow", /* requirements */
 	    SIZE, SIZE,
 	    NULL, intersecting_quads)
 
 CAIRO_TEST (partial_coverage_intersecting_triangles,
 	    "Check the fidelity of the rasterisation.",
-	    "coverage raster", /* keywords */
+	    "coverage, raster", /* keywords */
 	    "target=raster slow", /* requirements */
 	    SIZE, SIZE,
 	    NULL, intersecting_triangles)
 CAIRO_TEST (partial_coverage_triangles,
 	    "Check the fidelity of the rasterisation.",
-	    "coverage raster", /* keywords */
+	    "coverage, raster", /* keywords */
 	    "target=raster slow", /* requirements */
 	    SIZE, SIZE,
 	    NULL, triangles)
 CAIRO_TEST (partial_coverage_overlap_three_quarter_triangles,
 	    "Check the fidelity of the rasterisation.",
-	    "coverage raster", /* keywords */
+	    "coverage, raster", /* keywords */
 	    "target=raster slow", /* requirements */
 	    SIZE, SIZE,
 	    NULL, overlap_three_quarter_triangles)
 CAIRO_TEST (partial_coverage_overlap_half_triangles_eo,
 	    "Check the fidelity of the rasterisation.",
-	    "coverage raster", /* keywords */
+	    "coverage, raster", /* keywords */
 	    "target=raster slow", /* requirements */
 	    SIZE, SIZE,
 	    NULL, overlap_half_triangles_eo)
 CAIRO_TEST (partial_coverage_overlap_half_triangles,
 	    "Check the fidelity of the rasterisation.",
-	    "coverage raster", /* keywords */
+	    "coverage, raster", /* keywords */
 	    "target=raster slow", /* requirements */
 	    SIZE, SIZE,
 	    NULL, overlap_half_triangles)
 CAIRO_TEST (partial_coverage_half_triangles,
 	    "Check the fidelity of the rasterisation.",
-	    "coverage raster", /* keywords */
+	    "coverage, raster", /* keywords */
 	    "target=raster slow", /* requirements */
 	    SIZE, SIZE,
 	    NULL, half_triangles)
 
 CAIRO_TEST (partial_coverage_reference,
 	    "Check the fidelity of this test.",
-	    "coverage raster", /* keywords */
+	    "coverage, raster", /* keywords */
 	    "target=raster", /* requirements */
 	    SIZE, SIZE,
 	    NULL, reference)
 CAIRO_TEST (partial_coverage_three_quarter_reference,
 	    "Check the fidelity of this test.",
-	    "coverage raster", /* keywords */
+	    "coverage, raster", /* keywords */
 	    "target=raster", /* requirements */
 	    SIZE, SIZE,
 	    NULL, three_quarter_reference)
 CAIRO_TEST (partial_coverage_half_reference,
 	    "Check the fidelity of this test.",
-	    "coverage raster", /* keywords */
+	    "coverage, raster", /* keywords */
 	    "target=raster", /* requirements */
 	    SIZE, SIZE,
 	    NULL, half_reference)
diff --git a/test/rectilinear-dash-scale.c b/test/rectilinear-dash-scale.c
index 1b69516..34f3345 100644
--- a/test/rectilinear-dash-scale.c
+++ b/test/rectilinear-dash-scale.c
@@ -183,14 +183,14 @@ unaligned (cairo_t *cr, int width, int height)
 
 CAIRO_TEST (rectilinear_dash_scale,
 	    "Test dashed rectilinear stroke operations (covering only whole pixels) after scaling",
-	    "stroke dash", /* keywords */
+	    "stroke, dash", /* keywords */
 	    NULL, /* requirements */
 	    4*SIZE, 2*SIZE,
 	    NULL, aligned)
 
 CAIRO_TEST (rectilinear_dash_scale_unaligned,
 	    "Test dashed rectilinear stroke operations (covering partial pixels) after scaling",
-	    "stroke dash", /* keywords */
+	    "stroke, dash", /* keywords */
 	    NULL, /* requirements */
 	    4*SIZE, 2*SIZE,
 	    NULL, unaligned)
diff --git a/test/rectilinear-dash.c b/test/rectilinear-dash.c
index fe998bb..954a2a0 100644
--- a/test/rectilinear-dash.c
+++ b/test/rectilinear-dash.c
@@ -169,7 +169,7 @@ draw (cairo_t *cr, int width, int height)
 
 CAIRO_TEST (rectilinear_dash,
 	    "Test dashed rectilinear stroke operations (covering only whole pixels)",
-	    "stroke dash", /* keywords */
+	    "stroke, dash", /* keywords */
 	    NULL, /* requirements */
 	    SIZE, SIZE,
 	    NULL, draw)
diff --git a/test/scale-offset-image.c b/test/scale-offset-image.c
index 0eef22e..a6e575a 100644
--- a/test/scale-offset-image.c
+++ b/test/scale-offset-image.c
@@ -135,7 +135,7 @@ draw (cairo_t *cr, int width, int height)
 
 CAIRO_TEST (scale_offset_image,
 	    "Tests drawing surfaces under various scales and transforms",
-	    "surface scale-offset", /* keywords */
+	    "surface, scale-offset", /* keywords */
 	    NULL, /* requirements */
 	    320, 320,
 	    NULL, draw)
diff --git a/test/scale-offset-similar.c b/test/scale-offset-similar.c
index daf7ffe..e9e6a2b 100644
--- a/test/scale-offset-similar.c
+++ b/test/scale-offset-similar.c
@@ -136,7 +136,7 @@ draw (cairo_t *cr, int width, int height)
 
 CAIRO_TEST (scale_offset_similar,
 	    "Tests drawing surfaces under various scales and transforms",
-	    "surface scale-offset", /* keywords */
+	    "surface, scale-offset", /* keywords */
 	    NULL, /* requirements */
 	    320, 320,
 	    NULL, draw)
diff --git a/test/unclosed-strokes.c b/test/unclosed-strokes.c
index 3c0287f..40a76eb 100644
--- a/test/unclosed-strokes.c
+++ b/test/unclosed-strokes.c
@@ -75,7 +75,7 @@ draw (cairo_t *cr, int width, int height)
 
 CAIRO_TEST (unclosed_strokes,
 	    "Test coincident end-points are capped and not joined",
-	    "stroke caps", /* keywords */
+	    "stroke, caps", /* keywords */
 	    NULL, /* requirements */
 	    PAD + SIZE + PAD,
 	    3 * (PAD + SIZE) + PAD,
-- 
1.7.9.5


More information about the cairo mailing list