Fix typo

lib/desktoptools.pm

@@ -68,14 +68,6 @@ sub check_application_information {
 # you need to start it before running this.
 sub install_application {
     my ($application, $source) = @_;
-    # Sometimes, especially when this method is used several
-    # times in a row, Software can be located on the
-    # installation tab and we need to leave it until
-    # we can proceed.
-    if (check_screen("software_back_button")) {
-        click_lastmatch();
-    }
-
     # For some applications, there are more installation sources
     # available. Pick the desired one.
     if (check_screen("software_sources_available", timeout => 5)) {
@@ -96,6 +88,10 @@ sub install_application {
         $wait_time = 1200;
     }
     assert_screen("gnome_button_open", timeout => $wait_time);
+    # After the installation, return to the previous page.
+    if (check_screen("software_back_button")) {
+        click_lastmatch();
+    }
 }
 
 # This subroutine opens the $application using Gnome Software.
@@ -127,12 +123,6 @@ sub start_application_via_packagemanager {
 # application has been found (or it will fail).
 sub check_app_installed {
     my $application = shift;
-    # It is possible that we still find ourselves in the Installation
-    # pane. In that case, the Installed button is not visible, therefore
-    # we need to go back in the GUI if this is the sitation.
-    unless (check_screen("software_installed_button")) {
-        assert_and_click("software_back_button");
-    }
     # Look for the application and confirm that it is listed as installed
     # in the application overview.
     assert_and_click("gnome_search_button");

needles/gnome/apps/software/software_application_amarok.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 94,
+      "ypos": 510,
+      "width": 140,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_application_amarok"
+  ]
+}

needles/gnome/apps/software/software_application_chess.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 393,
+      "ypos": 613,
+      "width": 181,
+      "height": 29,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_application_chess"
+  ]
+}

needles/gnome/apps/software/software_application_clocks.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 398,
+      "ypos": 498,
+      "width": 121,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_application_clocks"
+  ]
+}

needles/gnome/apps/software/software_category_create.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 209,
+      "ypos": 478,
+      "width": 61,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_category_create"
+  ]
+}

needles/gnome/apps/software/software_category_learn.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 503,
+      "ypos": 560,
+      "width": 58,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_category_learn"
+  ]
+}

needles/gnome/apps/software/software_category_play.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 803,
+      "ypos": 478,
+      "width": 45,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_category_play"
+  ]
+}

needles/gnome/apps/software/software_category_work.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 505,
+      "ypos": 473,
+      "width": 58,
+      "height": 29,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_category_work"
+  ]
+}

needles/gnome/apps/software/software_credits-20230321.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 160,
+      "type": "match",
+      "xpos": 338,
+      "ypos": 201,
+      "height": 20
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_credits"
+  ]
+}

needles/gnome/apps/software/software_description_amarok.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 97,
+      "ypos": 726,
+      "width": 349,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_description_amarok"
+  ]
+}

needles/gnome/apps/software/software_description_chess.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 98,
+      "ypos": 723,
+      "width": 255,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_description_chess"
+  ]
+}

needles/gnome/apps/software/software_description_clocks.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 98,
+      "ypos": 726,
+      "width": 252,
+      "height": 26,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_description_clocks"
+  ]
+}

needles/gnome/apps/software/software_download_size_amarok.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 148,
+      "ypos": 641,
+      "width": 107,
+      "height": 70,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_download_size_amarok"
+  ]
+}

needles/gnome/apps/software/software_download_size_chess.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 144,
+      "ypos": 634,
+      "width": 114,
+      "height": 76,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_download_size_chess"
+  ]
+}

needles/gnome/apps/software/software_download_size_clocks.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 154,
+      "ypos": 640,
+      "width": 96,
+      "height": 70,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_download_size_clocks"
+  ]
+}

needles/gnome/apps/software/software_logo_amarok.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 99,
+      "ypos": 103,
+      "width": 128,
+      "height": 131,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_logo_amarok"
+  ]
+}

needles/gnome/apps/software/software_logo_chess.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 109,
+      "ypos": 109,
+      "width": 101,
+      "height": 117,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_logo_chess"
+  ]
+}

needles/gnome/apps/software/software_logo_clocks.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 106,
+      "ypos": 109,
+      "width": 118,
+      "height": 119,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_logo_clocks"
+  ]
+}

needles/gnome/apps/software/software_menu_about-20230321.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 111,
+      "type": "match",
+      "ypos": 162,
+      "height": 19,
+      "xpos": 857
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_menu_about"
+  ]
+}

needles/gnome/apps/software/software_rating_amarok.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 778,
+      "ypos": 641,
+      "width": 85,
+      "height": 71,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_rating_amarok"
+  ]
+}

needles/gnome/apps/software/software_rating_chess.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 783,
+      "ypos": 639,
+      "width": 79,
+      "height": 76,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_rating_chess"
+  ]
+}

needles/gnome/apps/software/software_rating_clocks.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 786,
+      "ypos": 642,
+      "width": 76,
+      "height": 68,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_rating_clocks"
+  ]
+}

needles/gnome/apps/software/software_safestatus_amarok.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 383,
+      "ypos": 642,
+      "width": 51,
+      "height": 68,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_safestatus_amarok"
+  ]
+}

needles/gnome/apps/software/software_safestatus_chess.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 385,
+      "ypos": 638,
+      "width": 47,
+      "height": 76,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_safestatus_chess"
+  ]
+}

