From 5e560f358b20b811b2795de6c60d06aca731d1ac Mon Sep 17 00:00:00 2001
From: Titouan Rigoudy <titouan.rigoudy@gmail.com>
Date: Sun, 11 Dec 2022 21:47:34 +0000
Subject: [PATCH] Clean up RoomEventHandler tests.

---
 client/src/room/event.rs | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/client/src/room/event.rs b/client/src/room/event.rs
index 0e5dd7f..9180677 100644
--- a/client/src/room/event.rs
+++ b/client/src/room/event.rs
@@ -224,16 +224,17 @@ mod tests {
   use std::cmp::Ordering;
   use std::time::{Duration, SystemTime};
 
-  use solstice_proto::server;
+  use solstice_proto::{server, ServerRequest};
 
   use crate::clock::SimulatedSystemClock;
   use crate::context::{ContextBundle, ContextOptions};
-  use crate::room::{RoomMembership, RoomState, RoomVisibility};
+  use crate::control;
+  use crate::room::{RoomMembership, RoomMessage, RoomState, RoomVisibility};
 
-  use super::*;
+  use super::{HandleRoomEvent, RoomEvent, RoomEventHandler};
 
   #[test]
-  fn handle_room_join_request_failure() {
+  fn handle_join_request_failure() {
     let mut bundle = ContextBundle::default();
 
     RoomEventHandler
@@ -241,7 +242,7 @@ mod tests {
         &mut bundle.context,
         RoomEvent::JoinRequest("bleep".to_string()),
       )
-      .unwrap_err();
+      .expect_err("handling request");
 
     // Room state has not changed.
     assert_eq!(bundle.context.state.rooms.get_room_list(), vec![]);
@@ -252,7 +253,7 @@ mod tests {
   }
 
   #[test]
-  fn handle_room_join_request_already_joined() {
+  fn handle_join_request_already_joined() {
     let mut room = RoomState::new(RoomVisibility::Public, 3);
     room.membership = RoomMembership::Member;
 
@@ -268,7 +269,7 @@ mod tests {
         &mut bundle.context,
         RoomEvent::JoinRequest("bleep".to_string()),
       )
-      .unwrap_err();
+      .expect_err("handling request");
 
     // Room state has not changed.
     assert_eq!(
@@ -288,7 +289,7 @@ mod tests {
   }
 
   #[test]
-  fn handle_room_join_request_success() {
+  fn handle_join_request_success() {
     let mut options = ContextOptions::default();
     options.initial_state.rooms.insert(
       "bleep".to_string(),
@@ -303,7 +304,10 @@ mod tests {
       )
       .expect("handling request");
 
-    let request = bundle.server_request_rx.blocking_recv().unwrap();
+    let request = bundle
+      .server_request_rx
+      .blocking_recv()
+      .expect("receiving request");
 
     // Room state has been altered to reflect the request.
     assert_eq!(
@@ -377,9 +381,12 @@ mod tests {
 
     RoomEventHandler
       .handle(&mut bundle.context, RoomEvent::ListRequest)
-      .unwrap();
+      .expect("handling request");
 
-    let request = bundle.server_request_rx.blocking_recv().unwrap();
+    let request = bundle
+      .server_request_rx
+      .blocking_recv()
+      .expect("receving request");
 
     assert_eq!(request, ServerRequest::RoomListRequest);
   }
@@ -411,9 +418,12 @@ mod tests {
 
     RoomEventHandler
       .handle(&mut bundle.context, RoomEvent::ListRequest)
-      .unwrap();
+      .expect("handling request");
 
-    let response = bundle.control_response_rx.blocking_recv().unwrap();
+    let response = bundle
+      .control_response_rx
+      .blocking_recv()
+      .expect("receiving response");
 
     let mut rooms = match response {
       control::Response::RoomListResponse(control::RoomListResponse {