--- a/videocollection/videocollectionwrapper/tsrc/testvideocollectionclient/src/testvideocollectionclient.cpp	Thu Apr 01 23:13:36 2010 +0300
+++ b/videocollection/videocollectionwrapper/tsrc/testvideocollectionclient/src/testvideocollectionclient.cpp	Thu Apr 01 23:22:15 2010 +0300
@@ -21,13 +21,14 @@
 
 #include "testvideocollectionclient.h"
 #include "videocollectioncommon.h"
-#include "stub/inc/videocollectionlistener.h"
+#include "stubcollectionsignalreceiver.h"
+#include "videocollectionlistener.h"
 
 #define private public
 #include "videocollectionclient.h"
 #undef private
 
-#include "stub/inc/stubcollectionsignalclasses.h"
+
 
 Q_DECLARE_METATYPE(QList<int>)
 
@@ -39,12 +40,19 @@
 {
     TestVideoCollectionClient tv;
 
-    char *pass[3];
-    pass[0] = argv[0];
-    pass[1] = "-o";
-    pass[2] = "c:\\data\\testvideocollectionclient.txt";
-    
-    int res = QTest::qExec(&tv, 3, pass);
+    int res;
+    if(argc > 1)
+    {   
+        res = QTest::qExec(&tv, argc, argv);
+    }
+    else
+    {
+        char *pass[3];
+        pass[0] = argv[0];
+        pass[1] = "-o";
+        pass[2] = "c:\\data\\testvideocollectionclient.txt";
+        res = QTest::qExec(&tv, 3, pass);
+    }
     
     return res;
 }
@@ -58,6 +66,7 @@
 void TestVideoCollectionClient::init()
 {    
     mTestObject = new VideoCollectionClient();
+    mSignalReceiver = new StubSignalReceiver();
 }
     
 // -----------------------------------------------------------------------------
@@ -78,7 +87,7 @@
 {
     MMPXCollectionUtility *tmpUtility = new MMPXCollectionUtility();
     mTestObject->mCollectionUtility = tmpUtility;
-    QVERIFY(mTestObject->initialize() == 0);
+    QVERIFY(mTestObject->initialize(mSignalReceiver) == 0);
     QVERIFY(mTestObject->mCollectionUtility != 0);
     QVERIFY(mTestObject->mCollectionListener != 0);
 }
@@ -89,9 +98,9 @@
 //
 void TestVideoCollectionClient::testInitializeCollListenerExist()
 {
-    VideoCollectionListener *tmpListener = new VideoCollectionListener(*mTestObject);
+    VideoCollectionListener *tmpListener = new VideoCollectionListener(*mTestObject, *mSignalReceiver);
     mTestObject->mCollectionListener = tmpListener;
-    QVERIFY(mTestObject->initialize() == 0);    
+    QVERIFY(mTestObject->initialize(mSignalReceiver) == 0);    
     QVERIFY(mTestObject->mCollectionUtility != 0);
     QVERIFY(mTestObject->mCollectionListener != 0);
 }
@@ -103,11 +112,22 @@
 void TestVideoCollectionClient::testInitializeUtilCreateFail()
 {
     MMPXCollectionUtility::setNewLLeave(true);
-    QVERIFY(mTestObject->initialize() < 0);  
+    QVERIFY(mTestObject->initialize(mSignalReceiver) < 0);  
     QVERIFY(mTestObject->mCollectionUtility == 0);
     QVERIFY(mTestObject->mCollectionListener == 0);
     MMPXCollectionUtility::setNewLLeave(false);
 }
+
+// -----------------------------------------------------------------------------
+// testInitializeNullReceiverCreateFail
+// -----------------------------------------------------------------------------
+//
+void TestVideoCollectionClient::testInitializeNullReceiverCreateFail()
+{
+    QVERIFY(mTestObject->initialize(0) < 0);  
+    QVERIFY(mTestObject->mCollectionUtility == 0);
+    QVERIFY(mTestObject->mCollectionListener == 0);
+}
     
 // -----------------------------------------------------------------------------
 // testInitializeCollUtilityExists
