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

Simplyfying tests

Browse Source
This commit is contained in:
João M. Bezerra 2021-03-26 14:24:24 -03:00
parent 36db7d721d
commit 41a81b75a6
2 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.rs
View File

@ -10,7 +10,7 @@ mod utils;
use std::convert::TryFrom; use std::convert::TryFrom;
pub use error::{Error, Result}; use error::{Error, Result};
use evaluator::Evaluator; use evaluator::Evaluator;
fn main() -> crate::Result<()> { fn main() -> crate::Result<()> {

72
src/test.rs
View File

@ -127,9 +127,7 @@ mod cli_errors {
use std::convert::TryFrom; use std::convert::TryFrom;
use crate::{ use crate::cli::{clap_app, Command};
cli::{clap_app, Command},
};
#[test] #[test]
fn compress_files() -> crate::Result<()> { fn compress_files() -> crate::Result<()> {
@ -150,24 +148,22 @@ mod cli_errors {
#[cfg(test)] #[cfg(test)]
mod extension_extraction { mod extension_extraction {
use std::{convert::TryFrom, path::PathBuf, str::FromStr}; use std::convert::TryFrom;
use crate::{ use crate::extension::{CompressionFormat, Extension};
extension::{CompressionFormat, Extension},
};
#[test] #[test]
fn zip() -> crate::Result<()> { fn test_extension_zip() {
let path = PathBuf::from_str("filename.tar.zip").unwrap(); let path = "filename.tar.zip";
assert_eq!(CompressionFormat::try_from(&path)?, CompressionFormat::Zip); assert_eq!(
CompressionFormat::try_from(path),
Ok(()) Ok(CompressionFormat::Zip)
);
} }
#[test] #[test]
fn tar_gz() -> crate::Result<()> { fn test_extension_tar_gz() {
let extension = Extension::new("folder.tar.gz")?; let extension = Extension::new("folder.tar.gz").unwrap();
assert_eq!( assert_eq!(
extension, extension,
Extension { Extension {
@ -175,39 +171,41 @@ mod extension_extraction {
second_ext: CompressionFormat::Gzip second_ext: CompressionFormat::Gzip
} }
); );
Ok(())
} }
#[test] #[test]
fn tar() -> crate::Result<()> { fn test_extension_tar() {
let path = PathBuf::from_str("pictures.tar").unwrap(); let path = "pictures.tar";
assert_eq!(CompressionFormat::try_from(&path)?, CompressionFormat::Tar); assert_eq!(
CompressionFormat::try_from(path),
Ok(()) Ok(CompressionFormat::Tar)
);
} }
#[test] #[test]
fn gz() -> crate::Result<()> { fn test_extension_gz() {
let path = PathBuf::from_str("passwords.tar.gz").unwrap(); let path = "passwords.tar.gz";
assert_eq!(CompressionFormat::try_from(&path)?, CompressionFormat::Gzip); assert_eq!(
CompressionFormat::try_from(path),
Ok(()) Ok(CompressionFormat::Gzip)
);
} }
#[test] #[test]
fn lzma() -> crate::Result<()> { fn test_extension_lzma() {
let path = PathBuf::from_str("mygame.tar.lzma").unwrap(); let path = "mygame.tar.lzma";
assert_eq!(CompressionFormat::try_from(&path)?, CompressionFormat::Lzma); assert_eq!(
CompressionFormat::try_from(path),
Ok(()) Ok(CompressionFormat::Lzma)
);
} }
#[test] #[test]
fn bz() -> crate::Result<()> { fn test_extension_bz() {
let path = PathBuf::from_str("songs.tar.bz").unwrap(); let path = "songs.tar.bz";
assert_eq!(CompressionFormat::try_from(&path)?, CompressionFormat::Bzip); assert_eq!(
CompressionFormat::try_from(path),
Ok(()) Ok(CompressionFormat::Bzip)
);
} }
} }