1 files changed, 57 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 89dac33671..1f0248c258 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -1,5 +1,6 @@
 /****************************************************************************
 **
+** Copyright (C) 2017 Crimson AS <info@crimson.no>
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
@@ -333,6 +334,8 @@ private slots:
     void stringify_qtbug_50592();
     void instanceof_data();
     void instanceof();
+    void constkw_data();
+    void constkw();
 
 private:
 //    static void propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter);
@@ -8183,6 +8186,60 @@ void tst_qqmlecmascript::instanceof()
     }
 }
 
+void tst_qqmlecmascript::constkw_data()
+{
+    QTest::addColumn<QString>("sourceCode");
+    QTest::addColumn<bool>("exceptionExpected");
+    QTest::addColumn<QVariant>("expectedValue");
+
+    QTest::newRow("simpleconst")
+        << "const v = 5\n"
+           "v\n"
+        << false
+        << QVariant(5);
+    QTest::newRow("twoconst")
+        << "const v = 5, i = 10\n"
+           "v + i\n"
+        << false
+        << QVariant(15);
+    QTest::newRow("constandvar")
+        << "const v = 5\n"
+           "var i = 20\n"
+           "v + i\n"
+        << false
+        << QVariant(25);
+
+    // error cases
+    QTest::newRow("const-no-initializer")
+        << "const v\n"
+        << true
+        << QVariant("SyntaxError: Missing initializer in const declaration");
+    QTest::newRow("const-no-initializer-comma")
+        << "const v = 1, i\n"
+        << true
+        << QVariant("SyntaxError: Missing initializer in const declaration");
+}
+
+void tst_qqmlecmascript::constkw()
+{
+    QFETCH(QString, sourceCode);
+    QFETCH(bool, exceptionExpected);
+    QFETCH(QVariant, expectedValue);
+
+    QJSEngine engine;
+    QJSValue ret = engine.evaluate(sourceCode);
+
+    if (!exceptionExpected) {
+        QVERIFY2(!ret.isError(), qPrintable(ret.toString()));
+        QCOMPARE(ret.toVariant(), expectedValue);
+    } else {
+        QVERIFY2(ret.isError(), qPrintable(ret.toString()));
+        QCOMPARE(ret.toString(), expectedValue.toString());
+    }
+}
+
+
+
 QTEST_MAIN(tst_qqmlecmascript)
 
 #include "tst_qqmlecmascript.moc"