From 4c45e43916fa79e2048f0abb9353e56d53e18965 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 17 Sep 2014 19:15:49 +0200 Subject: [PATCH] Squish: Updates to keep suite_tools running Change-Id: Idb7a4c70c26aaf105ba2023d126fbc0f9f992e9e Reviewed-by: Christian Stenger --- tests/system/objects.map | 2 +- tests/system/suite_tools/tst_external_sort/test.py | 2 +- tests/system/suite_tools/tst_git_local/test.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/system/objects.map b/tests/system/objects.map index f47bb4a421e..245ab7fbcb4 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -159,7 +159,7 @@ :Qt Creator_DiffEditor::SideDiffEditorWidget2 {occurrence='2' type='DiffEditor::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_FilenameQComboBox {type='QComboBox' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Find::Internal::SearchResultTreeView {type='Core::Internal::SearchResultTreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} -:Qt Creator_Git::Internal::GitEditor {type='Git::Internal::GitEditor' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Qt Creator_Git::Internal::GitEditor {type='Git::Internal::GitEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Help::Internal::HelpViewer {type='Help::Internal::QtWebKitHelpWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_HelpSelector_QComboBox {occurrence='3' type='QComboBox' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Issues_Core::Internal::OutputPaneToggleButton {occurrence='1' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} diff --git a/tests/system/suite_tools/tst_external_sort/test.py b/tests/system/suite_tools/tst_external_sort/test.py index b3e09ddf19b..77a358c64f9 100644 --- a/tests/system/suite_tools/tst_external_sort/test.py +++ b/tests/system/suite_tools/tst_external_sort/test.py @@ -40,7 +40,7 @@ def main(): locale = "LC_ALL=C " sorted = getOutputFromCmdline("%ssort %s" % (locale, unsortedFile)).replace("\r", "") selectFromFileDialog(unsortedFile) - editor = waitForObject("{type='TextEditor::PlainTextEditorWidget' unnamed='1' " + editor = waitForObject("{type='TextEditor::BaseTextEditorWidget' unnamed='1' " "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}", 3000) placeCursorToLine(editor, "bbb") invokeMenuItem("Edit", "Select All") diff --git a/tests/system/suite_tools/tst_git_local/test.py b/tests/system/suite_tools/tst_git_local/test.py index a22779cc289..0e28957579a 100644 --- a/tests/system/suite_tools/tst_git_local/test.py +++ b/tests/system/suite_tools/tst_git_local/test.py @@ -152,7 +152,7 @@ def main(): clickButton(waitForObject(":Next_QPushButton")) readmeName += ".txt" __createProjectHandleLastPage__([readmeName], "Git", "") - replaceEditorContent(waitForObject(":Qt Creator_TextEditor::PlainTextEditorWidget"), + replaceEditorContent(waitForObject(":Qt Creator_TextEditor::BaseTextEditorWidget"), "Some important advice in the README") invokeMenuItem("File", "Save All") commitsInProject = list(commitMessages) # deep copy