File tree Expand file tree Collapse file tree 1 file changed +2
-28
lines changed Expand file tree Collapse file tree 1 file changed +2
-28
lines changed Original file line number Diff line number Diff line change @@ -54,7 +54,8 @@ fn find_content_in_bom_files() -> Result<(), Box<dyn std::error::Error>> {
5454
5555 cmd. current_dir ( tmp_dir. path ( ) )
5656 . arg ( "cyclonedx" )
57- . arg ( "--top-level" ) ;
57+ . arg ( "--top-level" )
58+ . arg ( "--override-filename=bom" ) ;
5859
5960 cmd. assert ( ) . success ( ) . stdout ( "" ) ;
6061
@@ -116,10 +117,6 @@ fn find_content_in_stderr() -> Result<(), Box<dyn std::error::Error>> {
116117
117118 cmd. assert ( )
118119 . success ( )
119- . stderr ( predicate:: str:: contains ( format ! (
120- "Outputting {}" ,
121- tmp_dir. path( ) . join( "bom.xml" ) . display( ) ,
122- ) ) )
123120 . stderr ( predicate:: str:: contains ( format ! (
124121 "Package {} has an invalid license expression ({}), using as named license: Invalid SPDX expression: unknown term" ,
125122 pkg_name, license,
@@ -129,31 +126,8 @@ fn find_content_in_stderr() -> Result<(), Box<dyn std::error::Error>> {
129126
130127 cmd. current_dir ( tmp_dir. path ( ) ) . arg ( "cyclonedx" ) . arg ( "-qq" ) ;
131128
132- cmd. assert ( ) . success ( ) . stdout ( "" ) . stderr ( "" ) ;
133-
134- tmp_dir. close ( ) ?;
135-
136- Ok ( ( ) )
137- }
138-
139- #[ test]
140- fn bom_file_name_extension_is_prepended_with_cdx ( ) -> Result < ( ) , Box < dyn std:: error:: Error > > {
141- let tmp_dir = make_temp_rust_project ( ) ?;
142-
143- let mut cmd = Command :: cargo_bin ( env ! ( "CARGO_PKG_NAME" ) ) ?;
144-
145- cmd. current_dir ( tmp_dir. path ( ) )
146- . arg ( "cyclonedx" )
147- . arg ( "--output-cdx" ) ;
148-
149129 cmd. assert ( ) . success ( ) . stdout ( "" ) ;
150130
151- tmp_dir. child ( "bom.xml" ) . assert ( predicate:: path:: missing ( ) ) ;
152-
153- tmp_dir
154- . child ( "bom.cdx.xml" )
155- . assert ( predicate:: path:: exists ( ) ) ;
156-
157131 tmp_dir. close ( ) ?;
158132
159133 Ok ( ( ) )
You can’t perform that action at this time.
0 commit comments