Skip to content

Commit

Permalink
Use namespaced includes in test code as well
Browse files Browse the repository at this point in the history
This is necessary in order to also allow enforcing namespaced includes
in embedded/inline builds of libQuotient and is cleaner to do that way
then to manually mess with include search paths just for the tests.
  • Loading branch information
vkrause committed Apr 23, 2023
1 parent 7cd3440 commit dd5ee7d
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion autotests/callcandidateseventtest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: LGPL-2.1-or-later

#include "events/callevents.h"
#include <Quotient/events/callevents.h>

#include <QtTest/QtTest>

Expand Down
2 changes: 1 addition & 1 deletion autotests/testfilecrypto.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "testfilecrypto.h"

#include "events/filesourceinfo.h"
#include <Quotient/events/filesourceinfo.h>

#include <qtest.h>

Expand Down
4 changes: 2 additions & 2 deletions autotests/testgroupsession.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// SPDX-License-Identifier: LGPL-2.1-or-later

#include "testgroupsession.h"
#include "e2ee/qolminboundsession.h"
#include "e2ee/qolmoutboundsession.h"
#include <Quotient/e2ee/qolminboundsession.h>
#include <Quotient/e2ee/qolmoutboundsession.h>

using namespace Quotient;

Expand Down
2 changes: 1 addition & 1 deletion autotests/testkeyverification.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <QTest>
#include "testutils.h"
#include <QtCore/QDateTime>
#include <e2ee/qolmaccount.h>
#include <Quotient/e2ee/qolmaccount.h>
#include "olm/sas.h"

class TestKeyVerificationSession : public QObject
Expand Down
16 changes: 8 additions & 8 deletions autotests/testolmaccount.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

#include "testolmaccount.h"

#include <connection.h>
#include <csapi/joining.h>
#include <e2ee/qolmaccount.h>
#include <e2ee/qolmutility.h>
#include <events/encryptionevent.h>
#include <events/filesourceinfo.h>
#include <networkaccessmanager.h>
#include <room.h>
#include <Quotient/connection.h>
#include <Quotient/csapi/joining.h>
#include <Quotient/e2ee/qolmaccount.h>
#include <Quotient/e2ee/qolmutility.h>
#include <Quotient/events/encryptionevent.h>
#include <Quotient/events/filesourceinfo.h>
#include <Quotient/networkaccessmanager.h>
#include <Quotient/room.h>

#include "testutils.h"

Expand Down
4 changes: 2 additions & 2 deletions autotests/testolmsession.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
//
// SPDX-License-Identifier: LGPL-2.1-or-later

#include "e2ee/qolmsession.h"
#include "e2ee/qolmaccount.h"
#include <Quotient/e2ee/qolmsession.h>
#include <Quotient/e2ee/qolmaccount.h>
#include "testolmsession.h"

using namespace Quotient;
Expand Down
4 changes: 2 additions & 2 deletions autotests/testolmutility.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// SPDX-License-Identifier: LGPL-2.1-or-later

#include "testolmutility.h"
#include "e2ee/qolmaccount.h"
#include "e2ee/qolmutility.h"
#include <Quotient/e2ee/qolmaccount.h>
#include <Quotient/e2ee/qolmutility.h>

#include <olm/olm.h>

Expand Down
4 changes: 2 additions & 2 deletions autotests/testutils.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#pragma once

#include <connection.h>
#include <networkaccessmanager.h>
#include <Quotient/connection.h>
#include <Quotient/networkaccessmanager.h>

#include <QtTest/QSignalSpy>

Expand Down
2 changes: 1 addition & 1 deletion autotests/utiltests.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: 2021 Kitsune Ral <[email protected]>
// SPDX-License-Identifier: LGPL-2.1-or-later

#include "omittable.h"
#include <Quotient/omittable.h>

#include <QtTest/QtTest>

Expand Down
30 changes: 15 additions & 15 deletions quotest/quotest.cpp
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
// SPDX-FileCopyrightText: 2016 Kitsune Ral <[email protected]>
// SPDX-License-Identifier: LGPL-2.1-or-later

#include "connection.h"
#include "room.h"
#include "user.h"
#include "uriresolver.h"
#include "networkaccessmanager.h"
#include "qt_connection_util.h"

#include "csapi/joining.h"
#include "csapi/leaving.h"
#include "csapi/room_send.h"

#include "events/reactionevent.h"
#include "events/redactionevent.h"
#include "events/simplestateevents.h"
#include "events/roommemberevent.h"
#include <Quotient/connection.h>
#include <Quotient/room.h>
#include <Quotient/user.h>
#include <Quotient/uriresolver.h>
#include <Quotient/networkaccessmanager.h>
#include <Quotient/qt_connection_util.h>

#include <Quotient/csapi/joining.h>
#include <Quotient/csapi/leaving.h>
#include <Quotient/csapi/room_send.h>

#include <Quotient/events/reactionevent.h>
#include <Quotient/events/redactionevent.h>
#include <Quotient/events/simplestateevents.h>
#include <Quotient/events/roommemberevent.h>

#include <QtTest/QSignalSpy>
#include <QtCore/QCoreApplication>
Expand Down

0 comments on commit dd5ee7d

Please sign in to comment.