--- a/videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata/src/testvideothumbnaildata.cpp	Thu Apr 01 23:13:36 2010 +0300
+++ b/videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata/src/testvideothumbnaildata.cpp	Thu Apr 01 23:22:15 2010 +0300
@@ -47,12 +47,19 @@
 
     TestVideoThumbnailData tv;
 
-    char *pass[3];
-    pass[0] = argv[0];
-    pass[1] = "-o";
-    pass[2] = "c:\\data\\TestVideoThumbnailData.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\\TestVideoThumbnailData.txt";
+        res = QTest::qExec(&tv, 3, pass);
+    }
 
     return res;
 }
@@ -82,19 +89,6 @@
     QCOMPARE(VideoThumbnailDataPrivate::mConstructCallCount, 1);
 }
 
-
-// ---------------------------------------------------------------------------
-// testStartFetchingThumbnail
-// ---------------------------------------------------------------------------
-//
-void TestVideoThumbnailData::testStartFetchingThumbnail()
-{
-    VideoThumbnailData &instance = VideoThumbnailData::instance();
-    QCOMPARE(VideoThumbnailDataPrivate::mConstructCallCount, 1);
-    QVERIFY(instance.startFetchingThumbnail(0, 0) == 0);
-    QCOMPARE(VideoThumbnailDataPrivate::mStartFetchingThumbnailCallCount, 1);
-}
-
 // ---------------------------------------------------------------------------
 // testRemoveThumbnail
 // ---------------------------------------------------------------------------
@@ -153,8 +147,20 @@
 {
     VideoThumbnailData &instance = VideoThumbnailData::instance();
     QCOMPARE(VideoThumbnailDataPrivate::mConstructCallCount, 1);
-    instance.startBackgroundFetching(0);
+    instance.startBackgroundFetching(0, 0);
     QCOMPARE(VideoThumbnailDataPrivate::mStartBackgroundFetchingCallCount, 1);    
 }
 
+// ---------------------------------------------------------------------------
+// testEnableThumbnailCreation
+// ---------------------------------------------------------------------------
+//
+void TestVideoThumbnailData::testEnableThumbnailCreation()
+{
+    VideoThumbnailData &instance = VideoThumbnailData::instance();
+    QCOMPARE(VideoThumbnailDataPrivate::mConstructCallCount, 1);
+    instance.enableThumbnailCreation(true);
+    QCOMPARE(VideoThumbnailDataPrivate::mEnableThumbnailCreationCallCount, 1);
+}
+
 // End of file