Refactor integration tests to use new mounting functions and update shortcut paths

Author: AlixANNERAUD

Modules/Executables/Shell/Graphical/Tests/Integration_test.rs

@@ -11,11 +11,12 @@ use Graphical_shell::Shell_executable_type;
 #[test]
 fn main() {
     use Drivers::Native::Window_screen;
-    use File_system::{Flags_type, Open_type, Permissions_type};
+    use Executable::Mount_static_executables;
+    use File_system::{Flags_type, Open_type};
     use Graphics::{Get_minimal_buffer_size, Input_type_type, Point_type};
     use Users::Group_identifier_type;
 
-    use Virtual_file_system::File_type;
+    use Virtual_file_system::{File_type, Mount_static_devices};
 
     // - Initialize the task manager.
     let Task_instance = Task::Initialize().unwrap();
@@ -60,57 +61,34 @@ fn main() {
     Virtual_file_system::Create_default_hierarchy(Virtual_file_system::Get_instance(), Task)
         .unwrap();
 
-    Virtual_file_system::Get_instance()
-        .Mount_static_device(
-            Task,
-            &"/Binaries/Graphical_shell",
-            Create_device!(Shell_executable_type),
-        )
-        .unwrap();
-
-    Virtual_file_system::Get_instance()
-        .Mount_static_device(
-            Task,
-            &"/Binaries/Command_line_shell",
-            Create_device!(Shell_executable_type),
-        )
-        .unwrap();
-
-    Virtual_file_system::Get_instance()
-        .Set_permissions("/Binaries/Command_line_shell", Permissions_type::Executable)
-        .unwrap();
-
-    Virtual_file_system::Get_instance()
-        .Create_directory(&"/Configuration/Graphical_shell", Task)
-        .unwrap();
+    Mount_static_executables!(
+        Virtual_file_system::Get_instance(),
+        Task,
+        &[(&"/Binaries/Graphical_shell", Shell_executable_type),]
+    )
+    .unwrap();
 
     Virtual_file_system::Get_instance()
-        .Create_directory(&"/Configuration/Graphical_shell/Shortcuts", Task)
+        .Create_directory(&"/Configuration/Shared/Shortcuts", Task)
         .unwrap();
 
     Drivers::Native::Console::Mount_devices(Task, Virtual_file_system::Get_instance()).unwrap();
 
-    Virtual_file_system::Get_instance()
-        .Mount_static_device(
-            Task,
-            &"/Devices/Random",
-            Create_device!(Drivers::Native::Random_device_type),
-        )
-        .unwrap();
-
-    Virtual_file_system::Get_instance()
-        .Mount_static_device(
-            Task,
-            &"/Devices/Null",
-            Create_device!(Drivers::Common::Null_device_type),
-        )
-        .unwrap();
+    Mount_static_devices!(
+        Virtual_file_system::Get_instance(),
+        Task,
+        &[
+            (&"/Devices/Random", Drivers::Native::Random_device_type),
+            (&"/Devices/Null", Drivers::Common::Null_device_type),
+        ]
+    )
+    .unwrap();
 
     // Add fake shortcuts.
     for i in 0..20 {
         File_type::Open(
             Virtual_file_system::Get_instance(),
-            format!("/Configuration/Graphical_shell/Shortcuts/Test{}.json", i).as_str(),
+            format!("/Configuration/Shared/Shortcuts/Test{}.json", i).as_str(),
             Flags_type::New(Mode_type::Write_only, Some(Open_type::Create), None),
         )
         .unwrap()
@@ -122,7 +100,8 @@ fn main() {
         "Command": "/Binaries/?",
         "Arguments": "",
         "Terminal": false,
-        "Icon_string": "T!"
+        "Icon_string": "T!",
+        "Icon_color": [255, 0, 0]
     }}
         "#,
                 i
@@ -150,29 +129,14 @@ fn main() {
     )
     .unwrap();
 
-    let Standard_in = Virtual_file_system::Get_instance()
-        .Open(&"/Devices/Standard_in", Mode_type::Read_only.into(), Task)
-        .unwrap();
-
-    let Standard_out = Virtual_file_system::Get_instance()
-        .Open(&"/Devices/Standard_out", Mode_type::Write_only.into(), Task)
-        .unwrap();
-
-    let Standard_error = Virtual_file_system::Get_instance()
-        .Open(
-            &"/Devices/Standard_error",
-            Mode_type::Write_only.into(),
-            Task,
-        )
-        .unwrap();
-
-    let Standard = Standard_type::New(
-        Standard_in,
-        Standard_out,
-        Standard_error,
+    let Standard = Standard_type::Open(
+        &"/Devices/Standard_in",
+        &"/Devices/Standard_out",
+        &"/Devices/Standard_error",
         Task,
         Virtual_file_system::Get_instance(),
-    );
+    )
+    .unwrap();
 
     Task_instance
         .Set_environment_variable(Task, "Paths", "/")

Modules/Executables/Shell/Graphical/src/Desk.rs

@@ -417,6 +417,11 @@ impl Desk_type {
                     }
                     // If the target is a dock icon, move the window to the foreground
                     else if unsafe { LVGL::lv_obj_get_parent(Event.Get_target()) == self.Dock } {
+                        // Ignore the main button
+                        if Event.Get_target() == self.Main_button {
+                            continue;
+                        }
+
                         let Window_identifier =
                             unsafe { LVGL::lv_obj_get_user_data(Event.Get_target()) as usize };