From 5423ec3937a4e28f3958a71b3db7498a4c427dc1 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Fri, 25 Oct 2024 00:33:16 -0400
Subject: Tests for purged channels and messages.

This required a re-think of the `.immediately()` combinator, to generalize it to cases where a message is _not_ expected. That (more or less immediately) suggested some mixed combinators, particularly for stream futures (futures of `Option<T>`).
---
 src/event/routes/test/resume.rs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/event/routes/test/resume.rs')

diff --git a/src/event/routes/test/resume.rs b/src/event/routes/test/resume.rs
index e4751bb..62b9bad 100644
--- a/src/event/routes/test/resume.rs
+++ b/src/event/routes/test/resume.rs
@@ -6,7 +6,7 @@ use futures::stream::{self, StreamExt as _};
 
 use crate::{
     event::{routes::get, Sequenced as _},
-    test::fixtures::{self, future::Immediately as _},
+    test::fixtures::{self, future::Expect as _},
 };
 
 #[tokio::test]
@@ -44,9 +44,8 @@ async fn resume() {
             .filter_map(fixtures::event::message::sent)
             .filter(|event| future::ready(event.message == initial_message))
             .next()
-            .immediately()
-            .await
-            .expect("delivered events");
+            .expect_some("delivered event for initial message")
+            .await;
 
         event.sequence()
     };
@@ -68,7 +67,7 @@ async fn resume() {
         .filter_map(fixtures::event::message::sent)
         .zip(stream::iter(later_messages));
 
-    while let Some((event, message)) = events.next().immediately().await {
+    while let Some((event, message)) = events.next().expect_ready("event ready").await {
         assert_eq!(message, event.message);
     }
 }
@@ -128,7 +127,7 @@ async fn serial_resume() {
             .filter_map(fixtures::event::message::sent)
             .zip(stream::iter(initial_messages))
             .collect::<Vec<_>>()
-            .immediately()
+            .expect_ready("zipping a finite list of events is ready immediately")
             .await;
 
         assert!(events
@@ -169,7 +168,7 @@ async fn serial_resume() {
             .filter_map(fixtures::event::message::sent)
             .zip(stream::iter(resume_messages))
             .collect::<Vec<_>>()
-            .immediately()
+            .expect_ready("zipping a finite list of events is ready immediately")
             .await;
 
         assert!(events
@@ -210,7 +209,7 @@ async fn serial_resume() {
             .filter_map(fixtures::event::message::sent)
             .zip(stream::iter(final_messages))
             .collect::<Vec<_>>()
-            .immediately()
+            .expect_ready("zipping a finite list of events is ready immediately")
             .await;
 
         assert!(events
-- 
cgit v1.2.3