#include "quicktestresult_p.h"
#include <QtTest/qtestsystem.h>
#include "qtestoptions_p.h"
-#include <QApplication>
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativecontext.h>
-#if defined(QML_VERSION) && QML_VERSION >= 0x020000
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlcontext.h>
#include <QtQuick/qquickview.h>
-#define QUICK_TEST_SCENEGRAPH 1
-#endif
-#include <QtDeclarative/qjsvalue.h>
-#include <QtDeclarative/qjsengine.h>
+#include <QtQml/qjsvalue.h>
+#include <QtQml/qjsengine.h>
#include <QtGui/qopengl.h>
#include <QtCore/qurl.h>
#include <QtCore/qfileinfo.h>
#include <QtCore/QTranslator>
QT_BEGIN_NAMESPACE
-static void installCoverageTool(const char * appname, const char * testname)
-{
-#ifdef __COVERAGESCANNER__
- // Install Coverage Tool
- __coveragescanner_install(appname);
- __coveragescanner_testname(testname);
- __coveragescanner_clear();
-#else
- Q_UNUSED(appname);
- Q_UNUSED(testname);
-#endif
-}
-
-static void saveCoverageTool(const char * appname, bool testfailed)
-{
-#ifdef __COVERAGESCANNER__
- // install again to make sure the filename is correct.
- // without this, a plugin or similar may have changed the filename.
- __coveragescanner_install(appname);
- __coveragescanner_teststate(testfailed ? "FAILED" : "PASSED");
- __coveragescanner_save();
- __coveragescanner_testname("");
- __coveragescanner_clear();
-#else
- Q_UNUSED(appname);
- Q_UNUSED(testfailed);
-#endif
-}
-
-
class QTestRootObject : public QObject
{
Q_OBJECT
template <class View> void handleCompileErrors(const QFileInfo &fi, const View &view)
{
// Error compiling the test - flag failure in the log and continue.
- const QList<QDeclarativeError> errors = view.errors();
+ const QList<QQmlError> errors = view.errors();
QuickTestResult results;
results.setTestCaseName(fi.baseName());
results.startLogging();
QTextStream str(&message);
str << "\n " << QDir::toNativeSeparators(fi.absoluteFilePath()) << " produced "
<< errors.size() << " error(s):\n";
- foreach (const QDeclarativeError &e, errors) {
+ foreach (const QQmlError &e, errors) {
str << " ";
if (e.url().isLocalFile()) {
str << e.url().toLocalFile();
str << ": " << e.description() << '\n';
}
str << " Working directory: " << QDir::toNativeSeparators(QDir::current().absolutePath()) << '\n';
- if (QDeclarativeEngine *engine = view.engine()) {
+ if (QQmlEngine *engine = view.engine()) {
str << " View: " << view.metaObject()->className() << ", import paths:\n";
foreach (const QString &i, engine->importPathList())
str << " '" << QDir::toNativeSeparators(i) << "'\n";
results.fail(errors.at(0).description(),
errors.at(0).url(), errors.at(0).line());
results.finishTestData();
+ results.finishTestDataCleanup();
results.finishTestFunction();
results.setFunctionName(QString());
results.stopLogging();
int quick_test_main(int argc, char **argv, const char *name, quick_test_viewport_create createViewport, const char *sourceDir)
{
+ Q_UNUSED(createViewport);
QGuiApplication* app = 0;
if (!QCoreApplication::instance()) {
app = new QGuiApplication(argc, argv);
// Look for QML-specific command-line options.
// -import dir Specify an import directory.
// -input dir Specify the input directory for test cases.
- // -qtquick1 Run with QtQuick 1 rather than QtQuick 2.
// -translation file Specify the translation file.
QStringList imports;
QString testPath;
QString translationFile;
- bool qtQuick2 = true;
int outargc = 1;
int index = 1;
while (index < argc) {
index += 2;
} else if (strcmp(argv[index], "-opengl") == 0) {
++index;
- } else if (strcmp(argv[index], "-qtquick1") == 0) {
- qtQuick2 = false;
- ++index;
} else if (strcmp(argv[index], "-translation") == 0 && (index + 1) < argc) {
translationFile = stripQuotes(QString::fromLocal8Bit(argv[index + 1]));
index += 2;
argc = outargc;
// Parse the command-line arguments.
- QuickTestResult::parseArgs(argc, argv);
+
+ // Setting currentAppname and currentTestObjectName (via setProgramName) are needed
+ // for the code coverage analysis. Must be done before parseArgs is called.
+ QuickTestResult::setCurrentAppname(argv[0]);
QuickTestResult::setProgramName(name);
- installCoverageTool(argv[0], name);
+ QuickTestResult::parseArgs(argc, argv);
QTranslator translator;
if (!translationFile.isEmpty()) {
}
// Scan through all of the "tst_*.qml" files and run each of them
- // in turn with a QDeclarativeView.
-#ifdef QUICK_TEST_SCENEGRAPH
- if (qtQuick2) {
- QQuickView view;
- QTestRootObject rootobj;
- QEventLoop eventLoop;
- QObject::connect(view.engine(), SIGNAL(quit()),
- &rootobj, SLOT(quit()));
- QObject::connect(view.engine(), SIGNAL(quit()),
- &eventLoop, SLOT(quit()));
- view.rootContext()->setContextProperty
- (QLatin1String("qtest"), &rootobj);
- foreach (const QString &path, imports)
- view.engine()->addImportPath(path);
+ // in turn with a QQuickView.
+ QQuickView view;
+ QTestRootObject rootobj;
+ QEventLoop eventLoop;
+ QObject::connect(view.engine(), SIGNAL(quit()),
+ &rootobj, SLOT(quit()));
+ QObject::connect(view.engine(), SIGNAL(quit()),
+ &eventLoop, SLOT(quit()));
+ view.rootContext()->setContextProperty
+ (QLatin1String("qtest"), &rootobj);
+ foreach (const QString &path, imports)
+ view.engine()->addImportPath(path);
- foreach (QString file, files) {
- QFileInfo fi(file);
- if (!fi.exists())
- continue;
+ foreach (QString file, files) {
+ QFileInfo fi(file);
+ if (!fi.exists())
+ continue;
- rootobj.setHasTestCase(false);
- rootobj.setWindowShown(false);
- rootobj.hasQuit = false;
- QString path = fi.absoluteFilePath();
- if (path.startsWith(QLatin1String(":/")))
- view.setSource(QUrl(QLatin1String("qrc:") + path.mid(2)));
- else
- view.setSource(QUrl::fromLocalFile(path));
+ rootobj.setHasTestCase(false);
+ rootobj.setWindowShown(false);
+ rootobj.hasQuit = false;
+ QString path = fi.absoluteFilePath();
+ if (path.startsWith(QLatin1String(":/")))
+ view.setSource(QUrl(QLatin1String("qrc:") + path.mid(2)));
+ else
+ view.setSource(QUrl::fromLocalFile(path));
- if (QTest::printAvailableFunctions)
- continue;
- if (view.status() == QQuickView::Error) {
- handleCompileErrors(fi, view);
- continue;
- }
- if (!rootobj.hasQuit) {
- // If the test already quit, then it was performed
- // synchronously during setSource(). Otherwise it is
- // an asynchronous test and we need to show the window
- // and wait for the quit indication.
- view.show();
- QTest::qWaitForWindowShown(&view);
- rootobj.setWindowShown(true);
- if (!rootobj.hasQuit && rootobj.hasTestCase())
- eventLoop.exec();
- }
+ if (QTest::printAvailableFunctions)
+ continue;
+ if (view.status() == QQuickView::Error) {
+ handleCompileErrors(fi, view);
+ continue;
+ }
+ if (!rootobj.hasQuit) {
+ // If the test already quit, then it was performed
+ // synchronously during setSource(). Otherwise it is
+ // an asynchronous test and we need to show the window
+ // and wait for the quit indication.
+ view.show();
+ QTest::qWaitForWindowShown(&view);
+ rootobj.setWindowShown(true);
+ if (!rootobj.hasQuit && rootobj.hasTestCase())
+ eventLoop.exec();
}
- } else
-#endif
- {
- qWarning("No suitable QtQuick1 implementation is available!");
- return 1;
}
// Flush the current logging stream.
QuickTestResult::setProgramName(0);
- saveCoverageTool(argv[0], QuickTestResult::exitCode() != 0);
-
//Sometimes delete app cause crash here with some qpa plugins,
//so we comment the follow line out to make them happy.
//delete app;
projects / profile / ivi / qtdeclarative.git / blobdiff