diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/breaks/eleven.expected | 2 | ||||
| -rw-r--r-- | tests/breaks/four.expected | 2 | ||||
| -rw-r--r-- | tests/breaks/nine.expected | 2 | ||||
| -rw-r--r-- | tests/breaks/one.expected | 2 | ||||
| -rw-r--r-- | tests/breaks/ten.expected | 2 | ||||
| -rw-r--r-- | tests/breaks/three.expected | 2 | ||||
| -rw-r--r-- | tests/breaks/two.expected | 2 | ||||
| -rw-r--r-- | tests/test-break.c | 33 | ||||
| -rw-r--r-- | tests/test-common.c | 3 | ||||
| -rw-r--r-- | tests/test-itemize.c | 6 | ||||
| -rw-r--r-- | tests/testattributes.c | 109 |
11 files changed, 138 insertions, 27 deletions
diff --git a/tests/breaks/eleven.expected b/tests/breaks/eleven.expected index 5f45affe..45c7ad01 100644 --- a/tests/breaks/eleven.expected +++ b/tests/breaks/eleven.expected @@ -1,6 +1,6 @@ Text: ❤️︎︎ 👨[0x200d]🦰 👨🏿[0x200d]🦱 0️⃣ 🏴[0xe0075][0xe0073][0xe0063][0xe0061][0xe007f] 🇩🇪️ [0x0a] Breaks: c lc lc lc lc lc c c Whitespace: w w -Words: b b b bs be b b b Sentences: bs e b +Words: b b b bs be b b b Graphemes: b b b b b b b b diff --git a/tests/breaks/four.expected b/tests/breaks/four.expected index b7f1a86c..ce58e10b 100644 --- a/tests/breaks/four.expected +++ b/tests/breaks/four.expected @@ -1,6 +1,6 @@ Text: ภ า ษ า ไ ท ย [ ] ห รื อ [ ] ภ า ษ า ไ ท ย ก ล า ง [ ] เ ป็ น ภ า ษ า ร า ช ก า ร แ ล ะ ภ า ษ า ป ร ะ จ ำ ช า ติ ข อ ง ป ร ะ เ ท ศ ไ ท ย [ ] ภ า ษ า ไ ท ย เ ป็ น ภ า ษ า ใ น ก ลุ่ ม ภ า ษ า ไ ท ซึ่ ง เ ป็ น ก ลุ่ ม ย่ อ ย ข อ ง ต ร ะ กู ล ภ า ษ า ข ร้ า [ ] ไ ท [ ] สั น นิ ษ ฐ า น ว่ า [ ] ภ า ษ า ใ น ต ร ะ กู ล นี้ มี ถิ่ น ก ำ เ นิ ด จ า ก ท า ง ต อ น ใ ต้ ข อ ง ป ร ะ เ ท ศ จี น [ ] แ ล ะ นั ก ภ า ษ า ศ า ส ต ร์ บ า ง ส่ ว น เ ส น อ ว่ า [ ] ภ า ษ า ไ ท ย น่ า จ ะ มี ค ว า ม เ ชื่ อ ม โ ย ง กั บ ต ร ะ กู ล ภ า ษ า อ อ ส โ ต ร [ ] เ อ เ ชี ย ติ ก [ ] ต ร ะ กู ล ภ า ษ า อ อ ส โ ต ร นี เ ซี ย น [ ] แ ล ะ ต ร ะ กู ล ภ า ษ า จี น [ ] ทิ เ บ ต [0x0a] Breaks: c c c c lc c c c lc c c c lc c c c lc c c lc c c c c lc c c lc c c c lc c c c c c lc c c lc c c c lc c c c c lc c c lc c c lc c c c c c lc c c c lc c c c lc c c lc c c lc c c c lc c lc c c lc c c c lc c lc c lc c c lc c c lc c c lc c c lc c c c c lc c c c lc c c c lc c c lc c c c c c c lc c c lc c c c lc c lc c c c c lc lc lc c lc c c c c lc c c lc c c lc c c lc c lc c c lc c c c c c lc c c lc c c lc c lc c c c c c c c c lc c c lc c c lc c c c lc c c lc c c c lc c c lc c lc c lc lc c c c lc c c c lc c c lc c lc c c c c lc c c c lc c lc c c c c lc c c c c lc c c lc c c c c lc c c c lc c lc c c c c c c c c c lc c c lc c c c c lc c c c lc c c lc c c c c c Whitespace: x x x x x x x x x x x x x w w -Words: bs b b b bse b b be bse b b be bse b b b bse b b bse b b b be bse b b bse b b b bse b b b b b bse b b bse b b b bse b b b b bse b b bse b b bse b b b b b bse b b be bse b b b bse b b bse b b bse b b b bse b bse b b bse b b b bse b bse b bse b b bse b b bse b b bse b b bse b b b b bse b b b bse b b be bse b be bse b b b b b b bse b be bse b b b bse b bse b b b b bse bse bse b bse b b b b bse b b bse b b bse b b bse b bse b b bse b b b b b bse b be bse b b bse b bse b b b b b b b b bse b b bse b b bse b b b bse b be bse b b b bse b b bse b bse b bse bse b b b bse b b b bse b b bse b bse b b b b bse b b b bse b bse b b b be bse b b b b bse b be bse b b b b bse b b b bse b bse b b b b b b b b be bse b b bse b b b b bse b b b bse b be bse b b b be b Sentences: bs e b +Words: bs b b b bse b b be bse b b be bse b b b bse b b bse b b b be bse b b bse b b b bse b b b b b bse b b bse b b b bse b b b b bse b b bse b b bse b b b b b bse b b be bse b b b bse b b bse b b bse b b b bse b bse b b bse b b b bse b bse b bse b b bse b b bse b b bse b b bse b b b b bse b b b bse b b be bse b be bse b b b b b b bse b be bse b b b bse b bse b b b b bse bse bse b bse b b b b bse b b bse b b bse b b bse b bse b b bse b b b b b bse b be bse b b bse b bse b b b b b b b b bse b b bse b b bse b b b bse b be bse b b b bse b b bse b bse b bse bse b b b bse b b b bse b b bse b bse b b b b bse b b b bse b bse b b b be bse b b b b bse b be bse b b b b bse b b b bse b bse b b b b b b b b be bse b b bse b b b b bse b b b bse b be bse b b b be b Graphemes: b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b diff --git a/tests/breaks/nine.expected b/tests/breaks/nine.expected index 4f6f95a3..957f67e5 100644 --- a/tests/breaks/nine.expected +++ b/tests/breaks/nine.expected @@ -1,6 +1,6 @@ Text: मी [ ] का च [ ] खा ऊ [ ] श क तो , [ ] म ला [ ] ते [ ] दु ख त [ ] ना ह [0x0a] मैं [ ] काँ च [ ] खा [ ] स क ता [ ] हूँ , [ ] मु झे [ ] उ स [ ] से [ ] को ई [ ] पी डा [ ] न हीं [ ] हो त [0x0a] நா ன் [ ] க ண் ணா டி [ ] சா ப் பி டு வே ன் , [ ] அ த னா ல் [ ] எ ன க் கு [ ] ஒ ரு [ ] கே டு ம் [ ] வ ரா த [0x0a] ﻢ ﯾ ں [ ] ﮎ ﺎ ﻨ ﭼ [ ] ﮎ ھ ﺍ [ ] ﺲ ﮑ ﺗ ﺍ [ ] ہ ﻭ ں [ ] ﺍ ﻭ ﺭ [ ] ﻢ ﺟ ھ ے [ ] ﺖ ﮑ ﻠ ﯿ ﻓ [ ] ﻥ ہ ﯼ ں [ ] ہ ﻮ ﺘ ﯾ [ ] [0x0a] ﺰ ﻫ [ ] ﺶ ﻴ ﺸ ﻫ [ ] ﺥ ﻭ ړ ﻝ ې [ ] ﺶ ﻣ ، [ ] ﻪ ﻐ ﻫ [ ] ﻡ ﺍ [ ] ﻦ ﻫ [ ] ﺥ ﻭ ږ ﻮ ﻳ [0x0a] Breaks: c c lc c c lc c c lc c c c c lc c c lc c lc c c c lc c c c c lc c c lc c lc c c c lc c c lc c c lc c c lc c lc c c lc c c lc c c lc c c c c c lc c c c c lc c c c c c c c lc c c c c lc c c c c lc c c lc c c c lc c c c c c c c lc c c c c lc c c c lc c c c c lc c c c lc c c c lc c c c c lc c c c c c lc c c c c lc c c c c c c c c lc c c c c lc c c c c c lc c c c lc c c c lc c c lc c c lc c c c c c c Whitespace: x x x x x x x w x x x x x x x x x x x w x x x x x x x w x x x x x x x x x x w x x x x x x x w w -Words: bs be bs be bs be bs be b bs be bs be bs be bs be bs be bs be bs be bs be bs be b bs be bs be bs be bs be bs be bs be bs be bs be bs be bs be b bs be bs be bs be bs be bs be bs be bs be bs be bs be bs be bs be bs be bs be bs be bs be b bs be bs be bs be bs be b bs be bs be bs be bs be b Sentences: bs e bs e bs e bs e bs e b +Words: bs be bs be bs be bs be b bs be bs be bs be bs be bs be bs be bs be bs be bs be b bs be bs be bs be bs be bs be bs be bs be bs be bs be bs be b bs be bs be bs be bs be bs be bs be bs be bs be bs be bs be bs be bs be bs be bs be bs be b bs be bs be bs be bs be b bs be bs be bs be bs be b Graphemes: b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b diff --git a/tests/breaks/one.expected b/tests/breaks/one.expected index f3ab2612..bbae494d 100644 --- a/tests/breaks/one.expected +++ b/tests/breaks/one.expected @@ -1,6 +1,6 @@ Text: a b c / d e f [ ] g h i [0xad] j k l . [ ] B l a [0x0a] Breaks: c c c c lc c c c lc c c c lc c c c c lc c c c c Whitespace: x x w w -Words: bs be bs be bs be b bs be b Sentences: bs e bs e b +Words: bs be bs be bs be b bs be b Graphemes: b b b b b b b b b b b b b b b b b b b b b b diff --git a/tests/breaks/ten.expected b/tests/breaks/ten.expected index a83252da..c1f8cc35 100644 --- a/tests/breaks/ten.expected +++ b/tests/breaks/ten.expected @@ -1,6 +1,6 @@ Text: i ක්[0x200d]ක [ ] a[0x200c] a் [0x0a] Breaks: c c c lc c c c Whitespace: x w w -Words: bs be bs be b Sentences: bs e b +Words: bs be bs be b Graphemes: b b b b b b b diff --git a/tests/breaks/three.expected b/tests/breaks/three.expected index 72e6fbe2..7f078f4f 100644 --- a/tests/breaks/three.expected +++ b/tests/breaks/three.expected @@ -1,6 +1,6 @@ Text: o n e [ ] t w o [0x2028] r e d [ ] b l u e[0x200d] g r e e n [0x0a] Breaks: c c c c lc c c c Lc c c c lc c c c c c c c c c c Whitespace: x w x w w -Words: bs be bs be bs be bs be b Sentences: bs e bs e b +Words: bs be bs be bs be bs be b Graphemes: b b b b b b b b b b b b b b b b b b b b b b b diff --git a/tests/breaks/two.expected b/tests/breaks/two.expected index 9bea7f7d..3ec2d948 100644 --- a/tests/breaks/two.expected +++ b/tests/breaks/two.expected @@ -1,6 +1,6 @@ Text: g o r i l · l e s [0x0a] Breaks: c c c c c c c c c c c Whitespace: w w -Words: bs e s be b Sentences: bs e b +Words: bs e s be b Graphemes: b b b b b b b b b b b diff --git a/tests/test-break.c b/tests/test-break.c index d59971a0..3fb5cdcd 100644 --- a/tests/test-break.c +++ b/tests/test-break.c @@ -106,8 +106,8 @@ test_file (const gchar *filename, GString *string) s1 = g_string_new ("Breaks: "); s2 = g_string_new ("Whitespace: "); - s3 = g_string_new ("Words:"); - s4 = g_string_new ("Sentences:"); + s3 = g_string_new ("Sentences:"); + s4 = g_string_new ("Words:"); s5 = g_string_new ("Graphemes:"); g_string_append (string, "Text: "); @@ -157,37 +157,38 @@ test_file (const gchar *filename, GString *string) w++; } - if (log.is_word_boundary) + if (log.is_sentence_boundary) { g_string_append (s3, "b"); - o++; + s++; } - if (log.is_word_start) + if (log.is_sentence_start) { g_string_append (s3, "s"); - o++; + s++; } - if (log.is_word_end) + if (log.is_sentence_end) { g_string_append (s3, "e"); - o++; + s++; } - if (log.is_sentence_boundary) + if (log.is_word_boundary) { g_string_append (s4, "b"); - s++; + o++; } - if (log.is_sentence_start) + if (log.is_word_start) { g_string_append (s4, "s"); - s++; + o++; } - if (log.is_sentence_end) + if (log.is_word_end) { g_string_append (s4, "e"); - s++; + o++; } + if (log.is_cursor_position) { g_string_append (s5, "b"); @@ -199,8 +200,8 @@ test_file (const gchar *filename, GString *string) g_string_append_printf (string, "%*s", m, ""); g_string_append_printf (s1, "%*s", m - b, ""); g_string_append_printf (s2, "%*s", m - w, ""); - g_string_append_printf (s3, "%*s", m - o, ""); - g_string_append_printf (s4, "%*s", m - s, ""); + g_string_append_printf (s3, "%*s", m - s, ""); + g_string_append_printf (s4, "%*s", m - o, ""); g_string_append_printf (s5, "%*s", m - g, ""); if (i < len - 1) diff --git a/tests/test-common.c b/tests/test-common.c index 3df4015c..011b2eef 100644 --- a/tests/test-common.c +++ b/tests/test-common.c @@ -143,6 +143,7 @@ print_attribute (PangoAttribute *attr, GString *string) case PANGO_ATTR_INSERT_HYPHENS: case PANGO_ATTR_SHOW: case PANGO_ATTR_TEXT_TRANSFORM: + case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT: g_string_append_printf (string, "%d", ((PangoAttrInt *)attr)->value); break; case PANGO_ATTR_FONT_DESC: @@ -167,6 +168,7 @@ print_attribute (PangoAttribute *attr, GString *string) g_string_append_printf (string, "shape"); break; case PANGO_ATTR_SCALE: + case PANGO_ATTR_LINE_HEIGHT: { char val[20]; @@ -174,6 +176,7 @@ print_attribute (PangoAttribute *attr, GString *string) g_string_append (string, val); } break; + case PANGO_ATTR_INVALID: default: g_assert_not_reached (); break; diff --git a/tests/test-itemize.c b/tests/test-itemize.c index 0a8515b8..926eb3ae 100644 --- a/tests/test-itemize.c +++ b/tests/test-itemize.c @@ -251,8 +251,6 @@ test_itemize (gconstpointer d) return; } - context = pango_font_map_create_context (pango_cairo_font_map_get_default ()); - found_cantarell = FALSE; pango_context_list_families (context, &families, &n_families); for (int i = 0; i < n_families; i++) @@ -305,7 +303,6 @@ test_itemize (gconstpointer d) g_free (diff); g_string_free (dump, TRUE); g_free (expected_file); - g_object_unref (context); } int @@ -318,6 +315,9 @@ main (int argc, char *argv[]) g_test_init (&argc, &argv, NULL); + context = pango_font_map_create_context (pango_cairo_font_map_get_default ()); + pango_context_set_language (context, pango_language_from_string ("en-us")); + /* allow to easily generate expected output for new test cases */ if (argc > 1) { diff --git a/tests/testattributes.c b/tests/testattributes.c index 79caf7b8..662a6142 100644 --- a/tests/testattributes.c +++ b/tests/testattributes.c @@ -1,5 +1,5 @@ /* Pango - * testiter.c: Test pango attributes + * testattributes.c: Test pango attributes * * Copyright (C) 2015 Red Hat, Inc. * @@ -66,10 +66,15 @@ test_attributes_basic (void) test_copy (pango_attr_shape_new (&rect, &rect)); test_copy (pango_attr_gravity_new (PANGO_GRAVITY_SOUTH)); test_copy (pango_attr_gravity_hint_new (PANGO_GRAVITY_HINT_STRONG)); + test_copy (pango_attr_font_features_new ("csc=1")); + test_copy (pango_attr_foreground_alpha_new (8000)); + test_copy (pango_attr_background_alpha_new (8000)); test_copy (pango_attr_allow_breaks_new (FALSE)); test_copy (pango_attr_show_new (PANGO_SHOW_SPACES)); test_copy (pango_attr_insert_hyphens_new (FALSE)); test_copy (pango_attr_text_transform_new (PANGO_TEXT_TRANSFORM_UPPERCASE)); + test_copy (pango_attr_line_height_new (1.5)); + test_copy (pango_attr_line_height_new_absolute (3000)); } static void @@ -111,6 +116,107 @@ test_attributes_register (void) g_type_class_unref (class); } +#define g_assert_as(x, y) \ + if (x == NULL) \ + { \ + GString *s = g_string_new (""); \ + print_attribute (y, s); \ + g_print ("failed to convert: %s\n", s->str); \ + g_string_free (s, TRUE); \ + } + +static void +test_binding (PangoAttribute *attr) +{ + enum { + INVALID, INT, LANGUAGE, STRING, SIZE, FONT_DESC, COLOR, SHAPE, FLOAT, FONT_FEATURES, + } attr_base[] = { + INVALID, LANGUAGE, STRING, INT, INT, INT, INT, SIZE, FONT_DESC, COLOR, + COLOR, INT, INT, INT, SHAPE, FLOAT, INT, INT, COLOR, COLOR, SIZE, + INT, INT, FONT_FEATURES, INT, INT, INT, INT, INT, INT, COLOR, FLOAT, + INT, INT, INT, INT + }; + + switch (attr_base[attr->klass->type]) + { + case INT: + g_assert_as (pango_attribute_as_int (attr), attr); + break; + case LANGUAGE: + g_assert_as (pango_attribute_as_language (attr), attr); + break; + case STRING: + g_assert_as (pango_attribute_as_string (attr), attr); + break; + case SIZE: + g_assert_as (pango_attribute_as_size (attr), attr); + break; + case FONT_DESC: + g_assert_as (pango_attribute_as_font_desc (attr), attr); + break; + case COLOR: + g_assert_as (pango_attribute_as_color (attr), attr); + break; + case SHAPE: + g_assert_as (pango_attribute_as_shape (attr), attr); + break; + case FLOAT: + g_assert_as (pango_attribute_as_float (attr), attr); + break; + case FONT_FEATURES: + g_assert_as (pango_attribute_as_font_features (attr), attr); + break; + default: + g_assert_not_reached (); + } + + pango_attribute_destroy (attr); +} + +static void +test_binding_helpers (void) +{ + PangoFontDescription *desc; + PangoRectangle rect = { 0, 0, 10, 10 }; + + test_binding (pango_attr_language_new (pango_language_from_string ("ja-JP"))); + test_binding (pango_attr_family_new ("Times")); + test_binding (pango_attr_foreground_new (100, 200, 300)); + test_binding (pango_attr_background_new (100, 200, 300)); + test_binding (pango_attr_size_new (1024)); + test_binding (pango_attr_size_new_absolute (1024)); + test_binding (pango_attr_style_new (PANGO_STYLE_ITALIC)); + test_binding (pango_attr_weight_new (PANGO_WEIGHT_ULTRALIGHT)); + test_binding (pango_attr_variant_new (PANGO_VARIANT_SMALL_CAPS)); + test_binding (pango_attr_stretch_new (PANGO_STRETCH_SEMI_EXPANDED)); + desc = pango_font_description_from_string ("Computer Modern 12"); + test_binding (pango_attr_font_desc_new (desc)); + pango_font_description_free (desc); + test_binding (pango_attr_underline_new (PANGO_UNDERLINE_LOW)); + test_binding (pango_attr_underline_new (PANGO_UNDERLINE_ERROR_LINE)); + test_binding (pango_attr_underline_color_new (100, 200, 300)); + test_binding (pango_attr_overline_new (PANGO_OVERLINE_SINGLE)); + test_binding (pango_attr_overline_color_new (100, 200, 300)); + test_binding (pango_attr_strikethrough_new (TRUE)); + test_binding (pango_attr_strikethrough_color_new (100, 200, 300)); + test_binding (pango_attr_rise_new (256)); + test_binding (pango_attr_scale_new (2.56)); + test_binding (pango_attr_fallback_new (FALSE)); + test_binding (pango_attr_letter_spacing_new (1024)); + test_binding (pango_attr_shape_new (&rect, &rect)); + test_binding (pango_attr_gravity_new (PANGO_GRAVITY_SOUTH)); + test_binding (pango_attr_gravity_hint_new (PANGO_GRAVITY_HINT_STRONG)); + test_binding (pango_attr_font_features_new ("csc=1")); + test_binding (pango_attr_foreground_alpha_new (8000)); + test_binding (pango_attr_background_alpha_new (8000)); + test_binding (pango_attr_allow_breaks_new (FALSE)); + test_binding (pango_attr_show_new (PANGO_SHOW_SPACES)); + test_binding (pango_attr_insert_hyphens_new (FALSE)); + test_binding (pango_attr_text_transform_new (PANGO_TEXT_TRANSFORM_UPPERCASE)); + test_binding (pango_attr_line_height_new (1.5)); + test_binding (pango_attr_line_height_new_absolute (3000)); +} + static void assert_attributes (GSList *attrs, const char *expected) @@ -1211,6 +1317,7 @@ main (int argc, char *argv[]) g_test_add_func ("/attributes/basic", test_attributes_basic); g_test_add_func ("/attributes/equal", test_attributes_equal); g_test_add_func ("/attributes/register", test_attributes_register); + g_test_add_func ("/attributes/binding-helpers", test_binding_helpers); g_test_add_func ("/attributes/list/basic", test_list); g_test_add_func ("/attributes/list/change", test_list_change); g_test_add_func ("/attributes/list/change2", test_list_change2); |