diff --git a/tests/apps_startstop/kde/mahjong.pm b/tests/apps_startstop/kde/kmahjong.pm similarity index 86% rename from tests/apps_startstop/kde/mahjong.pm rename to tests/apps_startstop/kde/kmahjong.pm index 5681d4f1..bb1ed664 100644 --- a/tests/apps_startstop/kde/mahjong.pm +++ b/tests/apps_startstop/kde/kmahjong.pm @@ -11,7 +11,7 @@ sub run { # Start the application menu_launch_type 'kmahjong'; # Check that it is started - assert_screen 'mahjong_runs', timeout => 60; + assert_screen 'apps_run_kmahjong', timeout => 60; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/kmail.pm b/tests/apps_startstop/kde/kmail.pm index fcb94334..2e4d0174 100644 --- a/tests/apps_startstop/kde/kmail.pm +++ b/tests/apps_startstop/kde/kmail.pm @@ -17,7 +17,7 @@ sub run { # Click on the exit icon assert_and_click("kde_exit_icon"); } - assert_screen("kmail_runs"); + assert_screen("apps_run_kmail"); # Close the application quit_with_shortcut(); diff --git a/tests/apps_startstop/kde/kmail_header.pm b/tests/apps_startstop/kde/kmail_header.pm index e66ec11c..fb16247e 100644 --- a/tests/apps_startstop/kde/kmail_header.pm +++ b/tests/apps_startstop/kde/kmail_header.pm @@ -11,7 +11,7 @@ sub run { # Start the application menu_launch_type 'kmail header'; # Check that the application runs - assert_screen 'kmail_hedit_runs', timeout => 60; + assert_screen 'apps_run_kmail_header', timeout => 60; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/minesweeper.pm b/tests/apps_startstop/kde/kmines.pm similarity index 86% rename from tests/apps_startstop/kde/minesweeper.pm rename to tests/apps_startstop/kde/kmines.pm index 03eced94..20fa9cd9 100644 --- a/tests/apps_startstop/kde/minesweeper.pm +++ b/tests/apps_startstop/kde/kmines.pm @@ -11,7 +11,7 @@ sub run { # Start the application menu_launch_type 'kmines'; # Check that it is started - assert_screen 'minesweeper_runs', timeout => 60; + assert_screen 'apps_run_kmines', timeout => 60; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/kmouth.pm b/tests/apps_startstop/kde/kmouth.pm index 024869b7..fa48bff5 100644 --- a/tests/apps_startstop/kde/kmouth.pm +++ b/tests/apps_startstop/kde/kmouth.pm @@ -25,7 +25,7 @@ sub run { # July 19th, I realized that kmouth test has been failing, # but it seems that it takes more time to run than # the needle is willing to wait. Adding wait time. - assert_screen('kmouth_runs', timeout => 300); + assert_screen('apps_run_kmouth', timeout => 300); # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/kolourpaint.pm b/tests/apps_startstop/kde/kolourpaint.pm index 261d38fa..00e12cd3 100644 --- a/tests/apps_startstop/kde/kolourpaint.pm +++ b/tests/apps_startstop/kde/kolourpaint.pm @@ -11,7 +11,7 @@ sub run { # Start the application menu_launch_type 'kolourpaint'; # Check that it is started - assert_screen 'kolourpaint_runs', timeout => 60; + assert_screen 'apps_run_kolourpaint', timeout => 60; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/konsole.pm b/tests/apps_startstop/kde/konsole.pm index 0ed45e60..068451eb 100644 --- a/tests/apps_startstop/kde/konsole.pm +++ b/tests/apps_startstop/kde/konsole.pm @@ -11,7 +11,7 @@ sub run { # Start the application menu_launch_type 'konsole'; # Check that it is started - assert_screen 'konsole_runs', timeout => 60; + assert_screen 'apps_run_konsole', timeout => 60; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/kontakt.pm b/tests/apps_startstop/kde/kontakt.pm index 44aa0a3d..20305282 100644 --- a/tests/apps_startstop/kde/kontakt.pm +++ b/tests/apps_startstop/kde/kontakt.pm @@ -17,7 +17,7 @@ sub run { assert_and_click("kde_exit_icon"); } # Check that the application window is there. - assert_screen 'kontact_runs'; + assert_screen 'apps_run_kontact'; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/konversation.pm b/tests/apps_startstop/kde/konversation.pm index 34e9a646..17f51aa2 100644 --- a/tests/apps_startstop/kde/konversation.pm +++ b/tests/apps_startstop/kde/konversation.pm @@ -17,7 +17,7 @@ sub run { # Connect to Freenode assert_and_click "${app}_connect", timeout => 60 if ($app eq 'konversation'); # Check that it is started - assert_screen "${app}_runs"; + assert_screen "apps_run_${app}"; # Close the application if ($app eq 'konversation') { send_key 'alt-f4'; diff --git a/tests/apps_startstop/kde/korganizer.pm b/tests/apps_startstop/kde/korganizer.pm index 2297a7bd..d1ff6f6e 100644 --- a/tests/apps_startstop/kde/korganizer.pm +++ b/tests/apps_startstop/kde/korganizer.pm @@ -11,7 +11,7 @@ sub run { # Start the application menu_launch_type 'korganizer'; # Check that it is started - assert_screen 'korganizer_runs', timeout => 60; + assert_screen 'apps_run_korganizer', timeout => 60; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/kparted.pm b/tests/apps_startstop/kde/kparted.pm index b3362cc0..a47a11fc 100644 --- a/tests/apps_startstop/kde/kparted.pm +++ b/tests/apps_startstop/kde/kparted.pm @@ -16,7 +16,7 @@ sub run { send_key 'ret'; wait_still_screen 2; # Check that it is started - assert_screen 'kparted_runs'; + assert_screen 'apps_run_kparted'; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/patience.pm b/tests/apps_startstop/kde/kpatience.pm similarity index 86% rename from tests/apps_startstop/kde/patience.pm rename to tests/apps_startstop/kde/kpatience.pm index eb1ce185..e5cad2bc 100644 --- a/tests/apps_startstop/kde/patience.pm +++ b/tests/apps_startstop/kde/kpatience.pm @@ -11,7 +11,7 @@ sub run { # Start the application menu_launch_type 'kpatience'; # Check that it is started - assert_screen 'patience_runs', timeout => 60; + assert_screen 'apps_run_kpatience', timeout => 60; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/krdc.pm b/tests/apps_startstop/kde/krdc.pm index d49e79c1..d3b34d60 100644 --- a/tests/apps_startstop/kde/krdc.pm +++ b/tests/apps_startstop/kde/krdc.pm @@ -11,7 +11,7 @@ sub run { # Start the application menu_launch_type 'krdc'; # Check that it is started - assert_screen 'krdc_runs', timeout => 60; + assert_screen 'apps_run_krdc', timeout => 60; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/krfb.pm b/tests/apps_startstop/kde/krfb.pm index d67643d4..3a596703 100644 --- a/tests/apps_startstop/kde/krfb.pm +++ b/tests/apps_startstop/kde/krfb.pm @@ -11,15 +11,15 @@ sub run { # Start the application menu_launch_type 'krfb'; # Check that it is started - assert_screen ['krfb_runs', 'kde_cancel_button'], timeout => 60; + assert_screen ['apps_run_krfb', 'kde_cancel_button'], timeout => 60; # we may see *two* cancel buttons - one for remote control # permissions, one for kwallet if (match_has_tag 'kde_cancel_button') { click_lastmatch; - assert_screen ['krfb_runs', 'kde_cancel_button']; + assert_screen ['apps_run_krfb', 'kde_cancel_button']; if (match_has_tag 'kde_cancel_button') { click_lastmatch; - assert_screen 'krfb_runs'; + assert_screen 'apps_run_krfb'; } } wait_still_screen(3); diff --git a/tests/apps_startstop/kde/ktnef.pm b/tests/apps_startstop/kde/ktnef.pm index f955f857..fe9cecfd 100644 --- a/tests/apps_startstop/kde/ktnef.pm +++ b/tests/apps_startstop/kde/ktnef.pm @@ -11,7 +11,7 @@ sub run { # Start the application menu_launch_type 'ktnef'; # Check that it is started - assert_screen 'ktnef_runs', timeout => 60; + assert_screen 'apps_run_ktnef', timeout => 60; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/kwallet.pm b/tests/apps_startstop/kde/kwallet.pm index c2021ecc..e74a367e 100644 --- a/tests/apps_startstop/kde/kwallet.pm +++ b/tests/apps_startstop/kde/kwallet.pm @@ -11,7 +11,7 @@ sub run { # Start the application menu_launch_type 'kwallet'; # Check that it is started - assert_screen 'kwallet_runs', timeout => 60; + assert_screen 'apps_run_kwallet', timeout => 60; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/kwrite.pm b/tests/apps_startstop/kde/kwrite.pm index 0ea9f1b4..c2617af8 100644 --- a/tests/apps_startstop/kde/kwrite.pm +++ b/tests/apps_startstop/kde/kwrite.pm @@ -11,7 +11,7 @@ sub run { # Start the application menu_launch_type 'kwrite'; # Check that it is started - assert_screen 'kwrite_runs', timeout => 60; + assert_screen 'apps_run_kwrite', timeout => 60; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/lcalc.pm b/tests/apps_startstop/kde/lcalc.pm index 43192181..fc39d47a 100644 --- a/tests/apps_startstop/kde/lcalc.pm +++ b/tests/apps_startstop/kde/lcalc.pm @@ -10,7 +10,7 @@ sub run { # Start the application menu_launch_type 'libreoffice calc'; # Check that it is started - assert_screen 'lcalc_runs', timeout => 60; + assert_screen 'apps_run_calc', timeout => 60; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/limpress.pm b/tests/apps_startstop/kde/limpress.pm index d48915c1..ec4778d2 100644 --- a/tests/apps_startstop/kde/limpress.pm +++ b/tests/apps_startstop/kde/limpress.pm @@ -10,7 +10,7 @@ sub run { # Start the application menu_launch_type 'libreoffice impress'; # Check that it is started - assert_screen 'limpress_runs', timeout => 60; + assert_screen 'apps_run_impress', timeout => 60; # Close the template chooser, then the application send_key 'esc'; quit_with_shortcut(); diff --git a/tests/apps_startstop/kde/lwriter.pm b/tests/apps_startstop/kde/lwriter.pm index 3e330ff6..4866d725 100644 --- a/tests/apps_startstop/kde/lwriter.pm +++ b/tests/apps_startstop/kde/lwriter.pm @@ -10,7 +10,7 @@ sub run { # Start the application menu_launch_type 'libreoffice writer'; # Check that it is started - assert_screen 'lwriter_runs'; + assert_screen 'apps_run_writer'; quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/mediawriter.pm b/tests/apps_startstop/kde/mediawriter.pm index 0ad3da3c..9481a6bd 100644 --- a/tests/apps_startstop/kde/mediawriter.pm +++ b/tests/apps_startstop/kde/mediawriter.pm @@ -11,7 +11,7 @@ sub run { # Start the application menu_launch_type 'media writer'; # Check that it is started - assert_screen 'fmw_runs', timeout => 60; + assert_screen 'apps_run_media-writer', timeout => 60; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/pimexporter.pm b/tests/apps_startstop/kde/pimexporter.pm index 9d98c2ad..b56c44ee 100644 --- a/tests/apps_startstop/kde/pimexporter.pm +++ b/tests/apps_startstop/kde/pimexporter.pm @@ -11,7 +11,7 @@ sub run { # Start the application menu_launch_type 'pim'; # Check that it is started - assert_screen 'pimexporter_runs', timeout => 60; + assert_screen 'apps_run_pim', timeout => 60; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/spectacle.pm b/tests/apps_startstop/kde/spectacle.pm index 09a019ff..ee9d4861 100644 --- a/tests/apps_startstop/kde/spectacle.pm +++ b/tests/apps_startstop/kde/spectacle.pm @@ -11,7 +11,7 @@ sub run { # Start the application menu_launch_type 'spectacle'; # Check that it is started - assert_screen 'spectacle_runs', timeout => 60; + assert_screen 'apps_run_spectacle', timeout => 60; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/system_settings.pm b/tests/apps_startstop/kde/system_settings.pm index 1884e598..9ca92a8f 100644 --- a/tests/apps_startstop/kde/system_settings.pm +++ b/tests/apps_startstop/kde/system_settings.pm @@ -11,7 +11,7 @@ sub run { # Start the application menu_launch_type 'system settings'; # Check that it is started - assert_screen 'system_settings_runs', timeout => 60; + assert_screen 'apps_run_system-settings', timeout => 60; # Close the application quit_with_shortcut(); } diff --git a/tests/apps_startstop/kde/vault.pm b/tests/apps_startstop/kde/vault.pm index 7d8af49c..8b231cde 100644 --- a/tests/apps_startstop/kde/vault.pm +++ b/tests/apps_startstop/kde/vault.pm @@ -23,7 +23,7 @@ sub run { assert_and_click "vault_menu_create_new"; # A vault creation dialog should appear - assert_screen "vault_dialog_runs"; + assert_screen "apps_run_vault-dialog"; # Check that a correct backend is available assert_screen "vault_backend_available";