From d48b5a76c65958548825765753b144ed1e62a655 Mon Sep 17 00:00:00 2001 From: Quba1 <22771850+Quba1@users.noreply.github.com> Date: Sat, 27 Jan 2024 10:47:32 +0100 Subject: [PATCH] scope the handle drop test to eliminate shadowing --- src/codes_handle/mod.rs | 58 ++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/src/codes_handle/mod.rs b/src/codes_handle/mod.rs index 957345b..1c980cc 100644 --- a/src/codes_handle/mod.rs +++ b/src/codes_handle/mod.rs @@ -363,35 +363,39 @@ mod tests { async fn codes_handle_drop() { testing_logger::setup(); - let file_path = Path::new("./data/iceland-surface.grib"); - let product_kind = ProductKind::GRIB; - - let handle = CodesHandle::new_from_file(file_path, product_kind).unwrap(); - drop(handle); + { + let file_path = Path::new("./data/iceland-surface.grib"); + let product_kind = ProductKind::GRIB; - testing_logger::validate(|captured_logs| { - assert_eq!(captured_logs.len(), 0); - }); + let handle = CodesHandle::new_from_file(file_path, product_kind).unwrap(); + drop(handle); - let product_kind = ProductKind::GRIB; - let file_data = reqwest::get( - "https://github.com/ScaleWeather/eccodes/blob/main/data/iceland.grib?raw=true", - ) - .await - .unwrap() - .bytes() - .await - .unwrap(); + testing_logger::validate(|captured_logs| { + assert_eq!(captured_logs.len(), 0); + }); + } - let handle = CodesHandle::new_from_memory(file_data, product_kind).unwrap(); - drop(handle); - - //logs from Reqwest are expected - testing_logger::validate(|captured_logs| { - for log in captured_logs { - assert_ne!(log.level, Level::Warn); - assert_ne!(log.level, Level::Error); - } - }); + { + let product_kind = ProductKind::GRIB; + let file_data = reqwest::get( + "https://github.com/ScaleWeather/eccodes/blob/main/data/iceland.grib?raw=true", + ) + .await + .unwrap() + .bytes() + .await + .unwrap(); + + let handle = CodesHandle::new_from_memory(file_data, product_kind).unwrap(); + drop(handle); + + //logs from Reqwest are expected + testing_logger::validate(|captured_logs| { + for log in captured_logs { + assert_ne!(log.level, Level::Warn); + assert_ne!(log.level, Level::Error); + } + }); + } } }