diff options
| author | Philipp Korber <p.korber@1aim.com> | 2018-11-20 16:36:13 +0100 |
|---|---|---|
| committer | Philipp Korber <p.korber@1aim.com> | 2018-11-20 16:36:13 +0100 |
| commit | a29ee0b24bee4e4a6f062d3074f0f60ef93114ee (patch) | |
| tree | 17dbb4146de1fce312bc055816a8323178f3f4c0 | |
| parent | 55de70da35e52a6bf1b141388d93efe1d927fd89 (diff) | |
test: make sure all tests are correct
| -rw-r--r-- | src/base_dir.rs | 2 | ||||
| -rw-r--r-- | src/path_rebase.rs | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/base_dir.rs b/src/base_dir.rs index e7072f1..91e824a 100644 --- a/src/base_dir.rs +++ b/src/base_dir.rs @@ -139,7 +139,7 @@ mod tests { let expected = cwd.join("./the/dog"); let base_dir = CwdBaseDir::from_path("./the/dog").unwrap(); - assert_eq!(&*base_dir, expected); + assert_eq!(&*base_dir, &expected); } #[test] diff --git a/src/path_rebase.rs b/src/path_rebase.rs index f6fc967..9818aa3 100644 --- a/src/path_rebase.rs +++ b/src/path_rebase.rs @@ -144,6 +144,7 @@ impl PathRebaseable for Resource { #[cfg(test)] mod test { use super::*; + use mail_core::Source; #[test] fn rebase_on_path() { @@ -159,10 +160,10 @@ mod test { #[test] fn rebase_on_iri() { - let mut iri = "path:/prefix/suffix.yup".parse().unwrap(); + let mut iri: IRI = "path:/prefix/suffix.yup".parse().unwrap(); iri.rebase_to_exclude_base_dir("/prefix").unwrap(); assert_eq!(iri.as_str(), "path:suffix.yup"); - iri.rebase_to_include_base_dir("./nfix").unwrap(); + iri.rebase_to_include_base_dir("nfix").unwrap(); iri.rebase_to_include_base_dir("/mfix").unwrap(); assert_eq!(iri.as_str(), "path:/mfix/nfix/suffix.yup"); iri.rebase_to_exclude_base_dir("/wrong").unwrap(); @@ -172,7 +173,7 @@ mod test { #[test] fn rebase_on_resource() { let mut resource = Resource::Source(Source { - iri: "path:./abc/def".parse().unwrap(), + iri: "path:abc/def".parse().unwrap(), use_media_type: Default::default(), use_file_name: Default::default() }); @@ -180,9 +181,11 @@ mod test { resource.rebase_to_include_base_dir("./abc").unwrap(); resource.rebase_to_include_base_dir("/pre").unwrap(); resource.rebase_to_exclude_base_dir("/pre").unwrap(); + resource.rebase_to_exclude_base_dir("abc").unwrap(); + resource.rebase_to_include_base_dir("abc").unwrap(); if let Resource::Source(Source { iri, ..}) = resource { - assert_eq!(iri.as_str(), "path:./abc/abc/def"); + assert_eq!(iri.as_str(), "path:abc/abc/def"); } else { unreachable!() } } }
\ No newline at end of file |