feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Adapt to ui changes

Browse Source 
Change-Id: Ie7cb2a80a5edfa135a1b5d1b44c365a5e6cf408b
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
This commit is contained in:
Christian Stenger
2022-10-11 10:54:51 +02:00
parent 0377f0f2ac
commit 9f0dcd71c4
9 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/system/objects.map
View File

@@ -214,7 +214,7 @@
:qt_tabwidget_stackedwidget_QScrollArea {container=':Options.qt_tabwidget_stackedwidget_QStackedWidget' type='QScrollArea' unnamed='1' visible='1'} :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'} :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'} :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:_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.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'} :scrollArea.Library not available_QLabel {name='qmlDebuggingWarningText' text?='Library not available*' type='QLabel' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}

2
tests/system/shared/debugger.py
View File

@@ -32,7 +32,7 @@ def handleDebuggerWarnings(config, isMsvcBuild=False):
def takeDebuggerLog(): def takeDebuggerLog():
invokeMenuItem("View", "Views", "Global Debugger Log") invokeMenuItem("View", "Views", "Global Debugger Log")
debuggerLogWindow = waitForObject("{container=':DebugModeWidget.Debugger Log_QDockWidget' " 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) debuggerLog = str(debuggerLogWindow.plainText)
mouseClick(debuggerLogWindow) mouseClick(debuggerLogWindow)
invokeContextMenuItem(debuggerLogWindow, "Clear Contents") invokeContextMenuItem(debuggerLogWindow, "Clear Contents")

2
tests/system/suite_APTW/tst_APTW03/test.py
View File

@@ -112,7 +112,7 @@ def main():
invokeContextMenuItem(editor, "Toggle Comment Selection") invokeContextMenuItem(editor, "Toggle Comment Selection")
virtualFunctionsAdded = True virtualFunctionsAdded = True
invokeMenuItem('File', 'Save All') invokeMenuItem('File', 'Save All')
selectFromLocator("t rebuild", "Rebuild (Rebuild Project)") selectFromLocator("t rebuild", "Rebuild Project")
waitForCompile(10000) waitForCompile(10000)
checkCompile() checkCompile()

3
tests/system/suite_debugger/tst_cli_output_console/test.py
View File

@@ -44,8 +44,7 @@ def main():
test.log("Running application") test.log("Running application")
setRunInTerminal(kit, False) setRunInTerminal(kit, False)
clickButton(waitForObject(":*Qt Creator.Run_Core::Internal::FancyToolButton")) clickButton(waitForObject(":*Qt Creator.Run_Core::Internal::FancyToolButton"))
outputButton = waitForObject(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton") ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton")
waitFor("outputButton.checked", 20000) # Not ensureChecked(), avoid race condition
outputWindow = waitForObject(":Qt Creator_Core::OutputWindow") outputWindow = waitForObject(":Qt Creator_Core::OutputWindow")
waitFor("'exited with code' in str(outputWindow.plainText) or \ waitFor("'exited with code' in str(outputWindow.plainText) or \
'The program has unexpectedly finished' in str(outputWindow.plainText)", 20000) 'The program has unexpectedly finished' in str(outputWindow.plainText)", 20000)

2
tests/system/suite_debugger/tst_debug_empty_main/test.py
View File

@@ -78,7 +78,7 @@ def performDebugging(projectName):
test.log("Selecting '%s' as build config" % config) test.log("Selecting '%s' as build config" % config)
verifyBuildConfig(kit, config, True, True, buildSystem="qmake") verifyBuildConfig(kit, config, True, True, buildSystem="qmake")
waitForObject(":*Qt Creator.Build Project_Core::Internal::FancyToolButton") waitForObject(":*Qt Creator.Build Project_Core::Internal::FancyToolButton")
selectFromLocator("t rebuild", "Rebuild (Rebuild All Projects)") selectFromLocator("t rebuild", "Rebuild All Projects")
waitForCompile() waitForCompile()
isMsvc = isMsvcConfig(kit) isMsvc = isMsvcConfig(kit)
clickButton(waitForObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton")) clickButton(waitForObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton"))

4
tests/system/suite_debugger/tst_simple_analyze/test.py
View File

@@ -42,11 +42,11 @@ def performTest(workingDir, projectName, availableConfigs):
for kit, config in availableConfigs: for kit, config in availableConfigs:
# switching from MSVC to MinGW build will fail on the clean step of 'Rebuild All Projects' # 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) # 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) verifyBuildConfig(kit, config, True, True, True)
test.log("Selected kit '%s'" % Targets.getStringForTarget(kit)) test.log("Selected kit '%s'" % Targets.getStringForTarget(kit))
# explicitly build before start debugging for adding the executable as allowed program to WinFW # 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() waitForCompile()
if not checkCompile(): if not checkCompile():
test.fatal("Compile had errors... Skipping current build config") test.fatal("Compile had errors... Skipping current build config")

2
tests/system/suite_debugger/tst_simple_debug/test.py
View File

@@ -37,7 +37,7 @@ def main():
test.log("Selecting '%s' as build config" % config) test.log("Selecting '%s' as build config" % config)
verifyBuildConfig(kit, config, True, True, True) verifyBuildConfig(kit, config, True, True, True)
# explicitly build before start debugging for adding the executable as allowed program to WinFW # 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) waitForCompile(300000)
if not checkCompile(): if not checkCompile():
test.fatal("Compile had errors... Skipping current build config") test.fatal("Compile had errors... Skipping current build config")

2
tests/system/suite_general/tst_build_speedcrunch/test.py
View File

@@ -36,7 +36,7 @@ def main():
test.log("Testing build configuration: " + config) test.log("Testing build configuration: " + config)
invokeMenuItem("Build", "Run qmake") invokeMenuItem("Build", "Run qmake")
waitForCompile() waitForCompile()
selectFromLocator("t rebuild", "Rebuild (Rebuild All Projects)") selectFromLocator("t rebuild", "Rebuild All Projects")
waitForCompile(300000) waitForCompile(300000)
checkCompile() checkCompile()
checkLastBuild() checkLastBuild()

2
tests/system/suite_general/tst_cmake_speedcrunch/test.py
View File

@@ -44,7 +44,7 @@ def main():
compareProjectTree(naviTreeView % "speedcrunch( \[\S+\])?", treeFile) compareProjectTree(naviTreeView % "speedcrunch( \[\S+\])?", treeFile)
# Invoke a rebuild of the application # 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 # Wait for, and test if the build succeeded
waitForCompile(300000) waitForCompile(300000)