fixed tests

H3rmt · Feb 3, 2024 · bca8680 · bca8680
1 parent 9016c1b
commit bca8680
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/tests/many_windows/mod.rs b/tests/many_windows/mod.rs
@@ -3,7 +3,7 @@ use std::time::Instant;
 
 use hyprland::shared::WorkspaceId;
 
-use window_switcher::{MonitorData, WorkspaceData};
+use window_switcher::{MonitorData, MonitorId, WorkspaceData};
 use window_switcher::sort::{sort_clients, update_clients};
 
 use crate::common::{create_svg_from_client_tests, function, is_sorted, MockClient};
@@ -36,7 +36,7 @@ fn many_1() {
         MockClient(7, 8, 2, 2, 0, 0, "7".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 12, height: 10, combined_width: 12, combined_height: 10, workspaces_on_monitor: 1 });
 
     let mut workspace_data: HashMap<WorkspaceId, WorkspaceData> = HashMap::new();
@@ -86,7 +86,7 @@ fn many_2() {
         MockClient(10, 11, 2, 2, 0, 0, "9".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 12, height: 10, combined_width: 12, combined_height: 10, workspaces_on_monitor: 1 });
 
     let mut workspace_data: HashMap<WorkspaceId, WorkspaceData> = HashMap::new();

