mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-26 14:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

tests: levarage the materialize_conflict_string() helper in more places

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-08-11 13:52:32 -07:00 committed by Martin von Zweigbergk
parent adf9679d4c
commit 94c14d454a
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/tests/test_conflicts.rs
View file

@ -288,10 +288,9 @@ line 5 right
vec![Some(file_value(&base_id))],
vec![Some(file_value(&left_id)), Some(file_value(&right_id))],
);
let mut result: Vec<u8> = vec![];
materialize(&conflict, store, &path, &mut result).unwrap();
let materialized = materialize_conflict_string(store, &path, &conflict);
insta::assert_snapshot!(
String::from_utf8(result.clone()).unwrap(),
materialized,
@r###"
<<<<<<<
+++++++
@ -317,7 +316,7 @@ line 5 right
// The first add should always be from the left side
insta::assert_debug_snapshot!(
parse_conflict(&result, conflict.removes().len(), conflict.adds().len()),
parse_conflict(materialized.as_bytes(), conflict.removes().len(), conflict.adds().len()),
@r###"
Some(
[
@ -661,9 +660,8 @@ fn test_update_conflict_from_content() {
// If the content is unchanged compared to the materialized value, we get the
// old conflict id back.
let mut materialized = vec![];
materialize(&conflict, store, &path, &mut materialized).unwrap();
let result = update_from_content(&conflict, store, &path, &materialized).unwrap();
let materialized = materialize_conflict_string(store, &path, &conflict);
let result = update_from_content(&conflict, store, &path, materialized.as_bytes()).unwrap();
assert_eq!(result, Some(conflict.clone()));
// If the conflict is resolved, we get None back to indicate that.
@ -712,9 +710,8 @@ fn test_update_conflict_from_content_modify_delete() {
// If the content is unchanged compared to the materialized value, we get the
// old conflict id back.
let mut materialized = vec![];
materialize(&conflict, store, &path, &mut materialized).unwrap();
let result = update_from_content(&conflict, store, &path, &materialized).unwrap();
let materialized = materialize_conflict_string(store, &path, &conflict);
let result = update_from_content(&conflict, store, &path, materialized.as_bytes()).unwrap();
assert_eq!(result, Some(conflict.clone()));
// If the conflict is resolved, we get None back to indicate that.