diff --git a/needles/gnome/apps/app_run_cheese.json b/needles/gnome/apps/app_run_cheese.json deleted file mode 100644 index 784ae118..00000000 --- a/needles/gnome/apps/app_run_cheese.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "properties": [], - "tags": [ - "apps_run_cheese" - ], - "area": [ - { - "xpos": 116, - "ypos": 5, - "width": 52, - "height": 19, - "type": "match" - } - ] -} \ No newline at end of file diff --git a/needles/gnome/apps/app_run_cheese.png b/needles/gnome/apps/app_run_cheese.png deleted file mode 100644 index a67e4162..00000000 Binary files a/needles/gnome/apps/app_run_cheese.png and /dev/null differ diff --git a/needles/gnome/apps/apps_run_abrt.json b/needles/gnome/apps/apps_run_abrt.json index 85f9d14d..d7ae8192 100644 --- a/needles/gnome/apps/apps_run_abrt.json +++ b/needles/gnome/apps/apps_run_abrt.json @@ -8,7 +8,7 @@ "xpos": 447, "ypos": 41, "width": 133, - "height": 23, + "height": 21, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_archiver.json b/needles/gnome/apps/apps_run_archiver.json index 8c0ad143..c0562012 100644 --- a/needles/gnome/apps/apps_run_archiver.json +++ b/needles/gnome/apps/apps_run_archiver.json @@ -5,9 +5,9 @@ ], "area": [ { - "xpos": 117, - "ypos": 4, - "width": 117, + "xpos": 452, + "ypos": 110, + "width": 118, "height": 23, "type": "match" } diff --git a/needles/gnome/apps/apps_run_boxes.json b/needles/gnome/apps/apps_run_boxes.json index 53f6682e..87586e65 100644 --- a/needles/gnome/apps/apps_run_boxes.json +++ b/needles/gnome/apps/apps_run_boxes.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 115, - "ypos": 5, - "width": 47, - "height": 19, + "xpos": 517, + "ypos": 532, + "width": 113, + "height": 20, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_calculator.json b/needles/gnome/apps/apps_run_calculator.json index 2c532d91..0589bc48 100644 --- a/needles/gnome/apps/apps_run_calculator.json +++ b/needles/gnome/apps/apps_run_calculator.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 117, - "ypos": 4, - "width": 72, - "height": 22, + "xpos": 424, + "ypos": 515, + "width": 20, + "height": 17, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_calendar.json b/needles/gnome/apps/apps_run_calendar.json index fe581670..a3f21166 100644 --- a/needles/gnome/apps/apps_run_calendar.json +++ b/needles/gnome/apps/apps_run_calendar.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 114, - "ypos": 5, - "width": 66, - "height": 20, + "xpos": 612, + "ypos": 42, + "width": 42, + "height": 19, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_chars.json b/needles/gnome/apps/apps_run_chars.json index c09b3271..bed7a808 100644 --- a/needles/gnome/apps/apps_run_chars.json +++ b/needles/gnome/apps/apps_run_chars.json @@ -5,9 +5,9 @@ ], "area": [ { - "xpos": 115, - "ypos": 5, - "width": 79, + "xpos": 195, + "ypos": 627, + "width": 126, "height": 21, "type": "match" } diff --git a/needles/gnome/apps/apps_run_clocks.json b/needles/gnome/apps/apps_run_clocks.json index f4675782..1bb406c9 100644 --- a/needles/gnome/apps/apps_run_clocks.json +++ b/needles/gnome/apps/apps_run_clocks.json @@ -1,15 +1,15 @@ -{ - "area": [ - { - "height": 17, - "xpos": 115, - "ypos": 5, - "width": 49, - "type": "match" - } - ], - "properties": [], - "tags": [ - "apps_run_clocks" - ] +{ + "area": [ + { + "xpos": 488, + "ypos": 382, + "width": 52, + "height": 50, + "type": "match" + } + ], + "properties": [], + "tags": [ + "apps_run_clocks" + ] } \ No newline at end of file diff --git a/needles/gnome/apps/apps_run_contacts.json b/needles/gnome/apps/apps_run_contacts.json index 7ae93533..ddc7f80b 100644 --- a/needles/gnome/apps/apps_run_contacts.json +++ b/needles/gnome/apps/apps_run_contacts.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 117, - "ypos": 5, - "width": 112, - "height": 23, + "xpos": 457, + "ypos": 71, + "width": 65, + "height": 21, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_disks.json b/needles/gnome/apps/apps_run_disks.json index 453b8f07..ffdebf32 100644 --- a/needles/gnome/apps/apps_run_disks.json +++ b/needles/gnome/apps/apps_run_disks.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 116, - "ypos": 4, - "width": 42, - "height": 20, + "xpos": 256, + "ypos": 139, + "width": 82, + "height": 22, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_diskusage.json b/needles/gnome/apps/apps_run_diskusage.json index 38dbaed1..f78b454a 100644 --- a/needles/gnome/apps/apps_run_diskusage.json +++ b/needles/gnome/apps/apps_run_diskusage.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 115, - "ypos": 6, - "width": 80, - "height": 20, + "xpos": 445, + "ypos": 40, + "width": 138, + "height": 22, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_documents.json b/needles/gnome/apps/apps_run_documents.json index c052c55f..2a439bbb 100644 --- a/needles/gnome/apps/apps_run_documents.json +++ b/needles/gnome/apps/apps_run_documents.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 114, - "ypos": 5, - "width": 83, - "height": 19, + "xpos": 412, + "ypos": 39, + "width": 79, + "height": 23, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_dviewer.json b/needles/gnome/apps/apps_run_dviewer.json index 4441501c..c00c385b 100644 --- a/needles/gnome/apps/apps_run_dviewer.json +++ b/needles/gnome/apps/apps_run_dviewer.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 115, - "ypos": 5, - "width": 127, - "height": 20, + "xpos": 446, + "ypos": 71, + "width": 132, + "height": 21, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_evolution_warning.json b/needles/gnome/apps/apps_run_evolution_warning.json index 1c41b9b1..664b52c2 100644 --- a/needles/gnome/apps/apps_run_evolution_warning.json +++ b/needles/gnome/apps/apps_run_evolution_warning.json @@ -1,15 +1,15 @@ -{ - "properties": [], - "tags": [ - "apps_run_evolution_warning" - ], - "area": [ - { - "xpos": 688, - "ypos": 644, - "width": 32, - "height": 19, - "type": "match" - } - ] +{ + "properties": [], + "tags": [ + "apps_run_evolution_warning" + ], + "area": [ + { + "xpos": 691, + "ypos": 645, + "width": 26, + "height": 19, + "type": "match" + } + ] } \ No newline at end of file diff --git a/needles/gnome/apps/apps_run_files.json b/needles/gnome/apps/apps_run_files.json index 5c5a97e1..52dd8e75 100644 --- a/needles/gnome/apps/apps_run_files.json +++ b/needles/gnome/apps/apps_run_files.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 116, - "ypos": 6, - "width": 37, - "height": 17, + "xpos": 157, + "ypos": 87, + "width": 67, + "height": 22, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_help.json b/needles/gnome/apps/apps_run_help.json index 974eea73..f639d414 100644 --- a/needles/gnome/apps/apps_run_help.json +++ b/needles/gnome/apps/apps_run_help.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 116, - "ypos": 5, - "width": 35, - "height": 21, + "xpos": 467, + "ypos": 40, + "width": 92, + "height": 22, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_imageviewer.json b/needles/gnome/apps/apps_run_imageviewer.json index 5ffe603a..17c48065 100644 --- a/needles/gnome/apps/apps_run_imageviewer.json +++ b/needles/gnome/apps/apps_run_imageviewer.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 116, - "ypos": 5, - "width": 96, - "height": 21, + "xpos": 461, + "ypos": 122, + "width": 102, + "height": 20, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_logs.json b/needles/gnome/apps/apps_run_logs.json index a95773d7..9749c6f8 100644 --- a/needles/gnome/apps/apps_run_logs.json +++ b/needles/gnome/apps/apps_run_logs.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 117, - "ypos": 5, - "width": 35, - "height": 20, + "xpos": 573, + "ypos": 36, + "width": 34, + "height": 19, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_maps.json b/needles/gnome/apps/apps_run_maps.json index aaef7ec2..78c8841b 100644 --- a/needles/gnome/apps/apps_run_maps.json +++ b/needles/gnome/apps/apps_run_maps.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 114, - "ypos": 5, - "width": 44, - "height": 21, + "xpos": 52, + "ypos": 41, + "width": 23, + "height": 20, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_monitor.json b/needles/gnome/apps/apps_run_monitor.json index 7b79e8c8..d9162c15 100644 --- a/needles/gnome/apps/apps_run_monitor.json +++ b/needles/gnome/apps/apps_run_monitor.json @@ -1,15 +1,15 @@ -{ - "area": [ - { - "xpos": 117, - "ypos": 3, - "width": 107, - "height": 24, - "type": "match" - } - ], - "properties": [], - "tags": [ - "apps_run_monitor" - ] +{ + "area": [ + { + "xpos": 489, + "ypos": 141, + "width": 51, + "height": 19, + "type": "match" + } + ], + "properties": [], + "tags": [ + "apps_run_monitor" + ] } \ No newline at end of file diff --git a/needles/gnome/apps/apps_run_nautilus.json b/needles/gnome/apps/apps_run_nautilus.json index 44b5d951..a6002546 100644 --- a/needles/gnome/apps/apps_run_nautilus.json +++ b/needles/gnome/apps/apps_run_nautilus.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 116, - "ypos": 6, - "width": 37, - "height": 17, + "xpos": 157, + "ypos": 86, + "width": 67, + "height": 23, "type": "ocr" } ] diff --git a/needles/gnome/apps/apps_run_photos.json b/needles/gnome/apps/apps_run_photos.json index 60a6f171..e2262d8f 100644 --- a/needles/gnome/apps/apps_run_photos.json +++ b/needles/gnome/apps/apps_run_photos.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 115, - "ypos": 4, - "width": 51, - "height": 20, + "xpos": 458, + "ypos": 338, + "width": 111, + "height": 89, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_screenshot.json b/needles/gnome/apps/apps_run_screenshot.json index 9ff2afb0..209d5efc 100644 --- a/needles/gnome/apps/apps_run_screenshot.json +++ b/needles/gnome/apps/apps_run_screenshot.json @@ -5,9 +5,9 @@ ], "area": [ { - "xpos": 115, - "ypos": 4, - "width": 82, + "xpos": 128, + "ypos": 98, + "width": 115, "height": 21, "type": "match" } diff --git a/needles/gnome/apps/apps_run_settings.json b/needles/gnome/apps/apps_run_settings.json index 6ea0b93a..e64ba22c 100644 --- a/needles/gnome/apps/apps_run_settings.json +++ b/needles/gnome/apps/apps_run_settings.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 115, - "ypos": 6, - "width": 62, - "height": 20, + "xpos": 104, + "ypos": 41, + "width": 61, + "height": 21, "type": "ocr" } ] diff --git a/needles/gnome/apps/apps_run_terminal.json b/needles/gnome/apps/apps_run_terminal.json index 19e08a5c..63b7ec79 100644 --- a/needles/gnome/apps/apps_run_terminal.json +++ b/needles/gnome/apps/apps_run_terminal.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 115, - "ypos": 5, + "xpos": 345, + "ypos": 150, "width": 66, - "height": 19, + "height": 17, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_texteditor.json b/needles/gnome/apps/apps_run_texteditor.json index c9d1b236..18f4f644 100644 --- a/needles/gnome/apps/apps_run_texteditor.json +++ b/needles/gnome/apps/apps_run_texteditor.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 115, - "ypos": 5, - "width": 81, - "height": 18, + "xpos": 501, + "ypos": 39, + "width": 71, + "height": 21, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_videos.json b/needles/gnome/apps/apps_run_videos.json index 02611f7b..3994bdb4 100644 --- a/needles/gnome/apps/apps_run_videos.json +++ b/needles/gnome/apps/apps_run_videos.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 115, - "ypos": 5, + "xpos": 440, + "ypos": 43, "width": 51, - "height": 20, + "height": 17, "type": "match" } ] diff --git a/needles/gnome/apps/apps_run_weather.json b/needles/gnome/apps/apps_run_weather.json index 2f7ad905..5cb05c2d 100644 --- a/needles/gnome/apps/apps_run_weather.json +++ b/needles/gnome/apps/apps_run_weather.json @@ -5,10 +5,10 @@ ], "area": [ { - "xpos": 114, - "ypos": 5, - "width": 66, - "height": 19, + "xpos": 386, + "ypos": 401, + "width": 56, + "height": 18, "type": "match" } ] diff --git a/tests/apps_startstop/gnome/calculator.pm b/tests/apps_startstop/gnome/calculator.pm index 28b4dc4b..39fa4d09 100644 --- a/tests/apps_startstop/gnome/calculator.pm +++ b/tests/apps_startstop/gnome/calculator.pm @@ -9,7 +9,7 @@ sub run { my $self = shift; # Start the application - start_with_launcher('apps_menu_calculator'); + start_with_launcher('apps_menu_calculator', 'apps_menu_utilities'); # Check that it is started assert_screen 'apps_run_calculator'; # Close the application diff --git a/tests/apps_startstop/gnome/dviewer.pm b/tests/apps_startstop/gnome/dviewer.pm index d69de11a..91a32add 100644 --- a/tests/apps_startstop/gnome/dviewer.pm +++ b/tests/apps_startstop/gnome/dviewer.pm @@ -8,7 +8,7 @@ use utils; sub run { my $self = shift; # Start the application - start_with_launcher('apps_menu_dviewer'); + start_with_launcher('apps_menu_dviewer', 'apps_menu_utilities'); # Check that is started assert_screen 'apps_run_dviewer'; # Close the application diff --git a/tests/apps_startstop/gnome/evolution.pm b/tests/apps_startstop/gnome/evolution.pm deleted file mode 100644 index d849a54b..00000000 --- a/tests/apps_startstop/gnome/evolution.pm +++ /dev/null @@ -1,30 +0,0 @@ -use base "installedtest"; -use strict; -use testapi; -use utils; - -# This test checks that Evolution starts. - -sub run { - my $self = shift; - # Start the application - start_with_launcher('apps_menu_evolution'); - # get rid of the welcome screen - if ('apps_run_evolution_warning') { - assert_and_click 'apps_run_evolution_warning'; - } - assert_and_click 'apps_run_evolution_welcome'; - wait_still_screen 2; - # Check that is started - assert_screen 'apps_run_evolution'; - # Close the application - quit_with_shortcut(); -} - -sub test_flags { - return {always_rollback => 1}; -} - -1; - -# vim: set sw=4 et: