martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-09-20 10:18:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

tests: rewrite "@"/"root" revset resolution tests without using bad git refs

Browse Source
This commit is contained in:
Yuya Nishihara 2023-09-10 20:18:02 +09:00
parent 86206e83a4
commit b80d04319d
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/tests/test_revset.rs
View File

@ -619,6 +619,22 @@ fn test_resolve_symbol_tags() {
resolve_symbol(mut_repo, "unimported"),
Err(RevsetResolutionError::NoSuchRevision { .. })
);
// "@" (quoted) can be resolved, and root is a normal symbol.
let ws_id = WorkspaceId::default();
mut_repo
.set_wc_commit(ws_id.clone(), commit1.id().clone())
.unwrap();
mut_repo.set_tag_target("@", RefTarget::normal(commit2.id().clone()));
mut_repo.set_tag_target("root", RefTarget::normal(commit3.id().clone()));
assert_eq!(
resolve_symbol(mut_repo, r#""@""#).unwrap(),
vec![commit2.id().clone()]
);
assert_eq!(
resolve_symbol(mut_repo, "root").unwrap(),
vec![commit3.id().clone()]
);
}
#[test]
@ -753,22 +769,6 @@ fn test_resolve_symbol_git_refs() {
Err(RevsetResolutionError::NoSuchRevision { .. })
);
// "@" (quoted) can be resolved, and root is a normal symbol.
let ws_id = WorkspaceId::default();
mut_repo
.set_wc_commit(ws_id.clone(), commit1.id().clone())
.unwrap();
mut_repo.set_git_ref_target("@", RefTarget::normal(commit2.id().clone()));
mut_repo.set_git_ref_target("root", RefTarget::normal(commit3.id().clone()));
assert_eq!(
resolve_symbol(mut_repo, r#""@""#).unwrap(),
vec![commit2.id().clone()]
);
assert_eq!(
resolve_symbol(mut_repo, "root").unwrap(),
vec![commit3.id().clone()]
);
// Conflicted ref resolves to its "adds"
assert_eq!(
resolve_symbol(mut_repo, "refs/heads/conflicted").unwrap(),