11 files changed, 265 insertions, 89 deletions
diff --git a/tests/auto/qml/qmllint/data/CatchStatement.qml b/tests/auto/qml/qmllint/data/CatchStatement.qml
new file mode 100644
index 0000000000..e0f70fce7e
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/CatchStatement.qml
@@ -0,0 +1,8 @@
+import QtQml 2.12
+
+QtObject {
+    function f() {
+        try {} catch(err) {}
+        console.log(err);
+    }
+}
diff --git a/tests/auto/qml/qmllint/data/FromRoot.qml b/tests/auto/qml/qmllint/data/FromRoot.qml
new file mode 100644
index 0000000000..021c09285e
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/FromRoot.qml
@@ -0,0 +1,17 @@
+import QtQuick 2.0
+
+Item {
+    id: root
+    property int unqualified: 42
+
+    Item {
+        Item {
+            x: unqualified // user defined property from root
+        }
+
+        QtObject {
+            property int check: x // existing property from root
+        }
+    }
+
+}
diff --git a/tests/auto/qml/qmllint/data/IdFromOuterSpace.qml b/tests/auto/qml/qmllint/data/IdFromOuterSpace.qml
new file mode 100644
index 0000000000..774a1cfc7c
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/IdFromOuterSpace.qml
@@ -0,0 +1,9 @@
+import QtQuick 2.0
+
+Item {
+    x: alien.x
+
+    Component.onCompleted: {
+        console.log(alien);
+    }
+}
diff --git a/tests/auto/qml/qmllint/data/SignalHandler.qml b/tests/auto/qml/qmllint/data/SignalHandler.qml
new file mode 100644
index 0000000000..865277cedb
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/SignalHandler.qml
@@ -0,0 +1,13 @@
+import QtQuick 2.0
+
+MouseArea {
+    onDoubleClicked: {
+        console.log(mouse);
+        // do further things
+    }
+    onClicked: console.info(mouse)
+    onPositionChanged: {
+        console.log(mouse)
+    }
+    onPressAndHold: console.warn(mouse)
+}
diff --git a/tests/auto/qml/qmllint/data/WithStatement.qml b/tests/auto/qml/qmllint/data/WithStatement.qml
new file mode 100644
index 0000000000..5641f21eeb
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/WithStatement.qml
@@ -0,0 +1,13 @@
+import QtQuick 2.0
+
+Item {
+    Item {
+        id: target
+        property int test: 42
+    }
+    Component.onCompleted: {
+        with(target) {
+            console.log(test);
+        }
+    }
+}
diff --git a/tests/auto/qml/qmllint/data/catchIdentifierNoWarning.qml b/tests/auto/qml/qmllint/data/catchIdentifierNoWarning.qml
new file mode 100644
index 0000000000..097baa6fcf
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/catchIdentifierNoWarning.qml
@@ -0,0 +1,7 @@
+import QtQml 2.12
+
+QtObject {
+    function f() {
+        try {} catch(err) {console.log(err);}
+    }
+}
diff --git a/tests/auto/qml/qmllint/data/nonSpuriousParentWarning.qml b/tests/auto/qml/qmllint/data/nonSpuriousParentWarning.qml
new file mode 100644
index 0000000000..a59b736929
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/nonSpuriousParentWarning.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.12
+import QtQml 2.12
+
+Item {
+    QtObject {
+        property int x: parent.x
+    }
+}
diff --git a/tests/auto/qml/qmllint/data/spuriousParentWarning.qml b/tests/auto/qml/qmllint/data/spuriousParentWarning.qml
new file mode 100644
index 0000000000..1323593031
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/spuriousParentWarning.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.12
+
+Item {
+    Unknown {
+        property int x: parent.x
+    }
+}
diff --git a/tests/auto/qml/qmllint/main.cpp b/tests/auto/qml/qmllint/main.cpp
deleted file mode 100644
index eedbd7c2f2..0000000000
--- a/tests/auto/qml/qmllint/main.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sergio Martins <sergio.martins@kdab.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins 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$
-**
-****************************************************************************/
-
-#include <QtTest/QtTest>
-#include <QProcess>
-#include <QString>
-
-class TestQmllint: public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-    void initTestCase();
-    void test();
-    void test_data();
-private:
-    QString m_qmllintPath;
-};
-
-void TestQmllint::initTestCase()
-{
-    m_qmllintPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
-#ifdef Q_OS_WIN
-    m_qmllintPath += QLatin1String(".exe");
-#endif
-    if (!QFileInfo(m_qmllintPath).exists()) {
-        QString message = QStringLiteral("qmllint executable not found (looked for %0)").arg(m_qmllintPath);
-        QFAIL(qPrintable(message));
-    }
-}
-
-void TestQmllint::test_data()
-{
-    QTest::addColumn<QString>("filename");
-    QTest::addColumn<bool>("isValid");
-
-    // Valid files:
-    QTest::newRow("Simple_QML") << QStringLiteral("Simple.qml") << true;
-    QTest::newRow("QML_importing_JS") << QStringLiteral("importing_js.qml") << true;
-    QTest::newRow("QTBUG-45916_JS_with_pragma_and_import") << QStringLiteral("QTBUG-45916.js") << true;
-
-    // Invalid files:
-    QTest::newRow("Invalid_syntax_QML") << QStringLiteral("failure1.qml") << false;
-    QTest::newRow("Invalid_syntax_JS") << QStringLiteral("failure1.js") << false;
-}
-
-void TestQmllint::test()
-{
-    QFETCH(QString, filename);
-    QFETCH(bool, isValid);
-    filename = QStringLiteral("data/") + filename;
-    QStringList args;
-    args << QStringLiteral("--silent") << filename;
-
-    bool success = QProcess::execute(m_qmllintPath, args) == 0;
-    QCOMPARE(success, isValid);
-}
-
-QTEST_MAIN(TestQmllint)
-#include "main.moc"
diff --git a/tests/auto/qml/qmllint/qmllint.pro b/tests/auto/qml/qmllint/qmllint.pro
index b53a6f6877..95470b4085 100644
--- a/tests/auto/qml/qmllint/qmllint.pro
+++ b/tests/auto/qml/qmllint/qmllint.pro
@@ -1,6 +1,11 @@
-TEMPLATE = app
-TARGET = testqmllint
-INCLUDEPATH += .
+CONFIG += testcase
+TARGET = tst_qmllint
+macos:CONFIG -= app_bundle
+
+SOURCES += tst_qmllint.cpp
+
+include (../../shared/util.pri)
+
+TESTDATA = data/*
 
-SOURCES += main.cpp
 QT += testlib
diff --git a/tests/auto/qml/qmllint/tst_qmllint.cpp b/tests/auto/qml/qmllint/tst_qmllint.cpp
new file mode 100644
index 0000000000..582f146dca
--- /dev/null
+++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
@@ -0,0 +1,174 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sergio Martins <sergio.martins@kdab.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins 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$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QProcess>
+#include <QString>
+
+#include <util.h>
+
+class TestQmllint: public QQmlDataTest
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase() override;
+    void test();
+    void test_data();
+    void testUnqualified();
+    void testUnqualified_data();
+    void testUnqualifiedNoSpuriousParentWarning();
+    void catchIdentifierNoFalsePositive();
+private:
+    QString m_qmllintPath;
+};
+
+void TestQmllint::initTestCase()
+{
+    QQmlDataTest::initTestCase();
+    m_qmllintPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
+#ifdef Q_OS_WIN
+    m_qmllintPath += QLatin1String(".exe");
+#endif
+    if (!QFileInfo(m_qmllintPath).exists()) {
+        QString message = QStringLiteral("qmllint executable not found (looked for %0)").arg(m_qmllintPath);
+        QFAIL(qPrintable(message));
+    }
+}
+
+void TestQmllint::test_data()
+{
+    QTest::addColumn<QString>("filename");
+    QTest::addColumn<bool>("isValid");
+
+    // Valid files:
+    QTest::newRow("Simple_QML") << QStringLiteral("Simple.qml") << true;
+    QTest::newRow("QML_importing_JS") << QStringLiteral("importing_js.qml") << true;
+    QTest::newRow("QTBUG-45916_JS_with_pragma_and_import") << QStringLiteral("QTBUG-45916.js") << true;
+
+    // Invalid files:
+    QTest::newRow("Invalid_syntax_QML") << QStringLiteral("failure1.qml") << false;
+    QTest::newRow("Invalid_syntax_JS") << QStringLiteral("failure1.js") << false;
+}
+
+void TestQmllint::testUnqualified()
+{
+    auto qmlImportDir = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
+    QFETCH(QString, filename);
+    QFETCH(QString, warningMessage);
+    QFETCH(int, warningLine);
+    QFETCH(int, warningColumn);
+    QStringList args;
+    args << QStringLiteral("-U") << testFile(filename) << QStringLiteral("-I") << qmlImportDir;
+
+    QProcess process;
+    process.start(m_qmllintPath, args);
+    QVERIFY(process.waitForFinished());
+    QVERIFY(process.exitStatus() == QProcess::NormalExit);
+    QVERIFY(process.exitCode());
+    QString output = process.readAllStandardError();
+    QVERIFY(output.contains(QString::asprintf("Warning: unqualified access at %d:%d", warningLine, warningColumn)));
+    QVERIFY(output.contains(warningMessage));
+}
+
+void TestQmllint::testUnqualified_data()
+{
+    QTest::addColumn<QString>("filename");
+    QTest::addColumn<QString>("warningMessage");
+    QTest::addColumn<int>("warningLine");
+    QTest::addColumn<int>("warningColumn");
+
+    // check for false positive due to and warning about with statement
+    QTest::newRow("WithStatement") << QStringLiteral("WithStatement.qml") << QStringLiteral("with statements are strongly discouraged") << 10 << 25;
+    // id from nowhere (as with setContextProperty)
+    QTest::newRow("IdFromOuterSpaceDirect") << QStringLiteral("IdFromOuterSpace.qml") << "alien.x" << 4 << 8;
+    QTest::newRow("IdFromOuterSpaceAccess") << QStringLiteral("IdFromOuterSpace.qml") << "console.log(alien)" << 7 << 21;
+    // access property of root object
+    QTest::newRow("FromRootDirect") << QStringLiteral("FromRoot.qml") << QStringLiteral("x: root.unqualified") << 9 << 16; // new property
+    QTest::newRow("FromRootAccess") << QStringLiteral("FromRoot.qml") << QStringLiteral("property int check: root.x") << 13 << 33;  // builtin property
+    // access injected name from signal
+    QTest::newRow("SignalHandler1") << QStringLiteral("SignalHandler.qml") << QStringLiteral("onDoubleClicked:  function(mouse) {...") << 5 << 21;
+    QTest::newRow("SignalHandler2") << QStringLiteral("SignalHandler.qml") << QStringLiteral("onPositionChanged:  function(mouse) {...") << 10 << 21;
+    QTest::newRow("SignalHandlerShort1") << QStringLiteral("SignalHandler.qml") << QStringLiteral("onClicked:  (mouse) =>  {...") << 8 << 29;
+    QTest::newRow("SignalHandlerShort2") << QStringLiteral("SignalHandler.qml") << QStringLiteral("onPressAndHold:  (mouse) =>  {...") << 12 << 34;
+    // access catch identifier outside catch block
+    QTest::newRow("CatchStatement") << QStringLiteral("CatchStatement.qml") << QStringLiteral("err") << 6 << 21;
+}
+
+void TestQmllint::testUnqualifiedNoSpuriousParentWarning()
+{
+    auto qmlImportDir = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
+    {
+        QString filename = testFile("spuriousParentWarning.qml");
+        QStringList args;
+        args << QStringLiteral("-U") << filename << QStringLiteral("-I") << qmlImportDir;
+        QProcess process;
+        process.start(m_qmllintPath, args);
+        QVERIFY(process.waitForFinished());
+        QVERIFY(process.exitStatus() == QProcess::NormalExit);
+        QVERIFY(process.exitCode() == 0);
+    }
+    {
+        QString filename = testFile("nonSpuriousParentWarning.qml");
+        QStringList args;
+        args << QStringLiteral("-U") << filename << QStringLiteral("-I") << qmlImportDir;
+        QProcess process;
+        process.start(m_qmllintPath, args);
+        QVERIFY(process.waitForFinished());
+        QVERIFY(process.exitStatus() == QProcess::NormalExit);
+        QVERIFY(process.exitCode());
+    }
+}
+
+void TestQmllint::catchIdentifierNoFalsePositive()
+{
+    auto qmlImportDir = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
+    QString filename = QLatin1String("catchIdentifierNoWarning.qml");
+    filename.prepend(QStringLiteral("data/"));
+    QStringList args;
+    args << QStringLiteral("-U") << filename << QStringLiteral("-I") << qmlImportDir;
+    QProcess process;
+    process.start(m_qmllintPath, args);
+    QVERIFY(process.waitForFinished());
+    QVERIFY(process.exitStatus() == QProcess::NormalExit);
+    QVERIFY(process.exitCode() == 0);
+}
+
+void TestQmllint::test()
+{
+    QFETCH(QString, filename);
+    QFETCH(bool, isValid);
+    QStringList args;
+    args << QStringLiteral("--silent") << testFile(filename);
+
+    bool success = QProcess::execute(m_qmllintPath, args) == 0;
+    QCOMPARE(success, isValid);
+}
+
+QTEST_MAIN(TestQmllint)
+#include "tst_qmllint.moc"