AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-17 14:30:15 +00:00
Code Issues Projects Releases Wiki Activity

filechooser: Do tests with g_assert_cmpstr(), not g_assert(passed)

Browse Source 
This lets us see exactly what failed, instead of just seeing a boolean error value.

Signed-off-by: Federico Mena Quintero <federico@gnome.org>
This commit is contained in:
Federico Mena Quintero 2013-02-11 15:20:46 -06:00
parent ff4bf0c895
commit 40c57d9b58
1 changed files with 16 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
gtk/tests/filechooser.c
View File

@ -53,7 +53,7 @@ log_test (gboolean passed, const char *test_name, ...)
} }
typedef void (* SetFilenameFn) (GtkFileChooser *chooser, gpointer data); typedef void (* SetFilenameFn) (GtkFileChooser *chooser, gpointer data);
typedef gboolean (* CompareFilenameFn) (GtkFileChooser *chooser, gpointer data); typedef void (* CompareFilenameFn) (GtkFileChooser *chooser, gpointer data);
struct test_set_filename_closure { struct test_set_filename_closure {
GtkWidget *chooser; GtkWidget *chooser;
@ -98,7 +98,7 @@ wait_for_idle (void)
gtk_main_iteration (); gtk_main_iteration ();
} }
static gboolean static void
test_set_filename (GtkFileChooserAction action, test_set_filename (GtkFileChooserAction action,
gboolean focus_button, gboolean focus_button,
SetFilenameFn set_filename_fn,const SetFilenameFn set_filename_fn,const
@ -107,7 +107,6 @@ test_set_filename (GtkFileChooserAction action,
{ {
GtkWidget *chooser; GtkWidget *chooser;
struct test_set_filename_closure closure; struct test_set_filename_closure closure;
gboolean retval;
chooser = gtk_file_chooser_dialog_new ("hello", NULL, action, chooser = gtk_file_chooser_dialog_new ("hello", NULL, action,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@ -124,11 +123,9 @@ test_set_filename (GtkFileChooserAction action,
gdk_threads_add_timeout_full (G_MAXINT, SLEEP_DURATION, set_filename_timeout_cb, &closure, NULL); gdk_threads_add_timeout_full (G_MAXINT, SLEEP_DURATION, set_filename_timeout_cb, &closure, NULL);
gtk_dialog_run (GTK_DIALOG (chooser)); gtk_dialog_run (GTK_DIALOG (chooser));
retval = (* compare_filename_fn) (GTK_FILE_CHOOSER (chooser), data); (* compare_filename_fn) (GTK_FILE_CHOOSER (chooser), data);
gtk_widget_destroy (chooser); gtk_widget_destroy (chooser);
return retval;
} }
static void static void
@ -140,24 +137,19 @@ set_filename_cb (GtkFileChooser *chooser, gpointer data)
gtk_file_chooser_set_filename (chooser, filename); gtk_file_chooser_set_filename (chooser, filename);
} }
static gboolean static void
compare_filename_cb (GtkFileChooser *chooser, gpointer data) compare_filename_cb (GtkFileChooser *chooser, gpointer data)
{ {
const char *filename; const char *filename;
char *out_filename; char *out_filename;
gboolean retval;
filename = data; filename = data;
out_filename = gtk_file_chooser_get_filename (chooser); out_filename = gtk_file_chooser_get_filename (chooser);
if (out_filename) g_assert_cmpstr (out_filename, ==, filename);
{
retval = (strcmp (out_filename, filename) == 0);
g_free (out_filename);
} else
retval = FALSE;
return retval; if (out_filename)
g_free (out_filename);
} }
typedef struct typedef struct
@ -172,15 +164,8 @@ static void
test_black_box_set_filename (gconstpointer data) test_black_box_set_filename (gconstpointer data)
{ {
const TestSetFilenameSetup *setup = data; const TestSetFilenameSetup *setup = data;
gboolean passed;
passed = test_set_filename (setup->action, setup->focus_button, set_filename_cb, compare_filename_cb, (char *) setup->filename); test_set_filename (setup->action, setup->focus_button, set_filename_cb, compare_filename_cb, (char *) setup->filename);
log_test (passed, "set_filename: action %d, focus_button=%s",
(int) setup->action,
setup->focus_button ? "TRUE" : "FALSE");
g_assert (passed);
} }
struct current_name_closure { struct current_name_closure {
@ -199,29 +184,24 @@ set_current_name_cb (GtkFileChooser *chooser, gpointer data)
gtk_file_chooser_set_current_name (chooser, closure->current_name); gtk_file_chooser_set_current_name (chooser, closure->current_name);
} }
static gboolean static void
compare_current_name_cb (GtkFileChooser *chooser, gpointer data) compare_current_name_cb (GtkFileChooser *chooser, gpointer data)
{ {
struct current_name_closure *closure; struct current_name_closure *closure;
char *out_filename; char *out_filename;
gboolean retval; char *filename;
closure = data; closure = data;
out_filename = gtk_file_chooser_get_filename (chooser); out_filename = gtk_file_chooser_get_filename (chooser);
if (out_filename) g_assert (out_filename != NULL);
{
char *filename;
filename = g_build_filename (closure->path, closure->current_name, NULL); filename = g_build_filename (closure->path, closure->current_name, NULL);
retval = (strcmp (filename, out_filename) == 0); g_assert_cmpstr (filename, ==, out_filename);
g_free (filename);
g_free (out_filename);
} else
retval = FALSE;
return retval; g_free (filename);
g_free (out_filename);
} }
typedef struct typedef struct
@ -237,7 +217,6 @@ test_black_box_set_current_name (gconstpointer data)
{ {
const TestSetCurrentNameSetup *setup = data; const TestSetCurrentNameSetup *setup = data;
struct current_name_closure closure; struct current_name_closure closure;
gboolean passed;
char *cwd; char *cwd;
cwd = g_get_current_dir (); cwd = g_get_current_dir ();
@ -245,14 +224,9 @@ test_black_box_set_current_name (gconstpointer data)
closure.path = cwd; closure.path = cwd;
closure.current_name = setup->current_name; closure.current_name = setup->current_name;
passed = test_set_filename (setup->action, setup->focus_button, test_set_filename (setup->action, setup->focus_button, set_current_name_cb, compare_current_name_cb, &closure);
set_current_name_cb, compare_current_name_cb, &closure);
g_free (cwd); g_free (cwd);
log_test (passed, "set_current_name: action %d, focus_button=%s", (int) setup->action, setup->focus_button ? "TRUE" : "FALSE");
g_assert (passed);
} }
/* FIXME: fails in CREATE_FOLDER mode when FOLDER_NAME == "/" */ /* FIXME: fails in CREATE_FOLDER mode when FOLDER_NAME == "/" */