chore(tests): switch to preview container image for tests

Signed-off-by: Raphael Höser <[email protected]>

Author: Snapstromegon

tests/essentials.rs

@@ -1,8 +1,10 @@
-use eventsourcingdb::{Client, container::Container};
+mod utils;
+use eventsourcingdb::Client;
+use utils::create_test_container;
 
 #[tokio::test]
 async fn ping() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     client.ping().await.expect("Failed to ping");
 }
@@ -11,12 +13,12 @@ async fn ping() {
 async fn ping_unavailable_server_errors() {
     let client = Client::new("http://localhost:12345".parse().unwrap(), "secrettoken");
     let result = client.ping().await;
-    assert!(result.is_err(), "Expected an error, but got: {:?}", result);
+    assert!(result.is_err(), "Expected an error, but got: {result:?}");
 }
 
 #[tokio::test]
 async fn verify_api_token() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     client
         .verify_api_token()
@@ -28,14 +30,14 @@ async fn verify_api_token() {
 async fn verify_api_token_unavailable_server_errors() {
     let client = Client::new("http://localhost:12345".parse().unwrap(), "secrettoken");
     let result = client.verify_api_token().await;
-    assert!(result.is_err(), "Expected an error, but got: {:?}", result);
+    assert!(result.is_err(), "Expected an error, but got: {result:?}");
 }
 
 #[tokio::test]
 async fn verify_api_token_invalid_token_errors() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let invalid_client = Client::new(client.get_base_url().clone(), "invalid_token");
     let result = invalid_client.verify_api_token().await;
-    assert!(result.is_err(), "Expected an error, but got: {:?}", result);
+    assert!(result.is_err(), "Expected an error, but got: {result:?}");
 }

tests/metadata_and_discovery.rs

@@ -1,10 +1,11 @@
-use eventsourcingdb::container::Container;
+mod utils;
 use futures::StreamExt;
 use serde_json::json;
+use utils::create_test_container;
 
 #[tokio::test]
 async fn register_event_schema() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     client
         .register_event_schema(
@@ -28,7 +29,7 @@ async fn register_event_schema() {
 
 #[tokio::test]
 async fn register_invalid_event_schema() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let res = client
         .register_event_schema(
@@ -38,24 +39,23 @@ async fn register_invalid_event_schema() {
             }),
         )
         .await;
-    assert!(res.is_err(), "Expected an error, but got: {:?}", res);
+    assert!(res.is_err(), "Expected an error, but got: {res:?}");
 }
 
 #[tokio::test]
 async fn list_all_subjects() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let res = client.list_subjects(None).await;
     match res {
         Ok(subjects) => {
             let subjects = subjects.collect::<Vec<_>>().await;
             assert!(
                 subjects.is_empty(),
-                "Expected no subjects, but got: {:?}",
-                subjects
+                "Expected no subjects, but got: {subjects:?}"
             );
         }
-        Err(err) => panic!("Failed to list subjects: {:?}", err),
+        Err(err) => panic!("Failed to list subjects: {err:?}"),
     }
 }
 
