ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix building room test on windows

Browse Source 
Making protected public seems to mess things up
This commit is contained in:
Tobias Fella
2023-01-04 13:58:05 +01:00
parent fa6f451e11
commit 7137a5808f
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
autotests/neochatroomtest.cpp
View File

@@ -5,9 +5,7 @@
#include <QSignalSpy> #include <QSignalSpy>
#include <QTest> #include <QTest>
#define protected public // please don't hate me
#include "neochatroom.h" #include "neochatroom.h"
#undef protected
#include <connection.h> #include <connection.h>
#include <quotient_common.h> #include <quotient_common.h>
@@ -15,12 +13,23 @@
using namespace Quotient; using namespace Quotient;
class TestRoom : public NeoChatRoom
{
public:
using NeoChatRoom::NeoChatRoom;
void update(SyncRoomData &&data, bool fromCache = false)
{
Room::updateData(std::move(data), fromCache);
}
};
class NeoChatRoomTest : public QObject { class NeoChatRoomTest : public QObject {
Q_OBJECT Q_OBJECT
private: private:
Connection *connection = nullptr; Connection *connection = nullptr;
NeoChatRoom *room = nullptr; TestRoom *room = nullptr;
private Q_SLOTS: private Q_SLOTS:
void initTestCase(); void initTestCase();
@@ -31,7 +40,7 @@ private Q_SLOTS:
void NeoChatRoomTest::initTestCase() void NeoChatRoomTest::initTestCase()
{ {
connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org")); connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
room = new NeoChatRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join); room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
auto json = QJsonDocument::fromJson(R"EVENT({ auto json = QJsonDocument::fromJson(R"EVENT({
"account_data": { "account_data": {
@@ -121,7 +130,7 @@ void NeoChatRoomTest::initTestCase()
} }
})EVENT"); })EVENT");
SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, json.object()); SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, json.object());
room->updateData(std::move(roomData)); room->update(std::move(roomData));
} }
void NeoChatRoomTest::subtitleTextTest() void NeoChatRoomTest::subtitleTextTest()