From 5da31cbd4dc7b5e08136012c175112c7bff0e0cc Mon Sep 17 00:00:00 2001 From: Lukas Ruzicka Date: Tue, 7 May 2019 16:08:54 +0200 Subject: [PATCH] Other tests. --- tests/apps_startstop/kde/abrt.pm | 8 +++----- tests/apps_startstop/kde/krusader.pm | 8 +++++++- tests/apps_startstop/kde/ksysguard.pm | 8 +++++++- tests/apps_startstop/kde/ktnef.pm | 8 +++++++- tests/apps_startstop/kde/ktorrent.pm | 8 +++++++- tests/apps_startstop/kde/kwallet.pm | 8 +++++++- tests/apps_startstop/kde/kwrite.pm | 8 +++++++- tests/apps_startstop/kde/language.pm | 8 +++++++- tests/apps_startstop/kde/mahjong.pm | 8 +++++++- tests/apps_startstop/kde/mediawriter.pm | 8 +++++++- 10 files changed, 66 insertions(+), 14 deletions(-) diff --git a/tests/apps_startstop/kde/abrt.pm b/tests/apps_startstop/kde/abrt.pm index 02243324..2b4669b7 100644 --- a/tests/apps_startstop/kde/abrt.pm +++ b/tests/apps_startstop/kde/abrt.pm @@ -9,14 +9,12 @@ sub run { my $self = shift; my $mode = get_var('MODE'); + # Start the application if ($mode eq 'fast') { - - # Start the application - start_with_launcher('abrt_launch', 'menu_applications','menu_system'); + start_with_command('abrt'); } else { - # Start the application via command. - start_with_command('abrt'); + start_with_launcher('abrt_launch', 'menu_applications','menu_system'); } # Check that it is started assert_screen 'abrt_runs'; diff --git a/tests/apps_startstop/kde/krusader.pm b/tests/apps_startstop/kde/krusader.pm index 98b3717c..d86d4c33 100644 --- a/tests/apps_startstop/kde/krusader.pm +++ b/tests/apps_startstop/kde/krusader.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('krusader_launch','menu_applications','menu_utilities'); + if ($mode eq 'fast') { + start_with_command 'krusader'; + } + else { + start_with_launcher('krusader_launch','menu_applications','menu_utilities'); + } # Deal with the welcome screens while (check_screen('krusader_welcome', '1')){ assert_and_click 'krusader_welcome'; diff --git a/tests/apps_startstop/kde/ksysguard.pm b/tests/apps_startstop/kde/ksysguard.pm index 86bfb475..fab3ac5c 100644 --- a/tests/apps_startstop/kde/ksysguard.pm +++ b/tests/apps_startstop/kde/ksysguard.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('ksysguard_launch','menu_applications','menu_system'); + if ($mode eq 'fast') { + start_with_command 'ksysguard'; + } + else { + start_with_launcher('ksysguard_launch','menu_applications','menu_system'); + } # Check that it is started assert_screen 'ksysguard_runs'; # Close the application diff --git a/tests/apps_startstop/kde/ktnef.pm b/tests/apps_startstop/kde/ktnef.pm index b54069b1..4f10ed9c 100644 --- a/tests/apps_startstop/kde/ktnef.pm +++ b/tests/apps_startstop/kde/ktnef.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('ktnef_launch','menu_applications','menu_internet'); + if ($mode eq 'fast') { + start_with_command 'ktnef'; + } + else { + start_with_launcher('ktnef_launch','menu_applications','menu_internet'); + } # Check that it is started assert_screen 'ktnef_runs'; # Close the application diff --git a/tests/apps_startstop/kde/ktorrent.pm b/tests/apps_startstop/kde/ktorrent.pm index f1e4c428..96239dd3 100644 --- a/tests/apps_startstop/kde/ktorrent.pm +++ b/tests/apps_startstop/kde/ktorrent.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('ktorrent_launch','menu_applications','menu_internet'); + if ($mode eq 'fast') { + start_with_command 'ktorrent'; + } + else { + start_with_launcher('ktorrent_launch','menu_applications','menu_internet'); + } # Check that it is started assert_screen 'ktorrent_runs'; # Close the application diff --git a/tests/apps_startstop/kde/kwallet.pm b/tests/apps_startstop/kde/kwallet.pm index bddf00b9..4f5621fa 100644 --- a/tests/apps_startstop/kde/kwallet.pm +++ b/tests/apps_startstop/kde/kwallet.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('kwallet_launch','menu_applications','menu_system'); + if ($mode eq 'fast') { + start_with_command 'kwallet'; + } + else { + start_with_launcher('kwallet_launch','menu_applications','menu_system'); + } # Check that it is started assert_screen 'kwallet_runs'; # Close the application diff --git a/tests/apps_startstop/kde/kwrite.pm b/tests/apps_startstop/kde/kwrite.pm index df640825..255acba5 100644 --- a/tests/apps_startstop/kde/kwrite.pm +++ b/tests/apps_startstop/kde/kwrite.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('kwrite_launch','menu_applications','menu_utilities'); + if ($mode eq 'fast') { + start_with_command 'kwrite'; + } + else { + start_with_launcher('kwrite_launch','menu_applications','menu_utilities'); + } # Check that it is started assert_screen 'kwrite_runs'; # Close the application diff --git a/tests/apps_startstop/kde/language.pm b/tests/apps_startstop/kde/language.pm index 672531e2..16df4953 100644 --- a/tests/apps_startstop/kde/language.pm +++ b/tests/apps_startstop/kde/language.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('language_launch', 'menu_applications','menu_administration'); + if ($mode eq 'fast') { + start_with_command 'language'; + } + else { + start_with_launcher('language_launch', 'menu_applications','menu_administration'); + } # Deal with confirmation window type_very_safely(get_var('USER_PASSWORD', 'weakpassword')); send_key 'ret'; diff --git a/tests/apps_startstop/kde/mahjong.pm b/tests/apps_startstop/kde/mahjong.pm index 49b378b5..609c94bb 100644 --- a/tests/apps_startstop/kde/mahjong.pm +++ b/tests/apps_startstop/kde/mahjong.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('menu_boardgames', 'menu_applications','menu_games'); + if ($mode eq 'fast') { + start_with_command 'kmahjong'; + } + else { + start_with_launcher('menu_boardgames', 'menu_applications','menu_games'); + } # Games are hidden even deeper in menus, so let us fix that here. assert_and_click 'mahjong_launch'; wait_still_screen 2; diff --git a/tests/apps_startstop/kde/mediawriter.pm b/tests/apps_startstop/kde/mediawriter.pm index 9b566dbf..10c69c0e 100644 --- a/tests/apps_startstop/kde/mediawriter.pm +++ b/tests/apps_startstop/kde/mediawriter.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('fmw_launch','menu_applications','menu_system'); + if ($mode eq 'fast') { + start_with_command 'mediawriter'; + } + else { + start_with_launcher('fmw_launch','menu_applications','menu_system'); + } # Check that it is started assert_screen 'fmw_runs'; # Close the application