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

Squish: Don't let test run into ScriptError...

Browse Source 
...if former verification already fails.

Change-Id: I0a5d60f6a91158ed1decdedd8aa7e98ac047a44b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
Christian Stenger
2013-05-30 14:36:54 +02:00
parent 3ed5fc2b8f
commit 322853ec69
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/system/suite_QMLS/tst_QMLS01/test.py
View File

@@ -62,8 +62,10 @@ def testSuggestionsAuto(lineText, textToType, expectedText, keyToUseSuggestion):
if not __beginTestSuggestions__(editorArea, lineText, textToType): if not __beginTestSuggestions__(editorArea, lineText, textToType):
return False return False
# check if suggestions are shown # check if suggestions are shown
test.verify(checkIfObjectExists(":popupFrame_Proposal_QListView"), if not test.verify(checkIfObjectExists(":popupFrame_Proposal_QListView"),
"Verifying if suggestions in automatic mode are shown.") "Verifying if suggestions in automatic mode are shown."):
__endTestSuggestions__(editorArea)
return False
# verify proposed suggestions # verify proposed suggestions
verifySuggestions(textToType) verifySuggestions(textToType)
# test if suggestion can be selected with keyToUseSuggestion # test if suggestion can be selected with keyToUseSuggestion
@@ -83,8 +85,10 @@ def testSuggestionsManual(lineText, textToType, expectedText):
if not __beginTestSuggestions__(editorArea, lineText, textToType): if not __beginTestSuggestions__(editorArea, lineText, textToType):
return False return False
# wait if automatic popup displayed - if yes then fail, because we are in manual mode # wait if automatic popup displayed - if yes then fail, because we are in manual mode
test.verify(checkIfObjectExists(":popupFrame_Proposal_QListView", False), if not test.verify(checkIfObjectExists(":popupFrame_Proposal_QListView", False),
"Verifying if suggestions in manual mode are properly not automatically shown") "Verifying if suggestions in manual mode are not automatically shown"):
__endTestSuggestions__(editorArea)
return False
# test if suggestion can be invoked manually # test if suggestion can be invoked manually
if platform.system() == "Darwin": if platform.system() == "Darwin":
type(editorArea, "<Meta+Space>") type(editorArea, "<Meta+Space>")