github/ouch
1
1
Fork 0
mirror of https://github.com/ouch-org/ouch.git synced 2025-06-06 19:45:29 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

Update tests

Browse Source
This commit is contained in:
Spyros Roum 2021-10-19 14:55:37 +03:00
parent e24c9ce931
commit bc33ccc99c
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/compress_and_decompress.rs
View File

@ -7,7 +7,10 @@ use std::{
time::Duration, time::Duration,
}; };
use ouch::{cli::Command, commands::run, oof}; use ouch::{
cli::{Opts, Subcommand},
commands::run,
};
use rand::{rngs::SmallRng, RngCore, SeedableRng}; use rand::{rngs::SmallRng, RngCore, SeedableRng};
use tempfile::NamedTempFile; use tempfile::NamedTempFile;
use utils::*; use utils::*;
@ -172,11 +175,15 @@ fn extract_files(archive_path: &Path) -> Vec<PathBuf> {
// Add the suffix "results" // Add the suffix "results"
extraction_output_folder.push("extraction_results"); extraction_output_folder.push("extraction_results");
let command = Command::Decompress { let command = Opts {
files: vec![archive_path.to_owned()], yes: false,
output_folder: Some(extraction_output_folder.clone()), no: false,
cmd: Subcommand::Decompress {
files: vec![archive_path.to_owned()],
output: Some(extraction_output_folder.clone()),
},
}; };
run(command, &oof::Flags::default()).expect("Failed to extract"); run(command, None).expect("Failed to extract");
fs::read_dir(extraction_output_folder).unwrap().map(Result::unwrap).map(|entry| entry.path()).collect() fs::read_dir(extraction_output_folder).unwrap().map(Result::unwrap).map(|entry| entry.path()).collect()
} }

25
tests/utils.rs
View File

@ -7,7 +7,10 @@ use std::{
path::{Path, PathBuf}, path::{Path, PathBuf},
}; };
use ouch::{cli::Command, commands::run, oof}; use ouch::{
cli::{Opts, Subcommand},
commands::run,
};
pub fn create_empty_dir(at: &Path, filename: &str) -> PathBuf { pub fn create_empty_dir(at: &Path, filename: &str) -> PathBuf {
let dirname = Path::new(filename); let dirname = Path::new(filename);
@ -22,8 +25,12 @@ pub fn compress_files(at: &Path, paths_to_compress: &[PathBuf], format: &str) ->
let archive_path = String::from("archive.") + format; let archive_path = String::from("archive.") + format;
let archive_path = at.join(archive_path); let archive_path = at.join(archive_path);
let command = Command::Compress { files: paths_to_compress.to_vec(), output_path: archive_path.clone() }; let command = Opts {
run(command, &oof::Flags::default()).expect("Failed to compress test dummy files"); yes: false,
no: false,
cmd: Subcommand::Compress { files: paths_to_compress.to_vec(), output: archive_path.clone() },
};
run(command, None).expect("Failed to compress test dummy files");
archive_path archive_path
} }
@ -40,11 +47,15 @@ pub fn extract_files(archive_path: &Path) -> Vec<PathBuf> {
// Add the suffix "results" // Add the suffix "results"
extraction_output_folder.push("extraction_results"); extraction_output_folder.push("extraction_results");
let command = Command::Decompress { let command = Opts {
files: vec![archive_path.to_owned()], yes: false,
output_folder: Some(extraction_output_folder.clone()), no: false,
cmd: Subcommand::Decompress {
files: vec![archive_path.to_owned()],
output: Some(extraction_output_folder.clone()),
},
}; };
run(command, &oof::Flags::default()).expect("Failed to extract"); run(command, None).expect("Failed to extract");
fs::read_dir(extraction_output_folder).unwrap().map(Result::unwrap).map(|entry| entry.path()).collect() fs::read_dir(extraction_output_folder).unwrap().map(Result::unwrap).map(|entry| entry.path()).collect()
} }