Added initial testing support

- Moved setup functions from main.rs to lib.rs to allow testing
- Moved main.rs to new bin directory in src directory
- Created tests directory with integration_tests_1.rs
- Currently only tests if application exits successfully, need to expand
- Added gtk4-macros crate as this is needed for gtk initialisation in tests
- Added shortcuts to application (Ctrl+q: close, Ctrl+w: toggle maximized, Ctrl+m: minimize)

Signed-off-by: Deren Vural <[email protected]>

Author: Deren Vural

Cargo.toml

@@ -10,6 +10,7 @@ edition = "2021"
 adwaita = { version = "^0.1.1", package = "libadwaita" }
 gtk = { version = "^0.4.8", package = "gtk4" }
 gdk = { version = "^0.4.8", package = "gdk4" }
+gtk4_macros = { version = "^0.5.2", package = "gtk4-macros" }
 
 #serde = { version = "1.0", features = ["derive"] }
 #serde_json = "1.0"

src/bin/main.rs

@@ -0,0 +1,49 @@
+// SPDX-FileCopyrightText: 2022 Deren Vural
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/**
+ * Name:
+ * gtk4-nvidia-monitor-rust
+ *
+ * Description:
+ * GTK-rs app for monitoring Nvidia GPU statistics
+ *
+ * Made:
+ * 12/09/2022
+ *
+ * Made by:
+ * Deren Vural
+ *
+ * Notes:
+ *
+ */
+
+// Declare module
+extern crate gtk4_nvidia_monitor_rust;
+
+// Imports
+use adwaita::{prelude::ApplicationExtManual, Application};
+
+/**
+ * Name:
+ * main
+ *
+ * Description:
+ * Create application using lib.rs functions and run
+ *
+ * Made:
+ * 13/09/2022
+ *
+ * Made by:
+ * Deren Vural
+ *
+ * Notes:
+ *
+ */
+fn main() {
+    // Intialise GTK & Create a new application
+    let app: Application = gtk4_nvidia_monitor_rust::create_app();
+
+    // Run the application
+    println!("{}", app.run());
+}

src/main.rs renamed to src/lib.rs

@@ -17,6 +17,7 @@
  * Notes:
  *
  */
+
 // Modules
 mod formatter;
 mod gpu_page;
@@ -30,7 +31,7 @@ mod custom_button;
 mod settingswindow;
 
 // Imports
-use adwaita::{gio, prelude::*, Application};
+use adwaita::{gio, glib, prelude::*, Application};
 use gdk::Display;
 use gio::resources_register_include;
 use gtk::{CssProvider, StyleContext};
@@ -54,7 +55,7 @@ const APP_ID: &str = "com.gtk_d.NvidiaMonitorRust";
  * Notes:
  *
  */
