--- a/videoplayerapp/videoplayerengine/tsrc/testvideoservices/src/testvideoservices.cpp	Tue Jul 06 14:17:50 2010 +0300
+++ b/videoplayerapp/videoplayerengine/tsrc/testvideoservices/src/testvideoservices.cpp	Wed Aug 18 09:50:14 2010 +0300
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version:  %
+// Version : %version:  da1mmcf#5 %
 
 // INCLUDES
 #include <QtTest/QtTest>
@@ -31,6 +31,7 @@
 #include "videoservices.h"
 #include "videoserviceurifetch.h"
 #include "videoserviceplay.h"
+#include "videoserviceuri.h"
 #undef private
 
 // ---------------------------------------------------------------------------
@@ -54,7 +55,7 @@
 
 TestVideoServices::TestVideoServices()
     : mTestObject( 0 )
-	, mEngine( 0 )
+    , mEngine( 0 )
 {
     MPX_DEBUG(_L("TestVideoServices::TestVideoServices()"));
 }
@@ -80,41 +81,45 @@
     delete mEngine;
     mEngine = 0;
 	
-    QCOMPARE(mTestObject->mReferenceCount, 1);
-	if(mTestObject)
-	{
-		mTestObject->decreaseReferenceCount();
-	}
-	mTestObject = 0;
+    QCOMPARE( mTestObject->mReferenceCount, 1 );
+
+    if ( mTestObject)
+    {
+        mTestObject->decreaseReferenceCount();
+    }
+
+    mTestObject = 0;
 }
 
 void TestVideoServices::testCreateDelete()
 {
     MPX_DEBUG(_L("TestVideoServices::testCreateDelete()"));
     
-	mTestObject = VideoServices::instance();
+    mTestObject = VideoServices::instance();
 
-    QVERIFY(mTestObject);
-    QVERIFY(mTestObject->mServicePlay);
-    QVERIFY(mTestObject->mServiceUriFetch);
-    QVERIFY(mTestObject->mServiceView);
-    QVERIFY(mTestObject->mEngine == 0);
-    QVERIFY(mTestObject->mCurrentService == VideoServices::ENoService);
+    QVERIFY( mTestObject );
+    QVERIFY( mTestObject->mServicePlay );
+    QVERIFY( mTestObject->mServiceUriFetch );
+    QVERIFY( mTestObject->mServiceView );
+    QVERIFY( mTestObject->mServiceUriView );
+    QVERIFY( mTestObject->mEngine == 0 );
+    QVERIFY( mTestObject->mCurrentService == VideoServices::ENoService );
 }
 
 void TestVideoServices::testCreateDeleteEngine()
 {
     MPX_DEBUG(_L("TestVideoServices::testCreateDeleteEngine()"));
     
-	mEngine = new QVideoPlayerEngine();
-	mTestObject = VideoServices::instance(mEngine);
+    mEngine = new VideoPlayerEngine();
+    mTestObject = VideoServices::instance(mEngine);
 
-    QVERIFY(mTestObject);
-    QVERIFY(mTestObject->mServicePlay);
-    QVERIFY(mTestObject->mServiceUriFetch);
-    QVERIFY(mTestObject->mServiceView);
-    QVERIFY(mTestObject->mEngine == mEngine);
-    QVERIFY(mTestObject->mCurrentService == VideoServices::ENoService);
+    QVERIFY( mTestObject );
+    QVERIFY( mTestObject->mServicePlay );
+    QVERIFY( mTestObject->mServiceUriFetch );
+    QVERIFY( mTestObject->mServiceView );
+    QVERIFY( mTestObject->mServiceUriView );    
+    QVERIFY( mTestObject->mEngine == mEngine );
+    QVERIFY( mTestObject->mCurrentService == VideoServices::ENoService );
 }
 
 
@@ -122,41 +127,45 @@
 {
     MPX_DEBUG(_L("TestVideoServices::testCurrentService()"));
     
-	mTestObject = VideoServices::instance();
-
-    QVERIFY(mTestObject);
-    QVERIFY(mTestObject->mServicePlay);
-    QVERIFY(mTestObject->mServiceUriFetch);
-    QVERIFY(mTestObject->mServiceView);
-    QVERIFY(mTestObject->mEngine == 0);
-    QVERIFY(mTestObject->mCurrentService == VideoServices::ENoService);
+    mTestObject = VideoServices::instance();
 
-    mTestObject->mServicePlay->playMedia(QString());
-    QVERIFY(mTestObject->mCurrentService == VideoServices::ENoService);
+    QVERIFY( mTestObject );
+    QVERIFY( mTestObject->mServicePlay );
+    QVERIFY( mTestObject->mServiceUriFetch );
+    QVERIFY( mTestObject->mServiceView );
+    QVERIFY( mTestObject->mServiceUriView );    
+    QVERIFY( mTestObject->mEngine == 0 );
+    QVERIFY( mTestObject->mCurrentService == VideoServices::ENoService );
 
-    mTestObject->mServiceUriFetch->fetch(QString());
-    QVERIFY(mTestObject->mCurrentService == VideoServices::EUriFetcher);
+    mTestObject->mServicePlay->playMedia( QString() );
+    QVERIFY( mTestObject->mCurrentService == VideoServices::ENoService );
+
+    mTestObject->mServiceUriFetch->fetch( QString() );
+    QVERIFY( mTestObject->mCurrentService == VideoServices::EUriFetcher );
     
-    mTestObject->mServicePlay->playMedia(QString());
-    QVERIFY(mTestObject->mCurrentService == VideoServices::EUriFetcher);
+    mTestObject->mServicePlay->playMedia( QString() );
+    QVERIFY( mTestObject->mCurrentService == VideoServices::EUriFetcher );
     
-	cleanup();
+    cleanup();
 
-	mEngine = new QVideoPlayerEngine();
-	mTestObject = VideoServices::instance(mEngine);
+    mEngine = new VideoPlayerEngine();
+    mTestObject = VideoServices::instance(mEngine);
 
-	QVERIFY(mTestObject);
-    QVERIFY(mTestObject->mServicePlay);
-    QVERIFY(mTestObject->mServiceUriFetch);
-    QVERIFY(mTestObject->mServiceView);
-    QVERIFY(mTestObject->mEngine == mEngine);
-    QVERIFY(mTestObject->mCurrentService == VideoServices::ENoService);
+    QVERIFY( mTestObject );
+    QVERIFY( mTestObject->mServicePlay );
+    QVERIFY( mTestObject->mServiceUriFetch );
+    QVERIFY( mTestObject->mServiceView );
+    QVERIFY( mTestObject->mEngine == mEngine );
+    QVERIFY( mTestObject->mCurrentService == VideoServices::ENoService );
 
-    mTestObject->mServiceUriFetch->fetch(QString());
-    QVERIFY(mTestObject->mCurrentService == VideoServices::EUriFetcher);
+    mTestObject->mServiceUriFetch->fetch( QString() );
+    QVERIFY( mTestObject->mCurrentService == VideoServices::EUriFetcher );
     
-    mTestObject->mServicePlay->playMedia(QString());
-    QVERIFY(mTestObject->mCurrentService == VideoServices::EPlayback);
+    mTestObject->mServicePlay->playMedia( QString() );
+    QVERIFY( mTestObject->mCurrentService == VideoServices::EPlayback );
+    
+    mTestObject->mServiceUriView->view( QString() );
+    QVERIFY( mTestObject->mCurrentService == VideoServices::EUriView );    
 }
 
 void TestVideoServices::cleanupTestCase()