[librsvg: 3/5] aspect_ratio: make tests more compact.
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 3/5] aspect_ratio: make tests more compact.
- Date: Fri, 16 Mar 2018 22:09:14 +0000 (UTC)
commit 1cbd29e1e5830c31c14552337cc82c30e19bbb63
Author: Jordan Petridis <jordanpetridis protonmail com>
Date: Fri Mar 16 02:35:04 2018 +0200
aspect_ratio: make tests more compact.
rsvg_internals/src/aspect_ratio.rs | 269 +++++++++----------------------------
1 file changed, 64 insertions(+), 205 deletions(-)
---
diff --git a/rsvg_internals/src/aspect_ratio.rs b/rsvg_internals/src/aspect_ratio.rs
index 238bc0e0..1f64c4ef 100644
--- a/rsvg_internals/src/aspect_ratio.rs
+++ b/rsvg_internals/src/aspect_ratio.rs
@@ -207,19 +207,12 @@ mod tests {
#[test]
fn parsing_invalid_strings_yields_error() {
assert!(AspectRatio::parse("", ()).is_err());
-
assert!(AspectRatio::parse("defer", ()).is_err());
-
assert!(AspectRatio::parse("defer foo", ()).is_err());
-
assert!(AspectRatio::parse("defer xmidymid", ()).is_err());
-
assert!(AspectRatio::parse("defer xMidYMid foo", ()).is_err());
-
assert!(AspectRatio::parse("xmidymid", ()).is_err());
-
assert!(AspectRatio::parse("xMidYMid foo", ()).is_err());
-
assert!(AspectRatio::parse("defer xMidYMid meet foo", ()).is_err());
}
@@ -296,211 +289,77 @@ mod tests {
#[test]
fn aligns() {
- assert_eq!(
- AspectRatio::parse("xMinYMin meet", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (0.0, 0.0, 0.1, 1.0)
- );
- assert_eq!(
- AspectRatio::parse("xMinYMin slice", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (0.0, 0.0, 10.0, 100.0)
- );
+ let foo = AspectRatio::parse("xMinYMin meet", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (0.0, 0.0, 0.1, 1.0));
- assert_eq!(
- AspectRatio::parse("xMinYMid meet", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (0.0, 0.0, 0.1, 1.0)
- );
- assert_eq!(
- AspectRatio::parse("xMinYMid slice", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (0.0, -49.5, 10.0, 100.0)
- );
+ let foo = AspectRatio::parse("xMinYMin slice", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (0.0, 0.0, 10.0, 100.0));
- assert_eq!(
- AspectRatio::parse("xMinYMax meet", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (0.0, 0.0, 0.1, 1.0)
- );
- assert_eq!(
- AspectRatio::parse("xMinYMax slice", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (0.0, -99.0, 10.0, 100.0)
- );
+ let foo = AspectRatio::parse("xMinYMid meet", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (0.0, 0.0, 0.1, 1.0));
- assert_eq!(
- AspectRatio::parse("xMidYMin meet", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (4.95, 0.0, 0.1, 1.0)
- );
- assert_eq!(
- AspectRatio::parse("xMidYMin slice", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (0.0, 0.0, 10.0, 100.0)
- );
+ let foo = AspectRatio::parse("xMinYMid slice", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
- assert_eq!(
- AspectRatio::parse("xMidYMid meet", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (4.95, 0.0, 0.1, 1.0)
- );
- assert_eq!(
- AspectRatio::parse("xMidYMid slice", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (0.0, -49.5, 10.0, 100.0)
- );
+ assert_eq!(foo, (0.0, -49.5, 10.0, 100.0));
- assert_eq!(
- AspectRatio::parse("xMidYMax meet", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (4.95, 0.0, 0.1, 1.0)
- );
- assert_eq!(
- AspectRatio::parse("xMidYMax slice", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (0.0, -99.0, 10.0, 100.0)
- );
+ let foo = AspectRatio::parse("xMinYMax meet", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (0.0, 0.0, 0.1, 1.0));
- assert_eq!(
- AspectRatio::parse("xMaxYMin meet", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (9.9, 0.0, 0.1, 1.0)
- );
- assert_eq!(
- AspectRatio::parse("xMaxYMin slice", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (0.0, 0.0, 10.0, 100.0)
- );
+ let foo = AspectRatio::parse("xMinYMax slice", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (0.0, -99.0, 10.0, 100.0));
- assert_eq!(
- AspectRatio::parse("xMaxYMid meet", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (9.9, 0.0, 0.1, 1.0)
- );
- assert_eq!(
- AspectRatio::parse("xMaxYMid slice", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (0.0, -49.5, 10.0, 100.0)
- );
+ let foo = AspectRatio::parse("xMidYMin meet", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (4.95, 0.0, 0.1, 1.0));
- assert_eq!(
- AspectRatio::parse("xMaxYMax meet", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (9.9, 0.0, 0.1, 1.0)
- );
- assert_eq!(
- AspectRatio::parse("xMaxYMax slice", ()).unwrap().compute(
- 1.0,
- 10.0,
- 0.0,
- 0.0,
- 10.0,
- 1.0,
- ),
- (0.0, -99.0, 10.0, 100.0)
- );
+ let foo = AspectRatio::parse("xMidYMin slice", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (0.0, 0.0, 10.0, 100.0));
+
+ let foo = AspectRatio::parse("xMidYMid meet", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (4.95, 0.0, 0.1, 1.0));
+
+ let foo = AspectRatio::parse("xMidYMid slice", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (0.0, -49.5, 10.0, 100.0));
+
+ let foo = AspectRatio::parse("xMidYMax meet", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (4.95, 0.0, 0.1, 1.0));
+
+ let foo = AspectRatio::parse("xMidYMax slice", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (0.0, -99.0, 10.0, 100.0));
+
+ let foo = AspectRatio::parse("xMaxYMin meet", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (9.9, 0.0, 0.1, 1.0));
+
+ let foo = AspectRatio::parse("xMaxYMin slice", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (0.0, 0.0, 10.0, 100.0));
+
+ let foo = AspectRatio::parse("xMaxYMid meet", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (9.9, 0.0, 0.1, 1.0));
+
+ let foo = AspectRatio::parse("xMaxYMid slice", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (0.0, -49.5, 10.0, 100.0));
+
+ let foo = AspectRatio::parse("xMaxYMax meet", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (9.9, 0.0, 0.1, 1.0));
+
+ let foo = AspectRatio::parse("xMaxYMax slice", ()).unwrap();
+ let foo = foo.compute(1.0, 10.0, 0.0, 0.0, 10.0, 1.0);
+ assert_eq!(foo, (0.0, -99.0, 10.0, 100.0));
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