@@ -116,14 +136,14 @@
 void TestVideoCollectionClient::testInitializeSucceed()
 {   
     MMPXCollectionUtility::setNewLLeave(false);
-    QVERIFY(mTestObject->initialize() == 0);  
+    QVERIFY(mTestObject->initialize(mSignalReceiver) == 0);  
     // none exists
-    QVERIFY(mTestObject->initialize() == 0);  
+    QVERIFY(mTestObject->initialize(mSignalReceiver) == 0);  
     QVERIFY(mTestObject->mCollectionUtility != 0);
     QVERIFY(mTestObject->mCollectionListener != 0);
     
     // both items exists
-    QVERIFY(mTestObject->initialize() == 0);  
+    QVERIFY(mTestObject->initialize(mSignalReceiver) == 0);  
     QVERIFY(mTestObject->mCollectionUtility != 0);
     QVERIFY(mTestObject->mCollectionListener != 0);
     
@@ -135,78 +155,7 @@
     QVERIFY(MMPXCollectionUtility::getCloseCounter() == 1);
     QVERIFY(listener == 0);   
 }
-    
-// -----------------------------------------------------------------------------
-// testInitializeCollUtilityExists
-// -----------------------------------------------------------------------------
-//
-void TestVideoCollectionClient::testConnectCollectionSignalReceiver()
-{   
-    // no collection listener or signal receiver
-    QVERIFY(mTestObject->connectCollectionSignalReceiver(0) == -1);
-
-    // no collection listener
-    StubSignalReceiver stubReceiver;        
-    QVERIFY(mTestObject->connectCollectionSignalReceiver(&stubReceiver) == -1);
-    
-    // collection listener exists, no signal receiver    
-    QVERIFY(mTestObject->initialize() == 0);  
-    QVERIFY(mTestObject->connectCollectionSignalReceiver(0) == -1);
-    
-    VideoCollectionListener *tmp = mTestObject->mCollectionListener;
-    
-    // no newVideoList signal
-    StubListenerNoNewVideoList *noNewVideoList = 
-        new StubListenerNoNewVideoList(*mTestObject);
-    mTestObject->mCollectionListener = noNewVideoList;
-    QVERIFY(mTestObject->connectCollectionSignalReceiver(&stubReceiver) == -1);
-    delete noNewVideoList;
-    
-    // no videoListAppended signal
-    StubListenerNoVideoListAppended *noVideoListAppended = 
-        new StubListenerNoVideoListAppended(*mTestObject);
-    mTestObject->mCollectionListener = noVideoListAppended;
-    QVERIFY(mTestObject->connectCollectionSignalReceiver(&stubReceiver) == -1);
-    delete noVideoListAppended;
-    
-    // no newVideoAvailable signal
-    StubListenerNoNewVideoAvailable *noNewVideo = 
-        new StubListenerNoNewVideoAvailable(*mTestObject);
-    mTestObject->mCollectionListener = noNewVideo;
-    QVERIFY(mTestObject->connectCollectionSignalReceiver(&stubReceiver) == -1);
-    delete noNewVideo;
-    
-    // no videoDeleted signal
-    StubListenerNoVideoDeleted *noVideoDeleted = 
-        new StubListenerNoVideoDeleted(*mTestObject);
-    mTestObject->mCollectionListener = noVideoDeleted;
-    QVERIFY(mTestObject->connectCollectionSignalReceiver(&stubReceiver) == -1);
-    delete noVideoDeleted;
-    
-    // no videoDeleteCompleted signal
-    StubListenerNoVideoDeleteCompleted *noVideoDelCompl = 
-        new StubListenerNoVideoDeleteCompleted(*mTestObject);
-    mTestObject->mCollectionListener = noVideoDelCompl;
-    QVERIFY(mTestObject->connectCollectionSignalReceiver(&stubReceiver) == -1);
-    delete noVideoDelCompl;
-    
-    // no videoDetailsCompleted signal
-    StubListenerNoVideoDetailsCompleted *noVideoDetails = 
-        new StubListenerNoVideoDetailsCompleted(*mTestObject);
-    mTestObject->mCollectionListener = noVideoDetails;
-    QVERIFY(mTestObject->connectCollectionSignalReceiver(&stubReceiver) == -1);
-    delete noVideoDetails;
-    
-    // all signals exists
-    StubListenerAllSignals *allSignals = 
-        new StubListenerAllSignals(*mTestObject);
-    mTestObject->mCollectionListener = allSignals;
-    QVERIFY(mTestObject->connectCollectionSignalReceiver(&stubReceiver) == 0);
-    delete allSignals;
-    
-    mTestObject->mCollectionListener = tmp;
-}
-    
+       
 // -----------------------------------------------------------------------------
 // testInitializeCollUtilityExists
 // -----------------------------------------------------------------------------
