diff --git a/src/version1/mod.rs b/src/version1/mod.rs index 1663317..4f6114a 100644 --- a/src/version1/mod.rs +++ b/src/version1/mod.rs @@ -80,34 +80,26 @@ fn finalize(data: *const u8, size: u32, status: u32) -> Option> { #[cfg(test)] mod tests { #[test] - fn compress_otf() { + fn otf() { super::convert( "tests/fixtures/Roboto-Regular.otf", "tests/fixtures/Roboto-Regular.otf.woff", ) .unwrap(); - } - - #[test] - fn compress_ttf() { super::convert( - "tests/fixtures/Roboto-Regular.ttf", - "tests/fixtures/Roboto-Regular.ttf.woff", + "tests/fixtures/Roboto-Regular.otf.woff", + "tests/fixtures/Roboto-Regular.otf", ) .unwrap(); } #[test] - fn decompress_otf() { + fn ttf() { super::convert( - "tests/fixtures/Roboto-Regular.otf.woff", - "tests/fixtures/Roboto-Regular.otf", + "tests/fixtures/Roboto-Regular.ttf", + "tests/fixtures/Roboto-Regular.ttf.woff", ) .unwrap(); - } - - #[test] - fn decompress_ttf() { super::convert( "tests/fixtures/Roboto-Regular.ttf.woff", "tests/fixtures/Roboto-Regular.ttf", diff --git a/src/version2/mod.rs b/src/version2/mod.rs index 279da22..4928a0e 100644 --- a/src/version2/mod.rs +++ b/src/version2/mod.rs @@ -100,7 +100,7 @@ pub fn convert>( #[cfg(test)] mod tests { #[test] - fn compress_otf() { + fn otf() { super::convert( "tests/fixtures/Roboto-Regular.otf", "tests/fixtures/Roboto-Regular.otf.woff2", @@ -109,13 +109,9 @@ mod tests { None, ) .unwrap(); - } - - #[test] - fn compress_ttf() { super::convert( - "tests/fixtures/Roboto-Regular.ttf", - "tests/fixtures/Roboto-Regular.ttf.woff2", + "tests/fixtures/Roboto-Regular.otf.woff2", + "tests/fixtures/Roboto-Regular.otf", None, None, None, @@ -124,19 +120,15 @@ mod tests { } #[test] - fn decompress_otf() { + fn ttf() { super::convert( - "tests/fixtures/Roboto-Regular.otf.woff2", - "tests/fixtures/Roboto-Regular.otf", + "tests/fixtures/Roboto-Regular.ttf", + "tests/fixtures/Roboto-Regular.ttf.woff2", None, None, None, ) .unwrap(); - } - - #[test] - fn decompress_ttf() { super::convert( "tests/fixtures/Roboto-Regular.ttf.woff2", "tests/fixtures/Roboto-Regular.ttf",