qt 6.5.1 original

tests/auto/tools/qdbuscpp2xml/CMakeLists.txt

@@ -0,0 +1,27 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## tst_qdbuscpp2xml Test:
+#####################################################################
+
+qt_internal_add_test(tst_qdbuscpp2xml
+    SOURCES
+        test1.h
+        tst_qdbuscpp2xml.cpp
+    LIBRARIES
+        Qt::DBus
+)
+
+# Resources:
+set(qdbuscpp2xml_resource_files
+    "test1.h"
+)
+
+qt_internal_add_resource(tst_qdbuscpp2xml "qdbuscpp2xml"
+    PREFIX
+        "/tst_qdbuscpp2xml/"
+    FILES
+        ${qdbuscpp2xml_resource_files}
+)
+

tests/auto/tools/qdbuscpp2xml/test1.h

@@ -0,0 +1,102 @@
+// Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#ifndef QDBUSCPP2XML_TEST1_H
+#define QDBUSCPP2XML_TEST1_H
+
+#include <QObject>
+#include <QtDBus/QDBusSignature>
+#include <QtDBus/QDBusObjectPath>
+#include <QtDBus/QDBusUnixFileDescriptor>
+
+class Test1 : public QObject
+{
+    Q_OBJECT
+    Q_MOC_INCLUDE(<QtDBus/qdbusextratypes.h>)
+    Q_MOC_INCLUDE(<QtDBus/qdbusunixfiledescriptor.h>)
+    Q_CLASSINFO("D-Bus Interface", "org.qtProject.qdbuscpp2xmlTests.Test1")
+    Q_PROPERTY(int numProperty1 READ numProperty1 CONSTANT)
+    Q_PROPERTY(int numProperty2 READ numProperty2 WRITE setNumProperty2)
+    Q_ENUMS(Salaries)
+public:
+    // C++1y allows use of single quote as a digit separator, useful for large
+    // numbers. http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3781.pdf
+    // Ensure that qdbuscpp2xml does not get confused with this appearing.
+    enum Salaries {
+        Steve
+#ifdef Q_MOC_RUN
+        = 1'234'567
+#endif
+    };
+
+    Test1(QObject *parent = nullptr) : QObject(parent) {}
+
+    int numProperty1() { return 42; }
+
+    int numProperty2() { return 42; }
+    void setNumProperty2(int) {}
+
+signals:
+    void signalVoidType();
+    int signalIntType();
+    void signal_primitive_args(int a1, bool a2, short a3, ushort a4, uint a5, qlonglong a6, double a7, qlonglong a8 = 0);
+    void signal_string_args(const QByteArray &ba, const QString &a2);
+    void signal_Qt_args1(const QDate &a1, const QTime &a2, const QDateTime &a3,
+        const QRect &a4, const QRectF &a5, const QSize &a6, const QSizeF &a7);
+    void signal_Qt_args2(const QPoint &a1, const QPointF &a2, const QLine &a3, const QLineF &a4,
+        const QVariantList &a5, const QVariantMap &a6, const QVariantHash &a7);
+
+    void signal_QDBus_args(const QDBusObjectPath &a1, const QDBusSignature &a2, const QDBusUnixFileDescriptor &a3);
+
+    void signal_container_args1(const QList<bool> &a1, const QList<short> &a2, const QList<ushort> &a3, const QList<int> &a4, const QList<uint> &a5);
+    void signal_container_args2(const QList<qlonglong> &a1, const QList<qulonglong> &a2, const QList<double> &a3, const QList<QDBusObjectPath> &a4, const QList<QDBusSignature> &a5, const QList<QDBusUnixFileDescriptor> &a6);
+
+    Q_SCRIPTABLE void signalVoidType_scriptable();
+    Q_SCRIPTABLE int signalIntType_scriptable();
+    Q_SCRIPTABLE void signal_primitive_args_scriptable(int a1, bool a2, short a3, ushort a4, uint a5, qlonglong a6, double a7, qlonglong a8 = 0);
+    Q_SCRIPTABLE void signal_string_args_scriptable(const QByteArray &ba, const QString &a2);
+    Q_SCRIPTABLE void signal_Qt_args1_scriptable(const QDate &a1, const QTime &a2, const QDateTime &a3,
+        const QRect &a4, const QRectF &a5, const QSize &a6, const QSizeF &a7);
+    Q_SCRIPTABLE void signal_Qt_args2_scriptable(const QPoint &a1, const QPointF &a2, const QLine &a3, const QLineF &a4,
+        const QVariantList &a5, const QVariantMap &a6, const QVariantHash &a7);
+
+    Q_SCRIPTABLE void signal_QDBus_args_scriptable(const QDBusObjectPath &a1, const QDBusSignature &a2, const QDBusUnixFileDescriptor &a3);
+
+    Q_SCRIPTABLE void signal_container_args1_scriptable(const QList<bool> &a1, const QList<short> &a2, const QList<ushort> &a3, const QList<int> &a4, const QList<uint> &a5);
+    Q_SCRIPTABLE void signal_container_args2_scriptable(const QList<qlonglong> &a1, const QList<qulonglong> &a2, const QList<double> &a3, const QList<QDBusObjectPath> &a4, const QList<QDBusSignature> &a5, const QList<QDBusUnixFileDescriptor> &a6);
+
+public slots:
+    void slotVoidType() {}
+    int slotIntType() { return 42; }
+
+    Q_SCRIPTABLE void slotVoidType_scriptable() {}
+    Q_SCRIPTABLE int slotIntType_scriptable() { return 42; }
+
+protected slots:
+    void neverExported1() {}
+    int neverExported2() { return 42; }
+
+    Q_SCRIPTABLE void neverExported3() {}
+    Q_SCRIPTABLE int neverExported4() { return 42; }
+
+private slots:
+    void neverExported5() {}
+    int neverExported6() { return 42; }
+
+    Q_SCRIPTABLE void neverExported7() {}
+    Q_SCRIPTABLE int neverExported8() { return 42; }
+
+public:
+    Q_SCRIPTABLE void methodVoidType() {}
+    Q_SCRIPTABLE int methodIntType() { return 42; }
+
+protected:
+    Q_SCRIPTABLE void neverExported9() {}
+    Q_SCRIPTABLE int neverExported10() { return 42; }
+
+private:
+    Q_SCRIPTABLE void neverExported11() {}
+    Q_SCRIPTABLE int neverExported12() { return 42; }
+};
+
+#endif

