feat: migrate tests to new test infrastructure

csaf-rs/src/validations/test_6_1_02.rs

@@ -3,11 +3,11 @@ use crate::validation::ValidationError;
 use std::collections::HashSet;
 
 pub fn test_6_1_02_multiple_definition_of_product_id(doc: &impl CsafTrait) -> Result<(), Vec<ValidationError>> {
-    // Map to store each key with all of its paths
-    let mut products = HashSet::<String>::new();
+    let mut errors: Option<Vec<ValidationError>> = None;
 
-    let mut errors: Option<Vec<ValidationError>> = Option::None;
     if let Some(tree) = doc.get_product_tree().as_ref() {
+        // Map to store each key with all of its paths
+        let mut products: HashSet<String> = HashSet::new();
         tree.visit_all_products(&mut |product, path| {
             if products.contains(product.get_product_id()) {
                 errors
@@ -29,22 +29,41 @@ fn generate_err_msg(product_id: &str, path: &str) -> ValidationError {
     }
 }
 
+impl crate::test_validation::TestValidator<crate::schema::csaf2_0::schema::CommonSecurityAdvisoryFramework>
+    for crate::csaf2_0::testcases::ValidatorForTest6_1_2
+{
+    fn validate(
+        &self,
+        doc: &crate::schema::csaf2_0::schema::CommonSecurityAdvisoryFramework,
+    ) -> Result<(), Vec<ValidationError>> {
+        test_6_1_02_multiple_definition_of_product_id(doc)
+    }
+}
+
+impl crate::test_validation::TestValidator<crate::schema::csaf2_1::schema::CommonSecurityAdvisoryFramework>
+    for crate::csaf2_1::testcases::ValidatorForTest6_1_2
+{
+    fn validate(
+        &self,
+        doc: &crate::schema::csaf2_1::schema::CommonSecurityAdvisoryFramework,
+    ) -> Result<(), Vec<ValidationError>> {
+        test_6_1_02_multiple_definition_of_product_id(doc)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::test_helper::{run_csaf20_tests, run_csaf21_tests};
-    use std::collections::HashMap;
+    use crate::csaf2_0::testcases::TESTS_2_0;
+    use crate::csaf2_1::testcases::TESTS_2_1;
 
     #[test]
     fn test_test_6_1_02() {
-        let errors = HashMap::from([(
-            "01",
-            vec![generate_err_msg(
-                "CSAFPID-9080700",
-                "/product_tree/full_product_names/1",
-            )],
+        let shared_error_01 = Err(vec![generate_err_msg(
+            "CSAFPID-9080700",
+            "/product_tree/full_product_names/1",
         )]);
-        run_csaf20_tests("02", test_6_1_02_multiple_definition_of_product_id, errors.clone());
-        run_csaf21_tests("02", test_6_1_02_multiple_definition_of_product_id, errors);
+        TESTS_2_0.test_6_1_2.expect(shared_error_01.clone());
+        TESTS_2_1.test_6_1_2.expect(shared_error_01.clone());
     }
 }

csaf-rs/src/validations/test_6_1_03.rs

@@ -105,16 +105,40 @@ pub fn test_6_1_03_circular_definition_of_product_id(doc: &impl CsafTrait) -> Re
     errors.map_or(Ok(()), Err)
 }
 
+impl crate::test_validation::TestValidator<crate::schema::csaf2_0::schema::CommonSecurityAdvisoryFramework>
+    for crate::csaf2_0::testcases::ValidatorForTest6_1_3
+{
+    fn validate(
+        &self,
+        doc: &crate::schema::csaf2_0::schema::CommonSecurityAdvisoryFramework,
+    ) -> Result<(), Vec<ValidationError>> {
+        test_6_1_03_circular_definition_of_product_id(doc)
+    }
+}
+
+impl crate::test_validation::TestValidator<crate::schema::csaf2_1::schema::CommonSecurityAdvisoryFramework>
+    for crate::csaf2_1::testcases::ValidatorForTest6_1_3
+{
+    fn validate(
+        &self,
+        doc: &crate::schema::csaf2_1::schema::CommonSecurityAdvisoryFramework,
+    ) -> Result<(), Vec<ValidationError>> {
+        test_6_1_03_circular_definition_of_product_id(doc)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::test_helper::{run_csaf20_tests, run_csaf21_tests};
+    use crate::csaf2_0::testcases::TESTS_2_0;
+    use crate::csaf2_1::testcases::TESTS_2_1;
 
     #[test]
     fn test_test_6_1_03() {
-        let errors = HashMap::from([("01", vec![generate_self_reference_relates_to_error(0)])]);
-        run_csaf20_tests("03", test_6_1_03_circular_definition_of_product_id, errors.clone());
-        run_csaf21_tests("03", test_6_1_03_circular_definition_of_product_id, errors);
+        let shared_error_01 = Err(vec![generate_self_reference_relates_to_error(0)]);
+
+        TESTS_2_0.test_6_1_3.expect(shared_error_01.clone());
+        TESTS_2_1.test_6_1_3.expect(shared_error_01.clone());
     }
 
     #[test]

csaf-rs/src/validations/test_6_1_04.rs

@@ -30,31 +30,50 @@ pub fn test_6_1_04_missing_definition_of_product_group_id(doc: &impl CsafTrait)
     errors.map_or(Ok(()), Err)
 }
 
+impl crate::test_validation::TestValidator<crate::schema::csaf2_0::schema::CommonSecurityAdvisoryFramework>
+    for crate::csaf2_0::testcases::ValidatorForTest6_1_4
+{
+    fn validate(
+        &self,
+        doc: &crate::schema::csaf2_0::schema::CommonSecurityAdvisoryFramework,
+    ) -> Result<(), Vec<ValidationError>> {
+        test_6_1_04_missing_definition_of_product_group_id(doc)
+    }
+}
+
+impl crate::test_validation::TestValidator<crate::schema::csaf2_1::schema::CommonSecurityAdvisoryFramework>
+    for crate::csaf2_1::testcases::ValidatorForTest6_1_4
+{
+    fn validate(
+        &self,
+        doc: &crate::schema::csaf2_1::schema::CommonSecurityAdvisoryFramework,
+    ) -> Result<(), Vec<ValidationError>> {
+        test_6_1_04_missing_definition_of_product_group_id(doc)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::test_helper::{run_csaf20_tests, run_csaf21_tests};
-    use std::collections::HashMap;
+    use crate::csaf2_0::testcases::TESTS_2_0;
+    use crate::csaf2_1::testcases::TESTS_2_1;
 
     #[test]
     fn test_test_6_1_04() {
-        let errors = HashMap::from([
-            (
-                "01",
-                vec![generate_err_msg(
-                    "CSAFGID-1020301",
-                    "/vulnerabilities/0/threats/0/group_ids/0",
-                )],
-            ),
-            (
-                "02",
-                vec![
-                    generate_err_msg("CSAFGID-1020300", "/vulnerabilities/0/flags/0/group_ids/0"),
-                    generate_err_msg("CSAFGID-1020301", "/vulnerabilities/1/flags/0/group_ids/0"),
-                ],
-            ),
-        ]);
-        run_csaf20_tests("04", test_6_1_04_missing_definition_of_product_group_id, errors.clone());
-        run_csaf21_tests("04", test_6_1_04_missing_definition_of_product_group_id, errors);
+        let case_01 = Err(vec![generate_err_msg(
+            "CSAFGID-1020301",
+            "/vulnerabilities/0/threats/0/group_ids/0",
+        )]);
+
+        TESTS_2_0.test_6_1_4.expect(
+            case_01.clone(),
+            Err(vec![
+                generate_err_msg("CSAFGID-1020300", "/vulnerabilities/0/flags/0/group_ids/0"),
+                generate_err_msg("CSAFGID-1020301", "/vulnerabilities/1/flags/0/group_ids/0"),
+            ]),
+            Ok(()),
+            Ok(()),
+        );
+        TESTS_2_1.test_6_1_4.expect(case_01);
     }
 }

csaf-rs/src/validations/test_6_1_05.rs

@@ -30,26 +30,42 @@ pub fn test_6_1_05_multiple_definition_of_product_group_id(doc: &impl CsafTrait)
     if errors.is_empty() { Ok(()) } else { Err(errors) }
 }
 
+impl crate::test_validation::TestValidator<crate::schema::csaf2_0::schema::CommonSecurityAdvisoryFramework>
+    for crate::csaf2_0::testcases::ValidatorForTest6_1_5
+{
+    fn validate(
+        &self,
+        doc: &crate::schema::csaf2_0::schema::CommonSecurityAdvisoryFramework,
+    ) -> Result<(), Vec<ValidationError>> {
+        test_6_1_05_multiple_definition_of_product_group_id(doc)
+    }
+}
+
+impl crate::test_validation::TestValidator<crate::schema::csaf2_1::schema::CommonSecurityAdvisoryFramework>
+    for crate::csaf2_1::testcases::ValidatorForTest6_1_5
+{
+    fn validate(
+        &self,
+        doc: &crate::schema::csaf2_1::schema::CommonSecurityAdvisoryFramework,
+    ) -> Result<(), Vec<ValidationError>> {
+        test_6_1_05_multiple_definition_of_product_group_id(doc)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::test_helper::{run_csaf20_tests, run_csaf21_tests};
-    use std::collections::HashMap;
+    use crate::csaf2_0::testcases::TESTS_2_0;
+    use crate::csaf2_1::testcases::TESTS_2_1;
 
     #[test]
-    fn test_test_6_1_02() {
-        let errors = HashMap::from([(
-            "01",
-            vec![
-                generate_err_msg("CSAFGID-1020300", "/product_tree/product_groups/0/group_id"),
-                generate_err_msg("CSAFGID-1020300", "/product_tree/product_groups/1/group_id"),
-            ],
-        )]);
-        run_csaf20_tests(
-            "05",
-            test_6_1_05_multiple_definition_of_product_group_id,
-            errors.clone(),
-        );
-        run_csaf21_tests("05", test_6_1_05_multiple_definition_of_product_group_id, errors);
+    fn test_test_6_1_05() {
+        let case_01 = Err(vec![
+            generate_err_msg("CSAFGID-1020300", "/product_tree/product_groups/0/group_id"),
+            generate_err_msg("CSAFGID-1020300", "/product_tree/product_groups/1/group_id"),
+        ]);
+
+        TESTS_2_0.test_6_1_5.expect(case_01.clone());
+        TESTS_2_1.test_6_1_5.expect(case_01);
     }
 }