-fn main() {
+pub fn create_app() -> Application {
     // Resources
     resources_register_include!("nvidiamonitorrust.gresource")
         .expect("Failed to register resources.");
@@ -66,12 +67,12 @@ fn main() {
     let app: Application = Application::builder().application_id(APP_ID).build();
 
     // Connect to signals of `app`
-    //app.connect_startup(setup_shortcuts);
+    app.connect_startup(setup_shortcuts);
     app.connect_startup(|_| load_css());
     app.connect_activate(build_ui);
 
-    // Run the application
-    println!("{}", app.run());
+    // Return the application
+    app
 }
 
 /**
@@ -91,14 +92,18 @@ fn main() {
  * <https://github.com/gtk-rs/gtk4-rs/blob/master/book/listings/todo/5/main.rs>
  * <https://gtk-rs.org/gtk4-rs/stable/latest/book/todo_3.html>
  *
+ * https://gtk-rs.org/gtk4-rs/git/book/actions.html
+ * https://gtk-rs.org/gtk4-rs/git/docs/gtk4/struct.Window.html#actions
  */
-/*
 fn setup_shortcuts(app: &Application) {
-    app.set_accels_for_action("win.filter('All')", &["<Ctrl>a"]);
-    app.set_accels_for_action("win.filter('Open')", &["<Ctrl>o"]);
-    app.set_accels_for_action("win.filter('Done')", &["<Ctrl>d"]);
+    //app.set_accels_for_action("win.filter('All')", &["<Ctrl>a"]);
+    //app.set_accels_for_action("win.filter('Open')", &["<Ctrl>o"]);
+    //app.set_accels_for_action("win.filter('Done')", &["<Ctrl>d"]);
+    //app.set_accels_for_action("win.filter('Close')", &["<Ctrl>q"])
+    app.set_accels_for_action("window.close", &["<Ctrl>q"]);
+    app.set_accels_for_action("window.toggle-maximized", &["<Ctrl>w"]);
+    app.set_accels_for_action("window.minimize", &["<Ctrl>m"]);
 }
-*/
 
 /**
  * Name:
@@ -149,44 +154,26 @@ fn build_ui(app: &Application) {
     // Create a new custom window and show it
     let window: MainWindow = MainWindow::new(app);
 
+    // Create custom action to close window (for shortcuts)
+    // Was a "close" replica
+    /*
+    let action_close = SimpleAction::new("something", None);
+    action_close.connect_activate(clone!(@weak window => move |_, _| {
+        window.close();
+    }));
+    window.add_action(&action_close);
+    */
+
     // Present window
     window.show();
 
     /*
-    // Menu Child
-    let menu: Menu = Menu::new();
-    let item: Menu = Menu::new();
-    item.append(Some("Utilisation"), Some("app.util"));
-    item.append(Some("Temperature"), Some("app.temp"));
-    item.append(Some("Memory Usage"), Some("app.memo"));
-    item.append(Some("Fan Speed"), Some("app.fans"));
-    menu.append_submenu(Some("Item 1"), &item);
-    menu.append(Some("SMI"), Some("app.smi"));
-    menu.append(Some("Settings"), Some("app.settings"));
-    app.set_menubar(Some(&menu));
-
     // App Indicator
     //let mut indicator = AppIndicator::new("Nvidia App", "");
     //indicator.set_status(AppIndicatorStatus::Active);
     //let icon_path = Path::new(env!("CARGO_MANIFEST_DIR")).join("resources");
     //indicator.set_icon_theme_path(icon_path.to_str().unwrap());
     //indicator.set_icon_full("rust-logo", "icon");
     //indicator.set_menu(&mut menu);
-
-    // Create Parent window
-    let window: ApplicationWindow = ApplicationWindow::new(app);
-    window.set_title(Some("Nvidia App"));
-    window.set_default_size(400, 400);
-    window.set_show_menubar(true);
-
-    // Add children to window
-    //window.set_child(Some(&button1));
-    //window.set_child(Some(&button2));
-    //window.set_child(Some(&button3));
-    //window.set_child(Some(&button4));
-    //window.set_child(Some(&button5));
-
-    // Present window
-    window.show();
     */
 }

tests/integration_tests_1.rs

@@ -0,0 +1,45 @@
+// SPDX-FileCopyrightText: 2022 Deren Vural
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* *
+ * Name:
+ * integration_tests_1.rs
+ *
+ * Description:
+ * Integration tests for Nvidia Gnome Extension (Rust)
+ *
+ * Made:
+ * 26/11/2022
+ *
+ * Made by:
+ * Deren Vural
+ *
+ * Notes:
+ *
+ */
+
+// Imports
+extern crate gtk4_macros;
+
+// Declare module
+extern crate gtk4_nvidia_monitor_rust;
+
+// Imports
+use adwaita::{prelude::ApplicationExtManual, Application};
+
+pub fn init_ui() -> Application {
+    // Intialise GTK & Create a new application
+    gtk4_nvidia_monitor_rust::create_app()
+}
+
+/*
+ * Integration tests
+ */
+#[gtk::test]
+fn test_test() {
+    // Intialise GTK & Create a new application
+    let app: Application = init_ui();
+
+    // Run the application
+    assert_eq!(app.run(), 0);
+}