Tests: Fix scope of store

2026-01-30 06:58:26 +00:00 · 2025-12-31 01:05:56 +01:00
parent f778c470d0
commit 4b8a8c61f2
14 changed files with 103 additions and 316 deletions
--- a/src/integration_tests/caldav/calendar.rs
+++ b/src/integration_tests/caldav/calendar.rs
@@ -5,7 +5,7 @@ use headers::{Authorization, HeaderMapExt};
 use http::{HeaderValue, StatusCode};
 use rstest::rstest;
 use rustical_store::{CalendarMetadata, CalendarStore};
-use rustical_store_sqlite::{calendar_store::SqliteCalendarStore, tests::get_test_calendar_store};
+use rustical_store_sqlite::tests::{TestStoreContext, test_store_context};
 use tower::ServiceExt;

 fn mkcalendar_template(
@@ -48,15 +48,13 @@ fn mkcalendar_template(
 #[rstest]
 #[tokio::test]
 async fn test_caldav_calendar(
-    #[from(get_app)]
+    #[from(test_store_context)]
    #[future]
-    app: axum::Router,
-    #[from(get_test_calendar_store)]
-    #[future]
-    cal_store: SqliteCalendarStore,
+    context: TestStoreContext,
 ) {
-    let app = app.await;
-    let cal_store = cal_store.await;
+    let context = context.await;
+    let app = get_app(context.clone());
+    let cal_store = context.cal_store;

    let mut calendar_meta = CalendarMetadata {
        displayname: Some("Calendar".to_string()),
--- a/src/integration_tests/caldav/mod.rs
+++ b/src/integration_tests/caldav/mod.rs
@@ -4,6 +4,7 @@ use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};
 use http::{HeaderValue, StatusCode};
 use rstest::rstest;
+use rustical_store_sqlite::tests::{TestStoreContext, test_store_context};
 use tower::ServiceExt;

 mod calendar;
@@ -11,11 +12,11 @@ mod calendar;
 #[rstest]
 #[tokio::test]
 async fn test_caldav_root(
-    #[from(get_app)]
+    #[from(test_store_context)]
    #[future]
-    app: axum::Router,
+    context: TestStoreContext,
 ) {
-    let app = app.await;
+    let app = get_app(context.await);

    let request_template = || {
        Request::builder()
@@ -53,11 +54,11 @@ async fn test_caldav_root(
 #[rstest]
 #[tokio::test]
 async fn test_caldav_principal(
-    #[from(get_app)]
+    #[from(test_store_context)]
    #[future]
-    app: axum::Router,
+    context: TestStoreContext,
 ) {
-    let app = app.await;
+    let app = get_app(context.await);

    let request_template = || {
        Request::builder()
--- a/src/integration_tests/caldav/snapshots/rustical__integration_testscaldavpropfind_depth_1.snap
+++ b/src/integration_tests/caldav/snapshots/rustical__integration_testscaldavpropfind_depth_1.snap
@@ -50,192 +50,4 @@ expression: body
            <status>HTTP/1.1 200 OK</status>
        </propstat>
    </response>
-    <response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
-        <href>/caldav/principal/user/calendar/</href>
-        <propstat>
-            <prop>
-                <calendar-color xmlns="http://apple.com/ns/ical/">#00FF00</calendar-color>
-                <CAL:calendar-description>Description</CAL:calendar-description>
-                <CAL:calendar-timezone>BEGIN:VCALENDAR
-PRODID:-//github.com/lennart-k/vzic-rs//RustiCal Calendar server//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Berlin
-LAST-MODIFIED:20250723T190331Z
-X-LIC-LOCATION:Europe/Berlin
-X-PROLEPTIC-TZNAME:LMT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+005328
-TZOFFSETTO:+0100
-DTSTART:18930401T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19160430T230000
-RDATE:19400401T020000
-RDATE:19430329T020000
-RDATE:19460414T020000
-RDATE:19470406T030000
-RDATE:19480418T020000
-RDATE:19490410T020000
-RDATE:19800406T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19161001T010000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19451118T030000
-RDATE:19461007T030000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19170416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19170917T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19440403T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T010000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZNAME:CEMT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-DTSTART:19450524T020000
-RDATE:19470511T030000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-DTSTART:19450924T030000
-RDATE:19470629T030000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-DTSTART:19460101T000000
-RDATE:19800101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19471005T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19800928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
-</CAL:calendar-timezone>
-                <CAL:timezone-service-set>
-                    <href>https://www.iana.org/time-zones</href>
-                </CAL:timezone-service-set>
-                <CAL:calendar-timezone-id>Europe/Berlin</CAL:calendar-timezone-id>
-                <calendar-order xmlns="http://apple.com/ns/ical/">0</calendar-order>
-                <CAL:supported-calendar-component-set>
-                    <CAL:comp name="VEVENT"/>
-                    <CAL:comp name="VTODO"/>
-                    <CAL:comp name="VJOURNAL"/>
-                </CAL:supported-calendar-component-set>
-                <CAL:supported-calendar-data>
-                    <CAL:calendar-data content-type="text/calendar" version="2.0"/>
-                </CAL:supported-calendar-data>
-                <CAL:supported-collation-set>
-                    <CAL:supported-collation>i;ascii-casemap</CAL:supported-collation>
-                    <CAL:supported-collation>i;octet</CAL:supported-collation>
-                </CAL:supported-collation-set>
-                <max-resource-size>10000000</max-resource-size>
-                <supported-report-set>
-                    <supported-report>
-                        <report>
-                            <CAL:calendar-query/>
-                        </report>
-                    </supported-report>
-                    <supported-report>
-                        <report>
-                            <CAL:calendar-multiget/>
-                        </report>
-                    </supported-report>
-                    <supported-report>
-                        <report>
-                            <sync-collection/>
-                        </report>
-                    </supported-report>
-                </supported-report-set>
-                <CAL:min-date-time>-2621430101T000000Z</CAL:min-date-time>
-                <CAL:max-date-time>+2621421231T235959Z</CAL:max-date-time>
-                <sync-token>github.com/lennart-k/rustical/ns/0</sync-token>
-                <CS:getctag>github.com/lennart-k/rustical/ns/0</CS:getctag>
-                <PUSH:transports>
-                    <PUSH:web-push/>
-                </PUSH:transports>
-                <PUSH:topic>[PUSH_TOPIC]</PUSH:topic>
-                <PUSH:supported-triggers>
-                    <PUSH:content-update>
-                        <depth>1</depth>
-                    </PUSH:content-update>
-                    <PUSH:property-update>
-                        <depth>1</depth>
-                    </PUSH:property-update>
-                </PUSH:supported-triggers>
-                <resourcetype>
-                    <collection/>
-                    <CAL:calendar/>
-                </resourcetype>
-                <displayname>Calendar</displayname>
-                <current-user-principal>
-                    <href>/caldav/principal/user/</href>
-                </current-user-principal>
-                <current-user-privilege-set>
-                    <privilege>
-                        <all/>
-                    </privilege>
-                </current-user-privilege-set>
-                <owner>
-                    <href>/caldav/principal/user/</href>
-                </owner>
-            </prop>
-            <status>HTTP/1.1 200 OK</status>
-        </propstat>
-    </response>
 </multistatus>
--- a/src/integration_tests/carddav/mod.rs
+++ b/src/integration_tests/carddav/mod.rs
@@ -4,16 +4,17 @@ use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};
 use http::StatusCode;
 use rstest::rstest;
+use rustical_store_sqlite::tests::{TestStoreContext, test_store_context};
 use tower::ServiceExt;

 #[rstest]
 #[tokio::test]
 async fn test_carddav_root(
-    #[from(get_app)]
+    #[from(test_store_context)]
    #[future]
-    app: axum::Router,
+    context: TestStoreContext,
 ) {
-    let app = app.await;
+    let app = get_app(context.await);

    let request_template = || {
        Request::builder()
--- a/src/integration_tests/mod.rs
+++ b/src/integration_tests/mod.rs
@@ -3,44 +3,24 @@ use axum::extract::Request;
 use axum::{body::Body, response::Response};
 use rstest::rstest;
 use rustical_frontend::FrontendConfig;
-use rustical_store_sqlite::{
-    SqliteStore,
-    addressbook_store::SqliteAddressbookStore,
-    calendar_store::SqliteCalendarStore,
-    principal_store::SqlitePrincipalStore,
-    tests::{
-        get_test_addressbook_store, get_test_calendar_store, get_test_principal_store,
-        get_test_subscription_store,
-    },
-};
+use rustical_store_sqlite::tests::{TestStoreContext, test_store_context};
 use std::sync::Arc;
 use tower::ServiceExt;

-#[rstest::fixture]
-pub async fn get_app(
-    #[from(get_test_calendar_store)]
-    #[future]
-    cal_store: SqliteCalendarStore,
-    #[from(get_test_addressbook_store)]
-    #[future]
-    addr_store: SqliteAddressbookStore,
-    #[from(get_test_principal_store)]
-    #[future]
-    principal_store: SqlitePrincipalStore,
-    #[from(get_test_subscription_store)]
-    #[future]
-    sub_store: SqliteStore,
-) -> axum::Router {
-    let addr_store = Arc::new(addr_store.await);
-    let cal_store = Arc::new(cal_store.await);
-    let sub_store = Arc::new(sub_store.await);
-    let principal_store = Arc::new(principal_store.await);
-
-    make_app(
+pub fn get_app(context: TestStoreContext) -> axum::Router {
+    let TestStoreContext {
        addr_store,
        cal_store,
-        sub_store,
        principal_store,
+        sub_store,
+        ..
+    } = context;
+
+    make_app(
+        Arc::new(addr_store),
+        Arc::new(cal_store),
+        Arc::new(sub_store),
+        Arc::new(principal_store),
        FrontendConfig {
            enabled: true,
            allow_password_login: true,
@@ -70,11 +50,11 @@ impl ResponseExtractString for Response {
 #[rstest]
 #[tokio::test]
 async fn test_ping(
-    #[from(get_app)]
+    #[from(test_store_context)]
    #[future]
-    app: axum::Router,
+    context: TestStoreContext,
 ) {
-    let app = app.await;
+    let app = get_app(context.await);

    let response = app
        .oneshot(Request::builder().uri("/ping").body(Body::empty()).unwrap())