Skip to content

Commit 888869b

Browse files
committed
Added WindowWithEmbeddedViewTestWidget for hybrid tests
1 parent 7b6b70d commit 888869b

File tree

4 files changed

+79
-1
lines changed

4 files changed

+79
-1
lines changed
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#include "WindowWithEmbeddedViewTest.h"
2+
#include <QtWebKit/QWebView>
3+
4+
WindowWithEmbeddedViewTestWidget::WindowWithEmbeddedViewTestWidget(QWidget *parent) :
5+
QWidget(parent)
6+
{
7+
setWindowTitle("Test Window");
8+
pLineEdit = new QLineEdit();
9+
pLineEdit->setObjectName("inputURL");
10+
connect(pLineEdit, SIGNAL(returnPressed()), this, SLOT(loadHTML()));
11+
12+
pButton = new QPushButton("Go!");
13+
pButton->setObjectName("loadButton");
14+
connect(pButton, SIGNAL(clicked()), this, SLOT(loadHTML()));
15+
16+
pLabel = new QLabel("Here Will Be HTML Title");
17+
pLabel->setObjectName("labelTitle");
18+
pLabel->setVisible(true);
19+
20+
pView = new QWebView();
21+
pView->setObjectName("webView");
22+
connect(pView, SIGNAL(loadFinished(bool)), this, SLOT(setHTMLTitle()));
23+
24+
QHBoxLayout* hbl = new QHBoxLayout();
25+
hbl->addWidget(pLineEdit);
26+
hbl->addWidget(pButton);
27+
28+
QVBoxLayout *vbl = new QVBoxLayout(this);
29+
vbl->addLayout(hbl);
30+
vbl->addWidget(pLabel);
31+
vbl->addWidget(pView);
32+
this->setLayout(vbl);
33+
}
34+
35+
WindowWithEmbeddedViewTestWidget::~WindowWithEmbeddedViewTestWidget() {}
36+
37+
void WindowWithEmbeddedViewTestWidget::loadHTML() {
38+
pView->load(QUrl(pLineEdit->text()));
39+
}
40+
41+
void WindowWithEmbeddedViewTestWidget::setHTMLTitle() {
42+
pLabel->setText(pView->title());
43+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#ifndef WINDOWWITHEMBEDDEDVIEWTEST_H
2+
#define WINDOWWITHEMBEDDEDVIEWTEST_H
3+
4+
#include "CommonQtTestHeaders.h"
5+
6+
class QWebView;
7+
8+
class WindowWithEmbeddedViewTestWidget : public QWidget
9+
{
10+
Q_OBJECT
11+
public:
12+
explicit WindowWithEmbeddedViewTestWidget(QWidget *parent = 0);
13+
~WindowWithEmbeddedViewTestWidget();
14+
15+
public slots:
16+
void loadHTML();
17+
void setHTMLTitle();
18+
19+
private:
20+
QPushButton* pButton;
21+
QLineEdit* pLineEdit;
22+
QLabel *pLabel;
23+
QWebView *pView;
24+
25+
};
26+
27+
#endif // WINDOWWITHEMBEDDEDVIEWTEST_H

src/Test/main.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "StaleElementReferenceTest.h"
3232
#include "VisibilityTest.h"
3333
#include "BasicMouseInterfaceTest.h"
34+
#include "WindowWithEmbeddedViewTest.h"
3435

3536
#include "base/at_exit.h"
3637
#include "webdriver_server.h"
@@ -102,6 +103,7 @@ int main(int argc, char *argv[])
102103
widgetCreator->RegisterViewClass<StaleElementReferenceTestWidget>("StaleElementReferenceTestWidget");
103104
widgetCreator->RegisterViewClass<VisibilityTestWidget>("VisibilityTestWidget");
104105
widgetCreator->RegisterViewClass<BasicMouseInterfaceTestWidget>("BasicMouseInterfaceTestWidget");
106+
widgetCreator->RegisterViewClass<WindowWithEmbeddedViewTestWidget>("WindowWithEmbeddedViewTestWidget");
105107

106108
webdriver::ViewFactory::GetInstance()->AddViewCreator(widgetCreator);
107109

wd_test.gyp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
'-licuuc',
4545
'-licudata',
4646
'-licui18n',
47+
'-lQt5WebKit',
4748
],
4849
} ],
4950
['OS=="win"', {
@@ -95,6 +96,7 @@
9596
'-lpthread',
9697
'-lrt',
9798
'-ldl',
99+
'-lQtWebKit',
98100
],
99101
} ],
100102
[ 'OS=="win"', {
@@ -104,6 +106,7 @@
104106
'-l<(QT_LIB_PATH)/QtXmlPatterns4',
105107
'-l<(QT_LIB_PATH)/QtGui4',
106108
'-l<(QT_LIB_PATH)/QtCore4',
109+
'-l<(QT_LIB_PATH)/QtWebKit4',
107110
'-luser32.lib',
108111
'-lws2_32.lib',
109112
'-lshell32.lib',
@@ -180,7 +183,10 @@
180183
'<(INTERMEDIATE_DIR)/moc_VisibilityTest.cc',
181184
'src/Test/RestyledLabel.cc',
182185
'src/Test/DragableWidget.cc',
183-
'src/Test/BasicMouseInterfaceTest.cc'
186+
'src/Test/BasicMouseInterfaceTest.cc',
187+
'src/Test/WindowWithEmbeddedViewTest.cc',
188+
'src/Test/WindowWithEmbeddedViewTest.h',
189+
'<(INTERMEDIATE_DIR)/moc_WindowWithEmbeddedViewTest.cc'
184190
],
185191

186192
}, {

0 commit comments

Comments
 (0)