Skip to content

Commit f749466

Browse files
committed
Combine tests
1 parent 6bf486d commit f749466

File tree

2 files changed

+12
-28
lines changed

2 files changed

+12
-28
lines changed

src/version1/mod.rs

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,34 +80,26 @@ fn finalize(data: *const u8, size: u32, status: u32) -> Option<Vec<u8>> {
8080
#[cfg(test)]
8181
mod tests {
8282
#[test]
83-
fn compress_otf() {
83+
fn otf() {
8484
super::convert(
8585
"tests/fixtures/Roboto-Regular.otf",
8686
"tests/fixtures/Roboto-Regular.otf.woff",
8787
)
8888
.unwrap();
89-
}
90-
91-
#[test]
92-
fn compress_ttf() {
9389
super::convert(
94-
"tests/fixtures/Roboto-Regular.ttf",
95-
"tests/fixtures/Roboto-Regular.ttf.woff",
90+
"tests/fixtures/Roboto-Regular.otf.woff",
91+
"tests/fixtures/Roboto-Regular.otf",
9692
)
9793
.unwrap();
9894
}
9995

10096
#[test]
101-
fn decompress_otf() {
97+
fn ttf() {
10298
super::convert(
103-
"tests/fixtures/Roboto-Regular.otf.woff",
104-
"tests/fixtures/Roboto-Regular.otf",
99+
"tests/fixtures/Roboto-Regular.ttf",
100+
"tests/fixtures/Roboto-Regular.ttf.woff",
105101
)
106102
.unwrap();
107-
}
108-
109-
#[test]
110-
fn decompress_ttf() {
111103
super::convert(
112104
"tests/fixtures/Roboto-Regular.ttf.woff",
113105
"tests/fixtures/Roboto-Regular.ttf",

src/version2/mod.rs

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ pub fn convert<T: AsRef<Path>>(
100100
#[cfg(test)]
101101
mod tests {
102102
#[test]
103-
fn compress_otf() {
103+
fn otf() {
104104
super::convert(
105105
"tests/fixtures/Roboto-Regular.otf",
106106
"tests/fixtures/Roboto-Regular.otf.woff2",
@@ -109,13 +109,9 @@ mod tests {
109109
None,
110110
)
111111
.unwrap();
112-
}
113-
114-
#[test]
115-
fn compress_ttf() {
116112
super::convert(
117-
"tests/fixtures/Roboto-Regular.ttf",
118-
"tests/fixtures/Roboto-Regular.ttf.woff2",
113+
"tests/fixtures/Roboto-Regular.otf.woff2",
114+
"tests/fixtures/Roboto-Regular.otf",
119115
None,
120116
None,
121117
None,
@@ -124,19 +120,15 @@ mod tests {
124120
}
125121

126122
#[test]
127-
fn decompress_otf() {
123+
fn ttf() {
128124
super::convert(
129-
"tests/fixtures/Roboto-Regular.otf.woff2",
130-
"tests/fixtures/Roboto-Regular.otf",
125+
"tests/fixtures/Roboto-Regular.ttf",
126+
"tests/fixtures/Roboto-Regular.ttf.woff2",
131127
None,
132128
None,
133129
None,
134130
)
135131
.unwrap();
136-
}
137-
138-
#[test]
139-
fn decompress_ttf() {
140132
super::convert(
141133
"tests/fixtures/Roboto-Regular.ttf.woff2",
142134
"tests/fixtures/Roboto-Regular.ttf",

0 commit comments

Comments
 (0)