feat: Added assert_file_layout() to CargoPathExt

Author: ranger-ross

Cargo.lock

@@ -32,7 +32,7 @@ cargo-credential-macos-keychain = { version = "0.4.18", path = "credential/cargo
 cargo-credential-wincred = { version = "0.4.18", path = "credential/cargo-credential-wincred" }
 cargo-platform = { path = "crates/cargo-platform", version = "0.3.0" }
 cargo-test-macro = { version = "0.4.7", path = "crates/cargo-test-macro" }
-cargo-test-support = { version = "0.8.2", path = "crates/cargo-test-support" }
+cargo-test-support = { version = "0.9.0", path = "crates/cargo-test-support" }
 cargo-util = { version = "0.2.25", path = "crates/cargo-util" }
 cargo-util-schemas = { version = "0.10.1", path = "crates/cargo-util-schemas" }
 cargo_metadata = "0.21.0"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-test-support"
-version = "0.8.2"
+version = "0.9.0"
 edition.workspace = true
 rust-version = "1.90"  # MSRV:1
 license.workspace = true

crates/cargo-test-support/Cargo.toml

@@ -229,6 +229,12 @@ fn add_regex_redactions(subs: &mut snapbox::Redactions) {
     .unwrap();
     subs.insert("[HASH]", regex!(r"/[a-z0-9\-_]+-(?<redacted>[0-9a-f]{16})"))
         .unwrap();
+    // Match multi-part hashes like `06/b451d0d6f88b1d` used in directory paths
+    subs.insert("[HASH]", regex!(r"/(?<redacted>[a-f0-9]{2}\/[0-9a-f]{14})"))
+        .unwrap();
+    // Match file name hashes like `foo-06b451d0d6f88b1d`
+    subs.insert("[HASH]", regex!(r"[a-z0-9]+-(?<redacted>[a-f0-9]{16})"))
+        .unwrap();
     subs.insert(
         "[AVG_ELAPSED]",
         regex!(r"(?<redacted>[0-9]+(\.[0-9]+)?) ns/iter"),

crates/cargo-test-support/src/compare.rs

@@ -1,6 +1,8 @@
 //! Access common paths and manipulate the filesystem
 
 use filetime::FileTime;
+use itertools::Itertools;
+use walkdir::WalkDir;
 
 use std::cell::RefCell;
 use std::env;
@@ -12,6 +14,9 @@ use std::sync::Mutex;
 use std::sync::OnceLock;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
+use crate::compare::assert_e2e;
+use crate::compare::match_contains;
+
 static CARGO_INTEGRATION_TEST_DIR: &str = "cit";
 
 static GLOBAL_ROOT: OnceLock<Mutex<Option<PathBuf>>> = OnceLock::new();
@@ -152,6 +157,10 @@ pub trait CargoPathExt {
     fn move_in_time<F>(&self, travel_amount: F)
     where
         F: Fn(i64, u32) -> (i64, u32);
+
+    fn assert_build_dir_layout(&self, expected: impl snapbox::IntoData);
+
+    fn assert_dir_layout(&self, expected: impl snapbox::IntoData, ignored_path_patterns: &[String]);
 }
 
 impl CargoPathExt for Path {
@@ -236,6 +245,43 @@ impl CargoPathExt for Path {
             });
         }
     }
+
+    #[track_caller]
+    fn assert_build_dir_layout(&self, expected: impl snapbox::IntoData) {
+        // We call `unordered()` here to because the build-dir has some scenarios that make
+        // consistent ordering not possible.
+        // Notably:
+        // 1. Binaries with `.exe` on Windows causing the ordering to change with the dep-info `.d`
+        //    file.
+        // 2. Directories with hashes are often reordered differently by platform.
+        self.assert_dir_layout(expected.unordered(), &build_dir_ignored_path_patterns());
+    }
+
+    #[track_caller]
+    fn assert_dir_layout(
+        &self,
+        expected: impl snapbox::IntoData,
+        ignored_path_patterns: &[String],
+    ) {
+        let assert = assert_e2e();
+        let actual = WalkDir::new(self)
+            .sort_by_file_name()
+            .into_iter()
+            .filter_map(|e| e.ok())
+            .filter(|e| e.file_type().is_file())
+            .map(|e| e.path().to_string_lossy().into_owned())
+            .filter(|file| {
+                for ignored in ignored_path_patterns {
+                    if match_contains(&ignored, file, &assert.redactions()).is_ok() {
+                        return false;
+                    }
+                }
+                return true;
+            })
+            .join("\n");
+
+        assert.eq(format!("{actual}\n"), expected);
+    }
 }
 
 impl CargoPathExt for PathBuf {
@@ -260,6 +306,21 @@ impl CargoPathExt for PathBuf {
     {
         self.as_path().move_in_time(travel_amount)
     }
+
+    #[track_caller]
+    fn assert_build_dir_layout(&self, expected: impl snapbox::IntoData) {
+        self.as_path().assert_build_dir_layout(expected);
+    }
+
+    #[track_caller]
+    fn assert_dir_layout(
+        &self,
+        expected: impl snapbox::IntoData,
+        ignored_path_patterns: &[String],
+    ) {
+        self.as_path()
+            .assert_dir_layout(expected, ignored_path_patterns);
+    }
 }
 
 fn do_op<F>(path: &Path, desc: &str, mut f: F)
@@ -290,6 +351,20 @@ where
     }
 }
 
+/// The paths to ignore when [`CargoPathExt::assert_build_dir_layout`] is called
+fn build_dir_ignored_path_patterns() -> Vec<String> {
+    vec![
+        // Ignore MacOS debug symbols as there are many files/directories that would clutter up
+        // tests few not a lot of benefit.
+        "[..].dSYM/[..]",
+        // Ignore Windows debub symbols files (.pdb)
+        "[..].pdb",
+    ]
+    .into_iter()
+    .map(ToString::to_string)
+    .collect()
+}
+
 /// Get the filename for a library.
 ///
 /// `kind` should be one of: