@@ -62,10 +62,19 @@ mod required {
6262#[ derive( Clone , PartialEq , Eq , Debug , serde:: Serialize , serde:: Deserialize ) ]
6363pub ( crate ) struct Scenario {
6464 #[ serde( with = "required" ) ]
65- pub large_sbom : Option < String > ,
65+ pub get_sbom : Option < String > ,
6666
6767 #[ serde( with = "required" ) ]
68- pub max_vuln : Option < String > ,
68+ pub get_sbom_advisories : Option < String > ,
69+
70+ #[ serde( with = "required" ) ]
71+ pub get_sbom_packages : Option < String > ,
72+
73+ #[ serde( with = "required" ) ]
74+ pub get_sbom_related : Option < String > ,
75+
76+ #[ serde( with = "required" ) ]
77+ pub get_vulnerability : Option < String > ,
6978}
7079
7180impl Scenario {
@@ -88,9 +97,16 @@ impl Scenario {
8897
8998 let loader = Loader :: new ( db) ;
9099
100+ let large_sbom = Some ( loader. large_sbom ( ) . await ?) ;
101+ let max_vuln = Some ( loader. max_vuln ( ) . await ?) ;
102+
91103 Ok ( Self {
92- large_sbom : Some ( loader. large_sbom ( ) . await ?) ,
93- max_vuln : Some ( loader. max_vuln ( ) . await ?) ,
104+ get_sbom : large_sbom. clone ( ) ,
105+ get_sbom_advisories : large_sbom. clone ( ) ,
106+ get_sbom_related : large_sbom. clone ( ) ,
107+ get_sbom_packages : large_sbom,
108+
109+ get_vulnerability : max_vuln,
94110 } )
95111 }
96112}
@@ -154,6 +170,12 @@ order by num desc
154170mod test {
155171 use super :: * ;
156172
173+ #[ derive( Clone , PartialEq , Eq , Debug , serde:: Serialize , serde:: Deserialize ) ]
174+ pub ( crate ) struct Scenario {
175+ #[ serde( with = "required" ) ]
176+ pub large_sbom : Option < String > ,
177+ }
178+
157179 #[ test]
158180 fn missing ( ) {
159181 let err = serde_json:: from_str :: < Scenario > ( r#"{}"# ) . expect_err ( "Must be an error" ) ;
@@ -196,7 +218,7 @@ mod test {
196218 // Ensure the empty file parses
197219 #[ test]
198220 fn empty ( ) {
199- let _ =
200- serde_json5 :: from_str :: < Scenario > ( include_str ! ( "../empty.json5" ) ) . expect ( "Must be ok" ) ;
221+ let _ = serde_json5 :: from_str :: < super :: Scenario > ( include_str ! ( "../empty.json5" ) )
222+ . expect ( "Must be ok" ) ;
201223 }
202224}
0 commit comments