@@ -216,14 +165,14 @@
     // no collection utility
     QVERIFY(mTestObject->getCollectionLevel() == -1);
     
-    QVERIFY(mTestObject->initialize() == 0);  
+    QVERIFY(mTestObject->initialize(mSignalReceiver) == 0);  
     
     // path level not setted
     QVERIFY(mTestObject->getCollectionLevel() == -1);
 
     // succeeds
-    mTestObject->mCollectionPathLevel = VideoCollectionClient::ELevelCategory;
-    QVERIFY(mTestObject->getCollectionLevel() == VideoCollectionClient::ELevelCategory);
+    mTestObject->mCollectionPathLevel = VideoCollectionCommon::ELevelCategory;
+    QVERIFY(mTestObject->getCollectionLevel() == VideoCollectionCommon::ELevelCategory);
 }
     
 // -----------------------------------------------------------------------------
@@ -263,60 +212,59 @@
 void TestVideoCollectionClient::testStartOpenCollection()
 {
     // no collection utility    
-    QVERIFY(mTestObject->startOpenCollection(VideoCollectionClient::ELevelVideos) == -1);
+    QVERIFY(mTestObject->startOpenCollection(VideoCollectionCommon::ELevelVideos) == -1);
 
-    QVERIFY(mTestObject->startOpenCollection(VideoCollectionClient::ELevelCategory) == -1);
+    QVERIFY(mTestObject->startOpenCollection(VideoCollectionCommon::ELevelCategory) == -1);
 
-    QVERIFY(mTestObject->initialize() == 0); 
+    QVERIFY(mTestObject->initialize(mSignalReceiver) == 0); 
     // open status setted allready
     mTestObject->setOpenStatus(VideoCollectionClient::ECollectionOpening); 
-    QVERIFY(mTestObject->startOpenCollection(VideoCollectionClient::ELevelVideos) == 0);
+    QVERIFY(mTestObject->startOpenCollection(VideoCollectionCommon::ELevelVideos) == 0);
     mTestObject->setOpenStatus(VideoCollectionClient::ECollectionOpened);
-    QVERIFY(mTestObject->startOpenCollection(VideoCollectionClient::ELevelVideos) == 0);
+    QVERIFY(mTestObject->startOpenCollection(VideoCollectionCommon::ELevelVideos) == 0);
 
     mTestObject->setOpenStatus(VideoCollectionClient::ECollectionOpening); 
-    QVERIFY(mTestObject->startOpenCollection(VideoCollectionClient::ELevelCategory) == 0);
+    QVERIFY(mTestObject->startOpenCollection(VideoCollectionCommon::ELevelCategory) == 0);
     mTestObject->setOpenStatus(VideoCollectionClient::ECollectionOpened);
-    QVERIFY(mTestObject->startOpenCollection(VideoCollectionClient::ELevelCategory) == 0);
+    QVERIFY(mTestObject->startOpenCollection(VideoCollectionCommon::ELevelCategory) == 0);
     
     // open status and level setted allready
     mTestObject->setOpenStatus(VideoCollectionClient::ECollectionOpening); 
-    mTestObject->mCollectionPathLevel = VideoCollectionClient::ELevelVideos;
-    QVERIFY(mTestObject->startOpenCollection(VideoCollectionClient::ELevelVideos) == 0);
+    mTestObject->mCollectionPathLevel = VideoCollectionCommon::ELevelVideos;
+    QVERIFY(mTestObject->startOpenCollection(VideoCollectionCommon::ELevelVideos) == 0);
     mTestObject->setOpenStatus(VideoCollectionClient::ECollectionOpened);
-    QVERIFY(mTestObject->startOpenCollection(VideoCollectionClient::ELevelVideos) == 0);
+    QVERIFY(mTestObject->startOpenCollection(VideoCollectionCommon::ELevelVideos) == 0);
 
-    mTestObject->mCollectionPathLevel = VideoCollectionClient::ELevelCategory;
+    mTestObject->mCollectionPathLevel = VideoCollectionCommon::ELevelCategory;
     mTestObject->setOpenStatus(VideoCollectionClient::ECollectionOpening); 
-    QVERIFY(mTestObject->startOpenCollection(VideoCollectionClient::ELevelCategory) == 0);
+    QVERIFY(mTestObject->startOpenCollection(VideoCollectionCommon::ELevelCategory) == 0);
     mTestObject->setOpenStatus(VideoCollectionClient::ECollectionOpened);
-    QVERIFY(mTestObject->startOpenCollection(VideoCollectionClient::ELevelCategory) == 0);
+    QVERIFY(mTestObject->startOpenCollection(VideoCollectionCommon::ELevelCategory) == 0);
 
-    mTestObject->setOpenStatus(VideoCollectionClient::ECollectionNotOpen);  
+    mTestObject->setOpenStatus(VideoCollectionClient::ECollectionNotOpen); 
+    
     // startOpenCollectionL -leaves
     MMPXCollection::setOpenLPathLeave(true);
-    QVERIFY(mTestObject->startOpenCollection(VideoCollectionClient::ELevelVideos) < 0);
+    QVERIFY(mTestObject->startOpenCollection(VideoCollectionCommon::ELevelVideos) < 0);
 
-    QVERIFY(mTestObject->startOpenCollection(VideoCollectionClient::ELevelCategory) < 0);
+    QVERIFY(mTestObject->startOpenCollection(VideoCollectionCommon::ELevelCategory) < 0);
 
     MMPXCollection::setOpenLPathLeave(false);
-    QVERIFY(mTestObject->startOpenCollection(VideoCollectionClient::ELevelVideos) == 0);
+    QVERIFY(mTestObject->startOpenCollection(VideoCollectionCommon::ELevelVideos) == 0);
     QVERIFY(mTestObject->getOpenStatus() == VideoCollectionClient::ECollectionOpening);
-    int id = 0;
-    int type = 0;
-    mTestObject->getCategoryIds(id, type);
-    QVERIFY(id == KVcxMvcCategoryIdAll);
-    QVERIFY(type == 1);
+    TMPXItemId categoryId;
+    mTestObject->getCategoryId(categoryId);
+    QVERIFY(categoryId.iId1 == KVcxMvcCategoryIdAll);
+    QVERIFY(categoryId.iId2 == 1);
 
     mTestObject->setOpenStatus(VideoCollectionClient::ECollectionOpened);  
-    QVERIFY(mTestObject->startOpenCollection(VideoCollectionClient::ELevelCategory) == 0);
+    QVERIFY(mTestObject->startOpenCollection(VideoCollectionCommon::ELevelCategory) == 0);
     QVERIFY(mTestObject->getOpenStatus() == VideoCollectionClient::ECollectionOpening);
-    mTestObject->getCategoryIds(id, type);
-    QVERIFY(id == 0);
-    QVERIFY(type == 9);
+    mTestObject->getCategoryId(categoryId);
+    QVERIFY(categoryId == TMPXItemId::InvalidId());
 
     mTestObject->setOpenStatus(VideoCollectionClient::ECollectionOpened);  
-    QVERIFY(mTestObject->startOpenCollection(VideoCollectionClient::ELevelVideos) == 0);
+    QVERIFY(mTestObject->startOpenCollection(VideoCollectionCommon::ELevelVideos) == 0);
     QVERIFY(mTestObject->getOpenStatus() == VideoCollectionClient::ECollectionOpening);
 
 }
