Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tests #6596

Merged
merged 3 commits into from
Apr 22, 2024
Merged

Fix tests #6596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a9de18
pushnotification testutils: Bind only to LocalHost
pyromaniac2k Mar 30, 2024
d0097ce
SyncConfilctsModel test: use FakeAccountState
pyromaniac2k Mar 30, 2024
a5a3132
UserStatusDialog.cpp: Fix timezone
pyromaniac2k Mar 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/pushnotificationstestutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <QLoggingCategory>

Check failure on line 1 in test/pushnotificationstestutils.cpp

View workflow job for this annotation

GitHub Actions / build

test/pushnotificationstestutils.cpp:1:10 [clang-diagnostic-error] 

'QLoggingCategory' file not found
#include <QSignalSpy>
#include <QTest>
#include <cstdint>
Expand All @@ -13,7 +13,7 @@
: QObject(parent)
, _webSocketServer(new QWebSocketServer(QStringLiteral("Fake Server"), QWebSocketServer::NonSecureMode, this))
{
if (!_webSocketServer->listen(QHostAddress::Any, port)) {
if (!_webSocketServer->listen(QHostAddress::LocalHost, port)) {
Q_UNREACHABLE();
}
connect(_webSocketServer, &QWebSocketServer::newConnection, this, &FakeWebSocketServer::onNewConnection);
Expand Down
2 changes: 1 addition & 1 deletion test/testsetuserstatusdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* for more details.
*/

#include "userstatusconnector.h"

Check failure on line 15 in test/testsetuserstatusdialog.cpp

View workflow job for this annotation

GitHub Actions / build

test/testsetuserstatusdialog.cpp:15:10 [clang-diagnostic-error] 

'userstatusconnector.h' file not found
#include "userstatusselectormodel.h"

#include <QTest>
Expand Down Expand Up @@ -187,7 +187,7 @@
private slots:
void testCtor_fetchStatusAndPredefinedStatuses()
{
const QDateTime currentDateTime(QDateTime::currentDateTime());
const QDateTime currentDateTime(QDateTime::currentDateTimeUtc());

const QString userStatusId("fake-id");
const QString userStatusMessage("Some status");
Expand Down
4 changes: 2 additions & 2 deletions test/testsyncconflictsmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*

Check notice on line 1 in test/testsyncconflictsmodel.cpp

View workflow job for this annotation

GitHub Actions / build

Run clang-format on test/testsyncconflictsmodel.cpp 

File test/testsyncconflictsmodel.cpp does not conform to Custom style guidelines. (lines 70)
* Copyright (C) by Claudio Cambra <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
Expand All @@ -12,7 +12,7 @@
* for more details.
*/

#include "gui/syncconflictsmodel.h"

Check failure on line 15 in test/testsyncconflictsmodel.cpp

View workflow job for this annotation

GitHub Actions / build

test/testsyncconflictsmodel.cpp:15:10 [clang-diagnostic-error] 

'gui/syncconflictsmodel.h' file not found
#include "folderman.h"
#include "accountstate.h"
#include "configfile.h"
Expand Down Expand Up @@ -61,13 +61,13 @@
FolderMan fm;

auto account = Account::create();
auto url = QUrl{"http://example.de"};
auto url = QUrl{"http://example.com"};
auto cred = new HttpCredentialsTest("testuser", "secret");
account->setCredentials(cred);
account->setUrl(url);
url.setUserName(cred->user());

auto newAccountState{AccountStatePtr{ new AccountState{account}}};
auto newAccountState{AccountStatePtr{ new FakeAccountState{account}}};
auto folderman = FolderMan::instance();
QCOMPARE(folderman, &fm);

Expand Down
Loading