@@ -65,7 +65,7 @@ async fn list_all_subjects() {
 
 #[tokio::test]
 async fn list_all_event_types() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let test_event_type = "io.eventsourcingdb.test";
     let schema = json!({
@@ -90,8 +90,7 @@ async fn list_all_event_types() {
             let mut event_types = event_types.collect::<Vec<_>>().await;
             assert!(
                 event_types.len() == 1,
-                "Expected one event types, but got: {:?}",
-                event_types
+                "Expected one event types, but got: {event_types:?}"
             );
             assert!(event_types[0].is_ok(), "Expected event type to be ok");
             let response_event_type = event_types.pop().unwrap().unwrap();
@@ -113,7 +112,7 @@ async fn list_all_event_types() {
                 response_event_type.is_phantom
             );
         }
-        Err(err) => panic!("Failed to list event types: {:?}", err),
+        Err(err) => panic!("Failed to list event types: {err:?}"),
     }
 }
 

tests/observe_events.rs

@@ -1,13 +1,12 @@
 mod utils;
-
-use eventsourcingdb::container::Container;
 use futures::stream::StreamExt;
 use serde_json::json;
+use utils::create_test_container;
 use utils::create_test_eventcandidate;
 
 #[tokio::test]
 async fn observe_existing_events() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let event_candidate = create_test_eventcandidate("/test", json!({"value": 1}));
     let written = client
@@ -30,7 +29,7 @@ async fn observe_existing_events() {
 
 #[tokio::test]
 async fn keep_observing_events() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
 
     let mut events_stream = client

tests/read_events.rs

@@ -1,34 +1,32 @@
 mod utils;
 
-use eventsourcingdb::{
-    container::Container,
-    request_options::{
-        Ordering, ReadEventMissingStrategy, ReadEventsOptions, ReadFromLatestEventOptions,
-    },
+use eventsourcingdb::request_options::{
+    Ordering, ReadEventMissingStrategy, ReadEventsOptions, ReadFromLatestEventOptions,
 };
 use futures::TryStreamExt;
 use serde_json::json;
+use utils::create_test_container;
 use utils::{
     assert_event_match_eventcandidate, create_numbered_eventcandidates, create_test_eventcandidate,
 };
 
 #[tokio::test]
 async fn make_read_call() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let events_stream = client
         .read_events("/", None)
         .await
         .expect("Failed to read events");
     let events: Result<Vec<_>, _> = events_stream.try_collect().await;
-    assert!(events.is_ok(), "Failed to write events: {:?}", events);
+    assert!(events.is_ok(), "Failed to write events: {events:?}");
     let events = events.expect("Failed to read events");
     assert_eq!(events.len(), 0);
 }
 
 #[tokio::test]
 async fn make_read_call_with_event() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let event_candidate = create_test_eventcandidate("/test", json!({"value": 1}));
     let written = client
@@ -50,7 +48,7 @@ async fn make_read_call_with_event() {
 
 #[tokio::test]
 async fn make_read_call_with_multiple_events() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let event_candidates = create_numbered_eventcandidates(10);
     let written = client
@@ -72,7 +70,7 @@ async fn make_read_call_with_multiple_events() {
 
 #[tokio::test]
 async fn read_from_exact_topic() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let event_candidate = create_test_eventcandidate("/test", json!({"value": 1}));
     client
@@ -102,7 +100,7 @@ async fn read_from_exact_topic() {
 
 #[tokio::test]
 async fn read_recursive() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let event_candidate_parent = create_test_eventcandidate("/test", json!({"value": 1}));
     let event_candidate_child = create_test_eventcandidate("/test/sub", json!({"value": 2}));
@@ -137,7 +135,7 @@ async fn read_recursive() {
 
 #[tokio::test]
 async fn read_not_recursive() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let event_candidate_parent = create_test_eventcandidate("/test", json!({"value": 1}));
     let event_candidate_child = create_test_eventcandidate("/test/sub", json!({"value": 2}));
@@ -172,7 +170,7 @@ async fn read_not_recursive() {
 
 #[tokio::test]
 async fn read_chronological() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let event_candidates = create_numbered_eventcandidates(10);
     let written = client
@@ -200,7 +198,7 @@ async fn read_chronological() {
 
 #[tokio::test]
 async fn read_antichronological() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let event_candidates = create_numbered_eventcandidates(10);
     let written = client
@@ -230,7 +228,7 @@ async fn read_antichronological() {
 
 #[tokio::test]
 async fn read_everything_from_missing_latest_event() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let event_candidates = create_numbered_eventcandidates(10);
     let written = client
@@ -262,7 +260,7 @@ async fn read_everything_from_missing_latest_event() {
 
 #[tokio::test]
 async fn read_nothing_from_missing_latest_event() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let event_candidates = create_numbered_eventcandidates(10);
     client
@@ -294,7 +292,7 @@ async fn read_nothing_from_missing_latest_event() {
 
 #[tokio::test]
 async fn read_from_latest_event() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let event_candidates = create_numbered_eventcandidates(10);
     client

tests/run_eventql_query.rs

@@ -1,16 +1,17 @@
-use eventsourcingdb::container::Container;
+mod utils;
 use futures::stream::TryStreamExt;
+use utils::create_test_container;
 
 #[tokio::test]
 async fn run_empty_query() {
-    let container = Container::start_default().await.unwrap();
+    let container = create_test_container().await;
     let client = container.get_client().await.unwrap();
     let rows = client
         .run_eventql_query("FROM e IN events ORDER BY e.time DESC TOP 100 PROJECT INTO e")
         .await
         .expect("Unable to run query");
     let rows: Result<Vec<_>, _> = rows.try_collect().await;
-    assert!(rows.is_ok(), "Failed to run query: {:?}", rows);
+    assert!(rows.is_ok(), "Failed to run query: {rows:?}");
     let rows = rows.expect("Failed to read rows");
     assert_eq!(rows.len(), 0);
 }

tests/utils/mod.rs

@@ -1,7 +1,15 @@
 use chrono::{TimeDelta, Utc};
-use eventsourcingdb::{Event, EventCandidate};
+use eventsourcingdb::{Event, EventCandidate, container::Container};
 use serde_json::{Value, json};
 
+pub async fn create_test_container() -> Container {
+    Container::builder()
+        .with_image_tag("preview")
+        .start()
+        .await
+        .expect("Failed to start test container")
+}
+
 pub fn create_test_eventcandidate(
     subject: impl ToString,
     data: impl Into<Value>,