Thread: [fwbuilder-commits] r3172 - in branches/v4_1/src/gui/unit_tests: FWWindowTest main
Brought to you by:
mikehorn
From: <va...@in...> - 2010-07-29 20:05:11
|
Author: vadim Date: 2010-07-29 13:05:27 -0700 (Thu, 29 Jul 2010) New Revision: 3172 Modified: branches/v4_1/src/gui/unit_tests/FWWindowTest/FWWindowTest.cpp branches/v4_1/src/gui/unit_tests/FWWindowTest/FWWindowTest.h branches/v4_1/src/gui/unit_tests/main/main_macros.cpp Log: 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 Modified: branches/v4_1/src/gui/unit_tests/FWWindowTest/FWWindowTest.cpp =================================================================== --- branches/v4_1/src/gui/unit_tests/FWWindowTest/FWWindowTest.cpp 2010-07-29 18:12:06 UTC (rev 3171) +++ branches/v4_1/src/gui/unit_tests/FWWindowTest/FWWindowTest.cpp 2010-07-29 20:05:27 UTC (rev 3172) @@ -37,12 +37,17 @@ { } +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() Modified: branches/v4_1/src/gui/unit_tests/FWWindowTest/FWWindowTest.h =================================================================== --- branches/v4_1/src/gui/unit_tests/FWWindowTest/FWWindowTest.h 2010-07-29 18:12:06 UTC (rev 3171) +++ branches/v4_1/src/gui/unit_tests/FWWindowTest/FWWindowTest.h 2010-07-29 20:05:27 UTC (rev 3172) @@ -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(); Modified: branches/v4_1/src/gui/unit_tests/main/main_macros.cpp =================================================================== --- branches/v4_1/src/gui/unit_tests/main/main_macros.cpp 2010-07-29 18:12:06 UTC (rev 3171) +++ branches/v4_1/src/gui/unit_tests/main/main_macros.cpp 2010-07-29 20:05:27 UTC (rev 3172) @@ -48,6 +48,8 @@ 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"; \ |