@@ -333,7 +281,7 @@
     QVERIFY(mTestObject->startOpenCurrentState() == -1);  
     
     // collection not opened
-    QVERIFY(mTestObject->initialize() == 0); 
+    QVERIFY(mTestObject->initialize(mSignalReceiver) == 0); 
     QVERIFY(mTestObject->startOpenCurrentState() == -1); 
     
     // OpenL -leaves
@@ -358,7 +306,7 @@
     QList<TMPXItemId> ids;
     QVERIFY(mTestObject->deleteVideos(&ids) == -1); 
     
-    QVERIFY(mTestObject->initialize() == 0); 
+    QVERIFY(mTestObject->initialize(mSignalReceiver) == 0); 
     // empty list
     QVERIFY(mTestObject->deleteVideos(&ids) < 0); 
     
@@ -387,19 +335,19 @@
 {
     TMPXItemId id(0,0);
     // no collection utility    
-    QVERIFY(mTestObject->openVideo(id) == -1);  
+    QVERIFY(mTestObject->openItem(id) == -1);  
     
     // collection exists
-    QVERIFY(mTestObject->initialize() == 0); 
+    QVERIFY(mTestObject->initialize(mSignalReceiver) == 0); 
       
     MMPXCollection::setOpenLPathLeave(true);
-    QVERIFY(mTestObject->openVideo(id)< 0);
+    QVERIFY(mTestObject->openItem(id)< 0);
     
     MMPXCollection::setOpenLPathLeave(false);
 
     
-    mTestObject->mCollectionPathLevel = VideoCollectionClient::ELevelCategory;
-    QVERIFY(mTestObject->openVideo(id) == 0);
+    mTestObject->mCollectionPathLevel = VideoCollectionCommon::ELevelCategory;
+    QVERIFY(mTestObject->openItem(id) == 0);
       
 }
 
