Create procedures for XFCE desktop.

Create methods to accept the xfce desktop.
Add some test cases to check.

lib/utils.pm

@@ -677,17 +677,17 @@ sub start_with_command {
 # Open the DE application launcher and type the name of application into it.
 # Hit enter to run this application.
 
-my ($command) = @_;
+    my ($command) = @_;
-my $desktop = get_var('DESKTOP');
+    my $desktop = get_var('DESKTOP');
 
-# Open the launching page or menu
+    # Open the launching page or menu
-if ($desktop eq 'xfce') {
+    if ($desktop eq 'xfce') {
         send_key 'alt-f2';
         }
-else {
+    else {
         send_key 'alt-f1';
         }
-sleep 2;
+    sleep 2;
 
 # Type the command name to run the application
 type_very_safely $command;

needles/xfce/apps/claws_runs.json

@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "claws_runs"
+  ],
+  "area": [
+    {
+      "xpos": 71,
+      "ypos": 69,
+      "width": 21,
+      "height": 22,
+      "type": "match"
+    }
+  ]
+}

needles/xfce/apps/claws_save.json

@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "claws_save"
+  ],
+  "area": [
+    {
+      "xpos": 540,
+      "ypos": 580,
+      "width": 23,
+      "height": 26,
+      "type": "match"
+    }
+  ]
+}

needles/xfce/apps/claws_welcome.json

@@ -0,0 +1,17 @@
+{
+  "properties": [],
+  "tags": [
+    "claws_forward",
+    "claws_welcome",
+    ""
+  ],
+  "area": [
+    {
+      "xpos": 422,
+      "ypos": 581,
+      "width": 26,
+      "height": 23,
+      "type": "match"
+    }
+  ]
+}

needles/xfce/apps/printer_runs.json

@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "printer_runs"
+  ],
+  "area": [
+    {
+      "xpos": 294,
+      "ypos": 257,
+      "width": 27,
+      "height": 20,
+      "type": "match"
+    }
+  ]
+}

needles/xfce/apps/thunar_runs.json

@@ -5,10 +5,10 @@
   ],
   "area": [
     {
-      "xpos": 6,
+      "xpos": 267,
-      "ypos": 37,
+      "ypos": 39,
-      "width": 28,
+      "width": 90,
-      "height": 20,
+      "height": 17,
       "type": "match"
     }
   ]

needles/xfce/apps/users_runs.json

@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "users_runs"
+  ],
+  "area": [
+    {
+      "xpos": 130,
+      "ypos": 115,
+      "width": 27,
+      "height": 20,
+      "type": "match"
+    }
+  ]
+}

needles/xfce/graphical_desktop_clean_xfce.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 741,
+      "ypos": 1,
+      "width": 169,
+      "height": 27,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "graphical_desktop_clean",
+    "workspace"
+  ]
+}

needles/xfce/login_xfce.json

@@ -0,0 +1,18 @@
+{
+  "properties": [],
+  "tags": [
+    "graphical_login",
+    "login_screen",
+    "DESKTOP-xfce",
+    "LANGUAGE-english"
+  ],
+  "area": [
+    {
+      "xpos": 603,
+      "ypos": 428,
+      "width": 46,
+      "height": 18,
+      "type": "match"
+    }
+  ]
+}

needles/xfce/xfce_live_login.json

@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "xpos": 607,
+      "ypos": 421,
+      "width": 15,
+      "height": 10,
+      "type": "match"
+    },
+    {
+      "xpos": 601,
+      "ypos": 414,
+      "width": 45,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "xfce_live_login"
+  ]
+}

needles/xfce/xfce_login_input.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 457,
+      "ypos": 371,
+      "width": 209,
+      "height": 40,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "graphical_login_input"
+  ]
+}

tests/_boot_to_anaconda.pm

@@ -56,8 +56,20 @@ sub run {
         } else {
             # on lives, we have to explicitly launch anaconda
             if (get_var('LIVE')) {
+                # Handle XFCE live login
+                if (get_var('DESKTOP') eq 'xfce') {
+                    assert_and_click 'xfce_live_login';
+                    wait_still_screen 5;
+                    send_key 'alt-f2';
+                    wait_still_screen 2;
+                    type_very_safely 'liveinst';
+                    send_key 'ret';
+                    #assert_and_click("live_start_anaconda_icon", button => 'left', dclick => 1);
+                }
+                else {
                     assert_and_click "live_start_anaconda_icon", '', 300;
                 }
+            }
             my $language = get_var('LANGUAGE') || 'english';
             # wait for anaconda to appear; we click to work around
             # RHBZ #1566066 if it happens

tests/apps_startstop/xfce/claws.pm

@@ -0,0 +1,39 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This test checks that Claws starts.
+
+sub run {
+    my $self = shift;
+    my $mode = get_var('MODE');
+    
+    # Start the application
+    if ($mode eq 'fast') {
+        start_with_command 'claws-mail';
+    }
+    else {
+        #start_with_launcher('konsole_launch','menu_applications','menu_system');
+        sleep 1;
+    }
+    # Click through setup wizard
+    while (check_screen('claws_forward',1)) {
+        assert_and_click 'claws_forward';
+        wait_still_screen 2;
+    }
+    assert_and_click 'claws_save';
+    # Check that it is started
+    assert_screen 'claws_runs';
+    # Close the application
+    quit_with_shortcut();
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+
+1;
+
+# vim: set sw=4 et:

tests/apps_startstop/xfce/printer.pm

@@ -0,0 +1,33 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This test checks that Printer Settings starts.
+
+sub run {
+    my $self = shift;
+    my $mode = get_var('MODE');
+    
+    # Start the application
+    if ($mode eq 'fast') {
+        start_with_command 'system-config-printer';
+    }
+    else {
+        #start_with_launcher('konsole_launch','menu_applications','menu_system');
+        sleep 1;
+    }
+    # Check that it is started
+    assert_screen 'printer_runs';
+    # Close the application
+    quit_with_shortcut();
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+
+1;
+
+# vim: set sw=4 et:

tests/apps_startstop/xfce/specimen.pm

@@ -3,7 +3,7 @@ use strict;
 use testapi;
 use utils;
 
-# This test checks that application starts.
+# This test checks that Users starts.
 
 sub run {
     my $self = shift;
@@ -11,14 +11,14 @@ sub run {
     
     # Start the application
     if ($mode eq 'fast') {
-        start_with_command '';
+        start_with_command 'system_config_users';
     }
     else {
         #start_with_launcher('konsole_launch','menu_applications','menu_system');
         sleep 1;
     }
     # Check that it is started
-    assert_screen '_runs';
+    assert_screen 'users_runs';
     # Close the application
     quit_with_shortcut();
 }

tests/apps_startstop/xfce/users.pm

@@ -0,0 +1,33 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This test checks that Users starts.
+
+sub run {
+    my $self = shift;
+    my $mode = get_var('MODE');
+    
+    # Start the application
+    if ($mode eq 'fast') {
+        start_with_command 'system-config-users';
+    }
+    else {
+        #start_with_launcher('konsole_launch','menu_applications','menu_system');
+        sleep 1;
+    }
+    # Check that it is started
+    assert_screen 'users_runs';
+    # Close the application
+    quit_with_shortcut();
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+
+1;
+
+# vim: set sw=4 et: