@@ -146,49 +146,43 @@ mod tests {
146
146
use cargo_manifest:: { MaybeInherited , StringOrBool } ;
147
147
use insta:: assert_snapshot;
148
148
149
+ const MANIFEST : & [ u8 ] = b"[package]\n name = \" foo\" \n version = \" 0.0.1\" \n " ;
150
+ const MAX_SIZE : u64 = 512 * 1024 * 1024 ;
151
+
149
152
#[ test]
150
153
fn process_tarball_test ( ) {
151
- let manifest = b"[package]\n name = \" foo\" \n version = \" 0.0.1\" \n " ;
152
154
let tarball = TarballBuilder :: new ( )
153
- . add_file ( "foo-0.0.1/Cargo.toml" , manifest )
155
+ . add_file ( "foo-0.0.1/Cargo.toml" , MANIFEST )
154
156
. build ( ) ;
155
157
156
- let limit = 512 * 1024 * 1024 ;
157
-
158
- let tarball_info = assert_ok ! ( process_tarball( "foo-0.0.1" , & * tarball, limit) ) ;
158
+ let tarball_info = assert_ok ! ( process_tarball( "foo-0.0.1" , & * tarball, MAX_SIZE ) ) ;
159
159
assert_none ! ( tarball_info. vcs_info) ;
160
160
161
- let err = assert_err ! ( process_tarball( "bar-0.0.1" , & * tarball, limit ) ) ;
161
+ let err = assert_err ! ( process_tarball( "bar-0.0.1" , & * tarball, MAX_SIZE ) ) ;
162
162
assert_snapshot ! ( err, @"invalid path found: foo-0.0.1/Cargo.toml" ) ;
163
163
}
164
164
165
165
#[ test]
166
166
fn process_tarball_test_incomplete_vcs_info ( ) {
167
- let manifest = b"[package]\n name = \" foo\" \n version = \" 0.0.1\" \n " ;
168
167
let tarball = TarballBuilder :: new ( )
169
- . add_file ( "foo-0.0.1/Cargo.toml" , manifest )
168
+ . add_file ( "foo-0.0.1/Cargo.toml" , MANIFEST )
170
169
. add_file ( "foo-0.0.1/.cargo_vcs_info.json" , br#"{"unknown": "field"}"# )
171
170
. build ( ) ;
172
171
173
- let limit = 512 * 1024 * 1024 ;
174
-
175
- let tarball_info = assert_ok ! ( process_tarball( "foo-0.0.1" , & * tarball, limit) ) ;
172
+ let tarball_info = assert_ok ! ( process_tarball( "foo-0.0.1" , & * tarball, MAX_SIZE ) ) ;
176
173
let vcs_info = assert_some ! ( tarball_info. vcs_info) ;
177
174
assert_eq ! ( vcs_info. path_in_vcs, "" ) ;
178
175
}
179
176
180
177
#[ test]
181
178
fn process_tarball_test_vcs_info ( ) {
182
- let manifest = b"[package]\n name = \" foo\" \n version = \" 0.0.1\" \n " ;
183
179
let vcs_info = br#"{"path_in_vcs": "path/in/vcs"}"# ;
184
180
let tarball = TarballBuilder :: new ( )
185
- . add_file ( "foo-0.0.1/Cargo.toml" , manifest )
181
+ . add_file ( "foo-0.0.1/Cargo.toml" , MANIFEST )
186
182
. add_file ( "foo-0.0.1/.cargo_vcs_info.json" , vcs_info)
187
183
. build ( ) ;
188
184
189
- let limit = 512 * 1024 * 1024 ;
190
-
191
- let tarball_info = assert_ok ! ( process_tarball( "foo-0.0.1" , & * tarball, limit) ) ;
185
+ let tarball_info = assert_ok ! ( process_tarball( "foo-0.0.1" , & * tarball, MAX_SIZE ) ) ;
192
186
let vcs_info = assert_some ! ( tarball_info. vcs_info) ;
193
187
assert_eq ! ( vcs_info. path_in_vcs, "path/in/vcs" ) ;
194
188
}
@@ -207,9 +201,7 @@ mod tests {
207
201
. add_file ( "foo-0.0.1/Cargo.toml" , manifest)
208
202
. build ( ) ;
209
203
210
- let limit = 512 * 1024 * 1024 ;
211
-
212
- let tarball_info = assert_ok ! ( process_tarball( "foo-0.0.1" , & * tarball, limit) ) ;
204
+ let tarball_info = assert_ok ! ( process_tarball( "foo-0.0.1" , & * tarball, MAX_SIZE ) ) ;
213
205
let package = assert_some ! ( tarball_info. manifest. package) ;
214
206
assert_matches ! ( package. readme, Some ( MaybeInherited :: Local ( StringOrBool :: String ( s) ) ) if s == "README.md" ) ;
215
207
assert_matches ! ( package. repository, Some ( MaybeInherited :: Local ( s) ) if s == "https://github.com/foo/bar" ) ;
@@ -228,27 +220,18 @@ mod tests {
228
220
. add_file ( "foo-0.0.1/Cargo.toml" , manifest)
229
221
. build ( ) ;
230
222
231
- let limit = 512 * 1024 * 1024 ;
232
-
233
- let tarball_info = assert_ok ! ( process_tarball( "foo-0.0.1" , & * tarball, limit) ) ;
223
+ let tarball_info = assert_ok ! ( process_tarball( "foo-0.0.1" , & * tarball, MAX_SIZE ) ) ;
234
224
let package = assert_some ! ( tarball_info. manifest. package) ;
235
225
assert_matches ! ( package. rust_version, Some ( MaybeInherited :: Local ( s) ) if s == "1.23" ) ;
236
226
}
237
227
238
228
#[ test]
239
229
fn process_tarball_test_manifest_with_default_readme ( ) {
240
- let manifest = br#"
241
- [package]
242
- name = "foo"
243
- version = "0.0.1"
244
- "# ;
245
230
let tarball = TarballBuilder :: new ( )
246
- . add_file ( "foo-0.0.1/Cargo.toml" , manifest )
231
+ . add_file ( "foo-0.0.1/Cargo.toml" , MANIFEST )
247
232
. build ( ) ;
248
233
249
- let limit = 512 * 1024 * 1024 ;
250
-
251
- let tarball_info = assert_ok ! ( process_tarball( "foo-0.0.1" , & * tarball, limit) ) ;
234
+ let tarball_info = assert_ok ! ( process_tarball( "foo-0.0.1" , & * tarball, MAX_SIZE ) ) ;
252
235
let package = assert_some ! ( tarball_info. manifest. package) ;
253
236
assert_none ! ( package. readme) ;
254
237
}
@@ -265,9 +248,7 @@ mod tests {
265
248
. add_file ( "foo-0.0.1/Cargo.toml" , manifest)
266
249
. build ( ) ;
267
250
268
- let limit = 512 * 1024 * 1024 ;
269
-
270
- let tarball_info = assert_ok ! ( process_tarball( "foo-0.0.1" , & * tarball, limit) ) ;
251
+ let tarball_info = assert_ok ! ( process_tarball( "foo-0.0.1" , & * tarball, MAX_SIZE ) ) ;
271
252
let package = assert_some ! ( tarball_info. manifest. package) ;
272
253
assert_matches ! ( package. readme, Some ( MaybeInherited :: Local ( StringOrBool :: Bool ( b) ) ) if !b) ;
273
254
}
@@ -284,30 +265,19 @@ mod tests {
284
265
. add_file ( "foo-0.0.1/cargo.toml" , manifest)
285
266
. build ( ) ;
286
267
287
- let limit = 512 * 1024 * 1024 ;
288
-
289
- let tarball_info = assert_ok ! ( process_tarball( "foo-0.0.1" , & * tarball, limit) ) ;
268
+ let tarball_info = assert_ok ! ( process_tarball( "foo-0.0.1" , & * tarball, MAX_SIZE ) ) ;
290
269
let package = assert_some ! ( tarball_info. manifest. package) ;
291
270
assert_matches ! ( package. repository, Some ( MaybeInherited :: Local ( s) ) if s == "https://github.com/foo/bar" ) ;
292
271
}
293
272
294
273
#[ test]
295
274
fn process_tarball_test_incorrect_manifest_casing ( ) {
296
- let manifest = br#"
297
- [package]
298
- name = "foo"
299
- version = "0.0.1"
300
- repository = "https://github.com/foo/bar"
301
- "# ;
302
-
303
- let limit = 512 * 1024 * 1024 ;
304
-
305
275
let process = |file : & str | {
306
276
let tarball = TarballBuilder :: new ( )
307
- . add_file ( & format ! ( "foo-0.0.1/{file}" ) , manifest )
277
+ . add_file ( & format ! ( "foo-0.0.1/{file}" ) , MANIFEST )
308
278
. build ( ) ;
309
279
310
- process_tarball ( "foo-0.0.1" , & * tarball, limit )
280
+ process_tarball ( "foo-0.0.1" , & * tarball, MAX_SIZE )
311
281
} ;
312
282
313
283
let err = assert_err ! ( process( "CARGO.TOML" ) ) ;
@@ -319,24 +289,15 @@ mod tests {
319
289
320
290
#[ test]
321
291
fn process_tarball_test_multiple_manifests ( ) {
322
- let manifest = br#"
323
- [package]
324
- name = "foo"
325
- version = "0.0.1"
326
- repository = "https://github.com/foo/bar"
327
- "# ;
328
-
329
- let limit = 512 * 1024 * 1024 ;
330
-
331
292
let process = |files : Vec < & str > | {
332
293
let tarball = files
333
294
. iter ( )
334
295
. fold ( TarballBuilder :: new ( ) , |builder, file| {
335
- builder. add_file ( & format ! ( "foo-0.0.1/{file}" ) , manifest )
296
+ builder. add_file ( & format ! ( "foo-0.0.1/{file}" ) , MANIFEST )
336
297
} )
337
298
. build ( ) ;
338
299
339
- process_tarball ( "foo-0.0.1" , & * tarball, limit )
300
+ process_tarball ( "foo-0.0.1" , & * tarball, MAX_SIZE )
340
301
} ;
341
302
342
303
let err = assert_err ! ( process( vec![ "cargo.toml" , "Cargo.toml" ] ) ) ;
0 commit comments