--- a/videocollection/videocollectionview/tsrc/testlistview/inc/testlistview.h	Fri Sep 03 12:37:43 2010 +0300
+++ b/videocollection/videocollectionview/tsrc/testlistview/inc/testlistview.h	Mon Sep 20 18:25:37 2010 +0300
@@ -30,6 +30,7 @@
 class VideoCollectionWrapper;
 class VideoCollectionUiLoader;
 class VideoListWidget;
+class HbToolBarExtension;
 
 class TestListView : public QObject
 {
@@ -75,14 +76,9 @@
 	void testInitializeView();
 	
     /**
-     * Tests menus.
-     */
-    void testMenus();
-
-    /**
      * Tests createAction.
      */
-    void testCreateAction();
+    void testCreateToolbar();
     
     /**
      * Tests activatView.
@@ -110,16 +106,6 @@
     void testAlbumListReadySlot();
 
     /**
-     * Tests deleteItemsSlot.
-     */
-    void testDeleteItemsSlot();
-
-    /**
-     * Tests aboutToShowMainMenuSlot.
-     */
-    void testAboutToShowMainMenuSlot();
-    
-    /**
      * Tests handleStatusSlot.
      */
     void testHandleStatusSlot();
@@ -135,16 +121,6 @@
     void testOpenCollectionViewSlot();
     
     /**
-     * Tests openOperatorServiceSlot.
-     */
-    void testOpenOperatorServiceSlot();
-    
-    /**
-     * Tests startSortingSlot.
-     */
-    void testStartSortingSlot();
-
-    /**
      * Tests view when orientation changes.
      */
     void testOrientationSlots();
@@ -183,27 +159,17 @@
      * Tests orientationChangedSlot
      */
     void testOrientationChangedSlot();
-
-    /**
-     * Tests createCollectionSlot
-     */
-    void testCreateCollectionSlot();
     
     /**
-     * Tests addVideosToCollectionSlot
+     * Tests toolbarActionsChanged
      */
-    void testAddVideosToCollectionSlot();
+    void testToolbarActionsChanged();
     
     /**
-     * Tests removeVideosFromCollectionSlot
+     * Tests toolbarExtensionChanged
      */
-    void testRemoveVideosFromCollectionSlot();
-    
-    /**
-     * Tests createOperatorServicesToolbar
-     */
-    void testCreateOperatorServicesToolbar();
-    
+    void testToolbarExtensionChanged();
+
 signals:
 
     // Signals needed in tests.
@@ -229,6 +195,10 @@
     
     void testSignal(const HbEffect::EffectStatus &status);
     
+    void testSignal(QList<QAction*>);
+    
+    void testSignal(HbToolBarExtension*);
+    
 private:
     
     VideoCollectionUiLoader* mUiLoader;