diff options
| author | Jan Arne Petersen <jpetersen@jpetersen.org> | 2008-05-24 23:32:13 +0000 |
|---|---|---|
| committer | Jan Arne Petersen <jap@src.gnome.org> | 2008-05-24 23:32:13 +0000 |
| commit | 10e8e7d27a809d89c5fe4b1d85ba65c8c71bdf67 (patch) | |
| tree | 2b503414fa06a1c0e4b6d385dc04529cc916b125 /tests | |
| parent | c30e303c3586142c84c5f72032827f15d98f43eb (diff) | |
| download | gdk-pixbuf-10e8e7d27a809d89c5fe4b1d85ba65c8c71bdf67.tar.gz | |
Use type of the correct column (#529535). Add test.
2008-05-25 Jan Arne Petersen <jpetersen@jpetersen.org>
* gtk/gtkliststore.c: (list_store_text): Use type of the correct
column (#529535).
* tests/buildertest.c: (test_list_store): Add test.
svn path=/trunk/; revision=20142
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/buildertest.c | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/tests/buildertest.c b/tests/buildertest.c index 45558eca5..b3214574e 100644 --- a/tests/buildertest.c +++ b/tests/buildertest.c @@ -550,6 +550,31 @@ test_list_store (void) " </data>" " </object>" "</interface>"; + const char buffer3[] = + "<interface>" + " <object class=\"GtkListStore\" id=\"liststore1\">" + " <columns>" + " <column type=\"gchararray\"/>" + " <column type=\"gchararray\"/>" + " <column type=\"gint\"/>" + " </columns>" + " <data>" + " <row>" + " <col id=\"1\" context=\"foo\">Doe</col>" + " <col id=\"0\" translatable=\"yes\">John</col>" + " <col id=\"2\" comment=\"foobar\">25</col>" + " </row>" + " <row>" + " <col id=\"2\">50</col>" + " <col id=\"1\">Dole</col>" + " <col id=\"0\">Johan</col>" + " </row>" + " <row>" + " <col id=\"2\">19</col>" + " </row>" + " </data>" + " </object>" + "</interface>"; GtkBuilder *builder; GObject *store; GtkTreeIter iter; @@ -599,6 +624,52 @@ test_list_store (void) g_assert (age == 50); g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter) == FALSE); + builder = builder_new_from_string (buffer3, -1, NULL); + store = gtk_builder_get_object (builder, "liststore1"); + g_assert (gtk_tree_model_get_n_columns (GTK_TREE_MODEL (store)) == 3); + g_assert (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 0) == G_TYPE_STRING); + g_assert (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 1) == G_TYPE_STRING); + g_assert (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 2) == G_TYPE_INT); + + g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter) == TRUE); + gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, + 0, &surname, + 1, &lastname, + 2, &age, + -1); + g_assert (surname != NULL); + g_assert (strcmp (surname, "John") == 0); + g_free (surname); + g_assert (lastname != NULL); + g_assert (strcmp (lastname, "Doe") == 0); + g_free (lastname); + g_assert (age == 25); + g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter) == TRUE); + + gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, + 0, &surname, + 1, &lastname, + 2, &age, + -1); + g_assert (surname != NULL); + g_assert (strcmp (surname, "Johan") == 0); + g_free (surname); + g_assert (lastname != NULL); + g_assert (strcmp (lastname, "Dole") == 0); + g_free (lastname); + g_assert (age == 50); + g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter) == TRUE); + + gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, + 0, &surname, + 1, &lastname, + 2, &age, + -1); + g_assert (surname == NULL); + g_assert (lastname == NULL); + g_assert (age == 19); + g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter) == FALSE); + g_object_unref (builder); } |