fix: move inline codex-rs/core unit tests into sibling files (#14444)

## Why PR #13783 moved the `codex.rs` unit tests into `codex_tests.rs`. This applies the same extraction pattern across the rest of `codex-rs/core` so the production modules stay focused on runtime code instead of large inline test blocks. Keeping the tests in sibling files also makes follow-up edits easier to review because product changes no longer have to share a file with hundreds or thousands of lines of test scaffolding. ## What changed - replaced each inline `mod tests { ... }` in `codex-rs/core/src/**` with a path-based module declaration - moved each extracted unit test module into a sibling `*_tests.rs` file, using `mod_tests.rs` for `mod.rs` modules - preserved the existing `cfg(...)` guards and module-local structure so the refactor remains structural rather than behavioral ## Testing - `cargo test -p codex-core --lib` (`1653 passed; 0 failed; 5 ignored`) - `just fix -p codex-core` - `cargo fmt --check` - `cargo shear`
2026-05-05 05:42:33 +03:00 · 2026-03-12 08:16:36 -07:00
parent 7f2ca502f5
commit 0c8a36676a
252 changed files with 40158 additions and 40383 deletions
--- a/codex-rs/core/src/tasks/ghost_snapshot.rs
+++ b/codex-rs/core/src/tasks/ghost_snapshot.rs
@@ -250,36 +250,5 @@ fn format_bytes(bytes: i64) -> String {
 }

 #[cfg(test)]
-mod tests {
-    use super::*;
-    use codex_git::LargeUntrackedDir;
-    use pretty_assertions::assert_eq;
-    use std::path::PathBuf;
-
-    #[test]
-    fn large_untracked_warning_includes_threshold() {
-        let report = GhostSnapshotReport {
-            large_untracked_dirs: vec![LargeUntrackedDir {
-                path: PathBuf::from("models"),
-                file_count: 250,
-            }],
-            ignored_untracked_files: Vec::new(),
-        };
-
-        let message = format_large_untracked_warning(Some(200), &report).unwrap();
-        assert!(message.contains(">= 200 files"));
-    }
-
-    #[test]
-    fn large_untracked_warning_disabled_when_threshold_disabled() {
-        let report = GhostSnapshotReport {
-            large_untracked_dirs: vec![LargeUntrackedDir {
-                path: PathBuf::from("models"),
-                file_count: 250,
-            }],
-            ignored_untracked_files: Vec::new(),
-        };
-
-        assert_eq!(format_large_untracked_warning(None, &report), None);
-    }
-}
+#[path = "ghost_snapshot_tests.rs"]
+mod tests;
--- a/codex-rs/core/src/tasks/ghost_snapshot_tests.rs
+++ b/codex-rs/core/src/tasks/ghost_snapshot_tests.rs
@@ -0,0 +1,31 @@
+use super::*;
+use codex_git::LargeUntrackedDir;
+use pretty_assertions::assert_eq;
+use std::path::PathBuf;
+
+#[test]
+fn large_untracked_warning_includes_threshold() {
+    let report = GhostSnapshotReport {
+        large_untracked_dirs: vec![LargeUntrackedDir {
+            path: PathBuf::from("models"),
+            file_count: 250,
+        }],
+        ignored_untracked_files: Vec::new(),
+    };
+
+    let message = format_large_untracked_warning(Some(200), &report).unwrap();
+    assert!(message.contains(">= 200 files"));
+}
+
+#[test]
+fn large_untracked_warning_disabled_when_threshold_disabled() {
+    let report = GhostSnapshotReport {
+        large_untracked_dirs: vec![LargeUntrackedDir {
+            path: PathBuf::from("models"),
+            file_count: 250,
+        }],
+        ignored_untracked_files: Vec::new(),
+    };
+
+    assert_eq!(format_large_untracked_warning(None, &report), None);
+}
--- a/codex-rs/core/src/tasks/mod.rs
+++ b/codex-rs/core/src/tasks/mod.rs
@@ -454,119 +454,5 @@ impl Session {
 }

 #[cfg(test)]
-mod tests {
-    use super::emit_turn_network_proxy_metric;
-    use codex_otel::SessionTelemetry;
-    use codex_otel::metrics::MetricsClient;
-    use codex_otel::metrics::MetricsConfig;
-    use codex_otel::metrics::names::TURN_NETWORK_PROXY_METRIC;
-    use codex_protocol::ThreadId;
-    use codex_protocol::protocol::SessionSource;
-    use opentelemetry::KeyValue;
-    use opentelemetry_sdk::metrics::InMemoryMetricExporter;
-    use opentelemetry_sdk::metrics::data::AggregatedMetrics;
-    use opentelemetry_sdk::metrics::data::Metric;
-    use opentelemetry_sdk::metrics::data::MetricData;
-    use opentelemetry_sdk::metrics::data::ResourceMetrics;
-    use pretty_assertions::assert_eq;
-    use std::collections::BTreeMap;
-
-    fn test_session_telemetry() -> SessionTelemetry {
-        let exporter = InMemoryMetricExporter::default();
-        let metrics = MetricsClient::new(
-            MetricsConfig::in_memory("test", "codex-core", env!("CARGO_PKG_VERSION"), exporter)
-                .with_runtime_reader(),
-        )
-        .expect("in-memory metrics client");
-        SessionTelemetry::new(
-            ThreadId::new(),
-            "gpt-5.1",
-            "gpt-5.1",
-            None,
-            None,
-            None,
-            "test_originator".to_string(),
-            false,
-            "tty".to_string(),
-            SessionSource::Cli,
-        )
-        .with_metrics_without_metadata_tags(metrics)
-    }
-
-    fn find_metric<'a>(resource_metrics: &'a ResourceMetrics, name: &str) -> &'a Metric {
-        for scope_metrics in resource_metrics.scope_metrics() {
-            for metric in scope_metrics.metrics() {
-                if metric.name() == name {
-                    return metric;
-                }
-            }
-        }
-        panic!("metric {name} missing");
-    }
-
-    fn attributes_to_map<'a>(
-        attributes: impl Iterator<Item = &'a KeyValue>,
-    ) -> BTreeMap<String, String> {
-        attributes
-            .map(|kv| (kv.key.as_str().to_string(), kv.value.as_str().to_string()))
-            .collect()
-    }
-
-    fn metric_point(resource_metrics: &ResourceMetrics) -> (BTreeMap<String, String>, u64) {
-        let metric = find_metric(resource_metrics, TURN_NETWORK_PROXY_METRIC);
-        match metric.data() {
-            AggregatedMetrics::U64(data) => match data {
-                MetricData::Sum(sum) => {
-                    let points: Vec<_> = sum.data_points().collect();
-                    assert_eq!(points.len(), 1);
-                    let point = points[0];
-                    (attributes_to_map(point.attributes()), point.value())
-                }
-                _ => panic!("unexpected counter aggregation"),
-            },
-            _ => panic!("unexpected counter data type"),
-        }
-    }
-
-    #[test]
-    fn emit_turn_network_proxy_metric_records_active_turn() {
-        let session_telemetry = test_session_telemetry();
-
-        emit_turn_network_proxy_metric(&session_telemetry, true, ("tmp_mem_enabled", "true"));
-
-        let snapshot = session_telemetry
-            .snapshot_metrics()
-            .expect("runtime metrics snapshot");
-        let (attrs, value) = metric_point(&snapshot);
-
-        assert_eq!(value, 1);
-        assert_eq!(
-            attrs,
-            BTreeMap::from([
-                ("active".to_string(), "true".to_string()),
-                ("tmp_mem_enabled".to_string(), "true".to_string()),
-            ])
-        );
-    }
-
-    #[test]
-    fn emit_turn_network_proxy_metric_records_inactive_turn() {
-        let session_telemetry = test_session_telemetry();
-
-        emit_turn_network_proxy_metric(&session_telemetry, false, ("tmp_mem_enabled", "false"));
-
-        let snapshot = session_telemetry
-            .snapshot_metrics()
-            .expect("runtime metrics snapshot");
-        let (attrs, value) = metric_point(&snapshot);
-
-        assert_eq!(value, 1);
-        assert_eq!(
-            attrs,
-            BTreeMap::from([
-                ("active".to_string(), "false".to_string()),
-                ("tmp_mem_enabled".to_string(), "false".to_string()),
-            ])
-        );
-    }
-}
+#[path = "mod_tests.rs"]
+mod tests;
--- a/codex-rs/core/src/tasks/mod_tests.rs
+++ b/codex-rs/core/src/tasks/mod_tests.rs
@@ -0,0 +1,114 @@
+use super::emit_turn_network_proxy_metric;
+use codex_otel::SessionTelemetry;
+use codex_otel::metrics::MetricsClient;
+use codex_otel::metrics::MetricsConfig;
+use codex_otel::metrics::names::TURN_NETWORK_PROXY_METRIC;
+use codex_protocol::ThreadId;
+use codex_protocol::protocol::SessionSource;
+use opentelemetry::KeyValue;
+use opentelemetry_sdk::metrics::InMemoryMetricExporter;
+use opentelemetry_sdk::metrics::data::AggregatedMetrics;
+use opentelemetry_sdk::metrics::data::Metric;
+use opentelemetry_sdk::metrics::data::MetricData;
+use opentelemetry_sdk::metrics::data::ResourceMetrics;
+use pretty_assertions::assert_eq;
+use std::collections::BTreeMap;
+
+fn test_session_telemetry() -> SessionTelemetry {
+    let exporter = InMemoryMetricExporter::default();
+    let metrics = MetricsClient::new(
+        MetricsConfig::in_memory("test", "codex-core", env!("CARGO_PKG_VERSION"), exporter)
+            .with_runtime_reader(),
+    )
+    .expect("in-memory metrics client");
+    SessionTelemetry::new(
+        ThreadId::new(),
+        "gpt-5.1",
+        "gpt-5.1",
+        None,
+        None,
+        None,
+        "test_originator".to_string(),
+        false,
+        "tty".to_string(),
+        SessionSource::Cli,
+    )
+    .with_metrics_without_metadata_tags(metrics)
+}
+
+fn find_metric<'a>(resource_metrics: &'a ResourceMetrics, name: &str) -> &'a Metric {
+    for scope_metrics in resource_metrics.scope_metrics() {
+        for metric in scope_metrics.metrics() {
+            if metric.name() == name {
+                return metric;
+            }
+        }
+    }
+    panic!("metric {name} missing");
+}
+
+fn attributes_to_map<'a>(
+    attributes: impl Iterator<Item = &'a KeyValue>,
+) -> BTreeMap<String, String> {
+    attributes
+        .map(|kv| (kv.key.as_str().to_string(), kv.value.as_str().to_string()))
+        .collect()
+}
+
+fn metric_point(resource_metrics: &ResourceMetrics) -> (BTreeMap<String, String>, u64) {
+    let metric = find_metric(resource_metrics, TURN_NETWORK_PROXY_METRIC);
+    match metric.data() {
+        AggregatedMetrics::U64(data) => match data {
+            MetricData::Sum(sum) => {
+                let points: Vec<_> = sum.data_points().collect();
+                assert_eq!(points.len(), 1);
+                let point = points[0];
+                (attributes_to_map(point.attributes()), point.value())
+            }
+            _ => panic!("unexpected counter aggregation"),
+        },
+        _ => panic!("unexpected counter data type"),
+    }
+}
+
+#[test]
+fn emit_turn_network_proxy_metric_records_active_turn() {
+    let session_telemetry = test_session_telemetry();
+
+    emit_turn_network_proxy_metric(&session_telemetry, true, ("tmp_mem_enabled", "true"));
+
+    let snapshot = session_telemetry
+        .snapshot_metrics()
+        .expect("runtime metrics snapshot");
+    let (attrs, value) = metric_point(&snapshot);
+
+    assert_eq!(value, 1);
+    assert_eq!(
+        attrs,
+        BTreeMap::from([
+            ("active".to_string(), "true".to_string()),
+            ("tmp_mem_enabled".to_string(), "true".to_string()),
+        ])
+    );
+}
+
+#[test]
+fn emit_turn_network_proxy_metric_records_inactive_turn() {
+    let session_telemetry = test_session_telemetry();
+
+    emit_turn_network_proxy_metric(&session_telemetry, false, ("tmp_mem_enabled", "false"));
+
+    let snapshot = session_telemetry
+        .snapshot_metrics()
+        .expect("runtime metrics snapshot");
+    let (attrs, value) = metric_point(&snapshot);
+
+    assert_eq!(value, 1);
+    assert_eq!(
+        attrs,
+        BTreeMap::from([
+            ("active".to_string(), "false".to_string()),
+            ("tmp_mem_enabled".to_string(), "false".to_string()),
+        ])
+    );
+}