Commit 8c66ecfa authored by Robert Loehning's avatar Robert Loehning

Squish: Expect wrong popups to be fixed

Task-number: QTCREATORBUG-15710
Change-Id: Id4a0e3e42249cdd281ed79b0914faacfb3450e37
Reviewed-by: Christian Stenger's avatarChristian Stenger <christian.stenger@qt.io>
parent 29504197
......@@ -76,12 +76,8 @@ def checkIncludeCompletion(editor, isClangCodeModel):
missing, noProposal, specialHandling = args
inclSnippet = currentLine.split("//#include")[-1].strip().strip('<"')
propShown = waitFor("object.exists(':popupFrame_TextEditor::GenericProposalWidget')", 2500)
if isClangCodeModel and inclSnippet in noProposal and JIRA.isBugStillOpen(15710):
test.xcompare(propShown, False, ("Proposal widget should not be shown for (%s) "
"but because of QTCREATORBUG-15710 it currently is") % inclSnippet)
else:
test.compare(not propShown, inclSnippet in missing or inclSnippet in noProposal,
"Proposal widget is (not) shown as expected (%s)" % inclSnippet)
test.compare(not propShown, inclSnippet in missing or inclSnippet in noProposal,
"Proposal widget is (not) shown as expected (%s)" % inclSnippet)
if propShown:
proposalListView = waitForObject(':popupFrame_Proposal_QListView')
if inclSnippet in specialHandling:
......@@ -131,12 +127,8 @@ def checkSymbolCompletion(editor, isClangCodeModel):
if isClangCodeModel and JIRA.isBugStillOpen(15639):
timeout = 5000
propShown = waitFor("object.exists(':popupFrame_TextEditor::GenericProposalWidget')", timeout)
if isClangCodeModel and symbol in missing and not "(" in symbol and JIRA.isBugStillOpen(15710):
test.xcompare(propShown, False, ("Proposal widget should not be shown for (%s) "
"but because of QTCREATORBUG-15710 it currently is") % symbol)
else:
test.compare(not propShown, symbol in missing,
"Proposal widget is (not) shown as expected (%s)" % symbol)
test.compare(not propShown, symbol in missing,
"Proposal widget is (not) shown as expected (%s)" % symbol)
found = []
if propShown:
proposalListView = waitForObject(':popupFrame_Proposal_QListView')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment