working perfectly well

server/tests/adresar/post_adresar_test.rs

@@ -1,29 +1,13 @@
-// src/adresar/tests/post_adresar_test.rs
+// tests/adresar/post_adresar_test.rs
 use server::adresar::handlers::post_adresar;
 use common::proto::multieko2::adresar::PostAdresarRequest;
-use sqlx::{postgres::PgPoolOptions, PgPool};
+use crate::common::setup_test_db;
-use std::env;
+use sqlx::PgPool;
 
 // Helper functions
 mod test_helpers {
     use super::*;
 
-    pub async fn setup_test_db() -> PgPool {
-        dotenvy::from_filename(".env_test").ok();
-        let pool = PgPoolOptions::new()
-            .max_connections(5)
-            .connect(&env::var("TEST_DATABASE_URL").unwrap())
-            .await
-            .unwrap();
-
-        sqlx::migrate!()
-            .run(&pool)
-            .await
-            .expect("Migrations failed");
-
-        pool
-    }
-
     pub fn valid_request() -> PostAdresarRequest {
         PostAdresarRequest {
             firma: "Test Company".into(),
@@ -70,7 +54,7 @@ mod test_helpers {
 
 #[tokio::test]
 async fn test_create_adresar_success() {
-    let pool = test_helpers::setup_test_db().await;
+    let pool = setup_test_db().await;
     let request = test_helpers::valid_request();
 
     let response = post_adresar(&pool, request).await.unwrap();
@@ -91,7 +75,7 @@ async fn test_create_adresar_success() {
 
 #[tokio::test]
 async fn test_create_adresar_whitespace_trimming() {
-    let pool = test_helpers::setup_test_db().await;
+    let pool = setup_test_db().await;
 
     let mut request = test_helpers::valid_request();
     request.firma = "  Test Company  ".into();
@@ -107,7 +91,7 @@ async fn test_create_adresar_whitespace_trimming() {
 
 #[tokio::test]
 async fn test_create_adresar_empty_optional_fields() {
-    let pool = test_helpers::setup_test_db().await;
+    let pool = setup_test_db().await;
 
     let mut request = test_helpers::valid_request();
     request.telefon = "   ".into();  // Only whitespace
@@ -126,7 +110,7 @@ async fn test_create_adresar_empty_optional_fields() {
 
 #[tokio::test]
 async fn test_create_adresar_invalid_firma() {
-    let pool = test_helpers::setup_test_db().await;
+    let pool = setup_test_db().await;
 
     let mut request = test_helpers::valid_request();
     request.firma = "   ".into();  // Only whitespace
@@ -138,7 +122,7 @@ async fn test_create_adresar_invalid_firma() {
 
 #[tokio::test]
 async fn test_create_adresar_minimal_valid_request() {
-    let pool = test_helpers::setup_test_db().await;
+    let pool = setup_test_db().await;
     let request = test_helpers::minimal_request();
 
     let response = post_adresar(&pool, request).await.unwrap();
@@ -154,7 +138,7 @@ async fn test_create_adresar_minimal_valid_request() {
 
 #[tokio::test]
 async fn test_create_adresar_empty_firma() {
-    let pool = test_helpers::setup_test_db().await;
+    let pool = setup_test_db().await;
     let mut request = test_helpers::minimal_request();
     request.firma = "".into();
 
@@ -166,7 +150,7 @@ async fn test_create_adresar_empty_firma() {
 
 #[tokio::test]
 async fn test_create_adresar_database_error() {
-    let pool = test_helpers::setup_test_db().await;
+    let pool = setup_test_db().await;
     pool.close().await;
 
     let result = post_adresar(&pool, test_helpers::minimal_request()).await;
@@ -177,7 +161,7 @@ async fn test_create_adresar_database_error() {
 
 #[tokio::test]
 async fn test_create_adresar_field_length_limits() {
-    let pool = test_helpers::setup_test_db().await;
+    let pool = setup_test_db().await;
 
     let mut request = test_helpers::valid_request();
     request.firma = "a".repeat(255);
@@ -191,7 +175,7 @@ async fn test_create_adresar_field_length_limits() {
 
 #[tokio::test]
 async fn test_create_adresar_special_characters() {
-    let pool = test_helpers::setup_test_db().await;
+    let pool = setup_test_db().await;
 
     let mut request = test_helpers::valid_request();
     request.telefon = "+420 123-456.789".into();
@@ -205,7 +189,7 @@ async fn test_create_adresar_special_characters() {
 
 #[tokio::test]
 async fn test_create_adresar_optional_fields_null_vs_empty() {
-    let pool = test_helpers::setup_test_db().await;
+    let pool = setup_test_db().await;
 
     // Test explicit null (using default values)
     let mut request = test_helpers::valid_request();

server/tests/common/mod.rs

@@ -1,18 +1,24 @@
 // tests/common/mod.rs
+use dotenvy;
 use sqlx::{postgres::PgPoolOptions, PgPool};
 use std::env;
-use tokio::sync::OnceCell;
+use std::path::Path;
 
-static DB_POOL: OnceCell<PgPool> = OnceCell::const_new();
+pub async fn setup_test_db() -> PgPool {
+    // Get path to server directory
+    let manifest_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR must be set");
+    let env_path = Path::new(&manifest_dir).join(".env_test");
 
-pub async fn get_db_pool() -> PgPool {
+    // Load environment variables
-    DB_POOL.get_or_init(|| async {
+    dotenvy::from_path(env_path).ok();
-        dotenvy::from_filename(".env_test").ok();
+
+    // Create connection pool
+    let database_url = env::var("TEST_DATABASE_URL").expect("TEST_DATABASE_URL must be set");
     let pool = PgPoolOptions::new()
         .max_connections(5)
-            .connect(&env::var("TEST_DATABASE_URL").unwrap())
+        .connect(&database_url)
         .await
-            .unwrap();
+        .expect("Failed to create pool");
 
     // Run migrations
     sqlx::migrate!()
@@ -21,57 +27,4 @@ pub async fn get_db_pool() -> PgPool {
         .expect("Migrations failed");
 
     pool
-    }).await.clone()
-}
-
-pub async fn cleanup_db(pool: &PgPool) {
-    sqlx::query!("TRUNCATE TABLE adresar, uctovnictvo RESTART IDENTITY CASCADE")
-        .execute(pool)
-        .await
-        .expect("Failed to cleanup test database");
-}
-
-// Test helpers
-pub mod adresar_helpers {
-    use common::proto::multieko2::adresar::{PostAdresarRequest, AdresarResponse};
-    use sqlx::PgPool;
-
-    pub fn valid_request() -> PostAdresarRequest {
-        PostAdresarRequest {
-            firma: "Test Company".into(),
-            kz: "KZ123".into(),
-            drc: "DRC456".into(),
-            ulica: "Test Street".into(),
-            psc: "12345".into(),
-            mesto: "Test City".into(),
-            stat: "Test Country".into(),
-            banka: "Test Bank".into(),
-            ucet: "123456789".into(),
-            skladm: "Warehouse M".into(),
-            ico: "12345678".into(),
-            kontakt: "John Doe".into(),
-            telefon: "+421123456789".into(),
-            skladu: "Warehouse U".into(),
-            fax: "+421123456700".into(),
-        }
-    }
-
-    pub fn minimal_request() -> PostAdresarRequest {
-        PostAdresarRequest {
-            firma: "Required Only".into(),
-            ..Default::default()
-        }
-    }
-
-    pub async fn assert_response_matches(pool: &PgPool, response: &AdresarResponse) {
-        let db_record = sqlx::query!("SELECT * FROM adresar WHERE id = $1", response.id)
-            .fetch_one(pool)
-            .await
-            .unwrap();
-
-        assert_eq!(db_record.firma, response.firma);
-        assert_eq!(db_record.telefon, Some(response.telefon.clone()));
-        assert!(!db_record.deleted);
-        assert!(db_record.created_at.is_some());
-    }
 }

server/tests/mod.rs

@@ -1,2 +1,3 @@
+// tests/mod.rs
 pub mod adresar;
 pub mod common;