needles/gnome/apps/software/software_safestatus_clocks.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 378,
+      "ypos": 638,
+      "width": 60,
+      "height": 73,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_safestatus_clocks"
+  ]
+}

needles/gnome/apps/software/software_screenshot_amarok.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 171,
+      "ypos": 262,
+      "width": 267,
+      "height": 157,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_screenshot_amarok"
+  ]
+}

needles/gnome/apps/software/software_screenshot_chess.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 381,
+      "ypos": 324,
+      "width": 260,
+      "height": 136,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_screenshot_chess"
+  ]
+}

needles/gnome/apps/software/software_screenshot_clocks.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 371,
+      "ypos": 256,
+      "width": 275,
+      "height": 120,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_screenshot_clocks"
+  ]
+}

needles/gnome/apps/software/software_usage_amarok.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 565,
+      "ypos": 643,
+      "width": 105,
+      "height": 67,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_usage_amarok"
+  ]
+}

needles/gnome/apps/software/software_usage_chess.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 563,
+      "ypos": 637,
+      "width": 101,
+      "height": 75,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_usage_chess"
+  ]
+}

needles/gnome/apps/software/software_usage_clocks.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 570,
+      "ypos": 642,
+      "width": 87,
+      "height": 70,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_usage_clocks"
+  ]
+}

needles/gnome/apps/software/software_webcontent_amarok.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 209,
+      "ypos": 185,
+      "width": 269,
+      "height": 33,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_webcontent_amarok"
+  ]
+}

needles/gnome/apps/software/software_webcontent_chess.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 102,
+      "ypos": 504,
+      "width": 228,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_webcontent_chess"
+  ]
+}

needles/gnome/apps/software/software_webcontent_clocks.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 194,
+      "ypos": 528,
+      "width": 541,
+      "height": 28,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_webcontent_clocks"
+  ]
+}

needles/gnome/apps/software/software_weblink_amarok.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 242,
+      "ypos": 86,
+      "width": 164,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_weblink_amarok"
+  ]
+}

needles/gnome/apps/software/software_weblink_chess.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 240,
+      "ypos": 85,
+      "width": 248,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_weblink_chess"
+  ]
+}

needles/gnome/apps/software/software_weblink_clocks.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 238,
+      "ypos": 85,
+      "width": 332,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_weblink_clocks"
+  ]
+}

needles/gnome/apps/software/software_website_amarok.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 526,
+      "ypos": 273,
+      "width": 164,
+      "height": 43,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_website_amarok"
+  ]
+}

needles/gnome/apps/software/software_website_chess.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 530,
+      "ypos": 544,
+      "width": 223,
+      "height": 42,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_website_chess"
+  ]
+}

needles/gnome/apps/software/software_website_clocks.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 530,
+      "ypos": 526,
+      "width": 295,
+      "height": 40,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "software_website_clocks"
+  ]
+}

tests/applications/software/browse_applications.pm

@@ -25,10 +25,10 @@ sub run {
         assert_and_click("gnome_back_button");
     }
 
-    # Open the Learn category.
-    assert_and_click("software_category_learn");
-    assert_and_click("software_application_octave");
-    check_application_information("octave");
+    # Open the Play category.
+    assert_and_click("software_category_work");
+    assert_and_click("software_application_clocks");
+    check_application_information("clocks");
     # Come back to the main screen
     while (! check_screen("gnome_search_button")) {
         assert_and_click("gnome_back_button");

tests/applications/software/install_flatpak.pm

@@ -15,6 +15,9 @@ sub run {
         restart_application("software");
     }
 
+    # Find the application
+    find_application("inkscape");
+
     # Install the application using Flatpak
     install_application("inkscape", "flatpak");
 

tests/applications/software/install_rpm.pm

@@ -18,12 +18,9 @@ sub run {
     my $self = shift;
 
     unless (get_var("SUBVARIANT") eq "Silverblue") {
-        # Sometimes, after rollback, Software crashes. If it
-        # happens, let's restart it.
-        unless (check_screen("apps_run_software")) {
-            restart_application("software");
-        }
 
+        # Find the application.
+        find_application("mahjongg");
         # Install the application.
         install_application("mahjongg", "rpm");
         wait_still_screen(10);

tests/applications/software/install_rpm_multi.pm

@@ -24,8 +24,11 @@ sub run {
             restart_application("software");
         }
         # Perform all installations one after another.
+        find_application("mahjongg");
         install_application("mahjongg", "rpm");
+        find_application("gvim");
         install_application("gvim", "rpm");
+        find_application("emacs");
         install_application("emacs", "rpm");
 
         # Check that the installations have completed successfully.

tests/applications/software/search_applications.pm

@@ -6,8 +6,9 @@ use desktoptools;
 
 # This script tests if Software can browse through various applications.
 
-# As we cannot browse through all of the applications, we will only focus
-# on three application, for example KTurtle, IDLE3, and Midori.
+# The concept of this is to look for applications using the Search function.
+# We are not going to check for metadata anymore, as this would require
+# another set of needles.
 
 sub run {
     my $self = shift;
@@ -15,19 +16,16 @@ sub run {
     # Find KTurtle and check for its details,
     # use a keyword.
     find_application("educational");
-    check_application_information("educational");
     assert_and_click("gnome_back_button");
 
     # Find IDLE3 and check for its details,
     # use a name.
     find_application("idle3");
-    check_application_information("idle3");
     assert_and_click("gnome_back_button");
 
     # Find Midori and check for its details
     # use a category.
     find_application("browser");
-    check_application_information("browser");
     assert_and_click("gnome_back_button");
 }