-
Notifications
You must be signed in to change notification settings - Fork 2
Test helper improvements & Test 6.1.3 #41
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,3 +16,4 @@ pub mod test_6_1_46; | |
| pub mod test_6_1_47; | ||
| pub mod test_6_1_48; | ||
| pub mod test_6_1_49; | ||
| pub mod test_6_1_03; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| use crate::csaf::getter_traits::{CsafTrait, ProductTrait, ProductTreeTrait, RelationshipTrait}; | ||
| use crate::csaf::validation::ValidationError; | ||
| use std::collections::HashMap; | ||
|
|
||
| /// Find the first cycle in the given `relation_map`, if any. | ||
| /// | ||
| /// # Returns | ||
| /// - Product ID where the cycle was first detected | ||
| /// - String representation of the whole cycle detected | ||
| /// - Index of the CSAF relation containing the product ID where the cycle was first detected | ||
| pub fn find_cycle<'a>( | ||
| relation_map: &'a HashMap<String, HashMap<String, usize>>, | ||
| product_id: &'a str, | ||
| visited: &mut Vec<&'a str>, | ||
| ) -> Option<(String, Vec<String>, usize)> { | ||
| if visited.contains(&product_id) { | ||
| return Some((product_id.to_string(), vec!(product_id.to_string()), 0)); | ||
| } else { | ||
| visited.push(product_id); | ||
| } | ||
| if let Some(next_vec) = relation_map.get(product_id) { | ||
| for (next, r_i) in next_vec { | ||
| match find_cycle(relation_map, next, visited) { | ||
| None => {} | ||
| Some((cycle_end, mut cycle, r_i_res)) => { | ||
| if cycle.len() == 1 || cycle_end != *cycle.last().unwrap() { | ||
| // Back-trace the cycle to the first node | ||
| cycle.push(product_id.to_string()); | ||
| if cycle_end == product_id { | ||
| // Reverse the cycle when it is complete | ||
| cycle.reverse(); | ||
| return Some((cycle_end, cycle, *r_i)); | ||
| } | ||
| } | ||
| return Some((cycle_end, cycle, r_i_res)); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| visited.pop(); | ||
| None | ||
| } | ||
|
|
||
| pub fn test_6_1_03_circular_definition_of_product_id( | ||
| doc: &impl CsafTrait, | ||
| ) -> Result<(), ValidationError> { | ||
| if let Some(tree) = doc.get_product_tree().as_ref() { | ||
| let mut relation_map = HashMap::<String, HashMap<String, usize>>::new(); | ||
|
|
||
| for (i_r, r) in tree.get_relationships().iter().enumerate() { | ||
| let rel_prod_id = r.get_full_product_name().get_product_id(); | ||
| if r.get_product_reference() == rel_prod_id { | ||
| return Err(ValidationError { | ||
| message: "Relationship references itself via product_reference".to_string(), | ||
| instance_path: format!("/product_tree/relationships/{}/product_reference", i_r), | ||
| }) | ||
| } else if r.get_relates_to_product_reference() == rel_prod_id { | ||
| return Err(ValidationError { | ||
| message: "Relationship references itself via relates_to_product_reference".to_string(), | ||
| instance_path: format!("/product_tree/relationships/{}/relates_to_product_reference", i_r), | ||
| }) | ||
| } else { | ||
| match relation_map.get_mut(r.get_product_reference()) { | ||
| Some(v) => { | ||
| v.insert(r.get_relates_to_product_reference().to_owned(), i_r); | ||
| }, | ||
| None => { | ||
| relation_map.insert( | ||
| r.get_product_reference().to_owned(), | ||
| HashMap::from([(r.get_relates_to_product_reference().to_owned(), i_r)]) | ||
| ); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Perform cycle check | ||
| for product_id in relation_map.keys() { | ||
| let mut vec: Vec<&str> = vec!(); | ||
| if let Some((_, cycle, relation_index)) = find_cycle(&relation_map, product_id, &mut vec) { | ||
| return Err(ValidationError { | ||
| message: format!("Found product relationship cycle: {}", cycle.join(" -> ")), | ||
| instance_path: format!("/product_tree/relationships/{}", relation_index), | ||
| }) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Ok(()) | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use crate::csaf::test_helper::{run_csaf20_tests, run_csaf21_tests}; | ||
| use crate::csaf::validation::ValidationError; | ||
| use crate::csaf::validations::test_6_1_03::test_6_1_03_circular_definition_of_product_id; | ||
| use std::collections::HashMap; | ||
|
|
||
| #[test] | ||
| fn test_test_6_1_03() { | ||
| let error01 = ValidationError { | ||
| message: "Relationship references itself via relates_to_product_reference".to_string(), | ||
| instance_path: "/product_tree/relationships/0/relates_to_product_reference".to_string(), | ||
| }; | ||
| let errors = HashMap::from([ | ||
| ("01", &error01) | ||
| ]); | ||
| run_csaf20_tests("03", test_6_1_03_circular_definition_of_product_id, &errors); | ||
| run_csaf21_tests("03", test_6_1_03_circular_definition_of_product_id, &errors); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_find_cycle() { | ||
| // Create a relation map with a non-trivial cycle: B -> C -> D -> B | ||
| let mut relation_map = HashMap::new(); | ||
|
|
||
| relation_map.insert( | ||
| "A".to_string(), | ||
| HashMap::from([("B".to_string(), 0)]) | ||
| ); | ||
| relation_map.insert( | ||
| "B".to_string(), | ||
| HashMap::from([("C".to_string(), 1), ("E".to_string(), 2)]) | ||
| ); | ||
| relation_map.insert( | ||
| "C".to_string(), | ||
| HashMap::from([("D".to_string(), 3), ("F".to_string(), 4)]) | ||
| ); | ||
| relation_map.insert( | ||
| "D".to_string(), | ||
| HashMap::from([("B".to_string(), 5)]) | ||
| ); | ||
|
|
||
| // Also add some nodes that aren't part of the cycle | ||
| relation_map.insert( | ||
| "E".to_string(), | ||
| HashMap::from([("F".to_string(), 6)]) | ||
| ); | ||
| relation_map.insert( | ||
| "F".to_string(), | ||
| HashMap::from([("G".to_string(), 7)]) | ||
| ); | ||
|
|
||
| // Test cycle detection starting from the first node | ||
| let mut visited = Vec::new(); | ||
| let result = super::find_cycle(&relation_map, "A", &mut visited); | ||
| assert!(result.is_some()); | ||
| let (cycle_end, cycle, relation_index) = result.unwrap(); | ||
| assert_eq!(cycle_end, "B"); | ||
| assert_eq!(cycle, vec!("B", "C", "D", "B")); | ||
| assert_eq!(relation_index, 1); | ||
|
|
||
| // Test starting from a node that's part of the cycle | ||
| let mut visited = Vec::new(); | ||
| let result = super::find_cycle(&relation_map, "C", &mut visited); | ||
| assert!(result.is_some()); | ||
| let (cycle_end, cycle, relation_index) = result.unwrap(); | ||
| assert_eq!(cycle_end, "C"); | ||
| assert_eq!(cycle, vec!("C", "D", "B", "C")); | ||
| assert_eq!(relation_index, 3); | ||
|
|
||
| // Test starting from a node that's not part of any cycle | ||
| let mut visited = Vec::new(); | ||
| let result = super::find_cycle(&relation_map, "E", &mut visited); | ||
| assert!(result.is_none()); | ||
|
|
||
| // Test with empty visited Set and starting from a node not in the map | ||
| let mut visited = Vec::new(); | ||
| let result = super::find_cycle(&relation_map, "Z", &mut visited); | ||
| assert!(result.is_none()); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.