@@ -411,16 +359,21 @@
 {
     TMPXItemId id(0,0);
     // no collection utility    
-    QVERIFY(mTestObject->openVideo(id) == -1);  
+    QVERIFY(mTestObject->openItem(id) == -1);  
     
-    // collection exists
-    QVERIFY(mTestObject->initialize() == 0); 
-    mTestObject->mCollectionPathLevel = VideoCollectionClient::ELevelVideos;  
+    // collection exists: media type KVcxMvcMediaTypeVideo
+    QVERIFY(mTestObject->initialize(mSignalReceiver) == 0); 
     MMPXCollection::setOpenLPathLeave(true);
-    QVERIFY(mTestObject->openVideo(id)< 0);
-    MMPXCollection::setOpenLPathLeave(false);
+    QVERIFY(mTestObject->openItem(id)< 0);
+    MMPXCollection::setOpenLPathLeave(false);    
+    QVERIFY(mTestObject->openItem(id) == 0);
     
-    QVERIFY(mTestObject->openVideo(id) == 0);
+    // collection exists: media type !=  KVcxMvcMediaTypeVideo
+    id.iId2 = 2;
+    MMPXCollection::setOpenLPathLeave(true);
+    QVERIFY(mTestObject->openItem(id)< 0);
+    MMPXCollection::setOpenLPathLeave(false);    
+    QVERIFY(mTestObject->openItem(id) == 0);
 }
 
 // -----------------------------------------------------------------------------
@@ -434,7 +387,7 @@
     QVERIFY(mTestObject->fetchMpxMediaByMpxId(id) == -1); 
     
     // collection exists
-    QVERIFY(mTestObject->initialize() == 0); 
+    QVERIFY(mTestObject->initialize(mSignalReceiver) == 0); 
     
     MMPXCollection::setCommandLLeave(true);
     QVERIFY(mTestObject->fetchMpxMediaByMpxId(id) < 0);
@@ -455,7 +408,7 @@
     QVERIFY(mTestObject->getVideoDetails(id) == -1); 
     
     // collection exists
-    QVERIFY(mTestObject->initialize() == 0); 
+    QVERIFY(mTestObject->initialize(mSignalReceiver) == 0); 
     
     MMPXCollection::setCommandLLeave(true);
     QVERIFY(mTestObject->getVideoDetails(id) < 0);
@@ -465,63 +418,6 @@
     
 }
 
-// -----------------------------------------------------------------------------
-// testAddNewCollection_data
-// -----------------------------------------------------------------------------
-//
-void TestVideoCollectionClient::testAddNewCollection_data()
-{
-    QTest::addColumn<QString>("name");
-    QTest::addColumn<QString>("thumb");
-    QTest::addColumn<QList<TMPXItemId> >("ids");
-    
-    
-    
-    QList<TMPXItemId> testIds;
-    testIds.append(TMPXItemId(5,0));
-    testIds.append(TMPXItemId(9,0));
-    
-    QTest::newRow("All params empty")
-        << QString()
-        << QString()
-        << QList<TMPXItemId>();
-    
-    QTest::newRow("Only name")
-        << QString("testname")
-        << QString()
-        << QList<TMPXItemId>();
-    
-    QTest::newRow("Only thumb")
-        << QString()
-        << QString("testthumb")
-        << QList<TMPXItemId>();
-    
-    QTest::newRow("Name and thumb")
-        << QString("testname")
-        << QString("testthumb")
-        << QList<TMPXItemId>();
-    
-    QTest::newRow("Only ids")
-        << QString()
-        << QString()
-        << testIds;
-    
-    QTest::newRow("Name and ids")
-        << QString("testname")
-        << QString()
-        << testIds;
-    
-    QTest::newRow("Thumb and ids")
-        << QString()
-        << QString("testthumb")
-        << testIds;
-    
-    QTest::newRow("All params")
-        << QString("testname")
-        << QString("testthumb")
-        << testIds;
-    
-}
 
 // -----------------------------------------------------------------------------
 // testAddNewCollection
