From kde-commits Sat Sep 10 09:22:55 2011 From: Matthias Fuchs Date: Sat, 10 Sep 2011 09:22:55 +0000 To: kde-commits Subject: KDE/kdenetwork/kget Message-Id: <20110910092255.6058AAC883 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=131564659509676 SVN commit 1252498 by mfuchs: Also testing shouldUpdate by making SchedulerTest a friend. M +2 -0 core/scheduler.h M +31 -0 tests/schedulertest.cpp M +3 -0 tests/schedulertest.h --- trunk/KDE/kdenetwork/kget/core/scheduler.h #1252497:1252498 @@ -33,6 +33,8 @@ { Q_OBJECT + friend class SchedulerTest; + public: enum FailureStatus { --- trunk/KDE/kdenetwork/kget/tests/schedulertest.cpp #1252497:1252498 @@ -506,6 +506,37 @@ QTest::newRow("None") << Job::None; } +void SchedulerTest::testShouldUpdate() +{ + QFETCH(bool, isSuspended); + QFETCH(bool, hasNetworkConnection); + QFETCH(bool, shouldUpdate); + + SettingsHelper helper(NO_LIMIT); + + Scheduler scheduler; + TestQueue *queue = new TestQueue(&scheduler); + scheduler.addQueue(queue); + + QVERIFY(scheduler.shouldUpdate());//should be true by default + + scheduler.setIsSuspended(isSuspended); + scheduler.setHasNetworkConnection(hasNetworkConnection); + + QCOMPARE(scheduler.shouldUpdate(), shouldUpdate); +} + +void SchedulerTest::testShouldUpdate_data() +{ + QTest::addColumn("isSuspended"); + QTest::addColumn("hasNetworkConnection"); + QTest::addColumn("shouldUpdate"); + + QTest::newRow("false, true, true") << false << true << true; + QTest::newRow("true, true, false") << true << true << false; + QTest::newRow("false, false, false") << false << false << false; +} + QTEST_MAIN(SchedulerTest) #include "schedulertest.moc" --- trunk/KDE/kdenetwork/kget/tests/schedulertest.h #1252497:1252498 @@ -141,6 +141,9 @@ void testLosingNetworkConnection(); void testLosingNetworkConnection_data(); + void testShouldUpdate(); + void testShouldUpdate_data(); + private: static const int NO_LIMIT; };