--- a/videocollection/videocollectionwrapper/tsrc/testvideomodel_p/inc/testvideomodel_p.h	Thu Apr 01 23:22:15 2010 +0300
+++ b/videocollection/videocollectionwrapper/tsrc/testvideomodel_p/inc/testvideomodel_p.h	Thu Apr 01 23:32:44 2010 +0300
@@ -15,12 +15,9 @@
 *
 */
 
-
-
 #ifndef __TESTVIDEOMODEL_P_H__
 #define __TESTVIDEOMODEL_P_H__
 
-
 // INCLUDES
 #include <QtTest/QtTest>
 #include <QList>
@@ -57,21 +54,31 @@
     void signalAppendVideoList(CMPXMediaArray*);
     
     /**
+     * emitted to verify albumListAvailableSlot
+     */
+    void signalAlbumListAvailable(TMPXItemId, CMPXMediaArray*);
+    
+    /**
      * emitted to test newVideoAvailableSlot
      */
     void signalNewVideoAvailable(CMPXMedia*);
     
     /**
-     * emitted to get deleteVideoSlot to be called.
+     * emitted to get deleteItemSlot to be called.
      */
-    void signalDeleteVideo(TMPXItemId);
-    
+    void signalDeleteItem(TMPXItemId);
+         
     /**
     * emitted to get videoDeleteCompletedSlot to be called.
     */
    void signalDeleteCompleted(int, QList<TMPXItemId>*);
    
    /**
+    * emitted to get albumRemoveFailureSlot to be called.
+    */
+   void signalAlbumDeleteFailure(QList<TMPXItemId>*);
+   
+   /**
     * emitted to get videoDetailsCompletedSlot to be called.
     */
    void signalVideoDetailsCompleted(TMPXItemId);
@@ -128,6 +135,11 @@
     void testGetVideoThumbnailFromIndex();
     
     /**
+     * verifies getCategoryVideoCountFromIndex
+     */
+    void testGetCategoryVideoCountFromIndex();
+    
+    /**
      * verifies getVideoSizeFromIndex
      */
     void testGetVideoSizeFromIndex();
@@ -166,6 +178,16 @@
      * verifies getFilePathForId
      */
     void testGetFilePathForId();
+    
+    /**
+     * verifies belongsToAlbum
+     */
+    void testBelongsToAlbum();
+    
+    /**
+     * verifies removeItemsFromAlbum
+     */
+    void testRemoveItemsFromAlbum();
          
     /**
      * verifies thumbnailsFetchedSlot
@@ -181,6 +203,11 @@
      * verifies appendVideoListSlot
      */
     void testAppendVideoListSlot();
+    
+    /**
+     * verifies albumListAvailableSlot
+     */
+    void testAlbumListAvailableSlot();
         
     /**
      * verifies newVideoAvailableSlot
@@ -188,14 +215,19 @@
     void testNewVideoAvailableSlot();
      
     /**
-     * verifies videoDeletedSlot
+     * verifies itemDeletedSlot
      */
-    void testVideoDeletedSlot();
+    void testItemDeletedSlot();
     
     /**
      * verifies videoDeleteCompletedSlot
      */
     void testVideoDeleteCompletedSlot();
+    
+    /**
+     * verifies albumRemoveFailureSlot
+     */
+    void testAlbumRemoveFailureSlot();
       
     /**
      * verifies videoDetailsCompletedSlot