@@ -272,7 +272,6 @@ mod test {
272
272
273
273
#[ test]
274
274
fn calibrate ( ) -> Result < ( ) > {
275
- env_logger:: init ( ) ;
276
275
let mut api = X11Api :: new ( ) ?;
277
276
let win = api. get_active_window ( ) ?;
278
277
let image = api. capture_window_screenshot ( win) ?;
@@ -284,8 +283,8 @@ mod test {
284
283
let image_calibrated: View < _ , Bgra < u8 > > = image_calibrated. as_view ( ) . unwrap ( ) ;
285
284
let ( width_new, height_new) = image_calibrated. dimensions ( ) ;
286
285
287
- assert ! ( height > height_new) ;
288
- assert ! ( width > width_new) ;
286
+ assert ! ( height >= height_new) ;
287
+ assert ! ( width >= width_new) ;
289
288
290
289
Ok ( ( ) )
291
290
}
@@ -308,21 +307,15 @@ mod test {
308
307
///
309
308
#[ test]
310
309
fn should_inspect_screenshots ( ) -> Result < ( ) > {
311
- env_logger:: init ( ) ;
312
310
let api = X11Api :: new ( ) ?;
313
311
let win = api. get_active_window ( ) ?;
314
312
let image = api. capture_window_screenshot ( win) ?;
315
313
let image: View < _ , Bgra < u8 > > = image. as_view ( ) . unwrap ( ) ;
316
- let some_pix: Bgra < u8 > = image. get_pixel ( 10 , 25 ) ;
317
- if let Bgra ( [ b, g, r, a] ) = some_pix {
318
- dbg ! ( some_pix) ;
319
- assert_ne ! ( b, 0 ) ;
320
- assert_ne ! ( g, 0 ) ;
321
- assert_ne ! ( r, 0 ) ;
322
- assert_eq ! ( a, 0xff ) ;
323
- } else {
324
- anyhow:: bail!( "should not happen" ) ;
325
- }
314
+ let Bgra ( [ b, g, r, a] ) = image. get_pixel ( 10 , 25 ) ;
315
+ assert_ne ! ( b, 0 ) ;
316
+ assert_ne ! ( g, 0 ) ;
317
+ assert_ne ! ( r, 0 ) ;
318
+ assert_eq ! ( a, 0xff ) ;
326
319
327
320
// Note: visual validation is sometimes helpful:
328
321
// let file = format!("/tmp/foo-bar-{}.tga", win);
@@ -333,7 +326,6 @@ mod test {
333
326
// image.layout.height,
334
327
// image.color_hint.unwrap(),
335
328
// )?;
336
- // info!("File saved at: {}", file);
337
329
Ok ( ( ) )
338
330
}
339
331
@@ -350,18 +342,17 @@ mod test {
350
342
let windows = api. get_visible_windows ( ) ?;
351
343
let window = api. get_active_window ( ) ?;
352
344
353
- assert ! ( windows. len ( ) > 0 ) ;
345
+ assert ! ( ! windows. is_empty ( ) ) ;
354
346
assert ! (
355
347
windows. contains( & window) ,
356
348
"Active window was not found in visible list"
357
349
) ;
358
350
let name = api. get_window_name ( & window) ?;
359
- match name {
360
- None => assert ! ( false , "The active window has no name :(" ) ,
361
- Some ( name) => {
362
- assert ! ( name. len( ) > 0 ) ;
363
- println ! ( "Active window: {:?}" , name) ;
364
- }
351
+ if let Some ( name) = name {
352
+ assert ! ( !name. is_empty( ) ) ;
353
+ println ! ( "Active window: {:?}" , name) ;
354
+ } else {
355
+ eprintln ! ( "The active window has no name :(" ) ;
365
356
}
366
357
367
358
Ok ( ( ) )
@@ -371,7 +362,7 @@ mod test {
371
362
fn should_list_all_visible_windows ( ) -> Result < ( ) > {
372
363
let api = X11Api :: new ( ) ?;
373
364
let windows = api. get_visible_windows ( ) ?;
374
- assert ! ( windows. len ( ) > 0 ) ;
365
+ assert ! ( ! windows. is_empty ( ) ) ;
375
366
376
367
Ok ( ( ) )
377
368
}
@@ -414,7 +405,7 @@ mod test {
414
405
. reply ( ) ?;
415
406
let _class = String :: from_utf8 ( class. value ) ?;
416
407
417
- for prop in vec ! [ "_NET_WM_ICON_NAME" , "_NET_WM_NAME" , "_NET_WM_VISIBLE_NAME" ] {
408
+ for prop in & [ "_NET_WM_ICON_NAME" , "_NET_WM_NAME" , "_NET_WM_VISIBLE_NAME" ] {
418
409
let wm_name_atom = conn. intern_atom ( true , prop. as_bytes ( ) ) ?. reply ( ) ?;
419
410
let utf8_atom = conn. intern_atom ( true , b"UTF8_STRING" ) ?. reply ( ) ?;
420
411
let name = conn
0 commit comments