From a4321bbfe14d8e041f45840468d7ea18f0d3f97b Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 24 Sep 2014 18:01:22 +0200 Subject: [PATCH] Squish: Run tst_memberoperator with Clang code model, too Change-Id: I3b4b2ed3523e94d5a6dee6957b5b16d4092122fd Reviewed-by: Christian Stenger --- .../suite_editors/tst_memberoperator/test.py | 46 ++++++++++++------- 1 file 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 04c992fe041..4f976fdbde5 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 ") - typeLines(cppwindow, ("", "#include " + include)) - placeCursorToLine(cppwindow, "return a.exec();") - typeLines(cppwindow, ("", 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 ") + typeLines(cppwindow, ("", "#include " + include)) + placeCursorToLine(cppwindow, "return a.exec();") + typeLines(cppwindow, ("", 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")