From ecfc661054f27628db48b6f6bf817da6d9a493d6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 17 Sep 2023 08:27:02 -0400 Subject: [PATCH] Adapt tests to new path builder behavior Some tests were expecting to get elevated curves from GskPathBuilder. But they won't, anymore. --- testsuite/gsk/nodeparser/fill2.node | 2 +- testsuite/gsk/nodeparser/fill2.ref.node | 2 +- testsuite/gsk/path-special-cases.c | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/testsuite/gsk/nodeparser/fill2.node b/testsuite/gsk/nodeparser/fill2.node index 4702c0fa79..9674539d3d 100644 --- a/testsuite/gsk/nodeparser/fill2.node +++ b/testsuite/gsk/nodeparser/fill2.node @@ -1,4 +1,4 @@ fill { - path: "M 0 0 O 10 10 20 20 5"; + path: "M 0 0 O 10 0 20 20 5"; fill-rule: even-odd; } diff --git a/testsuite/gsk/nodeparser/fill2.ref.node b/testsuite/gsk/nodeparser/fill2.ref.node index 467a06ede0..6fd83027db 100644 --- a/testsuite/gsk/nodeparser/fill2.ref.node +++ b/testsuite/gsk/nodeparser/fill2.ref.node @@ -4,6 +4,6 @@ fill { color: rgb(255,0,204); } path: "\ -M 0 0 O 10 10, 20 20, 5"; +M 0 0 O 10 0, 20 20, 5"; fill-rule: even-odd; } diff --git a/testsuite/gsk/path-special-cases.c b/testsuite/gsk/path-special-cases.c index 22a99f5b89..3226ff0f92 100644 --- a/testsuite/gsk/path-special-cases.c +++ b/testsuite/gsk/path-special-cases.c @@ -426,10 +426,23 @@ test_foreach (void) path2 = gsk_path_builder_free_to_path (builder); s2 = gsk_path_to_string (path2); - g_assert_cmpstr (sp, ==, s2); + /* We still end up with quads here, since GskPathBuilder aggressively reduces + * curves degrees. + */ + g_assert_cmpstr (s, ==, s2); gsk_path_unref (path2); g_free (s2); + + path2 = gsk_path_parse (sp); + s2 = gsk_path_to_string (path2); + + g_assert_cmpstr (s, ==, s2); + + gsk_path_unref (path2); + g_free (s2); + + gsk_path_unref (path); } static void