[librsvg] length.rs: Don't use Length in the tests; use LengthHorizontal, etc.
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg] length.rs: Don't use Length in the tests; use LengthHorizontal, etc.
- Date: Tue, 22 Jan 2019 01:48:51 +0000 (UTC)
commit fcbbba18b59ee7feac231da0528ff8ab7e6f761d
Author: Federico Mena Quintero <federico gnome org>
Date: Mon Jan 21 19:23:19 2019 -0600
length.rs: Don't use Length in the tests; use LengthHorizontal, etc.
rsvg_internals/src/length.rs | 98 ++++++++++++++++++++++++++++----------------
1 file changed, 63 insertions(+), 35 deletions(-)
---
diff --git a/rsvg_internals/src/length.rs b/rsvg_internals/src/length.rs
index 79041e9a..1144cdad 100644
--- a/rsvg_internals/src/length.rs
+++ b/rsvg_internals/src/length.rs
@@ -377,87 +377,116 @@ mod tests {
#[test]
fn parses_default() {
assert_eq!(
- Length::parse_str("42", LengthDir::Horizontal),
- Ok(Length::new(
+ LengthHorizontal::parse_str("42", ()),
+ Ok(LengthHorizontal(Length::new(
42.0,
LengthUnit::Default,
LengthDir::Horizontal
- ))
+ )))
);
assert_eq!(
- Length::parse_str("-42px", LengthDir::Horizontal),
- Ok(Length::new(
+ LengthHorizontal::parse_str("-42px", ()),
+ Ok(LengthHorizontal(Length::new(
-42.0,
LengthUnit::Default,
LengthDir::Horizontal
- ))
+ )))
);
}
#[test]
fn parses_percent() {
assert_eq!(
- Length::parse_str("50.0%", LengthDir::Horizontal),
- Ok(Length::new(0.5, LengthUnit::Percent, LengthDir::Horizontal))
+ LengthHorizontal::parse_str("50.0%", ()),
+ Ok(LengthHorizontal(Length::new(
+ 0.5,
+ LengthUnit::Percent,
+ LengthDir::Horizontal
+ )))
);
}
#[test]
fn parses_font_em() {
assert_eq!(
- Length::parse_str("22.5em", LengthDir::Vertical),
- Ok(Length::new(22.5, LengthUnit::FontEm, LengthDir::Vertical))
+ LengthVertical::parse_str("22.5em", ()),
+ Ok(LengthVertical(Length::new(
+ 22.5,
+ LengthUnit::FontEm,
+ LengthDir::Vertical
+ )))
);
}
#[test]
fn parses_font_ex() {
assert_eq!(
- Length::parse_str("22.5ex", LengthDir::Vertical),
- Ok(Length::new(22.5, LengthUnit::FontEx, LengthDir::Vertical))
+ LengthVertical::parse_str("22.5ex", ()),
+ Ok(LengthVertical(Length::new(
+ 22.5,
+ LengthUnit::FontEx,
+ LengthDir::Vertical
+ )))
);
}
#[test]
fn parses_physical_units() {
assert_eq!(
- Length::parse_str("72pt", LengthDir::Both),
- Ok(Length::new(1.0, LengthUnit::Inch, LengthDir::Both))
+ LengthBoth::parse_str("72pt", ()),
+ Ok(LengthBoth(Length::new(
+ 1.0,
+ LengthUnit::Inch,
+ LengthDir::Both
+ )))
);
assert_eq!(
- Length::parse_str("-22.5in", LengthDir::Both),
- Ok(Length::new(-22.5, LengthUnit::Inch, LengthDir::Both))
+ LengthBoth::parse_str("-22.5in", ()),
+ Ok(LengthBoth(Length::new(
+ -22.5,
+ LengthUnit::Inch,
+ LengthDir::Both
+ )))
);
assert_eq!(
- Length::parse_str("-254cm", LengthDir::Both),
- Ok(Length::new(-100.0, LengthUnit::Inch, LengthDir::Both))
+ LengthBoth::parse_str("-254cm", ()),
+ Ok(LengthBoth(Length::new(
+ -100.0,
+ LengthUnit::Inch,
+ LengthDir::Both
+ )))
);
assert_eq!(
- Length::parse_str("254mm", LengthDir::Both),
- Ok(Length::new(10.0, LengthUnit::Inch, LengthDir::Both))
+ LengthBoth::parse_str("254mm", ()),
+ Ok(LengthBoth(Length::new(
+ 10.0,
+ LengthUnit::Inch,
+ LengthDir::Both
+ )))
);
assert_eq!(
- Length::parse_str("60pc", LengthDir::Both),
- Ok(Length::new(10.0, LengthUnit::Inch, LengthDir::Both))
+ LengthBoth::parse_str("60pc", ()),
+ Ok(LengthBoth(Length::new(
+ 10.0,
+ LengthUnit::Inch,
+ LengthDir::Both
+ )))
);
}
#[test]
fn empty_length_yields_error() {
- assert!(is_parse_error(&Length::parse_str("", LengthDir::Both)));
+ assert!(is_parse_error(&LengthBoth::parse_str("", ())));
}
#[test]
fn invalid_unit_yields_error() {
- assert!(is_parse_error(&Length::parse_str(
- "8furlong",
- LengthDir::Both
- )));
+ assert!(is_parse_error(&LengthBoth::parse_str("8furlong", ())));
}
#[test]
@@ -477,7 +506,7 @@ mod tests {
let values = ComputedValues::default();
assert_approx_eq_cairo!(
- Length::new(10.0, LengthUnit::Default, LengthDir::Both).normalize(&values, ¶ms),
+ LengthBoth::new(10.0, LengthUnit::Default).normalize(&values, ¶ms),
10.0
);
}
@@ -489,11 +518,11 @@ mod tests {
let values = ComputedValues::default();
assert_approx_eq_cairo!(
- Length::new(10.0, LengthUnit::Inch, LengthDir::Horizontal).normalize(&values, ¶ms),
+ LengthHorizontal::new(10.0, LengthUnit::Inch).normalize(&values, ¶ms),
400.0
);
assert_approx_eq_cairo!(
- Length::new(10.0, LengthUnit::Inch, LengthDir::Vertical).normalize(&values, ¶ms),
+ LengthVertical::new(10.0, LengthUnit::Inch).normalize(&values, ¶ms),
500.0
);
}
@@ -505,12 +534,11 @@ mod tests {
let values = ComputedValues::default();
assert_approx_eq_cairo!(
- Length::new(0.05, LengthUnit::Percent, LengthDir::Horizontal)
- .normalize(&values, ¶ms),
+ LengthHorizontal::new(0.05, LengthUnit::Percent).normalize(&values, ¶ms),
5.0
);
assert_approx_eq_cairo!(
- Length::new(0.05, LengthUnit::Percent, LengthDir::Vertical).normalize(&values, ¶ms),
+ LengthVertical::new(0.05, LengthUnit::Percent).normalize(&values, ¶ms),
10.0
);
}
@@ -525,12 +553,12 @@ mod tests {
// property and the way we compute FontEx from that.
assert_approx_eq_cairo!(
- Length::new(1.0, LengthUnit::FontEm, LengthDir::Vertical).normalize(&values, ¶ms),
+ LengthVertical::new(1.0, LengthUnit::FontEm).normalize(&values, ¶ms),
12.0
);
assert_approx_eq_cairo!(
- Length::new(1.0, LengthUnit::FontEx, LengthDir::Vertical).normalize(&values, ¶ms),
+ LengthVertical::new(1.0, LengthUnit::FontEx).normalize(&values, ¶ms),
6.0
);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]