diff options
Diffstat (limited to 'src/di_container/asynchronous')
| -rw-r--r-- | src/di_container/asynchronous/binding/builder.rs | 39 | ||||
| -rw-r--r-- | src/di_container/asynchronous/mod.rs | 74 |
2 files changed, 55 insertions, 58 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] |