[librsvg: 20/43] Remove the is_*_error() functions for tests
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 20/43] Remove the is_*_error() functions for tests
- Date: Sat, 21 Dec 2019 02:31:10 +0000 (UTC)
commit dc99be7203dcf4c88ba7390dce8845babbce2052
Author: Federico Mena Quintero <federico gnome org>
Date: Fri Dec 20 12:36:36 2019 -0600
Remove the is_*_error() functions for tests
rsvg_internals/src/error.rs | 16 ----------------
rsvg_internals/src/marker.rs | 20 +++++---------------
rsvg_internals/src/transform.rs | 2 +-
3 files changed, 6 insertions(+), 32 deletions(-)
---
diff --git a/rsvg_internals/src/error.rs b/rsvg_internals/src/error.rs
index 90c028b2..c831c153 100644
--- a/rsvg_internals/src/error.rs
+++ b/rsvg_internals/src/error.rs
@@ -367,19 +367,3 @@ impl From<glib::Error> for LoadingError {
LoadingError::Glib(e)
}
}
-
-#[cfg(test)]
-pub fn is_parse_error<T>(r: &Result<T, ValueErrorKind>) -> bool {
- match *r {
- Err(ValueErrorKind::Parse(_)) => true,
- _ => false,
- }
-}
-
-#[cfg(test)]
-pub fn is_value_error<T>(r: &Result<T, ValueErrorKind>) -> bool {
- match *r {
- Err(ValueErrorKind::Value(_)) => true,
- _ => false,
- }
-}
diff --git a/rsvg_internals/src/marker.rs b/rsvg_internals/src/marker.rs
index 5af9193c..ec6939b6 100644
--- a/rsvg_internals/src/marker.rs
+++ b/rsvg_internals/src/marker.rs
@@ -805,12 +805,8 @@ mod parser_tests {
#[test]
fn parsing_invalid_marker_units_yields_error() {
- assert!(is_parse_error(
- &MarkerUnits::parse_str("").map_err(|e| ValueErrorKind::from(e))
- ));
- assert!(is_parse_error(
- &MarkerUnits::parse_str("foo").map_err(|e| ValueErrorKind::from(e))
- ));
+ assert!(MarkerUnits::parse_str("").is_err());
+ assert!(MarkerUnits::parse_str("foo").is_err());
}
#[test]
@@ -827,15 +823,9 @@ mod parser_tests {
#[test]
fn parsing_invalid_marker_orient_yields_error() {
- assert!(is_parse_error(
- &MarkerOrient::parse_str("").map_err(|e| ValueErrorKind::from(e))
- ));
- assert!(is_parse_error(
- &MarkerOrient::parse_str("blah").map_err(|e| ValueErrorKind::from(e))
- ));
- assert!(is_parse_error(
- &MarkerOrient::parse_str("45blah").map_err(|e| ValueErrorKind::from(e))
- ));
+ assert!(MarkerOrient::parse_str("").is_err());
+ assert!(MarkerOrient::parse_str("blah").is_err());
+ assert!(MarkerOrient::parse_str("45blah").is_err());
}
#[test]
diff --git a/rsvg_internals/src/transform.rs b/rsvg_internals/src/transform.rs
index 71b7bd65..6d67ebd5 100644
--- a/rsvg_internals/src/transform.rs
+++ b/rsvg_internals/src/transform.rs
@@ -220,7 +220,7 @@ mod tests {
}
fn assert_parse_error(s: &str) {
- assert!(is_parse_error(&parse_transform(s)));
+ assert!(parse_transform(s).is_err());
}
#[test]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]