Cleanup weird test

Author: alan-george-lk

src/tests/unit/test_room.cpp

@@ -91,65 +91,6 @@ class UnitDisconnectTrackingDelegate : public RoomDelegate {
 
 } // namespace
 
-TEST_F(RoomTest, ServerDisconnectTearsDownRoomAndRemovesListener) {
-  Room room;
-  UnitDisconnectTrackingDelegate delegate;
-  std::atomic<int> listener_calls{0};
-  room.setDelegate(&delegate);
-  RoomTestAccess::installConnectedListener(room, listener_calls);
-
-  proto::FfiEvent event;
-  auto* room_event = event.mutable_room_event();
-  room_event->set_room_handle(0);
-  room_event->mutable_disconnected()->set_reason(proto::ROOM_DELETED);
-
-  emitFfiEvent(event);
-
-  EXPECT_EQ(listener_calls.load(std::memory_order_relaxed), 1);
-  EXPECT_EQ(room.connectionState(), ConnectionState::Disconnected);
-  EXPECT_FALSE(RoomTestAccess::hasRoomHandle(room));
-  EXPECT_EQ(RoomTestAccess::listenerId(room), 0);
-  EXPECT_EQ(delegate.count, 1);
-  EXPECT_EQ(delegate.reason, DisconnectReason::RoomDeleted);
-
-  emitFfiEvent(event);
-  EXPECT_EQ(listener_calls.load(std::memory_order_relaxed), 1) << "server disconnect must unregister the Room listener";
-  EXPECT_EQ(delegate.count, 1) << "server disconnect must notify the delegate exactly once";
-  EXPECT_FALSE(room.disconnect()) << "disconnect after server shutdown must be a no-op";
-}
-
-TEST_F(RoomTest, ConnectAllowedAfterServerDisconnectShutdown) {
-  Room room;
-  UnitDisconnectTrackingDelegate delegate;
-  std::atomic<int> listener_calls{0};
-  room.setDelegate(&delegate);
-  RoomTestAccess::installConnectedListener(room, listener_calls);
-
-  proto::FfiEvent event;
-  auto* room_event = event.mutable_room_event();
-  room_event->set_room_handle(0);
-  room_event->mutable_disconnected()->set_reason(proto::ROOM_DELETED);
-  emitFfiEvent(event);
-
-  ASSERT_EQ(room.connectionState(), ConnectionState::Disconnected);
-  ASSERT_TRUE(RoomTestAccess::shutdownStarted(room));
-  ASSERT_EQ(delegate.count, 1);
-
-  // Room::connect() clears shutdown_started_ before FFI work; mirror that reset and run a
-  // second synthetic connection cycle to prove the Room is reusable after server shutdown.
-  RoomTestAccess::clearShutdownForReconnect(room);
-  EXPECT_FALSE(RoomTestAccess::shutdownStarted(room));
-
-  listener_calls.store(0, std::memory_order_relaxed);
-  RoomTestAccess::installConnectedListener(room, listener_calls);
-  emitFfiEvent(event);
-
-  EXPECT_EQ(listener_calls.load(std::memory_order_relaxed), 1);
-  EXPECT_EQ(delegate.count, 2) << "second connection cycle should notify onDisconnected again";
-  EXPECT_EQ(RoomTestAccess::listenerId(room), 0);
-  EXPECT_TRUE(RoomTestAccess::shutdownStarted(room));
-}
-
 TEST_F(RoomTest, ConnectWithoutInitialize) {
   // Test fixture initializes by default, do this to emulate lack of initialization
   livekit::shutdown();
@@ -396,4 +337,31 @@ TEST_F(RoomTest, RemoteParticipantLookupBeforeConnect) {
       << "Looking up participant before connect should return an empty handle";
 }
 
+TEST_F(RoomTest, ServerDisconnectTearsDownRoomAndRemovesListener) {
+  Room room;
+  UnitDisconnectTrackingDelegate delegate;
+  std::atomic<int> listener_calls{0};
+  room.setDelegate(&delegate);
+  RoomTestAccess::installConnectedListener(room, listener_calls);
+
+  proto::FfiEvent event;
+  auto* room_event = event.mutable_room_event();
+  room_event->set_room_handle(0);
+  room_event->mutable_disconnected()->set_reason(proto::ROOM_DELETED);
+
+  emitFfiEvent(event);
+
+  EXPECT_EQ(listener_calls.load(std::memory_order_relaxed), 1);
+  EXPECT_EQ(room.connectionState(), ConnectionState::Disconnected);
+  EXPECT_FALSE(RoomTestAccess::hasRoomHandle(room));
+  EXPECT_EQ(RoomTestAccess::listenerId(room), 0);
+  EXPECT_EQ(delegate.count, 1);
+  EXPECT_EQ(delegate.reason, DisconnectReason::RoomDeleted);
+
+  emitFfiEvent(event);
+  EXPECT_EQ(listener_calls.load(std::memory_order_relaxed), 1) << "server disconnect must unregister the Room listener";
+  EXPECT_EQ(delegate.count, 1) << "server disconnect must notify the delegate exactly once";
+  EXPECT_FALSE(room.disconnect()) << "disconnect after server shutdown must be a no-op";
+}
+
 } // namespace livekit::test