summaryrefslogtreecommitdiffstats
path: root/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp')
-rw-r--r--tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp57
1 files changed, 16 insertions, 41 deletions
diff --git a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp
index 5caea5b14d..35e3471bbe 100644
--- a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp
+++ b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QTest>
#include <QTestEventLoop>
@@ -134,20 +109,20 @@ void tst_QDBusLocalCalls::makeInvalidCalls()
QDBusMessage callMsg = QDBusMessage::createMethodCall(conn.baseService(),
"/", QString(), "echo");
QDBusMessage replyMsg = doCall(callMsg);
- QCOMPARE(int(replyMsg.type()), int(QDBusMessage::ErrorMessage));
+ QCOMPARE(replyMsg.type(), QDBusMessage::ErrorMessage);
QDBusError error(replyMsg);
- QCOMPARE(int(error.type()), int(QDBusError::UnknownMethod));
+ QCOMPARE(error.type(), QDBusError::UnknownMethod);
}
{
QDBusMessage callMsg = QDBusMessage::createMethodCall(conn.baseService(),
"/no_object", QString(), "echo");
QDBusMessage replyMsg = doCall(callMsg);
- QCOMPARE(int(replyMsg.type()), int(QDBusMessage::ErrorMessage));
+ QCOMPARE(replyMsg.type(), QDBusMessage::ErrorMessage);
QDBusError error(replyMsg);
- QCOMPARE(int(error.type()), int(QDBusError::UnknownObject));
+ QCOMPARE(error.type(), QDBusError::UnknownObject);
}
}
@@ -159,10 +134,10 @@ void tst_QDBusLocalCalls::makeCalls()
callMsg << value;
QDBusMessage replyMsg = doCall(callMsg);
- QCOMPARE(int(replyMsg.type()), int(QDBusMessage::ReplyMessage));
+ QCOMPARE(replyMsg.type(), QDBusMessage::ReplyMessage);
QVariantList replyArgs = replyMsg.arguments();
- QCOMPARE(replyArgs.count(), 1);
+ QCOMPARE(replyArgs.size(), 1);
QCOMPARE(replyArgs.at(0), value);
}
@@ -174,10 +149,10 @@ void tst_QDBusLocalCalls::makeCallsVariant()
callMsg << QVariant::fromValue(QDBusVariant(value));
QDBusMessage replyMsg = doCall(callMsg);
- QCOMPARE(int(replyMsg.type()), int(QDBusMessage::ReplyMessage));
+ QCOMPARE(replyMsg.type(), QDBusMessage::ReplyMessage);
QVariantList replyArgs = replyMsg.arguments();
- QCOMPARE(replyArgs.count(), 1);
+ QCOMPARE(replyArgs.size(), 1);
const QVariant &reply = replyArgs.at(0);
QCOMPARE(reply.userType(), qMetaTypeId<QDBusVariant>());
@@ -191,10 +166,10 @@ void tst_QDBusLocalCalls::makeCallsTwoRets()
callMsg << (QStringList() << "One" << "Two");
QDBusMessage replyMsg = doCall(callMsg);
- QCOMPARE(int(replyMsg.type()), int(QDBusMessage::ReplyMessage));
+ QCOMPARE(replyMsg.type(), QDBusMessage::ReplyMessage);
QVariantList replyArgs = replyMsg.arguments();
- QCOMPARE(replyArgs.count(), 2);
+ QCOMPARE(replyArgs.size(), 2);
QCOMPARE(replyArgs.at(0).toString(), QString::fromLatin1("One"));
QCOMPARE(replyArgs.at(1).toString(), QString::fromLatin1("Two"));
}
@@ -211,10 +186,10 @@ void tst_QDBusLocalCalls::makeCallsComplex()
callMsg << QVariant::fromValue(value);
QDBusMessage replyMsg = doCall(callMsg);
- QCOMPARE(int(replyMsg.type()), int(QDBusMessage::ReplyMessage));
+ QCOMPARE(replyMsg.type(), QDBusMessage::ReplyMessage);
QVariantList replyArgs = replyMsg.arguments();
- QCOMPARE(replyArgs.count(), 1);
+ QCOMPARE(replyArgs.size(), 1);
const QVariant &reply = replyArgs.at(0);
QCOMPARE(reply.userType(), qMetaTypeId<QDBusArgument>());
QCOMPARE(qdbus_cast<QList<int> >(reply), value);
@@ -226,10 +201,10 @@ void tst_QDBusLocalCalls::makeDelayedCalls()
"/", QString(), "delayed");
QTest::ignoreMessage(QtWarningMsg, "QDBusConnection: cannot call local method 'delayed' at object / (with signature '') on blocking mode");
QDBusMessage replyMsg = doCall(callMsg);
- QCOMPARE(int(replyMsg.type()), int(QDBusMessage::ErrorMessage));
+ QCOMPARE(replyMsg.type(), QDBusMessage::ErrorMessage);
QDBusError error(replyMsg);
- QCOMPARE(int(error.type()), int(QDBusError::InternalError));
+ QCOMPARE(error.type(), QDBusError::InternalError);
}
void tst_QDBusLocalCalls::asyncReplySignal()