--- a/videocollection/videocollectionwrapper/tsrc/testvideocollectionwrapper_p/src/testvideocollectionwrapper_p.cpp	Thu Apr 01 23:32:44 2010 +0300
+++ b/videocollection/videocollectionwrapper/tsrc/testvideocollectionwrapper_p/src/testvideocollectionwrapper_p.cpp	Fri Apr 16 18:13:14 2010 +0300
@@ -87,11 +87,10 @@
     QVERIFY(mTestObject);        
     
     VideoSortFilterProxyModel *proxyGotten = 0;
-    int type = -1;
            
     // source model init fails
     VideoListDataModel::mInitFails = true;
-    type = VideoCollectionWrapper::EAllVideos;
+    VideoCollectionCommon::TModelType type = VideoCollectionCommon::EModelTypeAllVideos;
     proxyGotten = mTestObject->getModel(type);
     QVERIFY(!proxyGotten);
     
@@ -99,30 +98,23 @@
     VideoSortFilterProxyModel::setInitFailure(true);
     
     // VideoCollectionWrapper::EAllvideos -> init fails
-    type = VideoCollectionWrapper::EAllVideos;
+    type = VideoCollectionCommon::EModelTypeAllVideos;
     proxyGotten = mTestObject->getModel(type);
     QVERIFY(!proxyGotten);
     
     // VideoCollectionWrapper::ECollections -> init fails
-    type = VideoCollectionWrapper::ECollections;
+    type = VideoCollectionCommon::EModelTypeAllVideos;
     proxyGotten = mTestObject->getModel(type);
     QVERIFY(!proxyGotten);
     
     // VideoCollectionWrapper::EGeneric -> init fails
-    type = VideoCollectionWrapper::EGeneric;
+    type = VideoCollectionCommon::EModelTypeGeneric;
     proxyGotten = mTestObject->getModel(type);
     QVERIFY(!proxyGotten);
     
-    type = VideoCollectionWrapper::ECollectionContent;
+    type = VideoCollectionCommon::EModelTypeCollectionContent;
     proxyGotten = mTestObject->getModel(type);
     QVERIFY(!proxyGotten);
-    
-    // called with invalid type param
-    type = -1;
-    VideoListDataModel::mInitFails = false;
-    proxyGotten = mTestObject->getModel(type);
-    QVERIFY(!proxyGotten);
-    
 }
 
  
@@ -135,10 +127,11 @@
     QVERIFY(mTestObject);        
        
     VideoSortFilterProxyModel *proxyGotten = 0;
-    int type = -1;    
     VideoSortFilterProxyModel::setInitFailure(false);
+    VideoCollectionCommon::TModelType type = VideoCollectionCommon::EModelTypeAllVideos;
+
     // VideoCollectionWrapper::EAllvideos
-    type = VideoCollectionWrapper::EAllVideos;
+    type = VideoCollectionCommon::EModelTypeAllVideos;
     proxyGotten = mTestObject->getModel(type);
     QVERIFY(proxyGotten);
     QVERIFY(proxyGotten->mType == type);
@@ -149,7 +142,7 @@
     proxyGotten = 0;
    
     // VideoCollectionWrapper::ECollections
-    type = VideoCollectionWrapper::ECollections;
+    type = VideoCollectionCommon::EModelTypeCollections;
     proxyGotten = mTestObject->getModel(type);
     QVERIFY(proxyGotten);
     QVERIFY(proxyGotten->mType == type);
@@ -160,7 +153,7 @@
     proxyGotten = 0;
    
    // VideoCollectionWrapper::EGeneric
-    type = VideoCollectionWrapper::EGeneric;
+    type = VideoCollectionCommon::EModelTypeGeneric;
     proxyGotten = mTestObject->getModel(type);
     QVERIFY(proxyGotten);
     QVERIFY(proxyGotten->mType == type);
@@ -171,7 +164,7 @@
     proxyGotten = 0;
     
     // VideoCollectionWrapper::ECollectionContent
-    type = VideoCollectionWrapper::ECollectionContent;
+    type = VideoCollectionCommon::EModelTypeCollectionContent;
     proxyGotten = mTestObject->getModel(type);
     QVERIFY(proxyGotten);
     QVERIFY(proxyGotten->mType == type);
@@ -180,13 +173,6 @@
     QVERIFY(proxyGotten->mType == type);
     delete proxyGotten;
     proxyGotten = 0;
-   
-    // called with invalid type param
-    type = -1;
-    VideoListDataModel::mInitFails = false;
-    proxyGotten = mTestObject->getModel(type);
-    QVERIFY(!proxyGotten);
-    
 }
 
 // -----------------------------------------------------------------------------
@@ -199,10 +185,8 @@
     connect(this, SIGNAL(testSignal()), mTestObject, SLOT(aboutToQuitSlot()));
     
     VideoSortFilterProxyModel *proxyGotten = 0;
-    int type = -1;    
-    
     VideoSortFilterProxyModel::setInitFailure(false);
-    type = VideoCollectionWrapper::EAllVideos;
+    VideoCollectionCommon::TModelType type = VideoCollectionCommon::EModelTypeAllVideos;
     proxyGotten = mTestObject->getModel(type);
     QVERIFY(proxyGotten);
     QVERIFY(!mTestObject->mSourceModel.isNull());
@@ -212,7 +196,6 @@
     emit testSignal();
     QVERIFY(mTestObject->mSourceModel.isNull());
     
-    
     disconnect(this, SIGNAL(testSignal()), mTestObject, SLOT(aboutToQuitSlot()));
 }