-
-
Notifications
You must be signed in to change notification settings - Fork 405
Report number of non-matching diffs in slider test #2276
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 { | ||
|
|
@@ -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 { | ||
|
|
@@ -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); | ||
|
|
||
|
|
@@ -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, | ||
| "assertion failed: total diffs {} == matching diffs {}\n\n{}", | ||
|
||
| 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(()) | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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!?