From a8e8f1cd39e846941de544c7791e1ab6398a335b Mon Sep 17 00:00:00 2001 From: Alexey Rusakov Date: Mon, 25 Jan 2021 10:33:25 +0100 Subject: Collapse the autotest entirely in *.cpp file Otherwise CMake's automoc complains that it doesn't see a moc-able class definition in the file that includes "*.moc". --- autotests/callcandidateseventtest.cpp | 11 ++++++++++- autotests/callcandidateseventtest.h | 13 ------------- 2 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 autotests/callcandidateseventtest.h (limited to 'autotests') diff --git a/autotests/callcandidateseventtest.cpp b/autotests/callcandidateseventtest.cpp index f103e4d3..39e6a116 100644 --- a/autotests/callcandidateseventtest.cpp +++ b/autotests/callcandidateseventtest.cpp @@ -3,7 +3,16 @@ // SPDX-License-Identifier: LGPL-2.1-or-later #include "events/callcandidatesevent.h" -#include "callcandidateseventtest.h" + +#include + +class TestCallCandidatesEvent : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void fromJson(); +}; void TestCallCandidatesEvent::fromJson() { diff --git a/autotests/callcandidateseventtest.h b/autotests/callcandidateseventtest.h deleted file mode 100644 index b81c9c9b..00000000 --- a/autotests/callcandidateseventtest.h +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-FileCopyrightText: 2020 Carl Schwan -// -// SPDX-License-Identifier: LGPL-2.1-or-later - -#include - -class TestCallCandidatesEvent : public QObject -{ - Q_OBJECT - -private Q_SLOTS: - void fromJson(); -}; -- cgit v1.2.3 From f621367f0706ae3093eedb8cf0d068c34acee6ea Mon Sep 17 00:00:00 2001 From: Alexey Rusakov Date: Mon, 25 Jan 2021 10:35:39 +0100 Subject: Autotests: make sure types passed to QCOMPARE are the same The current test may fail with "undefined reference" errors discussed at https://stackoverflow.com/questions/14198972/undefined-symbols-for-qcompare. --- autotests/callcandidateseventtest.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'autotests') diff --git a/autotests/callcandidateseventtest.cpp b/autotests/callcandidateseventtest.cpp index 39e6a116..1a69cb66 100644 --- a/autotests/callcandidateseventtest.cpp +++ b/autotests/callcandidateseventtest.cpp @@ -43,13 +43,14 @@ void TestCallCandidatesEvent::fromJson() Quotient::CallCandidatesEvent callCandidatesEvent(object); QCOMPARE(callCandidatesEvent.version(), 0); - QCOMPARE(callCandidatesEvent.callId(), "12345"); + QCOMPARE(callCandidatesEvent.callId(), QStringLiteral("12345")); QCOMPARE(callCandidatesEvent.candidates().count(), 1); const QJsonObject &candidate = callCandidatesEvent.candidates().at(0).toObject(); - QCOMPARE(candidate.value("sdpMid").toString(), "audio"); + QCOMPARE(candidate.value("sdpMid").toString(), QStringLiteral("audio")); QCOMPARE(candidate.value("sdpMLineIndex").toInt(), 0); - QCOMPARE(candidate.value("candidate").toString(), "candidate:863018703 1 udp 2122260223 10.9.64.156 43670 typ host generation 0"); + QCOMPARE(candidate.value("candidate").toString(), + QStringLiteral("candidate:863018703 1 udp 2122260223 10.9.64.156 43670 typ host generation 0")); } QTEST_MAIN(TestCallCandidatesEvent) -- cgit v1.2.3