mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-12 23:23:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

test_merged_tree: reduce duplication and wrapping with helper lambdas

Browse source 
I'm about to make `[Merged]Tree::path_value()` return a `Result`. This
will help even more then.
This commit is contained in:
Martin von Zweigbergk 2024-05-21 06:55:33 -07:00 committed by Martin von Zweigbergk
parent 2143cc3686
commit facfb71f7b
1 changed files with 29 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
lib/tests/test_merged_tree.rs
View file

@ -985,6 +985,8 @@ fn test_diff_dir_file() {
vec![right_base], vec![right_base],
vec![right_side1, right_side2], vec![right_side1, right_side2],
)); ));
let left_value = |path: &RepoPath| left_merged.path_value(path);
let right_value = |path: &RepoPath| right_merged.path_value(path);
// Test the forwards diff // Test the forwards diff
{ {
@ -994,58 +996,37 @@ fn test_diff_dir_file() {
.collect_vec(); .collect_vec();
let expected_diff = vec![ let expected_diff = vec![
// path1: file1 -> directory1 // path1: file1 -> directory1
( (path1.to_owned(), (left_value(path1), Merge::absent())),
path1.to_owned(),
(left_merged.path_value(path1), Merge::absent()),
),
( (
path1.join(file), path1.join(file),
(Merge::absent(), right_merged.path_value(&path1.join(file))), (Merge::absent(), right_value(&path1.join(file))),
), ),
// path2: file1 -> directory1+(directory2-absent) // path2: file1 -> directory1+(directory2-absent)
( (path2.to_owned(), (left_value(path2), Merge::absent())),
path2.to_owned(),
(left_merged.path_value(path2), Merge::absent()),
),
( (
path2.join(file), path2.join(file),
(Merge::absent(), right_merged.path_value(&path2.join(file))), (Merge::absent(), right_value(&path2.join(file))),
), ),
// path3: file1 -> directory1+(file1-absent) // path3: file1 -> directory1+(file1-absent)
( (path3.to_owned(), (left_value(path3), right_value(path3))),
path3.to_owned(),
(
left_merged.path_value(path3),
right_merged.path_value(path3),
),
),
// path4: file1+(file2-file3) -> directory1+(directory2-directory3) // path4: file1+(file2-file3) -> directory1+(directory2-directory3)
( (path4.to_owned(), (left_value(path4), Merge::absent())),
path4.to_owned(),
(left_merged.path_value(path4), Merge::absent()),
),
( (
path4.join(file), path4.join(file),
(Merge::absent(), right_merged.path_value(&path4.join(file))), (Merge::absent(), right_value(&path4.join(file))),
), ),
// path5: directory1 -> file1+(file2-absent) // path5: directory1 -> file1+(file2-absent)
( (
path5.join(file), path5.join(file),
(left_merged.path_value(&path5.join(file)), Merge::absent()), (left_value(&path5.join(file)), Merge::absent()),
),
(
path5.to_owned(),
(Merge::absent(), right_merged.path_value(path5)),
), ),
(path5.to_owned(), (Merge::absent(), right_value(path5))),
// path6: directory1 -> file1+(directory1-absent) // path6: directory1 -> file1+(directory1-absent)
( (
path6.join(file), path6.join(file),
(left_merged.path_value(&path6.join(file)), Merge::absent()), (left_value(&path6.join(file)), Merge::absent()),
),
(
path6.to_owned(),
(Merge::absent(), right_merged.path_value(path6)),
), ),
(path6.to_owned(), (Merge::absent(), right_value(path6))),
]; ];
assert_eq!(actual_diff, expected_diff); assert_eq!(actual_diff, expected_diff);
diff_stream_equals_iter(&left_merged, &right_merged, &EverythingMatcher); diff_stream_equals_iter(&left_merged, &right_merged, &EverythingMatcher);
@ -1061,55 +1042,34 @@ fn test_diff_dir_file() {
// path1: file1 -> directory1 // path1: file1 -> directory1
( (
path1.join(file), path1.join(file),
(right_merged.path_value(&path1.join(file)), Merge::absent()), (right_value(&path1.join(file)), Merge::absent()),
),
(
path1.to_owned(),
(Merge::absent(), left_merged.path_value(path1)),
), ),
(path1.to_owned(), (Merge::absent(), left_value(path1))),
// path2: file1 -> directory1+(directory2-absent) // path2: file1 -> directory1+(directory2-absent)
( (
path2.join(file), path2.join(file),
(right_merged.path_value(&path2.join(file)), Merge::absent()), (right_value(&path2.join(file)), Merge::absent()),
),
(
path2.to_owned(),
(Merge::absent(), left_merged.path_value(path2)),
), ),
(path2.to_owned(), (Merge::absent(), left_value(path2))),
// path3: file1 -> directory1+(file1-absent) // path3: file1 -> directory1+(file1-absent)
( (path3.to_owned(), (right_value(path3), left_value(path3))),
path3.to_owned(),
(
right_merged.path_value(path3),
left_merged.path_value(path3),
),
),
// path4: file1+(file2-file3) -> directory1+(directory2-directory3) // path4: file1+(file2-file3) -> directory1+(directory2-directory3)
( (
path4.join(file), path4.join(file),
(right_merged.path_value(&path4.join(file)), Merge::absent()), (right_value(&path4.join(file)), Merge::absent()),
),
(
path4.to_owned(),
(Merge::absent(), left_merged.path_value(path4)),
), ),
(path4.to_owned(), (Merge::absent(), left_value(path4))),
// path5: directory1 -> file1+(file2-absent) // path5: directory1 -> file1+(file2-absent)
( (path5.to_owned(), (right_value(path5), Merge::absent())),
path5.to_owned(),
(right_merged.path_value(path5), Merge::absent()),
),
( (
path5.join(file), path5.join(file),
(Merge::absent(), left_merged.path_value(&path5.join(file))), (Merge::absent(), left_value(&path5.join(file))),
), ),
// path6: directory1 -> file1+(directory1-absent) // path6: directory1 -> file1+(directory1-absent)
( (path6.to_owned(), (right_value(path6), Merge::absent())),
path6.to_owned(),
(right_merged.path_value(path6), Merge::absent()),
),
( (
path6.join(file), path6.join(file),
(Merge::absent(), left_merged.path_value(&path6.join(file))), (Merge::absent(), left_value(&path6.join(file))),
), ),
]; ];
assert_eq!(actual_diff, expected_diff); assert_eq!(actual_diff, expected_diff);
@ -1125,10 +1085,7 @@ fn test_diff_dir_file() {
.collect_vec(); .collect_vec();
let expected_diff = vec![ let expected_diff = vec![
// path1: file1 -> directory1 // path1: file1 -> directory1
( (path1.to_owned(), (left_value(path1), Merge::absent())),
path1.to_owned(),
(left_merged.path_value(path1), Merge::absent()),
),
]; ];
assert_eq!(actual_diff, expected_diff); assert_eq!(actual_diff, expected_diff);
diff_stream_equals_iter(&left_merged, &right_merged, &matcher); diff_stream_equals_iter(&left_merged, &right_merged, &matcher);
@ -1145,7 +1102,7 @@ fn test_diff_dir_file() {
// path1: file1 -> directory1 // path1: file1 -> directory1
( (
path1.join(file), path1.join(file),
(Merge::absent(), right_merged.path_value(&path1.join(file))), (Merge::absent(), right_value(&path1.join(file))),
), ),
]; ];
assert_eq!(actual_diff, expected_diff); assert_eq!(actual_diff, expected_diff);
@ -1160,13 +1117,10 @@ fn test_diff_dir_file() {
.map(|(path, diff)| (path, diff.unwrap())) .map(|(path, diff)| (path, diff.unwrap()))
.collect_vec(); .collect_vec();
let expected_diff = vec![ let expected_diff = vec![
( (path1.to_owned(), (left_value(path1), Merge::absent())),
path1.to_owned(),
(left_merged.path_value(path1), Merge::absent()),
),
( (
path1.join(file), path1.join(file),
(Merge::absent(), right_merged.path_value(&path1.join(file))), (Merge::absent(), right_value(&path1.join(file))),
), ),
]; ];
assert_eq!(actual_diff, expected_diff); assert_eq!(actual_diff, expected_diff);
@ -1183,10 +1137,7 @@ fn test_diff_dir_file() {
.diff(&right_merged, &matcher) .diff(&right_merged, &matcher)
.map(|(path, diff)| (path, diff.unwrap())) .map(|(path, diff)| (path, diff.unwrap()))
.collect_vec(); .collect_vec();
let expected_diff = vec![( let expected_diff = vec![(path6.to_owned(), (Merge::absent(), right_value(path6)))];
path6.to_owned(),
(Merge::absent(), right_merged.path_value(path6)),
)];
assert_eq!(actual_diff, expected_diff); assert_eq!(actual_diff, expected_diff);
diff_stream_equals_iter(&left_merged, &right_merged, &matcher); diff_stream_equals_iter(&left_merged, &right_merged, &matcher);
} }