feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmljs: fix tst_importcheck

Browse Source 
Mainly update import lists for Qt5.15 and ensure load is complete
before comparing.

Change-Id: I954cc4806d49d1a466f5e558b836ce49eb3693b0
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Fawzi Mohamed
2021-01-08 07:28:53 +01:00
parent 1455eae9ac
commit 45bdb39c6b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/qml/codemodel/importscheck/tst_importscheck.cpp
View File

@@ -73,6 +73,7 @@ void scanDir(const QString &dir)
paths.maybeInsert(Utils::FilePath::fromString(dir), Dialect::Qml); paths.maybeInsert(Utils::FilePath::fromString(dir), Dialect::Qml);
ModelManagerInterface::importScan(result, ModelManagerInterface::workingCopy(), paths, ModelManagerInterface::importScan(result, ModelManagerInterface::workingCopy(), paths,
ModelManagerInterface::instance(), false); ModelManagerInterface::instance(), false);
ModelManagerInterface::instance()->test_joinAllThreads();
ViewerContext vCtx; ViewerContext vCtx;
vCtx.paths.append(dir); vCtx.paths.append(dir);
Snapshot snap = ModelManagerInterface::instance()->snapshot(); Snapshot snap = ModelManagerInterface::instance()->snapshot();
@@ -123,7 +124,8 @@ void tst_ImportCheck::test_data()
QTest::addColumn<QStringList>("expectedFiles"); QTest::addColumn<QStringList>("expectedFiles");
QTest::newRow("base") << QStringList(QString(TESTSRCDIR "/base")) QTest::newRow("base") << QStringList(QString(TESTSRCDIR "/base"))
<< QStringList({"QML 1.0", "QtQml 2.2", "QtQml 2.1", "QtQuick 2.0", << QStringList({"QML 1.0", "QtQml 2.2", "QtQml 2.1", "QtQuick 2.0",
"QtQml 2.0", "QtQuick 2.1", "QtQuick 2.2", "<cpp>"}) "QtQml 2.0", "QtQuick 2.1", "QtQuick 2.2", "QtQuick 2.14",
"<cpp>"})
<< QStringList(); << QStringList();
QTest::newRow("001_flatQmlOnly") << QStringList(QString(TESTSRCDIR "/001_flatQmlOnly")) QTest::newRow("001_flatQmlOnly") << QStringList(QString(TESTSRCDIR "/001_flatQmlOnly"))
<< QStringList() << QStringList()
@@ -169,7 +171,8 @@ void tst_ImportCheck::test_data()
<< QString(TESTSRCDIR "/003_packageQmlOnly/QtGraphicalEffects/FastBlur.qml")); << QString(TESTSRCDIR "/003_packageQmlOnly/QtGraphicalEffects/FastBlur.qml"));
QTest::newRow("004_cppOnly copy") << QStringList(QString(TESTSRCDIR "/004_cppOnly copy")) QTest::newRow("004_cppOnly copy") << QStringList(QString(TESTSRCDIR "/004_cppOnly copy"))
<< QStringList({ "QML 1.0", "QtQml 2.2", "QtQml 2.1", "QtQuick 2.0", << QStringList({ "QML 1.0", "QtQml 2.2", "QtQml 2.1", "QtQuick 2.0",
"QtQml 2.0", "QtQuick 2.1", "QtQuick 2.2", "<cpp>" }) "QtQml 2.0", "QtQuick 2.1", "QtQuick 2.2", "QtQuick 2.14",
"<cpp>" })
<< QStringList(); << QStringList();
} }
@@ -185,6 +188,7 @@ void tst_ImportCheck::test()
lPaths.maybeInsert(Utils::FilePath::fromString(path), Dialect::Qml); lPaths.maybeInsert(Utils::FilePath::fromString(path), Dialect::Qml);
ModelManagerInterface::importScan(result, ModelManagerInterface::workingCopy(), lPaths, ModelManagerInterface::importScan(result, ModelManagerInterface::workingCopy(), lPaths,
ModelManagerInterface::instance(), false); ModelManagerInterface::instance(), false);
ModelManagerInterface::instance()->test_joinAllThreads();
ViewerContext vCtx; ViewerContext vCtx;
vCtx.paths.append(paths); vCtx.paths.append(paths);
Snapshot snap = ModelManagerInterface::instance()->snapshot(); Snapshot snap = ModelManagerInterface::instance()->snapshot();