Squish: Adapt to ui changes

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

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_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'}

View File

@@ -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")

View File

@@ -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()

View File

@@ -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)

View File

@@ -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"))

View File

@@ -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")

View File

@@ -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")

View File

@@ -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()

View File

@@ -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)