--- a/videocollection/mpxmyvideoscollection/tsrc/ut_vcxmyvideosmdsdb/inc/VcxMyVideosMdsDbTest.h	Tue May 25 12:44:54 2010 +0300
+++ b/videocollection/mpxmyvideoscollection/tsrc/ut_vcxmyvideosmdsdb/inc/VcxMyVideosMdsDbTest.h	Wed Jun 09 09:44:23 2010 +0300
@@ -32,8 +32,22 @@
 #include <vcxmyvideosdefs.h>
 
 //#include <mpxmedia.h>
+
+
+#include <mdesession.h>
+#include <mdequery.h>
+#include <harvesterclient.h>
+#include <mpxcollectionmessagedefs.h>
+#include <vcxmyvideosdefs.h>
+#include <e32property.h>
+#include "vcxmyvideosalbum.h"
+
+#define protected public
+#define private public
 #include "vcxmyvideosmdsdb.h"
-#include "vcxmyvideosactivetask.h"
+#undef private
+#undef protected
+
 
 
 // MACROS
@@ -95,7 +109,7 @@
         * @param aEvent Event type.
         * @param aId    Array of IDs in database.
         */
-        void HandleMyVideosDbEvent( TMPXChangeEventType aEvent, RArray<TUint32>& aId ){};
+        void HandleMyVideosDbEvent( TMPXChangeEventType aEvent, RArray<TUint32>& aId );
 
         /**
         * Handler function for list fetching events. This callback is called as a response
@@ -108,7 +122,7 @@
         *                            EFalse if there are more to come.
         */
         void HandleCreateVideoListResp( CMPXMedia* aVideoList,
-                TInt aNewItemsStartIndex, TBool aComplete ){};
+                TInt aNewItemsStartIndex, TBool aComplete );
 
         /**
         * Handler function for media remove/insert events. This is called every time
@@ -188,9 +202,26 @@
         virtual TInt UpdateVideoL( CStifItemParser& aItem );
 
         virtual TInt CreateVideoListL( CStifItemParser& aItem );
+        
+        virtual TInt DoCreateVideoListL( CStifItemParser& aItem );
 
         virtual TInt CreateVideoL( CStifItemParser& aItem );
         
+        virtual TInt HandleQueryNewResultsL( CStifItemParser& aItem );
+
+        virtual TInt HandleQueryCompletedL( CStifItemParser& aItem );
+        
+        virtual TInt AsyncHandleQueryCompletedL( CStifItemParser& aItem );
+        
+        virtual TInt HandleSessionErrorL( CStifItemParser& aItem );
+        
+        virtual TInt HandleObjectNotificationL( CStifItemParser& aItem );
+
+        virtual TInt HandleObjectPresentNotification( CStifItemParser& aItem );
+
+        virtual TInt ShutdownNotificationL( CStifItemParser& aItem );        
+        
+        
         /**
          * Method used to log version of test class
          */
@@ -207,7 +238,11 @@
     public:
     
         TInt mdssessionerror,  mdssessionasyncerror,
-        mdsoperationleaves, mdsoperationreturns ;
+        mdsoperationleaves, mdsoperationreturns, mdeobjectopenresult,
+        querycountresult, propertynotdefined, propertyisnull, handledbeventleave ;
+        
+        
+        CMPXMedia* iVideoList;
         
     };