@@ -53,10 +53,13 @@ def test_unsupported_schema_raises(self, sv: SchemaVersion) -> None:
53
53
with self .assertRaises (FormatNotSupportedException ):
54
54
outputter .output_as_string ()
55
55
56
- @named_data (* ((f'{ n } -{ sv .to_version ()} ' , gb , sv )
57
- for n , gb in all_get_bom_funct_valid
58
- for sv in SchemaVersion
59
- if sv not in UNSUPPORTED_SV and is_valid_for_schema_version (gb , sv )))
56
+ @named_data (* (
57
+ (f'{ n } -{ sv .to_version ()} ' , gb , sv )
58
+ for n , gb in all_get_bom_funct_valid
59
+ for sv in SchemaVersion
60
+ if sv not in UNSUPPORTED_SV
61
+ and is_valid_for_schema_version (gb , sv )
62
+ ))
60
63
@unpack
61
64
@patch ('cyclonedx.model.ThisTool._version' , 'TESTING' )
62
65
def test_valid (self , get_bom : Callable [[], Bom ], sv : SchemaVersion , * _ : Any , ** __ : Any ) -> None :
@@ -72,10 +75,13 @@ def test_valid(self, get_bom: Callable[[], Bom], sv: SchemaVersion, *_: Any, **_
72
75
self .assertIsNone (errors , json )
73
76
self .assertEqualSnapshot (json , snapshot_name )
74
77
75
- @named_data (* ((f'{ n } -{ sv .to_version ()} ' , gb , sv )
76
- for n , gb in all_get_bom_funct_invalid
77
- for sv in SchemaVersion
78
- if sv not in UNSUPPORTED_SV ))
78
+ @named_data (* (
79
+ (f'{ n } -{ sv .to_version ()} ' , gb , sv )
80
+ for n , gb in all_get_bom_funct_invalid
81
+ for sv in SchemaVersion
82
+ if sv not in UNSUPPORTED_SV
83
+ and is_valid_for_schema_version (gb , sv )
84
+ ))
79
85
@unpack
80
86
def test_invalid (self , get_bom : Callable [[], Bom ], sv : SchemaVersion ) -> None :
81
87
with self .assertRaises (CycloneDxException ) as error :
0 commit comments