diff options
author | Robert Loehning <robert.loehning@digia.com> | 2014-08-18 14:37:17 +0200 |
---|---|---|
committer | Robert Loehning <robert.loehning@digia.com> | 2014-08-18 15:20:27 +0200 |
commit | 742db5115cd58e9f00b6f4a1323dbb5f416d6319 (patch) | |
tree | 661ffbd5c417e841d3ee8d5c857df5d1bbd910a8 /tests | |
parent | 996a999b551ff64024c820a2ead66909a1372a19 (diff) |
Squish: Use small letters in shortcuts
Following Squish documentation. Capital letters even caused
problems in nativeType().
Change-Id: I902984da40c7b57c1c40d35c2cd183e95481f1cf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/system/shared/editor_utils.py | 2 | ||||
-rw-r--r-- | tests/system/shared/utils.py | 2 | ||||
-rw-r--r-- | tests/system/suite_CSUP/tst_CSUP04/test.py | 2 | ||||
-rw-r--r-- | tests/system/suite_CSUP/tst_CSUP05/test.py | 2 | ||||
-rw-r--r-- | tests/system/suite_QMLS/tst_QMLS01/test.py | 8 | ||||
-rw-r--r-- | tests/system/suite_QMLS/tst_QMLS03/test.py | 2 | ||||
-rw-r--r-- | tests/system/suite_QMLS/tst_QMLS08/test.py | 6 | ||||
-rw-r--r-- | tests/system/suite_editors/tst_basic_cpp_support/test.py | 6 | ||||
-rw-r--r-- | tests/system/suite_editors/tst_qml_indent/test.py | 8 |
9 files changed, 19 insertions, 19 deletions
diff --git a/tests/system/shared/editor_utils.py b/tests/system/shared/editor_utils.py index d29465d2df2..125234c06ce 100644 --- a/tests/system/shared/editor_utils.py +++ b/tests/system/shared/editor_utils.py @@ -115,7 +115,7 @@ def markText(editor, direction, typeCount=1): # works for all standard editors def replaceEditorContent(editor, newcontent): - type(editor, "<Ctrl+A>") + type(editor, "<Ctrl+a>") type(editor, "<Delete>") type(editor, newcontent) diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index 913e5b2fbfa..1c457dab2c6 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -289,7 +289,7 @@ def addHelpDocumentation(which): if listWidget.count > 0: rect = listWidget.visualItemRect(listWidget.item(0)) mouseClick(listWidget, rect.x+5, rect.y+5, 0, Qt.LeftButton) - type(listWidget, "<Ctrl+A>") + type(listWidget, "<Ctrl+a>") mouseClick(waitForObject("{type='QPushButton' name='removeButton' visible='1'}"), 5, 5, 0, Qt.LeftButton) for qch in which: clickButton(waitForObject("{type='QPushButton' name='addButton' visible='1' text='Add...'}")) diff --git a/tests/system/suite_CSUP/tst_CSUP04/test.py b/tests/system/suite_CSUP/tst_CSUP04/test.py index 16217a52970..dd8fa406d57 100644 --- a/tests/system/suite_CSUP/tst_CSUP04/test.py +++ b/tests/system/suite_CSUP/tst_CSUP04/test.py @@ -71,7 +71,7 @@ def main(): return for i in range(4): type(editorWidget, "<Left>") - type(editorWidget, "<Ctrl+Shift+U>") + type(editorWidget, "<Ctrl+Shift+u>") # wait until search finished and verify search results waitForSearchResults() validateSearchResult(3) diff --git a/tests/system/suite_CSUP/tst_CSUP05/test.py b/tests/system/suite_CSUP/tst_CSUP05/test.py index c853e37e52f..32271b0ae73 100644 --- a/tests/system/suite_CSUP/tst_CSUP05/test.py +++ b/tests/system/suite_CSUP/tst_CSUP05/test.py @@ -60,7 +60,7 @@ def main(): return type(editorWidget, "<Left>") markText(editorWidget, "Left", 6) - type(editorWidget, "<Ctrl+F>") + type(editorWidget, "<Ctrl+f>") # verify if find toolbar exists and if search text contains selected word test.verify(checkIfObjectExists(":*Qt Creator.Find_Find::Internal::FindToolBar"), "Verifying if: Find/Replace pane is displayed at the bottom of the view.") diff --git a/tests/system/suite_QMLS/tst_QMLS01/test.py b/tests/system/suite_QMLS/tst_QMLS01/test.py index 3e1c8d26b95..57319fe89d7 100644 --- a/tests/system/suite_QMLS/tst_QMLS01/test.py +++ b/tests/system/suite_QMLS/tst_QMLS01/test.py @@ -33,8 +33,8 @@ source("../../shared/suites_qtta.py") # go to proper line, make backup, type needed text def __beginTestSuggestions__(editorArea, lineText, textToType): # make source code backup to clipboard - type(editorArea, "<Ctrl+A>") - type(editorArea, "<Ctrl+C>") + type(editorArea, "<Ctrl+a>") + type(editorArea, "<Ctrl+c>") # place cursor to proper position and start typing if not placeCursorToLine(editorArea, lineText): return False @@ -53,8 +53,8 @@ def verifySuggestions(textToType): # restore source code from clipboard backup def __endTestSuggestions__(editorArea): - type(editorArea, "<Ctrl+A>") - type(editorArea, "<Ctrl+V>") + type(editorArea, "<Ctrl+a>") + type(editorArea, "<Ctrl+v>") def testSuggestionsAuto(lineText, textToType, expectedText, keyToUseSuggestion): # get editor diff --git a/tests/system/suite_QMLS/tst_QMLS03/test.py b/tests/system/suite_QMLS/tst_QMLS03/test.py index bec51c5100d..ee9d5970591 100644 --- a/tests/system/suite_QMLS/tst_QMLS03/test.py +++ b/tests/system/suite_QMLS/tst_QMLS03/test.py @@ -132,7 +132,7 @@ def main(): return for i in range(5): type(editorArea, "<Left>") - type(editorArea, "<Ctrl+Shift+U>") + type(editorArea, "<Ctrl+Shift+u>") # check if usage was properly found expectedResults = [ExpectedResult("color-animation.qml", 87, "SequentialAnimation on opacity {")] resultsView = waitForObject(":Qt Creator_Find::Internal::SearchResultTreeView") diff --git a/tests/system/suite_QMLS/tst_QMLS08/test.py b/tests/system/suite_QMLS/tst_QMLS08/test.py index 8e14e7e1b6c..415b5d13c7a 100644 --- a/tests/system/suite_QMLS/tst_QMLS08/test.py +++ b/tests/system/suite_QMLS/tst_QMLS08/test.py @@ -74,13 +74,13 @@ def main(): if not verifyIndentation(editorArea): return # cancel indentation - type(editorArea, "<Ctrl+A>") + type(editorArea, "<Ctrl+a>") for i in range(5): type(editorArea, "<Shift+Backtab>") # select unindented block - type(editorArea, "<Ctrl+A>") + type(editorArea, "<Ctrl+a>") # do indentation - type(editorArea, "<Ctrl+I>") + type(editorArea, "<Ctrl+i>") # verify invoked indentation if not verifyIndentation(editorArea): return diff --git a/tests/system/suite_editors/tst_basic_cpp_support/test.py b/tests/system/suite_editors/tst_basic_cpp_support/test.py index 22187c8d037..6534cb7436c 100644 --- a/tests/system/suite_editors/tst_basic_cpp_support/test.py +++ b/tests/system/suite_editors/tst_basic_cpp_support/test.py @@ -63,7 +63,7 @@ def main(): # - Press F2 or select from the menu: Tools / C++ / Follow Symbol under Cursor # Creator will show you the declaration of the variable. - type(cppwindow, "<Ctrl+F>") + type(cppwindow, "<Ctrl+f>") type(waitForObject(":*Qt Creator.findEdit_Utils::FilterLineEdit"), " xi") type(waitForObject(":*Qt Creator.findEdit_Utils::FilterLineEdit"), "<Return>") __typeAndWaitForAction__(cppwindow, "<F2>") @@ -72,7 +72,7 @@ def main(): # - Move the cursor to a function call. # - Press F2 or select from the menu: Tools / C++ / Follow Symbol under Cursor # Creator will show you the definition of the function. - type(cppwindow, "<Ctrl+F>") + type(cppwindow, "<Ctrl+f>") clickButton(waitForObject(":*Qt Creator_Utils::IconButton")) type(waitForObject(":*Qt Creator.findEdit_Utils::FilterLineEdit"), "freefunc2") type(waitForObject(":*Qt Creator.findEdit_Utils::FilterLineEdit"), "<Return>") @@ -94,7 +94,7 @@ def main(): else: type(cppwindow, "<Ctrl+Home>") - type(cppwindow, "<Ctrl+F>") + type(cppwindow, "<Ctrl+f>") clickButton(waitForObject(":*Qt Creator_Utils::IconButton")) type(waitForObject(":*Qt Creator.findEdit_Utils::FilterLineEdit"), "Dummy::Dummy") # Take us to the second instance diff --git a/tests/system/suite_editors/tst_qml_indent/test.py b/tests/system/suite_editors/tst_qml_indent/test.py index 9f163542892..f9ee862be52 100644 --- a/tests/system/suite_editors/tst_qml_indent/test.py +++ b/tests/system/suite_editors/tst_qml_indent/test.py @@ -65,9 +65,9 @@ def prepareQmlFile(): markText(editor, "Ctrl+End") # unmark the last line type(editor, "<Shift+Up>") - type(editor, "<Ctrl+C>") + type(editor, "<Ctrl+c>") for j in range(10): - type(editor, "<Ctrl+V>") + type(editor, "<Ctrl+v>") # assume the current editor content to be indented correctly originalText = "%s" % editor.plainText indented = editor.plainText @@ -80,10 +80,10 @@ def testReIndent(originalText): editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget") correctIndented = len(originalText) incorrectIndented = correctIndented + 4004 - type(editor, "<Ctrl+A>") + type(editor, "<Ctrl+a>") test.log("calling re-indent") starttime = datetime.utcnow() - type(editor, "<Ctrl+I>") + type(editor, "<Ctrl+i>") waitFor("len(str(editor.plainText)) in (incorrectIndented, correctIndented)", 25000) endtime = datetime.utcnow() test.xverify(originalText == str(editor.plainText), |