mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-01 03:45:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tests: simplify transaction tests slightly by using testutils more

Browse source
This commit is contained in:
Martin von Zweigbergk 2021-01-16 10:42:22 -08:00
parent f43880381f
commit 265f90185e
1 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/tests/test_transaction.rs
View file

@ -314,12 +314,8 @@ fn test_add_head_success(use_git: bool) {
// Create a commit outside of the repo by using a temporary transaction. Then
// add that as a head.
let mut tx = repo.start_transaction("test");
let new_commit = CommitBuilder::for_new_commit(
&settings,
repo.store(),
repo.store().empty_tree_id().clone(),
)
.write_to_transaction(&mut tx);
let new_commit =
testutils::create_random_commit(&settings, &repo).write_to_transaction(&mut tx);
tx.discard();
let mut tx = repo.start_transaction("test");
@ -341,15 +337,13 @@ fn test_add_head_ancestor(use_git: bool) {
// an existing head.
let settings = testutils::user_settings();
let (_temp_dir, mut repo) = testutils::init_repo(&settings, use_git);
let store = repo.store();
let mut tx = repo.start_transaction("test");
let commit1 = CommitBuilder::for_new_commit(&settings, store, store.empty_tree_id().clone())
.write_to_transaction(&mut tx);
let commit2 = CommitBuilder::for_new_commit(&settings, store, store.empty_tree_id().clone())
let commit1 = testutils::create_random_commit(&settings, &repo).write_to_transaction(&mut tx);
let commit2 = testutils::create_random_commit(&settings, &repo)
.set_parents(vec![commit1.id().clone()])
.write_to_transaction(&mut tx);
let _commit3 = CommitBuilder::for_new_commit(&settings, store, store.empty_tree_id().clone())
let _commit3 = testutils::create_random_commit(&settings, &repo)
.set_parents(vec![commit2.id().clone()])
.write_to_transaction(&mut tx);
tx.commit();
@ -369,15 +363,13 @@ fn test_remove_head(use_git: bool) {
// removed after commit.
let settings = testutils::user_settings();
let (_temp_dir, mut repo) = testutils::init_repo(&settings, use_git);
let store = repo.store();
let mut tx = repo.start_transaction("test");
let commit1 = CommitBuilder::for_new_commit(&settings, store, store.empty_tree_id().clone())
.write_to_transaction(&mut tx);
let commit2 = CommitBuilder::for_new_commit(&settings, store, store.empty_tree_id().clone())
let commit1 = testutils::create_random_commit(&settings, &repo).write_to_transaction(&mut tx);
let commit2 = testutils::create_random_commit(&settings, &repo)
.set_parents(vec![commit1.id().clone()])
.write_to_transaction(&mut tx);
let commit3 = CommitBuilder::for_new_commit(&settings, store, store.empty_tree_id().clone())
let commit3 = testutils::create_random_commit(&settings, &repo)
.set_parents(vec![commit2.id().clone()])
.write_to_transaction(&mut tx);
tx.commit();
@ -407,15 +399,13 @@ fn test_remove_head_ancestor_git_ref(use_git: bool) {
// pointing to a commit that's not reachable by any head.
let settings = testutils::user_settings();
let (_temp_dir, mut repo) = testutils::init_repo(&settings, use_git);
let store = repo.store();
let mut tx = repo.start_transaction("test");
let commit1 = CommitBuilder::for_new_commit(&settings, store, store.empty_tree_id().clone())
.write_to_transaction(&mut tx);
let commit2 = CommitBuilder::for_new_commit(&settings, store, store.empty_tree_id().clone())
let commit1 = testutils::create_random_commit(&settings, &repo).write_to_transaction(&mut tx);
let commit2 = testutils::create_random_commit(&settings, &repo)
.set_parents(vec![commit1.id().clone()])
.write_to_transaction(&mut tx);
let commit3 = CommitBuilder::for_new_commit(&settings, store, store.empty_tree_id().clone())
let commit3 = testutils::create_random_commit(&settings, &repo)
.set_parents(vec![commit2.id().clone()])
.write_to_transaction(&mut tx);
tx.insert_git_ref("refs/heads/main".to_string(), commit1.id().clone());