summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@digia.com>2014-09-24 18:01:22 +0200
committerRobert Loehning <robert.loehning@digia.com>2014-09-25 16:09:12 +0200
commita4321bbfe14d8e041f45840468d7ea18f0d3f97b (patch)
treeefc8c81981645c5ba7cb17fed932f6aad7289ee4
parentea93a6531c3994cadfac95035433f5aa61d8562f (diff)
downloadqt-creator-a4321bbfe14d8e041f45840468d7ea18f0d3f97b.tar.gz
Squish: Run tst_memberoperator with Clang code model, too
Change-Id: I3b4b2ed3523e94d5a6dee6957b5b16d4092122fd Reviewed-by: Christian Stenger <christian.stenger@digia.com>
-rw-r--r--tests/system/suite_editors/tst_memberoperator/test.py46
1 files changed, 29 insertions, 17 deletions
diff --git a/tests/system/suite_editors/tst_memberoperator/test.py b/tests/system/suite_editors/tst_memberoperator/test.py
index 04c992fe04..4f976fdbde 100644
--- a/tests/system/suite_editors/tst_memberoperator/test.py
+++ b/tests/system/suite_editors/tst_memberoperator/test.py
@@ -30,26 +30,38 @@
source("../../shared/qtcreator.py")
def main():
- startApplication("qtcreator" + SettingsPath)
+ startCreatorTryingClang()
if not startedWithoutPluginError():
return
createProject_Qt_Console(tempDir(), "SquishProject")
- selectFromLocator("main.cpp")
- cppwindow = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")
+ models = iterateAvailableCodeModels()
+ for current in models:
+ if current != models[0]:
+ selectCodeModel(current)
+ test.log("Testing code model: %s" % current)
+ selectFromLocator("main.cpp")
+ cppwindow = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")
- for record in testData.dataset("usages.tsv"):
- include = testData.field(record, "include")
- if include:
- placeCursorToLine(cppwindow, "#include <QCoreApplication>")
- typeLines(cppwindow, ("", "#include " + include))
- placeCursorToLine(cppwindow, "return a.exec();")
- typeLines(cppwindow, ("<Up>", testData.field(record, "declaration")))
- type(cppwindow, testData.field(record, "usage"))
- snooze(1) # maybe find something better
- type(cppwindow, testData.field(record, "operator"))
- waitFor("object.exists(':popupFrame_TextEditor::GenericProposalWidget')", 1500)
- test.compare(str(lineUnderCursor(cppwindow)).strip(), testData.field(record, "expected"))
- invokeMenuItem("File", 'Revert "main.cpp" to Saved')
- clickButton(waitForObject(":Revert to Saved.Proceed_QPushButton"))
+ for record in testData.dataset("usages.tsv"):
+ include = testData.field(record, "include")
+ if include:
+ placeCursorToLine(cppwindow, "#include <QCoreApplication>")
+ typeLines(cppwindow, ("", "#include " + include))
+ placeCursorToLine(cppwindow, "return a.exec();")
+ typeLines(cppwindow, ("<Up>", testData.field(record, "declaration")))
+ type(cppwindow, testData.field(record, "usage"))
+ snooze(1) # maybe find something better
+ type(cppwindow, testData.field(record, "operator"))
+ waitFor("object.exists(':popupFrame_TextEditor::GenericProposalWidget')", 1500)
+ found = str(lineUnderCursor(cppwindow)).strip()
+ exp = testData.field(record, "expected")
+ if current == "Clang" and exp[-2:] == "->":
+ test.xcompare(found, exp) # QTCREATORBUG-11581
+ else:
+ test.compare(found, exp)
+ invokeMenuItem("File", 'Revert "main.cpp" to Saved')
+ clickButton(waitForObject(":Revert to Saved.Proceed_QPushButton"))
+ snooze(1)
+ invokeMenuItem("File", "Close All")
invokeMenuItem("File", "Exit")