From 4bca4898f439445fe405d69e2a17d7b649fe3064 Mon Sep 17 00:00:00 2001 From: Krysztal Huang Date: Thu, 25 Jul 2024 23:41:00 +0800 Subject: [PATCH] uucore: Move tests for `Teletype`to `tty.rs` --- src/uucore/src/lib/features.rs | 4 +-- src/uucore/src/lib/features/proc_info.rs | 31 +-------------------- src/uucore/src/lib/features/tty.rs | 34 ++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/src/uucore/src/lib/features.rs b/src/uucore/src/lib/features.rs index 7237788c9..cf24637f7 100644 --- a/src/uucore/src/lib/features.rs +++ b/src/uucore/src/lib/features.rs @@ -47,10 +47,10 @@ pub mod perms; pub mod pipes; #[cfg(all(target_os = "linux", feature = "proc-info"))] pub mod proc_info; -#[cfg(all(target_os = "linux", feature = "tty"))] -pub mod tty; #[cfg(all(unix, feature = "process"))] pub mod process; +#[cfg(all(target_os = "linux", feature = "tty"))] +pub mod tty; #[cfg(all(unix, not(target_os = "macos"), feature = "fsxattr"))] pub mod fsxattr; diff --git a/src/uucore/src/lib/features/proc_info.rs b/src/uucore/src/lib/features/proc_info.rs index fc359492e..f6c4edf4c 100644 --- a/src/uucore/src/lib/features/proc_info.rs +++ b/src/uucore/src/lib/features/proc_info.rs @@ -350,35 +350,6 @@ mod tests { use super::*; use std::str::FromStr; - #[test] - fn test_tty_from() { - assert_eq!(Teletype::try_from("?").unwrap(), Teletype::Unknown); - assert_eq!(Teletype::try_from("/dev/tty1").unwrap(), Teletype::Tty(1)); - assert_eq!(Teletype::try_from("/dev/tty10").unwrap(), Teletype::Tty(10)); - assert_eq!(Teletype::try_from("/dev/pts/1").unwrap(), Teletype::Pts(1)); - assert_eq!( - Teletype::try_from("/dev/pts/10").unwrap(), - Teletype::Pts(10) - ); - assert_eq!(Teletype::try_from("/dev/ttyS1").unwrap(), Teletype::TtyS(1)); - assert_eq!( - Teletype::try_from("/dev/ttyS10").unwrap(), - Teletype::TtyS(10) - ); - assert_eq!(Teletype::try_from("ttyS10").unwrap(), Teletype::TtyS(10)); - - assert!(Teletype::try_from("value").is_err()); - assert!(Teletype::try_from("TtyS10").is_err()); - } - - #[test] - fn test_terminal_type_display() { - assert_eq!(Teletype::Pts(10).to_string(), "/dev/pts/10"); - assert_eq!(Teletype::Tty(10).to_string(), "/dev/tty10"); - assert_eq!(Teletype::TtyS(10).to_string(), "/dev/ttyS10"); - assert_eq!(Teletype::Unknown.to_string(), "?"); - } - #[test] fn test_run_state_conversion() { assert_eq!(RunState::try_from("R").unwrap(), RunState::Running); @@ -431,7 +402,7 @@ mod tests { .flat_map(Teletype::try_from) .collect::>(); - assert_eq!(pid_entry.ttys().unwrap(), result.into()) + assert_eq!(pid_entry.ttys().unwrap(), result.into()); } #[test] diff --git a/src/uucore/src/lib/features/tty.rs b/src/uucore/src/lib/features/tty.rs index 49ec700da..67d34c5d0 100644 --- a/src/uucore/src/lib/features/tty.rs +++ b/src/uucore/src/lib/features/tty.rs @@ -91,3 +91,37 @@ impl TryFrom for Teletype { } } } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_tty_from() { + assert_eq!(Teletype::try_from("?").unwrap(), Teletype::Unknown); + assert_eq!(Teletype::try_from("/dev/tty1").unwrap(), Teletype::Tty(1)); + assert_eq!(Teletype::try_from("/dev/tty10").unwrap(), Teletype::Tty(10)); + assert_eq!(Teletype::try_from("/dev/pts/1").unwrap(), Teletype::Pts(1)); + assert_eq!( + Teletype::try_from("/dev/pts/10").unwrap(), + Teletype::Pts(10) + ); + assert_eq!(Teletype::try_from("/dev/ttyS1").unwrap(), Teletype::TtyS(1)); + assert_eq!( + Teletype::try_from("/dev/ttyS10").unwrap(), + Teletype::TtyS(10) + ); + assert_eq!(Teletype::try_from("ttyS10").unwrap(), Teletype::TtyS(10)); + + assert!(Teletype::try_from("value").is_err()); + assert!(Teletype::try_from("TtyS10").is_err()); + } + + #[test] + fn test_terminal_type_display() { + assert_eq!(Teletype::Pts(10).to_string(), "/dev/pts/10"); + assert_eq!(Teletype::Tty(10).to_string(), "/dev/tty10"); + assert_eq!(Teletype::TtyS(10).to_string(), "/dev/ttyS10"); + assert_eq!(Teletype::Unknown.to_string(), "?"); + } +}