diff --git a/tests/mod.rs b/tests/mod.rs
@@ -12,7 +12,7 @@ pub mod common {
     use hyprland::shared::WorkspaceId;
 
     use window_switcher::sort::{SortableClient, MONITOR_WORKSPACE_INDEX_OFFSET};
-    use window_switcher::MonitorData;
+    use window_switcher::{MonitorData, MonitorId};
 
     use crate::svg::create_svg;
 
@@ -23,7 +23,7 @@ pub mod common {
         pub u16,
         pub u16,
         pub WorkspaceId,
-        pub i64,
+        pub MonitorId,
         pub String,
     );
 
@@ -43,10 +43,10 @@ pub mod common {
         fn ws(&self) -> WorkspaceId {
             self.4
         }
-        fn wsi(&self, monitor_count: i64) -> WorkspaceId {
+        fn wsi(&self, monitor_count: MonitorId) -> WorkspaceId {
             self.4 - (MONITOR_WORKSPACE_INDEX_OFFSET * monitor_count as i32)
         }
-        fn m(&self) -> i64 {
+        fn m(&self) -> MonitorId {
             self.5
         }
         fn set_x(&mut self, x: u16) {
@@ -69,7 +69,7 @@ pub mod common {
     pub fn create_svg_from_client_tests<SC>(
         clients: &[SC],
         filename: &str,
-        monitor_data: HashMap<i64, MonitorData>,
+        monitor_data: HashMap<MonitorId, MonitorData>,
     ) where
         SC: SortableClient + Debug,
     {

diff --git a/tests/multi_workspace_multi_monitor_horizontal/mod.rs b/tests/multi_workspace_multi_monitor_horizontal/mod.rs
@@ -4,7 +4,7 @@ use std::time::Instant;
 use hyprland::shared::WorkspaceId;
 
 use window_switcher::sort::{sort_clients, update_clients};
-use window_switcher::{MonitorData, WorkspaceData};
+use window_switcher::{MonitorData, MonitorId, WorkspaceData};
 
 use crate::common::{create_svg_from_client_tests, function, is_sorted, MockClient};
 
@@ -41,7 +41,7 @@ fn default() {
         MockClient(5, 5, 1, 2, 11, 1, "16".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 4, height: 7, combined_width: 8, combined_height: 7, workspaces_on_monitor: 2 });
     monitor_data.insert(1, MonitorData { x: 5, y: 0, width: 5, height: 7, combined_width: 10, combined_height: 7, workspaces_on_monitor: 2 });
 
@@ -95,7 +95,7 @@ fn ignore_workspaces() {
         MockClient(5, 5, 1, 2, 11, 1, "16".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 4, height: 7, combined_width: 8, combined_height: 7, workspaces_on_monitor: 2 });
     monitor_data.insert(1, MonitorData { x: 5, y: 0, width: 5, height: 7, combined_width: 10, combined_height: 7, workspaces_on_monitor: 2 });
 
@@ -149,7 +149,7 @@ fn ignore_monitor() {
         MockClient(5, 5, 1, 2, 11, 1, "16".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 4, height: 7, combined_width: 8, combined_height: 7, workspaces_on_monitor: 2 });
     monitor_data.insert(1, MonitorData { x: 5, y: 0, width: 5, height: 7, combined_width: 10, combined_height: 7, workspaces_on_monitor: 2 });
 
@@ -204,7 +204,7 @@ fn ignore_monitor_ignore_workspace() {
         MockClient(5, 5, 1, 2, 11, 1, "16".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 4, height: 7, combined_width: 8, combined_height: 7, workspaces_on_monitor: 2 });
     monitor_data.insert(1, MonitorData { x: 5, y: 0, width: 5, height: 7, combined_width: 10, combined_height: 7, workspaces_on_monitor: 2 });
 
@@ -286,7 +286,7 @@ fn default_more_monitor() {
         MockClient(7, 12, 2, 2, 7, 3, "32".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 4, height: 7, combined_width: 8, combined_height: 7, workspaces_on_monitor: 2 });
     monitor_data.insert(1, MonitorData { x: 5, y: 0, width: 5, height: 7, combined_width: 10, combined_height: 7, workspaces_on_monitor: 2 });
     monitor_data.insert(2, MonitorData { x: 0, y: 8, width: 4, height: 7, combined_width: 8, combined_height: 7, workspaces_on_monitor: 2 });
@@ -374,7 +374,7 @@ fn ignore_workspaces_more_monitor() {
         MockClient(5, 11, 1, 3, 7, 3, "28".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 4, height: 7, combined_width: 8, combined_height: 7, workspaces_on_monitor: 2 });
     monitor_data.insert(1, MonitorData { x: 5, y: 0, width: 5, height: 7, combined_width: 10, combined_height: 7, workspaces_on_monitor: 2 });
     monitor_data.insert(2, MonitorData { x: 0, y: 8, width: 4, height: 7, combined_width: 8, combined_height: 7, workspaces_on_monitor: 2 });
@@ -462,7 +462,7 @@ fn ignore_monitor_more_monitor() {
         MockClient(5, 11, 1, 3, 32, 3, "29".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 4, height: 7, combined_width: 8, combined_height: 7, workspaces_on_monitor: 2 });
     monitor_data.insert(1, MonitorData { x: 5, y: 0, width: 5, height: 7, combined_width: 10, combined_height: 7, workspaces_on_monitor: 2 });
     monitor_data.insert(2, MonitorData { x: 0, y: 8, width: 4, height: 7, combined_width: 8, combined_height: 7, workspaces_on_monitor: 2 });
@@ -551,7 +551,7 @@ fn ignore_monitor_ignore_workspace_more_monitor() {
         MockClient(5, 12, 1, 2, 7, 3, "32".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 4, height: 7, combined_width: 8, combined_height: 7, workspaces_on_monitor: 2 });
     monitor_data.insert(1, MonitorData { x: 5, y: 0, width: 5, height: 7, combined_width: 10, combined_height: 7, workspaces_on_monitor: 2 });
     monitor_data.insert(2, MonitorData { x: 0, y: 8, width: 4, height: 7, combined_width: 8, combined_height: 7, workspaces_on_monitor: 2 });

diff --git a/tests/multi_workspaces/mod.rs b/tests/multi_workspaces/mod.rs
@@ -3,8 +3,8 @@ use std::time::Instant;
 
 use hyprland::shared::WorkspaceId;
 
+use window_switcher::{MonitorData, MonitorId, WorkspaceData};
 use window_switcher::sort::{sort_clients, update_clients};
-use window_switcher::{MonitorData, WorkspaceData};
 
 use crate::common::{create_svg_from_client_tests, function, is_sorted, MockClient};
 
@@ -33,7 +33,7 @@ fn default() {
         MockClient(1, 5, 1, 2, 1, 0, "8".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 4, height: 7, combined_width: 8, combined_height: 7, workspaces_on_monitor: 2 });
 
     let mut workspace_data: HashMap<WorkspaceId, WorkspaceData> = HashMap::new();
@@ -76,7 +76,7 @@ fn ignore_workspace() {
         MockClient(1, 5, 1, 2, 1, 0, "8".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 4, height: 7, combined_width: 8, combined_height: 7, workspaces_on_monitor: 2 });
 
     let mut workspace_data: HashMap<WorkspaceId, WorkspaceData> = HashMap::new();
@@ -127,7 +127,7 @@ fn vertical() {
         MockClient(1, 5, 1, 2, 1, 0, "8".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 4, height: 7, combined_width: 4, combined_height: 14, workspaces_on_monitor: 2 });
 
     let mut workspace_data: HashMap<WorkspaceId, WorkspaceData> = HashMap::new();
@@ -178,7 +178,7 @@ fn vertical_ignore_workspace() {
         MockClient(1, 5, 1, 2, 1, 0, "8".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 4, height: 7, combined_width: 4, combined_height: 14, workspaces_on_monitor: 2 });
 
     let mut workspace_data: HashMap<WorkspaceId, WorkspaceData> = HashMap::new();

diff --git a/tests/simple/mod.rs b/tests/simple/mod.rs
@@ -4,7 +4,7 @@ use std::time::Instant;
 use hyprland::shared::WorkspaceId;
 
 use window_switcher::sort::{sort_clients, update_clients};
-use window_switcher::{MonitorData, WorkspaceData};
+use window_switcher::{MonitorData, MonitorId, WorkspaceData};
 
 use crate::common::{create_svg_from_client_tests, function, is_sorted, MockClient};
 
@@ -28,7 +28,7 @@ fn simple_1() {
         MockClient(3, 5, 1, 2, 0, 0, "4".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 4, height: 7, combined_width: 4, combined_height: 7, workspaces_on_monitor: 1 });
 
     let mut workspace_data: HashMap<WorkspaceId, WorkspaceData> = HashMap::new();
@@ -65,7 +65,7 @@ fn simple_2() {
         MockClient(4, 5, 1, 2, 0, 0, "4".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 5, height: 7, combined_width: 5, combined_height: 7, workspaces_on_monitor: 1 });
 
     let mut workspace_data: HashMap<WorkspaceId, WorkspaceData> = HashMap::new();
@@ -102,7 +102,7 @@ fn simple_3() {
         MockClient(5, 5, 1, 2, 0, 0, "4".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(
         0,
         MonitorData {
@@ -150,7 +150,7 @@ fn simple_4() {
         MockClient(1, 5, 1, 2, 0, 0, "4".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 4, height: 7, combined_width: 4, combined_height: 7, workspaces_on_monitor: 1 });
 
     let mut workspace_data: HashMap<WorkspaceId, WorkspaceData> = HashMap::new();
@@ -188,7 +188,7 @@ fn simple_5() {
         MockClient(1, 6, 1, 2, 0, 0, "4".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 4, height: 8, combined_width: 4, combined_height: 8, workspaces_on_monitor: 1 });
 
     let mut workspace_data: HashMap<WorkspaceId, WorkspaceData> = HashMap::new();
@@ -225,7 +225,7 @@ fn float_1() {
         MockClient(1, 5, 2, 2, 0, 0, "4".to_string()),
     ];
 
-    let mut monitor_data: HashMap<i64, MonitorData> = HashMap::new();
+    let mut monitor_data: HashMap<MonitorId, MonitorData> = HashMap::new();
     monitor_data.insert(0, MonitorData { x: 0, y: 0, width: 6, height: 7, combined_width: 4, combined_height: 6, workspaces_on_monitor: 1 });
 
     let mut workspace_data: HashMap<WorkspaceId, WorkspaceData> = HashMap::new();