[gtk+/gtk-2-24] filechooserbutton: Give proper names to the SELECT_FOLDER tests with cancelled dialog
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24] filechooserbutton: Give proper names to the SELECT_FOLDER tests with cancelled dialog
- Date: Wed, 13 Mar 2013 02:23:32 +0000 (UTC)
commit ca7fe8417a149524157ac65fdaa94b71cbd8f61f
Author: Federico Mena Quintero <federico gnome org>
Date: Tue Mar 12 12:24:06 2013 -0600
filechooserbutton: Give proper names to the SELECT_FOLDER tests with cancelled dialog
Signed-off-by: Federico Mena Quintero <federico gnome org>
gtk/tests/filechooser.c | 140 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 119 insertions(+), 21 deletions(-)
---
diff --git a/gtk/tests/filechooser.c b/gtk/tests/filechooser.c
index 34a3304..8ad263c 100644
--- a/gtk/tests/filechooser.c
+++ b/gtk/tests/filechooser.c
@@ -1280,7 +1280,7 @@ static FileChooserButtonTest button_tests[] =
/* SELECT_FOLDER tests with dialog, cancelled */
{
- "select-folder-dialog-cancel-1",
+ "select-folder-dialog-cancel-ni-nt",
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
NULL, /* initial_current_folder */
NULL, /* initial_filename */
@@ -1294,7 +1294,35 @@ static FileChooserButtonTest button_tests[] =
NULL /* final_filename */
},
{
- "select-folder-dialog-cancel-2",
+ "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 */
@@ -1308,7 +1336,77 @@ static FileChooserButtonTest button_tests[] =
FOLDER_NAME /* final_filename */
},
{
- "select-folder-dialog-cancel-3",
+ "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 */
@@ -1322,7 +1420,7 @@ static FileChooserButtonTest button_tests[] =
NULL /* final_filename */
},
{
- "select-folder-dialog-cancel-4",
+ "select-folder-dialog-cancel-f-nt-2",
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
FOLDER_NAME, /* initial_current_folder */
NULL, /* initial_filename */
@@ -1336,24 +1434,24 @@ static FileChooserButtonTest button_tests[] =
FOLDER_NAME /* final_filename */
},
{
- "select-folder-dialog-cancel-5",
+ "select-folder-dialog-cancel-f-b",
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- NULL, /* initial_current_folder */
+ FOLDER_NAME, /* initial_current_folder */
NULL, /* initial_filename */
TRUE, /* open_dialog */
BUTTON, /* what_to_tweak */
- NULL, /* tweak_current_folder */
- FOLDER_NAME, /* tweak_filename */
+ FOLDER_NAME_2, /* tweak_current_folder */
+ NULL, /* tweak_filename */
GTK_RESPONSE_CANCEL, /* dialog_response */
FALSE, /* unselect_all */
- NULL, /* final_current_folder */
+ FOLDER_NAME_2, /* final_current_folder */
NULL /* final_filename */
},
{
- "select-folder-dialog-cancel-6",
+ "select-folder-dialog-cancel-f-b-2",
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- NULL, /* initial_current_folder */
- FOLDER_NAME, /* initial_filename */
+ FOLDER_NAME, /* initial_current_folder */
+ NULL, /* initial_filename */
TRUE, /* open_dialog */
BUTTON, /* what_to_tweak */
NULL, /* tweak_current_folder */
@@ -1361,35 +1459,35 @@ static FileChooserButtonTest button_tests[] =
GTK_RESPONSE_CANCEL, /* dialog_response */
FALSE, /* unselect_all */
NULL, /* final_current_folder */
- FOLDER_NAME /* final_filename */
+ FOLDER_NAME_2 /* final_filename */
},
{
- "select-folder-dialog-cancel-7",
+ "select-folder-dialog-cancel-f-d",
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 */
+ 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-8",
+ "select-folder-dialog-cancel-f-d-2",
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
FOLDER_NAME, /* initial_current_folder */
NULL, /* initial_filename */
TRUE, /* open_dialog */
- BUTTON, /* what_to_tweak */
+ 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 */
+ FOLDER_NAME, /* final_current_folder */
+ NULL /* final_filename */
},
/* OPEN tests with dialog */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
