[librsvg: 17/30] Unwrap the Cairo calls in the tests




commit 6c22954b49dbc4ad7522b5a177dbcc82ad05956d
Author: Federico Mena Quintero <federico gnome org>
Date:   Mon Jun 21 17:42:19 2021 -0500

    Unwrap the Cairo calls in the tests
    
    We don't need to handle errors there, and failure in Cairo *is*
    catastrphic for the reference tests anyway.
    
    Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/516>

 tests/src/api.rs                  |  8 ++++----
 tests/src/bugs.rs                 | 14 +++++++-------
 tests/src/filters.rs              |  4 ++--
 tests/src/intrinsic_dimensions.rs | 22 +++++++++++-----------
 tests/src/primitives.rs           | 24 ++++++++++++------------
 tests/src/reference.rs            |  5 +++--
 tests/src/reference_utils.rs      |  4 ++--
 7 files changed, 41 insertions(+), 40 deletions(-)
---
diff --git a/tests/src/api.rs b/tests/src/api.rs
index 6cb55397..d67814e1 100644
--- a/tests/src/api.rs
+++ b/tests/src/api.rs
@@ -76,7 +76,7 @@ fn render_layer() {
 
         cr.rectangle(20.0, 20.0, 30.0, 30.0);
         cr.set_source_rgba(0.0, 0.0, 1.0, 1.0);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -158,11 +158,11 @@ fn untransformed_element() {
 
         cr.rectangle(10.0, 10.0, 60.0, 80.0);
         cr.set_source_rgba(0.0, 0.0, 1.0, 1.0);
-        cr.fill_preserve();
+        cr.fill_preserve().unwrap();
 
         cr.set_line_width(20.0);
         cr.set_source_rgba(0.0, 0.0, 0.0, 1.0);
-        cr.stroke();
+        cr.stroke().unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -212,7 +212,7 @@ fn set_stylesheet() {
 
         cr.rectangle(10.0, 20.0, 30.0, 40.0);
         cr.set_source_rgba(0.0, 1.0, 0.0, 1.0);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
diff --git a/tests/src/bugs.rs b/tests/src/bugs.rs
index d5ab54f4..c3a08ff4 100644
--- a/tests/src/bugs.rs
+++ b/tests/src/bugs.rs
@@ -73,7 +73,7 @@ fn nonexistent_image_shouldnt_cancel_rendering() {
 
         cr.rectangle(10.0, 10.0, 30.0, 30.0);
         cr.set_source_rgba(0.0, 0.0, 1.0, 1.0);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -122,7 +122,7 @@ fn href_attribute_overrides_xlink_href() {
 
         cr.rectangle(100.0, 100.0, 100.0, 100.0);
         cr.set_source_rgba(0.0, 1.0, 0.0, 1.0);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -163,7 +163,7 @@ fn nonexistent_filter_leaves_object_unfiltered() {
 
         cr.rectangle(100.0, 100.0, 100.0, 100.0);
         cr.set_source_rgba(0.0, 1.0, 0.0, 1.0);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -228,7 +228,7 @@ fn recursive_paint_servers_fallback_to_color() {
 
         cr.rectangle(0.0, 100.0, 200.0, 100.0);
         cr.set_source_rgba(0.0, 1.0, 0.0, 1.0);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -391,7 +391,7 @@ fn switch_element_should_ignore_elements_in_error() {
 
         cr.rectangle(10.0, 10.0, 10.0, 10.0);
         cr.set_source_rgba(0.0, 0.0, 1.0, 1.0);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -450,11 +450,11 @@ fn accepted_children_inside_clip_path() {
     let reference_surf = cairo::ImageSurface::create(cairo::Format::ARgb32, 200, 200).unwrap();
 
     {
-        let cr = cairo::Context::new(&reference_surf);
+        let cr = cairo::Context::new(&reference_surf).unwrap();
 
         cr.rectangle(10.0, 10.0, 100.0, 100.0);
         cr.set_source_rgba(0.0, 1.0, 0.0, 1.0);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
diff --git a/tests/src/filters.rs b/tests/src/filters.rs
index 1674bcd6..175f0fe3 100644
--- a/tests/src/filters.rs
+++ b/tests/src/filters.rs
@@ -42,7 +42,7 @@ fn invalid_filter_reference_cancels_filter_chain() {
 
         cr.rectangle(100.0, 100.0, 200.0, 200.0);
         cr.set_source_rgb(0.0, 1.0, 0.0);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -92,7 +92,7 @@ fn non_filter_reference_cancels_filter_chain() {
 
         cr.rectangle(100.0, 100.0, 200.0, 200.0);
         cr.set_source_rgb(0.0, 1.0, 0.0);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
diff --git a/tests/src/intrinsic_dimensions.rs b/tests/src/intrinsic_dimensions.rs
index 053c2af3..ac9bd6d5 100644
--- a/tests/src/intrinsic_dimensions.rs
+++ b/tests/src/intrinsic_dimensions.rs
@@ -455,7 +455,7 @@ fn render_to_viewport_with_different_size() {
 
         cr.rectangle(8.0, 8.0, 32.0, 32.0);
         cr.set_source_rgba(0.0, 0.0, 1.0, 1.0);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -496,7 +496,7 @@ fn render_to_offsetted_viewport() {
 
         cr.rectangle(8.0, 8.0, 32.0, 32.0);
         cr.set_source_rgba(0.0, 0.0, 1.0, 1.0);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -540,7 +540,7 @@ fn render_to_viewport_with_transform() {
 
         cr.rectangle(18.0, 18.0, 32.0, 32.0);
         cr.set_source_rgba(0.0, 0.0, 1.0, 1.0);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -591,13 +591,13 @@ fn clip_on_transformed_viewport() {
 
         cr.rectangle(10.0, 10.0, 40.0, 40.0);
         cr.set_source_rgba(0.0, 0.0, 1.0, 1.0);
-        cr.fill();
+        cr.fill().unwrap();
 
         cr.rectangle(50.0, 50.0, 40.0, 40.0);
         cr.set_source_rgba(0.0, 1.0, 0.0, 1.0);
-        cr.fill();
+        cr.fill().unwrap();
 
-        cr.pop_group_to_source();
+        cr.pop_group_to_source().unwrap();
 
         cr.move_to(50.0, 10.0);
         cr.line_to(90.0, 50.0);
@@ -606,7 +606,7 @@ fn clip_on_transformed_viewport() {
         cr.close_path();
 
         cr.clip();
-        cr.paint();
+        cr.paint().unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -657,13 +657,13 @@ fn mask_on_transformed_viewport() {
 
         cr.rectangle(10.0, 10.0, 40.0, 40.0);
         cr.set_source_rgba(0.0, 0.0, 1.0, 1.0);
-        cr.fill();
+        cr.fill().unwrap();
 
         cr.rectangle(50.0, 50.0, 40.0, 40.0);
         cr.set_source_rgba(0.0, 1.0, 0.0, 1.0);
-        cr.fill();
+        cr.fill().unwrap();
 
-        cr.pop_group_to_source();
+        cr.pop_group_to_source().unwrap();
 
         cr.move_to(50.0, 10.0);
         cr.line_to(90.0, 50.0);
@@ -672,7 +672,7 @@ fn mask_on_transformed_viewport() {
         cr.close_path();
 
         cr.clip();
-        cr.paint();
+        cr.paint().unwrap();
     }
 
     Reference::from_surface(reference_surf)
diff --git a/tests/src/primitives.rs b/tests/src/primitives.rs
index e305bc5b..2afde00d 100644
--- a/tests/src/primitives.rs
+++ b/tests/src/primitives.rs
@@ -37,7 +37,7 @@ fn simple_opacity_with_transform() {
         cr.translate(50.0, 50.0);
         cr.rectangle(10.0, 10.0, 30.0, 30.0);
         cr.set_source_rgba(0.0, 0.0, 1.0, 0.5);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -79,7 +79,7 @@ fn simple_opacity_with_offset_viewport() {
         cr.translate(50.0, 50.0);
         cr.rectangle(10.0, 10.0, 30.0, 30.0);
         cr.set_source_rgba(0.0, 0.0, 1.0, 0.5);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -126,7 +126,7 @@ fn simple_opacity_with_scale() {
         cr.scale(8.0, 8.0);
         cr.rectangle(10.0, 10.0, 30.0, 30.0);
         cr.set_source_rgba(0.0, 0.0, 1.0, 0.5);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -177,14 +177,14 @@ fn markers_with_scale() {
         cr.line_to(170.0, 100.0);
         cr.set_source_rgb(0.0, 0.5, 0.0);
         cr.set_line_width(1.0);
-        cr.stroke();
+        cr.stroke().unwrap();
 
         for (x, y) in &[(30.0, 100.0), (170.0, 100.0)] {
             cr.move_to(x + 20.0 - 10.0, y + 10.0 - 10.0);
             cr.line_to(x + 0.0 - 10.0, y + 16.0 - 10.0);
             cr.line_to(x + 0.0 - 10.0, y + 4.0 - 10.0);
             cr.set_source_rgba(0.0, 0.0, 1.0, 0.5);
-            cr.fill();
+            cr.fill().unwrap();
         }
     }
 
@@ -227,7 +227,7 @@ fn opacity_inside_transformed_group() {
         cr.translate(20.0, 20.0);
         cr.rectangle(20.0, 20.0, 60.0, 60.0);
         cr.set_source_rgba(0.0, 0.0, 1.0, 0.5);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -277,14 +277,14 @@ fn compound_opacity() {
 
         cr.rectangle(60.0, 230.0, 80.0, 40.0);
         cr.set_source_rgba(0.0, 0.0, 1.0, 0.5);
-        cr.fill();
+        cr.fill().unwrap();
 
         cr.rectangle(70.0, 240.0, 80.0, 40.0);
         cr.set_source_rgba(0.0, 1.0, 0.0, 0.5);
-        cr.fill();
+        cr.fill().unwrap();
 
-        cr.pop_group_to_source();
-        cr.paint_with_alpha(0.5);
+        cr.pop_group_to_source().unwrap();
+        cr.paint_with_alpha(0.5).unwrap();
     }
 
     Reference::from_surface(reference_surf)
@@ -347,11 +347,11 @@ fn nested_masks() {
 
         cr.set_source_rgba(0.0, 0.0, 0.0, 1.0);
         cr.rectangle(0.0, 0.0, 6420.0, 540.0);
-        cr.fill();
+        cr.fill().unwrap();
 
         cr.set_operator(cairo::Operator::Clear);
         cr.rectangle(2760.0, 20.0, 900.0, 480.0);
-        cr.fill();
+        cr.fill().unwrap();
     }
 
     Reference::from_surface(reference_surf)
diff --git a/tests/src/reference.rs b/tests/src/reference.rs
index 831d73a0..c730070c 100644
--- a/tests/src/reference.rs
+++ b/tests/src/reference.rs
@@ -108,8 +108,9 @@ fn extract_rectangle(
 ) -> Result<cairo::ImageSurface, cairo::Error> {
     let dest = cairo::ImageSurface::create(cairo::Format::ARgb32, w, h)?;
     let cr = cairo::Context::new(&dest).expect("Failed to create a cairo context");
-    cr.set_source_surface(&source, f64::from(-x), f64::from(-y));
-    cr.paint();
+    cr.set_source_surface(&source, f64::from(-x), f64::from(-y))
+        .unwrap();
+    cr.paint().unwrap();
     Ok(dest)
 }
 
diff --git a/tests/src/reference_utils.rs b/tests/src/reference_utils.rs
index c2650887..3cb9da84 100644
--- a/tests/src/reference_utils.rs
+++ b/tests/src/reference_utils.rs
@@ -177,8 +177,8 @@ where
     {
         // convert to ARGB; the PNG may come as Rgb24
         let cr = cairo::Context::new(&argb).expect("Failed to create a cairo context");
-        cr.set_source_surface(&png, 0.0, 0.0);
-        cr.paint();
+        cr.set_source_surface(&png, 0.0, 0.0).unwrap();
+        cr.paint().unwrap();
     }
     Ok(argb)
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]