ref: moved macros into tests itself

Author: raphael-goetz

src/container/mod.rs

@@ -28,7 +28,30 @@ mod tests {
     use testcontainers::runners::AsyncRunner;
     use testcontainers::GenericImage;
     use crate::flow_queue::connection::build_connection;
-    use crate::rabbitmq_container_test;
+
+    macro_rules! rabbitmq_container_test {
+        ($test_name:ident, $consumer:expr) => {
+            
+            #[tokio::test]
+            async fn $test_name() {
+                let port: u16 = 5672;
+                let image_name = "rabbitmq";
+                let wait_message = "Server startup complete";
+    
+                let container = GenericImage::new(image_name, "latest")
+                    .with_exposed_port(port.tcp())
+                    .with_wait_for(WaitFor::message_on_stdout(wait_message))
+                    .start()
+                    .await
+                    .unwrap();
+    
+                let host_port = container.get_host_port_ipv4(port).await.unwrap();
+                let url = format!("amqp://guest:guest@localhost:{}", host_port);
+                
+                $consumer(url).await;
+            }
+        };
+    }
 
     rabbitmq_container_test!(test_rabbitmq_startup, (|url: String| async move {
         println!("RabbitMQ started with the url: {}", url);

src/flow_queue/connection.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 use redis::aio::MultiplexedConnection;
-use redis::{Client, RedisResult};
+use redis::{Client};
 use tokio::sync::Mutex;
 
 pub type FlowStore = Arc<Mutex<Box<MultiplexedConnection>>>;
@@ -29,7 +29,31 @@ mod tests {
     use testcontainers::GenericImage;
     use testcontainers::core::WaitFor;
     use crate::flow_store::connection::build_connection;
-    use crate::redis_container_test;
+
+    macro_rules! redis_container_test {
+        ($test_name:ident, $consumer:expr) => {
+            
+            #[tokio::test]
+            async fn $test_name() {
+                let port: u16 = 6379;
+                let image_name = "redis";
+                let wait_message = "Ready to accept connections";
+    
+                let container = GenericImage::new(image_name, "latest")
+                    .with_exposed_port(port.tcp())
+                    .with_wait_for(WaitFor::message_on_stdout(wait_message))
+                    .start()
+                    .await
+                    .unwrap();
+    
+                let host = container.get_host().await.unwrap();
+                let host_port = container.get_host_port_ipv4(port).await.unwrap();
+                let url = format!("redis://{host}:{host_port}");
+                
+                $consumer(url).await;
+            }
+        };
+    }
 
     redis_container_test!(test_redis_startup, (|url: String| async move {
         println!("Redis server started correctly on: {}", url);

src/flow_store/connection.rs

@@ -2,6 +2,4 @@
 pub mod flow_store;
 
 #[cfg(feature = "flow_queue")]
-pub mod flow_queue;
-
-pub mod container;
+pub mod flow_queue;