Refactor a lot more tests to compile code

Signed-off-by: Sebastian Ziebell <[email protected]>

Author: justahero

cyclonedx-bom/src/external_models/normalized_string.rs

@@ -53,6 +53,12 @@ impl Deref for NormalizedString {
     }
 }
 
+impl AsRef<NormalizedString> for NormalizedString {
+    fn as_ref(&self) -> &NormalizedString {
+        self
+    }
+}
+
 impl AsRef<str> for NormalizedString {
     fn as_ref(&self) -> &str {
         &self.0

cyclonedx-bom/src/lib.rs

@@ -46,8 +46,8 @@
 //! }"#;
 //! let bom = Bom::parse_from_json_v1_3(bom_json.as_bytes()).expect("Failed to parse BOM");
 //!
-//! let validation_result = bom.validate_default();
-//! assert_eq!(validation_result, ValidationResult::Passed);
+//! let validation_result = bom.validate();
+//! assert!(validation_result.passed());
 //! ```
 //!
 //! ## Create and output an SBOM

cyclonedx-bom/src/models/advisory.rs

@@ -63,7 +63,9 @@ pub struct Advisories(pub Vec<Advisory>);
 impl Validate for Advisories {
     fn validate_version(&self, version: SpecVersion) -> ValidationResult {
         ValidationContext::new()
-            .add_list("inner", &self.0, |advisory| advisory.validate_version(version))
+            .add_list("inner", &self.0, |advisory| {
+                advisory.validate_version(version)
+            })
             .into()
     }
 }
@@ -86,7 +88,7 @@ mod test {
         }])
         .validate();
 
-        assert_eq!(validation_result, ValidationResult::Passed);
+        assert!(validation_result.passed());
     }
 
     #[test]
@@ -98,8 +100,8 @@ mod test {
         .validate();
 
         assert_eq!(
-            validation_result.errors(),
-            Some(validation::list(
+            validation_result,
+            validation::list(
                 "inner",
                 [(
                     0,
@@ -111,7 +113,7 @@ mod test {
                         validation::field("url", "Uri does not conform to RFC 3986")
                     ]
                 )]
-            ))
+            )
         );
     }
 }

cyclonedx-bom/src/models/attached_text.rs

@@ -48,7 +48,8 @@ impl AttachedText {
 
 impl Validate for AttachedText {
     fn validate_version(&self, _version: SpecVersion) -> ValidationResult {
-        let mut context = ValidationContext::new().add_field_option(
+        let mut context = ValidationContext::new();
+        context.add_field_option(
             "content_type",
             self.content_type.as_ref(),
             validate_normalized_string,
@@ -58,12 +59,12 @@ impl Validate for AttachedText {
             match (encoding, STANDARD.decode(self.content.clone())) {
                 (Encoding::Base64, Ok(_)) => (),
                 (Encoding::Base64, Err(_)) => {
-                    context = context.add_field("content", &self.content, |_| {
+                    context.add_field("content", &self.content, |_| {
                         Err("Content is not Base64 encoded".into())
                     });
                 }
                 (Encoding::UnknownEncoding(_), _) => {
-                    context = context.add_field("encoding", encoding, validate_encoding);
+                    context.add_field("encoding", encoding, validate_encoding);
                 }
             }
         }
@@ -109,7 +110,7 @@ impl Encoding {
 mod test {
     use crate::{
         models::attached_text::{AttachedText, Encoding},
-        prelude::{NormalizedString, Validate, ValidationResult},
+        prelude::{NormalizedString, Validate},
         validation,
     };
 
@@ -140,7 +141,7 @@ mod test {
         }
         .validate();
 
-        assert_eq!(validation_result, ValidationResult::Passed);
+        assert!(validation_result.passed());
     }
 
     #[test]
@@ -153,17 +154,15 @@ mod test {
         .validate();
 
         assert_eq!(
-            validation_result.errors(),
-            Some(
-                vec![
-                    validation::field(
-                        "content_type",
-                        "NormalizedString contains invalid characters \\r \\n \\t or \\r\\n"
-                    ),
-                    validation::field("content", "Content is not Base64 encoded")
-                ]
-                .into()
-            )
+            validation_result,
+            vec![
+                validation::field(
+                    "content_type",
+                    "NormalizedString contains invalid characters \\r \\n \\t or \\r\\n"
+                ),
+                validation::field("content", "Content is not Base64 encoded")
+            ]
+            .into()
         );
     }
 
@@ -177,8 +176,8 @@ mod test {
         .validate();
 
         assert_eq!(
-            validation_result.errors(),
-            Some(validation::field("encoding", "Unknown encoding")),
+            validation_result,
+            validation::field("encoding", "Unknown encoding"),
         );
     }
 
@@ -191,6 +190,6 @@ mod test {
         }
         .validate();
 
-        assert_eq!(validation_result, ValidationResult::Passed);
+        assert!(validation_result.passed());
     }
 }