From eae0edb57e9ade7c73affb78baf2ae267b6290b8 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Thu, 24 Oct 2024 22:50:23 -0400
Subject: Consolidate test helper event functions

---
 src/event/routes/test/message.rs | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

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

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()
-- 
cgit v1.2.3