diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-06-08 17:41:58 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-06-08 17:41:58 +0000 |
| commit | 8175bfe7ebbdd885cfdab857783aa2e5f7c136e4 (patch) | |
| tree | 7d358946ca78f9fd242aeed26c44a1fbb2e47982 /tests | |
| parent | 1fb9e50c73bb8c6389c7eaa9adb2eee13642d2ff (diff) | |
| parent | 4d8e71471984fb0fc147d1a64695ad5f18576fde (diff) | |
| download | pango-8175bfe7ebbdd885cfdab857783aa2e5f7c136e4.tar.gz | |
Merge branch 'wip/baedert/for-master2' into 'master'
Wip/baedert/for master2
See merge request GNOME/pango!190
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/layouts/valid-3.expected | 1 | ||||
| -rw-r--r-- | tests/layouts/valid-4.expected | 1 | ||||
| -rw-r--r-- | tests/test-common.c | 3 | ||||
| -rw-r--r-- | tests/testattributes.c | 11 |
4 files changed, 13 insertions, 3 deletions
diff --git a/tests/layouts/valid-3.expected b/tests/layouts/valid-3.expected index 247c61bf..7f9d9e2f 100644 --- a/tests/layouts/valid-3.expected +++ b/tests/layouts/valid-3.expected @@ -8,7 +8,6 @@ lines: 2 --- attributes -range 0 2147483647 --- lines diff --git a/tests/layouts/valid-4.expected b/tests/layouts/valid-4.expected index 09f143f3..dae4e065 100644 --- a/tests/layouts/valid-4.expected +++ b/tests/layouts/valid-4.expected @@ -9,7 +9,6 @@ width: 194560 --- attributes -range 0 2147483647 --- lines diff --git a/tests/test-common.c b/tests/test-common.c index 608b405c..786973f1 100644 --- a/tests/test-common.c +++ b/tests/test-common.c @@ -151,6 +151,9 @@ print_attr_list (PangoAttrList *attrs, GString *string) { PangoAttrIterator *iter; + if (!attrs) + return; + iter = pango_attr_list_get_iterator (attrs); do { gint start, end; diff --git a/tests/testattributes.c b/tests/testattributes.c index 9964f3d0..6b5e849b 100644 --- a/tests/testattributes.c +++ b/tests/testattributes.c @@ -100,7 +100,7 @@ assert_attributes (GSList *attrs, s = g_string_new (""); print_attributes (attrs, s); g_assert_cmpstr (s->str, ==, expected); - g_string_free (s, FALSE); + g_string_free (s, TRUE); } static void @@ -358,6 +358,15 @@ test_iter (void) PangoAttrIterator *copy; gint start, end; + /* Empty list */ + list = pango_attr_list_new (); + iter = pango_attr_list_get_iterator (list); + + g_assert_false (pango_attr_iterator_next (iter)); + g_assert_null (pango_attr_iterator_get_attrs (iter)); + pango_attr_iterator_destroy (iter); + pango_attr_list_unref (list); + list = pango_attr_list_new (); attr = pango_attr_size_new (10); pango_attr_list_insert (list, attr); |