Changeset View
Changeset View
Standalone View
Standalone View
autotests/src/script_test_base.cpp
Context not available. | |||||
34 | #include <QProcess> | 34 | #include <QProcess> | ||
---|---|---|---|---|---|
35 | #include <QDirIterator> | 35 | #include <QDirIterator> | ||
36 | #include <QMainWindow> | 36 | #include <QMainWindow> | ||
37 | #include <QScriptEngine> | 37 | #include <QJSEngine> | ||
38 | #include <QCryptographicHash> | 38 | #include <QCryptographicHash> | ||
39 | #include <QTest> | 39 | #include <QTest> | ||
40 | 40 | | |||
Context not available. | |||||
79 | QFile scriptFile(QLatin1String(JS_DATA_DIR) + m_script_dir + QLatin1Char('/') + script + QLatin1String(".js")); | 79 | QFile scriptFile(QLatin1String(JS_DATA_DIR) + m_script_dir + QLatin1Char('/') + script + QLatin1String(".js")); | ||
80 | if (scriptFile.exists()) { | 80 | if (scriptFile.exists()) { | ||
81 | QVERIFY(scriptFile.open(QFile::ReadOnly)); | 81 | QVERIFY(scriptFile.open(QFile::ReadOnly)); | ||
82 | QScriptValue result = m_env->engine()->evaluate(QString::fromLatin1(scriptFile.readAll()), scriptFile.fileName()); | 82 | QJSValue result = m_env->engine()->evaluate(QString::fromLatin1(scriptFile.readAll()), scriptFile.fileName()); | ||
83 | QVERIFY2(!result.isError(), qPrintable(QString(result.toString() + QLatin1String("\nat ") | 83 | QVERIFY2(!result.isError(), (result.toString() + QLatin1String(" in file ") + scriptFile.fileName()).toUtf8().constData()); | ||
84 | + m_env->engine()->uncaughtExceptionBacktrace().join(QLatin1String("\n"))))); | | |||
85 | } | 84 | } | ||
86 | } | 85 | } | ||
87 | 86 | | |||
Context not available. | |||||
131 | sourceFile.close(); | 130 | sourceFile.close(); | ||
132 | 131 | | |||
133 | // Execute script | 132 | // Execute script | ||
134 | QScriptValue result = m_env->engine()->evaluate(code, testcase + QLatin1String("/input.js"), 1); | 133 | QJSValue result = m_env->engine()->evaluate(code, testcase + QLatin1String("/input.js"), 1); | ||
135 | QVERIFY2(!result.isError(), result.toString().toUtf8().constData()); | 134 | QVERIFY2(!result.isError(), result.toString().toUtf8().constData()); | ||
136 | 135 | | |||
137 | const QString fileExpected = testcase + QLatin1String("/expected"); | 136 | const QString fileExpected = testcase + QLatin1String("/expected"); | ||
Context not available. |