refactor(cli): restrict test utilities to test module and expand value escaping

Move internal test helpers to the test module to clean up the public API and add support for escaping common whitespace characters in output values.

crates/irtt-cli/src/lib.rs

@@ -2,13 +2,13 @@
 
 use std::{
     fmt::Write as _,
-    net::{IpAddr, Ipv4Addr, SocketAddr},
+    net::SocketAddr,
-    time::{Duration, Instant, SystemTime, UNIX_EPOCH},
+    time::{Duration, SystemTime, UNIX_EPOCH},
 };
 
 use clap::{Parser, ValueEnum};
 use irtt_client::{
-    ClientConfig, ClientEvent, ClientTimestamp, NegotiatedParams, OneWayDelaySample, PacketMeta,
+    ClientConfig, ClientEvent, NegotiatedParams, OneWayDelaySample, PacketMeta,
     ReceivedStatsSample, RttSample, ServerTiming, SocketConfig, WarningKind,
 };
 use irtt_proto::{Clock, ReceivedStats, StampAt};
@@ -471,26 +471,35 @@ fn warning_kind(kind: WarningKind) -> &'static str {
 }
 
 fn escape_value(value: &str) -> String {
-    value.replace('\\', "\\\\").replace(' ', "\\s")
+    value
-}
+        .replace('\\', "\\\\")
-
+        .replace(' ', "\\s")
-pub fn test_timestamp(offset: Duration) -> ClientTimestamp {
+        .replace('\n', "\\n")
-    ClientTimestamp {
+        .replace('\r', "\\r")
-        wall: UNIX_EPOCH + offset,
+        .replace('\t', "\\t")
-        mono: Instant::now() + offset,
-    }
-}
-
-pub fn test_remote() -> SocketAddr {
-    SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 2112)
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
     use clap::Parser;
-    use irtt_client::{PacketMeta, RttSample};
+    use irtt_client::{ClientTimestamp, PacketMeta, RttSample};
     use irtt_proto::{Params, PROTOCOL_VERSION};
+    use std::{
+        net::{IpAddr, Ipv4Addr, SocketAddr},
+        time::Instant,
+    };
+
+    fn test_timestamp(offset: Duration) -> ClientTimestamp {
+        ClientTimestamp {
+            wall: UNIX_EPOCH + offset,
+            mono: Instant::now() + offset,
+        }
+    }
+
+    fn test_remote() -> SocketAddr {
+        SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 2112)
+    }
 
     fn parse(args: &[&str]) -> Result<CliArgs, clap::Error> {
         let mut argv = vec!["irtt-rs"];