tests/auto/tools/qdbuscpp2xml/tst_qdbuscpp2xml.cpp

@@ -0,0 +1,146 @@
+// Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include <QTest>
+#include <QLibraryInfo>
+#include <QProcess>
+
+#include "test1.h"
+
+#include <QtDBus/QDBusConnection>
+
+// in qdbusxmlgenerator.cpp
+QT_BEGIN_NAMESPACE
+extern Q_DBUS_EXPORT QString qDBusGenerateMetaObjectXml(QString interface,
+                                                        const QMetaObject *mo,
+                                                        const QMetaObject *base,
+                                                        int flags);
+QT_END_NAMESPACE
+
+static QString addXmlHeader(const QString &input)
+{
+    return
+    "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\" \"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n<node>"
+      + (input.isEmpty() ? QString() : QString("\n  " + input.trimmed()))
+    + "\n</node>\n";
+}
+
+class tst_qdbuscpp2xml : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void qdbuscpp2xml_data();
+    void qdbuscpp2xml();
+
+    void initTestCase();
+    void cleanupTestCase();
+
+private:
+    QHash<QString, QObject*> m_tests;
+};
+
+void tst_qdbuscpp2xml::initTestCase()
+{
+    m_tests.insert("test1", new Test1);
+}
+
+void tst_qdbuscpp2xml::cleanupTestCase()
+{
+    qDeleteAll(m_tests);
+}
+
+void tst_qdbuscpp2xml::qdbuscpp2xml_data()
+{
+    QTest::addColumn<QString>("inputfile");
+    QTest::addColumn<int>("flags");
+
+    QBitArray doneFlags(int(QDBusConnection::ExportAllContents) + 1);
+    for (int flag = 0x10; flag < QDBusConnection::ExportScriptableContents; flag += 0x10) {
+        QTest::newRow("xmlgenerator-" + QByteArray::number(flag)) << "test1" << flag;
+        doneFlags.setBit(flag);
+        for (int mask = QDBusConnection::ExportAllSlots; mask <= QDBusConnection::ExportAllContents; mask += 0x110) {
+            int flags = flag | mask;
+            if (doneFlags.testBit(flags))
+                continue;
+            QTest::newRow("xmlgenerator-" + QByteArray::number(flags)) << "test1" << flags;
+            doneFlags.setBit(flags);
+        }
+    }
+}
+
+void tst_qdbuscpp2xml::qdbuscpp2xml()
+{
+    QFETCH(QString, inputfile);
+    QFETCH(int, flags);
+
+    // qdbuscpp2xml considers these equivalent
+    if (flags & QDBusConnection::ExportScriptableSlots)
+        flags |= QDBusConnection::ExportScriptableInvokables;
+    if (flags & QDBusConnection::ExportNonScriptableSlots)
+        flags |= QDBusConnection::ExportNonScriptableInvokables;
+
+    if (flags & QDBusConnection::ExportScriptableInvokables)
+        flags |= QDBusConnection::ExportScriptableSlots;
+    if (flags & QDBusConnection::ExportNonScriptableInvokables)
+        flags |= QDBusConnection::ExportNonScriptableSlots;
+
+    QStringList options;
+    if (flags & QDBusConnection::ExportScriptableProperties) {
+        if (flags & QDBusConnection::ExportNonScriptableProperties)
+            options << "-P";
+        else
+            options << "-p";
+    }
+    if (flags & QDBusConnection::ExportScriptableSignals) {
+        if (flags & QDBusConnection::ExportNonScriptableSignals)
+            options << "-S";
+        else
+            options << "-s";
+    }
+    if (flags & QDBusConnection::ExportScriptableSlots) {
+        if (flags & QDBusConnection::ExportNonScriptableSlots)
+            options << "-M";
+        else
+            options << "-m";
+    }
+
+    // Launch
+    const QString binpath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
+    const QString command = binpath + QLatin1String("/qdbuscpp2xml");
+    QProcess process;
+    process.start(command, QStringList() << options << (QFINDTESTDATA(inputfile + QStringLiteral(".h"))));
+    if (!process.waitForFinished()) {
+        const QString path = QString::fromLocal8Bit(qgetenv("PATH"));
+        QString message = QString::fromLatin1("'%1' could not be found when run from '%2'. Path: '%3' ").
+                          arg(command, QDir::currentPath(), path);
+        QFAIL(qPrintable(message));
+    }
+    const QChar cr = QLatin1Char('\r');
+    const QString err = QString::fromLocal8Bit(process.readAllStandardError()).remove(cr);
+    const QString out = QString::fromLatin1(process.readAllStandardOutput()).remove(cr);
+
+    if (!err.isEmpty()) {
+        qDebug() << "UNEXPECTED STDERR CONTENTS: " << err;
+        QFAIL("UNEXPECTED STDERR CONTENTS");
+    }
+
+    const QChar nl = QLatin1Char('\n');
+    const QStringList actualLines = out.split(nl);
+
+    QObject *testObject = m_tests.value(inputfile);
+
+    if (flags == 0)
+        flags = QDBusConnection::ExportScriptableContents
+              | QDBusConnection::ExportNonScriptableContents;
+
+    QString expected = qDBusGenerateMetaObjectXml(QString(), testObject->metaObject(), &QObject::staticMetaObject, flags);
+
+    expected = addXmlHeader(expected);
+
+    QCOMPARE(out, expected);
+}
+
+QTEST_APPLESS_MAIN(tst_qdbuscpp2xml)
+
+#include "tst_qdbuscpp2xml.moc"