diff --git a/tests/unittests/tests.xml b/tests/unittests/tests.xml index b0439dc..4484992 100644 --- a/tests/unittests/tests.xml +++ b/tests/unittests/tests.xml @@ -31,7 +31,7 @@ - /usr/share/applauncherd-tests/ut_mbooster + source /tmp/session_bus_address.user && DISPLAY=:0 /usr/share/applauncherd-tests/ut_mbooster diff --git a/tests/unittests/ut_mbooster/ut_mbooster.cpp b/tests/unittests/ut_mbooster/ut_mbooster.cpp index 21b0eb5..0f987a9 100644 --- a/tests/unittests/ut_mbooster/ut_mbooster.cpp +++ b/tests/unittests/ut_mbooster/ut_mbooster.cpp @@ -20,6 +20,10 @@ #include "ut_mbooster.h" #include "mbooster.h" +#ifdef HAVE_MCOMPONENTCACHE +#include +#endif + Ut_MBooster::Ut_MBooster() : m_subject(new MBooster) {} @@ -35,14 +39,35 @@ void Ut_MBooster::cleanupTestCase() void Ut_MBooster::testSocketName() { - QVERIFY2(MBooster::socketName() == MBooster::m_socketId, "Failure"); - QVERIFY2(m_subject->socketId() == MBooster::m_socketId, "Failure"); + QVERIFY(MBooster::socketName() == MBooster::m_socketId); + QVERIFY(m_subject->socketId() == MBooster::m_socketId); } void Ut_MBooster::testType() { - QVERIFY2(MBooster::type() == 'm', "Failure"); - QVERIFY2(m_subject->boosterType() == 'm', "Failure"); + QVERIFY(MBooster::type() == 'm'); + QVERIFY(m_subject->boosterType() == 'm'); +} + +void Ut_MBooster::testSetProcessId() +{ + MBooster::setProcessId(123); + QVERIFY(MBooster::processId() == 123); +} + +void Ut_MBooster::testPreload() +{ +#ifdef HAVE_MCOMPONENTCACHE + + m_subject->preload(); + + const char * argv[] = {"foo"}; + int argc = 1; + + QVERIFY(MComponentCache::mApplication(argc, const_cast(argv))); + QVERIFY(MComponentCache::mApplicationWindow()); + +#endif } QTEST_APPLESS_MAIN(Ut_MBooster); diff --git a/tests/unittests/ut_mbooster/ut_mbooster.h b/tests/unittests/ut_mbooster/ut_mbooster.h index 12aaf7e..d7a36e1 100644 --- a/tests/unittests/ut_mbooster/ut_mbooster.h +++ b/tests/unittests/ut_mbooster/ut_mbooster.h @@ -42,6 +42,8 @@ private Q_SLOTS: void cleanupTestCase(); void testSocketName(); void testType(); + void testSetProcessId(); + void testPreload(); private: std::tr1::shared_ptr m_subject;