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

SquishTests: Adapt to changed ui

Browse Source 
C and C++ compiler are now treated as related and are used
as bundled unit.

Change-Id: I3d2539067eb9245d734c6b98c46e8e479fdef965
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
This commit is contained in:
Christian Stenger
2024-08-06 07:49:21 +02:00
committed by Robert Löhning
parent ed577701dd
commit 270a0026ae
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/system/objects.map
View File

@@ -33,16 +33,14 @@
:Build and Run.Save all files before build_QCheckBox {container=':Build and Run_QGroupBox' text='Save all files before build' type='QCheckBox' unnamed='1' visible='1'}
:Build and Run_QGroupBox {container=':qt_tabwidget_stackedwidget_QScrollArea' name='Build and Run' type='QGroupBox' visible='1'}
:BuildAndRun_QTreeView {container=':qt_tabwidget_stackedwidget_QWidget' type='QTreeView' unnamed='1' visible='1'}
:CCompiler:_QComboBox {container=':qt_tabwidget_stackedwidget_QWidget' leftWidget=':CCompiler:_QLabel' type='QComboBox' unnamed='1' visible='1'}
:CCompiler:_QLabel {container=':qt_tabwidget_stackedwidget_QWidget' text='C:' type='QLabel' unnamed='1' visible='1'}
:Cannot Open Project.OK_QPushButton {text='OK' type='QPushButton' unnamed='1' visible='1' window=':Cannot Open Project_QMessageBox'}
:Cannot Open Project.Show Details..._QPushButton {text='Show Details...' type='QPushButton' unnamed='1' visible='1' window=':Cannot Open Project_QMessageBox'}
:Cannot Open Project_QMessageBox {text?='Failed to open project in *' type='QMessageBox' unnamed='1' visible='1'}
:Cannot Open Project_QTextEdit {type='QTextEdit' unnamed='1' visible='1' window=':Cannot Open Project_QMessageBox'}
:Close Debugging Session.Yes_QPushButton {text='Yes' type='QPushButton' unnamed='1' visible='1' window=':Close Debugging Session_Utils::CheckableMessageBox'}
:Close Debugging Session_Utils::CheckableMessageBox {type='Utils::CheckableMessageBox' unnamed='1' visible='1' windowTitle='Close Debugging Session'}
:CppCompiler:_QComboBox {container=':qt_tabwidget_stackedwidget_QWidget' leftWidget=':CppCompiler:_QLabel' type='QComboBox' unnamed='1' visible='1'}
:CppCompiler:_QLabel {container=':qt_tabwidget_stackedwidget_QWidget' text='C++:' type='QLabel' unnamed='1' visible='1'}
:Compiler:_QComboBox {container=':qt_tabwidget_stackedwidget_QWidget' leftWidget=':Compiler:_QLabel' type='QComboBox' unnamed='1' visible='1'}
:Compiler:_QLabel {container=':qt_tabwidget_stackedwidget_QWidget' text='C/C++:' type='QLabel' unnamed='1' visible='1'}
:CppTools__Internal__CompletionSettingsPage.Behavior_QGroupBox {container=':qt_tabwidget_stackedwidget_QScrollArea' name='Behavior' type='QGroupBox' visible='1'}
:DebugModeWidget.Debugger Log_QDockWidget {container=':Qt Creator.DebugModeWidget_QSplitter' name='GlobalLogDockWidget' type='QDockWidget' visible='1'}
:DebugModeWidget.Debugger.Docks.BreakDockWidget_QDockWidget {container=':Qt Creator.DebugModeWidget_QSplitter' name='Debugger.Docks.BreakpointManagerDockWidget' type='QDockWidget' visible='1'}

17
tests/system/suite_general/tst_default_settings/test.py
View File

@@ -113,7 +113,7 @@ def __iterateTree__(treeObjStr, additionalFunc, *additionalParameters):
def __compFunc__(it, foundComp, foundCompNames):
# skip sub section items (will continue on its children)
if str(it) == "C" or str(it) == "C++":
if str(it) == "C/C++":
return
try:
waitFor("object.exists(':Path.Utils_BaseValidatingLineEdit')", 1000)
@@ -174,17 +174,12 @@ def __kitFunc__(it, foundQt, foundCompNames):
test.compare(it, "Desktop (default)", "Verifying whether default Desktop kit has been created.")
if foundQt:
test.compare(qtVersionStr, foundQt, "Verifying if Qt versions match.")
cCompilerCombo = findObject(":CCompiler:_QComboBox")
test.compare(cCompilerCombo.enabled, cCompilerCombo.count > 1,
"Verifying whether C compiler combo is enabled/disabled correctly.")
cppCompilerCombo = findObject(":CppCompiler:_QComboBox")
test.compare(cppCompilerCombo.enabled, cppCompilerCombo.count > 1,
"Verifying whether C++ compiler combo is enabled/disabled correctly.")
compilerCombo = findObject(":Compiler:_QComboBox")
test.compare(compilerCombo.enabled, compilerCombo.count > 1,
"Verifying whether compiler combo is enabled/disabled correctly.")
test.verify(str(cCompilerCombo.currentText) in foundCompNames,
"Verifying if one of the found C compilers had been set.")
test.verify(str(cppCompilerCombo.currentText) in foundCompNames,
"Verifying if one of the found C++ compilers had been set.")
test.verify(str(compilerCombo.currentText) in foundCompNames,
"Verifying if one of the found compilers had been set.")
if currentSelectedTreeItem:
foundWarningOrError = warningOrError.search(str(currentSelectedTreeItem.toolTip))
if foundWarningOrError: