stop testing destructors with drop - instead we have null guards and we early fail test with infalliable drop fails; codes index is just special...

Author: Quba1

Cargo.toml

@@ -39,8 +39,6 @@ tracing = { version = "0.1", default-features = false, features = [
 [dev-dependencies]
 reqwest = { version = "0.12", features = ["rustls-tls"] }
 criterion = "0.7"
-testing_logger = "0.1"
-log = "*"
 rand = "0.9"
 anyhow = { version = "1.0", features = ["backtrace"] }
 float-cmp = "0.10"

src/codes_handle/mod.rs

@@ -472,25 +472,17 @@ mod tests {
 
     #[test]
     fn codes_handle_drop_file() -> Result<()> {
-        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)?;
         drop(handle);
 
-        testing_logger::validate(|captured_logs| {
-            assert_eq!(captured_logs.len(), 0);
-        });
-
         Ok(())
     }
 
     #[test]
     fn codes_handle_drop_mem() -> Result<()> {
-        testing_logger::setup();
-
         let product_kind = ProductKind::GRIB;
 
         let mut f = File::open(Path::new("./data/iceland.grib"))?;
@@ -500,16 +492,11 @@ mod tests {
         let handle = CodesHandle::new_from_memory(buf, product_kind)?;
         drop(handle);
 
-        testing_logger::validate(|captured_logs| {
-            assert_eq!(captured_logs.len(), 0);
-        });
-
         Ok(())
     }
 
     #[test]
     fn multiple_drops() -> Result<()> {
-        testing_logger::setup();
         {
             let file_path = Path::new("./data/iceland-surface.grib");
             let product_kind = ProductKind::GRIB;
@@ -524,26 +511,6 @@ mod tests {
             let _kiter = clone_msg.default_keys_iterator()?;
         }
 
-        testing_logger::validate(|captured_logs| {
-            assert_eq!(captured_logs.len(), 5);
-
-            let expected_logs = vec![
-                ("codes_handle_delete", log::Level::Trace),
-                ("codes_keys_iterator_delete", log::Level::Trace),
-                ("codes_grib_nearest_delete", log::Level::Trace),
-                ("codes_handle_delete", log::Level::Trace),
-                ("codes_handle_delete", log::Level::Trace),
-            ];
-
-            captured_logs
-                .iter()
-                .zip(expected_logs)
-                .for_each(|(clg, elg)| {
-                    assert_eq!(clg.body, elg.0);
-                    assert_eq!(clg.level, elg.1)
-                });
-        });
-
         Ok(())
     }
 

src/codes_nearest.rs

@@ -112,6 +112,8 @@ impl Drop for CodesNearest<'_> {
                     "codes_grib_nearest_delete() returned an error: {:?}",
                     &error
                 );
+                #[cfg(test)]
+                assert!(false, "Error in CodesNearest::drop")
             });
         }
 
@@ -164,21 +166,8 @@ mod tests {
         let _nrst = current_message.codes_nearest()?;
 
         drop(_nrst);
-
-        testing_logger::validate(|captured_logs| {
-            assert_eq!(captured_logs.len(), 1);
-            assert_eq!(captured_logs[0].body, "codes_grib_nearest_delete");
-            assert_eq!(captured_logs[0].level, log::Level::Trace);
-        });
-
         drop(handle);
 
-        testing_logger::validate(|captured_logs| {
-            assert_eq!(captured_logs.len(), 1);
-            assert_eq!(captured_logs[0].body, "codes_handle_delete");
-            assert_eq!(captured_logs[0].level, log::Level::Trace);
-        });
-
         Ok(())
     }
 }

src/keyed_message/mod.rs

@@ -222,6 +222,8 @@ impl Drop for KeyedMessage {
                     "codes_handle_delete() returned an error: {:?}",
                     &error
                 );
+                #[cfg(test)]
+                assert!(false, "Error in KeyedMessage::drop")
             });
         }
 
@@ -235,7 +237,6 @@ mod tests {
     use crate::codes_handle::{CodesHandle, ProductKind};
     use anyhow::{Context, Result};
     use std::path::Path;
-    use testing_logger;
 
     #[test]
     fn check_docs_keys() -> Result<()> {
@@ -296,33 +297,15 @@ mod tests {
 
     #[test]
     fn message_clone_drop() -> Result<()> {
-        testing_logger::setup();
         let file_path = Path::new("./data/iceland.grib");
         let product_kind = ProductKind::GRIB;
 
         let mut handle = CodesHandle::new_from_file(file_path, product_kind)?;
         let _msg_ref = handle.next()?.context("Message not some")?;
         let _msg_clone = _msg_ref.try_clone()?;
 
-        testing_logger::validate(|captured_logs| {
-            assert_eq!(captured_logs.len(), 0);
-        });
-
-        drop(_msg_clone);
-
-        testing_logger::validate(|captured_logs| {
-            assert_eq!(captured_logs.len(), 1);
-            assert_eq!(captured_logs[0].body, "codes_handle_delete");
-            assert_eq!(captured_logs[0].level, log::Level::Trace);
-        });
-
         drop(handle);
-
-        testing_logger::validate(|captured_logs| {
-            assert_eq!(captured_logs.len(), 1);
-            assert_eq!(captured_logs[0].body, "codes_handle_delete");
-            assert_eq!(captured_logs[0].level, log::Level::Trace);
-        });
+        drop(_msg_clone);
 
         Ok(())
     }

src/keys_iterator.rs

@@ -207,6 +207,8 @@ impl Drop for KeysIterator<'_> {
                     "codes_keys_iterator_delete() returned an error: {:?}",
                     &error
                 );
+                #[cfg(test)]
+                assert!(false, "Error in KeysIterator::drop")
             });
         }
 
@@ -283,21 +285,8 @@ mod tests {
         let _kiter = current_message.default_keys_iterator()?;
 
         drop(_kiter);
-
-        testing_logger::validate(|captured_logs| {
-            assert_eq!(captured_logs.len(), 1);
-            assert_eq!(captured_logs[0].body, "codes_keys_iterator_delete");
-            assert_eq!(captured_logs[0].level, log::Level::Trace);
-        });
-
         drop(handle);
 
-        testing_logger::validate(|captured_logs| {
-            assert_eq!(captured_logs.len(), 1);
-            assert_eq!(captured_logs[0].body, "codes_handle_delete");
-            assert_eq!(captured_logs[0].level, log::Level::Trace);
-        });
-
         Ok(())
     }
 }

tests/handle.rs

@@ -50,27 +50,3 @@ fn thread_safety_core() -> Result<()> {
 
     Ok(())
 }
-
-#[test]
-fn check_no_testing_logs() -> Result<()> {
-    testing_logger::setup();
-    {
-        let file_path = Path::new("./data/iceland-surface.grib");
-        let product_kind = ProductKind::GRIB;
-
-        let mut handle = CodesHandle::new_from_file(file_path, product_kind)?;
-
-        let _ref_msg = handle.next()?.context("no message")?;
-        let clone_msg = _ref_msg.try_clone()?;
-        let _oth_ref = handle.next()?.context("no message")?;
-
-        let _nrst = clone_msg.codes_nearest()?;
-        let _kiter = clone_msg.default_keys_iterator()?;
-    }
-
-    testing_logger::validate(|captured_logs| {
-        assert_eq!(captured_logs.len(), 0);
-    });
-
-    Ok(())
-}