GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-25 01:06:35 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

remove some unneeded transactions from tests

Browse source
This commit is contained in:
Damien Elmes 2021-04-30 19:18:02 +10:00
parent 449e3cc79d
commit d0f3007fad
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
rslib/src/media/check.rs
View file

@ -564,12 +564,12 @@ pub(crate) mod test {
let progress = |_n| true; let progress = |_n| true;
let (output, report) = col.transact_no_undo(|ctx| { let (output, report) = {
let mut checker = MediaChecker::new(ctx, &mgr, progress); let mut checker = MediaChecker::new(&mut col, &mgr, progress);
let output = checker.check()?; let output = checker.check()?;
let summary = checker.summarize_output(&mut output.clone()); let summary = checker.summarize_output(&mut output.clone());
Ok((output, summary)) (output, summary)
})?; };
assert_eq!( assert_eq!(
output, output,
@ -634,10 +634,8 @@ Unused: unused.jpg
let progress = |_n| true; let progress = |_n| true;
col.transact_no_undo(|ctx| { let mut checker = MediaChecker::new(&mut col, &mgr, progress);
let mut checker = MediaChecker::new(ctx, &mgr, progress); checker.restore_trash()?;
checker.restore_trash()
})?;
// file should have been moved to media folder // file should have been moved to media folder
assert_eq!(files_in_dir(&trash_folder), Vec::<String>::new()); assert_eq!(files_in_dir(&trash_folder), Vec::<String>::new());
@ -648,10 +646,10 @@ Unused: unused.jpg
// if we repeat the process, restoring should do the same thing if the contents are equal // if we repeat the process, restoring should do the same thing if the contents are equal
fs::write(trash_folder.join("test.jpg"), "test")?; fs::write(trash_folder.join("test.jpg"), "test")?;
col.transact_no_undo(|ctx| {
let mut checker = MediaChecker::new(ctx, &mgr, progress); let mut checker = MediaChecker::new(&mut col, &mgr, progress);
checker.restore_trash() checker.restore_trash()?;
})?;
assert_eq!(files_in_dir(&trash_folder), Vec::<String>::new()); assert_eq!(files_in_dir(&trash_folder), Vec::<String>::new());
assert_eq!( assert_eq!(
files_in_dir(&mgr.media_folder), files_in_dir(&mgr.media_folder),
@ -660,10 +658,10 @@ Unused: unused.jpg
// but rename if required // but rename if required
fs::write(trash_folder.join("test.jpg"), "test2")?; fs::write(trash_folder.join("test.jpg"), "test2")?;
col.transact_no_undo(|ctx| {
let mut checker = MediaChecker::new(ctx, &mgr, progress); let mut checker = MediaChecker::new(&mut col, &mgr, progress);
checker.restore_trash() checker.restore_trash()?;
})?;
assert_eq!(files_in_dir(&trash_folder), Vec::<String>::new()); assert_eq!(files_in_dir(&trash_folder), Vec::<String>::new());
assert_eq!( assert_eq!(
files_in_dir(&mgr.media_folder), files_in_dir(&mgr.media_folder),
@ -684,10 +682,10 @@ Unused: unused.jpg
let progress = |_n| true; let progress = |_n| true;
let mut output = col.transact_no_undo(|ctx| { let mut output = {
let mut checker = MediaChecker::new(ctx, &mgr, progress); let mut checker = MediaChecker::new(&mut col, &mgr, progress);
checker.check() checker.check()
})?; }?;
output.missing.sort(); output.missing.sort();