Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nmrs-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ zvariant = "5.7.0"
serde = { version = "1", features = ["derive"] }
thiserror = "2.0.16"
tracing = "0.1.41"
tokio = "1.47.1"
tokio = { version = "1.48.0", features = ["rt-multi-thread", "macros", "sync", "time"] }
async-io = "2.6.0"
futures-timer = "3.0.3"
futures-util = "0.3.31"
Expand Down
4 changes: 0 additions & 4 deletions nmrs-core/src/config.rs

This file was deleted.

1 change: 0 additions & 1 deletion nmrs-core/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
pub mod config;
pub mod dbus;
pub mod models;
pub mod wifi_builders;
Expand Down
25 changes: 25 additions & 0 deletions nmrs-core/tests/models_test.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
use nmrs_core::models::*;

#[test]
fn device_type_from_u32_matches_expected() {
assert_eq!(DeviceType::from(1), DeviceType::Ethernet);
assert_eq!(DeviceType::from(2), DeviceType::Wifi);
assert_eq!(DeviceType::from(999), DeviceType::Other(999));
}

#[test]
fn device_state_from_u32_matches_expected() {
assert_eq!(DeviceState::from(100), DeviceState::Activated);
assert_eq!(DeviceState::from(120), DeviceState::Failed);
assert_eq!(DeviceState::from(7), DeviceState::Other(7));
}

#[test]
fn wifi_security_flags_are_correct() {
let open = WifiSecurity::Open;
let psk = WifiSecurity::WpaPsk { psk: "abc".into() };
assert!(!open.secured());
assert!(psk.secured());
assert!(psk.is_psk());
assert!(!psk.is_eap());
}
26 changes: 26 additions & 0 deletions nmrs-core/tests/wifi_buillders_test.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
use nmrs_core::models::WifiSecurity;
use nmrs_core::wifi_builders::build_wifi_connection;
use zvariant::Value;

#[test]
fn builds_open_wifi_connection() {
let conn = build_wifi_connection("testnet", &WifiSecurity::Open);
assert!(conn.contains_key("connection"));
assert!(conn.contains_key("802-11-wireless"));
assert!(conn.contains_key("ipv4"));
assert!(conn.contains_key("ipv6"));
}

#[test]
fn builds_psk_wifi_connection_with_security_section() {
let conn = build_wifi_connection(
"secure",
&WifiSecurity::WpaPsk {
psk: "pw123".into(),
},
);
let has_sec = conn.contains_key("802-11-wireless-security");
assert!(has_sec, "security section missing");
let sec = conn.get("802-11-wireless-security").unwrap();
assert_eq!(sec.get("psk"), Some(&Value::from("pw123".to_string())));
}
18 changes: 18 additions & 0 deletions nmrs-ui/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
pub mod style;
pub mod ui;

use gtk::Application;
use gtk::prelude::*;

pub fn run() {
let app = Application::builder()
.application_id("org.netrs.ui")
.build();

app.connect_activate(|app| {
crate::style::load_css();
crate::ui::build_ui(app);
});

app.run();
}
19 changes: 1 addition & 18 deletions nmrs-ui/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,21 +1,4 @@
use gtk::Application;
use gtk::prelude::*;

mod style;
mod ui;

use crate::style::load_css;

#[tokio::main(flavor = "current_thread")]
async fn main() {
let app = Application::builder()
.application_id("org.netrs.ui")
.build();

app.connect_activate(move |app| {
load_css();
ui::build_ui(app);
});

app.run();
nmrs_ui::run();
}
13 changes: 13 additions & 0 deletions nmrs-ui/tests/smoke_test.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#[test]
fn app_initializes_without_panic() {
// Skip when no display (e.g. in CI)
if std::env::var("CI").is_ok() {
return;
}

gtk::init().unwrap();
let result = std::panic::catch_unwind(|| {
nmrs_ui::run();
});
assert!(result.is_ok(), "UI startup panicked");
}
9 changes: 9 additions & 0 deletions nmrs-ui/tests/style_test.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#[test]
fn style_css_loads() {
if std::env::var("CI").is_ok() {
return;
}

gtk::init().unwrap();
nmrs_ui::style::load_css();
}