@@ -529,18 +425,77 @@
 //
 void TestVideoCollectionClient::testAddNewCollection()
 {
-
-    QFETCH(QString, name);
-    QFETCH(QString, thumb);
-    QFETCH(QList<TMPXItemId>, ids);
+    QString name("");
+    // no collection utility
+    TMPXItemId id = TMPXItemId(1,1);
+    id = mTestObject->addNewAlbum(name);
+    QVERIFY(id == TMPXItemId::InvalidId());
+    id = TMPXItemId(1,1);
+    
+    // empty title
+    mTestObject->initialize(mSignalReceiver);    
+    id = mTestObject->addNewAlbum(name);
+    QVERIFY(id == TMPXItemId::InvalidId());
+    id = TMPXItemId(1,1);
+    name = "TestAlbum";
+    
+    // cmd not supported
+    CMPXMedia::mIsSupported = false;
+    id = mTestObject->addNewAlbum(name);
+    QVERIFY(id == TMPXItemId::InvalidId());
+    CMPXMedia::mIsSupported = true;
+    id = TMPXItemId(1,1);
+    
+    // id getting leaves
+    CMPXMedia::mValueTObjectLeaves = true; 
+    id = mTestObject->addNewAlbum(name);
+    QVERIFY(id == TMPXItemId::InvalidId());
+    CMPXMedia::mValueTObjectLeaves = false;
+    id = TMPXItemId(1,1); 
     
-    QCOMPARE(mTestObject->addNewCollection(name, thumb, ids), -1);
+    // succeed
+    CMPXMedia::mIdFromValueTObject = id;
+    id = TMPXItemId::InvalidId();
+    id = mTestObject->addNewAlbum(name);
+    QVERIFY(id == CMPXMedia::mIdFromValueTObject);
+}
+
+
+// -----------------------------------------------------------------------------
+// testAddItemsInAlbum
+// -----------------------------------------------------------------------------
+//
+void TestVideoCollectionClient::testAddItemsInAlbum()
+{
+    TMPXItemId albumId = TMPXItemId(1,2);
+    QList<TMPXItemId> mediaIds;
     
-    mTestObject->initialize();
+    // no collectionutility
+    QVERIFY(mTestObject->addItemsInAlbum(albumId, mediaIds) < 0);
     
-    QCOMPARE(mTestObject->addNewCollection(name, thumb, ids), 0);
+    albumId = TMPXItemId::InvalidId();
+    mTestObject->initialize(mSignalReceiver);
+    // invalid album id
+    QVERIFY(mTestObject->addItemsInAlbum(albumId, mediaIds) < 0);
+        
+    albumId = TMPXItemId(1,0);
+    // media type not album
+    QVERIFY(mTestObject->addItemsInAlbum(albumId, mediaIds) < 0);
     
-    // TODO needs proper verification after the method has been fully implemented.
+    // command leaves
+    albumId = TMPXItemId(1,2);
+    MMPXCollection::setCommandLLeave(true);
+    QVERIFY(mTestObject->addItemsInAlbum(albumId, mediaIds) < 0);
+    MMPXCollection::setCommandLLeave(false);
+    
+    // empty list
+    QVERIFY(mTestObject->addItemsInAlbum(albumId, mediaIds) == 0);
+    
+    mediaIds.append(TMPXItemId(1,0));
+    mediaIds.append(TMPXItemId(2,0));
+    // list contains items
+    QVERIFY(mTestObject->addItemsInAlbum(albumId, mediaIds) == 0);
+   
 }
 
 // -----------------------------------------------------------------------------
@@ -554,14 +509,14 @@
     // not initialized    
     QVERIFY(mTestObject->back() == -1);  
     
-    QVERIFY(mTestObject->initialize() == 0); 
-    mTestObject->mCollectionPathLevel = VideoCollectionClient::ELevelVideos;   
+    QVERIFY(mTestObject->initialize(mSignalReceiver) == 0); 
+    mTestObject->mCollectionPathLevel = VideoCollectionCommon::ELevelVideos;   
     MMPXCollection::setBackLLeave(true);
     QVERIFY(mTestObject->back()< 0);
     MMPXCollection::setBackLLeave(false);
     QVERIFY(mTestObject->back() == 0); 
     
-    mTestObject->mCollectionPathLevel = VideoCollectionClient::ELevelCategory;
+    mTestObject->mCollectionPathLevel = VideoCollectionCommon::ELevelCategory;
     QVERIFY(mTestObject->back() == 0); 
 }