summaryrefslogtreecommitdiff
path: root/test/test-action-menu.c
diff options
context:
space:
mode:
authorFelipe Erias Morandeira <femorandeira@igalia.com>2013-07-23 14:45:33 +0100
committerFelipe Erias Morandeira <femorandeira@igalia.com>2013-07-23 14:45:33 +0100
commitefe88dcaa0d62ee01557c48b7864ba3ba34245f6 (patch)
tree8ec4a94a4b16c70c46e55f799802425aafc85895 /test/test-action-menu.c
parenta2adbcc4cad5f5219d59247ccdfc5de6d281a63d (diff)
EosActionMenu places cancel, close and delete actions at the bottom. Internally, it uses a GtkOverlay to correctly position the two sets of actions.
[endlessm/eos-sdk#146]
Diffstat (limited to 'test/test-action-menu.c')
-rw-r--r--test/test-action-menu.c26
1 files changed, 16 insertions, 10 deletions
diff --git a/test/test-action-menu.c b/test/test-action-menu.c
index 46fc300..e066b70 100644
--- a/test/test-action-menu.c
+++ b/test/test-action-menu.c
@@ -57,7 +57,7 @@ test_am_add_action (ActionMenuFixture *fixture,
eos_action_menu_add_action (fixture->action_menu, fixture->action1);
- GtkWidget *button = gtk_grid_get_child_at (GTK_GRID (fixture->action_menu->priv->grid), 0, 0);
+ GtkWidget *button = gtk_grid_get_child_at (GTK_GRID (fixture->action_menu->priv->center_grid), 0, 0);
g_assert (EOS_IS_ACTION_BUTTON (button));
@@ -106,11 +106,16 @@ test_am_list_actions (ActionMenuFixture *fixture,
}
static gboolean
-menu_contains_button_with_label (GtkContainer *menu, const gchar* button_label)
+menu_contains_button_with_label (EosActionMenu *menu, const gchar* button_label)
{
- GList* children = gtk_container_get_children (menu);
+ GList* children;
gboolean found = FALSE;
+ children = gtk_container_get_children (GTK_CONTAINER (menu->priv->center_grid));
+
+ children = g_list_concat (children,
+ gtk_container_get_children (GTK_CONTAINER (menu->priv->bottom_grid)));
+
for (GList *i = children; i != NULL ; i = i->next)
{
if (EOS_IS_ACTION_BUTTON (i->data))
@@ -148,11 +153,11 @@ test_am_remove_action (ActionMenuFixture *fixture,
g_assert (g_list_find (list, fixture->action3) != NULL);
// the buttons have been removed as well
- g_assert (menu_contains_button_with_label (GTK_CONTAINER (fixture->action_menu->priv->grid),
+ g_assert (menu_contains_button_with_label (fixture->action_menu,
gtk_action_get_label (fixture->action1)));
- g_assert (!menu_contains_button_with_label (GTK_CONTAINER (fixture->action_menu->priv->grid),
+ g_assert (!menu_contains_button_with_label (fixture->action_menu,
gtk_action_get_label (fixture->action2)));
- g_assert (menu_contains_button_with_label (GTK_CONTAINER (fixture->action_menu->priv->grid),
+ g_assert (menu_contains_button_with_label (fixture->action_menu,
gtk_action_get_label (fixture->action3)));
eos_action_menu_remove_action (fixture->action_menu, fixture->action1);
@@ -165,7 +170,8 @@ test_am_remove_action (ActionMenuFixture *fixture,
g_assert (g_list_find (list, fixture->action3) == NULL);
// the container is empty
- g_assert (gtk_container_get_children (GTK_CONTAINER (fixture->action_menu->priv->grid)) == NULL);
+ g_assert (gtk_container_get_children (GTK_CONTAINER (fixture->action_menu->priv->center_grid)) == NULL);
+ g_assert (gtk_container_get_children (GTK_CONTAINER (fixture->action_menu->priv->bottom_grid)) == NULL);
}
static void
@@ -184,11 +190,11 @@ test_am_remove_action_by_name (ActionMenuFixture *fixture,
g_assert (g_list_find (list, fixture->action2) == NULL);
g_assert (g_list_find (list, fixture->action3) != NULL);
- g_assert (menu_contains_button_with_label (GTK_CONTAINER (fixture->action_menu->priv->grid),
+ g_assert (menu_contains_button_with_label (fixture->action_menu,
gtk_action_get_label (fixture->action1)));
- g_assert (!menu_contains_button_with_label (GTK_CONTAINER (fixture->action_menu->priv->grid),
+ g_assert (!menu_contains_button_with_label (fixture->action_menu,
gtk_action_get_label (fixture->action2)));
- g_assert (menu_contains_button_with_label (GTK_CONTAINER (fixture->action_menu->priv->grid),
+ g_assert (menu_contains_button_with_label (fixture->action_menu,
gtk_action_get_label (fixture->action3)));
}