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

Squish: Correct hitting "Do Not Show Again"

Browse Source 
Original implementation just made it work for the common use case.
If the order or the selected buttons differed from the common case
this failed.
Beside this it is later on more easily to extend.

Change-Id: I581b0af2579fa728a81b9946028ade5559f17fd8
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
This commit is contained in:
Christian Stenger
2021-02-25 11:57:43 +01:00
parent ef25cfac59
commit 412b661672
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/system/objects.map
View File

@@ -2,7 +2,6 @@
:*Qt Creator.Cancel Build_QToolButton {text='Cancel Build' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:*Qt Creator.Clear_QToolButton {text='Clear' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:*Qt Creator.Continue_Core::Internal::FancyToolButton {name='Debug.Button' toolTip?='Continue *' type='Core::Internal::FancyToolButton' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:*Qt Creator.Do Not Show Again_QToolButton {text='Do Not Show Again' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:*Qt Creator.Find_Find::Internal::FindToolBar {name='Core__Internal__FindWidget' type='Core::Internal::FindToolBar' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Find'}
:*Qt Creator.FormEditorStack_Designer::Internal::FormEditorStack {name='FormEditorStack' type='Designer::Internal::FormEditorStack' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:*Qt Creator.Interrupt_Core::Internal::FancyToolButton {name='Debug.Button' toolTip='Interrupt' type='Core::Internal::FancyToolButton' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}

12
tests/system/shared/qtcreator.py
View File

@@ -54,6 +54,14 @@ source("../../shared/clang.py")
source("../../shared/welcome.py")
source("../../shared/workarounds.py") # include this at last
def __closeInfoBarEntry__(leftButtonText):
toolButton = ("text='%s' type='QToolButton' unnamed='1' visible='1' "
"window=':Qt Creator_Core::Internal::MainWindow'")
doNotShowAgain = toolButton % "Do Not Show Again"
leftWidget = "leftWidget={%s}" % (toolButton % leftButtonText)
clickButton(waitForObject("{%s %s}" % (doNotShowAgain, leftWidget)))
# additionalParameters must be a list or tuple of strings or None
def startQC(additionalParameters=None, withPreparedSettingsPath=True, closeLinkToQt=True, cancelTour=True):
global SettingsPath
@@ -69,9 +77,9 @@ def startQC(additionalParameters=None, withPreparedSettingsPath=True, closeLinkT
if closeLinkToQt or cancelTour:
progressBarWait(3000) # wait for the "Updating documentation" progress bar
if closeLinkToQt:
clickButton(waitForObject(":*Qt Creator.Do Not Show Again_QToolButton"))
__closeInfoBarEntry__("Link with Qt")
if cancelTour:
clickButton(waitForObject(":*Qt Creator.Do Not Show Again_QToolButton"))
__closeInfoBarEntry__("Take UI Tour")
return appContext;
def startedWithoutPluginError():