diff --git a/tests/system/objects.map b/tests/system/objects.map index 93c2c8a5af2..5329fe8c0f9 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -214,7 +214,7 @@ :qt_tabwidget_stackedwidget_QScrollArea {container=':Options.qt_tabwidget_stackedwidget_QStackedWidget' type='QScrollArea' unnamed='1' visible='1'} :qt_tabwidget_stackedwidget_QWidget {container=':Options.qt_tabwidget_stackedwidget_QStackedWidget' type='QWidget' unnamed='1' visible='1'} :qtdirList_QTreeView {container=':qt_tabwidget_stackedwidget_QScrollArea' name='qtdirList' type='QTreeView' visible='1'} -:scrollArea.Details_Utils::DetailsButton {text='Details' type='Utils::DetailsButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:scrollArea.Details_Utils::DetailsButton {text='Details' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :scrollArea.Edit build configuration:_QComboBox {leftWidget=':scrollArea.Edit build configuration:_QLabel' type='QComboBox' unnamed='1' visible='1'} :scrollArea.Edit build configuration:_QLabel {text='Edit build configuration:' type='QLabel' unnamed='1' visible='1'} :scrollArea.Library not available_QLabel {name='qmlDebuggingWarningText' text?='Library not available*' type='QLabel' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} diff --git a/tests/system/shared/debugger.py b/tests/system/shared/debugger.py index 338d83cd758..2c4a44ae987 100644 --- a/tests/system/shared/debugger.py +++ b/tests/system/shared/debugger.py @@ -32,7 +32,7 @@ def handleDebuggerWarnings(config, isMsvcBuild=False): def takeDebuggerLog(): invokeMenuItem("View", "Views", "Global Debugger Log") debuggerLogWindow = waitForObject("{container=':DebugModeWidget.Debugger Log_QDockWidget' " - "type='Debugger::Internal::DebuggerPane' unnamed='1' visible='1'}") + "type='QPlainTextEdit' unnamed='1' visible='1'}") debuggerLog = str(debuggerLogWindow.plainText) mouseClick(debuggerLogWindow) invokeContextMenuItem(debuggerLogWindow, "Clear Contents") diff --git a/tests/system/suite_APTW/tst_APTW03/test.py b/tests/system/suite_APTW/tst_APTW03/test.py index 1202558a223..246dc37607e 100644 --- a/tests/system/suite_APTW/tst_APTW03/test.py +++ b/tests/system/suite_APTW/tst_APTW03/test.py @@ -112,7 +112,7 @@ def main(): invokeContextMenuItem(editor, "Toggle Comment Selection") virtualFunctionsAdded = True invokeMenuItem('File', 'Save All') - selectFromLocator("t rebuild", "Rebuild (Rebuild Project)") + selectFromLocator("t rebuild", "Rebuild Project") waitForCompile(10000) checkCompile() diff --git a/tests/system/suite_debugger/tst_cli_output_console/test.py b/tests/system/suite_debugger/tst_cli_output_console/test.py index 20db24d1866..95ccc298188 100644 --- a/tests/system/suite_debugger/tst_cli_output_console/test.py +++ b/tests/system/suite_debugger/tst_cli_output_console/test.py @@ -44,8 +44,7 @@ def main(): test.log("Running application") setRunInTerminal(kit, False) clickButton(waitForObject(":*Qt Creator.Run_Core::Internal::FancyToolButton")) - outputButton = waitForObject(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton") - waitFor("outputButton.checked", 20000) # Not ensureChecked(), avoid race condition + ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton") outputWindow = waitForObject(":Qt Creator_Core::OutputWindow") waitFor("'exited with code' in str(outputWindow.plainText) or \ 'The program has unexpectedly finished' in str(outputWindow.plainText)", 20000) 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 92d79ca2288..0bbf7fa755b 100644 --- a/tests/system/suite_debugger/tst_debug_empty_main/test.py +++ b/tests/system/suite_debugger/tst_debug_empty_main/test.py @@ -78,7 +78,7 @@ def performDebugging(projectName): test.log("Selecting '%s' as build config" % config) verifyBuildConfig(kit, config, True, True, buildSystem="qmake") waitForObject(":*Qt Creator.Build Project_Core::Internal::FancyToolButton") - selectFromLocator("t rebuild", "Rebuild (Rebuild All Projects)") + selectFromLocator("t rebuild", "Rebuild All Projects") waitForCompile() isMsvc = isMsvcConfig(kit) clickButton(waitForObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton")) diff --git a/tests/system/suite_debugger/tst_simple_analyze/test.py b/tests/system/suite_debugger/tst_simple_analyze/test.py index 8cb3abec1a1..3bd04a6a6ee 100644 --- a/tests/system/suite_debugger/tst_simple_analyze/test.py +++ b/tests/system/suite_debugger/tst_simple_analyze/test.py @@ -42,11 +42,11 @@ def performTest(workingDir, projectName, availableConfigs): for kit, config in availableConfigs: # switching from MSVC to MinGW build will fail on the clean step of 'Rebuild All Projects' # because of differences between MSVC's and MinGW's Makefile (so clean before changing kit) - selectFromLocator("t clean", "Clean (Clean Project)") + selectFromLocator("t clean", "Clean Project") verifyBuildConfig(kit, config, True, True, True) test.log("Selected kit '%s'" % Targets.getStringForTarget(kit)) # explicitly build before start debugging for adding the executable as allowed program to WinFW - selectFromLocator("t rebuild", "Rebuild (Rebuild All Projects)") + selectFromLocator("t rebuild", "Rebuild All Projects") waitForCompile() if not checkCompile(): test.fatal("Compile had errors... Skipping current build config") diff --git a/tests/system/suite_debugger/tst_simple_debug/test.py b/tests/system/suite_debugger/tst_simple_debug/test.py index 7b3c166028e..4cfbaa30d6b 100644 --- a/tests/system/suite_debugger/tst_simple_debug/test.py +++ b/tests/system/suite_debugger/tst_simple_debug/test.py @@ -37,7 +37,7 @@ def main(): test.log("Selecting '%s' as build config" % config) verifyBuildConfig(kit, config, True, True, True) # explicitly build before start debugging for adding the executable as allowed program to WinFW - selectFromLocator("t rebuild", "Rebuild (Rebuild All Projects)") + selectFromLocator("t rebuild", "Rebuild All Projects") waitForCompile(300000) if not checkCompile(): test.fatal("Compile had errors... Skipping current build config") diff --git a/tests/system/suite_general/tst_build_speedcrunch/test.py b/tests/system/suite_general/tst_build_speedcrunch/test.py index 0618f058914..5a606a837d7 100644 --- a/tests/system/suite_general/tst_build_speedcrunch/test.py +++ b/tests/system/suite_general/tst_build_speedcrunch/test.py @@ -36,7 +36,7 @@ def main(): test.log("Testing build configuration: " + config) invokeMenuItem("Build", "Run qmake") waitForCompile() - selectFromLocator("t rebuild", "Rebuild (Rebuild All Projects)") + selectFromLocator("t rebuild", "Rebuild All Projects") waitForCompile(300000) checkCompile() checkLastBuild() diff --git a/tests/system/suite_general/tst_cmake_speedcrunch/test.py b/tests/system/suite_general/tst_cmake_speedcrunch/test.py index 380993e233d..b74c3d5cc9b 100644 --- a/tests/system/suite_general/tst_cmake_speedcrunch/test.py +++ b/tests/system/suite_general/tst_cmake_speedcrunch/test.py @@ -44,7 +44,7 @@ def main(): compareProjectTree(naviTreeView % "speedcrunch( \[\S+\])?", treeFile) # Invoke a rebuild of the application - selectFromLocator("t rebuild", "Rebuild (Rebuild All Projects)") + selectFromLocator("t rebuild", "Rebuild All Projects") # Wait for, and test if the build succeeded waitForCompile(300000)