From 6a04f23c404e401afd2921d3a4317a1ad102deeb Mon Sep 17 00:00:00 2001 From: Nicola Fontana Date: Fri, 30 Jan 2015 18:50:12 +0100 Subject: [PATCH] tests: new adg_test_cairo_num_data helper function A function that gets the num_data field from the currently active path in the provided cairo context. --- src/cpml/tests/test-primitive.c | 18 ++++-------------- src/tests/adg-test.c | 10 ++++++++++ src/tests/adg-test.h | 3 ++- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/cpml/tests/test-primitive.c b/src/cpml/tests/test-primitive.c index 2c4833c3..0e40bb16 100644 --- a/src/cpml/tests/test-primitive.c +++ b/src/cpml/tests/test-primitive.c @@ -584,16 +584,6 @@ _cpml_test_join(void) g_assert_cmpfloat((primitive2.org)->point.y, ==, 0); } -static int -_cpml_path_length(cairo_t *cr) -{ - cairo_path_t *path = cairo_copy_path(cr); - int length = path->num_data; - cairo_path_destroy(path); - - return length; -} - static void _cpml_test_to_cairo(void) { @@ -606,17 +596,17 @@ _cpml_test_to_cairo(void) cpml_segment_from_cairo(&segment, &path); cpml_primitive_from_segment(&primitive, &segment); - g_assert_cmpint(_cpml_path_length(cr), ==, 0); + g_assert_cmpint(adg_test_cairo_num_data(cr), ==, 0); cpml_primitive_to_cairo(NULL, cr); - g_assert_cmpint(_cpml_path_length(cr), ==, 0); + g_assert_cmpint(adg_test_cairo_num_data(cr), ==, 0); cpml_primitive_to_cairo(&primitive, NULL); - g_assert_cmpint(_cpml_path_length(cr), ==, 0); + g_assert_cmpint(adg_test_cairo_num_data(cr), ==, 0); length = 0; do { last_length = length; cpml_primitive_to_cairo(&primitive, cr); - length = _cpml_path_length(cr); + length = adg_test_cairo_num_data(cr); g_assert_cmpint(length, >, last_length); } while (cpml_primitive_next(&primitive)); diff --git a/src/tests/adg-test.c b/src/tests/adg-test.c index 2b47295d..1a22fe68 100644 --- a/src/tests/adg-test.c +++ b/src/tests/adg-test.c @@ -83,6 +83,16 @@ adg_test_cairo_context(void) return cr; } +int +adg_test_cairo_num_data(cairo_t *cr) +{ + cairo_path_t *path = cairo_copy_path(cr); + int length = path->num_data; + cairo_path_destroy(path); + + return length; +} + static void _adg_test_func(_FuncData *func_data) { diff --git a/src/tests/adg-test.h b/src/tests/adg-test.h index 2ba4ec2b..351c7b0e 100644 --- a/src/tests/adg-test.h +++ b/src/tests/adg-test.h @@ -61,7 +61,8 @@ void adg_test_init (int *p_argc, char **p_argv[]); const gpointer adg_test_invalid_pointer (void); cairo_t * adg_test_cairo_context (void); -void adg_test_add_func (const gchar *testpath, +int adg_test_cairo_num_data (cairo_t *cr); +void adg_test_add_func (const gchar *testpath, GCallback test_func); void adg_test_add_func_full (const char *testpath, GCallback test_func, -- 2.11.4.GIT