testsuite: Remove a bunch of broken tests

These tests have either been commented out for way too long or use APIs
that we don't want to support.

6 files changed, 0 insertions, 5012 deletions

diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
index 517492a6c0..79f494654e 100644
--- a/testsuite/gtk/Makefile.am
+++ b/testsuite/gtk/Makefile.am
@@ -44,7 +44,6 @@ TEST_PROGS += 			\
 	cssprovider		\
 	defaultvalue		\
 	entry			\
-	expander		\
 	firefox-stylecontext	\
 	floating		\
 	focus			\
@@ -79,16 +78,6 @@ if OS_UNIX
 #TEST_PROGS			+= defaultvalue
 endif
 
-#TEST_PROGS			+= testing
-#TEST_PROGS			+= treeview-scrolling
-#TEST_PROGS			+= object
-#TEST_PROGS			+= filechooser
-
-# this doesn't work in make distcheck, since running
-# on a naked X server creates slightly different event
-# sequences than running on a normal desktop
-# TEST_PROGS			+= crossingevents
-
 treemodel_SOURCES = 		\
 	treemodel.h 		\
 	treemodel.c 		\
diff --git a/testsuite/gtk/crossingevents.c b/testsuite/gtk/crossingevents.c
deleted file mode 100644
index be210f3c17..0000000000
--- a/testsuite/gtk/crossingevents.c
+++ /dev/null
@@ -1,628 +0,0 @@
-/*
- * crossingevents.c: A test for crossing events
- *
- * Copyright (C) 2008 Cody Russell
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <gtk/gtk.h>
-#include <string.h>
-
-typedef struct {
-  GtkWidget *window;
-  GtkWidget *eventbox;
-  GtkWidget *frame;
-  GtkWidget *button;
-  GtkWidget *check;
-  gboolean   events_connected;
-  GQueue    *queue;
-} CrossingTest;
-
-typedef struct {
-  gboolean entered;
-  gchar *name;
-  gboolean synthesized;
-  GdkCrossingMode mode;
-  GdkNotifyType detail;
-} CrossingEventData;
-
-#define SLEEP_DURATION    100
-
-void start_events (CrossingTest *test);
-void stop_events (CrossingTest *test);
-
-static gboolean
-sleep_timeout_cb (gpointer data)
-{
-  gtk_main_quit ();
-  return FALSE;
-}
-
-static void
-sleep_in_main_loop (double fraction)
-{
-  /* process all pending idles and events */
-  while (g_main_context_pending (NULL))
-    g_main_context_iteration (NULL, FALSE);
-  /* sleeping probably isn't strictly necessary here */
-  gdk_threads_add_timeout_full (G_MAXINT, fraction * SLEEP_DURATION, sleep_timeout_cb, NULL, NULL);
-  gtk_main ();
-  /* process any pending idles or events that arrived during sleep */
-  while (g_main_context_pending (NULL))
-    g_main_context_iteration (NULL, FALSE);
-}
-
-void
-set_cursor (GtkWidget *widget)
-{
-  int x, y, w, h;
-
-  gdk_window_get_origin (widget->window, &x, &y);
-
-  x += widget->allocation.x;
-  y += widget->allocation.y;
-  w = widget->allocation.width;
-  h = widget->allocation.height;
-
-  gdk_display_warp_pointer (gtk_widget_get_display (widget),
-			    gtk_widget_get_screen (widget),
-			    x + w / 2,
-			    y + h / 2);
-
-  sleep_in_main_loop (0.5);
-}
-
-static gboolean
-on_enter (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data)
-{
-  CrossingTest *test = (CrossingTest*)user_data;
-
-  CrossingEventData *evt = g_slice_new0 (CrossingEventData);
-  evt->entered = TRUE;
-  evt->name = g_strdup (gtk_widget_get_name (widget));
-  evt->synthesized = event->send_event;
-  evt->mode = event->mode;
-  evt->detail = event->detail;
-
-  if (!test->queue)
-    test->queue = g_queue_new ();
-
-  g_queue_push_tail (test->queue, evt);
-
-  return FALSE;
-}
-
-static gboolean
-on_leave (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data)
-{
-  CrossingTest *test = (CrossingTest*)user_data;
-
-  CrossingEventData *evt = g_slice_new0 (CrossingEventData);
-  evt->entered = FALSE;
-  evt->name = g_strdup (gtk_widget_get_name (widget));
-  evt->synthesized = event->send_event;
-  evt->mode = event->mode;
-  evt->detail = event->detail;
-
-  if (!test->queue)
-    test->queue = g_queue_new ();
-
-  g_queue_push_tail (test->queue, evt);
-
-  return FALSE;
-}
-
-static void
-on_check_toggled (GtkWidget *toggle, GtkWidget *button)
-{
-  gtk_widget_set_sensitive (button, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle)));
-}
-
-static void
-sensitivity_setup (CrossingTest *test,
-		   gconstpointer user_data)
-{
-  GtkWidget *frame;
-
-  test->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_widget_set_name (test->window, "W");
-  frame = gtk_frame_new ("Crossing Events");
-  test->eventbox = gtk_event_box_new ();
-  gtk_widget_set_name (test->eventbox, "E");
-
-  GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
-  gtk_container_add (GTK_CONTAINER (test->window), frame);
-  gtk_container_add (GTK_CONTAINER (frame), test->eventbox);
-  gtk_container_add (GTK_CONTAINER (test->eventbox), vbox);
-
-  test->button = gtk_button_new_with_label ("Click me!");
-  gtk_widget_set_name (test->button, "B");
-  gtk_box_pack_start (GTK_BOX (vbox), test->button, FALSE, TRUE, 0);
-
-  test->check = gtk_check_button_new_with_label ("Sensitive?");
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (test->check), TRUE);
-  g_signal_connect (G_OBJECT (test->check),
-		    "toggled", G_CALLBACK (on_check_toggled), test->button);
-  gtk_widget_set_name (test->check, "C");
-  gtk_box_pack_start (GTK_BOX (vbox), test->check, FALSE, TRUE, 0);
-
-  gtk_widget_show_all (test->window);
-
-  gtk_window_move (GTK_WINDOW (test->window), 0, 0);
-
-  sleep_in_main_loop (0.5);
-}
-
-static void
-sensitivity_teardown (CrossingTest *test,
-		      gconstpointer user_data)
-{
-  stop_events (test);
-  gtk_widget_destroy (test->window);
-
-  if (test->queue != NULL)
-    {
-      g_queue_clear (test->queue);
-      test->queue = NULL;
-    }
-}
-
-void
-start_events (CrossingTest *test)
-{
-  if (!test->events_connected)
-    {
-      g_object_connect (G_OBJECT (test->window),
-			"signal::destroy", gtk_main_quit, NULL,
-			"signal::enter-notify-event", on_enter, test,
-			"signal::leave-notify-event", on_leave, test,
-			NULL);
-      g_object_connect (G_OBJECT (test->eventbox),
-			"signal::enter-notify-event", on_enter, test,
-			"signal::leave-notify-event", on_leave, test,
-			NULL);
-      g_object_connect (G_OBJECT (test->button),
-			"signal::enter-notify-event", on_enter, test,
-			"signal::leave-notify-event", on_leave, test,
-			NULL);
-      g_object_connect (G_OBJECT (test->check),
-			"signal::enter-notify-event", on_enter, test,
-			"signal::leave-notify-event", on_leave, test,
-			NULL);
-      test->events_connected = TRUE;
-    }
-
-  sleep_in_main_loop (0.5);
-}
-
-void
-stop_events (CrossingTest *test)
-{
-  if (test->events_connected)
-    {
-      g_object_disconnect (G_OBJECT (test->window),
-			   "any_signal", gtk_main_quit, NULL,
-			   "any_signal", on_enter, test,
-			   "any_signal", on_leave, test,
-			   NULL);
-      g_object_disconnect (G_OBJECT (test->eventbox),
-			   "any_signal", on_enter, test,
-			   "any_signal", on_leave, test,
-			   NULL);
-      g_object_disconnect (G_OBJECT (test->button),
-			   "any_signal", on_enter, test,
-			   "any_signal", on_leave, test,
-			   NULL);
-      g_object_disconnect (G_OBJECT (test->check),
-			   "any_signal", G_CALLBACK (on_check_toggled), test->button,
-			   "any_signal", on_enter, test,
-			   "any_signal", on_leave, test,
-			   NULL);
-      test->events_connected = FALSE;
-    }
-}
-
-void
-move_cursor_away (CrossingTest *test)
-{
-  gdk_display_warp_pointer (gtk_widget_get_display (test->window),
-                            gtk_widget_get_screen (test->window),
-                            1000, -1000);
-
-  sleep_in_main_loop (0.5);
-}
-
-void
-check_event (CrossingTest *test,
-	     const gchar *name,
-	     gboolean entered,
-	     gboolean synthesized,
-	     GdkCrossingMode mode,
-	     GdkNotifyType detail)
-{
-  CrossingEventData *evt;
-
-  g_assert (test->queue != NULL);
-
-  evt = g_queue_pop_head (test->queue);
-
-  g_assert (evt->entered == entered);
-  g_assert (strcmp (evt->name, name) == 0);
-  g_assert (evt->synthesized == synthesized);
-  g_assert (evt->mode == mode);
-
-  if (evt->detail != detail)
-    g_print ("%s %s event, detail %d, expected detail %d\n", 
-             synthesized ? "synthesized" : "native",
-             entered ? "enter" : "leave",
-             evt->detail, detail);
- 
-  g_assert (evt->detail == detail);
-}
-
-/* Verify crossing events when moving into and out of a sensitive widget */
-static void
-cursor_on_sensitive (CrossingTest *test,
-		     gconstpointer user_data)
-{
-  move_cursor_away (test);
-
-  start_events (test);
-
-  set_cursor (test->button);
-
-  check_event (test,
-	       "W",
-	       TRUE,
-	       FALSE,  /* native */
-	       GDK_CROSSING_NORMAL,
-	       GDK_NOTIFY_NONLINEAR_VIRTUAL);
-
-  check_event (test,
-	       "E",
-	       TRUE,
-	       FALSE,  /* native */
-	       GDK_CROSSING_NORMAL,
-	       GDK_NOTIFY_NONLINEAR_VIRTUAL);
-
-  check_event (test,
-	       "B",
-	       TRUE,
-	       FALSE,  /* native */
-	       GDK_CROSSING_NORMAL,
-	       GDK_NOTIFY_NONLINEAR);
-
-  g_assert (g_queue_is_empty (test->queue));
-
-  move_cursor_away (test);
-
-  check_event (test,
-	       "B",
-	       FALSE,
-	       FALSE,  /* native */
-	       GDK_CROSSING_NORMAL,
-	       GDK_NOTIFY_NONLINEAR);
-
-  check_event (test,
-	       "E",
-	       FALSE,
-	       FALSE,  /* native */
-	       GDK_CROSSING_NORMAL,
-	       GDK_NOTIFY_NONLINEAR_VIRTUAL);
-
-  check_event (test,
-	       "W",
-	       FALSE,
-	       FALSE,  /* native */
-	       GDK_CROSSING_NORMAL,
-	       GDK_NOTIFY_NONLINEAR_VIRTUAL);
-
-  g_assert (g_queue_is_empty (test->queue));
-
-  stop_events (test);
-}
-
-static void
-change_sensitive_to_insensitive (CrossingTest *test,
-				 gconstpointer user_data)
-{
-  move_cursor_away (test);
-  set_cursor (test->button);
-
-  start_events (test);
-
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (test->check), FALSE);
-
-  check_event (test,
-	       "B",
-	       FALSE,
-	       TRUE,  /* synthesized */
-	       GDK_CROSSING_STATE_CHANGED,
-	       GDK_NOTIFY_ANCESTOR);
-
-  check_event (test,
-               "E",
-	       FALSE,
-	       TRUE,  /* synthesized */
-               GDK_CROSSING_STATE_CHANGED,
-               GDK_NOTIFY_VIRTUAL);
-
-  check_event (test,
-               "W",
-	       FALSE,
-	       TRUE,  /* synthesized */
-               GDK_CROSSING_STATE_CHANGED,
-               GDK_NOTIFY_VIRTUAL);
-
-  g_assert (g_queue_is_empty (test->queue));
-
-  stop_events (test);
-}
-
-static void
-change_insensitive_to_sensitive (CrossingTest *test,
-				 gconstpointer user_data)
-{
-  move_cursor_away (test);
-  set_cursor (test->button);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (test->check), FALSE);
-
-  start_events (test);
-
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (test->check), TRUE);
-
-  check_event (test,
-               "W",
-               TRUE,
-               TRUE,  /* synthesized */
-               GDK_CROSSING_STATE_CHANGED,
-               GDK_NOTIFY_VIRTUAL);
-
-  check_event (test,
-               "E",
-               TRUE,
-	       TRUE,  /* synthesized */
-               GDK_CROSSING_STATE_CHANGED,
-               GDK_NOTIFY_VIRTUAL);
-
-  check_event (test,
-               "B",
-               TRUE,
-	       TRUE,  /* synthesized */
-               GDK_CROSSING_STATE_CHANGED,
-               GDK_NOTIFY_ANCESTOR);
-
-  g_assert (g_queue_is_empty (test->queue));
-
-  stop_events (test);
-}
-
-static void
-cursor_from_insensitive_to_sensitive (CrossingTest *test,
-				      gconstpointer user_data)
-{
-  set_cursor (test->button);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (test->check), FALSE);
-
-  start_events (test);
-
-  set_cursor (test->check);
-
-  check_event (test,
-               "C",
-               TRUE,
-               FALSE,  /* native */
-               GDK_CROSSING_NORMAL,
-               GDK_NOTIFY_NONLINEAR);
-
-  g_assert (g_queue_is_empty (test->queue));
-
-  stop_events (test);
-}
-
-static void
-cursor_from_sensitive_to_insensitive (CrossingTest *test,
-				      gconstpointer user_data)
-{
-  set_cursor (test->check);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (test->check), FALSE);
-
-  start_events (test);
-
-  set_cursor (test->button);
-
-  check_event (test,
-               "C",
-               FALSE,
-               FALSE,  /* native */
-               GDK_CROSSING_NORMAL,
-               GDK_NOTIFY_NONLINEAR);
-
-  g_assert (g_queue_is_empty (test->queue));
-
-  stop_events (test);
-}
-
-static void
-add_gtk_grab (CrossingTest *test,
-	      gconstpointer user_data)
-{
-  set_cursor (test->button);
-
-  start_events (test);
-
-  gtk_grab_add (test->check);
-
-  check_event (test,
-	       "B",
-	       FALSE,
-	       TRUE,   /* synthesized */
-	       GDK_CROSSING_GTK_GRAB,
-	       GDK_NOTIFY_ANCESTOR);
-
-  check_event (test,
-               "E",
-               FALSE,
-	       TRUE,   /* synthesized */
-	       GDK_CROSSING_GTK_GRAB,
-	       GDK_NOTIFY_ANCESTOR);
-
-  check_event (test,
-               "W",
-               FALSE,
-               TRUE,   /* synthesized */
-               GDK_CROSSING_GTK_GRAB,
-	       GDK_NOTIFY_ANCESTOR);
-
-  g_assert (g_queue_is_empty (test->queue));
-
-  stop_events (test);
-}
-
-static void
-remove_gtk_grab (CrossingTest *test,
-		 gconstpointer user_data)
-{
-  set_cursor (test->button);
-
-  gtk_grab_add (test->check);
-
-  start_events (test);
-
-  gtk_grab_remove (test->check);
-
-  check_event (test,
-               "B",
-               TRUE,
-               TRUE,   /* synthesized */
-               GDK_CROSSING_GTK_UNGRAB,
-	       GDK_NOTIFY_ANCESTOR);
-
-  check_event (test,
-               "E",
-               TRUE,
-               TRUE,   /* synthesized */
-	       GDK_CROSSING_GTK_UNGRAB,
-               GDK_NOTIFY_ANCESTOR);
-
-  check_event (test,
-               "W",
-               TRUE,
-               TRUE,   /* synthesized */
-               GDK_CROSSING_GTK_UNGRAB,
-               GDK_NOTIFY_ANCESTOR);
-
-  g_assert (g_queue_is_empty (test->queue));
-
-  stop_events (test);
-}
-
-static void
-cursor_from_shadowed_to_unshadowed (CrossingTest *test,
-				    gconstpointer user_data)
-{
-  set_cursor (test->button);
-
-  gtk_grab_add (test->check);
-
-  start_events (test);
-
-  set_cursor (test->check);
-
-  check_event (test,
-               "C",
-               FALSE,
-               FALSE,   /* native */
-               GDK_CROSSING_NORMAL,
-               GDK_NOTIFY_NONLINEAR);
-
-  check_event (test,
-               "C",
-               TRUE,
-               FALSE,   /* native */
-               GDK_CROSSING_NORMAL,
-               GDK_NOTIFY_NONLINEAR);
-
-  g_assert (g_queue_is_empty (test->queue));
-
-  stop_events (test);
-}
-
-static void
-cursor_from_unshadowed_to_shadowed (CrossingTest *test,
-				    gconstpointer user_data)
-{
-  set_cursor (test->check);
-
-  gtk_grab_add (test->check);
-
-  start_events (test);
-
-  set_cursor (test->button);
-
-  check_event (test,
-               "C",
-               FALSE,
-               FALSE,   /* native */
-               GDK_CROSSING_NORMAL,
-               GDK_NOTIFY_NONLINEAR);
-
-  check_event (test,
-               "C",
-               TRUE,
-               FALSE,   /* native */
-               GDK_CROSSING_NORMAL,
-               GDK_NOTIFY_NONLINEAR);
-
-  g_assert (g_queue_is_empty (test->queue));
-
-  stop_events (test);
-}
-
-int
-main (int    argc,
-      char **argv)
-{
-  gtk_test_init (&argc, &argv, NULL);
-
-  g_test_add ("/crossings/cursor-on-sensitive", CrossingTest, NULL,
-  	      sensitivity_setup, cursor_on_sensitive, sensitivity_teardown);
-
-  g_test_add ("/crossings/change-sensitive-to-insensitive", CrossingTest, NULL,
-	      sensitivity_setup, change_sensitive_to_insensitive, sensitivity_teardown);
-
-  g_test_add ("/crossings/cursor-from-insensitive-to-sensitive", CrossingTest, NULL,
-	      sensitivity_setup, cursor_from_insensitive_to_sensitive, sensitivity_teardown);
-
-  g_test_add ("/crossings/cursor-from-sensitive-to-insensitive", CrossingTest, NULL,
-	      sensitivity_setup, cursor_from_sensitive_to_insensitive, sensitivity_teardown);
-
-  g_test_add ("/crossings/change-insensitive-to-sensitive", CrossingTest, NULL,
-	      sensitivity_setup, change_insensitive_to_sensitive, sensitivity_teardown);
-
-  g_test_add ("/crossings/add-gtk-grab", CrossingTest, NULL,
-	      sensitivity_setup, add_gtk_grab, sensitivity_teardown);
-
-  g_test_add ("/crossings/remove-gtk-grab", CrossingTest, NULL,
-	      sensitivity_setup, remove_gtk_grab, sensitivity_teardown);
-
-  g_test_add ("/crossings/cursor-from-shadowed-to-unshadowed", CrossingTest, NULL,
-	      sensitivity_setup, cursor_from_shadowed_to_unshadowed, sensitivity_teardown);
-
-  g_test_add ("/crossings/cursor-from-unshadowed-to-shadowed", CrossingTest, NULL,
-	      sensitivity_setup, cursor_from_unshadowed_to_shadowed, sensitivity_teardown);
-
-  return g_test_run ();
-}
diff --git a/testsuite/gtk/expander.c b/testsuite/gtk/expander.c
deleted file mode 100644
index fc49bc0e76..0000000000
--- a/testsuite/gtk/expander.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2001.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#include <gtk/gtk.h>
-
-#ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
-#endif
-
-static void
-test_click_expander (void)
-{
-  GtkWidget *window = gtk_test_create_simple_window ("Test Window", "Test click on expander");
-  GtkWidget *expander = gtk_expander_new ("Test Expander");
-  GtkWidget *label = gtk_label_new ("Test Label");
-  gboolean expanded;
-  gboolean simsuccess;
-  gtk_container_add (GTK_CONTAINER (expander), label);
-  gtk_container_add (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (window))), expander);
-  gtk_widget_show (expander);
-  gtk_widget_show (label);
-  gtk_widget_show_now (window);
-  /* check initial expander state */
-  expanded = gtk_expander_get_expanded (GTK_EXPANDER (expander));
-  g_assert (!expanded);
-  /* check expanding */
-  simsuccess = gtk_test_widget_click (expander, 1, 0);
-  g_assert (simsuccess == TRUE);
-
-  gtk_test_widget_wait_for_draw (expander);
-
-  expanded = gtk_expander_get_expanded (GTK_EXPANDER (expander));
-  g_assert (expanded);
-  /* check collapsing */
-  simsuccess = gtk_test_widget_click (expander, 1, 0);
-  g_assert (simsuccess == TRUE);
-
-  gtk_test_widget_wait_for_draw (expander);
-
-  expanded = gtk_expander_get_expanded (GTK_EXPANDER (expander));
-  g_assert (!expanded);
-}
-
-static void
-test_click_content_widget (void)
-{
-  GtkWidget *window = gtk_test_create_simple_window ("Test Window", "Test click on content widget");
-  GtkWidget *expander = gtk_expander_new ("Test Expander");
-  GtkWidget *entry = gtk_entry_new ();
-  gboolean expanded;
-  gboolean simsuccess;
-
-  gtk_container_add (GTK_CONTAINER (expander), entry);
-  gtk_container_add (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (window))), expander);
-  gtk_expander_set_expanded (GTK_EXPANDER (expander), TRUE);
-  gtk_widget_show (expander);
-  gtk_widget_show (entry);
-  gtk_widget_show_now (window);
-
-  /* check click on content with expander open */
-  expanded = gtk_expander_get_expanded (GTK_EXPANDER (expander));
-  g_assert (expanded);
-  simsuccess = gtk_test_widget_click (entry, 1, 0);
-  g_assert (simsuccess == TRUE);
-
-  gtk_test_widget_wait_for_draw (expander);
-
-  expanded = gtk_expander_get_expanded (GTK_EXPANDER (expander));
-  g_assert (expanded);
-}
-
-int
-main (int   argc,
-      char *argv[])
-{
-  gtk_test_init (&argc, &argv);
-
-#ifdef GDK_WINDOWING_X11
-  if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) ;
-    return 0; /* gtk_test functions don't work well elsewhere */
-#else
-  return 0;
-#endif
-
-  g_test_add_func ("/expander/click-expander", test_click_expander);
-  g_test_add_func ("/expander/click-content-widget", test_click_content_widget);
-
-  return g_test_run();
-}
diff --git a/testsuite/gtk/filechooser.c b/testsuite/gtk/filechooser.c
deleted file mode 100644
index 5846bac0ce..0000000000
--- a/testsuite/gtk/filechooser.c
+++ /dev/null
@@ -1,2487 +0,0 @@
-/* GTK - The GIMP Toolkit
- * autotestfilechooser.c: Automated unit tests for the GtkFileChooser widget
- * Copyright (C) 2005, Novell, Inc.
- *
- * Authors:
- *   Federico Mena-Quintero <federico@novell.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* TODO:
- *
- * - In test_reload_sequence(), test that the selection is preserved properly
- *   between unmap/map.
- *
- * - More tests!
- */
-
-#define SLEEP_DURATION  100
-
-#include "config.h"
-#include <string.h>
-#include <glib/gprintf.h>
-#include <gtk/gtk.h>
-#include "gtk/gtkfilechooserdefault.h"
-#include "gtk/gtkfilechooserentry.h"
-
-#if 0
-static const char *
-get_action_name (GtkFileChooserAction action)
-{
-  switch (action)
-    {
-    case GTK_FILE_CHOOSER_ACTION_OPEN:          return "OPEN";
-    case GTK_FILE_CHOOSER_ACTION_SAVE:          return "SAVE";
-    case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER: return "SELECT_FOLDER";
-    case GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER: return "CREATE_FOLDER";
-
-    default:
-      g_assert_not_reached ();
-      return NULL;
-    }
-}
-#endif
-
-#ifdef BROKEN_TESTS
-static void
-log_test (gboolean passed, const char *test_name, ...)
-{
-  va_list args;
-  char *str;
-
-  va_start (args, test_name);
-  str = g_strdup_vprintf (test_name, args);
-  va_end (args);
-
-  if (g_test_verbose())
-    g_printf ("%s: %s\n", passed ? "PASSED" : "FAILED", str);
-  g_free (str);
-}
-
-typedef void (* SetFilenameFn) (GtkFileChooser *chooser, gpointer data);
-typedef void (* CompareFilenameFn) (GtkFileChooser *chooser, gpointer data);
-
-struct test_set_filename_closure {
-  GtkWidget *chooser;
-  GtkWidget *accept_button;
-  gboolean focus_button;
-};
-
-static gboolean
-set_filename_timeout_cb (gpointer data)
-{
-  struct test_set_filename_closure *closure;
-
-  closure = data;
-
-  if (closure->focus_button)
-    gtk_widget_grab_focus (closure->accept_button);
-
-  gtk_button_clicked (GTK_BUTTON (closure->accept_button));
-
-  return FALSE;
-}
-#endif
-
-
-static guint wait_for_idle_id = 0;
-
-static gboolean
-wait_for_idle_idle (gpointer data)
-{
-  wait_for_idle_id = 0;
-
-  return G_SOURCE_REMOVE;
-}
-
-static void
-wait_for_idle (void)
-{
-  wait_for_idle_id = g_idle_add_full (G_PRIORITY_LOW + 100,
-				      wait_for_idle_idle,
-				      NULL, NULL);
-
-  while (wait_for_idle_id)
-    gtk_main_iteration ();
-}
-
-#ifdef BROKEN_TESTS
-static void
-test_set_filename (GtkFileChooserAction action,
-		   gboolean focus_button,
-		   SetFilenameFn set_filename_fn,const
-		   CompareFilenameFn compare_filename_fn,
-		   gpointer data)
-{
-  GtkWidget *chooser;
-  struct test_set_filename_closure closure;
-  guint timeout_id;
-
-  chooser = gtk_file_chooser_dialog_new ("hello", NULL, action,
-					 _("_Cancel"), GTK_RESPONSE_CANCEL,
-					 NULL);
-
-  closure.chooser = chooser;
-  closure.accept_button = gtk_dialog_add_button (GTK_DIALOG (chooser), _("_OK"), GTK_RESPONSE_ACCEPT);
-  closure.focus_button = focus_button;
-
-  gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT);
-
-  (* set_filename_fn) (GTK_FILE_CHOOSER (chooser), data);
-
-  timeout_id = gdk_threads_add_timeout_full (G_MAXINT, SLEEP_DURATION, set_filename_timeout_cb, &closure, NULL);
-  gtk_dialog_run (GTK_DIALOG (chooser));
-  g_source_remove (timeout_id);
-
-  (* compare_filename_fn) (GTK_FILE_CHOOSER (chooser), data);
-
-  gtk_widget_destroy (chooser);
-}
-
-static void
-set_filename_cb (GtkFileChooser *chooser, gpointer data)
-{
-  const char *filename;
-
-  filename = data;
-  gtk_file_chooser_set_filename (chooser, filename);
-}
-
-static void
-compare_filename_cb (GtkFileChooser *chooser, gpointer data)
-{
-  const char *filename;
-  char *out_filename;
-
-  filename = data;
-  out_filename = gtk_file_chooser_get_filename (chooser);
-
-  g_assert_cmpstr (out_filename, ==, filename);
-
-  g_free (out_filename);
-}
-
-typedef struct
-{
-  const char *test_name;
-  GtkFileChooserAction action;
-  const char *filename;
-  gboolean focus_button;
-} TestSetFilenameSetup;
-
-static void
-test_black_box_set_filename (gconstpointer data)
-{
-  const TestSetFilenameSetup *setup = data;
-
-  test_set_filename (setup->action, setup->focus_button, set_filename_cb, compare_filename_cb, (char *) setup->filename);
-}
-
-struct current_name_closure {
-	const char *path;
-	const char *current_name;
-};
-
-static void
-set_current_name_cb (GtkFileChooser *chooser, gpointer data)
-{
-  struct current_name_closure *closure;
-
-  closure = data;
-
-  gtk_file_chooser_set_current_folder (chooser, closure->path);
-  gtk_file_chooser_set_current_name (chooser, closure->current_name);
-}
-
-static void
-compare_current_name_cb (GtkFileChooser *chooser, gpointer data)
-{
-  struct current_name_closure *closure;
-  char *out_filename;
-  char *filename;
-
-  closure = data;
-
-  out_filename = gtk_file_chooser_get_filename (chooser);
-
-  g_assert (out_filename != NULL);
-
-  filename = g_build_filename (closure->path, closure->current_name, NULL);
-  g_assert_cmpstr (filename, ==, out_filename);
-
-  g_free (filename);
-  g_free (out_filename);
-}
-
-typedef struct
-{
-  const char *test_name;
-  GtkFileChooserAction action;
-  const char *current_name;
-  gboolean focus_button;
-} TestSetCurrentNameSetup;
-
-static void
-test_black_box_set_current_name (gconstpointer data)
-{
-  const TestSetCurrentNameSetup *setup = data;
-  struct current_name_closure closure;
-  char *cwd;
-
-  cwd = g_get_current_dir ();
-
-  closure.path = cwd;
-  closure.current_name = setup->current_name;
-
-  test_set_filename (setup->action, setup->focus_button, set_current_name_cb, compare_current_name_cb, &closure);
-
-  g_free (cwd);
-}
-#endif
-
-/* FIXME: fails in CREATE_FOLDER mode when FOLDER_NAME == "/" */
-
-#if 0
-#define FILE_NAME "/nonexistent"
-#define FILE_NAME_2 "/nonexistent2"
-#define FOLDER_NAME "/etc"
-#define FOLDER_NAME_2 "/usr"
-#else
-#define FILE_NAME "/etc/passwd"
-#define FILE_NAME_2 "/etc/group"
-#define FOLDER_NAME "/etc"
-#define FOLDER_NAME_2 "/usr"
-#endif
-
-#define CURRENT_NAME "parangaricutirimicuaro.txt"
-#define CURRENT_NAME_FOLDER "parangaricutirimicuaro"
-
-/* https://bugzilla.novell.com/show_bug.cgi?id=184875
- * http://bugzilla.gnome.org/show_bug.cgi?id=347066
- * http://bugzilla.gnome.org/show_bug.cgi?id=346058
- */
-
-#ifdef BROKEN_TESTS
-static void
-setup_set_filename_tests (void)
-{
-  static TestSetFilenameSetup tests[] =
-    {
-      { "/GtkFileChooser/black_box/set_filename/open/no_focus",		 GTK_FILE_CHOOSER_ACTION_OPEN,		FILE_NAME,  FALSE },
-      { "/GtkFileChooser/black_box/set_filename/open/focus",		 GTK_FILE_CHOOSER_ACTION_OPEN,		FILE_NAME,  TRUE  },
-      { "/GtkFileChooser/black_box/set_filename/save/no_focus",		 GTK_FILE_CHOOSER_ACTION_SAVE,		FILE_NAME,  FALSE },
-      { "/GtkFileChooser/black_box/set_filename/save/focus",		 GTK_FILE_CHOOSER_ACTION_SAVE,		FILE_NAME,  TRUE  },
-      { "/GtkFileChooser/black_box/set_filename/select_folder/no_focus", GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,	FOLDER_NAME,FALSE },
-      { "/GtkFileChooser/black_box/set_filename/select_folder/focus",	 GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,	FOLDER_NAME,TRUE  },
-      { "/GtkFileChooser/black_box/set_filename/create_folder/no_focus", GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER,	FOLDER_NAME,FALSE },
-      { "/GtkFileChooser/black_box/set_filename/create_folder/focus",	 GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER,	FOLDER_NAME,TRUE  },
-    };
-  int i;
-
-  for (i = 0; i < G_N_ELEMENTS (tests); i++)
-    g_test_add_data_func (tests[i].test_name, &tests[i], test_black_box_set_filename);
-}
-
-static void
-setup_set_current_name_tests (void)
-{
-  static TestSetCurrentNameSetup tests[] =
-    {
-      { "/GtkFileChooser/black_box/set_current_name/save/no_focus",	     GTK_FILE_CHOOSER_ACTION_SAVE,	    CURRENT_NAME,	 FALSE },
-      { "/GtkFileChooser/black_box/set_current_name/save/focus",	     GTK_FILE_CHOOSER_ACTION_SAVE,	    CURRENT_NAME,	 TRUE  },
-      { "/GtkFileChooser/black_box/set_current_name/create_folder/no_focus", GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER, CURRENT_NAME_FOLDER, FALSE },
-      { "/GtkFileChooser/black_box/set_current_name/create_folder/focus",    GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER, CURRENT_NAME_FOLDER, TRUE  },
-    };
-  int i;
-
-  for (i = 0; i < G_N_ELEMENTS (tests); i++)
-    g_test_add_data_func (tests[i].test_name, &tests[i], test_black_box_set_current_name);
-}
-#endif
-
-typedef struct
-{
-  const char *shortname;
-  GtkFileChooserAction action;
-  const char *initial_current_folder;
-  const char *initial_filename;
-  gboolean open_dialog;
-  enum {
-    BUTTON,
-    DIALOG
-  } what_to_tweak;
-  const char *tweak_current_folder;
-  const char *tweak_filename;
-  gint dialog_response;
-  gboolean unselect_all;
-  const char *final_current_folder;
-  const char *final_filename;
-} FileChooserButtonTest;
-
-static char *
-make_button_test_name (FileChooserButtonTest *t)
-{
-  return g_strdup_printf ("/GtkFileChooserButton/%s", t->shortname);
-#if 0
-  GString *s = g_string_new ("/GtkFileChooserButton");
-
-  g_string_append_printf (s, "/%s/%s/%s/%s",
-			  get_action_name (t->action),
-			  t->initial_current_folder ? "set_initial_folder" : "no_default_folder",
-			  t->initial_filename ? "set_initial_filename" : "no_initial_filename",
-			  t->open_dialog ? "open_dialog" : "no_dialog");
-
-  if (t->tweak_current_folder)
-    g_string_append (s, "/tweak_current_folder");
-
-  if (t->tweak_filename)
-    g_string_append (s, "/tweak_filename");
-
-  if (t->open_dialog)
-    g_string_append_printf (s, "/%s",
-			    t->dialog_response == GTK_RESPONSE_ACCEPT ? "accept" : "cancel");
-
-  if (t->final_current_folder)
-    g_string_append (s, "/final_current_folder");
-
-  if (t->final_filename)
-    g_string_append (s, "/final_filename");
-
-  return g_string_free (s, FALSE);
-#endif
-}
-
-static gboolean
-sleep_timeout_cb (gpointer data)
-{
-  gtk_main_quit ();
-  return FALSE;
-}
-
-static void
-sleep_in_main_loop (void)
-{
-  guint timeout_id;
-
-  timeout_id = gdk_threads_add_timeout_full (G_MAXINT, 250, sleep_timeout_cb, NULL, NULL);
-  gtk_main ();
-  g_source_remove (timeout_id);
-}
-
-static void
-build_children_list (GtkWidget *widget, gpointer data)
-{
-  GList **list;
-
-  list = data;
-  *list = g_list_prepend (*list, widget);
-}
-
-static GtkWidget *
-find_child_widget_with_atk_role (GtkWidget *widget, AtkRole role)
-{
-  AtkObject *accessible;
-  AtkRole a_role;
-
-  accessible = gtk_widget_get_accessible (widget);
-  a_role = atk_object_get_role (accessible);
-
-  if (a_role == role)
-    return widget;
-  else
-    {
-      GtkWidget *found_child;
-
-      found_child = NULL;
-
-      if (GTK_IS_CONTAINER (widget))
-	{
-	  GList *children;
-	  GList *l;
-
-	  children = NULL;
-	  gtk_container_forall (GTK_CONTAINER (widget), build_children_list, &children);
-
-	  l = children;
-
-	  while (l && !found_child)
-	    {
-	      GtkWidget *child;
-
-	      child = GTK_WIDGET (l->data);
-
-	      found_child = find_child_widget_with_atk_role (child, role);
-
-	      l = l->next;
-	    }
-
-	  g_list_free (children);
-	}
-
-      return found_child;
-    }
-}
-
-static const char *
-get_atk_name_for_filechooser_button (GtkFileChooserButton *button)
-{
-  GtkFileChooserAction action;
-  GtkWidget *widget;
-  AtkObject *accessible;
-
-  action = gtk_file_chooser_get_action (GTK_FILE_CHOOSER (button));
-  g_assert (action == GTK_FILE_CHOOSER_ACTION_OPEN || action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-
-  if (action == GTK_FILE_CHOOSER_ACTION_OPEN)
-    widget = find_child_widget_with_atk_role (GTK_WIDGET (button), ATK_ROLE_PUSH_BUTTON);
-  else
-    widget = find_child_widget_with_atk_role (GTK_WIDGET (button), ATK_ROLE_COMBO_BOX);
-
-  accessible = gtk_widget_get_accessible (widget);
-  return atk_object_get_name (accessible);
-}
-
-static void
-check_that_basename_is_shown (GtkFileChooserButton *button, const char *expected_filename)
-{
-  GtkFileChooserAction action;
-  const char *name_on_button;
-  char *expected_basename;
-
-  name_on_button = get_atk_name_for_filechooser_button (button);
-
-  action = gtk_file_chooser_get_action (GTK_FILE_CHOOSER (button));
-  g_assert (action == GTK_FILE_CHOOSER_ACTION_OPEN || action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-
-  if (expected_filename)
-    expected_basename = g_path_get_basename (expected_filename);
-  else
-    expected_basename = NULL;
-
-  if (expected_basename)
-    g_assert_cmpstr (expected_basename, ==, name_on_button);
-  else
-    g_assert_cmpstr (name_on_button, ==, "(None)"); /* see gtkfilechooserbutton.c:FALLBACK_DISPLAY_NAME */ /* FIXME: how do we translate this? */
-
-  g_free (expected_basename);
-}
-
-static const char *
-get_expected_shown_filename (GtkFileChooserAction action, const char *folder_name, const char *filename)
-{
-  if (action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
-    {
-      if (filename)
-	return filename;
-      else
-	return folder_name;
-    }
-  else
-    return filename;
-}
-
-static GtkWidget *
-get_file_chooser_dialog_from_button (GtkFileChooserButton *button)
-{
-  GtkWidget *fc_dialog;
-
-  /* Give me the internal dialog, damnit */
-  fc_dialog = g_object_get_qdata (G_OBJECT (button), g_quark_from_static_string ("gtk-file-chooser-delegate"));
-  g_assert (GTK_IS_FILE_CHOOSER (fc_dialog));
-  g_assert (GTK_IS_DIALOG (fc_dialog));
-
-  return fc_dialog;
-}
-
-typedef struct {
-  GtkWidget *window;
-  GtkWidget *fc_button;
-} WindowAndButton;
-
-static WindowAndButton
-create_window_and_file_chooser_button (GtkFileChooserAction action)
-{
-  WindowAndButton w;
-
-  w.window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-  w.fc_button = gtk_file_chooser_button_new (action == GTK_FILE_CHOOSER_ACTION_OPEN ? "Select a file" : "Select a folder",
-					     action);
-  gtk_container_add (GTK_CONTAINER (w.window), w.fc_button);
-
-  return w;
-}
-
-typedef struct
-{
-  GObject *object;
-  GHashTable *signals;
-  gboolean in_main_loop;
-} SignalWatcher;
-
-typedef struct
-{
-  SignalWatcher *watcher;
-  char *signal_name;
-  gulong id;
-  gboolean emitted;
-} SignalConnection;
-
-static SignalWatcher *
-signal_watcher_new (GObject *object)
-{
-  SignalWatcher *watcher = g_new0 (SignalWatcher, 1);
-
-  watcher->object = g_object_ref (object);
-  watcher->signals = g_hash_table_new (g_str_hash, g_str_equal);
-
-  return watcher;
-}
-
-static void
-dummy_callback (GObject *object)
-{
-  /* nothing */
-}
-
-static void
-marshal_notify_cb (gpointer data, GClosure *closure)
-{
-  if (data)
-    {
-      SignalConnection *conn;
-
-      conn = data;
-      conn->emitted = TRUE;
-
-      if (conn->watcher->in_main_loop)
-	{
-	  gtk_main_quit ();
-	  conn->watcher->in_main_loop = FALSE;
-	}
-    }
-}
-
-static void
-signal_watcher_watch_signal (SignalWatcher *watcher, const char *signal_name)
-{
-  SignalConnection *conn;
-
-  conn = g_hash_table_lookup (watcher->signals, signal_name);
-  if (!conn)
-    {
-      GClosure *closure;
-
-      conn = g_new0 (SignalConnection, 1);
-      conn->watcher = watcher;
-      conn->signal_name = g_strdup (signal_name);
-
-      closure = g_cclosure_new (G_CALLBACK (dummy_callback), NULL, NULL);
-      g_closure_add_marshal_guards (closure, conn, marshal_notify_cb, NULL, marshal_notify_cb);
-      conn->id = g_signal_connect_closure (watcher->object, signal_name, closure, FALSE);
-      conn->emitted = FALSE;
-
-      g_hash_table_insert (watcher->signals, conn->signal_name, conn);
-    }
-  else
-    conn->emitted = FALSE;
-}
-
-static gboolean
-signal_watcher_expect (SignalWatcher *watcher, const char *signal_name, char *unused_description)
-{
-  SignalConnection *conn;
-  gboolean emitted;
-
-  conn = g_hash_table_lookup (watcher->signals, signal_name);
-  g_assert (conn != NULL);
-
-  if (!conn->emitted)
-    {
-      guint timeout_id;
-      
-      timeout_id = gdk_threads_add_timeout_full (G_MAXINT, 1000, sleep_timeout_cb, NULL, NULL);
-
-      watcher->in_main_loop = TRUE;
-      gtk_main ();
-      watcher->in_main_loop = FALSE;
-
-      g_source_remove (timeout_id);
-    }
-
-  emitted = conn->emitted;
-  conn->emitted = FALSE;
-
-  return emitted;
-}
-
-static void
-destroy_connection (gpointer key, gpointer value, gpointer user_data)
-{
-  SignalConnection *conn;
-
-  conn = value;
-  g_signal_handler_disconnect (conn->watcher->object, conn->id);
-  g_free (conn->signal_name);
-  g_free (conn);
-}
-
-static void
-signal_watcher_destroy (SignalWatcher *watcher)
-{
-  g_hash_table_foreach (watcher->signals, destroy_connection, NULL);
-  g_hash_table_destroy (watcher->signals);
-  g_object_unref (watcher->object);
-  g_free (watcher);
-}
-
-static void
-test_file_chooser_button_with_response (const FileChooserButtonTest *setup, gint dialog_response)
-{
-  WindowAndButton w;
-  SignalWatcher *watcher;
-  GtkWidget *fc_dialog = NULL;
-  int iterations;
-  int i;
-
-  w = create_window_and_file_chooser_button (setup->action);
-
-  watcher = signal_watcher_new (G_OBJECT (w.fc_button));
-  signal_watcher_watch_signal (watcher, "current-folder-changed");
-  signal_watcher_watch_signal (watcher, "selection-changed");
-
-  if (setup->initial_current_folder)
-    gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (w.fc_button), setup->initial_current_folder);
-
-  if (setup->initial_filename)
-    gtk_file_chooser_select_filename (GTK_FILE_CHOOSER (w.fc_button), setup->initial_filename);
-
-  gtk_widget_show_all (w.window);
-  wait_for_idle ();
-
-  if (setup->initial_current_folder)
-    g_assert (signal_watcher_expect (watcher, "current-folder-changed", "initial current folder"));
-
-  if (setup->initial_filename)
-    g_assert (signal_watcher_expect (watcher, "selection-changed", "initial filename"));
-
-  check_that_basename_is_shown (GTK_FILE_CHOOSER_BUTTON (w.fc_button),
-				get_expected_shown_filename (setup->action, setup->initial_current_folder, setup->initial_filename));
-
-  /* If there is a dialog to be opened, we actually test going through it a
-   * couple of times.  This ensures that any state that the button frobs for
-   * each appearance of the dialog will make sense.
-   */
-  if (setup->open_dialog)
-    iterations = 2;
-  else
-    iterations = 1;
-
-  for (i = 0; i < iterations; i++)
-    {
-      GtkFileChooser *chooser_to_tweak;
-
-      if (setup->open_dialog)
-	{
-	  GList *children;
-
-	  /* Hack our way into the file chooser button; get its GtkButton child and click it */
-	  children = gtk_container_get_children (GTK_CONTAINER (w.fc_button));
-	  g_assert (children && GTK_IS_BUTTON (children->data));
-	  gtk_button_clicked (GTK_BUTTON (children->data));
-	  g_list_free (children);
-
-	  wait_for_idle ();
-
-	  fc_dialog = get_file_chooser_dialog_from_button (GTK_FILE_CHOOSER_BUTTON (w.fc_button));
-	}
-
-      if (setup->what_to_tweak == BUTTON)
-	chooser_to_tweak = GTK_FILE_CHOOSER (w.fc_button);
-      else if (setup->what_to_tweak == DIALOG)
-	chooser_to_tweak = GTK_FILE_CHOOSER (fc_dialog);
-      else
-	g_assert_not_reached ();
-
-      /* Okay, now frob the button or its optional dialog */
-
-      if (setup->tweak_current_folder)
-	{
-	  if (setup->what_to_tweak == BUTTON)
-	    signal_watcher_watch_signal (watcher, "current-folder-changed");
-
-	  gtk_file_chooser_set_current_folder (chooser_to_tweak, setup->tweak_current_folder);
-
-	  if (setup->what_to_tweak == BUTTON)
-	    g_assert (signal_watcher_expect (watcher, "current-folder-changed", "tweak current folder in button"));
-	}
-
-      if (setup->tweak_filename)
-	{
-	  if (setup->what_to_tweak == BUTTON)
-	    signal_watcher_watch_signal (watcher, "selection-changed");
-
-	  gtk_file_chooser_select_filename (chooser_to_tweak, setup->tweak_filename);
-
-	  if (setup->what_to_tweak == BUTTON)
-	    g_assert (signal_watcher_expect (watcher, "selection-changed", "tweak filename in button"));
-	}
-
-      if (setup->unselect_all)
-	{
-	  if (setup->what_to_tweak == BUTTON)
-	    signal_watcher_watch_signal (watcher, "selection-changed");
-
-	  gtk_file_chooser_unselect_all (chooser_to_tweak);
-
-	  if (setup->what_to_tweak == BUTTON)
-	    g_assert (signal_watcher_expect (watcher, "selection-changed", "tweak unselect_all in button"));
-	}
-
-      wait_for_idle ();
-
-      if (setup->open_dialog)
-	{
-	  gtk_dialog_response (GTK_DIALOG (fc_dialog), dialog_response);
-	  wait_for_idle ();
-
-	  gtk_window_resize (GTK_WINDOW (fc_dialog), 500, 500);
-	}
-
-      if (setup->final_current_folder)
-	{
-	  char *folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (w.fc_button));
-
-	  g_assert_cmpstr (folder, ==, setup->final_current_folder);
-	  g_free (folder);
-	}
-
-      if (setup->final_filename)
-	{
-	  char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (w.fc_button));
-
-	  g_assert_cmpstr (filename, ==, setup->final_filename);
-	  g_free (filename);
-	}
-
-      check_that_basename_is_shown (GTK_FILE_CHOOSER_BUTTON (w.fc_button),
-				    get_expected_shown_filename (setup->action, setup->final_current_folder, setup->final_filename));
-    }
-
-  signal_watcher_destroy (watcher);
-  gtk_widget_destroy (w.window);
-}
-
-static void
-test_file_chooser_button (gconstpointer data)
-{
-  const FileChooserButtonTest *setup = data;
-
-  test_file_chooser_button_with_response (setup, setup->dialog_response);
-
-  if (setup->open_dialog && setup->dialog_response == GTK_RESPONSE_CANCEL)
-    {
-      /* Runs the test again, with DELETE_EVENT (as if the user closed the
-       * dialog instead of using the Cancel button), since the button misbehaved
-       * in that case sometimes.
-       */
-      test_file_chooser_button_with_response (setup, GTK_RESPONSE_DELETE_EVENT);
-    }
-}
-
-static int
-find_accessible_action_num (AtkObject *object, const char *action_name)
-{
-  AtkAction *action_a;
-  int num_actions;
-  int i;
-
-  action_a = ATK_ACTION (object);
-
-  num_actions = atk_action_get_n_actions (action_a);
-
-  for (i = 0; i < num_actions; i++)
-    if (strcmp (atk_action_get_name (action_a, i), action_name) == 0)
-      return i;
-
-  return -1;
-}
-
-static void
-do_accessible_action (AtkObject *object, const char *action_name)
-{
-  int action_num;
-
-  action_num = find_accessible_action_num (object, action_name);
-  g_assert (action_num != -1);
-
-  atk_action_do_action (ATK_ACTION (object), action_num);
-}
-
-static void
-test_file_chooser_button_combo_box_1 (void)
-{
-  WindowAndButton w;
-  GtkWidget *combo_box;
-  AtkObject *combo_box_a;
-  AtkObject *menu_a;
-  int num_items;
-  int other_index;
-  AtkObject *item_a;
-  GtkWidget *fc_dialog;
-
-  w = create_window_and_file_chooser_button (GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-
-  gtk_file_chooser_select_filename (GTK_FILE_CHOOSER (w.fc_button), FOLDER_NAME);
-
-  gtk_widget_show_all (w.window);
-
-  /* Get the accessible for the combo box */
-
-  combo_box = find_child_widget_with_atk_role (GTK_WIDGET (w.fc_button), ATK_ROLE_COMBO_BOX);
-  combo_box_a = gtk_widget_get_accessible (combo_box);
-
-  /* Press the combo box to bring up the menu */
-
-  do_accessible_action (combo_box_a, "press");
-  sleep_in_main_loop (); /* have to wait because bringing up the menu is asynchronous... */
-
-  /* Get the menu from the combo box; it's the first child */
-
-  menu_a = atk_object_ref_accessible_child (combo_box_a, 0);
-  g_assert (atk_object_get_role (menu_a) == ATK_ROLE_MENU);
-
-  /* Check that the last item in the menu is the "Other…" one */
-
-  num_items = atk_object_get_n_accessible_children (menu_a);
-  g_assert (num_items > 0);
-
-  other_index = num_items - 1;
-
-  item_a = atk_object_ref_accessible_child (menu_a, other_index);
-  g_assert_cmpstr (atk_object_get_name (item_a), ==, "Other…");  /* FIXME: how do we translate this? */
-
-  /* Activate the item */
-
-  do_accessible_action (item_a, "click");
-
-  /* Cancel the dialog */
-
-  sleep_in_main_loop ();
-  fc_dialog = get_file_chooser_dialog_from_button (GTK_FILE_CHOOSER_BUTTON (w.fc_button));
-
-  gtk_dialog_response (GTK_DIALOG (fc_dialog), GTK_RESPONSE_CANCEL);
-
-  /* Now check the selection in the combo box */
-  check_that_basename_is_shown (GTK_FILE_CHOOSER_BUTTON (w.fc_button), FOLDER_NAME);
-
-  gtk_widget_destroy (w.window);
-}
-
-static void
-setup_file_chooser_button_combo_box_tests (void)
-{
-  g_test_add_func ("/GtkFileChooserButton/combo_box-1", test_file_chooser_button_combo_box_1);
-}
-
-static FileChooserButtonTest button_tests[] =
-  {
-    /* OPEN tests without dialog */
-
-    {
-      "open-1",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      NULL, 			/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      0,			/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "open-2",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      FILE_NAME, 		/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      0,			/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FILE_NAME			/* final_filename */
-    },
-    {
-      "open-3",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      NULL,	 		/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FILE_NAME,		/* tweak_filename */
-      0,			/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FILE_NAME			/* final_filename */
-    },
-    {
-      "open-4",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      FILE_NAME, 		/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FILE_NAME_2,		/* tweak_filename */
-      0,			/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FILE_NAME_2		/* final_filename */
-    },
-    {
-      "open-5",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,	 		/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      0,			/* dialog_response */
-      FALSE,			/* unselect_all */
-      FOLDER_NAME,		/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "open-6",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,	 		/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      FOLDER_NAME_2,		/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      0,			/* dialog_response */
-      FALSE,			/* unselect_all */
-      FOLDER_NAME_2,		/* final_current_folder */
-      NULL			/* final_filename */
-    },
-
-    /* SELECT_FOLDER tests without dialog */
-
-    {
-      "select-folder-1",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      NULL, 			/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      0,			/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "select-folder-2",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      FOLDER_NAME, 		/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      0,			/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FOLDER_NAME		/* final_filename */
-    },
-    {
-      "select-folder-3",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      FOLDER_NAME, 		/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FOLDER_NAME_2,		/* tweak_filename */
-      0,			/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FOLDER_NAME_2		/* final_filename */
-    },
-    {
-      "select-folder-4",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,	 		/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      0,			/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FOLDER_NAME		/* final_filename */
-    },
-    {
-      "select-folder-5",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,	 		/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      0,			/* dialog_response */
-      FALSE,			/* unselect_all */
-      FOLDER_NAME,		/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "select-folder-6",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,	 		/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      FOLDER_NAME_2,		/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      0,			/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FOLDER_NAME_2		/* final_filename */
-    },
-    {
-      "select-folder-7",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,	 		/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      FOLDER_NAME_2,		/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      0,			/* dialog_response */
-      FALSE,			/* unselect_all */
-      FOLDER_NAME_2,		/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "select-folder-8",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,	 		/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FOLDER_NAME_2,		/* tweak_filename */
-      0,			/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FOLDER_NAME_2		/* final_filename */
-    },
-
-    /* OPEN tests with dialog, cancelled
-     *
-     * Test names are "open-dialog-cancel-A-B", where A and B can be:
-     *
-     *   A:
-     *      ni - no initial filename
-     *       i - initial filename
-     *      nf - no initial folder
-     *       f - initial folder
-     *
-     *   B:
-     *      nt - no tweaks
-     *       b - tweak button
-     *       d - tweak dialog
-     */
-
-    {
-      "open-dialog-cancel-ni-nt",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      NULL, 			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "open-dialog-cancel-ni-b",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      NULL, 			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FILE_NAME,		/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FILE_NAME			/* final_filename */
-    },
-    {
-      "open-dialog-cancel-ni-d",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      NULL, 			/* initial_filename */
-      TRUE,			/* open_dialog */
-      DIALOG,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FILE_NAME,		/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "open-dialog-cancel-i-nt",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      FILE_NAME,		/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FILE_NAME			/* final_filename */
-    },
-    {
-      "open-dialog-cancel-i-b",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      FILE_NAME,		/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FILE_NAME_2,		/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FILE_NAME_2		/* final_filename */
-    },
-    {
-      "open-dialog-cancel-i-d",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      FILE_NAME,		/* initial_filename */
-      TRUE,			/* open_dialog */
-      DIALOG,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FILE_NAME_2,		/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FILE_NAME			/* final_filename */
-    },
-    {
-      "open-dialog-cancel-nf-nt",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      NULL, 			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "open-dialog-cancel-nf-b",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      FOLDER_NAME,		/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      FOLDER_NAME,		/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "open-dialog-cancel-nf-d",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      DIALOG,			/* what_to_tweak */
-      FOLDER_NAME,		/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "open-dialog-cancel-f-nt",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      FOLDER_NAME,		/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "open-dialog-cancel-f-b",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      FOLDER_NAME_2,		/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      FOLDER_NAME_2,		/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "open-dialog-cancel-f-d",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      DIALOG,			/* what_to_tweak */
-      FOLDER_NAME_2,		/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      FOLDER_NAME,		/* final_current_folder */
-      NULL			/* final_filename */
-    },
-
-    /* SELECT_FOLDER tests with dialog, cancelled */
-
-    {
-      "select-folder-dialog-cancel-ni-nt",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      NULL, 			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "select-folder-dialog-cancel-ni-b",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FOLDER_NAME,		/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FOLDER_NAME		/* final_filename */
-    },
-    {
-      "select-folder-dialog-cancel-ni-d",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      NULL, 			/* initial_filename */
-      TRUE,			/* open_dialog */
-      DIALOG,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FOLDER_NAME,		/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "select-folder-dialog-cancel-i-nt",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      FOLDER_NAME,		/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FOLDER_NAME		/* final_filename */
-    },
-    {
-      "select-folder-dialog-cancel-i-b",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      FOLDER_NAME,		/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FOLDER_NAME_2,		/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FOLDER_NAME_2		/* final_filename */
-    },
-    {
-      "select-folder-dialog-cancel-i-d",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      FOLDER_NAME,		/* initial_filename */
-      TRUE,			/* open_dialog */
-      DIALOG,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FOLDER_NAME_2,		/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FOLDER_NAME		/* final_filename */
-    },
-    {
-      "select-folder-dialog-cancel-nf-nt",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      NULL, 			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "select-folder-dialog-cancel-nf-b",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      FOLDER_NAME,		/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      FOLDER_NAME,		/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "select-folder-dialog-cancel-nf-d",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      DIALOG,			/* what_to_tweak */
-      FOLDER_NAME,		/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "select-folder-dialog-cancel-f-nt",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      FOLDER_NAME,		/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "select-folder-dialog-cancel-f-nt-2",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FOLDER_NAME		/* final_filename */
-    },
-    {
-      "select-folder-dialog-cancel-f-b",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      FOLDER_NAME_2,		/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      FOLDER_NAME_2,		/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "select-folder-dialog-cancel-f-b-2",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FOLDER_NAME_2,		/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FOLDER_NAME_2		/* final_filename */
-    },
-    {
-      "select-folder-dialog-cancel-f-d",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      DIALOG,			/* what_to_tweak */
-      FOLDER_NAME_2,		/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      FOLDER_NAME,		/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "select-folder-dialog-cancel-f-d-2",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      DIALOG,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FOLDER_NAME_2,		/* tweak_filename */
-      GTK_RESPONSE_CANCEL,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      FOLDER_NAME,		/* final_current_folder */
-      NULL			/* final_filename */
-    },
-
-    /* OPEN tests with dialog */
-
-    {
-      "open-dialog-1",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FILE_NAME,		/* tweak_filename */
-      GTK_RESPONSE_ACCEPT,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FILE_NAME			/* final_filename */
-    },
-    {
-      "open-dialog-2",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      FILE_NAME,		/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_ACCEPT,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FILE_NAME			/* final_filename */
-    },
-    {
-      "open-dialog-3",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      FILE_NAME,		/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FILE_NAME_2,		/* tweak_filename */
-      GTK_RESPONSE_ACCEPT,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FILE_NAME_2		/* final_filename */
-    },
-    {
-      "open-dialog-4",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FILE_NAME,		/* tweak_filename */
-      GTK_RESPONSE_ACCEPT,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FILE_NAME			/* final_filename */
-    },
-
-    /* SELECT_FOLDER tests with dialog */
-
-    {
-      "select-folder-dialog-1",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      FOLDER_NAME,		/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_ACCEPT,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FOLDER_NAME		/* final_filename */
-    },
-    {
-      "select-folder-dialog-2",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      GTK_RESPONSE_ACCEPT,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FOLDER_NAME		/* final_filename */
-    },
-    {
-      "select-folder-dialog-3",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      FOLDER_NAME,		/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FOLDER_NAME_2,		/* tweak_filename */
-      GTK_RESPONSE_ACCEPT,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FOLDER_NAME_2		/* final_filename */
-    },
-    {
-      "select-folder-dialog-4",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      FOLDER_NAME,		/* initial_current_folder */
-      NULL,			/* initial_filename */
-      TRUE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FOLDER_NAME_2,		/* tweak_filename */
-      GTK_RESPONSE_ACCEPT,	/* dialog_response */
-      FALSE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      FOLDER_NAME_2		/* final_filename */
-    },
-
-    /* Unselection tests */
-    {
-      "unselect-all-1",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      NULL,			/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      0,			/* dialog_response */
-      TRUE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "unselect-all-2",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      FILE_NAME,		/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      0,			/* dialog_response */
-      TRUE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "unselect-all-3",
-      GTK_FILE_CHOOSER_ACTION_OPEN,
-      NULL,			/* initial_current_folder */
-      FILE_NAME,		/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FILE_NAME_2,		/* tweak_filename */
-      0,			/* dialog_response */
-      TRUE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "unselect-all-4",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      NULL,			/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      0,			/* dialog_response */
-      TRUE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "unselect-all-5",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      FOLDER_NAME,		/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      NULL,			/* tweak_filename */
-      0,			/* dialog_response */
-      TRUE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      NULL			/* final_filename */
-    },
-    {
-      "unselect-all-6",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      NULL,			/* initial_current_folder */
-      FOLDER_NAME,		/* initial_filename */
-      FALSE,			/* open_dialog */
-      BUTTON,			/* what_to_tweak */
-      NULL,			/* tweak_current_folder */
-      FOLDER_NAME_2,		/* tweak_filename */
-      0,			/* dialog_response */
-      TRUE,			/* unselect_all */
-      NULL,			/* final_current_folder */
-      NULL			/* final_filename */
-    },
-
-  };
-
-static void
-setup_file_chooser_button_tests (void)
-{
-  int i;
-
-  for (i = 0; i < G_N_ELEMENTS (button_tests); i++)
-    {
-      char *test_name;
-
-      test_name = make_button_test_name (&button_tests[i]);
-      g_test_add_data_func (test_name, &button_tests[i], test_file_chooser_button);
-      g_free (test_name);
-    }
-
-  setup_file_chooser_button_combo_box_tests ();
-}
-
-#ifdef BROKEN_TESTS
-struct confirm_overwrite_closure {
-  GtkWidget *chooser;
-  GtkWidget *accept_button;
-  gint confirm_overwrite_signal_emitted;
-  gchar *extension;
-};
-
-static GtkFileChooserConfirmation
-confirm_overwrite_cb (GtkFileChooser *chooser, gpointer data)
-{
-  struct confirm_overwrite_closure *closure = data;
-
-  if (g_test_verbose())
-    printf ("bling!\n");
-  closure->confirm_overwrite_signal_emitted += 1;
-
-  return GTK_FILE_CHOOSER_CONFIRMATION_ACCEPT_FILENAME;
-}
-
-static void
-overwrite_response_cb (GtkFileChooser *chooser, gint response, gpointer data)
-{
-  struct confirm_overwrite_closure *closure = data;
-  char *filename;
-
-  if (g_test_verbose())
-    printf ("plong!\n");
-
-  if (response != GTK_RESPONSE_ACCEPT)
-    return;
-
-  filename = gtk_file_chooser_get_filename (chooser);
-
-  if (!g_str_has_suffix (filename, closure->extension))
-    {
-      char *basename;
-
-      basename = g_path_get_basename (filename);
-      g_free (filename);
-
-      filename = g_strconcat (basename, closure->extension, NULL);
-      gtk_file_chooser_set_current_name (chooser, filename);
-
-      g_signal_stop_emission_by_name (chooser, "response");
-      gtk_dialog_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT);
-    }
-}
-
-static gboolean
-confirm_overwrite_timeout_cb (gpointer data)
-{
-  struct confirm_overwrite_closure *closure;
-
-  closure = data;
-  gtk_button_clicked (GTK_BUTTON (closure->accept_button));
-
-  return FALSE;
-}
-
-/* http://bugzilla.gnome.org/show_bug.cgi?id=347883 */
-static gboolean
-test_confirm_overwrite_for_path (const char *path, gboolean append_extension)
-{
-  gboolean passed;
-  struct confirm_overwrite_closure closure;
-  char *filename;
-  guint timeout_id;
-
-  passed = TRUE;
-
-  closure.extension = NULL;
-  closure.confirm_overwrite_signal_emitted = 0;
-  closure.chooser = gtk_file_chooser_dialog_new ("hello", NULL, GTK_FILE_CHOOSER_ACTION_SAVE,
-						 _("_Cancel"), GTK_RESPONSE_CANCEL,
-						 NULL);
-  closure.accept_button = gtk_dialog_add_button (GTK_DIALOG (closure.chooser),
-                                                 _("_Save"), GTK_RESPONSE_ACCEPT);
-  gtk_dialog_set_default_response (GTK_DIALOG (closure.chooser), GTK_RESPONSE_ACCEPT);
-
-  gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (closure.chooser), TRUE);
-
-  g_signal_connect (closure.chooser, "confirm-overwrite",
-		    G_CALLBACK (confirm_overwrite_cb), &closure);
-
-  if (append_extension)
-    {
-      char *extension;
-
-      filename = g_path_get_dirname (path);
-      gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (closure.chooser), filename);
-      g_free (filename);
-
-      filename = g_path_get_basename (path);
-      extension = strchr (filename, '.');
-
-      if (extension)
-        {
-          closure.extension = g_strdup (extension);
-          *extension = '\0';
-        }
-
-      gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (closure.chooser), filename);
-      g_free (filename);
-
-      g_signal_connect (closure.chooser, "response",
-                        G_CALLBACK (overwrite_response_cb), &closure);
-    }
-  else
-    {
-      gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (closure.chooser), path);
-    }
-
-  timeout_id = gdk_threads_add_timeout_full (G_MAXINT, SLEEP_DURATION, confirm_overwrite_timeout_cb, &closure, NULL);
-  gtk_dialog_run (GTK_DIALOG (closure.chooser));
-  g_source_remove (timeout_id);
-
-  filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (closure.chooser));
-  passed = passed && filename && (strcmp (filename, path) == 0);
-  g_free (filename);
-
-  gtk_widget_destroy (closure.chooser);
-
-  passed = passed && (1 == closure.confirm_overwrite_signal_emitted);
-
-  log_test (passed, "Confirm overwrite for %s", path);
-
-  return passed;
-}
-
-static void
-test_confirm_overwrite (void)
-{
-  gboolean passed = TRUE;
-
-  /* first test for a file we know will always exist */
-  passed = passed && test_confirm_overwrite_for_path ("/etc/passwd", FALSE);
-  g_assert (passed);
-  passed = passed && test_confirm_overwrite_for_path ("/etc/resolv.conf", TRUE);
-  g_assert (passed);
-}
-#endif
-
-static const GtkFileChooserAction open_actions[] = {
-  GTK_FILE_CHOOSER_ACTION_OPEN,
-  GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
-};
-
-static const GtkFileChooserAction save_actions[] = {
-  GTK_FILE_CHOOSER_ACTION_SAVE,
-  GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
-};
-
-
-#ifdef BROKEN_TESTS
-static gboolean
-has_action (const GtkFileChooserAction *actions,
-	    int n_actions,
-	    GtkFileChooserAction sought_action)
-{
-  int i;
-
-  for (i = 0; i < n_actions; i++)
-    if (actions[i] == sought_action)
-      return TRUE;
-
-  return FALSE;
-}
-
-static GtkFileChooserWidgetPrivate *
-get_widget_priv_from_dialog (GtkWidget *dialog)
-{
-  GtkFileChooserDialog *d;
-  GtkFileChooserDialogPrivate *dialog_priv;
-  GtkFileChooserWidget *chooser_widget;
-  GtkFileChooserWidgetPrivate *widget_priv;
-
-  d = GTK_FILE_CHOOSER_DIALOG (dialog);
-  dialog_priv = d->priv;
-  chooser_widget = GTK_FILE_CHOOSER_WIDGET (dialog_priv->widget);
-  if (!chooser_widget)
-    g_error ("BUG: dialog_priv->widget is not a GtkFileChooserWidget");
-
-  widget_priv = chooser_widget->priv;
-
-  return widget_priv;
-}
-
-static gboolean
-test_widgets_for_current_action (GtkFileChooserDialog *dialog,
-				 GtkFileChooserAction  expected_action)
-{
-  GtkFileChooserWidgetPrivate *priv;
-  gboolean passed;
-
-  if (gtk_file_chooser_get_action (GTK_FILE_CHOOSER (dialog)) != expected_action)
-    return FALSE;
-
-  priv = get_widget_priv_from_dialog (GTK_WIDGET (dialog));
-
-  g_assert (priv->action == expected_action);
-
-  passed = TRUE;
-
-  /* OPEN implies that the "new folder" button is hidden; otherwise it is shown */
-  if (priv->action == GTK_FILE_CHOOSER_ACTION_OPEN)
-    passed = passed && !gtk_widget_get_visible (priv->browse_new_folder_button);
-  else
-    passed = passed && gtk_widget_get_visible (priv->browse_new_folder_button);
-
-  /* Check that the widgets are present/visible or not */
-  if (has_action (open_actions, G_N_ELEMENTS (open_actions), priv->action))
-    {
-      passed = passed && (priv->save_widgets == NULL
-			  && (priv->location_mode == LOCATION_MODE_PATH_BAR
-			      ? priv->location_entry == NULL
-			      : priv->location_entry != NULL)
-			  && priv->save_folder_label == NULL
-			  && priv->save_folder_combo == NULL
-			  && priv->save_expander == NULL
-			  && GTK_IS_CONTAINER (priv->browse_widgets) && gtk_widget_is_drawable (priv->browse_widgets));
-    }
-  else if (has_action (save_actions, G_N_ELEMENTS (save_actions), priv->action))
-    {
-      /* FIXME: we can't use GTK_IS_FILE_CHOOSER_ENTRY() because it uses
-       * _gtk_file_chooser_entry_get_type(), which is a non-exported symbol.
-       * So, we just test priv->location_entry for being non-NULL
-       */
-      passed = passed && (GTK_IS_CONTAINER (priv->save_widgets) && gtk_widget_is_drawable (priv->save_widgets)
-			  && priv->location_entry != NULL && gtk_widget_is_drawable (priv->location_entry)
-			  && GTK_IS_LABEL (priv->save_folder_label) && gtk_widget_is_drawable (priv->save_folder_label)
-			  && GTK_IS_COMBO_BOX (priv->save_folder_combo) && gtk_widget_is_drawable (priv->save_folder_combo)
-			  && GTK_IS_EXPANDER (priv->save_expander) && gtk_widget_is_drawable (priv->save_expander)
-			  && GTK_IS_CONTAINER (priv->browse_widgets));
-
-      /* FIXME: we are in a SAVE mode; test the visibility and sensitivity of
-       * the children that change depending on the state of the expander.
-       */
-    }
-  else
-    {
-      g_error ("BAD TEST: test_widgets_for_current_action() doesn't know about %s", get_action_name (priv->action));
-      passed = FALSE;
-    }
-
-  return passed;
-}
-
-typedef gboolean (* ForeachActionCallback) (GtkFileChooserDialog *dialog,
-					    GtkFileChooserAction  action,
-					    gpointer              user_data);
-
-static gboolean
-foreach_action (GtkFileChooserDialog *dialog,
-		ForeachActionCallback callback,
-		gpointer              user_data)
-{
-  GEnumClass *enum_class;
-  int i;
-
-  enum_class = g_type_class_peek (GTK_TYPE_FILE_CHOOSER_ACTION);
-  if (!enum_class)
-    g_error ("BUG: get_action_name(): no GEnumClass for GTK_TYPE_FILE_CHOOSER_ACTION");
-
-  for (i = 0; i < enum_class->n_values; i++)
-    {
-      GEnumValue *enum_value;
-      GtkFileChooserAction action;
-      gboolean passed;
-
-      enum_value = enum_class->values + i;
-      action = enum_value->value;
-
-      passed = (* callback) (dialog, action, user_data);
-      if (!passed)
-	return FALSE;
-    }
-
-  return TRUE;
-}
-
-struct action_closure {
-  GtkFileChooserAction from_action;
-};
-
-static gboolean
-switch_from_to_action_cb (GtkFileChooserDialog *dialog,
-			  GtkFileChooserAction  action,
-			  gpointer              user_data)
-{
-  struct action_closure *closure;
-  gboolean passed;
-
-  closure = user_data;
-
-  gtk_file_chooser_set_action (GTK_FILE_CHOOSER (dialog), closure->from_action);
-
-  passed = test_widgets_for_current_action (dialog, closure->from_action);
-  log_test (passed, "switch_from_to_action_cb(): reset to action %s", get_action_name (closure->from_action));
-  if (!passed)
-    return FALSE;
-
-  gtk_file_chooser_set_action (GTK_FILE_CHOOSER (dialog), action);
-
-  passed = test_widgets_for_current_action (dialog, action);
-  log_test (passed, "switch_from_to_action_cb(): transition from %s to %s",
-	    get_action_name (closure->from_action),
-	    get_action_name (action));
-  return passed;
-}
-
-static gboolean
-switch_from_action_cb (GtkFileChooserDialog *dialog,
-		       GtkFileChooserAction  action,
-		       gpointer              user_data)
-{
-  struct action_closure closure;
-
-  closure.from_action = action;
-
-  return foreach_action (dialog, switch_from_to_action_cb, &closure);
-}
-
-static void
-test_action_widgets (void)
-{
-  GtkWidget *dialog;
-  GtkFileChooserAction action;
-  gboolean passed;
-
-  dialog = gtk_file_chooser_dialog_new ("Test file chooser",
-					NULL,
-					GTK_FILE_CHOOSER_ACTION_OPEN,
-					_("_Cancel"),
-					GTK_RESPONSE_CANCEL,
-					_("_OK"),
-					GTK_RESPONSE_ACCEPT,
-					NULL);
-  gtk_widget_show_now (dialog);
-
-  action = gtk_file_chooser_get_action (GTK_FILE_CHOOSER (dialog));
-
-  passed = test_widgets_for_current_action (GTK_FILE_CHOOSER_DIALOG (dialog), action);
-  log_test (passed, "test_action_widgets(): widgets for initial action %s", get_action_name (action));
-  g_assert (passed);
-
-  passed = foreach_action (GTK_FILE_CHOOSER_DIALOG (dialog), switch_from_action_cb, NULL);
-  log_test (passed, "test_action_widgets(): all transitions through property change");
-  g_assert (passed);
-
-  gtk_widget_destroy (dialog);
-}
-#endif
-
-#ifdef BROKEN_TESTS
-static gboolean
-test_reload_sequence (gboolean set_folder_before_map)
-{
-  GtkWidget *dialog;
-  GtkFileChooserWidgetPrivate *priv;
-  gboolean passed;
-  char *folder;
-  char *current_working_dir;
-
-  passed = TRUE;
-
-  current_working_dir = g_get_current_dir ();
-
-  dialog = gtk_file_chooser_dialog_new ("Test file chooser",
-					NULL,
-					GTK_FILE_CHOOSER_ACTION_OPEN,
-					_("_Cancel"),
-					GTK_RESPONSE_CANCEL,
-					_("_OK"),
-					GTK_RESPONSE_ACCEPT,
-					NULL);
-  priv = get_widget_priv_from_dialog (dialog);
-
-  if (set_folder_before_map)
-    {
-      gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), g_get_home_dir ());
-
-      wait_for_idle ();
-
-      passed = passed && (priv->current_folder != NULL
-			  && priv->browse_files_model != NULL
-			  && (priv->load_state == LOAD_PRELOAD || priv->load_state == LOAD_LOADING || priv->load_state == LOAD_FINISHED)
-			  && priv->reload_state == RELOAD_HAS_FOLDER
-			  && (priv->load_state == LOAD_PRELOAD ? (priv->load_timeout_id != 0) : TRUE)
-			  && ((priv->load_state == LOAD_LOADING || priv->load_state == LOAD_FINISHED)
-			      ? (priv->load_timeout_id == 0 && priv->sort_model != NULL)
-			      : TRUE));
-
-      wait_for_idle ();
-
-      folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
-      passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
-      g_free (folder);
-    }
-  else
-    {
-      /* Initially, no folder is not loaded or pending */
-      passed = passed && (priv->current_folder == NULL
-			  && priv->sort_model == NULL
-			  && priv->browse_files_model == NULL
-			  && priv->load_state == LOAD_EMPTY
-			  && priv->reload_state == RELOAD_EMPTY
-			  && priv->load_timeout_id == 0);
-
-      wait_for_idle ();
-
-      folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
-      passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
-    }
-
-  log_test (passed, "test_reload_sequence(): initial status");
-
-  /* After mapping, it is loading some folder, either the one that was explicitly set or the default one */
-
-  gtk_widget_show_now (dialog);
-
-  wait_for_idle ();
-
-  passed = passed && (priv->current_folder != NULL
-		      && priv->browse_files_model != NULL
-		      && (priv->load_state == LOAD_PRELOAD || priv->load_state == LOAD_LOADING || priv->load_state == LOAD_FINISHED)
-		      && priv->reload_state == RELOAD_HAS_FOLDER
-		      && (priv->load_state == LOAD_PRELOAD ? (priv->load_timeout_id != 0) : TRUE)
-		      && ((priv->load_state == LOAD_LOADING || priv->load_state == LOAD_FINISHED)
-			  ? (priv->load_timeout_id == 0 && priv->sort_model != NULL)
-			  : TRUE));
-
-  folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
-  if (set_folder_before_map)
-    passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
-  else
-    passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
-
-  g_free (folder);
-
-  log_test (passed, "test_reload_sequence(): status after map");
-
-  /* Unmap it; we should still have a folder */
-
-  gtk_widget_hide (dialog);
-
-  wait_for_idle ();
-
-  passed = passed && (priv->current_folder != NULL
-		      && priv->browse_files_model != NULL
-		      && (priv->load_state == LOAD_PRELOAD || priv->load_state == LOAD_LOADING || priv->load_state == LOAD_FINISHED)
-		      && (priv->load_state == LOAD_PRELOAD ? (priv->load_timeout_id != 0) : TRUE)
-		      && ((priv->load_state == LOAD_LOADING || priv->load_state == LOAD_FINISHED)
-			  ? (priv->load_timeout_id == 0 && priv->sort_model != NULL)
-			  : TRUE));
-
-  folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
-  if (set_folder_before_map)
-    passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
-  else
-    passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
-
-  g_free (folder);
-
-  log_test (passed, "test_reload_sequence(): status after unmap");
-
-  /* Map it again! */
-
-  gtk_widget_show_now (dialog);
-
-  wait_for_idle ();
-
-  passed = passed && (priv->current_folder != NULL
-		      && priv->browse_files_model != NULL
-		      && (priv->load_state == LOAD_PRELOAD || priv->load_state == LOAD_LOADING || priv->load_state == LOAD_FINISHED)
-		      && priv->reload_state == RELOAD_HAS_FOLDER
-		      && (priv->load_state == LOAD_PRELOAD ? (priv->load_timeout_id != 0) : TRUE)
-		      && ((priv->load_state == LOAD_LOADING || priv->load_state == LOAD_FINISHED)
-			  ? (priv->load_timeout_id == 0 && priv->sort_model != NULL)
-			  : TRUE));
-
-  folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
-  if (set_folder_before_map)
-    passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
-  else
-    passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
-
-  g_free (folder);
-
-  log_test (passed, "test_reload_sequence(): status after re-map");
-
-  gtk_widget_destroy (dialog);
-  g_free (current_working_dir);
-
-  return passed;
-}
-
-static void
-test_reload (void)
-{
-  gboolean passed;
-
-  passed = test_reload_sequence (FALSE);
-  log_test (passed, "test_reload(): create and use the default folder");
-  g_assert (passed);
-
-  passed = test_reload_sequence (TRUE);
-  log_test (passed, "test_reload(): set a folder explicitly before mapping");
-  g_assert (passed);
-}
-
-static gboolean
-test_button_folder_states_for_action (GtkFileChooserAction action, gboolean use_dialog, gboolean set_folder_on_dialog)
-{
-  gboolean passed;
-  GtkWidget *window;
-  GtkWidget *button;
-  char *folder;
-  GtkWidget *dialog;
-  char *current_working_dir;
-  gboolean must_have_cwd;
-
-  passed = TRUE;
-
-  current_working_dir = g_get_current_dir ();
-  must_have_cwd = !(use_dialog && set_folder_on_dialog);
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-  if (use_dialog)
-    {
-      dialog = gtk_file_chooser_dialog_new ("Test", NULL, action,
-					    _("_Cancel"), GTK_RESPONSE_CANCEL,
-					    _("_OK"), GTK_RESPONSE_ACCEPT,
-					    NULL);
-      button = gtk_file_chooser_button_new_with_dialog (dialog);
-
-      if (set_folder_on_dialog)
-	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), g_get_home_dir ());
-    }
-  else
-    {
-      button = gtk_file_chooser_button_new ("Test", action);
-      dialog = NULL; /* keep gcc happy */
-    }
-
-  gtk_container_add (GTK_CONTAINER (window), button);
-
-  /* Pre-map; no folder is set */
-  wait_for_idle ();
-
-  folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (button));
-  if (must_have_cwd)
-    passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
-  else
-    passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
-
-  log_test (passed, "test_button_folder_states_for_action(): %s, use_dialog=%d, set_folder_on_dialog=%d, pre-map, %s",
-	    get_action_name (action),
-	    use_dialog,
-	    set_folder_on_dialog,
-	    must_have_cwd ? "must have $cwd" : "must have explicit folder");
-
-  /* Map; folder should be set */
-
-  gtk_widget_show_all (window);
-  gtk_widget_show_now (window);
-
-  wait_for_idle ();
-
-  folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (button));
-
-  if (must_have_cwd)
-    passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
-  else
-    passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
-
-  log_test (passed, "test_button_folder_states_for_action(): %s, use_dialog=%d, set_folder_on_dialog=%d, mapped, %s",
-	    get_action_name (action),
-	    use_dialog,
-	    set_folder_on_dialog,
-	    must_have_cwd ? "must have $cwd" : "must have explicit folder");
-  g_free (folder);
-
-  /* Unmap; folder should be set */
-
-  gtk_widget_hide (window);
-  wait_for_idle ();
-  folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (button));
-
-  if (must_have_cwd)
-    passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
-  else
-    passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
-
-  log_test (passed, "test_button_folder_states_for_action(): %s, use_dialog=%d, set_folder_on_dialog=%d, unmapped, %s",
-	    get_action_name (action),
-	    use_dialog,
-	    set_folder_on_dialog,
-	    must_have_cwd ? "must have $cwd" : "must have explicit folder");
-  g_free (folder);
-
-  /* Re-map; folder should be set */
-
-  gtk_widget_show_now (window);
-  folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (button));
-
-  if (must_have_cwd)
-    passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
-  else
-    passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
-  wait_for_idle ();
-  log_test (passed, "test_button_folder_states_for_action(): %s, use_dialog=%d, set_folder_on_dialog=%d, re-mapped, %s",
-	    get_action_name (action),
-	    use_dialog,
-	    set_folder_on_dialog,
-	    must_have_cwd ? "must have $cwd" : "must have explicit folder");
-  g_free (folder);
-
-  g_free (current_working_dir);
-
-  gtk_widget_destroy (window);
-
-  return passed;
-}
-
-static void
-test_button_folder_states (void)
-{
-  /* GtkFileChooserButton only supports OPEN and SELECT_FOLDER */
-  static const GtkFileChooserAction actions_to_test[] = {
-    GTK_FILE_CHOOSER_ACTION_OPEN,
-    GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
-  };
-  gboolean passed;
-  int i;
-
-  passed = TRUE;
-
-  for (i = 0; i < G_N_ELEMENTS (actions_to_test); i++)
-    {
-      passed = passed && test_button_folder_states_for_action (actions_to_test[i], FALSE, FALSE);
-      g_assert (passed);
-      passed = passed && test_button_folder_states_for_action (actions_to_test[i], TRUE, FALSE);
-      g_assert (passed);
-      passed = passed && test_button_folder_states_for_action (actions_to_test[i], TRUE, TRUE);
-      g_assert (passed);
-      log_test (passed, "test_button_folder_states(): action %s", get_action_name (actions_to_test[i]));
-    }
-
-  log_test (passed, "test_button_folder_states(): all supported actions");
-}
-
-static void
-test_folder_switch_and_filters (void)
-{
-  gboolean passed;
-  char *cwd;
-  char *base_dir;
-  GFile *cwd_file;
-  GFile *base_dir_file;
-  GtkWidget *dialog;
-  GtkFileFilter *all_filter;
-  GtkFileFilter *txt_filter;
-  GtkFileChooserWidgetPrivate *priv;
-
-  passed = TRUE;
-
-  cwd = g_get_current_dir ();
-  base_dir = g_build_filename (cwd, "file-chooser-test-dir", NULL);
-
-  dialog = gtk_file_chooser_dialog_new ("Test", NULL, GTK_FILE_CHOOSER_ACTION_OPEN,
-					_("_Cancel"), GTK_RESPONSE_CANCEL,
-					_("_OK"), GTK_RESPONSE_ACCEPT,
-					NULL);
-  priv = get_widget_priv_from_dialog (dialog);
-
-  cwd_file = g_file_new_for_path (cwd);
-  base_dir_file = g_file_new_for_path (base_dir);
-
-  passed = passed && gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), base_dir);
-  g_assert (passed);
-
-  /* All files filter */
-
-  all_filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (all_filter, "All files");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), all_filter);
-
-  /* *.txt filter */
-
-  txt_filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (all_filter, "*.txt");
-  gtk_file_filter_add_pattern (txt_filter, "*.txt");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), txt_filter);
-
-  /* Test filter set */
-
-  gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), all_filter);
-  passed = passed && (gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (dialog)) == all_filter);
-  g_assert (passed);
-
-  gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), txt_filter);
-  passed = passed && (gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (dialog)) == txt_filter);
-  log_test (passed, "test_folder_switch_and_filters(): set and get filter");
-  g_assert (passed);
-
-  gtk_widget_show (dialog);
-
-  /* Test that filter is unchanged when we switch folders */
-
-  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), cwd);
-  sleep_in_main_loop ();
-  passed = passed && (gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (dialog)) == txt_filter);
-  g_assert (passed);
-
-  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), base_dir);
-  sleep_in_main_loop ();
-
-  g_signal_emit_by_name (priv->browse_path_bar, "path-clicked",
-			 cwd_file,
-			 base_dir_file,
-			 FALSE);
-  sleep_in_main_loop ();
-  passed = passed && (gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (dialog)) == txt_filter);
-  log_test (passed, "test_folder_switch_and_filters(): filter after changing folder");
-  g_assert (passed);
-
-  /* cleanups */
-  g_free (cwd);
-  g_free (base_dir);
-  g_object_unref (cwd_file);
-  g_object_unref (base_dir_file);
-
-  gtk_widget_destroy (dialog);
-
-  log_test (passed, "test_folder_switch_and_filters(): all filter tests");
-}
-#endif
-
-int
-main (int    argc,
-      char **argv)
-{
-  /* initialize test program */
-  gtk_test_init (&argc, &argv);
-
-  /* Register tests */
-
-  setup_file_chooser_button_tests ();
-#ifdef BROKEN_TESTS
-  setup_set_filename_tests ();
-  setup_set_current_name_tests ();
-
-  g_test_add_func ("/GtkFileChooser/confirm_overwrite", test_confirm_overwrite);
-  g_test_add_func ("/GtkFileChooser/action_widgets", test_action_widgets);
-  g_test_add_func ("/GtkFileChooser/reload", test_reload);
-  g_test_add_func ("/GtkFileChooser/button_folder_states", test_button_folder_states);
-  g_test_add_func ("/GtkFileChooser/folder_switch_and_filters", test_folder_switch_and_filters);
-#endif
-
-  /* run and check selected tests */
-  return g_test_run();
-}
diff --git a/testsuite/gtk/testing.c b/testsuite/gtk/testing.c
deleted file mode 100644
index 7d59bd1d1d..0000000000
--- a/testsuite/gtk/testing.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/* Gtk+ testing utilities
- * Copyright (C) 2007 Imendio AB
- * Authors: Tim Janik
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <string.h>
-#include <math.h>
-
-/* Use a keyval that requires Shift to be active (in typical layouts)
- * like GDK_KEY_ampersand, which is '<shift>6'
- */
-#define KEYVAL_THAT_REQUIRES_SHIFT GDK_KEY_ampersand
-
-
-/* --- test functions --- */
-static void
-test_button_clicks (void)
-{
-  int a = 0, b = 0, c = 0;
-  GtkWidget *window = gtk_test_display_button_window ("Test Window",
-                                                      "Test: gtk_test_widget_click",
-                                                      "IgnoreMe1", &a,
-                                                      "ClickMe", &b,
-                                                      "IgnoreMe2", &c,
-                                                      NULL);
-  GtkWidget *button = gtk_test_find_widget (window, "*Click*", GTK_TYPE_BUTTON);
-  gboolean simsuccess;
-  g_assert (button != NULL);
-  simsuccess = gtk_test_widget_click (button, 1, 0);
-  g_assert (simsuccess == TRUE);
-  while (gtk_events_pending ())
-    gtk_main_iteration ();
-  g_assert (a == 0);
-  g_assert (b > 0);
-  g_assert (c == 0);
-}
-
-static void
-test_button_keys (void)
-{
-  int a = 0, b = 0, c = 0;
-  GtkWidget *window = gtk_test_display_button_window ("Test Window",
-                                                      "Test: gtk_test_widget_send_key",
-                                                      "IgnoreMe1", &a,
-                                                      "ClickMe", &b,
-                                                      "IgnoreMe2", &c,
-                                                      NULL);
-  GtkWidget *button = gtk_test_find_widget (window, "*Click*", GTK_TYPE_BUTTON);
-  gboolean simsuccess;
-  g_assert (button != NULL);
-  gtk_widget_grab_focus (button);
-  g_assert (gtk_widget_has_focus (button));
-  simsuccess = gtk_test_widget_send_key (button, GDK_KEY_Return, 0);
-  g_assert (simsuccess == TRUE);
-  while (gtk_events_pending ())
-    gtk_main_iteration ();
-  g_assert (a == 0);
-  g_assert (b > 0);
-  g_assert (c == 0);
-}
-
-static gboolean
-store_last_key_release (GtkWidget   *widget,
-                        GdkEventKey *event,
-                        gpointer     user_data)
-{
-  *((gint *)user_data) = event->keyval;
-  return FALSE;
-}
-
-static void
-test_send_shift_key (void)
-{
-  GtkWidget *window = gtk_test_display_button_window ("Test Window",
-                                                      "Test: test_send_shift_key()",
-                                                      "IgnoreMe1", NULL,
-                                                      "SendMeKeys", NULL,
-                                                      "IgnoreMe2", NULL,
-                                                      NULL);
-  GtkWidget *button = gtk_test_find_widget (window, "SendMeKeys", GTK_TYPE_BUTTON);
-  gint last_key_release = 0;
-  gboolean simsuccess;
-  g_assert (button != NULL);
-  g_signal_connect (button, "key-release-event",
-                    G_CALLBACK (store_last_key_release),
-                    &last_key_release);
-  gtk_widget_grab_focus (button);
-  g_assert (gtk_widget_has_focus (button));
-  simsuccess = gtk_test_widget_send_key (button, KEYVAL_THAT_REQUIRES_SHIFT, 0 /*modifiers*/);
-  g_assert (simsuccess == TRUE);
-  while (gtk_events_pending ())
-    gtk_main_iteration ();
-  g_assert_cmpint (KEYVAL_THAT_REQUIRES_SHIFT, ==, last_key_release);
-}
-
-static void
-test_slider_ranges (void)
-{
-  GtkWidget *child;
-  GtkWidget *window = gtk_test_create_simple_window ("Test Window", "Test: gtk_test_warp_slider");
-  GtkWidget *hscale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
-                                                -50, +50, 5);
-
-  child = gtk_bin_get_child (GTK_BIN (window));
-  gtk_container_add (GTK_CONTAINER (child), hscale);
-  gtk_widget_show (hscale);
-  gtk_widget_show_now (window);
-  while (gtk_events_pending ())
-    gtk_main_iteration ();
-  gtk_test_slider_set_perc (hscale, 0.0);
-  while (gtk_events_pending ())
-    gtk_main_iteration ();
-  g_assert (gtk_test_slider_get_value (hscale) == -50);
-  gtk_test_slider_set_perc (hscale, 50.0);
-  while (gtk_events_pending ())
-    gtk_main_iteration ();
-  g_assert (fabs (gtk_test_slider_get_value (hscale)) < 0.0001);
-  gtk_test_slider_set_perc (hscale, 100.0);
-  while (gtk_events_pending ())
-    gtk_main_iteration ();
-  g_assert (gtk_test_slider_get_value (hscale) == +50.0);
-}
-
-static void
-test_text_access (void)
-{
-  const int N_WIDGETS = 3;
-  GtkWidget *widgets[N_WIDGETS];
-  int i = 0;
-  widgets[i++] = gtk_test_create_widget (GTK_TYPE_LABEL, NULL);
-  widgets[i++] = gtk_test_create_widget (GTK_TYPE_ENTRY, NULL);
-  widgets[i++] = gtk_test_create_widget (GTK_TYPE_TEXT_VIEW, NULL);
-  g_assert (i == N_WIDGETS);
-  for (i = 0; i < N_WIDGETS; i++)
-    gtk_test_text_set (widgets[i], "foobar");
-  for (i = 0; i < N_WIDGETS; i++)
-    {
-      gchar *text  = gtk_test_text_get (widgets[i]);
-      g_assert (strcmp (text, "foobar") == 0);
-      g_free (text);
-    }
-  for (i = 0; i < N_WIDGETS; i++)
-    gtk_test_text_set (widgets[i], "");
-  for (i = 0; i < N_WIDGETS; i++)
-    {
-      gchar *text  = gtk_test_text_get (widgets[i]);
-      g_assert (strcmp (text, "") == 0);
-      g_free (text);
-    }
-}
-
-static void
-test_xserver_sync (void)
-{
-  GtkWidget *window = gtk_test_create_simple_window ("Test Window", "Test: test_xserver_sync");
-  GtkWidget *darea = gtk_drawing_area_new ();
-  GtkWidget *child;
-  GdkWindow *gdk_window;
-  GTimer *gtimer = g_timer_new();
-  gint sync_is_slower = 0, repeat = 5;
-
-  child = gtk_bin_get_child (GTK_BIN (window));
-  //gdk_window = gtk_widget_get_window (darea);
-
-  gtk_widget_set_size_request (darea, 320, 200);
-  gtk_container_add (GTK_CONTAINER (child), darea);
-  gtk_widget_show (darea);
-  gtk_widget_show_now (window);
-
-  while (repeat--)
-    {
-      gint i, many = 200;
-      double nosync_time, sync_time;
-      cairo_t *cr;
-
-      while (gtk_events_pending ())
-        gtk_main_iteration ();
-      gdk_window = gtk_widget_get_window (darea);
-      cr = gdk_cairo_create (gdk_window);
-      cairo_set_source_rgba (cr, 0, 1, 0, 0.1);
-      /* run a number of consecutive drawing requests, just using drawing queue */
-      g_timer_start (gtimer);
-      for (i = 0; i < many; i++)
-        {
-          cairo_paint (cr);
-        }
-      g_timer_stop (gtimer);
-      nosync_time = g_timer_elapsed (gtimer, NULL);
-      gdk_flush();
-      while (gtk_events_pending ())
-        gtk_main_iteration ();
-      g_timer_start (gtimer);
-      /* run a number of consecutive drawing requests with intermediate drawing syncs */
-      for (i = 0; i < many; i++)
-        {
-          cairo_paint (cr);
-          gdk_test_render_sync (gdk_window);
-        }
-      g_timer_stop (gtimer);
-      sync_time = g_timer_elapsed (gtimer, NULL);
-      sync_is_slower += sync_time > nosync_time * 1.5;
-    }
-  g_timer_destroy (gtimer);
-  g_assert (sync_is_slower > 0);
-}
-
-static void
-test_spin_button_arrows (void)
-{
-  GtkWidget *child;
-  GtkWidget *window = gtk_test_create_simple_window ("Test Window", "Test: test_spin_button_arrows");
-  GtkWidget *spinner = gtk_spin_button_new_with_range (0, 100, 5);
-  gboolean simsuccess;
-  double oldval, newval;
-
-  child = gtk_bin_get_child (GTK_BIN (window));
-  gtk_container_add (GTK_CONTAINER (child), spinner);
-  gtk_widget_show (spinner);
-  gtk_widget_show_now (window);
-  gtk_test_slider_set_perc (spinner, 0);
-  /* check initial spinner value */
-  oldval = gtk_test_slider_get_value (spinner);
-  g_assert (oldval == 0);
-  /* check simple increment */
-  simsuccess = gtk_test_spin_button_click (GTK_SPIN_BUTTON (spinner), 1, TRUE);
-  g_assert (simsuccess == TRUE);
-  while (gtk_events_pending ()) /* let spin button timeout/idle handlers update */
-    gtk_main_iteration ();
-  newval = gtk_test_slider_get_value (spinner);
-  g_assert (newval > oldval);
-  /* check maximum warp */
-  simsuccess = gtk_test_spin_button_click (GTK_SPIN_BUTTON (spinner), 3, TRUE);
-  g_assert (simsuccess == TRUE);
-  while (gtk_events_pending ()) /* let spin button timeout/idle handlers update */
-    gtk_main_iteration ();
-  oldval = gtk_test_slider_get_value (spinner);
-  g_assert (oldval == 100);
-  /* check simple decrement */
-  oldval = gtk_test_slider_get_value (spinner);
-  simsuccess = gtk_test_spin_button_click (GTK_SPIN_BUTTON (spinner), 1, FALSE);
-  g_assert (simsuccess == TRUE);
-  while (gtk_events_pending ()) /* let spin button timeout/idle handlers update */
-    gtk_main_iteration ();
-  newval = gtk_test_slider_get_value (spinner);
-  g_assert (newval < oldval);
-  /* check minimum warp */
-  simsuccess = gtk_test_spin_button_click (GTK_SPIN_BUTTON (spinner), 3, FALSE);
-  g_assert (simsuccess == TRUE);
-  while (gtk_events_pending ()) /* let spin button timeout/idle handlers update */
-    gtk_main_iteration ();
-  oldval = gtk_test_slider_get_value (spinner);
-  g_assert (oldval == 0);
-}
-
-static void
-test_statusbar_remove_all (void)
-{
-  GtkWidget *statusbar;
-
-  g_test_bug ("640487");
-
-  statusbar = gtk_statusbar_new ();
-  g_object_ref_sink (statusbar);
-
-  gtk_statusbar_push (GTK_STATUSBAR (statusbar), 1, "bla");
-  gtk_statusbar_push (GTK_STATUSBAR (statusbar), 1, "bla");
-  gtk_statusbar_remove_all (GTK_STATUSBAR (statusbar), 1);
-
-  g_object_unref (statusbar);
-}
-
-int
-main (int   argc,
-      char *argv[])
-{
-  gtk_test_init (&argc, &argv);
-  g_test_bug_base ("http://bugzilla.gnome.org/");
-  gtk_test_register_all_types();
-
-  g_test_add_func ("/tests/statusbar-remove-all", test_statusbar_remove_all);
-  g_test_add_func ("/ui-tests/text-access", test_text_access);
-  g_test_add_func ("/ui-tests/button-clicks", test_button_clicks);
-  g_test_add_func ("/ui-tests/keys-events", test_button_keys);
-  g_test_add_func ("/ui-tests/send-shift-key", test_send_shift_key);
-  g_test_add_func ("/ui-tests/slider-ranges", test_slider_ranges);
-  g_test_add_func ("/ui-tests/xserver-sync", test_xserver_sync);
-  g_test_add_func ("/ui-tests/spin-button-arrows", test_spin_button_arrows);
-
-  return g_test_run();
-}
diff --git a/testsuite/gtk/treeview-scrolling.c b/testsuite/gtk/treeview-scrolling.c
deleted file mode 100644
index 5973d45a4f..0000000000
--- a/testsuite/gtk/treeview-scrolling.c
+++ /dev/null
@@ -1,1473 +0,0 @@
-/* Scrolling test suite for GtkTreeView
- * Copyright (C) 2006  Kristian Rietveld  <kris@gtk.org>
- * Copyright (C) 2007  Imendio AB,  Kristian Rietveld
- * Copyright (C) 2009  Kristian Rietveld  <kris@gtk.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* Original v1.0 -- December 26, 2006
- * Conversion to GLib/GTK+ test framework during December, 2007
- */
-
-
-#include <gtk/gtk.h>
-#include <unistd.h>
-#include <math.h>
-
-#define VIEW_WIDTH 320
-#define VIEW_HEIGHT 240
-
-#define N_ROWS 1000
-#define BIG_N_ROWS N_ROWS * 100
-
-/*
- * To do:
- *   - Test that nothing happens if the row is fully visible.
- *   - The tests are dependent on the theme/font (size measurements,
- *     chosen paths).
- *   - Convert to proper GTK+ coding style.
- *   - Briefly test scrolling in tree stores as well.
- *
- * Important:
- *   - For tests with "mixed height" models, you must ensure that
- *     there are only two heights used in total and that the rows with
- *     height A and B are strictly alternating.  The model creation
- *     functions already do this for you, but take this into account
- *     when you write a unit test that adds rows to such a created
- *     model, you must follow this rule otherwise things will break.
- */
-
-
-/* Constructing models for testing */
-static GtkTreeModel *
-create_model (gboolean constant)
-{
-	int i;
-
-	GtkTreeIter iter;
-	GtkListStore *store;
-
-	store = gtk_list_store_new (1, G_TYPE_STRING);
-
-	for (i = 0; i < N_ROWS; i++) {
-		gtk_list_store_append (store, &iter);
-		if (constant || i % 2 == 0)
-			gtk_list_store_set (store, &iter, 0, "Foo", -1);
-		else
-			gtk_list_store_set (store, &iter, 0, "Sliff\nSloff\nBleh", -1);
-	}
-
-	return GTK_TREE_MODEL (store);
-}
-
-static GtkTreeModel *
-create_big_model (gboolean constant)
-{
-	int i;
-
-	GtkTreeIter iter;
-	GtkListStore *store;
-
-	store = gtk_list_store_new (1, G_TYPE_STRING);
-
-	for (i = 0; i < BIG_N_ROWS; i++) {
-		gtk_list_store_append (store, &iter);
-		if (constant || i % 2 == 0)
-			gtk_list_store_set (store, &iter, 0, "Foo", -1);
-		else
-			gtk_list_store_set (store, &iter, 0, "Sliff\nSloff\nBleh", -1);
-	}
-
-	return GTK_TREE_MODEL (store);
-}
-
-/*
- * Fixtures
- */
-
-typedef struct
-{
-	GtkWidget *window;
-	GtkWidget *tree_view;
-}
-ScrollFixture;
-
-static void
-scroll_fixture_setup (ScrollFixture *fixture,
-		      GtkTreeModel  *model,
-		      gconstpointer  test_data)
-{
-	GtkWidget *sw;
-	GtkCellRenderer *renderer;
-	GtkTreeViewColumn *column;
-
-	fixture->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	sw = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_ALWAYS);
-	gtk_container_add (GTK_CONTAINER (fixture->window), sw);
-
-	fixture->tree_view = gtk_tree_view_new_with_model (model);
-	g_object_unref (model);
-	gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (sw), VIEW_WIDTH);
-	gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), VIEW_HEIGHT);
-	gtk_widget_set_size_request (fixture->tree_view, VIEW_WIDTH, VIEW_HEIGHT);
-
-	renderer = gtk_cell_renderer_text_new ();
-	g_object_set (renderer, "editable", TRUE, NULL);
-	column = gtk_tree_view_column_new_with_attributes ("Title",
-							   renderer,
-							   "text", 0,
-							   NULL);
-
-	gtk_tree_view_append_column (GTK_TREE_VIEW (fixture->tree_view), column);
-	gtk_container_add (GTK_CONTAINER (sw), fixture->tree_view);
-}
-
-/* sets up a fixture with a model with constant row heights */
-static void
-scroll_fixture_constant_setup (ScrollFixture *fixture,
-			       gconstpointer  test_data)
-{
-	scroll_fixture_setup (fixture, create_model (TRUE), test_data);
-}
-
-/* sets up a fixture with a model with varying row heights */
-static void
-scroll_fixture_mixed_setup (ScrollFixture *fixture,
-			    gconstpointer  test_data)
-{
-	scroll_fixture_setup (fixture, create_model (FALSE), test_data);
-}
-
-/* sets up a fixture with a large model with constant row heights */
-static void
-scroll_fixture_constant_big_setup (ScrollFixture *fixture,
-			           gconstpointer  test_data)
-{
-	scroll_fixture_setup (fixture, create_big_model (TRUE), test_data);
-}
-
-/* sets up a fixture with a large model with varying row heights */
-static void
-scroll_fixture_mixed_big_setup (ScrollFixture *fixture,
-			        gconstpointer  test_data)
-{
-	scroll_fixture_setup (fixture, create_big_model (FALSE), test_data);
-}
-
-/* sets up a fixture with only a single row for the "single row scroll" test */
-static void
-scroll_fixture_single_setup (ScrollFixture *fixture,
-			     gconstpointer  test_data)
-{
-	GtkTreeStore *store;
-	GtkTreeIter iter, child;
-
-	store = gtk_tree_store_new (1, G_TYPE_STRING);
-
-	gtk_tree_store_append (store, &iter, NULL);
-	gtk_tree_store_set (store, &iter, 0, "Foo", -1);
-
-	gtk_tree_store_append (store, &child, &iter);
-	gtk_tree_store_set (store, &child, 0, "Two\nLines", -1);
-
-	/* The teardown will also destroy the model */
-	scroll_fixture_setup (fixture, GTK_TREE_MODEL (store), test_data);
-}
-
-/* sets up a fixture with a tree store */
-static void
-scroll_fixture_tree_setup (ScrollFixture *fixture,
-			   gconstpointer   test_data)
-{
-	GtkTreeStore *store;
-	GtkTreeIter iter, child;
-	int i;
-
-	store = gtk_tree_store_new (1, G_TYPE_STRING);
-
-	gtk_tree_store_append (store, &iter, NULL);
-	gtk_tree_store_set (store, &iter, 0, "Root node", -1);
-
-	for (i = 0; i < 5; i++) {
-		gtk_tree_store_append (store, &child, &iter);
-		gtk_tree_store_set (store, &child, 0, "Child node", -1);
-	}
-
-	for (i = 0; i < 5; i++) {
-		gtk_tree_store_append (store, &iter, NULL);
-		gtk_tree_store_set (store, &iter, 0, "Other node", -1);
-	}
-
-	/* The teardown will also destroy the model */
-	scroll_fixture_setup (fixture, GTK_TREE_MODEL (store), test_data);
-}
-
-static void
-scroll_fixture_mixed_tree_setup (ScrollFixture *fixture,
-			         gconstpointer   test_data)
-{
-	GtkTreeStore *store;
-	GtkTreeIter iter, child;
-	int i;
-
-	store = gtk_tree_store_new (1, G_TYPE_STRING);
-
-	gtk_tree_store_append (store, &iter, NULL);
-	gtk_tree_store_set (store, &iter, 0, "Root\nnode", -1);
-
-	for (i = 0; i < 5; i++) {
-		gtk_tree_store_append (store, &child, &iter);
-		if (i % 2 != 0)
-			gtk_tree_store_set (store, &child, 0, "Child node", -1);
-		else
-			gtk_tree_store_set (store, &child,
-					    0, "Child\nnode", -1);
-	}
-
-	for (i = 0; i < 5; i++) {
-		gtk_tree_store_append (store, &iter, NULL);
-		if (i % 2 == 0)
-			gtk_tree_store_set (store, &iter, 0, "Other node", -1);
-		else
-			gtk_tree_store_set (store, &iter, 0, "Other\nnode", -1);
-	}
-
-	/* The teardown will also destroy the model */
-	scroll_fixture_setup (fixture, GTK_TREE_MODEL (store), test_data);
-}
-
-static void
-scroll_fixture_teardown (ScrollFixture *fixture,
-			 gconstpointer  test_data)
-{
-	gtk_widget_destroy (fixture->window);
-}
-
-/*
- * Position check and helpers.
- */
-enum Pos
-{
-	POS_TOP,
-	POS_CENTER,
-	POS_BOTTOM
-};
-
-static int
-get_row_start_for_index (GtkTreeView *tree_view, int index)
-{
-	gint height1, height2;
-	gint row_start;
-	GtkTreePath *path;
-	GdkRectangle rect;
-
-	path = gtk_tree_path_new_from_indices (0, -1);
-	gtk_tree_view_get_background_area (tree_view, path, NULL, &rect);
-	height1 = rect.height;
-
-	gtk_tree_path_next (path);
-	gtk_tree_view_get_background_area (tree_view, path, NULL, &rect);
-	height2 = rect.height;
-	gtk_tree_path_free (path);
-
-	row_start = (index / 2) * height1 + (index / 2) * height2;
-	if (index % 2)
-		row_start += height1;
-
-	return row_start;
-}
-
-static enum Pos
-get_pos_from_path (GtkTreeView   *tree_view,
-		   GtkTreePath   *path,
-		   gdouble        row_height,
-		   GtkAdjustment *vadjustment)
-{
-	int row_start;
-
-	row_start = get_row_start_for_index (tree_view,
-					     gtk_tree_path_get_indices (path)[0]);
-
-	if (row_start + row_height < gtk_adjustment_get_page_size (vadjustment))
-		return POS_TOP;
-
-	if (row_start >= gtk_adjustment_get_upper (vadjustment) - gtk_adjustment_get_page_size (vadjustment))
-		return POS_BOTTOM;
-
-	return POS_CENTER;
-}
-
-static void
-assert_position_with_align (GtkTreeView  *tree_view,
-                            enum Pos      pos,
-                            gint          row_y,
-                            gint          row_start,
-                            gdouble       row_height,
-                            gdouble       row_align)
-{
-	GtkAdjustment *vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (tree_view));
-
-	/* Switch on row-align: 0.0, 0.5, 1.0 */
-	switch ((int)(row_align * 2.)) {
-	case 0:
-		if (pos == POS_TOP || pos == POS_CENTER) {
-			/* The row in question is the first row
-			 * in the view.
-			 *    - rect.y should be zero
-			 *    - dy should be equal to the top
-			 *      y coordinate of the row.
-			 */
-			g_assert (row_y == 0);
-			g_assert (gtk_adjustment_get_value (vadjustment) == row_start);
-		} else {
-			/* The row can be anywhere at the last
-			 * page of the tree view.
-			 *   - dy is set to the start of the
-			 *     last page.
-			 */
-			g_assert (gtk_adjustment_get_value (vadjustment) == gtk_adjustment_get_upper (vadjustment) - gtk_adjustment_get_page_size (vadjustment));
-		}
-		break;
-
-	case 1:
-		/* 0.5 */
-		if (pos == POS_TOP
-		    && row_start < (gtk_adjustment_get_page_size (vadjustment) - row_height) / 2) {
-			/* For the first half of the top view we can't
-			 * center the row in the view, instead we
-			 * show the first page.
-			 *   - dy should be zero
-			 */
-			g_assert (gtk_adjustment_get_value (vadjustment) == 0);
-		} else if (pos == POS_BOTTOM
-			   && row_start + row_height >= gtk_adjustment_get_upper (vadjustment) - (gtk_adjustment_get_page_size (vadjustment) - row_height) / 2) {
-			/* For the last half of the bottom view we
-			 * can't center the row in the view, instead
-			 * we show the last page.
-			 *   - dy should be the start of the 
-			 *     last page.
-			 */
-			g_assert (gtk_adjustment_get_value (vadjustment) == gtk_adjustment_get_upper (vadjustment) - gtk_adjustment_get_page_size (vadjustment));
-		} else {
-			/* The row is located in the middle of
-			 * the view.
-			 *    - top y coordinate is equal to
-			 *      middle of the view minus
-			 *      half the height of the row.
-			 *      (ie. the row's center is at the
-			 *       center of the view).
-			 */
-			gdouble middle = (gtk_adjustment_get_page_size (vadjustment) - row_height) / 2.0;
-			g_assert (row_y == ceil (middle) || row_y == floor (middle));
-		}
-		break;
-
-	case 2:
-		/* 1.0 */
-		if (pos == POS_TOP) {
-			/* The row can be anywhere on the
-			 * first page of the tree view.
-			 *   - dy is zero.
-			 */
-			g_assert (gtk_adjustment_get_value (vadjustment) == 0);
-		} else if (pos == POS_CENTER || pos == POS_BOTTOM) {
-			/* The row is the last row visible in the
-			 * view.
-			 *   - rect.y is set to the top of the
-			 *     last row.
-			 *   - row_start is greater than page_size
-			 *     (ie we are not on the first page).
-			 *   - dy is greater than zero
-			 */
-			g_assert (row_start >= gtk_adjustment_get_page_size (vadjustment)
-			          || row_start + row_height >= gtk_adjustment_get_page_size (vadjustment));
-		        g_assert (row_y == gtk_adjustment_get_page_size (vadjustment) - row_height);
-		}
-		break;
-	}
-}
-
-static void
-assert_position_without_align (GtkTreeView *tree_view,
-                               gdouble      row_start,
-                               gdouble      row_height)
-{
-  GtkAdjustment *vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (tree_view));
-
-  /* Without align the tree view does as less work as possible,
-   * so basically we only have to check whether the row
-   * is visible on the screen.
-   */
-  g_assert (gtk_adjustment_get_value (vadjustment) <= row_start);
-  g_assert (gtk_adjustment_get_value (vadjustment) + gtk_adjustment_get_page_size (vadjustment) >= row_start + row_height);
-}
-
-static void
-test_position (GtkTreeView *tree_view,
-	       GtkTreePath *path,
-	       gboolean     use_align,
-	       gdouble      row_align)
-{
-	gint pos;
-	gchar *path_str;
-	GdkRectangle rect;
-	GtkTreeModel *model;
-	gint row_start;
-
-	/* Get the location of the path we scrolled to */
-	gtk_tree_view_get_background_area (GTK_TREE_VIEW (tree_view),
-					   path, NULL, &rect);
-
-	row_start = get_row_start_for_index (GTK_TREE_VIEW (tree_view),
-					     gtk_tree_path_get_indices (path)[0]);
-
-	/* Ugh */
-	pos = get_pos_from_path (GTK_TREE_VIEW (tree_view),
-				 path, rect.height,
-			         gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (tree_view)));
-
-	/* This is only tested for during test_single() */
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view));
-	if (gtk_tree_model_iter_n_children (model, NULL) == 1) {
-                GtkAllocation allocation;
-		GtkTreePath *tmppath;
-
-		/* Test nothing is dangling at the bottom; read
-		 * description for test_single() for more information.
-		 */
-
-		/* FIXME: hardcoded width */
-                gtk_widget_get_allocation (GTK_WIDGET (tree_view), &allocation);
-		if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tree_view), 0, allocation.height - 30, &tmppath, NULL, NULL, NULL)) {
-			g_assert_not_reached ();
-			gtk_tree_path_free (tmppath);
-		}
-	}
-
-	path_str = gtk_tree_path_to_string (path);
-	if (use_align) {
-		assert_position_with_align (tree_view, pos, rect.y,
-                                            row_start, rect.height, row_align);
-	} else {
-		assert_position_without_align (tree_view, row_start, rect.height);
-	}
-
-	g_free (path_str);
-}
-
-/*
- * Scrolling code
- */
-
-
-/* Testing scrolling to various positions with various alignments */
-static void
-scroll (ScrollFixture *fixture,
-	GtkTreePath   *path,
-	gboolean       use_align,
-	gdouble        row_align)
-{
-	gtk_tree_view_set_cursor (GTK_TREE_VIEW (fixture->tree_view), path,
-				  NULL, FALSE);
-	gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (fixture->tree_view),
-				      path, NULL,
-				      use_align, row_align, 0.0);
-
-	gtk_widget_show_all (fixture->window);
-
-        gtk_test_widget_wait_for_draw (fixture->window);
-
-	test_position (GTK_TREE_VIEW (fixture->tree_view), path,
-		       use_align, row_align);
-}
-
-static void
-scroll_no_align (ScrollFixture *fixture,
-		 gconstpointer  test_data)
-{
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new_from_string (test_data);
-	scroll (fixture, path, FALSE, 0.0);
-	gtk_tree_path_free (path);
-}
-
-static void
-scroll_align_0_0 (ScrollFixture *fixture,
-		  gconstpointer  test_data)
-{
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new_from_string (test_data);
-	scroll (fixture, path, TRUE, 0.0);
-	gtk_tree_path_free (path);
-}
-
-static void
-scroll_align_0_5 (ScrollFixture *fixture,
-		  gconstpointer  test_data)
-{
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new_from_string (test_data);
-	scroll (fixture, path, TRUE, 0.5);
-	gtk_tree_path_free (path);
-}
-
-static void
-scroll_align_1_0 (ScrollFixture *fixture,
-		  gconstpointer  test_data)
-{
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new_from_string (test_data);
-	scroll (fixture, path, TRUE, 1.0);
-	gtk_tree_path_free (path);
-}
-
-
-static void
-scroll_after_realize (ScrollFixture *fixture,
-		      GtkTreePath   *path,
-		      gboolean       use_align,
-		      gdouble        row_align)
-{
-	gtk_widget_show_all (fixture->window);
-
-        gtk_test_widget_wait_for_draw (fixture->window);
-
-	gtk_tree_view_set_cursor (GTK_TREE_VIEW (fixture->tree_view), path,
-				  NULL, FALSE);
-	gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (fixture->tree_view),
-				      path, NULL,
-				      use_align, row_align, 0.0);
-
-        gtk_test_widget_wait_for_draw (fixture->window);
-
-	test_position (GTK_TREE_VIEW (fixture->tree_view), path,
-		       use_align, row_align);
-}
-
-static void
-scroll_after_no_align (ScrollFixture *fixture,
-		       gconstpointer  test_data)
-{
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new_from_string (test_data);
-	scroll_after_realize (fixture, path, FALSE, 0.0);
-	gtk_tree_path_free (path);
-}
-
-static void
-scroll_after_align_0_0 (ScrollFixture *fixture,
-		        gconstpointer  test_data)
-{
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new_from_string (test_data);
-	scroll_after_realize (fixture, path, TRUE, 0.0);
-	gtk_tree_path_free (path);
-}
-
-static void
-scroll_after_align_0_5 (ScrollFixture *fixture,
-		        gconstpointer  test_data)
-{
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new_from_string (test_data);
-	scroll_after_realize (fixture, path, TRUE, 0.5);
-	gtk_tree_path_free (path);
-}
-
-static void
-scroll_after_align_1_0 (ScrollFixture *fixture,
-		        gconstpointer  test_data)
-{
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new_from_string (test_data);
-	scroll_after_realize (fixture, path, TRUE, 1.0);
-	gtk_tree_path_free (path);
-}
-
-
-static void
-scroll_both_realize (ScrollFixture *fixture,
-		     GtkTreePath   *path,
-		     gboolean       use_align,
-		     gdouble        row_align)
-{
-	GtkTreePath *end;
-
-	gtk_widget_show_all (fixture->window);
-
-	/* Scroll to end */
-	end = gtk_tree_path_new_from_indices (999, -1);
-
-	gtk_tree_view_set_cursor (GTK_TREE_VIEW (fixture->tree_view), end,
-				  NULL, FALSE);
-	gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (fixture->tree_view),
-				      end, NULL,
-				      use_align, row_align, 0.0);
-	gtk_tree_path_free (end);
-
-        gtk_test_widget_wait_for_draw (fixture->window);
-
-	/* Scroll to final position */
-	gtk_tree_view_set_cursor (GTK_TREE_VIEW (fixture->tree_view), path,
-				  NULL, FALSE);
-	gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (fixture->tree_view),
-				      path, NULL,
-				      use_align, row_align, 0.0);
-
-        gtk_test_widget_wait_for_draw (fixture->window);
-
-	test_position (GTK_TREE_VIEW (fixture->tree_view), path,
-		       use_align, row_align);
-}
-
-static void
-scroll_both_no_align (ScrollFixture *fixture,
-		      gconstpointer  test_data)
-{
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new_from_string (test_data);
-	scroll_both_realize (fixture, path, FALSE, 0.0);
-	gtk_tree_path_free (path);
-}
-
-static void
-scroll_both_align_0_0 (ScrollFixture *fixture,
-		       gconstpointer  test_data)
-{
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new_from_string (test_data);
-	scroll_both_realize (fixture, path, TRUE, 0.0);
-	gtk_tree_path_free (path);
-}
-
-static void
-scroll_both_align_0_5 (ScrollFixture *fixture,
-		       gconstpointer  test_data)
-{
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new_from_string (test_data);
-	scroll_both_realize (fixture, path, TRUE, 0.5);
-	gtk_tree_path_free (path);
-}
-
-static void
-scroll_both_align_1_0 (ScrollFixture *fixture,
-		       gconstpointer  test_data)
-{
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new_from_string (test_data);
-	scroll_both_realize (fixture, path, TRUE, 1.0);
-	gtk_tree_path_free (path);
-}
-
-/* Testing scrolling to a newly created row */
-static void
-create_new_row (GtkListStore *store,
-		int           n,
-		GtkTreeIter  *iter)
-{
-	switch (n) {
-		case 0:
-			/* Prepend a row */
-			gtk_list_store_prepend (store, iter);
-			break;
-
-                case 3:
-			/* Add a row in the middle of the visible area */
-			gtk_list_store_insert (store, iter, 3);
-			break;
-
-		case 4:
-			/* Add a row in the middle of the visible area */
-			gtk_list_store_insert (store, iter, 4);
-			break;
-
-                case 5:
-			/* Add a row which is not completely visible */
-			gtk_list_store_insert (store, iter, 5);
-			break;
-
-		case 8:
-			/* Add a row which is not completely visible */
-			gtk_list_store_insert (store, iter, 8);
-			break;
-
-		case 500:
-			/* Add a row in the middle */
-			gtk_list_store_insert (store, iter, 500);
-			break;
-
-		case 999:
-			/* Append a row */
-			gtk_list_store_append (store, iter);
-			break;
-	}
-
-	gtk_list_store_set (store, iter, 0, "New...", -1);
-}
-
-static void
-scroll_new_row_editing_started (GtkCellRenderer *cell,
-				GtkCellEditable *editable,
-				const char      *path,
-				gpointer         user_data)
-{
-	GtkWidget **widget = user_data;
-
-	*widget = GTK_WIDGET (editable);
-}
-
-static void
-test_editable_position (GtkWidget   *tree_view,
-			GtkWidget   *editable,
-			GtkTreePath *cursor_path)
-{
-        GtkAllocation allocation;
-	GdkRectangle rect;
-
-	gtk_tree_view_get_background_area (GTK_TREE_VIEW (tree_view),
-					   cursor_path, NULL, &rect);
-
-	/* There are all in bin_window coordinates */
-        gtk_widget_get_allocation (editable, &allocation);
-        g_assert (allocation.y == rect.y + ((rect.height - allocation.height) / 2));
-}
-
-static void
-scroll_new_row (ScrollFixture *fixture,
-		gconstpointer  test_data)
-{
-	GtkTreeIter scroll_iter;
-	GtkTreePath *scroll_path;
-	GtkTreeModel *model;
-	GList *renderers;
-	GtkTreeViewColumn *column;
-	GtkWidget *editable;
-
-	/* The aim of this test is creating a new row at several places,
-	 * and immediately put the cursor on it.  TreeView should correctly
-	 * scroll to the row and show the editable widget.
-	 *
-	 * See #81627.
-	 */
-
-	g_test_bug ("81627");
-
-	gtk_widget_show_all (fixture->window);
-
-        gtk_test_widget_wait_for_draw (fixture->window);
-
-	/* Create the new row and scroll to it */
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (fixture->tree_view));
-	create_new_row (GTK_LIST_STORE (model), GPOINTER_TO_INT (test_data),
-			&scroll_iter);
-
-	/* Set up a signal handler to acquire the editable widget */
-	column = gtk_tree_view_get_column (GTK_TREE_VIEW (fixture->tree_view), 0);
-	renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column));
-
-	g_signal_connect (G_OBJECT (renderers->data), "editing-started",
-			  G_CALLBACK (scroll_new_row_editing_started),
-			  &editable);
-
-	/* Now set the cursor on the path and start editing */
-	scroll_path = gtk_tree_model_get_path (model, &scroll_iter);
-	gtk_tree_view_set_cursor (GTK_TREE_VIEW (fixture->tree_view),
-				  scroll_path,
-				  column,
-				  TRUE);
-
-        gtk_test_widget_wait_for_draw (fixture->window);
-
-	/* Test position */
-	test_position (GTK_TREE_VIEW (fixture->tree_view), scroll_path,
-		       FALSE, 0.0);
-	test_editable_position (fixture->tree_view, editable, scroll_path);
-
-	gtk_tree_path_free (scroll_path);
-}
-
-static void
-scroll_new_row_tree (ScrollFixture *fixture,
-		     gconstpointer  test_data)
-{
-	GtkTreeModel *model;
-	GtkAdjustment *vadjustment;
-	int i;
-
-	/* The goal of this test is to append new rows at the end of a tree
-	 * store and immediately scroll to them.  If there is a parent
-	 * node with a couple of childs in the "area above" to explore,
-	 * this used to lead to unexpected results due to a bug.
-	 *
-	 * This issue has been reported by Miroslav Rajcic on
-	 * gtk-app-devel-list:
-	 * http://mail.gnome.org/archives/gtk-app-devel-list/2008-December/msg00068.html
-	 */
-
-	gtk_widget_show_all (fixture->window);
-
-	gtk_tree_view_expand_all (GTK_TREE_VIEW (fixture->tree_view));
-
-        gtk_test_widget_wait_for_draw (fixture->window);
-
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (fixture->tree_view));
-	vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (fixture->tree_view));
-
-	for (i = 0; i < 5; i++) {
-		GtkTreeIter scroll_iter;
-		GtkTreePath *scroll_path;
-
-		gtk_tree_store_append (GTK_TREE_STORE (model), &scroll_iter,
-				       NULL);
-		gtk_tree_store_set (GTK_TREE_STORE (model), &scroll_iter,
-				    0, "New node", -1);
-
-		scroll_path = gtk_tree_model_get_path (model, &scroll_iter);
-		gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (fixture->tree_view),
-					      scroll_path, NULL, FALSE, 0.0, 0.0);
-		gtk_tree_path_free (scroll_path);
-
-                gtk_test_widget_wait_for_draw (fixture->window);
-
-		/* Test position, the scroll bar must be at the end */
-		g_assert (gtk_adjustment_get_value (vadjustment) == gtk_adjustment_get_upper (vadjustment) - gtk_adjustment_get_page_size (vadjustment));
-	}
-}
-
-/* Test for GNOME bugzilla bug 359231; tests "recovery when removing a bunch of
- * rows at the bottom.
- */
-static void
-test_bug316689 (ScrollFixture *fixture,
-		gconstpointer  test_data)
-{
-	GtkTreeIter iter;
-	GtkTreePath *path;
-	GtkAdjustment *vadjustment;
-	GtkTreeModel *model;
-
-	/* The aim of this test is to scroll to the bottom of a TreeView,
-	 * remove at least one page_size of items and check if TreeView
-	 * correctly corrects the scroll bar (else they will look "broken").
-	 *
-	 * See #316689.
-	 */
-
-	g_test_bug ("316689");
-
-	/* Scroll to some place close to the end */
-	path = gtk_tree_path_new_from_indices (N_ROWS - 4, -1);
-	scroll (fixture, path, FALSE, 0.0);
-	gtk_tree_path_free (path);
-
-	/* No need for a while events pending loop here, scroll() does this for us.
-	 *
-	 * We now remove a bunch of rows, wait for events to process and then
-	 * check the adjustments to see if the TreeView gracefully recovered.
-	 */
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (fixture->tree_view));
-
-	while (gtk_tree_model_iter_nth_child (model, &iter, NULL, N_ROWS - 15))
-		gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
-
-        gtk_test_widget_wait_for_draw (fixture->window);
-
-	vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (fixture->tree_view));
-
-	g_assert (gtk_adjustment_get_value (vadjustment) + gtk_adjustment_get_page_size (vadjustment) <= gtk_adjustment_get_upper (vadjustment));
-	g_assert (gtk_adjustment_get_value (vadjustment) == gtk_adjustment_get_upper (vadjustment) - gtk_adjustment_get_page_size (vadjustment));
-}
-
-
-/* Test for GNOME bugzilla bug 359231 */
-static void
-test_bug359231 (void)
-{
-	int i;
-	int height1, height2;
-	GtkTreePath *path;
-	GtkTreeIter iter, child;
-	GtkTreeStore *store;
-	GdkRectangle rect;
-	ScrollFixture *fixture;
-
-	/* See #359231. */
-	g_test_bug ("359231");
-
-	/* Create model (GtkTreeStore in this case) */
-	store = gtk_tree_store_new (1, G_TYPE_STRING);
-
-	gtk_tree_store_append (store, &iter, NULL);
-	gtk_tree_store_set (store, &iter, 0, "Foo", -1);
-
-	for (i = 0; i < 4; i++) {
-		gtk_tree_store_append (store, &child, &iter);
-		gtk_tree_store_set (store, &child, 0, "Two\nLines", -1);
-	}
-	
-	fixture = g_new0 (ScrollFixture, 1);
-	scroll_fixture_setup (fixture, GTK_TREE_MODEL (store), NULL);
-	gtk_widget_show_all (fixture->window);
-
-        gtk_test_widget_wait_for_draw (fixture->window);
-
-	/* Prepend some rows at the top, expand */
-	gtk_tree_store_prepend (store, &iter, NULL);
-	gtk_tree_store_set (store, &iter, 0, "Foo", -1);
-
-	gtk_tree_store_prepend (store, &child, &iter);
-	gtk_tree_store_set (store, &child, 0, "Two\nLines", -1);
-
-	gtk_tree_view_expand_all (GTK_TREE_VIEW (fixture->tree_view));
-
-        gtk_test_widget_wait_for_draw (fixture->window);
-
-	/* Test if height of row 0:0 is correct */
-	path = gtk_tree_path_new_from_indices (0, -1);
-	gtk_tree_view_get_background_area (GTK_TREE_VIEW (fixture->tree_view),
-					   path, NULL, &rect);
-	height1 = rect.height;
-
-	gtk_tree_path_down (path);
-	gtk_tree_view_get_background_area (GTK_TREE_VIEW (fixture->tree_view),
-					   path, NULL, &rect);
-	height2 = rect.height;
-	gtk_tree_path_free (path);
-
-	g_assert (height2 > height1);
-
-	/* Clean up; the tear down also cleans up the model */
-	scroll_fixture_teardown (fixture, NULL);
-}
-
-/* Test for GNOME bugzilla bug 93584.  We add 150 rows to an existing
- * small model, and scroll to one of these with alignment.
- */
-static void
-test_bug93584 (ScrollFixture *fixture,
-	       gconstpointer  test_data)
-{
-	int row, i;
-	GtkTreeStore *store;
-	GtkTreePath *path;
-
-	g_test_bug ("93584");
-
-	/* Mimic state as in original test case */
-	g_signal_connect (G_OBJECT (fixture->tree_view), "realize",
-			  G_CALLBACK (gtk_tree_view_expand_all), NULL);
-	gtk_widget_show_all (fixture->window);
-
-	store = GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fixture->tree_view)));
-
-	/* Add 150 rows */
-	for (i = 0; i < 150; i++) {
-		GtkTreeIter iter;
-
-		gtk_tree_store_append (store, &iter, NULL);
-		gtk_tree_store_set (store, &iter, 0, "Row", -1);
-	}
-
-	row = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL);
-	row -= 20;
-
-        gtk_test_widget_wait_for_draw (fixture->window);
-
-	path = gtk_tree_path_new_from_indices (row, -1);
-	scroll (fixture, path, TRUE, 0.5);
-	gtk_tree_path_free (path);
-}
-
-/* GNOME bugzilla bug 111500.  Expand a row and immediately scroll
- * to its first child.  Make sure that expansion happens in currently
- * invisible area.
- */
-static void
-test_bug111500 (ScrollFixture *fixture,
-		gconstpointer  test_data)
-{
-	int i, len;
-	GtkTreeStore *store;
-	GtkTreeIter parent;
-	GtkTreePath *path;
-
-	g_test_bug ("111500");
-
-	gtk_widget_show_all (fixture->window);
-
-	/* Make sure all events have been processed and the window
-	 * is visible.
-	 */
-        gtk_test_widget_wait_for_draw (fixture->window);
-
-	/* Further prepare model */
-	store = GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fixture->tree_view)));
-
-	for (i = 0; i < 15; i++) {
-		GtkTreeIter iter;
-
-		gtk_tree_store_append (store, &iter, NULL);
-		gtk_tree_store_set (store, &iter, 0, "Other node", -1);
-	}
-
-	len = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL);
-	gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &parent,
-				       NULL, len - 1);
-
-	for (i = 0; i < 5; i++) {
-		GtkTreeIter iter;
-
-		gtk_tree_store_append (store, &iter, &parent);
-		gtk_tree_store_set (store, &iter, 0, "Row", -1);
-	}
-
-	path = gtk_tree_path_new_from_indices (len - 1, -1);
-	gtk_tree_view_expand_row (GTK_TREE_VIEW (fixture->tree_view),
-				  path, FALSE);
-
-	gtk_tree_path_down (path);
-
-	scroll (fixture, path, FALSE, 0.5);
-	gtk_tree_path_free (path);
-}
-
-static void
-test_bug111500_mixed (ScrollFixture *fixture,
-		      gconstpointer  test_data)
-{
-	int i, len;
-	GtkTreeStore *store;
-	GtkTreeIter parent;
-	GtkTreePath *path;
-
-	g_test_bug ("111500");
-
-	gtk_widget_show_all (fixture->window);
-
-	/* Make sure all events have been processed and the window
-	 * is visible.
-	 */
-        gtk_test_widget_wait_for_draw (fixture->window);
-
-	/* Further prepare model */
-	store = GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fixture->tree_view)));
-
-	for (i = 0; i < 15; i++) {
-		GtkTreeIter iter;
-
-		gtk_tree_store_append (store, &iter, NULL);
-		if (i % 2 == 0)
-			gtk_tree_store_set (store, &iter, 0, "Other node", -1);
-		else
-			gtk_tree_store_set (store, &iter, 0, "Other\nnode", -1);
-	}
-
-	len = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL);
-	gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &parent,
-				       NULL, len - 1);
-
-	for (i = 0; i < 5; i++) {
-		GtkTreeIter iter;
-
-		gtk_tree_store_append (store, &iter, &parent);
-		if (i % 2 != 0)
-			gtk_tree_store_set (store, &iter, 0, "Row", -1);
-		else
-			gtk_tree_store_set (store, &iter, 0, "Row\nRow", -1);
-	}
-
-	path = gtk_tree_path_new_from_indices (len - 1, -1);
-	gtk_tree_view_expand_row (GTK_TREE_VIEW (fixture->tree_view),
-				  path, FALSE);
-
-	gtk_tree_path_down (path);
-
-	scroll (fixture, path, FALSE, 0.5);
-	gtk_tree_path_free (path);
-}
-
-/* Test for GNOME bugzilla bug 163214.  Invalidate a couple of rows,
- * then scroll to one of these.
- */
-static void
-test_bug163214 (ScrollFixture *fixture,
-		gconstpointer  test_data)
-{
-	int i;
-	GtkListStore *store;
-	GtkTreePath *path;
-
-	g_test_bug ("163214");
-
-	gtk_widget_show_all (fixture->window);
-
-	/* Make sure all events have been processed and the window
-	 * is visible.
-	 */
-        gtk_test_widget_wait_for_draw (fixture->window);
-
-	store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fixture->tree_view)));
-
-	/* Invalidate a page of rows */
-	for (i = 100; i < 110; i++) {
-		GtkTreeIter iter;
-
-		gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter,
-					       NULL, i);
-		gtk_list_store_set (store, &iter, 0, "Row", -1);
-	}
-
-	/* Then scroll to that page. */
-	path = gtk_tree_path_new_from_indices (105, -1);
-	scroll (fixture, path, TRUE, 0.5);
-	gtk_tree_path_free (path);
-
-	/* Make sure all events have been processed and the window
-	 * is visible.
-	 */
-        gtk_test_widget_wait_for_draw (fixture->window);
-
-	store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fixture->tree_view)));
-
-	/* Invalidate a page of rows */
-	for (i = 300; i < 310; i++) {
-		GtkTreeIter iter;
-
-		gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter,
-					       NULL, i);
-		gtk_list_store_set (store, &iter, 0, "Row", -1);
-	}
-
-	/* Then scroll to the first row */
-	path = gtk_tree_path_new_from_indices (0, -1);
-	scroll (fixture, path, TRUE, 0.5);
-	gtk_tree_path_free (path);
-}
-
-/* Infrastructure for automatically adding tests */
-enum
-{
-	BEFORE,
-	AFTER,
-	BOTH
-};
-
-static const char *
-test_type_string (int test_type)
-{
-	switch (test_type) {
-		case BEFORE:
-			return "before-realize";
-
-		case AFTER:
-			return "after-realize";
-
-		case BOTH:
-			return "both";
-	}
-
-	return "???";
-}
-
-static char *
-align_string (gboolean use_align,
-	      gdouble  row_align)
-{
-	char *ret;
-
-	if (!use_align)
-		return g_strdup ("no-align");
-
-	ret = g_strdup_printf ("align-%1.1f", row_align);
-	return ret;
-}
-
-static void
-add_test (const char *path,
-	  gboolean    mixed,
-	  int         test_type,
-	  gboolean    use_align,
-	  gdouble     row_align,
-	  void (* setup) (ScrollFixture *, gconstpointer),
-	  void (* scroll_func) (ScrollFixture *, gconstpointer))
-{
-	gchar *test_path;
-	gchar *align;
-
-	align = align_string (use_align, row_align);
-
-	test_path = g_strdup_printf ("/TreeView/scrolling/%s/%s-height/path-%s-%s",
-				     test_type_string (test_type),
-				     mixed ? "mixed" : "constant",
-				     path, align);
-	g_free (align);
-
-	g_test_add (test_path, ScrollFixture, path,
-		    setup, scroll_func, scroll_fixture_teardown);
-
-	g_free (test_path);
-}
-
-static void
-add_tests (gboolean mixed,
-	   int test_type,
-	   gboolean use_align,
-	   gdouble  row_align,
-	   void (*scroll_func) (ScrollFixture *, gconstpointer))
-{
-	void (* setup) (ScrollFixture *, gconstpointer);
-
-	if (mixed)
-		setup = scroll_fixture_mixed_setup;
-	else
-		setup = scroll_fixture_constant_setup;
-
-	add_test ("0", mixed, test_type, use_align, row_align, setup, scroll_func);
-	add_test ("2", mixed, test_type, use_align, row_align, setup, scroll_func);
-	add_test ("5", mixed, test_type, use_align, row_align, setup, scroll_func);
-	/* We scroll to 8 to test a partial visible row.  The 8 is
-	 * based on my font setting of "Vera Sans 11" and
-	 * the separators set to 0.  (This should be made dynamic; FIXME).
-	 */
-	add_test ("8", mixed, test_type, use_align, row_align, setup, scroll_func);
-	add_test ("10", mixed, test_type, use_align, row_align, setup, scroll_func);
-	add_test ("250", mixed, test_type, use_align, row_align, setup, scroll_func);
-	add_test ("500", mixed, test_type, use_align, row_align, setup, scroll_func);
-	add_test ("750", mixed, test_type, use_align, row_align, setup, scroll_func);
-	add_test ("990", mixed, test_type, use_align, row_align, setup, scroll_func);
-	add_test ("991", mixed, test_type, use_align, row_align, setup, scroll_func);
-	add_test ("995", mixed, test_type, use_align, row_align, setup, scroll_func);
-	add_test ("997", mixed, test_type, use_align, row_align, setup, scroll_func);
-	add_test ("999", mixed, test_type, use_align, row_align, setup, scroll_func);
-}
-
-int
-main (int argc, char **argv)
-{
-	gtk_test_init (&argc, &argv);
-
-	/* Scrolls before realization */
-	add_tests (FALSE, BEFORE, FALSE, 0.0, scroll_no_align);
-	if (g_test_thorough ())
-		add_tests (TRUE, BEFORE, FALSE, 0.0, scroll_no_align);
-
-	add_tests (FALSE, BEFORE, TRUE, 0.0, scroll_align_0_0);
-	if (g_test_thorough ())
-		add_tests (TRUE, BEFORE, TRUE, 0.0, scroll_align_0_0);
-
-	add_tests (FALSE, BEFORE, TRUE, 0.5, scroll_align_0_5);
-	if (g_test_thorough ())
-		add_tests (TRUE, BEFORE, TRUE, 0.5, scroll_align_0_5);
-
-	add_tests (FALSE, BEFORE, TRUE, 1.0, scroll_align_1_0);
-	if (g_test_thorough ())
-		add_tests (TRUE, BEFORE, TRUE, 1.0, scroll_align_1_0);
-
-	/* Scrolls after realization */
-	add_tests (FALSE, AFTER, FALSE, 0.0, scroll_after_no_align);
-	if (g_test_thorough ())
-		add_tests (TRUE, AFTER, FALSE, 0.0, scroll_after_no_align);
-
-	add_tests (FALSE, AFTER, TRUE, 0.0, scroll_after_align_0_0);
-	if (g_test_thorough ())
-		add_tests (TRUE, AFTER, TRUE, 0.0, scroll_after_align_0_0);
-
-	add_tests (FALSE, AFTER, TRUE, 0.5, scroll_after_align_0_5);
-	if (g_test_thorough ())
-		add_tests (TRUE, AFTER, TRUE, 0.5, scroll_after_align_0_5);
-
-	add_tests (FALSE, AFTER, TRUE, 1.0, scroll_after_align_1_0);
-	if (g_test_thorough ())
-		add_tests (TRUE, AFTER, TRUE, 1.0, scroll_after_align_1_0);
-
-	/* Scroll to end before realization, to a real position after */
-	if (g_test_thorough ()) {
-		add_tests (FALSE, BOTH, FALSE, 0.0, scroll_both_no_align);
-		add_tests (TRUE, BOTH, FALSE, 0.0, scroll_both_no_align);
-
-		add_tests (FALSE, BOTH, TRUE, 0.0, scroll_both_align_0_0);
-		add_tests (TRUE, BOTH, TRUE, 0.0, scroll_both_align_0_0);
-
-		add_tests (FALSE, BOTH, TRUE, 0.5, scroll_both_align_0_5);
-		add_tests (TRUE, BOTH, TRUE, 0.5, scroll_both_align_0_5);
-
-		add_tests (FALSE, BOTH, TRUE, 1.0, scroll_both_align_1_0);
-		add_tests (TRUE, BOTH, TRUE, 1.0, scroll_both_align_1_0);
-	}
-
-	/* Test different alignments in view with single row */
-	g_test_add ("/TreeView/scrolling/single-row/no-align",
-		    ScrollFixture, "0",
-		    scroll_fixture_single_setup,
-		    scroll_no_align,
-		    scroll_fixture_teardown);
-	g_test_add ("/TreeView/scrolling/single-row/align-0.0",
-		    ScrollFixture, "0",
-		    scroll_fixture_single_setup,
-		    scroll_align_0_0,
-		    scroll_fixture_teardown);
-	g_test_add ("/TreeView/scrolling/single-row/align-0.5",
-		    ScrollFixture, "0",
-		    scroll_fixture_single_setup,
-		    scroll_align_0_5,
-		    scroll_fixture_teardown);
-	g_test_add ("/TreeView/scrolling/single-row/align-1.0",
-		    ScrollFixture, "0",
-		    scroll_fixture_single_setup,
-		    scroll_align_1_0,
-		    scroll_fixture_teardown);
-
-	/* Test scrolling in a very large model; also very slow */
-	if (g_test_slow ()) {
-		g_test_add ("/TreeView/scrolling/large-model/constant-height/middle-no-align",
-			    ScrollFixture, "50000",
-			    scroll_fixture_constant_big_setup,
-			    scroll_no_align,
-			    scroll_fixture_teardown);
-		g_test_add ("/TreeView/scrolling/large-model/constant-height/end-no-align",
-			    ScrollFixture, "99999",
-			    scroll_fixture_constant_big_setup,
-			    scroll_no_align,
-			    scroll_fixture_teardown);
-
-		g_test_add ("/TreeView/scrolling/large-model/mixed-height/middle-no-align",
-			    ScrollFixture, "50000",
-			    scroll_fixture_mixed_big_setup,
-			    scroll_no_align,
-			    scroll_fixture_teardown);
-		g_test_add ("/TreeView/scrolling/large-model/mixed-height/end-no-align",
-			    ScrollFixture, "99999",
-			    scroll_fixture_mixed_big_setup,
-			    scroll_no_align,
-			    scroll_fixture_teardown);
-	}
-
-	/* Test scrolling to a newly created row */
-	g_test_add ("/TreeView/scrolling/new-row/path-0", ScrollFixture,
-		    GINT_TO_POINTER (0),
-		    scroll_fixture_constant_setup,
-		    scroll_new_row,
-		    scroll_fixture_teardown);
-	g_test_add ("/TreeView/scrolling/new-row/path-4", ScrollFixture,
-		    GINT_TO_POINTER (4),
-		    scroll_fixture_constant_setup,
-		    scroll_new_row,
-		    scroll_fixture_teardown);
-	/* We scroll to 8 to test a partial visible row.  The 8 is
-	 * based on my font setting of "Vera Sans 11" and
-	 * the separators set to 0.  (This should be made dynamic; FIXME).
-	 */
-	g_test_add ("/TreeView/scrolling/new-row/path-8", ScrollFixture,
-		    GINT_TO_POINTER (8),
-		    scroll_fixture_constant_setup,
-		    scroll_new_row,
-		    scroll_fixture_teardown);
-	g_test_add ("/TreeView/scrolling/new-row/path-500", ScrollFixture,
-		    GINT_TO_POINTER (500),
-		    scroll_fixture_constant_setup,
-		    scroll_new_row,
-		    scroll_fixture_teardown);
-	g_test_add ("/TreeView/scrolling/new-row/path-999", ScrollFixture,
-		    GINT_TO_POINTER (999),
-		    scroll_fixture_constant_setup,
-		    scroll_new_row,
-		    scroll_fixture_teardown);
-
-	g_test_add ("/TreeView/scrolling/new-row/tree", ScrollFixture,
-		    NULL,
-		    scroll_fixture_tree_setup,
-		    scroll_new_row_tree,
-		    scroll_fixture_teardown);
-
-	/* Test scrolling to a newly created row, in a mixed height model */
-	g_test_add ("/TreeView/scrolling/new-row-mixed/path-0", ScrollFixture,
-		    GINT_TO_POINTER (0),
-		    scroll_fixture_mixed_setup,
-		    scroll_new_row,
-		    scroll_fixture_teardown);
-	g_test_add ("/TreeView/scrolling/new-row-mixed/path-3", ScrollFixture,
-		    GINT_TO_POINTER (3),
-		    scroll_fixture_mixed_setup,
-		    scroll_new_row,
-		    scroll_fixture_teardown);
-	/* We scroll to 8 to test a partial visible row.  The 8 is
-	 * based on my font setting of "Vera Sans 11" and
-	 * the separators set to 0.  (This should be made dynamic; FIXME).
-	 */
-	g_test_add ("/TreeView/scrolling/new-row-mixed/path-5", ScrollFixture,
-		    GINT_TO_POINTER (5),
-		    scroll_fixture_mixed_setup,
-		    scroll_new_row,
-		    scroll_fixture_teardown);
-	g_test_add ("/TreeView/scrolling/new-row-mixed/path-500", ScrollFixture,
-		    GINT_TO_POINTER (500),
-		    scroll_fixture_mixed_setup,
-		    scroll_new_row,
-		    scroll_fixture_teardown);
-	g_test_add ("/TreeView/scrolling/new-row-mixed/path-999", ScrollFixture,
-		    GINT_TO_POINTER (999),
-		    scroll_fixture_mixed_setup,
-		    scroll_new_row,
-		    scroll_fixture_teardown);
-
-	g_test_add ("/TreeView/scrolling/new-row-mixed/tree", ScrollFixture,
-		    NULL,
-		    scroll_fixture_mixed_tree_setup,
-		    scroll_new_row_tree,
-		    scroll_fixture_teardown);
-
-	/* Misc. tests */
-	g_test_add ("/TreeView/scrolling/specific/bug-316689",
-			ScrollFixture, NULL,
-		    scroll_fixture_constant_setup, test_bug316689,
-		    scroll_fixture_teardown);
-	g_test_add_func ("/TreeView/scrolling/specific/bug-359231",
-			test_bug359231);
-	g_test_add ("/TreeView/scrolling/specific/bug-93584",
-		    ScrollFixture, NULL,
-		    scroll_fixture_tree_setup, test_bug93584,
-		    scroll_fixture_teardown);
-	g_test_add ("/TreeView/scrolling/specific/bug-111500",
-		    ScrollFixture, NULL,
-		    scroll_fixture_tree_setup, test_bug111500,
-		    scroll_fixture_teardown);
-	g_test_add ("/TreeView/scrolling/specific/bug-111500-mixed",
-		    ScrollFixture, NULL,
-		    scroll_fixture_mixed_tree_setup, test_bug111500_mixed,
-		    scroll_fixture_teardown);
-	g_test_add ("/TreeView/scrolling/specific/bug-163214",
-		    ScrollFixture, NULL,
-		    scroll_fixture_constant_setup, test_bug163214,
-		    scroll_fixture_teardown);
-
-	return g_test_run ();
-}