Skip to content

Commit dd5127f

Browse files
committed
Test histogram algorithm as well
1 parent d573c0d commit dd5127f

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

gix-diff/tests/diff/blob/slider.rs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,14 @@ fn sliders() -> gix_testtools::Result {
188188
}
189189

190190
let parts: Vec<_> = file_name.split('.').collect();
191-
let name = parts[0];
191+
let [name, algorithm, ..] = parts[..] else {
192+
unimplemented!()
193+
};
194+
let algorithm = match algorithm {
195+
"myers" => Algorithm::Myers,
196+
"histogram" => Algorithm::Histogram,
197+
_ => unimplemented!(),
198+
};
192199

193200
let parts: Vec<_> = name.split('-').collect();
194201
let [old_blob_id, new_blob_id] = parts[..] else {
@@ -204,7 +211,7 @@ fn sliders() -> gix_testtools::Result {
204211
);
205212

206213
let actual = gix_diff::blob::diff(
207-
Algorithm::Myers,
214+
algorithm,
208215
&interner,
209216
UnifiedDiff::new(&interner, DiffHunkRecorder::new(), ContextSize::symmetrical(3)),
210217
)?;

tests/it/src/commands/create_diff_cases.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ mkdir -p {asset_dir}
8686
}
8787

8888
blocks.push(format!(
89-
r#"git diff --no-index "$ROOT/{asset_dir}/{old_blob_id}.blob" "$ROOT/{asset_dir}/{new_blob_id}.blob" > {old_blob_id}-{new_blob_id}.baseline || true
89+
r#"git -c diff.algorithm=myers diff --no-index "$ROOT/{asset_dir}/{old_blob_id}.blob" "$ROOT/{asset_dir}/{new_blob_id}.blob" > {old_blob_id}-{new_blob_id}.myers.baseline || true
90+
git -c diff.algorithm=histogram diff --no-index "$ROOT/{asset_dir}/{old_blob_id}.blob" "$ROOT/{asset_dir}/{new_blob_id}.blob" > {old_blob_id}-{new_blob_id}.histogram.baseline || true
9091
cp "$ROOT/{asset_dir}/{old_blob_id}.blob" assets/
9192
cp "$ROOT/{asset_dir}/{new_blob_id}.blob" assets/
9293
"#

0 commit comments

Comments
 (0)