From a85f64a7c6b30dafee9f4466d1d1f1b0f7fa2d95 Mon Sep 17 00:00:00 2001 From: Christian Stenger <christian.stenger@digia.com> Date: Mon, 17 Feb 2014 14:21:32 +0100 Subject: [PATCH] Squish: Fix DiffEditor related object types Change-Id: I295dc127a11e10496d441438feb7d1b8e15994b6 Reviewed-by: Robert Loehning <robert.loehning@digia.com> --- tests/system/objects.map | 6 +++--- tests/system/suite_tools/tst_git_local/test.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/system/objects.map b/tests/system/objects.map index 50e69c70413..20e6055b4e2 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -151,9 +151,9 @@ :Qt Creator_Core::Internal::ProgressBar {type='Core::Internal::ProgressBar' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Core::OutputWindow {type='Core::OutputWindow' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_CppEditor::Internal::CPPEditorWidget {type='CppEditor::Internal::CPPEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} -:Qt Creator_DiffEditor::DiffViewEditorWidget {type='DiffEditor::DiffViewEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} -:Qt Creator_DiffEditor::DiffViewEditorWidget2 {occurrence='2' type='DiffEditor::DiffViewEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} -:Qt Creator_DiffEditor::Internal::DiffShowEditorWidget {type='DiffEditor::Internal::DiffShowEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Qt Creator_DiffEditor::Internal::DescriptionEditorWidget {type='DiffEditor::Internal::DescriptionEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Qt Creator_DiffEditor::SideDiffEditorWidget {type='DiffEditor::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +: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'} diff --git a/tests/system/suite_tools/tst_git_local/test.py b/tests/system/suite_tools/tst_git_local/test.py index a67d24783bb..7b6099caa97 100644 --- a/tests/system/suite_tools/tst_git_local/test.py +++ b/tests/system/suite_tools/tst_git_local/test.py @@ -96,7 +96,7 @@ def verifyClickCommit(): expected = 'Git Show "%s"' % commit test.verify(waitFor('str(fileName.currentText) == expected', 5000), "Verifying editor switches to Git Show.") - diffShow = waitForObject(":Qt Creator_DiffEditor::Internal::DiffShowEditorWidget") + diffShow = waitForObject(":Qt Creator_DiffEditor::Internal::DescriptionEditorWidget") waitFor('len(str(diffShow.plainText)) != 0', 5000) show = str(diffShow.plainText) expected = [{"commit %s" % commit:False}, @@ -110,8 +110,8 @@ def verifyClickCommit(): test.verify(re.match(expLine, line), "Verifying commit header line '%s'" % line) else: test.compare(line, expLine, "Verifying commit header line.") - changed = waitForObject(":Qt Creator_DiffEditor::DiffViewEditorWidget") - original = waitForObject(":Qt Creator_DiffEditor::DiffViewEditorWidget2") + changed = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidget") + original = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidget2") waitFor('str(changed.plainText) != "Waiting for data..." ' 'and str(original.plainText) != "Waiting for data..."', 5000) # content of diff editors is merge of modified files -- GitLab