From 70846cf880c2b2e6dc9aa225aa3fb0e86ca04568 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Fri, 8 Jan 2021 07:41:37 +0100
Subject: quotest: use the target room for loadMembers test

Now that we've crowded it with a few synthetic users, lazy-loading of
members doesn't some other room to get tested. Bonus:
Connection::roomByAlias() has its own very simple test now.

(cherry picked from commit d09383d5dc7379c534860b5a66467a32d6adc932)
---
 tests/quotest.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/quotest.cpp b/tests/quotest.cpp
index 7ab7365f..98c01cfc 100644
--- a/tests/quotest.cpp
+++ b/tests/quotest.cpp
@@ -91,6 +91,7 @@ public slots:
     void doTest(const QByteArray& testName);
 
 private slots:
+    TEST_DECL(findRoomByAlias)
     TEST_DECL(loadMembers)
     TEST_DECL(sendMessage)
     TEST_DECL(sendReaction)
@@ -306,26 +307,25 @@ void TestManager::doTests()
             });
 }
 
+TEST_IMPL(findRoomByAlias)
+{
+    auto* roomByAlias = connection()->roomByAlias(targetRoom->canonicalAlias(),
+                                        JoinState::Join);
+    FINISH_TEST(roomByAlias == targetRoom);
+}
+
 TEST_IMPL(loadMembers)
 {
-    // Trying to load members from another (larger) room
-    const auto& testRoomAlias = QStringLiteral("#test:matrix.org");
-    auto* r = connection()->roomByAlias(testRoomAlias, JoinState::Join);
-    if (!r) {
-        clog << testRoomAlias.toStdString()
-             << " is not found in the test user's rooms" << endl;
-        FAIL_TEST();
-    }
     // It's not exactly correct because an arbitrary server might not support
     // lazy loading; but in the absence of capabilities framework we assume
     // it does.
-    if (r->users().size() >= r->joinedCount()) {
+    if (targetRoom->users().size() >= targetRoom->joinedCount()) {
         clog << "Lazy loading doesn't seem to be enabled" << endl;
         FAIL_TEST();
     }
-    r->setDisplayed();
-    connect(r, &Room::allMembersLoaded, this, [this, thisTest, r] {
-        FINISH_TEST(r->users().size() >= r->joinedCount());
+    targetRoom->setDisplayed();
+    connect(targetRoom, &Room::allMembersLoaded, this, [this, thisTest] {
+        FINISH_TEST(targetRoom->users().size() >= targetRoom->joinedCount());
     });
     return false;
 }
-- 
cgit v1.2.3