refactoring of integration tests

Cargo.toml

@@ -32,9 +32,6 @@ opentelemetry = [
   "dep:tracing-opentelemetry",
 ]
 
-[profile.dev]
-debug = 0
-
 [lib]
 doc = true
 name = "rustical"

crates/store_sqlite/src/lib.rs

@@ -37,11 +37,11 @@ impl SqliteStore {
 }
 
 pub async fn create_db_pool(db_url: &str, migrate: bool) -> Result<Pool<Sqlite>, sqlx::Error> {
+    let options: SqliteConnectOptions = db_url.parse()?;
+
     let db = SqlitePool::connect_with(
-        SqliteConnectOptions::new()
+        options
             .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal)
-            .synchronous(sqlx::sqlite::SqliteSynchronous::Normal)
-            .filename(db_url)
             .create_if_missing(true),
     )
     .await?;

crates/store_sqlite/src/tests/mod.rs

@@ -1,6 +1,6 @@
 use crate::{
     SqliteStore, addressbook_store::SqliteAddressbookStore, calendar_store::SqliteCalendarStore,
-    principal_store::SqlitePrincipalStore,
+    create_db_pool, principal_store::SqlitePrincipalStore,
 };
 use rstest::fixture;
 use rustical_store::auth::{AuthenticationProvider, Principal, PrincipalType};
@@ -9,12 +9,23 @@ use sqlx::SqlitePool;
 mod addressbook_store;
 mod calendar_store;
 
