diff options
Diffstat (limited to 'src/di_container')
| -rw-r--r-- | src/di_container/asynchronous/binding/builder.rs | 39 | ||||
| -rw-r--r-- | src/di_container/asynchronous/mod.rs | 74 | ||||
| -rw-r--r-- | src/di_container/blocking/binding/builder.rs | 44 | ||||
| -rw-r--r-- | src/di_container/blocking/mod.rs | 75 |
4 files changed, 116 insertions, 116 deletions
diff --git a/src/di_container/asynchronous/binding/builder.rs b/src/di_container/asynchronous/binding/builder.rs index acb1c69..db73ad2 100644 --- a/src/di_container/asynchronous/binding/builder.rs +++ b/src/di_container/asynchronous/binding/builder.rs @@ -502,8 +502,6 @@ where #[cfg(test)] mod tests { - use std::error::Error; - use mockall::predicate::eq; use super::*; @@ -512,7 +510,7 @@ mod tests use crate::test_utils::subjects_async; #[tokio::test] - async fn can_bind_to() -> Result<(), Box<dyn Error>> + async fn can_bind_to() { let mut di_container_mock = MockAsyncDIContainer::new(); @@ -534,14 +532,15 @@ mod tests MockDependencyHistory::new, ); - binding_builder.to::<subjects_async::UserManager>().await?; - - Ok(()) + binding_builder + .to::<subjects_async::UserManager>() + .await + .unwrap(); } #[tokio::test] #[cfg(feature = "factory")] - async fn can_bind_to_factory() -> Result<(), Box<dyn Error>> + async fn can_bind_to_factory() { use crate as syrette; use crate::factory; @@ -584,14 +583,13 @@ mod tests user_manager }) }) - .await?; - - Ok(()) + .await + .unwrap(); } #[tokio::test] #[cfg(feature = "factory")] - async fn can_bind_to_async_factory() -> Result<(), Box<dyn Error>> + async fn can_bind_to_async_factory() { use crate::future::BoxFuture; use crate::ptr::TransientPtr; @@ -633,14 +631,13 @@ mod tests user_manager }) }) - .await?; - - Ok(()) + .await + .unwrap(); } #[tokio::test] #[cfg(feature = "factory")] - async fn can_bind_to_default_factory() -> Result<(), Box<dyn Error>> + async fn can_bind_to_default_factory() { use syrette_macros::declare_default_factory; @@ -678,14 +675,13 @@ mod tests user_manager }) }) - .await?; - - Ok(()) + .await + .unwrap(); } #[tokio::test] #[cfg(feature = "factory")] - async fn can_bind_to_async_default_factory() -> Result<(), Box<dyn Error>> + async fn can_bind_to_async_default_factory() { use syrette_macros::declare_default_factory; @@ -724,8 +720,7 @@ mod tests user_manager }) }) - .await?; - - Ok(()) + .await + .unwrap(); } } diff --git a/src/di_container/asynchronous/mod.rs b/src/di_container/asynchronous/mod.rs index 929e2c0..13d4df0 100644 --- a/src/di_container/asynchronous/mod.rs +++ b/src/di_container/asynchronous/mod.rs @@ -496,15 +496,13 @@ impl AsyncDIContainer #[cfg(test)] mod tests { - use std::error::Error; - use super::*; use crate::ptr::{ThreadsafeSingletonPtr, TransientPtr}; use crate::test_utils::mocks::async_provider::MockAsyncProvider; use crate::test_utils::subjects_async; #[tokio::test] - async fn can_get() -> Result<(), Box<dyn Error>> + async fn can_get() { let di_container = AsyncDIContainer::new(); @@ -535,14 +533,14 @@ mod tests di_container .get::<dyn subjects_async::IUserManager>() - .await? - .transient()?; - - Ok(()) + .await + .unwrap() + .transient() + .unwrap(); } #[tokio::test] - async fn can_get_named() -> Result<(), Box<dyn Error>> + async fn can_get_named() { let di_container = AsyncDIContainer::new(); @@ -573,14 +571,14 @@ mod tests di_container .get_named::<dyn subjects_async::IUserManager>("special") - .await? - .transient()?; - - Ok(()) + .await + .unwrap() + .transient() + .unwrap(); } #[tokio::test] - async fn can_get_singleton() -> Result<(), Box<dyn Error>> + async fn can_get_singleton() { let di_container = AsyncDIContainer::new(); @@ -615,23 +613,25 @@ mod tests let first_number_rc = di_container .get::<dyn subjects_async::INumber>() - .await? - .threadsafe_singleton()?; + .await + .unwrap() + .threadsafe_singleton() + .unwrap(); assert_eq!(first_number_rc.get(), 2820); let second_number_rc = di_container .get::<dyn subjects_async::INumber>() - .await? - .threadsafe_singleton()?; + .await + .unwrap() + .threadsafe_singleton() + .unwrap(); assert_eq!(first_number_rc.as_ref(), second_number_rc.as_ref()); - - Ok(()) } #[tokio::test] - async fn can_get_singleton_named() -> Result<(), Box<dyn Error>> + async fn can_get_singleton_named() { let di_container = AsyncDIContainer::new(); @@ -666,24 +666,26 @@ mod tests let first_number_rc = di_container .get_named::<dyn subjects_async::INumber>("cool") - .await? - .threadsafe_singleton()?; + .await + .unwrap() + .threadsafe_singleton() + .unwrap(); assert_eq!(first_number_rc.get(), 2820); let second_number_rc = di_container .get_named::<dyn subjects_async::INumber>("cool") - .await? - .threadsafe_singleton()?; + .await + .unwrap() + .threadsafe_singleton() + .unwrap(); assert_eq!(first_number_rc.as_ref(), second_number_rc.as_ref()); - - Ok(()) } #[tokio::test] #[cfg(feature = "factory")] - async fn can_get_factory() -> Result<(), Box<dyn Error>> + async fn can_get_factory() { trait IUserManager: Send + Sync { @@ -761,15 +763,15 @@ mod tests di_container .get::<IUserManagerFactory>() - .await? - .threadsafe_factory()?; - - Ok(()) + .await + .unwrap() + .threadsafe_factory() + .unwrap(); } #[tokio::test] #[cfg(feature = "factory")] - async fn can_get_factory_named() -> Result<(), Box<dyn Error>> + async fn can_get_factory_named() { trait IUserManager: Send + Sync { @@ -852,10 +854,10 @@ mod tests di_container .get_named::<IUserManagerFactory>("special") - .await? - .threadsafe_factory()?; - - Ok(()) + .await + .unwrap() + .threadsafe_factory() + .unwrap(); } #[tokio::test] diff --git a/src/di_container/blocking/binding/builder.rs b/src/di_container/blocking/binding/builder.rs index 6f873d0..cd547d4 100644 --- a/src/di_container/blocking/binding/builder.rs +++ b/src/di_container/blocking/binding/builder.rs @@ -299,8 +299,6 @@ where #[cfg(test)] mod tests { - use std::error::Error; - use mockall::predicate::eq; use super::*; @@ -309,7 +307,7 @@ mod tests use crate::test_utils::subjects; #[test] - fn can_bind_to() -> Result<(), Box<dyn Error>> + fn can_bind_to() { let mut mock_di_container = MockDIContainer::new(); @@ -330,14 +328,12 @@ mod tests MockDependencyHistory::new, ); - binding_builder.to::<subjects::Number>()?; - - Ok(()) + binding_builder.to::<subjects::Number>().unwrap(); } #[test] #[cfg(feature = "factory")] - fn can_bind_to_factory() -> Result<(), Box<dyn Error>> + fn can_bind_to_factory() { use crate as syrette; use crate::factory; @@ -366,21 +362,21 @@ mod tests MockDependencyHistory::new, ); - binding_builder.to_factory(&|_| { - Box::new(move |_num, _text| { - let user_manager: TransientPtr<dyn subjects::IUserManager> = - TransientPtr::new(subjects::UserManager::new()); + binding_builder + .to_factory(&|_| { + Box::new(move |_num, _text| { + let user_manager: TransientPtr<dyn subjects::IUserManager> = + TransientPtr::new(subjects::UserManager::new()); - user_manager + user_manager + }) }) - })?; - - Ok(()) + .unwrap(); } #[test] #[cfg(feature = "factory")] - fn can_bind_to_default_factory() -> Result<(), Box<dyn Error>> + fn can_bind_to_default_factory() { use syrette_macros::declare_default_factory; @@ -408,15 +404,15 @@ mod tests MockDependencyHistory::new, ); - binding_builder.to_default_factory(&|_| { - Box::new(move || { - let user_manager: TransientPtr<dyn subjects::IUserManager> = - TransientPtr::new(subjects::UserManager::new()); + binding_builder + .to_default_factory(&|_| { + Box::new(move || { + let user_manager: TransientPtr<dyn subjects::IUserManager> = + TransientPtr::new(subjects::UserManager::new()); - user_manager + user_manager + }) }) - })?; - - Ok(()) + .unwrap(); } } 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<dyn Error>> + fn can_get() { let di_container = DIContainer::new(); @@ -417,14 +415,14 @@ mod tests ); di_container - .get::<dyn subjects::IUserManager>()? - .transient()?; - - Ok(()) + .get::<dyn subjects::IUserManager>() + .unwrap() + .transient() + .unwrap(); } #[test] - fn can_get_named() -> Result<(), Box<dyn Error>> + fn can_get_named() { let di_container = DIContainer::new(); @@ -445,14 +443,14 @@ mod tests ); di_container - .get_named::<dyn subjects::IUserManager>("special")? - .transient()?; - - Ok(()) + .get_named::<dyn subjects::IUserManager>("special") + .unwrap() + .transient() + .unwrap(); } #[test] - fn can_get_singleton() -> Result<(), Box<dyn Error>> + fn can_get_singleton() { let di_container = DIContainer::new(); @@ -471,20 +469,25 @@ mod tests .borrow_mut() .set::<dyn subjects::INumber>(BindingOptions::new(), Box::new(mock_provider)); - let first_number_rc = di_container.get::<dyn subjects::INumber>()?.singleton()?; + let first_number_rc = di_container + .get::<dyn subjects::INumber>() + .unwrap() + .singleton() + .unwrap(); assert_eq!(first_number_rc.get(), 2820); - let second_number_rc = - di_container.get::<dyn subjects::INumber>()?.singleton()?; + let second_number_rc = di_container + .get::<dyn subjects::INumber>() + .unwrap() + .singleton() + .unwrap(); assert_eq!(first_number_rc.as_ref(), second_number_rc.as_ref()); - - Ok(()) } #[test] - fn can_get_singleton_named() -> Result<(), Box<dyn Error>> + fn can_get_singleton_named() { let di_container = DIContainer::new(); @@ -507,23 +510,25 @@ mod tests ); let first_number_rc = di_container - .get_named::<dyn subjects::INumber>("cool")? - .singleton()?; + .get_named::<dyn subjects::INumber>("cool") + .unwrap() + .singleton() + .unwrap(); assert_eq!(first_number_rc.get(), 2820); let second_number_rc = di_container - .get_named::<dyn subjects::INumber>("cool")? - .singleton()?; + .get_named::<dyn subjects::INumber>("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<dyn Error>> + fn can_get_factory() { use crate::private::castable_factory::CastableFactory; use crate::ptr::FactoryPtr; @@ -593,14 +598,16 @@ mod tests .borrow_mut() .set::<IUserManagerFactory>(BindingOptions::new(), Box::new(mock_provider)); - di_container.get::<IUserManagerFactory>()?.factory()?; - - Ok(()) + di_container + .get::<IUserManagerFactory>() + .unwrap() + .factory() + .unwrap(); } #[test] #[cfg(feature = "factory")] - fn can_get_factory_named() -> Result<(), Box<dyn Error>> + 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::<IUserManagerFactory>("special")? - .factory()?; - - Ok(()) + .get_named::<IUserManagerFactory>("special") + .unwrap() + .factory() + .unwrap(); } #[test] |