aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Molodetskikh <yalterz@gmail.com>2025-08-27 10:54:41 +0300
committerIvan Molodetskikh <yalterz@gmail.com>2025-08-27 10:55:16 +0300
commit758a4c5e6572302d50c412040f358a7791c1912e (patch)
tree54fe250bbb524ce81957856cd69ff463711c588f
parent66584ab466dfb0563708ac80a5f10dbc9fcde562 (diff)
downloadniri-758a4c5e6572302d50c412040f358a7791c1912e.tar.gz
niri-758a4c5e6572302d50c412040f358a7791c1912e.tar.bz2
niri-758a4c5e6572302d50c412040f358a7791c1912e.zip
Move Position/SizeChange parsing tests to niri-ipc
-rw-r--r--niri-config/src/lib.rs53
-rw-r--r--niri-ipc/src/lib.rs58
2 files changed, 58 insertions, 53 deletions
diff --git a/niri-config/src/lib.rs b/niri-config/src/lib.rs
index d38bd30d..acc57cd6 100644
--- a/niri-config/src/lib.rs
+++ b/niri-config/src/lib.rs
@@ -1486,7 +1486,6 @@ impl FromStr for Percent {
#[cfg(test)]
mod tests {
use insta::assert_debug_snapshot;
- use niri_ipc::PositionChange;
use pretty_assertions::assert_eq;
use super::*;
@@ -3183,58 +3182,6 @@ mod tests {
}
#[test]
- fn parse_size_change() {
- assert_eq!(
- "10".parse::<SizeChange>().unwrap(),
- SizeChange::SetFixed(10),
- );
- assert_eq!(
- "+10".parse::<SizeChange>().unwrap(),
- SizeChange::AdjustFixed(10),
- );
- assert_eq!(
- "-10".parse::<SizeChange>().unwrap(),
- SizeChange::AdjustFixed(-10),
- );
- assert_eq!(
- "10%".parse::<SizeChange>().unwrap(),
- SizeChange::SetProportion(10.),
- );
- assert_eq!(
- "+10%".parse::<SizeChange>().unwrap(),
- SizeChange::AdjustProportion(10.),
- );
- assert_eq!(
- "-10%".parse::<SizeChange>().unwrap(),
- SizeChange::AdjustProportion(-10.),
- );
-
- assert!("-".parse::<SizeChange>().is_err());
- assert!("10% ".parse::<SizeChange>().is_err());
- }
-
- #[test]
- fn parse_position_change() {
- assert_eq!(
- "10".parse::<PositionChange>().unwrap(),
- PositionChange::SetFixed(10.),
- );
- assert_eq!(
- "+10".parse::<PositionChange>().unwrap(),
- PositionChange::AdjustFixed(10.),
- );
- assert_eq!(
- "-10".parse::<PositionChange>().unwrap(),
- PositionChange::AdjustFixed(-10.),
- );
-
- assert!("10%".parse::<PositionChange>().is_err());
- assert!("+10%".parse::<PositionChange>().is_err());
- assert!("-10%".parse::<PositionChange>().is_err());
- assert!("-".parse::<PositionChange>().is_err());
- assert!("10% ".parse::<PositionChange>().is_err());
- }
-
#[test]
fn parse_iso_level_shifts() {
assert_eq!(
diff --git a/niri-ipc/src/lib.rs b/niri-ipc/src/lib.rs
index fa524970..10d88de7 100644
--- a/niri-ipc/src/lib.rs
+++ b/niri-ipc/src/lib.rs
@@ -1609,3 +1609,61 @@ impl FromStr for ScaleToSet {
Ok(Self::Specific(scale))
}
}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn parse_size_change() {
+ assert_eq!(
+ "10".parse::<SizeChange>().unwrap(),
+ SizeChange::SetFixed(10),
+ );
+ assert_eq!(
+ "+10".parse::<SizeChange>().unwrap(),
+ SizeChange::AdjustFixed(10),
+ );
+ assert_eq!(
+ "-10".parse::<SizeChange>().unwrap(),
+ SizeChange::AdjustFixed(-10),
+ );
+ assert_eq!(
+ "10%".parse::<SizeChange>().unwrap(),
+ SizeChange::SetProportion(10.),
+ );
+ assert_eq!(
+ "+10%".parse::<SizeChange>().unwrap(),
+ SizeChange::AdjustProportion(10.),
+ );
+ assert_eq!(
+ "-10%".parse::<SizeChange>().unwrap(),
+ SizeChange::AdjustProportion(-10.),
+ );
+
+ assert!("-".parse::<SizeChange>().is_err());
+ assert!("10% ".parse::<SizeChange>().is_err());
+ }
+
+ #[test]
+ fn parse_position_change() {
+ assert_eq!(
+ "10".parse::<PositionChange>().unwrap(),
+ PositionChange::SetFixed(10.),
+ );
+ assert_eq!(
+ "+10".parse::<PositionChange>().unwrap(),
+ PositionChange::AdjustFixed(10.),
+ );
+ assert_eq!(
+ "-10".parse::<PositionChange>().unwrap(),
+ PositionChange::AdjustFixed(-10.),
+ );
+
+ assert!("10%".parse::<PositionChange>().is_err());
+ assert!("+10%".parse::<PositionChange>().is_err());
+ assert!("-10%".parse::<PositionChange>().is_err());
+ assert!("-".parse::<PositionChange>().is_err());
+ assert!("10% ".parse::<PositionChange>().is_err());
+ }
+}