From fe4255d765d24b3a62094a02d35077a1022887bb Mon Sep 17 00:00:00 2001 From: HampusM Date: Tue, 26 Sep 2023 19:46:15 +0200 Subject: test: make unit tests not return Result --- src/di_container/blocking/mod.rs | 75 ++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 34 deletions(-) (limited to 'src/di_container/blocking/mod.rs') diff --git a/src/di_container/blocking/mod.rs b/src/di_container/blocking/mod.rs index df6e68c..ce3edca 100644 --- a/src/di_container/blocking/mod.rs +++ b/src/di_container/blocking/mod.rs @@ -388,15 +388,13 @@ impl DIContainer #[cfg(test)] mod tests { - use std::error::Error; - use super::*; use crate::provider::blocking::MockIProvider; use crate::ptr::{SingletonPtr, TransientPtr}; use crate::test_utils::subjects; #[test] - fn can_get() -> Result<(), Box> + fn can_get() { let di_container = DIContainer::new(); @@ -417,14 +415,14 @@ mod tests ); di_container - .get::()? - .transient()?; - - Ok(()) + .get::() + .unwrap() + .transient() + .unwrap(); } #[test] - fn can_get_named() -> Result<(), Box> + fn can_get_named() { let di_container = DIContainer::new(); @@ -445,14 +443,14 @@ mod tests ); di_container - .get_named::("special")? - .transient()?; - - Ok(()) + .get_named::("special") + .unwrap() + .transient() + .unwrap(); } #[test] - fn can_get_singleton() -> Result<(), Box> + fn can_get_singleton() { let di_container = DIContainer::new(); @@ -471,20 +469,25 @@ mod tests .borrow_mut() .set::(BindingOptions::new(), Box::new(mock_provider)); - let first_number_rc = di_container.get::()?.singleton()?; + let first_number_rc = di_container + .get::() + .unwrap() + .singleton() + .unwrap(); assert_eq!(first_number_rc.get(), 2820); - let second_number_rc = - di_container.get::()?.singleton()?; + let second_number_rc = di_container + .get::() + .unwrap() + .singleton() + .unwrap(); assert_eq!(first_number_rc.as_ref(), second_number_rc.as_ref()); - - Ok(()) } #[test] - fn can_get_singleton_named() -> Result<(), Box> + fn can_get_singleton_named() { let di_container = DIContainer::new(); @@ -507,23 +510,25 @@ mod tests ); let first_number_rc = di_container - .get_named::("cool")? - .singleton()?; + .get_named::("cool") + .unwrap() + .singleton() + .unwrap(); assert_eq!(first_number_rc.get(), 2820); let second_number_rc = di_container - .get_named::("cool")? - .singleton()?; + .get_named::("cool") + .unwrap() + .singleton() + .unwrap(); assert_eq!(first_number_rc.as_ref(), second_number_rc.as_ref()); - - Ok(()) } #[test] #[cfg(feature = "factory")] - fn can_get_factory() -> Result<(), Box> + fn can_get_factory() { use crate::private::castable_factory::CastableFactory; use crate::ptr::FactoryPtr; @@ -593,14 +598,16 @@ mod tests .borrow_mut() .set::(BindingOptions::new(), Box::new(mock_provider)); - di_container.get::()?.factory()?; - - Ok(()) + di_container + .get::() + .unwrap() + .factory() + .unwrap(); } #[test] #[cfg(feature = "factory")] - fn can_get_factory_named() -> Result<(), Box> + fn can_get_factory_named() { use crate::private::castable_factory::CastableFactory; use crate::ptr::FactoryPtr; @@ -674,10 +681,10 @@ mod tests ); di_container - .get_named::("special")? - .factory()?; - - Ok(()) + .get_named::("special") + .unwrap() + .factory() + .unwrap(); } #[test] -- cgit v1.2.3-18-g5258