diff --git a/tests/apps_startstop/kde/dolphin.pm b/tests/apps_startstop/kde/dolphin.pm index 0c955b53..6b56ee48 100644 --- a/tests/apps_startstop/kde/dolphin.pm +++ b/tests/apps_startstop/kde/dolphin.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('dolphin_launch','menu_applications','menu_system'); + if ($mode eq 'fast') { + start_with_command 'dolphin'; + } + else { + start_with_launcher('dolphin_launch','menu_applications','menu_system'); + } # Check that it is started assert_screen 'dolphin_runs'; # Close the application diff --git a/tests/apps_startstop/kde/falkon.pm b/tests/apps_startstop/kde/falkon.pm index 3584bb29..29339825 100644 --- a/tests/apps_startstop/kde/falkon.pm +++ b/tests/apps_startstop/kde/falkon.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('falkon_launch','menu_applications','menu_internet'); + if ($mode eq 'fast') { + start_with_command 'falkon'; + } + else { + start_with_launcher('falkon_launch','menu_applications','menu_internet'); + } # Check that it is started assert_screen 'falkon_runs'; # Close the application diff --git a/tests/apps_startstop/kde/firefox.pm b/tests/apps_startstop/kde/firefox.pm index 0c4569f5..f08e4971 100644 --- a/tests/apps_startstop/kde/firefox.pm +++ b/tests/apps_startstop/kde/firefox.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('firefox_launch','menu_applications','menu_internet'); + if ($mode eq 'fast') { + start_with_command 'firefox'; + } + else { + start_with_launcher('firefox_launch','menu_applications','menu_internet'); + } # Check that it is started; this needle is from # needles/firefox, it already existed before the 'apps' tests # were created diff --git a/tests/apps_startstop/kde/firewall.pm b/tests/apps_startstop/kde/firewall.pm index d54b9a54..184acc41 100644 --- a/tests/apps_startstop/kde/firewall.pm +++ b/tests/apps_startstop/kde/firewall.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('firewall_launch', 'menu_applications','menu_administration'); + if ($mode eq 'fast') { + start_with_command 'firewall'; + } + else { + start_with_launcher('firewall_launch', 'menu_applications','menu_administration'); + } # Firewall requires password to be entered and confirmed to start. type_very_safely(get_var('ROOT_PASSWORD','weakpassword')); send_key 'ret'; diff --git a/tests/apps_startstop/kde/gwenview.pm b/tests/apps_startstop/kde/gwenview.pm index 08d2b50b..8ddd7b53 100644 --- a/tests/apps_startstop/kde/gwenview.pm +++ b/tests/apps_startstop/kde/gwenview.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('gwenview_launch','menu_applications','menu_graphics'); + if ($mode eq 'fast') { + start_with_command 'gwenview'; + } + else { + start_with_launcher('gwenview_launch','menu_applications','menu_graphics'); + } # Check that it is started assert_screen 'gwenview_runs'; # Close the application diff --git a/tests/apps_startstop/kde/help.pm b/tests/apps_startstop/kde/help.pm index 680fa4b3..63f3179a 100644 --- a/tests/apps_startstop/kde/help.pm +++ b/tests/apps_startstop/kde/help.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('help_launch','menu_applications'); + if ($mode eq 'fast') { + start_with_command 'help'; + } + else { + start_with_launcher('help_launch','menu_applications'); + } # Check that it is started assert_screen 'help_runs'; # Close the application diff --git a/tests/apps_startstop/kde/infocenter.pm b/tests/apps_startstop/kde/infocenter.pm index e351c5c6..4617e73e 100644 --- a/tests/apps_startstop/kde/infocenter.pm +++ b/tests/apps_startstop/kde/infocenter.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('infocenter_launch','menu_applications','menu_system'); + if ($mode eq 'fast') { + start_with_command 'info'; + } + else { + start_with_launcher('infocenter_launch','menu_applications','menu_system'); + } # Check that it is started assert_screen 'infocenter_runs'; # Close the application diff --git a/tests/apps_startstop/kde/juk.pm b/tests/apps_startstop/kde/juk.pm index 4d568c5d..afff0106 100644 --- a/tests/apps_startstop/kde/juk.pm +++ b/tests/apps_startstop/kde/juk.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('juk_launch','menu_applications','menu_multimedia'); + if ($mode eq '[ast') { + start_with_command 'juk'; + } + else { + start_with_launcher('juk_launch','menu_applications','menu_multimedia'); + } # Dismiss a setting window assert_and_click 'juk_cancel'; wait_still_screen 2; diff --git a/tests/apps_startstop/kde/k3b.pm b/tests/apps_startstop/kde/k3b.pm index abf7012d..55b5976f 100644 --- a/tests/apps_startstop/kde/k3b.pm +++ b/tests/apps_startstop/kde/k3b.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('k3b_launch','menu_applications','menu_multimedia'); + if ($mode eq 'fast') { + start_with_command 'k3b'; + } + else { + start_with_launcher('k3b_launch','menu_applications','menu_multimedia'); + } # Get rid of no burner warning assert_and_click 'k3b_burner_warning'; # Check that it is started diff --git a/tests/apps_startstop/kde/kaddressbook.pm b/tests/apps_startstop/kde/kaddressbook.pm index f7ff221d..3322e747 100644 --- a/tests/apps_startstop/kde/kaddressbook.pm +++ b/tests/apps_startstop/kde/kaddressbook.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('kaddressbook_launch','menu_applications','menu_office'); + if ($mode eq 'fast') { + start_with_command 'kaddressbook'; + } + else { + start_with_launcher('kaddressbook_launch','menu_applications','menu_office'); + } # Check that it is started assert_screen 'kaddressbook_runs'; # Close the application diff --git a/tests/apps_startstop/kde/kcalc.pm b/tests/apps_startstop/kde/kcalc.pm index ae62c749..f46d92fd 100644 --- a/tests/apps_startstop/kde/kcalc.pm +++ b/tests/apps_startstop/kde/kcalc.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('kcalc_launch','menu_applications','menu_utilities'); + if ($mode eq '[ast') { + start_with_command 'kcalc'; + } + else { + start_with_launcher('kcalc_launch','menu_applications','menu_utilities'); + } # Check that it is started assert_screen 'kcalc_runs'; # Close the application diff --git a/tests/apps_startstop/kde/kcharselect.pm b/tests/apps_startstop/kde/kcharselect.pm index 11bbbf77..1c8eee37 100644 --- a/tests/apps_startstop/kde/kcharselect.pm +++ b/tests/apps_startstop/kde/kcharselect.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('kcharselect_launch','menu_applications','menu_utilities'); + if ($mode eq 'fast') { + start_with_command 'kcharselect'; + } + else { + start_with_launcher('kcharselect_launch','menu_applications','menu_utilities'); + } # Check that it is started assert_screen 'kcharselect_runs'; # Close the application diff --git a/tests/apps_startstop/kde/kcolorchooser.pm b/tests/apps_startstop/kde/kcolorchooser.pm index c1f3d076..713a0613 100644 --- a/tests/apps_startstop/kde/kcolorchooser.pm +++ b/tests/apps_startstop/kde/kcolorchooser.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('menu_graphics_more_apps', 'menu_applications','menu_graphics'); + if ($mode eq 'fast') { + start_with_command 'kcolorchooser'; + } + else { + start_with_launcher('menu_graphics_more_apps', 'menu_applications','menu_graphics'); + } # Games are hidden even deeper in menus, so let us fix that here. assert_and_click 'kcolorchooser_launch'; wait_still_screen 2; diff --git a/tests/apps_startstop/kde/kfind.pm b/tests/apps_startstop/kde/kfind.pm index e605d305..20d2d4d3 100644 --- a/tests/apps_startstop/kde/kfind.pm +++ b/tests/apps_startstop/kde/kfind.pm @@ -7,9 +7,15 @@ use utils; sub run { my $self = shift; + my $mode = get_var('MODE'); # Start the application - start_with_launcher('kfind_launch','menu_applications','menu_utilities'); + if ($mode eq 'fast') { + start_with_command 'kfind'; + } + else { + start_with_launcher('kfind_launch','menu_applications','menu_utilities'); + } # Check that it is started assert_screen 'kfind_runs'; # Close the application