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

Make Help mode Squish-testable again

Browse Source 
Change-Id: I09bcdb63c44c4728cce63d5a5c2b29bf9fc96ac1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Robert Loehning
2020-10-12 21:19:44 +02:00
parent c510cf79d8
commit 89d36b418a
3 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/help/qlitehtml/qlitehtmlwidget.h
View File

@@ -41,10 +41,11 @@ public:
explicit QLiteHtmlWidget(QWidget *parent = nullptr); explicit QLiteHtmlWidget(QWidget *parent = nullptr);
~QLiteHtmlWidget() override; ~QLiteHtmlWidget() override;
// declaring the getters Q_INVOKABLE to make them Squish-testable
void setUrl(const QUrl &url); void setUrl(const QUrl &url);
QUrl url() const; Q_INVOKABLE QUrl url() const;
void setHtml(const QString &content); void setHtml(const QString &content);
QString title() const; Q_INVOKABLE QString title() const;
void setZoomFactor(qreal scale); void setZoomFactor(qreal scale);
qreal zoomFactor() const; qreal zoomFactor() const;
@@ -62,7 +63,8 @@ public:
using ResourceHandler = std::function<QByteArray(QUrl)>; using ResourceHandler = std::function<QByteArray(QUrl)>;
void setResourceHandler(const ResourceHandler &handler); void setResourceHandler(const ResourceHandler &handler);
QString selectedText() const; // declaring this Q_INVOKABLE to make it Squish-testable
Q_INVOKABLE QString selectedText() const;
signals: signals:
void linkClicked(const QUrl &url); void linkClicked(const QUrl &url);

6
tests/system/shared/utils.py
View File

@@ -670,9 +670,9 @@ def getChildByClass(parent, classToSearchFor, occurrence=1):
return children[occurrence - 1] return children[occurrence - 1]
def getHelpViewer(): def getHelpViewer():
return waitForObject("{type='Help::Internal::TextBrowserHelpWidget' unnamed='1' " return waitForObject("{type='QLiteHtmlWidget' unnamed='1' visible='1' "
"visible='1' window=':Qt Creator_Core::Internal::MainWindow'}", "window=':Qt Creator_Core::Internal::MainWindow'}",
1000) 1000)
def getHelpTitle(): def getHelpTitle():
return str(getHelpViewer().documentTitle) return str(getHelpViewer().title())

16
tests/system/suite_HELP/tst_HELP04/test.py
View File

@@ -32,27 +32,17 @@ urlDictionary = { "abundance":"qthelp://com.trolltech.qt.487/qdoc/gettingstarted
def __getSelectedText__(): def __getSelectedText__():
hv = getHelpViewer()
try: try:
return hv.textCursor().selectedText() return str(getHelpViewer().selectedText())
except:
pass
try:
test.log("Falling back to searching for selection in HTML.")
return getHighlightsInHtml(str(hv.toHtml()))
except: except:
test.warning("Could not get highlighted text.") test.warning("Could not get highlighted text.")
return str("") return str("")
def __getUrl__(): def __getUrl__():
helpViewer = getHelpViewer()
try: try:
url = helpViewer.url url = getHelpViewer().url()
except: except:
try: return ""
url = helpViewer.source
except:
return ""
return str(url.scheme) + "://" + str(url.host) + str(url.path) return str(url.scheme) + "://" + str(url.host) + str(url.path)
def getHighlightsInHtml(htmlCode): def getHighlightsInHtml(htmlCode):