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

Make WidgetTips Squish-testable

Browse Source 
Change-Id: I337fdca3541c5b2fb8f09ab2d7721b8950c0bea9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2020-04-16 23:51:26 +02:00
parent 8c7a06efd5
commit 7c95e17436
4 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/utils/tooltip/tooltip.cpp
View File

@@ -107,6 +107,7 @@ void ToolTip::show(const QPoint &pos,
layout->setContentsMargins(0, 0, 0, 0);
tooltipWidget->setLayout(layout);
auto label = new QLabel;
label->setObjectName("qcWidgetTipTopLabel");
label->setTextFormat(format);
label->setText(content);
layout->addWidget(label);

5
src/plugins/texteditor/basehoverhandler.cpp
View File

@@ -163,10 +163,13 @@ void BaseHoverHandler::operateTooltip(TextEditorWidget *editorWidget, const QPoi
auto layout = new QVBoxLayout;
layout->setContentsMargins(0, 0, 0, 0);
auto label = new QLabel;
label->setObjectName("qcWidgetTipTopLabel");
label->setTextFormat(m_textFormat);
label->setText(m_toolTip);
layout->addWidget(label);
layout->addWidget(new QLabel("<hr/>" + helpContents));
auto helpContentLabel = new QLabel("<hr/>" + helpContents);
helpContentLabel->setObjectName("qcWidgetTipHelpLabel");
layout->addWidget(helpContentLabel);
Utils::ToolTip::show(point, layout, editorWidget, helpItem);
}
}

15
tests/system/shared/editor_utils.py
View File

@@ -159,7 +159,7 @@ def verifyHoveringOnEditor(editor, lines, additionalKeyPresses, expectedTypes, e
elif expectedType == "TextTip":
__handleTextTips__(tip, expectedVals, altVal)
elif expectedType == "WidgetTip":
test.warning("Sorry - WidgetTip checks aren't implemented yet.")
__handleWidgetTips__(tip, expectedVals)
sendEvent("QMouseEvent", editor, QEvent.MouseMove, 0, -50, Qt.NoButton, 0)
waitFor("isNull(tip)", 10000)
@@ -228,6 +228,19 @@ def __handleColorTips__(colTip, expectedColor, alternativeColor):
test.fail("ColorTip does not match - expected color '%X'%s got '%X'"
% (uint(cmp.rgb()), altColorText, uint(rgb.rgb())))
# helper function that handles verification of WidgetTip hoverings
# param widgetTip the WidgetTip object
# param expectedVals a dict holding property value pairs that must match
def __handleWidgetTips__(widgetTip, expectedVals):
toplabel = waitForObject("{type='QLabel' objectName='qcWidgetTipTopLabel' visible='1'}")
foundText = str(toplabel.text)
try:
helplabel = waitForObject("{type='QLabel' objectName='qcWidgetTipHelpLabel' visible='1'}", 1000)
foundText += str(helplabel.text)
except:
pass
test.compare(foundText, expectedVals["text"])
# function that checks whether all expected properties (including their values)
# match the given properties
# param properties a dict holding the properties to check

25
tests/system/suite_editors/tst_qml_editor/test.py
View File

@@ -122,35 +122,26 @@ def testHovering():
else:
home = "<Home>"
additionalKeyPresses = [home, "<Right>"]
expectedTypes = ["TextTip", "TextTip"]
expectedTypes = ["WidgetTip", "WidgetTip"]
expectedValues = [
{'text':'<table><tr><td valign=middle><p>FocusScope</p><hr/><p>\n<p>Explicitly '
'creates a focus scope </p></p></td><td>&nbsp;&nbsp;<img src=":/utils/tooltip/images/f1.png"></td></tr></table>'},
{'text':'<table><tr><td valign=middle><p>Rectangle</p><hr/><p>\n<p>Paints a filled rectangle with an '
'optional border </p></p></td><td>&nbsp;&nbsp;<img src=":/utils/tooltip/images/f1.png"></td></tr></table>'}
{'text':'FocusScope<hr/>\n<p>Explicitly creates a focus scope.</p>'},
{'text':'Rectangle<hr/>\n<p>Paints a filled rectangle with an optional border.</p>'}
]
alternativeValues = [{"text":"<p>FocusScope</p>"}, {"text":"<p>Rectangle</p>"}]
verifyHoveringOnEditor(editor, lines, additionalKeyPresses, expectedTypes, expectedValues, alternativeValues)
verifyHoveringOnEditor(editor, lines, additionalKeyPresses, expectedTypes, expectedValues)
test.log("Testing hovering properties")
openDocument(focusDocumentPath % "focus\\.qml")
editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget")
lines = ['focus:\s*true', 'color:\s*"black"', 'states:\s*State\s*\{', 'transitions:\s*Transition\s*\{']
expectedTypes = ["TextTip", "TextTip", "TextTip", "TextTip"]
expectedTypes = ["TextTip", "WidgetTip", "WidgetTip", "WidgetTip"]
expectedValues = [
{'text':'<table><tr><td valign=middle><p>boolean</p><hr/><p><p>This property indicates whether the item has focus '
'within the enclosing focus scope. If true, this item will gain active focus when the enclosing '
'focus scope gains active focus. In the following example, <tt>input</tt> will be given active focus '
'when <tt>scope</tt> gains active focus.</p></p></td><td>&nbsp;&nbsp;<img src=":/utils/tooltip/images/f1.png"'
'></td></tr></table>'},
{'text':'<table><tr><td valign=middle><p>string</p><hr/><p><p>This property holds the color used to fill the rectangle.'
'</p></p></td><td>&nbsp;&nbsp;<img src=":/utils/tooltip/images/f1.png"></td></tr></table>'},
{'text':'<table><tr><td valign=middle><p>State</p><hr/><p><p>This property holds the list of possible states for this item. '
'To change the state of this item, set the state property to one of these states, or set the state property '
'to an empty string to revert the item to its default state.'
'</p></p></td><td>&nbsp;&nbsp;<img src=":/utils/tooltip/images/f1.png"></td></tr></table>'},
{'text':'<table><tr><td valign=middle><p>Transition</p><hr/><p><p>This property holds the list of transitions for this item. '
'These define the transitions to be applied to the item whenever it changes its state.'
'</p></p></td><td>&nbsp;&nbsp;<img src=":/utils/tooltip/images/f1.png"></td></tr></table>'}
{'text':'string'},
{'text':'State'},
{'text':'Transition'}
]
alternativeValues = [{"text":"<p>boolean</p>"}, {"text":"<p>string</p>"},
{"text":"<p>State</p>"}, {"text":"<p>Transition</p>"}]