diff options
author | Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com> | 2010-01-04 10:39:27 +0200 |
---|---|---|
committer | Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com> | 2010-01-04 10:39:27 +0200 |
commit | d84673cf92c0abddb12d9b24131b1af718c1543d (patch) | |
tree | d3538ccb43f9b94970a44581edb3e58d418fdc8b /tests | |
parent | 3ef3f8cd8d6bcb2d8c3401f7f89dca07af98adae (diff) |
Split initialization to 2 phases. initialize() and connectToServer()
Diffstat (limited to 'tests')
-rw-r--r-- | tests/mock-resource-library.cpp | 27 | ||||
-rw-r--r-- | tests/mock-resource-library.h | 6 | ||||
-rw-r--r-- | tests/test-libplayback.cpp | 9 | ||||
-rw-r--r-- | tests/test-libplayback.h | 5 | ||||
-rw-r--r-- | tests/test-resource.cpp | 34 | ||||
-rw-r--r-- | tests/test-resource.h | 5 |
6 files changed, 72 insertions, 14 deletions
diff --git a/tests/mock-resource-library.cpp b/tests/mock-resource-library.cpp index 4a4fdb4..49c29e4 100644 --- a/tests/mock-resource-library.cpp +++ b/tests/mock-resource-library.cpp @@ -1,7 +1,10 @@ #include "mock-resource-library.h" -MockResourceLibrary::MockResourceLibrary(QObject *parent, bool makeInitFail) - : QObject(parent), initializeFails(makeInitFail) +MockResourceLibrary::MockResourceLibrary(QObject *parent, + bool makeInitializationFail, + bool makeConnectingToServerFail) + : QObject(parent), initializeFails(makeInitializationFail), + connectToServerFails(makeConnectingToServerFail) { } @@ -11,10 +14,26 @@ MockResourceLibrary::~MockResourceLibrary() void MockResourceLibrary::makeInitializeFail() { - initializeFails=true; + initializeFails = true; } bool MockResourceLibrary::initialize() { - return !initializeFails; + if(initializeFails==false) + return true; + else + return false; +} + +void MockResourceLibrary::makeServerConnectFail() +{ + connectToServerFails = true; +} + +bool MockResourceLibrary::connectToServer() +{ + if(connectToServerFails == false) + return true; + else + return false; } diff --git a/tests/mock-resource-library.h b/tests/mock-resource-library.h index df6fd97..6c743fe 100644 --- a/tests/mock-resource-library.h +++ b/tests/mock-resource-library.h @@ -9,11 +9,15 @@ class MockResourceLibrary: public QObject, public ResourceLibrary Q_OBJECT private: bool initializeFails; + bool connectToServerFails; public: - MockResourceLibrary(QObject *parent=0,bool makeInitFail=false); + MockResourceLibrary(QObject *parent=0,bool makeInitializationFail=false, + bool makeConnectingToServerFail=false); virtual ~MockResourceLibrary(); void makeInitializeFail(); + void makeServerConnectFail(); bool initialize(); + bool connectToServer(); }; #endif diff --git a/tests/test-libplayback.cpp b/tests/test-libplayback.cpp index 46c28e3..7cdb2bf 100644 --- a/tests/test-libplayback.cpp +++ b/tests/test-libplayback.cpp @@ -2,6 +2,8 @@ TestLibplayback::TestLibplayback() { + resourceFactory=NULL; + resource=NULL; } TestLibplayback::~TestLibplayback() @@ -12,12 +14,13 @@ void TestLibplayback::initTestCase() { resourceFactory = new ResourceFactory(this); QVERIFY(resourceFactory != NULL); + Resource *resource = resourceFactory->createResource(MediaClass, RP_FLAGS_AUDIO|RP_FLAGS_VIDEO); + QVERIFY(resource != NULL); } -void TestLibplayback::testCreateResource() +void TestLibplayback::testConnectToServer() { - Resource *resource = resourceFactory->createResource(MediaClass, RP_FLAGS_AUDIO|RP_FLAGS_VIDEO); - QVERIFY(resource != NULL); + resource->connectToServer(); } QTEST_MAIN(TestLibplayback) diff --git a/tests/test-libplayback.h b/tests/test-libplayback.h index 75a04ed..9c294e6 100644 --- a/tests/test-libplayback.h +++ b/tests/test-libplayback.h @@ -3,20 +3,21 @@ #include <QtTest/QTest> #include "resource-factory.h" +#include "resource.h" class TestLibplayback: public QObject { Q_OBJECT private: - ResourceLibrary *resourceLibrary; ResourceFactory *resourceFactory; + Resource *resource; public: TestLibplayback(); ~TestLibplayback(); private slots: void initTestCase(); - void testCreateResource(); + void testConnectToServer(); }; #endif diff --git a/tests/test-resource.cpp b/tests/test-resource.cpp index 3dce276..eb2b59d 100644 --- a/tests/test-resource.cpp +++ b/tests/test-resource.cpp @@ -7,13 +7,14 @@ TestResource::~TestResource() { } -void TestResource::initTestCase() +void TestResource::init() { resource = new Resource(MediaClass, RP_FLAGS_AUDIO|RP_FLAGS_VIDEO, this); - resourceLibrary = new MockResourceLibrary(resource, false); + resourceLibrary = new MockResourceLibrary(resource, false, false); QVERIFY(resource != NULL); QVERIFY(resource->resourceClass == MediaClass); QVERIFY(resource->flags == (RP_FLAGS_AUDIO|RP_FLAGS_VIDEO)); + qDebug("INIT!"); } void TestResource::testInitializeSucceeds() @@ -34,7 +35,34 @@ void TestResource::testInitializeFails() QEXPECT_FAIL("", "Expecting resourceLibrary->initialize() to fail", Continue); QVERIFY(initializeSucceeded); - delete resource; +} + +void TestResource::testConnectToServerSucceeds() +{ + bool initializeSucceeded = resource->initialize(resourceLibrary); + + QVERIFY(resource->resourceLibrary == resourceLibrary); + QVERIFY(initializeSucceeded); + + bool connectToServerSucceeded = resource->connectToServer(); + QVERIFY(connectToServerSucceeded); +} + +void TestResource::testConnectToServerFails() +{ + MockResourceLibrary *mockResourceLibrary = + static_cast<MockResourceLibrary *>(resourceLibrary); + + bool initializeSucceeded = resource->initialize(resourceLibrary); + + QVERIFY(resource->resourceLibrary == resourceLibrary); + QVERIFY(initializeSucceeded); + + mockResourceLibrary->makeServerConnectFail(); + bool connectToServerSucceeded = resource->connectToServer(); + + QEXPECT_FAIL("", "Expecting resourceLibrary->connectToServer() to fail", Continue); + QVERIFY(connectToServerSucceeded); } QTEST_MAIN(TestResource) diff --git a/tests/test-resource.h b/tests/test-resource.h index 6ae3859..295d6d3 100644 --- a/tests/test-resource.h +++ b/tests/test-resource.h @@ -15,10 +15,13 @@ public: TestResource(); ~TestResource(); private slots: - void initTestCase(); + void init(); void testInitializeSucceeds(); void testInitializeFails(); + + void testConnectToServerSucceeds(); + void testConnectToServerFails(); }; #endif |