From 5efa16a76c1fe0417c9ddce7a1f928f2a2f5def5 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Thu, 29 Jul 2010 20:05:27 +0000 Subject: [PATCH] GUI unit tests should not connect to the update.fwbuilder.org web site to check for updates, we test for that specifically in a special uni test --- src/gui/unit_tests/FWWindowTest/FWWindowTest.cpp | 11 ++++++++--- src/gui/unit_tests/FWWindowTest/FWWindowTest.h | 7 +++++-- src/gui/unit_tests/main/main_macros.cpp | 2 ++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/gui/unit_tests/FWWindowTest/FWWindowTest.cpp b/src/gui/unit_tests/FWWindowTest/FWWindowTest.cpp index acaa919c5..a9c72d283 100644 --- a/src/gui/unit_tests/FWWindowTest/FWWindowTest.cpp +++ b/src/gui/unit_tests/FWWindowTest/FWWindowTest.cpp @@ -37,12 +37,17 @@ FWWindowTest::FWWindowTest(QWidget *parent) { } +void FWWindowTest::initTestCase() +{ + st->setCheckUpdates(true); + st->setBool("UI/NoStartTip", true); +} + void FWWindowTest::cleanupTestCase() { - qDebug() << 1; if (QFile::exists("/tmp/update_4.0.0")) - qDebug() << 2; - QFile::remove("/tmp/update_4.0.0"); + qDebug() << "file /tmp/update_4.0.0 exists"; + QFile::remove("/tmp/update_4.0.0"); } void FWWindowTest::findMessageBox() diff --git a/src/gui/unit_tests/FWWindowTest/FWWindowTest.h b/src/gui/unit_tests/FWWindowTest/FWWindowTest.h index faf57b83a..b2fe51f5b 100644 --- a/src/gui/unit_tests/FWWindowTest/FWWindowTest.h +++ b/src/gui/unit_tests/FWWindowTest/FWWindowTest.h @@ -32,15 +32,18 @@ class FWWindowTest : public QMainWindow { - Q_OBJECT + Q_OBJECT; public: FWWindowTest(QWidget *parent = 0); -public slots: + + public slots: void findMessageBox(); void findNoMessageBox(); void prepareMW(); + private slots: + void initTestCase(); void cleanupTestCase(); void checkForUpgrade_1(); void checkForUpgrade_2(); diff --git a/src/gui/unit_tests/main/main_macros.cpp b/src/gui/unit_tests/main/main_macros.cpp index 78d0d5bbf..5242fd654 100644 --- a/src/gui/unit_tests/main/main_macros.cpp +++ b/src/gui/unit_tests/main/main_macros.cpp @@ -48,6 +48,8 @@ int main( int argc, char** argv) \ app->setApplicationName(QLatin1String("Firewall Builder")); \ st = new FWBSettings(true); \ st->init(); \ + st->setCheckUpdates(false); \ + st->setBool("UI/NoStartTip", true); \ init(argv); \ wfl = new UserWorkflow(); \ string full_res_path = respath + FS_SEPARATOR + "resources.xml"; \