Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 32 additions & 5 deletions gix-diff/tests/diff/blob/slider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use gix_diff::blob::intern::TokenSource;
use gix_diff::blob::unified_diff::ContextSize;
use gix_diff::blob::{Algorithm, UnifiedDiff};
use gix_testtools::bstr::{BString, ByteVec};
use pretty_assertions::StrComparison;

#[test]
fn baseline() -> gix_testtools::Result {
Expand All @@ -10,15 +11,15 @@ fn baseline() -> gix_testtools::Result {

let dir = std::fs::read_dir(&worktree_path)?;

let mut count = 0;
let mut diffs = Vec::new();

for entry in dir {
let entry = entry?;
let file_name = entry.file_name().into_string().expect("to be string");

if !file_name.ends_with(".baseline") {
continue;
}
count += 1;

let parts: Vec<_> = file_name.split('.').collect();
let [name, algorithm, ..] = parts[..] else {
Expand Down Expand Up @@ -53,7 +54,7 @@ fn baseline() -> gix_testtools::Result {
),
)?;

let baseline_path = worktree_path.join(file_name);
let baseline_path = worktree_path.join(&file_name);
let baseline = std::fs::read(baseline_path)?;
let baseline = baseline::Baseline::new(&baseline);

Expand All @@ -80,13 +81,39 @@ fn baseline() -> gix_testtools::Result {
})
.to_string();

pretty_assertions::assert_eq!(actual, baseline);
let actual_matches_baseline = actual == baseline;
diffs.push((actual, baseline, actual_matches_baseline, file_name));
}

if count == 0 {
if diffs.is_empty() {
eprintln!("Slider baseline isn't setup - look at ./gix-diff/tests/README.md for instructions");
}

let total_diffs = diffs.len();
let matching_diffs = diffs
.iter()
.filter(|(_, _, actual_matches_baseline, _)| *actual_matches_baseline)
.count();

assert!(
matching_diffs == total_diffs,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would this not be more readable with assert_eq!?

"assertion failed: total diffs {} == matching diffs {}\n\n{}",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the assertion failure will come across by merit of assert_eq, so the text can skip assertion failed:.

total_diffs,
matching_diffs,
{
let first_non_matching_diff = diffs
.iter()
.find(|(_, _, actual_matches_baseline, _)| !actual_matches_baseline)
.expect("at least one non-matching diff to be there");

format!(
"affected baseline: `{}`\n\n{}",
first_non_matching_diff.3,
StrComparison::new(&first_non_matching_diff.0, &first_non_matching_diff.1)
)
}
);

Ok(())
}

Expand Down
Loading