Add two more unit tests for bug 659022

[~andy/gtk] / gtk / tests / filechooser.c

diff --git a/gtk/tests/filechooser.c b/gtk/tests/filechooser.c
index 300e15afda487f3493c11e12eb3a24a67a6bd7c1..3d82eefd6636da44fcf091749c5d785e8317b429 100644 (file)
--- a/gtk/tests/filechooser.c
+++ b/gtk/tests/filechooser.c
@@ -29,8 +29,6 @@
  * - More tests!
  */
 
-#define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
-#undef GTK_DISABLE_DEPRECATED
 #define SLEEP_DURATION  100
 
 #include "config.h"
@@ -517,9 +515,9 @@ test_widgets_for_current_action (GtkFileChooserDialog *dialog,
 
   /* OPEN implies that the "new folder" button is hidden; otherwise it is shown */
   if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
-    passed = passed && !GTK_WIDGET_VISIBLE (impl->browse_new_folder_button);
+    passed = passed && !gtk_widget_get_visible (impl->browse_new_folder_button);
   else
-    passed = passed && GTK_WIDGET_VISIBLE (impl->browse_new_folder_button);
+    passed = passed && gtk_widget_get_visible (impl->browse_new_folder_button);
 
   /* Check that the widgets are present/visible or not */
   if (has_action (open_actions, G_N_ELEMENTS (open_actions), impl->action))
@@ -531,7 +529,7 @@ test_widgets_for_current_action (GtkFileChooserDialog *dialog,
                          && impl->save_folder_label == NULL
                          && impl->save_folder_combo == NULL
                          && impl->save_expander == NULL
-                         && GTK_IS_CONTAINER (impl->browse_widgets) && GTK_WIDGET_DRAWABLE (impl->browse_widgets));
+                         && GTK_IS_CONTAINER (impl->browse_widgets) && gtk_widget_is_drawable (impl->browse_widgets));
     }
   else if (has_action (save_actions, G_N_ELEMENTS (save_actions), impl->action))
     {
@@ -539,11 +537,11 @@ test_widgets_for_current_action (GtkFileChooserDialog *dialog,
        * _gtk_file_chooser_entry_get_type(), which is a non-exported symbol.
        * So, we just test impl->location_entry for being non-NULL
        */
-      passed = passed && (GTK_IS_CONTAINER (impl->save_widgets) && GTK_WIDGET_DRAWABLE (impl->save_widgets)
-                         && impl->location_entry != NULL && GTK_WIDGET_DRAWABLE (impl->location_entry)
-                         && GTK_IS_LABEL (impl->save_folder_label) && GTK_WIDGET_DRAWABLE (impl->save_folder_label)
-                         && GTK_IS_COMBO_BOX (impl->save_folder_combo) && GTK_WIDGET_DRAWABLE (impl->save_folder_combo)
-                         && GTK_IS_EXPANDER (impl->save_expander) && GTK_WIDGET_DRAWABLE (impl->save_expander)
+      passed = passed && (GTK_IS_CONTAINER (impl->save_widgets) && gtk_widget_is_drawable (impl->save_widgets)
+                         && impl->location_entry != NULL && gtk_widget_is_drawable (impl->location_entry)
+                         && GTK_IS_LABEL (impl->save_folder_label) && gtk_widget_is_drawable (impl->save_folder_label)
+                         && GTK_IS_COMBO_BOX (impl->save_folder_combo) && gtk_widget_is_drawable (impl->save_folder_combo)
+                         && GTK_IS_EXPANDER (impl->save_expander) && gtk_widget_is_drawable (impl->save_expander)
                          && GTK_IS_CONTAINER (impl->browse_widgets));
 
       /* FIXME: we are in a SAVE mode; test the visibility and sensitivity of
@@ -705,7 +703,7 @@ test_reload_sequence (gboolean set_folder_before_map)
       wait_for_idle ();
 
       folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
-      passed = passed && (folder != NULL && strcmp (folder, g_get_home_dir()) == 0);
+      passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
       g_free (folder);
     }
   else
@@ -721,7 +719,7 @@ test_reload_sequence (gboolean set_folder_before_map)
       wait_for_idle ();
 
       folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
-      passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0);
+      passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
     }
 
   log_test (passed, "test_reload_sequence(): initial status");
@@ -743,9 +741,9 @@ test_reload_sequence (gboolean set_folder_before_map)
 
   folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
   if (set_folder_before_map)
-    passed = passed && (folder != NULL && strcmp (folder, g_get_home_dir()) == 0);
+    passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
   else
-    passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0);
+    passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
 
   g_free (folder);
 
@@ -760,7 +758,6 @@ test_reload_sequence (gboolean set_folder_before_map)
   passed = passed && (impl->current_folder != NULL
                      && impl->browse_files_model != NULL
                      && (impl->load_state == LOAD_PRELOAD || impl->load_state == LOAD_LOADING || impl->load_state == LOAD_FINISHED)
-                     && impl->reload_state == RELOAD_WAS_UNMAPPED
                      && (impl->load_state == LOAD_PRELOAD ? (impl->load_timeout_id != 0) : TRUE)
                      && ((impl->load_state == LOAD_LOADING || impl->load_state == LOAD_FINISHED)
                          ? (impl->load_timeout_id == 0 && impl->sort_model != NULL)
@@ -768,9 +765,9 @@ test_reload_sequence (gboolean set_folder_before_map)
 
   folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
   if (set_folder_before_map)
-    passed = passed && (folder != NULL && strcmp (folder, g_get_home_dir()) == 0);
+    passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
   else
-    passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0);
+    passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
 
   g_free (folder);
 
@@ -793,9 +790,9 @@ test_reload_sequence (gboolean set_folder_before_map)
 
   folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
   if (set_folder_before_map)
-    passed = passed && (folder != NULL && strcmp (folder, g_get_home_dir()) == 0);
+    passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
   else
-    passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0);
+    passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
 
   g_free (folder);
 
@@ -863,9 +860,9 @@ test_button_folder_states_for_action (GtkFileChooserAction action, gboolean use_
 
   folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (button));
   if (must_have_cwd)
-    passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0);
+    passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
   else
-    passed = passed && (folder != NULL && strcmp (folder, g_get_home_dir()) == 0);
+    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),
@@ -883,9 +880,9 @@ test_button_folder_states_for_action (GtkFileChooserAction action, gboolean use_
   folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (button));
 
   if (must_have_cwd)
-    passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0);
+    passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
   else
-    passed = passed && (folder != NULL && strcmp (folder, g_get_home_dir()) == 0);
+    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),
@@ -901,9 +898,9 @@ test_button_folder_states_for_action (GtkFileChooserAction action, gboolean use_
   folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (button));
 
   if (must_have_cwd)
-    passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0);
+    passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
   else
-    passed = passed && (folder != NULL && strcmp (folder, g_get_home_dir()) == 0);
+    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),
@@ -918,9 +915,9 @@ test_button_folder_states_for_action (GtkFileChooserAction action, gboolean use_
   folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (button));
 
   if (must_have_cwd)
-    passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0);
+    passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
   else
-    passed = passed && (folder != NULL && strcmp (folder, g_get_home_dir()) == 0);
+    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),