From 9c04c2c5312784ddc72c566b9b2d23aa1d4ef1de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonatan=20P=C3=A5lsson?= Date: Tue, 4 Mar 2014 15:30:14 +0100 Subject: Cleaned the tests a bit --- browser/browserconfig.cpp | 2 ++ browser/browserconfig.h | 2 +- browser/networkmanager.cpp | 1 + browser/unit-tests/browserdbus/testbrowserdbus.cpp | 42 +++++++++++----------- browser/unit-tests/browserdbus/testbrowserdbus.h | 8 ++--- 5 files changed, 30 insertions(+), 25 deletions(-) diff --git a/browser/browserconfig.cpp b/browser/browserconfig.cpp index c5d32b6..70f2ce5 100644 --- a/browser/browserconfig.cpp +++ b/browser/browserconfig.cpp @@ -19,12 +19,14 @@ template void BrowserConfig::setValue(BrowserConfig::BrowserConfig template void BrowserConfig::setValue(BrowserConfig::BrowserConfigKey, qlonglong); template void BrowserConfig::setValue(BrowserConfig::BrowserConfigKey, qulonglong); template void BrowserConfig::setValue(BrowserConfig::BrowserConfigKey, conn::brw::CACHE_POLICY); +template void BrowserConfig::setValue(BrowserConfig::BrowserConfigKey, bool); template int BrowserConfig::getValue(BrowserConfig::BrowserConfigKey); template QString BrowserConfig::getValue(BrowserConfig::BrowserConfigKey); template qlonglong BrowserConfig::getValue(BrowserConfig::BrowserConfigKey); template qulonglong BrowserConfig::getValue(BrowserConfig::BrowserConfigKey); template conn::brw::CACHE_POLICY BrowserConfig::getValue(BrowserConfig::BrowserConfigKey); +template bool BrowserConfig::getValue(BrowserConfig::BrowserConfigKey); BrowserConfig* BrowserConfig::m_config = NULL; diff --git a/browser/browserconfig.h b/browser/browserconfig.h index 2614af0..8a43bed 100644 --- a/browser/browserconfig.h +++ b/browser/browserconfig.h @@ -23,7 +23,7 @@ Q_OBJECT public: enum BrowserConfigKey { CONFIG_CACHEPOLICY, - CONFIG_STARTPAGE + CONFIG_STARTPAGE, }; static BrowserConfig* instance() { diff --git a/browser/networkmanager.cpp b/browser/networkmanager.cpp index 39fea62..e047138 100644 --- a/browser/networkmanager.cpp +++ b/browser/networkmanager.cpp @@ -130,6 +130,7 @@ void networkmanager::onAuthenticationRequired(QNetworkReply *reply, QAuthenticat void networkmanager::onSslErrors(QNetworkReply *reply, const QList & errors) { for (int i = 0; i < errors.size(); i++) { + m_isSslOk = false; conn::brw::SslError data = convertError (errors.at(i), reply); emit onSslErrorDialog(data); qDebug() << "SSL error; action required"; diff --git a/browser/unit-tests/browserdbus/testbrowserdbus.cpp b/browser/unit-tests/browserdbus/testbrowserdbus.cpp index 3744187..f8b0f1b 100644 --- a/browser/unit-tests/browserdbus/testbrowserdbus.cpp +++ b/browser/unit-tests/browserdbus/testbrowserdbus.cpp @@ -47,6 +47,7 @@ void TestBrowserDBus::testCallUninitialized() { void TestBrowserDBus::testGetTitle() { QSignalSpy spy (m_bdb, SIGNAL (pageloadingChanged(void))); m_bdb->createPageWindow(1,0,0,10,10); + m_bdb->loadurl(testFileUrl()); spy.wait(1000); QVERIFY (m_bdb->getTitle().compare("") != 0); } @@ -238,14 +239,12 @@ void TestBrowserDBus::testSelect() { QTest::qSleep(300); m_bdb->select(); QTest::qSleep(300); - QProcess::execute("xdotool getwindowname `xdotool getwindowfocus`"); } void TestBrowserDBus::testActivate() { m_bdb->createPageWindow(1,0,0,800,600); QTest::qSleep(300); m_bdb->activate(); QTest::qSleep(300); - QProcess::execute("xdotool getwindowname `xdotool getwindowfocus`"); } void TestBrowserDBus::testConfirmDialog() { @@ -311,13 +310,16 @@ void TestBrowserDBus::testGetPrevEnteredValues() { m_bdb->createPageWindow(1,0,0,800,600); m_bdb->loadurl(testFileUrl()); QTest::qSleep(300); - QProcess::execute("xdotool mousemove 200 375"); + QProcess::execute("xdotool mousemove 200 350"); QProcess::execute("xdotool click 1"); QTest::qSleep(300); m_bdb->inputText(conn::brw::DR_OK, "Hello world"); QTest::qSleep(300); QStringList list = m_bdb->getPrevEnteredValues("input", "", conn::brw::IET_TEXT); QVERIFY(list.contains("Hello world")); + + QStringList list2 = m_bdb->getPrevEnteredValues("input", "ello", conn::brw::IET_TEXT); + QVERIFY(list2.contains("Hello world")); } void TestBrowserDBus::testGetsNotifiedWhenSelectIsSelected() { @@ -335,7 +337,7 @@ void TestBrowserDBus::testGetsNotifiedWhenSelectIsSelected() { qDebug() << options.at(i).strValue; } } - +/* void TestBrowserDBus::testGetsNotifiedOnAuthDialog() { QSignalSpy spy (m_bdb, SIGNAL(onAuthenticationDialog(const conn::brw::AuthenticationData&))); m_bdb->createPageWindow(1,0,0,800,600); @@ -343,26 +345,13 @@ void TestBrowserDBus::testGetsNotifiedOnAuthDialog() { QVERIFY(spy.wait(1000)); } -void TestBrowserDBus::testCanCloseAuthDialog() { - QSignalSpy spy (m_bdb, SIGNAL(onAuthenticationDialog(const conn::brw::AuthenticationData&))); - m_bdb->createPageWindow(1,0,0,800,600); - m_bdb->loadurl("http://www.httpwatch.com/httpgallery/authentication/authenticatedimage/default.aspx"); - QVERIFY(spy.wait(1000)); - - conn::brw::AuthenticationData d; - d.strUserName = "httpwatch"; - d.strPassword = QString(qrand()); - qDebug() << ": user" << d.strUserName << "password:" << d.strPassword; - m_bdb->closeAuthenticationDialog(conn::brw::DR_OK, d); -} - void TestBrowserDBus::testGetsNotifiedOnBadSSL() { QSignalSpy spy (m_bdb, SIGNAL(onSslErrorDialog(const conn::brw::SslError&))); m_bdb->createPageWindow(1,0,0,800,600); m_bdb->loadurl("https://tv.eurosport.com/"); QVERIFY(spy.wait(1000)); } - +*/ void TestBrowserDBus::testCanCloseSslDialog() { QSignalSpy spy (m_bdb, SIGNAL(onSslErrorDialog(const conn::brw::SslError&))); m_bdb->createPageWindow(1,0,0,800,600); @@ -379,9 +368,9 @@ void TestBrowserDBus::testCanCancelSSL() { QSignalSpy spy2 (m_bdb, SIGNAL(onSslErrorDialogCancel(const conn::brw::SslError&))); m_bdb->createPageWindow(1,0,0,800,600); m_bdb->loadurl("https://tv.eurosport.com/"); - QVERIFY(spy.wait(1000)); + QVERIFY(spy.wait(3000)); m_bdb->closeSslErrorDialog(conn::brw::DR_CANCEL, false); - QVERIFY(spy2.wait()); + QVERIFY(spy2.wait(1000)); } void TestBrowserDBus::testCanCancelAuth() { @@ -396,6 +385,19 @@ void TestBrowserDBus::testCanCancelAuth() { QVERIFY(spy2.wait(1000)); } +void TestBrowserDBus::testCanCloseAuthDialog() { + QSignalSpy spy (m_bdb, SIGNAL(onAuthenticationDialog(const conn::brw::AuthenticationData&))); + m_bdb->createPageWindow(1,0,0,800,600); + m_bdb->loadurl("http://www.httpwatch.com/httpgallery/authentication/authenticatedimage/default.aspx"); + QVERIFY(spy.wait(1000)); + + conn::brw::AuthenticationData d; + d.strUserName = "httpwatch"; + d.strPassword = QString(qrand()); + qDebug() << ": user" << d.strUserName << "password:" << d.strPassword; + m_bdb->closeAuthenticationDialog(conn::brw::DR_OK, d); +} + void TestBrowserDBus::testCanSelectOptionsInSelectList() { QSignalSpy spy (m_bdb, SIGNAL(onSelect(const QString &, const conn::brw::SelectableOptionList &, bool))); m_bdb->createPageWindow(1,0,0,800,600); diff --git a/browser/unit-tests/browserdbus/testbrowserdbus.h b/browser/unit-tests/browserdbus/testbrowserdbus.h index 13ab4f9..823a9dc 100644 --- a/browser/unit-tests/browserdbus/testbrowserdbus.h +++ b/browser/unit-tests/browserdbus/testbrowserdbus.h @@ -49,12 +49,12 @@ private slots: void testAlertDialog(); void testGetPrevEnteredValues(); void testGetsNotifiedWhenSelectIsSelected(); - void testGetsNotifiedOnAuthDialog(); - void testCanCloseAuthDialog(); - void testGetsNotifiedOnBadSSL(); - void testCanCloseSslDialog(); +// void testGetsNotifiedOnAuthDialog(); +// void testGetsNotifiedOnBadSSL(); void testCanCancelSSL(); + void testCanCloseSslDialog(); void testCanCancelAuth(); + void testCanCloseAuthDialog(); void testCanSelectOptionsInSelectList(); private: -- cgit v1.2.1