2 files changed, 53 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp
index e45bcae..31c9be9 100644
--- a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp
+++ b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp
@@ -89,6 +89,7 @@ class ChatsManagerTest : public CppUnit::TestFixture {
     CPPUNIT_TEST(testChatControllerHighlightingNotificationTesting);
     CPPUNIT_TEST(testChatControllerHighlightingNotificationDeduplicateSounds);
     CPPUNIT_TEST(testChatControllerMeMessageHandling);
+	CPPUNIT_TEST(testRestartingMUCComponentCrash);
     CPPUNIT_TEST(testChatControllerMeMessageHandlingInMUC);
 
     // Carbons tests
@@ -822,6 +823,54 @@ public:
         CPPUNIT_ASSERT_EQUAL(std::string("is feeling delighted."), window->bodyFromMessage(window->lastAddedAction_));
     }
 
+   void testRestartingMUCComponentCrash() {
+        JID mucJID = JID("teaparty@rooms.wonderland.lit");
+        JID self = JID("girl@wonderland.lit/rabbithole");
+        std::string nick = "aLiCe";
+
+        MockChatWindow* window;
+
+        auto genRemoteMUCPresence = [=]() {
+            auto presence = Presence::create();
+            presence->setFrom(mucJID.withResource(nick));
+            presence->setTo(self);
+            return presence;
+        };
+
+        // User rejoins.
+        window = new MockChatWindow();
+        mocks_->ExpectCall(chatWindowFactory_, ChatWindowFactory::createChatWindow).With(mucJID, uiEventStream_).Return(window);
+
+        // Join room
+        {
+            auto joinRoomEvent = std::make_shared<JoinMUCUIEvent>(mucJID, boost::optional<std::string>(), nick);
+            uiEventStream_->send(joinRoomEvent);
+        }
+
+        {
+            auto firstPresence = genRemoteMUCPresence();
+            firstPresence->setType(Presence::Unavailable);
+            auto userPayload = std::make_shared<MUCUserPayload>();
+            userPayload->addItem(MUCItem(MUCOccupant::Owner, MUCOccupant::NoRole));
+            firstPresence->addPayload(userPayload);
+            stanzaChannel_->onPresenceReceived(firstPresence);
+        }
+        CPPUNIT_ASSERT_EQUAL(std::string("Couldn't enter room: Unable to enter this room."), MockChatWindow::bodyFromMessage(window->lastAddedErrorMessage_));
+
+        {
+            auto presence = genRemoteMUCPresence();
+            presence->setType(Presence::Unavailable);
+            auto userPayload = std::make_shared<MUCUserPayload>();
+            userPayload->addStatusCode(303);
+            auto item = MUCItem(MUCOccupant::Owner, self, MUCOccupant::Moderator);
+            item.nick = nick;
+            userPayload->addItem(item);
+            userPayload->addStatusCode(110);
+            presence->addPayload(userPayload);
+            stanzaChannel_->onPresenceReceived(presence);
+        }
+    }
+
     void testChatControllerMeMessageHandlingInMUC() {
         JID mucJID("mucroom@rooms.test.com");
         std::string nickname = "toodles";
diff --git a/Swift/Controllers/UnitTest/MockChatWindow.h b/Swift/Controllers/UnitTest/MockChatWindow.h
index d7942ff..054cd31 100644
--- a/Swift/Controllers/UnitTest/MockChatWindow.h
+++ b/Swift/Controllers/UnitTest/MockChatWindow.h
@@ -40,7 +40,9 @@ namespace Swift {
                 lastAddedPresence_ = message;
             }
 
-            virtual void addErrorMessage(const ChatMessage& /*message*/) {}
+            virtual void addErrorMessage(const ChatMessage& message) {
+                lastAddedErrorMessage_ = message;
+            }
             virtual void replaceMessage(const ChatMessage& /*message*/, const std::string& /*id*/, const boost::posix_time::ptime& /*time*/) {}
             virtual void replaceWithAction(const ChatMessage& /*message*/, const std::string& /*id*/, const boost::posix_time::ptime& /*time*/) {}
             virtual void replaceLastMessage(const ChatMessage& message, const TimestampBehaviour /*timestampBehaviour*/) {
@@ -134,6 +136,7 @@ namespace Swift {
             ChatMessage lastReplacedMessage_;
             ChatMessage lastAddedSystemMessage_;
             ChatMessage lastReplacedSystemMessage_;
+			ChatMessage lastAddedErrorMessage_;
             JID lastMUCInvitationJID_;
             std::vector<SecurityLabelsCatalog::Item> labels_;
             bool labelsEnabled_;