From 9fd5558acd1db772cd4ca95d05ab537486d67def Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 27 Feb 2024 23:46:33 -0500 Subject: [PATCH] Update nodeparser tests The node serialization code now prints fonts with pixel sizes. Update affected tests. --- testsuite/gsk/nodeparser/empty-text.ref.node | 2 +- testsuite/gsk/nodeparser/testswitch.node | 10 +++++----- testsuite/gsk/nodeparser/testswitch.ref.node | 10 +++++----- testsuite/gsk/nodeparser/text-color.node | 2 +- testsuite/gsk/nodeparser/text-font-blob.node | 4 ++-- .../gsk/nodeparser/text-font-blob.ref.node | 4 ++-- .../gsk/nodeparser/text-font-errors.errors | 12 +++++------ .../gsk/nodeparser/text-font-errors.node | 20 +++++++++---------- .../gsk/nodeparser/text-font-errors.ref.node | 20 +++++++++---------- testsuite/gsk/nodeparser/text-no-color.node | 2 +- 10 files changed, 43 insertions(+), 43 deletions(-) diff --git a/testsuite/gsk/nodeparser/empty-text.ref.node b/testsuite/gsk/nodeparser/empty-text.ref.node index 75ffdc0a01..8ac0f54ee0 100644 --- a/testsuite/gsk/nodeparser/empty-text.ref.node +++ b/testsuite/gsk/nodeparser/empty-text.ref.node @@ -1,4 +1,4 @@ text { - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: "Hello"; } diff --git a/testsuite/gsk/nodeparser/testswitch.node b/testsuite/gsk/nodeparser/testswitch.node index 736b3e4ffe..5cf4f900ab 100644 --- a/testsuite/gsk/nodeparser/testswitch.node +++ b/testsuite/gsk/nodeparser/testswitch.node @@ -56,7 +56,7 @@ container { transform { child: text { color: rgb(46,52,54); - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: "Disabled"; offset: 145 18; } @@ -120,7 +120,7 @@ container { transform { child: text { color: rgb(46,52,54); - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: "Enabled"; offset: 147 18; } @@ -163,7 +163,7 @@ container { transform { child: text { color: rgb(46,52,54); - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: "Disabled"; offset: 145 18; } @@ -209,7 +209,7 @@ container { transform { child: text { color: rgb(46,52,54); - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: "Enabled"; offset: 147 18; } @@ -272,7 +272,7 @@ container { transform { child: text { color: rgb(46,52,54); - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: "Disabled"; offset: 123 18; } diff --git a/testsuite/gsk/nodeparser/testswitch.ref.node b/testsuite/gsk/nodeparser/testswitch.ref.node index 65d072211a..cf128cbe66 100644 --- a/testsuite/gsk/nodeparser/testswitch.ref.node +++ b/testsuite/gsk/nodeparser/testswitch.ref.node @@ -57,7 +57,7 @@ container { transform: translate(56, 0); child: text { color: rgb(46,52,54); - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: "Disabled"; offset: 145 18; } @@ -122,7 +122,7 @@ container { transform: translate(56, 0); child: text { color: rgb(46,52,54); - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: "Enabled"; offset: 147 18; } @@ -165,7 +165,7 @@ container { transform: translate(56, 0); child: text { color: rgb(46,52,54); - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: "Disabled"; offset: 145 18; } @@ -211,7 +211,7 @@ container { transform: translate(56, 0); child: text { color: rgb(46,52,54); - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: "Enabled"; offset: 147 18; } @@ -274,7 +274,7 @@ container { transform: translate(78, 0); child: text { color: rgb(46,52,54); - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: "Disabled"; offset: 123 18; } diff --git a/testsuite/gsk/nodeparser/text-color.node b/testsuite/gsk/nodeparser/text-color.node index b3d46c0fa5..06bcfd9774 100644 --- a/testsuite/gsk/nodeparser/text-color.node +++ b/testsuite/gsk/nodeparser/text-color.node @@ -1,5 +1,5 @@ text { color: rgba(255,0,0,0.533333); - font: "Noto Sans 300"; + font: "Noto Sans 300px"; glyphs: 50 312, 2712 0 -156 -29 color; } diff --git a/testsuite/gsk/nodeparser/text-font-blob.node b/testsuite/gsk/nodeparser/text-font-blob.node index 17b80d7d9d..1398fa9635 100644 --- a/testsuite/gsk/nodeparser/text-font-blob.node +++ b/testsuite/gsk/nodeparser/text-font-blob.node @@ -1,5 +1,5 @@ text { - font: "text-mixed-color 7.5" url("data:font/ttf;base64,\ + font: "text-mixed-color 10px" url("data:font/ttf;base64,\ AAEAAAAKAIAAAwAgQ09MUgATAEEAAAJ8AAAALENQQUwB/wATAAACqAAAABpjbWFwAHcAPQAAATwA\ AAA0Z2x5Zu8g4kAAAAGEAAAA0mhlYWQmofyJAAAArAAAADZoaGVhDAEEAgAAAOQAAAAkaG10eAQA\ AQAAAAEoAAAAFGxvY2EAyAD5AAABcAAAABRtYXhwAAwACQAAAQgAAAAgbmFtZX7VdrQAAAJYAAAA\ @@ -18,6 +18,6 @@ AAEAAwAAAA4AAAAA//8A/wD//wAA/wAA\ } text { - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: "Hello"; } diff --git a/testsuite/gsk/nodeparser/text-font-blob.ref.node b/testsuite/gsk/nodeparser/text-font-blob.ref.node index 82886426df..2d4bb2b503 100644 --- a/testsuite/gsk/nodeparser/text-font-blob.ref.node +++ b/testsuite/gsk/nodeparser/text-font-blob.ref.node @@ -1,5 +1,5 @@ text { - font: "text-mixed-color 7.5" url("data:font/ttf;base64,AAEAAAAKAIAAAwAgQ09MUgATAEEAAAJ8AAAALENQQUwB/wATAAACqAAAABpjbWFwAHcAPQAAATwA\ + font: "text-mixed-color 10px" url("data:font/ttf;base64,AAEAAAAKAIAAAwAgQ09MUgATAEEAAAJ8AAAALENQQUwB/wATAAACqAAAABpjbWFwAHcAPQAAATwA\ AAA0Z2x5Zu8g4kAAAAGEAAAA0mhlYWQmofyJAAAArAAAADZoaGVhDAEEAgAAAOQAAAAkaG10eAQA\ AQAAAAEoAAAAFGxvY2EAyAD5AAABcAAAABRtYXhwAAwACQAAAQgAAAAgbmFtZX7VdrQAAAJYAAAA\ IgABAAAAARmajs74k18PPPUAAggAAAAAAOHCPQAAAAAA4cpY+QAAAAAEAAgAAAAAAQACAAAAAAAA\ @@ -16,6 +16,6 @@ AAEAAwAAAA4AAAAA//8A/wD//wAA/wAA\ glyphs: 7 10; } text { - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: "Hello"; } diff --git a/testsuite/gsk/nodeparser/text-font-errors.errors b/testsuite/gsk/nodeparser/text-font-errors.errors index 12b1720bcd..d07118866d 100644 --- a/testsuite/gsk/nodeparser/text-font-errors.errors +++ b/testsuite/gsk/nodeparser/text-font-errors.errors @@ -1,6 +1,6 @@ -:21:32-36: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE -:55:24-69:3: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE -:74:24-33: error: GTK_CSS_PARSER_ERROR_SYNTAX -:79:24-38: error: g-io-error-quark 15 -:84:24-47: error: g-io-error-quark 1 -:89:24-62: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE +:21:33-37: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE +:55:26-69:3: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE +:74:26-35: error: GTK_CSS_PARSER_ERROR_SYNTAX +:79:26-40: error: g-io-error-quark 15 +:84:26-49: error: g-io-error-quark 1 +:89:26-64: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE diff --git a/testsuite/gsk/nodeparser/text-font-errors.node b/testsuite/gsk/nodeparser/text-font-errors.node index 40a167d69e..ec89fee770 100644 --- a/testsuite/gsk/nodeparser/text-font-errors.node +++ b/testsuite/gsk/nodeparser/text-font-errors.node @@ -1,5 +1,5 @@ text { - font: "text-mixed-color 7.5" url("data:font/ttf;base64,\ + font: "text-mixed-color 10px" url("data:font/ttf;base64,\ AAEAAAAKAIAAAwAgQ09MUgATAEEAAAJ8AAAALENQQUwB/wATAAACqAAAABpjbWFwAHcAPQAAATwA\ AAA0Z2x5Zu8g4kAAAAGEAAAA0mhlYWQmofyJAAAArAAAADZoaGVhDAEEAgAAAOQAAAAkaG10eAQA\ AQAAAAEoAAAAFGxvY2EAyAD5AAABcAAAABRtYXhwAAwACQAAAQgAAAAgbmFtZX7VdrQAAAJYAAAA\ @@ -18,7 +18,7 @@ AAEAAwAAAA4AAAAA//8A/wD//wAA/wAA\ } text { - font: "text-mixed-color 7.5" url("data:font/ttf;base64,\ + font: "text-mixed-color 10px" url("data:font/ttf;base64,\ AAEAAAAKAIAAAwAgQ09MUgATAEEAAAJ8AAAALENQQUwB/wATAAACqAAAABpjbWFwAHcAPQAAATwA\ AAA0Z2x5Zu8g4kAAAAGEAAAA0mhlYWQmofyJAAAArAAAADZoaGVhDAEEAgAAAOQAAAAkaG10eAQA\ AQAAAAEoAAAAFGxvY2EAyAD5AAABcAAAABRtYXhwAAwACQAAAQgAAAAgbmFtZX7VdrQAAAJYAAAA\ @@ -37,22 +37,22 @@ AAEAAwAAAA4AAAAA//8A/wD//wAA/wAA\ } text { - font: "text-mixed-color 7.5"; + font: "text-mixed-color 10px"; glyphs: 7 10; } text { - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: "Hello"; } text { - font: "Demon Cat 11"; + font: "Demon Cat 15px"; glyphs: "Hello"; } text { - font: "Demon Cat 11" url("data:font/ttf;base64,\ + font: "Demon Cat 15px" url("data:font/ttf;base64,\ AAEAAAAKAIAAAwAgQ09MUgATAEEAAAJ8AAAALENQQUwB/wATAAACqAAAABpjbWFwAHcAPQAAATwA\ AAA0Z2x5Zu8g4kAAAAGEAAAA0mhlYWQmofyJAAAArAAAADZoaGVhDAEEAgAAAOQAAAAkaG10eAQA\ AQAAAAEoAAAAFGxvY2EAyAD5AAABcAAAABRtYXhwAAwACQAAAQgAAAAgbmFtZX7VdrQAAAJYAAAA\ @@ -71,21 +71,21 @@ AAEAAwAAAA4AAAAA//8A/wD//wAA/wAA\ } text { - font: "Demon Cat 11" url(url()); + font: "Demon Cat 15px" url(url()); glyphs: 7 10; } text { - font: "Demon Cat 11" url(not-a-url); + font: "Demon Cat 15px" url(not-a-url); glyphs: 7 10; } text { - font: "Demon Cat 11" url(file:///not-a-file); + font: "Demon Cat 15px" url(file:///not-a-file); glyphs: 7 10; } text { - font: "Demon Cat 11" url("data:font/ttf,Hello, I'm a Font"); + font: "Demon Cat 15px" url("data:font/ttf,Hello, I'm a Font"); glyphs: 7 10; } diff --git a/testsuite/gsk/nodeparser/text-font-errors.ref.node b/testsuite/gsk/nodeparser/text-font-errors.ref.node index 3e6df2c445..fc66bcbb7a 100644 --- a/testsuite/gsk/nodeparser/text-font-errors.ref.node +++ b/testsuite/gsk/nodeparser/text-font-errors.ref.node @@ -1,5 +1,5 @@ text { - font: "text-mixed-color 7.5" url("data:font/ttf;base64,AAEAAAAKAIAAAwAgQ09MUgATAEEAAAJ8AAAALENQQUwB/wATAAACqAAAABpjbWFwAHcAPQAAATwA\ + font: "text-mixed-color 10px" url("data:font/ttf;base64,AAEAAAAKAIAAAwAgQ09MUgATAEEAAAJ8AAAALENQQUwB/wATAAACqAAAABpjbWFwAHcAPQAAATwA\ AAA0Z2x5Zu8g4kAAAAGEAAAA0mhlYWQmofyJAAAArAAAADZoaGVhDAEEAgAAAOQAAAAkaG10eAQA\ AQAAAAEoAAAAFGxvY2EAyAD5AAABcAAAABRtYXhwAAwACQAAAQgAAAAgbmFtZX7VdrQAAAJYAAAA\ IgABAAAAARmajs74k18PPPUAAggAAAAAAOHCPQAAAAAA4cpY+QAAAAAEAAgAAAAAAQACAAAAAAAA\ @@ -16,38 +16,38 @@ AAEAAwAAAA4AAAAA//8A/wD//wAA/wAA\ glyphs: 7 10; } text { - font: "text-mixed-color 7.5"; + font: "text-mixed-color 10px"; glyphs: 7 10; } text { - font: "text-mixed-color 7.5"; + font: "text-mixed-color 10px"; glyphs: 7 10; } text { - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: "Hello"; } text { - font: "Noto Sans 11"; + font: "Noto Sans 15px"; glyphs: "Hello"; } text { - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: 7 10; } text { - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: 7 10; } text { - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: 7 10; } text { - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: 7 10; } text { - font: "Cantarell 11"; + font: "Cantarell 15px"; glyphs: 7 10; } diff --git a/testsuite/gsk/nodeparser/text-no-color.node b/testsuite/gsk/nodeparser/text-no-color.node index fb9832e975..83e61c6d03 100644 --- a/testsuite/gsk/nodeparser/text-no-color.node +++ b/testsuite/gsk/nodeparser/text-no-color.node @@ -1,5 +1,5 @@ text { color: rgba(255,0,0,0.533333); - font: "Noto Sans 300"; + font: "Noto Sans 300px"; glyphs: 50 312, 2712 0 -156 -29; }