diff options
| author | Robert Loehning <robert.loehning@qt.io> | 2017-01-20 12:20:00 +0100 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@qt.io> | 2017-01-30 12:52:09 +0000 |
| commit | 326d40dde1c6267cda6fa76949c9506f33cd703e (patch) | |
| tree | bb678fc79bec6ba1af7ce66f8a202cd4db5027cf | |
| parent | 2def95374d018898a484e34eca2e66effe0ac7f6 (diff) | |
| download | qt-creator-326d40dde1c6267cda6fa76949c9506f33cd703e.tar.gz | |
Squish: Parse qtcreator.pro with Qt 5.6 to avoid changing results
Change-Id: I47cecb8ac8aaf1d5a845b801ff4038b3f023a220
Task-number: QTCREATORBUG-17577
Task-number: QTCREATORBUG-17609
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | tests/system/suite_general/tst_openqt_creator/test.py | 13 | ||||
| -rw-r--r-- | tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv | 10 |
2 files changed, 8 insertions, 15 deletions
diff --git a/tests/system/suite_general/tst_openqt_creator/test.py b/tests/system/suite_general/tst_openqt_creator/test.py index 10ec71744c..5722a3fe46 100644 --- a/tests/system/suite_general/tst_openqt_creator/test.py +++ b/tests/system/suite_general/tst_openqt_creator/test.py @@ -41,7 +41,7 @@ def main(): waitFor("runButton.enabled", 30000) # Starting before opening, because this is where Creator froze (QTCREATORBUG-10733) startopening = datetime.utcnow() - openQmakeProject(pathCreator, Targets.DESKTOP_531_DEFAULT) + openQmakeProject(pathCreator, Targets.DESKTOP_561_DEFAULT) # Wait for parsing to complete startreading = datetime.utcnow() waitFor("runButton.enabled", 300000) @@ -62,12 +62,15 @@ def main(): if not test.verify(object.exists(":Qt Creator_Core::OutputWindow"), "Did the General Messages view show up?"): openGeneralMessages() + # Verify messages appear once, from using default kit before configuring generalMessages = str(waitForObject(":Qt Creator_Core::OutputWindow").plainText) - test.verify("Project MESSAGE: Cannot build Qt Creator with Qt version 5.3.1." in generalMessages, - "Warning about outdated Qt shown?") - test.verify("Project ERROR: Use at least Qt 5.5.0." in generalMessages, - "Minimum Qt version shown?") + test.compare(generalMessages.count("Project MESSAGE: Cannot build Qt Creator with Qt version 5.3.1."), 1, + "Warning about outdated Qt shown?") + test.compare(generalMessages.count("Project ERROR: Use at least Qt 5.5.0."), 1, + "Minimum Qt version shown?") + # Verify that qmljs.g is in the project even when we don't know where (QTCREATORBUG-17609) + selectFromLocator("p qmljs.g", "qmljs.g") # Now check some basic lookups in the search box selectFromLocator(": Qlist::QList", "QList::QList") test.compare(wordUnderCursor(waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")), "QList") diff --git a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv b/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv index d3a824e96f..d25452c942 100644 --- a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv +++ b/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv @@ -2683,8 +2683,6 @@ "qmljsgrammar.cpp" "6" "qmljslexer.cpp" "6" "qmljsparser.cpp" "6" -"Other files" "5" -"qmljs.g" "6" "Headers" "4" "jsoncheck.h" "5" "persistenttrie.h" "5" @@ -2760,9 +2758,6 @@ "qmljsutils.cpp" "5" "qmljsvalueowner.cpp" "5" "qmljsviewercontext.cpp" "5" -"Other files" "4" -"parser" "5" -"qmljs.g" "6" "qtcreatorlibrary" "3" "qtcreatorlibrary.pri" "4" "qmljs_dependencies" "4" @@ -13819,8 +13814,6 @@ "qmljsgrammar.cpp" "8" "qmljslexer.cpp" "8" "qmljsparser.cpp" "8" -"Other files" "7" -"qmljs.g" "8" "Headers" "6" "jsoncheck.h" "7" "persistenttrie.h" "7" @@ -13896,9 +13889,6 @@ "qmljsutils.cpp" "7" "qmljsvalueowner.cpp" "7" "qmljsviewercontext.cpp" "7" -"Other files" "6" -"parser" "7" -"qmljs.g" "8" "qttest" "5" "qttest.pri" "6" "qtcreator" "6" |