From cc63b3b47ac53573b9ad475a07d13f97541c3fb7 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 24 Jun 2020 19:01:48 +0200 Subject: [PATCH] Squish: Update menu items Change-Id: Ibbca07fb02092ce829246e99b2365b513b1fa4e0 Reviewed-by: Christian Stenger --- tests/system/shared/debugger.py | 4 ++-- tests/system/suite_debugger/tst_debug_empty_main/test.py | 2 +- tests/system/suite_debugger/tst_qml_js_console/test.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/system/shared/debugger.py b/tests/system/shared/debugger.py index 930e74980f3..5c9f01d5f2c 100644 --- a/tests/system/shared/debugger.py +++ b/tests/system/shared/debugger.py @@ -51,14 +51,14 @@ def handleDebuggerWarnings(config, isMsvcBuild=False): clickButton("{text='OK' type='QPushButton' unnamed='1' visible='1' window=%s}" % msgBox) def takeDebuggerLog(): - invokeMenuItem("Window", "Views", "Global Debugger Log") + invokeMenuItem("View", "Views", "Global Debugger Log") debuggerLogWindow = waitForObject("{container=':DebugModeWidget.Debugger Log_QDockWidget' " "type='Debugger::Internal::DebuggerPane' unnamed='1' visible='1'}") debuggerLog = str(debuggerLogWindow.plainText) mouseClick(debuggerLogWindow) invokeContextMenuItem(debuggerLogWindow, "Clear Contents") waitFor("str(debuggerLogWindow.plainText)==''", 5000) - invokeMenuItem("Window", "Views", "Global Debugger Log") + invokeMenuItem("View", "Views", "Global Debugger Log") return debuggerLog # function to set breakpoints for the current project diff --git a/tests/system/suite_debugger/tst_debug_empty_main/test.py b/tests/system/suite_debugger/tst_debug_empty_main/test.py index f71cd45d445..2d72b81ee49 100644 --- a/tests/system/suite_debugger/tst_debug_empty_main/test.py +++ b/tests/system/suite_debugger/tst_debug_empty_main/test.py @@ -52,7 +52,7 @@ def main(): workingDir = tempDir() projectName = createEmptyQtProject(workingDir, "EmptyQtProj", targets) waitForProjectParsing() - addFileToProject(os.path.join(workingDir, projectName), " C++", "C++ Source File", "main.cpp") + addFileToProject(os.path.join(workingDir, projectName), " C/C++", "C/C++ Source File", "main.cpp") editor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget") typeLines(editor, ["int main() {"]) invokeMenuItem("File", "Save All") diff --git a/tests/system/suite_debugger/tst_qml_js_console/test.py b/tests/system/suite_debugger/tst_qml_js_console/test.py index 040ceed7053..206e3f8a25b 100644 --- a/tests/system/suite_debugger/tst_qml_js_console/test.py +++ b/tests/system/suite_debugger/tst_qml_js_console/test.py @@ -152,7 +152,7 @@ def main(): invokeMenuItem("View", "Output Panes", "QML Debugger Console") # Window might be too small to show Locals, so close what we don't need for view in ("Stack", "Breakpoints", "Expressions"): - invokeMenuItem("Window", "Views", view) + invokeMenuItem("View", "Views", view) # color and float values have additional ZERO WIDTH SPACE (\u200b), different usage of # whitespaces inside expressions is part of the test checks = [("color", u"#\u200b008000"), ("width", "50"),