-async fn get_test_db() -> SqlitePool {
+#[derive(Debug, Clone)]
-    let db = SqlitePool::connect("sqlite::memory:").await.unwrap();
+pub struct TestStoreContext {
-    sqlx::migrate!("./migrations").run(&db).await.unwrap();
+    pub db: SqlitePool,
+    pub addr_store: SqliteAddressbookStore,
+    pub cal_store: SqliteCalendarStore,
+    pub principal_store: SqlitePrincipalStore,
+    pub sub_store: SqliteStore,
+}
+
+#[fixture]
+pub async fn test_store_context() -> TestStoreContext {
+    let (send_addr, _recv) = tokio::sync::mpsc::channel(1);
+    let (send_cal, _recv) = tokio::sync::mpsc::channel(1);
+    let db = create_db_pool(":memory:", true).await.unwrap();
 
-    // Populate with test data
     let principal_store = SqlitePrincipalStore::new(db.clone());
+    // Populate with test data
     principal_store
         .insert_principal(
             Principal {
@@ -33,28 +44,11 @@ async fn get_test_db() -> SqlitePool {
         .await
         .unwrap();
 
-    db
-}
-
-#[derive(Debug, Clone)]
-pub struct TestStoreContext {
-    pub db: SqlitePool,
-    pub addr_store: SqliteAddressbookStore,
-    pub cal_store: SqliteCalendarStore,
-    pub principal_store: SqlitePrincipalStore,
-    pub sub_store: SqliteStore,
-}
-
-#[fixture]
-pub async fn test_store_context() -> TestStoreContext {
-    let (send_addr, _recv) = tokio::sync::mpsc::channel(1);
-    let (send_cal, _recv) = tokio::sync::mpsc::channel(1);
-    let db = get_test_db().await;
     TestStoreContext {
         db: db.clone(),
         addr_store: SqliteAddressbookStore::new(db.clone(), send_addr, false),
         cal_store: SqliteCalendarStore::new(db.clone(), send_cal, false),
-        principal_store: SqlitePrincipalStore::new(db.clone()),
+        principal_store,
         sub_store: SqliteStore::new(db),
     }
 }

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar__delete_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/caldav/calendar.rs
-expression: body
----
-

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar__mkcalendar_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/caldav/calendar.rs
-expression: body
----
-

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_import__0_import_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/caldav/calendar_import.rs
-expression: body
----
-

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_import__1_import_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/caldav/calendar_import.rs
-expression: body
----
-

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_import__get_body.snap

@@ -1,107 +0,0 @@
----
-source: src/integration_tests/caldav/calendar_import.rs
-expression: body
----
-BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-PRODID:RustiCal
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20060206T001121Z
-DTSTART;TZID=US/Eastern:20060104T140000
-DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060104T120000
-SUMMARY:Event #2 bis
-UID:[UID]
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20060206T001102Z
-DTSTART;TZID=US/Eastern:20060102T100000
-DURATION:PT1H
-SUMMARY:Event #1
-Description:Go Steelers!
-UID:[UID]
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20060206T001121Z
-DTSTART;TZID=US/Eastern:20060102T120000
-DURATION:PT1H
-RRULE:FREQ=DAILY;COUNT=5
-SUMMARY:Event #2
-UID:[UID]
-END:VEVENT
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:cyrus@example.com
-ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:lisa@example.com
-DTSTAMP:20060206T001220Z
-DTSTART;TZID=US/Eastern:20060104T100000
-DURATION:PT1H
-LAST-MODIFIED:20060206T001330Z
-ORGANIZER:mailto:cyrus@example.com
-SEQUENCE:1
-STATUS:TENTATIVE
-SUMMARY:Event #3
-UID:[UID]
-END:VEVENT
-BEGIN:VTODO
-DTSTAMP:20060205T235335Z
-DUE;VALUE=DATE:20060104
-STATUS:NEEDS-ACTION
-SUMMARY:Task #1
-UID:[UID]
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VTODO
-BEGIN:VTODO
-DTSTAMP:20060205T235300Z
-DUE;VALUE=DATE:20060106
-LAST-MODIFIED:20060205T235308Z
-SEQUENCE:1
-STATUS:NEEDS-ACTION
-SUMMARY:Task #2
-UID:[UID]
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VTODO
-BEGIN:VTODO
-COMPLETED:20051223T122322Z
-DTSTAMP:20060205T235400Z
-DUE;VALUE=DATE:20051225
-LAST-MODIFIED:20060205T235308Z
-SEQUENCE:1
-STATUS:COMPLETED
-SUMMARY:Task #3
-UID:[UID]
-END:VTODO
-BEGIN:VTODO
-DTSTAMP:20060205T235600Z
-DUE;VALUE=DATE:20060101
-LAST-MODIFIED:20060205T235308Z
-SEQUENCE:1
-STATUS:CANCELLED
-SUMMARY:Task #4
-UID:[UID]
-END:VTODO
-END:VCALENDAR

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_import__import_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/caldav/calendar_import.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook__delete_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/addressbook.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook__get_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/addressbook.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook__mkcol_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/addressbook.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook_import__get_body.snap

@@ -1,13 +0,0 @@
----
-source: src/integration_tests/carddav/addressbook_import.rs
-expression: body
----
-BEGIN:VCARD
-VERSION:4.0
-FN:Simon Perreault
-N:Perreault;Simon;;;ing. jr,M.Sc.
-BDAY:--0203
-GENDER:M
-EMAIL;TYPE=work:simon.perreault@viagenie.ca
-UID:[UID]
-END:VCARD

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook_import__import_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/addressbook_import.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__carddav_root-2.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/mod.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__carddav_root.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/mod.rs
-expression: body
----
-

src/lib.rs

@@ -26,8 +26,6 @@ pub mod app;
 mod commands;
 pub use commands::*;
 pub mod config;
-#[cfg(test)]
-pub mod integration_tests;
 mod setup_tracing;
 
 #[derive(Parser, Debug)]
@@ -70,6 +68,7 @@ pub async fn get_data_stores(
             skip_broken,
         }) => {
             let db = create_db_pool(db_url, migrate).await?;
+
             // Channel to watch for changes (for DAV Push)
             let (send, recv) = tokio::sync::mpsc::channel(1000);
 

tests/integration_tests/caldav/calendar.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/caldav/calendar_import.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/caldav/calendar_put.rs

@@ -1,3 +1,4 @@
+use super::{ResponseExtractString, calendar::mkcalendar_template, get_app};
 use axum::body::Body;
 use headers::{Authorization, HeaderMapExt};
 use http::{Request, StatusCode};
@@ -6,10 +7,6 @@ use rustical_store::CalendarMetadata;
 use rustical_store_sqlite::tests::{TestStoreContext, test_store_context};
 use tower::ServiceExt;
 
-use crate::integration_tests::{
-    ResponseExtractString, caldav::calendar::mkcalendar_template, get_app,
-};
-
 #[rstest]
 #[tokio::test]
 async fn test_put_invalid(

tests/integration_tests/caldav/calendar_report.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/caldav/mod.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/caldav/snapshots/light_integrations__integration_tests__caldav__calendar__delete_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/caldav/calendar.rs
+expression: body
+---
+

tests/integration_tests/caldav/snapshots/light_integrations__integration_tests__caldav__calendar__get_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar.rs
+source: tests/integration_tests/caldav/calendar.rs
 expression: body
 ---
 BEGIN:VCALENDAR

tests/integration_tests/caldav/snapshots/light_integrations__integration_tests__caldav__calendar__mkcalendar_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/caldav/calendar.rs
+expression: body
+---
+

tests/integration_tests/caldav/snapshots/light_integrations__integration_tests__caldav__calendar__multiget_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar.rs
+source: tests/integration_tests/caldav/calendar.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/light_integrations__integration_tests__caldav__calendar__propfind_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar.rs
+source: tests/integration_tests/caldav/calendar.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/light_integrations__integration_tests__caldav__calendar__proppatch_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar.rs
+source: tests/integration_tests/caldav/calendar.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/light_integrations__integration_tests__caldav__calendar_import__0_get_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar_import.rs
+source: tests/integration_tests/caldav/calendar_import.rs
 expression: body
 ---
 BEGIN:VCALENDAR

tests/integration_tests/caldav/snapshots/light_integrations__integration_tests__caldav__calendar_import__0_import_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/caldav/calendar_import.rs
+expression: body
+---
+

tests/integration_tests/caldav/snapshots/light_integrations__integration_tests__caldav__calendar_import__1_get_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar_import.rs
+source: tests/integration_tests/caldav/calendar_import.rs
 expression: body
 ---
 BEGIN:VCALENDAR

tests/integration_tests/caldav/snapshots/light_integrations__integration_tests__caldav__calendar_import__1_import_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/caldav/calendar_import.rs
+expression: body
+---
+

tests/integration_tests/caldav/snapshots/light_integrations__integration_tests__caldav__calendar_report__0_report_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar_report.rs
+source: tests/integration_tests/caldav/calendar_report.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/light_integrations__integration_tests__caldav__calendar_report__1_report_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar_report.rs
+source: tests/integration_tests/caldav/calendar_report.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/light_integrations__integration_tests__caldav__calendar_report__2_report_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar_report.rs
+source: tests/integration_tests/caldav/calendar_report.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/light_integrations__integration_tests__caldav__propfind_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/mod.rs
+source: tests/integration_tests/caldav/mod.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/light_integrations__integration_tests__caldav__propfind_depth_0.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/mod.rs
+source: tests/integration_tests/caldav/mod.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/light_integrations__integration_tests__caldav__propfind_depth_1.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/mod.rs
+source: tests/integration_tests/caldav/mod.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/carddav/addressbook.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/carddav/addressbook_import.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};
@@ -27,11 +27,10 @@ async fn test_import(
             .body(Body::from(
                 r"BEGIN:VCARD
 VERSION:4.0
-FN:Simon Perreault
+FN:John Doe
-N:Perreault;Simon;;;ing. jr,M.Sc.
+N:Doe;John;;;,
 BDAY:--0203
 GENDER:M
-EMAIL;TYPE=work:simon.perreault@viagenie.ca
 END:VCARD",
             ))
             .unwrap()

tests/integration_tests/carddav/mod.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__delete_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/addressbook.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__get_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/addressbook.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__mkcol_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/addressbook.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__multiget_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/carddav/addressbook.rs
+source: tests/integration_tests/carddav/addressbook.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__propfind_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/carddav/addressbook.rs
+source: tests/integration_tests/carddav/addressbook.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__proppatch_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/carddav/addressbook.rs
+source: tests/integration_tests/carddav/addressbook.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook_import__get_body.snap

@@ -0,0 +1,12 @@
+---
+source: tests/integration_tests/carddav/addressbook_import.rs
+expression: body
+---
+BEGIN:VCARD
+VERSION:4.0
+FN:John Doe
+N:Doe;John;;;,
+BDAY:--0203
+GENDER:M
+UID:[UID]
+END:VCARD

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook_import__import_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/addressbook_import.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__carddav_root-2.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/mod.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__carddav_root-3.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/carddav/mod.rs
+source: tests/integration_tests/carddav/mod.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__carddav_root.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/mod.rs
+expression: body
+---
+

tests/integration_tests/mod.rs

@@ -1,7 +1,7 @@
-use crate::{app::make_app, config::NextcloudLoginConfig};
 use axum::extract::Request;
 use axum::{body::Body, response::Response};
 use rstest::rstest;
+use rustical::{app::make_app, config::NextcloudLoginConfig};
 use rustical_caldav::CalDavConfig;
 use rustical_frontend::FrontendConfig;
 use rustical_store_sqlite::tests::{TestStoreContext, test_store_context};

tests/light_integrations.rs

@@ -0,0 +1 @@
+mod integration_tests;