Consolidate test helper event functions

6 files changed, 50 insertions, 52 deletions

diff --git a/src/event/routes/test/channel.rs b/src/event/routes/test/channel.rs
index ac45bfc..0ab28c4 100644
--- a/src/event/routes/test/channel.rs
+++ b/src/event/routes/test/channel.rs
@@ -33,8 +33,8 @@ async fn creating() {
     // Verify channel created event
 
     let _ = events
-        .filter_map(fixtures::channel::events)
-        .filter_map(fixtures::channel::created)
+        .filter_map(fixtures::event::channel)
+        .filter_map(fixtures::event::channel::created)
         .filter(|event| future::ready(event.channel == channel))
         .next()
         .immediately()
@@ -68,8 +68,8 @@ async fn previously_created() {
     // Verify channel created event
 
     let _ = events
-        .filter_map(fixtures::channel::events)
-        .filter_map(fixtures::channel::created)
+        .filter_map(fixtures::event::channel)
+        .filter_map(fixtures::event::channel::created)
         .filter(|event| future::ready(event.channel == channel))
         .next()
         .immediately()
@@ -101,8 +101,8 @@ async fn expiring() {
 
     // Check for expiry event
     let _ = events
-        .filter_map(fixtures::channel::events)
-        .filter_map(fixtures::channel::deleted)
+        .filter_map(fixtures::event::channel)
+        .filter_map(fixtures::event::channel::deleted)
         .filter(|event| future::ready(event.id == channel.id))
         .next()
         .immediately()
@@ -134,8 +134,8 @@ async fn previously_expired() {
 
     // Check for expiry event
     let _ = events
-        .filter_map(fixtures::channel::events)
-        .filter_map(fixtures::channel::deleted)
+        .filter_map(fixtures::event::channel)
+        .filter_map(fixtures::event::channel::deleted)
         .filter(|event| future::ready(event.id == channel.id))
         .next()
         .immediately()
@@ -167,8 +167,8 @@ async fn deleting() {
 
     // Check for delete event
     let _ = events
-        .filter_map(fixtures::channel::events)
-        .filter_map(fixtures::channel::deleted)
+        .filter_map(fixtures::event::channel)
+        .filter_map(fixtures::event::channel::deleted)
         .filter(|event| future::ready(event.id == channel.id))
         .next()
         .immediately()
@@ -182,8 +182,6 @@ async fn previously_deleted() {
 
     let app = fixtures::scratch_app().await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
-    let message = fixtures::message::send(&app, &channel, &sender, &fixtures::now()).await;
 
     // Delete the channel
 
@@ -202,11 +200,11 @@ async fn previously_deleted() {
 
     // Check for expiry event
     let _ = events
-        .filter_map(fixtures::message::events)
-        .filter_map(fixtures::message::deleted)
-        .filter(|event| future::ready(event.id == message.id))
+        .filter_map(fixtures::event::channel)
+        .filter_map(fixtures::event::channel::deleted)
+        .filter(|event| future::ready(event.id == channel.id))
         .next()
         .immediately()
         .await
-        .expect("a deleted message will be delivered");
+        .expect("a deleted channel event will be delivered");
 }
diff --git a/src/event/routes/test/invite.rs b/src/event/routes/test/invite.rs
index 10e4521..afd3aeb 100644
--- a/src/event/routes/test/invite.rs
+++ b/src/event/routes/test/invite.rs
@@ -35,8 +35,8 @@ async fn accepting_invite() {
     // Expect a login created event
 
     let _ = events
-        .filter_map(fixtures::login::events)
-        .filter_map(fixtures::login::created)
+        .filter_map(fixtures::event::login)
+        .filter_map(fixtures::event::login::created)
         .filter(|event| future::ready(event.login == joiner))
         .next()
         .immediately()
@@ -72,8 +72,8 @@ async fn previously_accepted_invite() {
     // Expect a login created event
 
     let _ = events
-        .filter_map(fixtures::login::events)
-        .filter_map(fixtures::login::created)
+        .filter_map(fixtures::event::login)
+        .filter_map(fixtures::event::login::created)
         .filter(|event| future::ready(event.login == joiner))
         .next()
         .immediately()
diff --git a/src/event/routes/test/message.rs b/src/event/routes/test/message.rs
index 9bbbc7d..df42a89 100644
--- a/src/event/routes/test/message.rs
+++ b/src/event/routes/test/message.rs
@@ -42,8 +42,8 @@ async fn sending() {
     // Verify that an event is delivered
 
     let _ = events
-        .filter_map(fixtures::message::events)
-        .filter_map(fixtures::message::sent)
+        .filter_map(fixtures::event::message)
+        .filter_map(fixtures::event::message::sent)
         .filter(|event| future::ready(event.message == message))
         .next()
         .immediately()
@@ -83,8 +83,8 @@ async fn previously_sent() {
     // Verify that an event is delivered
 
     let _ = events
-        .filter_map(fixtures::message::events)
-        .filter_map(fixtures::message::sent)
+        .filter_map(fixtures::event::message)
+        .filter_map(fixtures::event::message::sent)
         .filter(|event| future::ready(event.message == message))
         .next()
         .immediately()
@@ -124,8 +124,8 @@ async fn sent_in_multiple_channels() {
     // Verify the structure of the response.
 
     let events = events
-        .filter_map(fixtures::message::events)
-        .filter_map(fixtures::message::sent)
+        .filter_map(fixtures::event::message)
+        .filter_map(fixtures::event::message::sent)
         .take(messages.len())
         .collect::<Vec<_>>()
         .immediately()
@@ -160,8 +160,8 @@ async fn sent_sequentially() {
     // Verify the expected events in the expected order
 
     let mut events = events
-        .filter_map(fixtures::message::events)
-        .filter_map(fixtures::message::sent)
+        .filter_map(fixtures::event::message)
+        .filter_map(fixtures::event::message::sent)
         .filter(|event| future::ready(messages.iter().any(|message| &event.message == message)));
 
     for message in &messages {
@@ -201,8 +201,8 @@ async fn expiring() {
 
     // Check for expiry event
     let _ = events
-        .filter_map(fixtures::message::events)
-        .filter_map(fixtures::message::deleted)
+        .filter_map(fixtures::event::message)
+        .filter_map(fixtures::event::message::deleted)
         .filter(|event| future::ready(event.id == message.id))
         .next()
         .immediately()
@@ -236,8 +236,8 @@ async fn previously_expired() {
 
     // Check for expiry event
     let _ = events
-        .filter_map(fixtures::message::events)
-        .filter_map(fixtures::message::deleted)
+        .filter_map(fixtures::event::message)
+        .filter_map(fixtures::event::message::deleted)
         .filter(|event| future::ready(event.id == message.id))
         .next()
         .immediately()
@@ -271,8 +271,8 @@ async fn deleting() {
 
     // Check for delete event
     let _ = events
-        .filter_map(fixtures::message::events)
-        .filter_map(fixtures::message::deleted)
+        .filter_map(fixtures::event::message)
+        .filter_map(fixtures::event::message::deleted)
         .filter(|event| future::ready(event.id == message.id))
         .next()
         .immediately()
@@ -306,8 +306,8 @@ async fn previously_deleted() {
 
     // Check for delete event
     let _ = events
-        .filter_map(fixtures::message::events)
-        .filter_map(fixtures::message::deleted)
+        .filter_map(fixtures::event::message)
+        .filter_map(fixtures::event::message::deleted)
         .filter(|event| future::ready(event.id == message.id))
         .next()
         .immediately()
diff --git a/src/event/routes/test/resume.rs b/src/event/routes/test/resume.rs
index c393d38..e4751bb 100644
--- a/src/event/routes/test/resume.rs
+++ b/src/event/routes/test/resume.rs
@@ -40,8 +40,8 @@ async fn resume() {
         .expect("subscribe never fails");
 
         let event = events
-            .filter_map(fixtures::message::events)
-            .filter_map(fixtures::message::sent)
+            .filter_map(fixtures::event::message)
+            .filter_map(fixtures::event::message::sent)
             .filter(|event| future::ready(event.message == initial_message))
             .next()
             .immediately()
@@ -64,8 +64,8 @@ async fn resume() {
     // Verify final events
 
     let mut events = resumed
-        .filter_map(fixtures::message::events)
-        .filter_map(fixtures::message::sent)
+        .filter_map(fixtures::event::message)
+        .filter_map(fixtures::event::message::sent)
         .zip(stream::iter(later_messages));
 
     while let Some((event, message)) = events.next().immediately().await {
@@ -124,8 +124,8 @@ async fn serial_resume() {
         // Check for expected events
 
         let events = events
-            .filter_map(fixtures::message::events)
-            .filter_map(fixtures::message::sent)
+            .filter_map(fixtures::event::message)
+            .filter_map(fixtures::event::message::sent)
             .zip(stream::iter(initial_messages))
             .collect::<Vec<_>>()
             .immediately()
@@ -165,8 +165,8 @@ async fn serial_resume() {
         // Check for expected events
 
         let events = events
-            .filter_map(fixtures::message::events)
-            .filter_map(fixtures::message::sent)
+            .filter_map(fixtures::event::message)
+            .filter_map(fixtures::event::message::sent)
             .zip(stream::iter(resume_messages))
             .collect::<Vec<_>>()
             .immediately()
@@ -206,8 +206,8 @@ async fn serial_resume() {
         // Check for expected events
 
         let events = events
-            .filter_map(fixtures::message::events)
-            .filter_map(fixtures::message::sent)
+            .filter_map(fixtures::event::message)
+            .filter_map(fixtures::event::message::sent)
             .zip(stream::iter(final_messages))
             .collect::<Vec<_>>()
             .immediately()
diff --git a/src/event/routes/test/setup.rs b/src/event/routes/test/setup.rs
index 234c2d9..a54b65b 100644
--- a/src/event/routes/test/setup.rs
+++ b/src/event/routes/test/setup.rs
@@ -36,8 +36,8 @@ async fn previously_completed() {
     // Expect a login created event
 
     let _ = events
-        .filter_map(fixtures::login::events)
-        .filter_map(fixtures::login::created)
+        .filter_map(fixtures::event::login)
+        .filter_map(fixtures::event::login::created)
         .filter(|event| future::ready(event.login == owner))
         .next()
         .immediately()
diff --git a/src/event/routes/test/token.rs b/src/event/routes/test/token.rs
index a545988..577fabd 100644
--- a/src/event/routes/test/token.rs
+++ b/src/event/routes/test/token.rs
@@ -41,8 +41,8 @@ async fn terminates_on_token_expiry() {
     ];
 
     assert!(events
-        .filter_map(fixtures::message::events)
-        .filter_map(fixtures::message::sent)
+        .filter_map(fixtures::event::message)
+        .filter_map(fixtures::event::message::sent)
         .filter(|event| future::ready(messages.iter().any(|message| &event.message == message)))
         .next()
         .immediately()
@@ -87,8 +87,8 @@ async fn terminates_on_logout() {
     ];
 
     assert!(events
-        .filter_map(fixtures::message::events)
-        .filter_map(fixtures::message::sent)
+        .filter_map(fixtures::event::message)
+        .filter_map(fixtures::event::message::sent)
         .filter(|event| future::ready(messages.iter().any(|message| &event.message == message)))
         .next()
         .immediately()