expect different error

georust · Apr 10, 2023 · 1936b8e · 1936b8e
1 parent b79b6e5
commit 1936b8e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/feature.rs b/src/feature.rs
@@ -336,8 +336,8 @@ mod tests {
     fn feature_json_invalid_geometry() {
         let geojson_str = r#"{"geometry":3.14,"properties":{},"type":"Feature"}"#;
         match geojson_str.parse::<GeoJson>().unwrap_err() {
-            Error::FeatureInvalidGeometryValue(_) => (),
-            _ => unreachable!(),
+            Error::MalformedJson(e) => assert!(e.to_string().contains("expected a valid GeoJSON Geometry object")),
+            other => panic!("expecting FeatureInvalidGeometryValue, but got: {:?}", other),
         }
     }
 
@@ -396,18 +396,18 @@ mod tests {
     #[test]
     fn decode_feature_with_invalid_id_type_object() {
         let feature_json_str = "{\"geometry\":{\"coordinates\":[1.1,2.1],\"type\":\"Point\"},\"id\":{},\"properties\":{},\"type\":\"Feature\"}";
-        assert!(matches!(
-            feature_json_str.parse::<GeoJson>(),
-            Err(Error::FeatureInvalidIdentifierType(_))
-        ));
+        match feature_json_str.parse::<GeoJson>().unwrap_err() {
+            Error::MalformedJson(e) => assert!(e.to_string().contains("Id")),
+            other => panic!("expected different error. Got: {:?}", other),
+        }
     }
 
     #[test]
     fn decode_feature_with_invalid_id_type_null() {
         let feature_json_str = "{\"geometry\":{\"coordinates\":[1.1,2.1],\"type\":\"Point\"},\"id\":null,\"properties\":{},\"type\":\"Feature\"}";
         match feature_json_str.parse::<GeoJson>().unwrap_err() {
-            Error::FeatureInvalidIdentifierType(_) => {} // pass,
-            other => panic!("unexpected err: {:?}", other),
+            Error::MalformedJson(e) => assert!(e.to_string().contains("Id")),
+            other => panic!("expected different error. Got: {:?}", other),
         }
     }
 

diff --git a/src/feature_collection.rs b/src/feature_collection.rs
@@ -342,11 +342,11 @@ mod tests {
 
         let actual_failure = FeatureCollection::from_str(&geometry_json).unwrap_err();
         match actual_failure {
-            Error::ExpectedType { actual, expected } => {
-                assert_eq!(actual, "Geometry");
-                assert_eq!(expected, "FeatureCollection");
+            Error::MalformedJson(e) => {
+                assert!(e.to_string().contains("missing field"));
+                assert!(e.to_string().contains("features"));
             }
-            e => panic!("unexpected error: {}", e),
-        };
+            other => panic!("expected other error. Got: {:?}", other)
+        }
     }
 }