FCL/sf/app/videoplayer: comparison videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/src/VCXMyVideosCollectionPluginTestBlocks.cpp

equal deleted inserted replaced

-:48e74db5d516
+:bbb98528c666
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
-* Description:   ?Description*
+* Description:
 */
 // INCLUDE FILES
 #include <mmf/common/mmfcontrollerpluginresolver.h> // CleanupResetAndDestroyPushL
 #include <e32svr.h>
 #include <StifParser.h>
 #include <Stiftestinterface.h>
 #include <centralrepository.h>
 #include <collate.h>
 #include "VCXTestLog.h"
-#include "VCXTestCommon.h"
+#include "VCXMyVideosTestUtils.h"
-#include "CIptvTestActiveWait.h"
+#include "CVcxTestActiveWait.h"
-#include "CIptvTestTimer.h"
+#include "CVcxTestTimer.h"
-#include "VCXTestStatsKeeper.h"
 #include "VCXMyVideosCollectionPluginTest.h"
 #include "VCXMyVideosCollectionPluginTester.h"
+#include "VCXMyVideosTestUtils.h"
+#include "VCXTestMdsDbModifier.h"
 #include "VCXMyVideosTestCommon.h"
-#include "VCXMyVideosTestDlWatcher.h"
-#include "VCXMyVideosTestServiceEmu.h"
-#include "VCXTestMdsDbModifier.h"
 #include <mpxmedia.h>
 #include <mpxmediageneraldefs.h>
 #include <mpxmediageneralextdefs.h>
+#include "vcxmyvideosdefs.h"
 #include "vcxmyvideosuids.h"
 // CONSTANTS
 const TInt KVcxTestFileSize3GB = -999;
+_LIT(KAbout2050CharsString, "asdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjaiasdfiajsdfasdfiasdjfijasdifjisdfjisdjfiasdjfidjai");
+_LIT(KVcxTestEmptyString, "");
+_LIT(KStifScriptInvalidRequest, "InvalidRequest");
+_LIT(KStifScriptEmptyString, "EmptyString");
+_LIT(KStifScript2KString, "2KString");
 // MACROS
-#define VCXMVTEST_ERR(err) ( iStatsEnabled ) ? KErrNone : err
 // MODULE DATA STRUCTURES
 // ============================ MEMBER FUNCTIONS ===============================
 }
 }
 iSideloadFolders.ResetAndDestroy();
-delete iTestCommon;
+delete iTestUtils;
-iTestCommon = NULL;
+iTestUtils = NULL;
 #ifdef __WINSCW__
 iClient.Close();
 #endif // __WINSCW__
 }
 delete iMpxMedia;
 iMpxMedia = NULL;
-delete iServiceEmu;
-iServiceEmu = NULL;
 delete iMdsDbModifier;
 iMdsDbModifier = NULL;
 delete iFileMan;
 iFileMan = NULL;
 iFs.Close();
-delete iStats;
-iStats = NULL;
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::Delete <----------");
 }
 // -----------------------------------------------------------------------------
 // Copy this line for every implemented function.
 // First string is the function name used in TestScripter script file.
 // Second is the actual implementation member function.
 ENTRY( "Create", CVCXMyVideosCollectionPluginTest::CreateL ),
-ENTRY( "EnableStats", CVCXMyVideosCollectionPluginTest::EnableStatsL ),
-ENTRY( "SetPreferredMemory", CVCXMyVideosCollectionPluginTest::SetPreferredMemoryL ),
 ENTRY( "SetSortingOrder", CVCXMyVideosCollectionPluginTest::SetSortingOrderL ),
 ENTRY( "SetAutomaticRefresh", CVCXMyVideosCollectionPluginTest::SetAutomaticRefresh ),
 ENTRY( "SetQuietMode", CVCXMyVideosCollectionPluginTest::SetQuietMode ),
 ENTRY( "CoolDown", CVCXMyVideosCollectionPluginTest::CoolDownL ),
-ENTRY( "DisableDownloadCheck", CVCXMyVideosCollectionPluginTest::DisableDownloadCheckL ),
 ENTRY( "SetFileCheck", CVCXMyVideosCollectionPluginTest::SetFileCheckL ),
-ENTRY( "SetAutoResume", CVCXMyVideosCollectionPluginTest::SetAutoResumeL ),
+ENTRY( "SetUseCopiedMedias", CVCXMyVideosCollectionPluginTest::SetUseCopiedMediasL ),
 ENTRY( "OpenCollection", CVCXMyVideosCollectionPluginTest::OpenCollectionL ),
 ENTRY( "OpenLevel", CVCXMyVideosCollectionPluginTest::OpenLevelL ),
+ENTRY( "OpenLevelByIndex", CVCXMyVideosCollectionPluginTest::OpenLevelByIndexL ),
 ENTRY( "RefreshContents", CVCXMyVideosCollectionPluginTest::RefreshContentsL ),
 ENTRY( "GetMediasByMpxId", CVCXMyVideosCollectionPluginTest::GetMediasByMpxIdL ),
 ENTRY( "CloseLevel", CVCXMyVideosCollectionPluginTest::CloseLevelL ),
 ENTRY( "GetMediaFullDetails", CVCXMyVideosCollectionPluginTest::GetMediaFullDetailsL ),
 ENTRY( "GetMediaFullDetailsByMpxId", CVCXMyVideosCollectionPluginTest::GetMediaFullDetailsByMpxIdL ),
 ENTRY( "GetAllMediaFullDetails", CVCXMyVideosCollectionPluginTest::GetAllMediaFullDetailsL ),
 ENTRY( "SetMediaDetail", CVCXMyVideosCollectionPluginTest::SetMediaDetailL ),
 ENTRY( "CheckMediaDetail", CVCXMyVideosCollectionPluginTest::CheckMediaDetailL ),
+ENTRY( "CheckAlbumCount", CVCXMyVideosCollectionPluginTest::CheckAlbumCountL ),
 ENTRY( "CheckMediaCount", CVCXMyVideosCollectionPluginTest::CheckMediaCountL ),
 ENTRY( "CheckMinimumMediaCount", CVCXMyVideosCollectionPluginTest::CheckMinimumMediaCountL ),
 ENTRY( "CheckMaximumMediaCount", CVCXMyVideosCollectionPluginTest::CheckMaximumMediaCountL ),
-ENTRY( "CheckDownloadCount", CVCXMyVideosCollectionPluginTest::CheckDownloadCountL ),
 ENTRY( "CreateCopyOfMedia", CVCXMyVideosCollectionPluginTest::CreateCopyOfMediaL ),
 ENTRY( "CreateEmptyMedia", CVCXMyVideosCollectionPluginTest::CreateEmptyMediaL ),
 ENTRY( "AddMedia", CVCXMyVideosCollectionPluginTest::AddMediaL ),
 ENTRY( "SetMedia", CVCXMyVideosCollectionPluginTest::SetMediaL ),
 ENTRY( "OutsideMediaUpdate", CVCXMyVideosCollectionPluginTest::OutsideMediaUpdateL ),
 ENTRY( "CancelNextOperation", CVCXMyVideosCollectionPluginTest::CancelNextOperationL ),
 ENTRY( "DeleteFileOfMedia", CVCXMyVideosCollectionPluginTest::DeleteFileOfMediaL ),
 ENTRY( "DeleteFilesOfAllMedias", CVCXMyVideosCollectionPluginTest::DeleteFilesOfAllMediasL ),
+ENTRY( "CreateAlbum", CVCXMyVideosCollectionPluginTest::CreateAlbumL ),
 ENTRY( "RemoveMedia", CVCXMyVideosCollectionPluginTest::RemoveMediaL ),
 ENTRY( "RemoveAllMedia", CVCXMyVideosCollectionPluginTest::RemoveAllMediaL ),
 ENTRY( "MoveMedia", CVCXMyVideosCollectionPluginTest::MoveMediaL ),
 ENTRY( "MoveMedias", CVCXMyVideosCollectionPluginTest::MoveMediasL ),
 ENTRY( "CancelMove", CVCXMyVideosCollectionPluginTest::CancelMoveL ),
 ENTRY( "CancelCopy", CVCXMyVideosCollectionPluginTest::CancelCopyL ),
 ENTRY( "DeleteMedia", CVCXMyVideosCollectionPluginTest::DeleteMediaL ),
 ENTRY( "DeleteMedias", CVCXMyVideosCollectionPluginTest::DeleteMediasL ),
 ENTRY( "CancelDelete", CVCXMyVideosCollectionPluginTest::CancelDeleteL ),
+ENTRY( "CreateAlbum", CVCXMyVideosCollectionPluginTest::CreateAlbumL ),
+ENTRY( "DeleteAlbums", CVCXMyVideosCollectionPluginTest::DeleteAlbumsL ),
+ENTRY( "DeleteAllAlbums", CVCXMyVideosCollectionPluginTest::DeleteAllAlbumsL ),
+ENTRY( "AddMediasToAlbum", CVCXMyVideosCollectionPluginTest::AddMediasToAlbumL ),
+ENTRY( "RemoveMediasFromAlbum", CVCXMyVideosCollectionPluginTest::RemoveMediasFromAlbumL ),
+ENTRY( "CheckAlbumCount", CVCXMyVideosCollectionPluginTest::CheckAlbumCount ),
 ENTRY( "CreateVideoFile", CVCXMyVideosCollectionPluginTest::CreateVideoFileL ),
 ENTRY( "CreateVideoFileNoWait", CVCXMyVideosCollectionPluginTest::CreateVideoFileNoWaitL ),
 ENTRY( "EnsureDriveForVideos", CVCXMyVideosCollectionPluginTest::EnsureDriveForVideosL ),
 ENTRY( "EmptySideloadFolders", CVCXMyVideosCollectionPluginTest::EmptySideloadFoldersL ),
 ENTRY( "SetDeleteSideloadedVideos", CVCXMyVideosCollectionPluginTest::SetDeleteSideloadedVideos ),
-ENTRY( "Download", CVCXMyVideosCollectionPluginTest::DownloadL ),
-ENTRY( "ResumeDownload", CVCXMyVideosCollectionPluginTest::ResumeDownloadL ),
-ENTRY( "ResumeAllDownloads", CVCXMyVideosCollectionPluginTest::ResumeAllDownloadsL ),
-ENTRY( "DownloadUsingMedia", CVCXMyVideosCollectionPluginTest::DownloadUsingMediaL ),
-ENTRY( "ResumeDownloadUsingMedia", CVCXMyVideosCollectionPluginTest::ResumeDownloadUsingMediaL ),
-ENTRY( "DownloadUrl", CVCXMyVideosCollectionPluginTest::DownloadUrlL ),
-ENTRY( "CancelDownload", CVCXMyVideosCollectionPluginTest::CancelDownloadL ),
-ENTRY( "CancelDownloadById", CVCXMyVideosCollectionPluginTest::CancelDownloadByIdL ),
-ENTRY( "PauseDownload", CVCXMyVideosCollectionPluginTest::PauseDownloadL ),
-ENTRY( "PauseDownloadByUrl", CVCXMyVideosCollectionPluginTest::PauseDownloadByUrlL ),
-ENTRY( "CheckDownloadProgress", CVCXMyVideosCollectionPluginTest::CheckDownloadProgressL ),
-ENTRY( "WaitAllDownloads", CVCXMyVideosCollectionPluginTest::WaitAllDownloadsL ),
 ENTRY( "WaitForMessage", CVCXMyVideosCollectionPluginTest::WaitForMessageL ),
 ENTRY( "WaitForAnyMessage", CVCXMyVideosCollectionPluginTest::WaitForAnyMessageL ),
 ENTRY( "WaitForMessages", CVCXMyVideosCollectionPluginTest::WaitForMessagesL ),
 };
 return RunInternalL( KFunctions, count, aItem );
 }
 // -----------------------------------------------------------------------------
-// CVCXMyVideosCollectionPluginTest::EnableStatsL
-// -----------------------------------------------------------------------------
-//
-TInt CVCXMyVideosCollectionPluginTest::EnableStatsL( CStifItemParser& aItem )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::EnableStatsL ---------->");
-// Print to UI
-_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
-_LIT( KWhere, "In EnableStatsL" );
-TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
-// Print to log file
-iLog->Log( KWhere );
-aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
-TPtrC statsName;
-TPtrC fileName;
-User::LeaveIfError( aItem.GetNextString( statsName) );
-User::LeaveIfError( aItem.GetNextString( fileName) );
-TRAP_IGNORE( iStats->StartStatsKeepingL( statsName, fileName ) );
-iStatsEnabled = ETrue;
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::EnableStatsL <----------");
-return KErrNone;
-}
-// -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::CreateL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::CreateL( CStifItemParser& aItem )
 {
 User::LeaveIfError( iFs.Connect() );
 iFileMan = CFileMan::NewL( iFs );
 aItem.SetParsingType(CStifItemParser::EQuoteStyleParsing);
-iTestCommon = CVCXTestCommon::NewL();
+iTestUtils = CVCXMyVideosTestUtils::NewL();
-iStats = CVCXTestStatsKeeper::NewL();
+iTester = CVCXMyVideosCollectionPluginTester::NewL( this, iTestUtils );
-iTester = CVCXMyVideosCollectionPluginTester::NewL( this, iTestCommon, iStats );
+iActiveWait = CVcxTestActiveWait::NewL();
-iActiveWait = CIptvTestActiveWait::NewL();
+iActiveWaitBlocking = CVcxTestActiveWait::NewL();
-iActiveWaitBlocking = CIptvTestActiveWait::NewL();
+iTimeoutTimer = CVcxTestTimer::NewL(*this, 0);
-iTimeoutTimer = CIptvTestTimer::NewL(*this, 0);
+iCoolDownTimer = CVcxTestTimer::NewL(*this, 1);
-iCoolDownTimer = CIptvTestTimer::NewL(*this, 1);
 #ifdef __WINSCW__
 TInt err = iClient.Connect();
 if( KErrNone != err )
 {
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: Could not start MDS server session! Err: %d", err);
 }
 #endif // __WINSCW__
-iAutoResume = ETrue;
-iTester->SetAutoResume( iAutoResume );
-iServiceEmu = CVCXMyVideosTestServiceEmu::NewL();
 iMdsDbModifier = CVCXTestMdsDbModifier::NewL();
 iCurrentSortOrder = EVcxMyVideosSortingNone;
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CreateL <----------");
-return KErrNone;
-}
-// -----------------------------------------------------------------------------
-// CVCXMyVideosCollectionPluginTest::SetPreferredMemoryL
-// -----------------------------------------------------------------------------
-//
-TInt CVCXMyVideosCollectionPluginTest::SetPreferredMemoryL( CStifItemParser& aItem )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::SetPreferredMemoryL ---------->");
-// Print to UI
-_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
-_LIT( KWhere, "In SetPreferredMemoryL" );
-TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
-// Print to log file
-iLog->Log( KWhere );
-aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
-TInt drive(0);
-User::LeaveIfError( GetDriveParam( aItem, drive ) );
-// These were defined in CVcxMyVideosDownloadUtil::PreferredMemoryDesL()
-const TInt KVcxCenRepUid = 0x102750E2; // same as KIptvCenRepUid in CIptvUtil.h
-const TInt KVcxCenRepPreferredMemoryKey = 0x01; // same as KIptvCenRepPreferredMemoryKey in CIptvUtil.h
-TUid uid;
-uid.iUid = KVcxCenRepUid;
-CRepository* cenRep = CRepository::NewLC( uid );
-User::LeaveIfError( cenRep->Set( KVcxCenRepPreferredMemoryKey, drive ) );
-CleanupStack::PopAndDestroy( cenRep );
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::SetPreferredMemoryL <----------");
 return KErrNone;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::SetSortingOrderL
 TRAP( err, DoTotalRefreshL() );
 iCurrentSortOrder = value;
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::SetSortingOrderL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::SetAutomaticRefresh
 // -----------------------------------------------------------------------------
 {
 iTester->SetAutomaticRefresh( static_cast<TBool>(value) );
 }
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::SetAutomaticRefresh <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::SetQuietMode
 // -----------------------------------------------------------------------------
 {
 iTester->SetQuietMode( static_cast<TBool>(value) );
 }
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::SetQuietMode <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CoolDownL
+// CVcxMyVideosApiTest::CoolDownL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::CoolDownL( CStifItemParser& /* aItem */ )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CoolDownL ---------->");
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CoolDownL <----------");
 return KErrNone;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::DisableDownloadCheckL
+// CVcxMyVideosApiTest::SetFileCheckL
-// -----------------------------------------------------------------------------
-//
-TInt CVCXMyVideosCollectionPluginTest::DisableDownloadCheckL( CStifItemParser& /* aItem */ )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::DisableDownloadCheckL");
-if( iTester )
-{
-iTester->GetDownloadWatcher()->DisableDownloadCheck();
-}
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::DisableDownloadCheckL");
-return KErrNone;
-}
-// -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::SetFileCheckL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::SetFileCheckL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::SetFileCheckL");
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::SetFileCheckL");
 return KErrNone;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::SetAutoResumeL
+// CVcxMyVideosApiTest::SetUseCopiedMediasL
 // -----------------------------------------------------------------------------
 //
-TInt CVCXMyVideosCollectionPluginTest::SetAutoResumeL( CStifItemParser& aItem )
+TInt CVCXMyVideosCollectionPluginTest::SetUseCopiedMediasL( CStifItemParser& aItem )
 {
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::SetAutoResumeL ---------->");
+VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::SetUseCopiedMediasL");
-// Print to UI
-_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
+TInt value(0);
-_LIT( KWhere, "In SetAutoResumeL" );
+User::LeaveIfError( aItem.GetNextInt( value ) );
-TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
+TBool set = static_cast<TBool>(value);
-// Print to log file
+iTester->SetUseCopiedMediasL( set );
-iLog->Log( KWhere );
+VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::SetUseCopiedMediasL");
-TInt autoResume(0);
-User::LeaveIfError( aItem.GetNextInt( autoResume ) );
-iAutoResume = autoResume;
-if( iTester )
-{
-iTester->SetAutoResume( iAutoResume );
-}
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::SetAutoResumeL <----------");
 return KErrNone;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::OpenCollectionL
 if( err != KErrNone )
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::OpenCollectionL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::OpenLevelL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::OpenLevelL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::OpenLevelL ---------->");
+// Print to UI
+_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
+_LIT( KWhere, "In OpenLevelL" );
+TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
+// Print to log file
+iLog->Log( KWhere );
+aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
+TPtrC name;
+User::LeaveIfError( aItem.GetNextString( name ) );
+VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: levelName: %S", &name);
+iLastReceivedMessage = -1;
+TInt err( KErrNotReady );
+if( iTester )
+{
+TRAP( err, iTester->OpenLevelL( name ) );
+}
+if( err != KErrNone )
+VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
+VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::OpenLevelL <----------");
+return err;
+}
+// -----------------------------------------------------------------------------
+// CVCXMyVideosCollectionPluginTest::OpenLevelByIndexL
+// -----------------------------------------------------------------------------
+//
+TInt CVCXMyVideosCollectionPluginTest::OpenLevelByIndexL( CStifItemParser& aItem )
+{
+VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::OpenLevelByIndexL ---------->");
 // Print to UI
 _LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
 _LIT( KWhere, "In OpenLevelL" );
 TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
 // Print to log file
 }
 if( err != KErrNone )
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::OpenLevelL <----------");
+VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::OpenLevelByIndexL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::CloseLevelL
 // -----------------------------------------------------------------------------
 if( err != KErrNone )
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CloseLevelL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::RefreshContentsL
 // -----------------------------------------------------------------------------
 if( err != KErrNone )
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::RefreshContentsL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::RefreshContentsL
 // -----------------------------------------------------------------------------
 if( err != KErrNone )
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::GetMediasByMpxIdL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::GetMediaFullDetailsL
 // -----------------------------------------------------------------------------
 }
 messages.Reset();
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::GetMediaFullDetailsL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::GetMediaFullDetailsByMpxIdL
 // -----------------------------------------------------------------------------
 }
 messages.Reset();
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::GetMediaFullDetailsByMpxIdL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::GetAllMediaFullDetailsL
 // -----------------------------------------------------------------------------
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 iLastReceivedMessage = -1;
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::GetAllMediaFullDetailsL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::CheckMediaDetailL
 // -----------------------------------------------------------------------------
 aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
 TInt drive(0);
 User::LeaveIfError( GetDriveParam( aItem, drive ) );
-TInt itemIndex(0);
+// Get the media object to be checked.
-User::LeaveIfError( aItem.GetNextInt( itemIndex ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: item index: %d", itemIndex);
+TPtrC itemIndexOrName;
+User::LeaveIfError( aItem.GetNextString( itemIndexOrName ) );
-if( itemIndex < 0 || itemIndex >= iTester->GetMediaCount() )
+VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: item index or name: %S", &itemIndexOrName);
-{
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: Error. Index (%d) out of bounds.", itemIndex);
+TLex lex( itemIndexOrName );
+TInt itemIndex( -1 );
+if( lex.Val( itemIndex ) == KErrNone )
+{
+if( itemIndex < 0 || itemIndex >= iTester->GetMediaCount() )
+{
+VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: Error. Index (%d) out of bounds.", itemIndex);
+User::Leave( KErrArgument );
+}
+}
+else
+{
+itemIndex = iTester->GetIndexOfMediaWithNameL( itemIndexOrName );
+}
+if( itemIndex == KErrNotFound )
+{
 User::Leave( KErrArgument );
 }
+// Attribute to be checked
 TInt mpxAttributeMappingId(0);
 User::LeaveIfError( aItem.GetNextInt( mpxAttributeMappingId ) );
+// It's type.
 TVcxTestMediaAttributeType type;
 TMPXAttributeData mpxMediaAttribute;
 User::LeaveIfError( MapMpxMediaAttribute(
 static_cast<TVcxTestMediaAttributeIdMapping>(mpxAttributeMappingId),
 mpxMediaAttribute, type ) );
+// Get the media to be checked.
-CMPXMedia* media( NULL );
+CMPXMedia* media( NULL );
 TRAP( err, media = iTester->GetMediaL( drive, itemIndex ) );
 // If attribute is not supported, fetch full media details.
 if( media && !media->IsSupported( mpxMediaAttribute ) )
 {
 }
 if( err != KErrNone )
 {
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CheckMediaDetailL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 if( !media->IsSupported( mpxMediaAttribute ) )
 {
 VCXLOGLO3("CVCXMyVideosCollectionPluginTest:: error: iAttributeId: %d, iContentId: %d is not supported.",
 mpxMediaAttribute.iAttributeId == 0, mpxMediaAttribute.iContentId);
 iTester->PrintMPXMediaL( *media, ETrue );
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CheckMediaDetailL <---------");
-return VCXMVTEST_ERR( KErrNotSupported );
+return KErrNotSupported;
 }
 if( type == EVcxTestMediaAttributeTypeString )
 {
 VCXLOGLO1("CVCXMyVideosCollectionPluginTest:: Getting attribute of type text");
 {
 TRAP_IGNORE( iTester->PrintMediasL( NULL, EFalse, _L("Videos") ) );
 }
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CheckMediaDetailL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::SetItemDetailsL
 // -----------------------------------------------------------------------------
 iMpxMedia->SetTObjectValueL<TUint32>( mpxMediaAttribute, value );
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: Set to %d", value);
 }
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::SetMediaDetailL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
-// -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CheckMediaCountL
+// -----------------------------------------------------------------------------
+// CVcxMyVideosApiTest::CheckAlbumCountL
+// -----------------------------------------------------------------------------
+//
+TInt CVCXMyVideosCollectionPluginTest::CheckAlbumCountL( CStifItemParser& aItem )
+{
+VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CheckAlbumCountL ---------->");
+// Print to UI
+_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
+_LIT( KWhere, "In CheckAlbumCountL" );
+TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
+// Print to log file
+iLog->Log( KWhere );
+WaitForRefreshL( EFalse ); // Wait for possible refresh to finish.
+aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
+TInt expectedCount(0);
+User::LeaveIfError(aItem.GetNextInt(expectedCount));
+// File check
+TInt videoCount = iTester->GetMediaCount();
+// attribute check that they are in allowed values
+int err(KErrNone);
+int actualCount(0);
+for( TInt i = videoCount-1; i >= 0; i-- )
+{
+CMPXMedia* media = iTester->GetMediaL( -1, i );
+// Skip categories with empty names, they are for photos.
+if( !media->IsSupported( KMPXMediaGeneralTitle ) )
+{
+continue;
+}
+TMPXItemId itemId  = *( media->Value<TMPXItemId>( KMPXMediaGeneralId ) );
+if(itemId.iId2 == KVcxMvcMediaTypeAlbum)
+{
+actualCount++;
+}
+}
+if ( actualCount != expectedCount )
+{
+VCXLOGLO2("CVCXMyVideosCollectionPluginTest: Error! Count of albums is wrong: %d", actualCount );
+err = KErrCorrupt;
+}
+VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CheckAlbumCountL <----------");
+return err;
+}
+// -----------------------------------------------------------------------------
+// CVcxMyVideosApiTest::CheckMediaCountL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::CheckMediaCountL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CheckMediaCountL ---------->");
 {
 iTester->PrintMediasL( NULL, EFalse, _L("Videos") );
 }
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CheckMediaCountL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CheckMinimumMediaCountL
+// CVcxMyVideosApiTest::CheckMinimumMediaCountL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::CheckMinimumMediaCountL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CheckMinimumMediaCountL ---------->");
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: drive: %d", drive);
 TRAPD( err, CheckMediasL( expectedCount, drive, -1 ) );
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CheckMinimumMediaCountL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CheckMaximumMediaCountL
+// CVcxMyVideosApiTest::CheckMaximumMediaCountL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::CheckMaximumMediaCountL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CheckMaximumMediaCountL ---------->");
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: drive: %d", drive);
 TRAPD( err, CheckMediasL( expectedCount, drive, 1 ) );
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CheckMaximumMediaCountL <----------");
-return VCXMVTEST_ERR( err );
+return err;
-}
-// -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CheckDownloadCountL
-// -----------------------------------------------------------------------------
-//
-TInt CVCXMyVideosCollectionPluginTest::CheckDownloadCountL( CStifItemParser& aItem )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CheckDownloadCountL ---------->");
-// Print to UI
-_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
-_LIT( KWhere, "In CheckMediaCountL" );
-TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
-// Print to log file
-iLog->Log( KWhere );
-aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
-WaitForRefreshL( EFalse ); // Wait for possible refresh to finish.
-TInt expectedCount(0);
-User::LeaveIfError(aItem.GetNextInt(expectedCount));
-TInt err( KErrNotReady );
-if( iTester )
-{
-err = KErrNone;
-if( iTester->GetDownloadWatcher()->GetDownloadCount() != expectedCount )
-{
-err = KErrCorrupt;
-VCXLOGLO1("CVCXMyVideosCollectionPluginTest:: ERROR: Not expected count of downloads!");
-}
-}
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CheckDownloadCountL <----------");
-return VCXMVTEST_ERR( err );
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::CreateCopyOfMediaL
 // -----------------------------------------------------------------------------
 if( iTester->GetMediaCount() <= 0 )
 {
 VCXLOGLO1("CVCXMyVideosCollectionPluginTest:: ERROR: There's zero medias!");
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CreateCopyOfMediaL <----------");
-return VCXMVTEST_ERR( KErrArgument );
+return KErrArgument;
 }
 if( iMpxMedia )
 {
 delete iMpxMedia;
 {
 VCXLOGLO2("<<<CVCXMyVideosCollectionPluginTest:: err: %d", err);
 }
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CreateCopyOfMediaL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::CreateEmptyMediaL
 // -----------------------------------------------------------------------------
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: Open plugin binary failed: %d", err2);
 }
 }
 #endif // __WINSCW__
 if( err != KErrNone )
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::AddMediaL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::SetMediaL
 // -----------------------------------------------------------------------------
 if( err != KErrNone )
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::SetMediaL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::OutsideMediaUpdateL
 // -----------------------------------------------------------------------------
 if( err != KErrNone )
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::OutsideMediaUpdateL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::RemoveMediaL
+// CVcxMyVideosApiTest::RemoveMediaL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::RemoveMediaL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::RemoveMediaL ---------->");
 {
 TRAP( err, iTester->RemoveMediaL( drive, index, syncCall ) );
 }
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::RemoveMediaL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::RemoveAllMediaL
+// CVcxMyVideosApiTest::RemoveAllMediaL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::RemoveAllMediaL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::RemoveAllMediaL ---------->");
 iLastReceivedMessage = -1;
 TRAP_IGNORE( iTester->EnsureMediaFilesAreNotInUseL() );
 TInt error( KErrNone );
-TInt mediaCount = iTester->GetMediaCount();
-// Store info about the mpx items.
-RArray<TUint> mpxIds;
-CleanupClosePushL( mpxIds );
-RArray<TUint> downloadIds;
-CleanupClosePushL( downloadIds );
-RArray<TInt> downloadStates;
-CleanupClosePushL( downloadStates );
-RPointerArray<HBufC> filePaths;
-CleanupResetAndDestroyPushL( filePaths );
-// Get ids and other needed details.
-for( TInt i=0; i<mediaCount; i++ )
-{
-CMPXMedia* media( NULL );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest::RemoveAllMediaL: GetMedia %d", i);
-TRAP( error, media = iTester->GetMediaL( -1, i ) );
-if( error != KErrNone )
-{
-CleanupStack::PopAndDestroy( &filePaths );
-CleanupStack::PopAndDestroy( &downloadStates );
-CleanupStack::PopAndDestroy( &downloadIds );
-CleanupStack::PopAndDestroy( &mpxIds );
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::RemoveAllMediaL <----------");
-return VCXMVTEST_ERR( error );
-}
-if( media && media->IsSupported( KMPXMediaGeneralUri ) )
-{
-TUint32 downloadId = 0;
-if( media->IsSupported( KVcxMediaMyVideosDownloadId ) )
-{
-downloadId = media->ValueTObjectL<TUint32>( KVcxMediaMyVideosDownloadId );
-}
-TInt state = -1;
-if( media->IsSupported( KVcxMediaMyVideosDownloadState ) )
-{
-state = media->ValueTObjectL<TUint8>( KVcxMediaMyVideosDownloadState );
-}
-HBufC* path( NULL );
-if( media->IsSupported( KMPXMediaGeneralUri ) )
-{
-path = media->ValueText( KMPXMediaGeneralUri ).AllocL();
-}
-else
-{
-path = HBufC::NewL( 32 );
-}
-TMPXItemId itemId = *(media->Value<TMPXItemId>( KMPXMediaGeneralId ));
-filePaths.Append( path );
-downloadIds.Append( downloadId );
-downloadStates.Append( state );
-mpxIds.Append( itemId.iId1 );
-}
-}
-// Cancel downloads.
-for( TInt i = mpxIds.Count()-1; i >= 0; i-- )
-{
-if( downloadIds[i] != 0 || downloadStates[i] != -1 )
-{
-// Cancel the download.
-RArray<TInt> messages;
-if( BaflUtils::FileExists( iFs, filePaths[i]->Des() ) )
-{
-messages.Append( KVCXMYVideosTestMessageMpxItemDeleted );
-}
-messages.Append( KVCXMYVideosTestMessageCommandComplete );
-messages.Append( KVCXMYVideosTestMessageCollectionOpened );
-TRAP( error, iTester->CancelDownloadL( mpxIds[i], downloadIds[i], filePaths[i]->Des(), EFalse ) );
-if( error == KErrNone )
-{
-TRAP( error, WaitForMessagesL( ETrue, messages, 30, ETrue ) );
-}
-messages.Reset();
-// Error occured, lets hope deleting works.
-if( error != KErrNone )
-{
-downloadIds[i] = 0;
-downloadStates[i] = -1;
-}
-}
-}
 // Get current list of medias.
 CMPXMediaArray* medias( NULL );
 medias = iTester->SelectMediasL( -1, 0, iTester->GetMediaCount() );
 CleanupStack::PopAndDestroy( medias );
 iLastReceivedMessage = -1;
-CleanupStack::PopAndDestroy( &filePaths );
-CleanupStack::PopAndDestroy( &downloadStates );
-CleanupStack::PopAndDestroy( &downloadIds );
-CleanupStack::PopAndDestroy( &mpxIds );
-if( iTester && iTester->GetDownloadWatcher() )
-{
-iTester->GetDownloadWatcher()->Reset();
-}
 if( iTester->GetMediaCount() > 0 )
 {
 VCXLOGLO1("CVCXMyVideosCollectionPluginTest:: All medias could not be removed.");
 error = KErrCorrupt;
 }
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::RemoveAllMediaL <----------");
-return VCXMVTEST_ERR( error );
+return error;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::MoveMediaL
+// CVcxMyVideosApiTest::MoveMediaL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::MoveMediaL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::MoveMediaL ---------->");
 TInt err( KErrNotReady );
 if( iTester )
 {
 TRAP( err, iTester->EnsureMediaFilesAreNotInUseL() );
-err = VCXMVTEST_ERR( err );
+err = err;
 if( err == KErrNone )
 {
 TRAP( err, iTester->MoveMediasL( sourceDrive, index, index+1, destDrive, syncCall ) );
 }
 }
 if( err != KErrNone )
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::MoveMediaL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::MoveMediasL
+// CVcxMyVideosApiTest::MoveMediasL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::MoveMediasL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::MoveMediasL ---------->");
 TInt err( KErrNotReady );
 if( iTester )
 {
 TRAP( err, iTester->EnsureMediaFilesAreNotInUseL() );
-err = VCXMVTEST_ERR( err );
+err = err;
 if( err == KErrNone )
 {
 TRAP( err, iTester->MoveMediasL( sourceDrive, index, endIndex, destDrive, syncCall ) );
 }
 }
 if( err != KErrNone )
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::MoveMediasL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CancelMoveL
+// CVcxMyVideosApiTest::CancelMoveL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::CancelMoveL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CancelMoveL ---------->");
 if( err != KErrNone )
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CancelMoveL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CopyMediaL
+// CVcxMyVideosApiTest::CopyMediaL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::CopyMediaL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CopyMediaL ---------->");
 if( err != KErrNone )
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CopyMediaL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CopyMediasL
+// CVcxMyVideosApiTest::CopyMediasL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::CopyMediasL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CopyMediasL ---------->");
 if( err != KErrNone )
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CopyMediasL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CancelCopyL
+// CVcxMyVideosApiTest::CancelCopyL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::CancelCopyL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CancelCopyL ---------->");
 if( err != KErrNone )
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CancelCopyL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::DeleteMediaL
+// CVcxMyVideosApiTest::DeleteMediaL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::DeleteMediaL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::DeleteMediaL ---------->");
 TInt err( KErrNotReady );
 if( iTester )
 {
 TRAP( err, iTester->EnsureMediaFilesAreNotInUseL() );
-err = VCXMVTEST_ERR( err );
+err = err;
 if( err == KErrNone )
 {
 TRAP( err, iTester->DeleteMediasL( sourceDrive, index, index+1, syncCall ) );
 }
 }
 if( err != KErrNone )
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::DeleteMediaL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::DeleteMediasL
+// CVcxMyVideosApiTest::DeleteMediasL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::DeleteMediasL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::DeleteMediasL ---------->");
 TInt err( KErrNotReady );
 if( iTester )
 {
 TRAP( err, iTester->EnsureMediaFilesAreNotInUseL() );
-err = VCXMVTEST_ERR( err );
+err = err;
 if( err == KErrNone )
 {
 TRAP( err, iTester->DeleteMediasL( sourceDrive, index, endIndex, syncCall ) );
 }
 }
 {
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 }
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::DeleteMediasL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CancelDeleteL
+// CVcxMyVideosApiTest::CancelDeleteL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::CancelDeleteL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CancelDeleteL ---------->");
 if( err != KErrNone )
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CancelDeleteL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 //----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CancelNextOperationL
+// CVcxMyVideosApiTest::CancelNextOperationL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::CancelNextOperationL( CStifItemParser& /* aItem */ )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CancelNextOperationL ---------->");
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CancelNextOperationL <----------");
 return KErrNone;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::DeleteFileOfMediaL
+// CVcxMyVideosApiTest::DeleteFileOfMediaL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::DeleteFileOfMediaL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::DeleteFileOfMediaL ---------->");
 {
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
 }
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::DeleteFileOfMediaL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::DeleteFilesOfAllMediasL
+// CVcxMyVideosApiTest::DeleteFilesOfAllMediasL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::DeleteFilesOfAllMediasL( CStifItemParser& /* aItem */ )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::DeleteFilesOfAllMediasL ---------->");
 TInt err( KErrNotReady );
 if( iTester )
 {
 TRAP( err, iTester->EnsureMediaFilesAreNotInUseL() );
-err = VCXMVTEST_ERR( err );
+err = err;
 if( err == KErrNone )
 {
 TRAP( err, iTester->DeleteAllMediaFilesL() );
 }
 }
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::DeleteFilesOfAllMediasL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CreateVideoFileL
+// CVcxMyVideosApiTest::CreateAlbumL
+// -----------------------------------------------------------------------------
+//
+TInt CVCXMyVideosCollectionPluginTest::CreateAlbumL( CStifItemParser& aItem )
+{
+VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CreateAlbumL ---------->");
+// Print to UI
+_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
+_LIT( KWhere, "In CreateAlbumL" );
+TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
+// Print to log file
+iLog->Log( KWhere );
+aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
+iLastReceivedMessage = -1;
+TInt err( KErrNotReady );
+if( iTester )
+{
+TPtrC albumName;
+User::LeaveIfError( aItem.GetNextString( albumName ) );
+TInt sync;
+if( aItem.GetNextInt( sync ) != KErrNone )
+{
+sync = EFalse;
+}
+if( albumName.Compare( KStifScript2KString ) == KErrNone )
+{
+TRAP( err, iTester->CreateAlbumL( KAbout2050CharsString, sync ) );
+}
+else if( albumName.Compare( KStifScriptEmptyString ) == KErrNone )
+{
+TRAP( err, iTester->CreateAlbumL( KVcxTestEmptyString, sync ) );
+}
+else if( albumName.Compare( KStifScriptInvalidRequest ) == KErrNone )
+{
+TRAP( err, iTester->CreateAlbumL( KVcxTestEmptyString, sync, ETrue ) );
+}
+else
+{
+TRAP( err, iTester->CreateAlbumL( albumName, sync ) );
+}
+}
+VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CreateAlbumL <----------");
+return err;
+}
+// -----------------------------------------------------------------------------
+// CVcxMyVideosApiTest::DeleteAlbumsL
+// -----------------------------------------------------------------------------
+//
+TInt CVCXMyVideosCollectionPluginTest::DeleteAlbumsL( CStifItemParser& aItem )
+{
+VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::DeleteAlbumsL ---------->");
+// Print to UI
+_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
+_LIT( KWhere, "In DeleteAlbumsL" );
+TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
+// Print to log file
+iLog->Log( KWhere );
+aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
+iLastReceivedMessage = -1;
+TInt err( KErrNotReady );
+if( iTester )
+{
+TPtrC albumName;
+RArray<TPtrC> albumNames;
+while( aItem.GetNextString( albumName ) == KErrNone )
+{
+albumNames.Append( albumName );
+}
+if( albumNames.Count() < 1 )
+{
+VCXLOGLO1("CVCXMyVideosCollectionPluginTest::DeleteAlbumsL: No albums specified!");
+err = KErrArgument;
+}
+else
+{
+TRAP( err, iTester->DeleteAlbumsL( albumNames ) );
+}
+}
+VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::DeleteAlbumsL <----------");
+return err;
+}
+// -----------------------------------------------------------------------------
+// CVcxMyVideosApiTest::DeleteAllAlbumsL
+// -----------------------------------------------------------------------------
+//
+TInt CVCXMyVideosCollectionPluginTest::DeleteAllAlbumsL( CStifItemParser& aItem )
+{
+VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::DeleteAllAlbumsL ---------->");
+// Print to UI
+_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
+_LIT( KWhere, "In DeleteAllAlbumsL" );
+TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
+// Print to log file
+iLog->Log( KWhere );
+aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
+iLastReceivedMessage = -1;
+TInt err( KErrNotReady );
+if( iTester )
+{
+TRAP( err, iTester->DeleteAllAlbumsL() );
+}
+VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::DeleteAllAlbumsL <----------");
+return err;
+}
+// -----------------------------------------------------------------------------
+// CVcxMyVideosApiTest::AddMediasToAlbumL
+// -----------------------------------------------------------------------------
+//
+TInt CVCXMyVideosCollectionPluginTest::AddMediasToAlbumL( CStifItemParser& aItem )
+{
+VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::AddMediasToAlbumL ---------->");
+// Print to UI
+_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
+_LIT( KWhere, "In AddMediasToAlbumL" );
+TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
+// Print to log file
+iLog->Log( KWhere );
+aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
+iLastReceivedMessage = -1;
+TInt err( KErrNotReady );
+if( iTester )
+{
+TPtrC albumName;
+User::LeaveIfError( aItem.GetNextString( albumName ) );
+TInt sourceDrive(0);
+User::LeaveIfError( GetDriveParam( aItem, sourceDrive ) );
+TInt index(0);
+User::LeaveIfError( aItem.GetNextInt( index ) );
+TInt endIndex(0);
+User::LeaveIfError( aItem.GetNextInt( endIndex ) );
+TRAP( err, iTester->AddMediasToAlbumL( albumName, sourceDrive, index, endIndex ) );
+}
+VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::AddMediasToAlbumL <----------");
+return err;
+}
+// -----------------------------------------------------------------------------
+// CVcxMyVideosApiTest::RemoveMediasFromAlbumL
+// -----------------------------------------------------------------------------
+//
+TInt CVCXMyVideosCollectionPluginTest::RemoveMediasFromAlbumL( CStifItemParser& aItem )
+{
+VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::RemoveMediasFromAlbumL ---------->");
+// Print to UI
+_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
+_LIT( KWhere, "In RemoveMediasFromAlbumL" );
+TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
+// Print to log file
+iLog->Log( KWhere );
+aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
+iLastReceivedMessage = -1;
+TInt err( KErrNotReady );
+if( iTester )
+{
+TPtrC albumName;
+User::LeaveIfError( aItem.GetNextString( albumName ) );
+TInt sourceDrive(0);
+User::LeaveIfError( GetDriveParam( aItem, sourceDrive ) );
+TInt index(0);
+User::LeaveIfError( aItem.GetNextInt( index ) );
+TInt endIndex(0);
+User::LeaveIfError( aItem.GetNextInt( endIndex ) );
+TRAP( err, iTester->RemoveMediasFromAlbumL( albumName, sourceDrive, index, endIndex ) );
+}
+VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::RemoveMediasFromAlbumL <----------");
+return err;
+}
+// -----------------------------------------------------------------------------
+// CVcxMyVideosApiTest::CheckAlbumCount
+// -----------------------------------------------------------------------------
+//
+TInt CVCXMyVideosCollectionPluginTest::CheckAlbumCount( CStifItemParser& aItem )
+{
+VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CreateAlbumL ---------->");
+// Print to UI
+_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
+_LIT( KWhere, "In CheckAlbumCount" );
+TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
+// Print to log file
+iLog->Log( KWhere );
+aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
+TInt err( KErrNotReady );
+int expectedCount;
+User::LeaveIfError( aItem.GetNextInt( expectedCount ) );
+if( iTester )
+{
+if( !iTester->CheckAlbumCount( expectedCount ) )
+{
+err = KErrCorrupt;
+}
+}
+VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CheckAlbumCount <----------");
+return err;
+}
+// -----------------------------------------------------------------------------
+// CVcxMyVideosApiTest::CreateVideoFileL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::CreateVideoFileL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CreateVideoFileL ---------->");
 aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
 TInt temp(0);
 // Parameter video type
-CIptvTestVideoCreator::TIptvTestVideoType videoType;
+CVCXMyVideosTestUtils::TVcxTestVideoType videoType;
 User::LeaveIfError( aItem.GetNextInt(temp) );
-videoType = static_cast<CIptvTestVideoCreator::TIptvTestVideoType>(temp);
+videoType = static_cast<CVCXMyVideosTestUtils::TVcxTestVideoType>(temp);
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: videoType: %d", videoType);
 // Parameter drive letter
 TPtrC driveLetter;
 User::LeaveIfError(aItem.GetNextString(driveLetter));
-#ifdef __WINSCW__
-driveLetter.Set(_L("C"));
-#endif
 // Parameter path and filename
 TPtrC filename;
 User::LeaveIfError(aItem.GetNextString(filename));
 if(filename.Length() < 64)
 }
 TRAPD( err, CreateVideoFileL( videoType, driveLetter, filename, size, count, ETrue ) );
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CreateVideoFileL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CreateVideoFileNoWaitL
+// CVcxMyVideosApiTest::CreateVideoFileNoWaitL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::CreateVideoFileNoWaitL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CreateVideoFileNoWaitL ---------->");
 aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
 TInt temp(0);
 // Parameter video type
-CIptvTestVideoCreator::TIptvTestVideoType videoType;
+CVCXMyVideosTestUtils::TVcxTestVideoType videoType;
 User::LeaveIfError( aItem.GetNextInt(temp) );
-videoType = static_cast<CIptvTestVideoCreator::TIptvTestVideoType>(temp);
+videoType = static_cast<CVCXMyVideosTestUtils::TVcxTestVideoType>(temp);
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: videoType: %d", videoType);
 // Parameter drive letter
 TPtrC driveLetter;
 User::LeaveIfError(aItem.GetNextString(driveLetter));
-#ifdef __WINSCW__
-driveLetter.Set(_L("C"));
-#endif
 // Parameter path and filename
 TPtrC filename;
 User::LeaveIfError(aItem.GetNextString(filename));
 if(filename.Length() < 64)
 }
 TRAPD( err, CreateVideoFileL( videoType, driveLetter, filename, size, count, EFalse ) );
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CreateVideoFileNoWaitL ---------->");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CreateVideoFileL
+// CVcxMyVideosApiTest::CreateVideoFileL
 // -----------------------------------------------------------------------------
 //
-void CVCXMyVideosCollectionPluginTest::CreateVideoFileL( CIptvTestVideoCreator::TIptvTestVideoType aType, const TDesC& aDriveLetter, const TDesC& aFileName, TInt aSize, TInt aVideoCount, TBool aDoSync )
+void CVCXMyVideosCollectionPluginTest::CreateVideoFileL( CVCXMyVideosTestUtils::TVcxTestVideoType aType, const TDesC& aDriveLetter, const TDesC& aFileName, TInt aSize, TInt aVideoCount, TBool aDoSync )
 {
 HBufC* path = HBufC::NewL( 2048 );
 CleanupStack::PushL(path);
 // Make sure path exists and resolve path + filename
 // Save the path for later use.
 CleanupStack::Pop( path );
 iSideloadedFiles.Append( path );
 // Create the video.
-TRAP( err, iTestCommon->CreateVideoFileL( aType, *path, aSize ) );
+TRAP( err, iTestUtils->CreateVideoFileL( aType, *path, aSize ) );
 if(err != KErrNone)
 {
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: CreateVideoFileL returned error: %d:", err);
 }
-TRAP_IGNORE( iStats->ActionStartL( KSideloadVideoActionId, _L("Sideload video") ) );
 }
 else
 {
-TRAP( err, iTestCommon->CreateVideoFilesL( aType, *path, aVideoCount, iSideloadedFiles ) );
+TRAP( err, iTestUtils->CreateVideoFilesL( aType, *path, aVideoCount, iSideloadedFiles ) );
 if(err != KErrNone)
 {
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: CreateVideoFilesL returned error: %d:", err);
-}
-for( TInt i = 0; i < aVideoCount; i++ )
-{
-TRAP_IGNORE( iStats->ActionStartL( KSideloadVideoActionId, _L("Sideload video") ) );
 }
 CleanupStack::PopAndDestroy( path );
 }
 if( iTester )
 // Wait for insertion events.
 RArray<TInt> messages;
 for( TInt i=0; i<aVideoCount; i++ )
 {
-messages.Append( KVCXMYVideosTestMessageMpxItemInserted );
+messages.Append( KVCXMYVideosTestMessageMpxVideoInserted );
 }
 // Only one video added, refresh is automatic.
 if( aVideoCount <= 1 )
 {
 messages.Append( KVCXMYVideosTestMessageCollectionOpened );
 }
 TInt createCount = amount - videoCount;
 TRAP( err, CreateVideoFileL(
-CIptvTestVideoCreator::IptvTestVideoMpeg4, driveLetter, filename, -1, createCount, ETrue ) );
+CVCXMyVideosTestUtils::VcxTestVideoMpeg4, driveLetter, filename, -1, createCount, ETrue ) );
 }
 else
 if( videoCount > amount )
 {
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest::EnsureDriveForVideosL: drive has more than %d videos.", amount);
 {
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest::EnsureDriveForVideosL: drive already has %d videos.", amount);
 }
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::EnsureDriveForVideosL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
 // CVCXMyVideosCollectionPluginTest::EmptySideloadFoldersL
 // Delete everything from sideloading folders.
 HBufC16* path = filesInUse[i];
 CleanupStack::PushL( path );
 filesInUse.Remove( i );
 // Delete file
-iTestCommon->EnsureFileIsNotInUse( *path );
+iTestUtils->EnsureFileIsNotInUse( *path );
 TInt err = iFs.Delete( path->Des() );
 if( err != KErrNone )
 {
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: delete 2nd error: %d", err);
 }
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::EmptySideloadFoldersL <----------");
 return KErrNone;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::SetDeleteSideloadedVideos
+// CVcxMyVideosApiTest::SetDeleteSideloadedVideos
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::SetDeleteSideloadedVideos( CStifItemParser& /* aItem */ )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::SetDeleteSideloadedVideos ---------->");
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::SetDeleteSideloadedVideos <----------");
 return KErrNone;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::DownloadL
+// CVcxMyVideosApiTest::WaitForMessageL
-// -----------------------------------------------------------------------------
-//
-TInt CVCXMyVideosCollectionPluginTest::DownloadL( CStifItemParser& aItem )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::DownloadL ---------->");
-iLastReceivedMessage = -1;
-TRAPD( err, DownloadOrResumeL( aItem, EFalse, EFalse ) );
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::DownloadL <----------");
-return VCXMVTEST_ERR( err );
-}
-// -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::ResumeDownloadL
-// -----------------------------------------------------------------------------
-//
-TInt CVCXMyVideosCollectionPluginTest::ResumeDownloadL( CStifItemParser& aItem )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::ResumeDownloadL ---------->");
-iLastReceivedMessage = -1;
-TRAPD( err, DownloadOrResumeL( aItem, EFalse, ETrue ) );
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::ResumeDownloadL <----------");
-return VCXMVTEST_ERR( err );
-}
-// -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::ResumeAllDownloadsL
-// -----------------------------------------------------------------------------
-//
-TInt CVCXMyVideosCollectionPluginTest::ResumeAllDownloadsL( CStifItemParser& /* aItem */ )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::ResumeAllDownloadsL ---------->");
-// Print to UI
-_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
-_LIT( KWhere, "In ResumeAllDownloadsL" );
-TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
-// Print to log file
-iLog->Log( KWhere );
-TRAPD( err, iTester->ResumeAllDownloadsL() );
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::ResumeAllDownloadsL <----------");
-return VCXMVTEST_ERR( err );
-}
-// -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::DownloadUsingMediaL
-// -----------------------------------------------------------------------------
-//
-TInt CVCXMyVideosCollectionPluginTest::DownloadUsingMediaL( CStifItemParser& aItem )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::DownloadUsingMediaL ---------->");
-if( !iMpxMedia )
-{
-VCXLOGLO1("CVCXMyVideosCollectionPluginTest:: Error. iMpxMedia not set!");
-User::Leave( KErrArgument );
-}
-iLastReceivedMessage = -1;
-TRAPD( err, DownloadOrResumeL( aItem, ETrue, EFalse ) );
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::DownloadUsingMediaL <----------");
-return VCXMVTEST_ERR( err );
-}
-// -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::ResumeDownloadUsingMediaL
-// -----------------------------------------------------------------------------
-//
-TInt CVCXMyVideosCollectionPluginTest::ResumeDownloadUsingMediaL( CStifItemParser& aItem )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::ResumeDownloadUsingMediaL ---------->");
-if( !iMpxMedia )
-{
-VCXLOGLO1("CVCXMyVideosCollectionPluginTest:: Error. iMpxMedia not set!");
-User::Leave( KErrArgument );
-}
-iLastReceivedMessage = -1;
-TRAPD( err, DownloadOrResumeL( aItem, ETrue, ETrue ) );
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::ResumeDownloadUsingMediaL <----------");
-return VCXMVTEST_ERR( err );
-}
-// -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::DownloadOrResumeL
-// -----------------------------------------------------------------------------
-//
-void CVCXMyVideosCollectionPluginTest::DownloadOrResumeL( CStifItemParser& aItem, TBool aUseCurrentMedia, TBool aResume )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::DownloadOrResumeL");
-// Print to UI
-_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
-_LIT( KWhere, "In DownloadOrResumeL" );
-TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
-// Print to log file
-iLog->Log( KWhere );
-aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
-iLastReceivedMessage = -1;
-TUint32 iapId(0);
-TPtrC iapName;
-User::LeaveIfError( aItem.GetNextString( iapName ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: iapName: %S", &iapName);
-if( iapName == KVCXTestZeroIap )
-{
-iapId = 0;
-}
-else
-if( iapName == KVCXTestInvalidIap )
-{
-iapId = 10001;
-}
-else
-{
-User::LeaveIfError( iTestCommon->GetIapIdL(iapName, iapId) );
-}
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: iapId: %d", iapId);
-TPtrC serviceName;
-User::LeaveIfError( aItem.GetNextString( serviceName ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: serviceName: %S", &serviceName);
-TInt serviceId(0);
-User::LeaveIfError( iServiceEmu->GetServiceIdL(serviceName, serviceId) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: serviceId: %d", serviceId);
-TInt contentId(0);
-User::LeaveIfError( aItem.GetNextInt( contentId ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: contentId: %d", contentId);
-TInt syncCallInt(0);
-User::LeaveIfError( aItem.GetNextInt( syncCallInt ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: callTypeInt: %d", syncCallInt);
-TBool syncCall = static_cast<TBool>(syncCallInt);
-TPtrC userName;
-if( KErrNone == aItem.GetNextString( userName ) )
-{
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: userName: %S", &userName);
-}
-else
-{
-userName.Set( _L("") );
-}
-TPtrC password;
-if( KErrNone == aItem.GetNextString( password ) )
-{
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: password: %S", &password);
-}
-else
-{
-password.Set( _L("") );
-}
-const TPtrC url = iServiceEmu->GetContentUrlL( serviceId, contentId );
-const TPtrC title = iServiceEmu->GetContentTitleL( serviceId, contentId );
-TInt err(0);
-if( !aUseCurrentMedia )
-{
-if( !aResume )
-{
-TRAP( err, iTester->StartDownloadL( title, iapId, serviceId, contentId, url, syncCall, userName, password, NULL ) );
-}
-else
-{
-TRAP( err, iTester->ResumeDownloadL( title, iapId, serviceId, contentId, url, syncCall, userName, password, NULL ) );
-}
-}
-else
-{
-VCXLOGLO1("CVCXMyVideosCollectionPluginTest:: passing current media to MPX plugin.");
-if( !aResume )
-{
-TRAP( err, iTester->StartDownloadL( title, iapId, serviceId, contentId, url, syncCall, userName, password, iMpxMedia ) );
-}
-else
-{
-TRAP( err, iTester->ResumeDownloadL( title, iapId, serviceId, contentId, url, syncCall, userName, password, iMpxMedia ) );
-}
-}
-// Set autoresume on if there's only one paused download.
-CVCXMyVideosTestDlWatcher* dlWatcher = iTester->GetDownloadWatcher();
-if( aResume && dlWatcher && !iAutoResume )
-{
-TInt pausedDlCount = 0;
-for( TInt i=0; i<dlWatcher->GetDownloadCount(); i++ )
-{
-CVCXMyVideosTestDownload* dl = dlWatcher->GetDownloadByIndex( i );
-if( dl->iState == EVcxMyVideosDlStatePaused )
-{
-pausedDlCount++;
-}
-}
-if( pausedDlCount == 1 )
-{
-iAutoResume = ETrue;
-iTester->SetAutoResume( ETrue );
-}
-}
-if( err != KErrNone )
-{
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
-User::Leave( err );
-}
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::DownloadOrResumeL");
-}
-// -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::DownloadUrlL
-// -----------------------------------------------------------------------------
-//
-TInt CVCXMyVideosCollectionPluginTest::DownloadUrlL( CStifItemParser& aItem )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::DownloadUrlL ---------->");
-// Print to UI
-_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
-_LIT( KWhere, "In DownloadUrlL" );
-TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
-// Print to log file
-iLog->Log( KWhere );
-iLastReceivedMessage = -1;
-aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
-TUint32 iapId(0);
-TPtrC iapName;
-User::LeaveIfError( aItem.GetNextString( iapName ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: iapName: %S", &iapName);
-User::LeaveIfError( iTestCommon->GetIapIdL(iapName, iapId) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: iapId: %d", iapId);
-TPtrC url;
-User::LeaveIfError( aItem.GetNextString( url ) );
-TInt syncCallInt(0);
-User::LeaveIfError( aItem.GetNextInt( syncCallInt ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: callTypeInt: %d", syncCallInt);
-TBool syncCall = static_cast<TBool>(syncCallInt);
-TPtrC userName;
-if( KErrNone == aItem.GetNextString( userName ) )
-{
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: userName: %S", &userName);
-}
-else
-{
-userName.Set( _L("") );
-}
-TPtrC password;
-if( KErrNone == aItem.GetNextString( password ) )
-{
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: password: %S", &password);
-}
-else
-{
-password.Set( _L("") );
-}
-if( url == KVCXTestZeroUrl)
-{
-url.Set( _L("" ) );
-}
-TInt err( KErrNone );
-if( iTester )
-{
-if( url == KVCXMYVideosTest2kURLTag )
-{
-TRAP( err, iTester->StartDownloadL( _L("2kcharsurl"), iapId, 0, 0, KVCXMYVideosTest2kURL, syncCall, userName, password, NULL ) );
-}
-else
-if( url == KVCXMYVideosTest1kURLTag )
-{
-TRAP( err, iTester->StartDownloadL( _L("1kcharsurl"), iapId, 0, 0, KVCXMYVideosTest1kURL, syncCall, userName, password, NULL ) );
-}
-else
-{
-TRAP( err, iTester->StartDownloadL( _L("urldl"), iapId, 0, 0, url, syncCall, userName, password, NULL ) );
-}
-}
-if( err != KErrNone )
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::DownloadUrlL <----------");
-return VCXMVTEST_ERR( err );
-}
-// -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CancelDownloadL
-// -----------------------------------------------------------------------------
-//
-TInt CVCXMyVideosCollectionPluginTest::CancelDownloadL( CStifItemParser& aItem )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CancelDownloadL ---------->");
-// Print to UI
-_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
-_LIT( KWhere, "In CancelDownloadL" );
-TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
-// Print to log file
-iLog->Log( KWhere );
-iLastReceivedMessage = -1;
-aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
-TPtrC serviceName;
-User::LeaveIfError( aItem.GetNextString( serviceName ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: serviceName: %S", &serviceName);
-TInt serviceId(0);
-User::LeaveIfError( iServiceEmu->GetServiceIdL(serviceName, serviceId) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: serviceId: %d", serviceId);
-TInt contentId(0);
-User::LeaveIfError( aItem.GetNextInt( contentId ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: contentId: %d", contentId);
-TInt syncCallInt(0);
-User::LeaveIfError( aItem.GetNextInt( syncCallInt ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: callTypeInt: %d", syncCallInt);
-TBool syncCall = static_cast<TBool>(syncCallInt);
-const TPtrC url = iServiceEmu->GetContentUrlL( serviceId, contentId );
-CVCXMyVideosTestDownload* dl = iTester->GetDownloadWatcher()->GetDownload( serviceId, contentId, url );
-TInt err( KErrNotReady );
-if( !dl )
-{
-VCXLOGLO1("CVCXMyVideosCollectionPluginTest:: Could not find download with specified params!");
-}
-else
-if( iTester )
-{
-TRAP( err, iTester->CancelDownloadL( dl, syncCall ) );
-}
-if( err != KErrNone )
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CancelDownloadL <----------");
-return VCXMVTEST_ERR( err );
-}
-// -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CancelDownloadByIdL
-// -----------------------------------------------------------------------------
-//
-TInt CVCXMyVideosCollectionPluginTest::CancelDownloadByIdL( CStifItemParser& aItem )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CancelDownloadByIdL ---------->");
-// Print to UI
-_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
-_LIT( KWhere, "In CancelDownloadByIdL" );
-TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
-// Print to log file
-iLog->Log( KWhere );
-iLastReceivedMessage = -1;
-aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
-TInt mpxId(0);
-User::LeaveIfError( aItem.GetNextInt( mpxId ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: mpxId: %d", mpxId);
-TInt downloadId(0);
-User::LeaveIfError( aItem.GetNextInt( downloadId ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: downloadId: %d", downloadId);
-TInt syncCallInt(0);
-User::LeaveIfError( aItem.GetNextInt( syncCallInt ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: callTypeInt: %d", syncCallInt);
-TBool syncCall = static_cast<TBool>(syncCallInt);
-_LIT(KVCxTestEmptyString, "NULL");
-TPtrC downloadPath;
-if( aItem.GetNextString( downloadPath ) != KErrNone )
-{
-downloadPath.Set( KVCxTestEmptyString );
-}
-TInt err( KErrNotReady );
-if( iTester )
-{
-TRAP( err, iTester->CancelDownloadL( mpxId, downloadId, downloadPath, syncCall ) );
-}
-if( err != KErrNone )
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CancelDownloadByIdL <----------");
-return VCXMVTEST_ERR( err );
-}
-// -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::PauseDownloadL
-// -----------------------------------------------------------------------------
-//
-TInt CVCXMyVideosCollectionPluginTest::PauseDownloadL( CStifItemParser& aItem )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::PauseDownloadL ---------->");
-// Print to UI
-_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
-_LIT( KWhere, "In PauseDownloadL" );
-TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
-// Print to log file
-iLog->Log( KWhere );
-iLastReceivedMessage = -1;
-aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
-TPtrC serviceName;
-User::LeaveIfError( aItem.GetNextString( serviceName ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: serviceName: %S", &serviceName);
-TInt serviceId(0);
-User::LeaveIfError( iServiceEmu->GetServiceIdL(serviceName, serviceId) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: serviceId: %d", serviceId);
-TInt contentId(0);
-User::LeaveIfError( aItem.GetNextInt( contentId ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: contentId: %d", contentId);
-TInt syncCallInt(0);
-User::LeaveIfError( aItem.GetNextInt( syncCallInt ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: callTypeInt: %d", syncCallInt);
-TBool syncCall = static_cast<TBool>(syncCallInt);
-const TPtrC url = iServiceEmu->GetContentUrlL( serviceId, contentId );
-TInt err( KErrNotReady );
-if( iTester )
-{
-// Disable autoresume
-iAutoResume = EFalse;
-iTester->SetAutoResume( iAutoResume );
-TRAP( err, iTester->PauseDownloadL( serviceId, contentId, url, syncCall ) );
-}
-if( err != KErrNone )
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::PauseDownloadL <----------");
-return VCXMVTEST_ERR( err );
-}
-// -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::PauseDownloadByUrlL
-// -----------------------------------------------------------------------------
-//
-TInt CVCXMyVideosCollectionPluginTest::PauseDownloadByUrlL( CStifItemParser& aItem )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::PauseDownloadByUrlL ---------->");
-// Print to UI
-_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
-_LIT( KWhere, "In PauseDownloadByUrlL" );
-TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
-// Print to log file
-iLog->Log( KWhere );
-iLastReceivedMessage = -1;
-aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
-TPtrC url;
-User::LeaveIfError( aItem.GetNextString( url ) );
-TInt err( KErrNotReady );
-if( iTester )
-{
-// Disable autoresume
-iAutoResume = EFalse;
-iTester->SetAutoResume( iAutoResume );
-TRAP( err, iTester->PauseDownloadL( url, EFalse ) );
-}
-if( err != KErrNone )
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: err: %d", err);
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::PauseDownloadL <----------");
-return VCXMVTEST_ERR( err );
-}
-// -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CheckDownloadProgressL
-// -----------------------------------------------------------------------------
-//
-TInt CVCXMyVideosCollectionPluginTest::CheckDownloadProgressL( CStifItemParser& aItem )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CheckDownloadProgressL ---------->");
-// Print to UI
-_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
-_LIT( KWhere, "In CheckDownloadProgressL" );
-TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
-// Print to log file
-iLog->Log( KWhere );
-iLastReceivedMessage = -1;
-aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
-TPtrC serviceName;
-User::LeaveIfError( aItem.GetNextString( serviceName ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: serviceName: %S", &serviceName);
-TInt serviceId(0);
-User::LeaveIfError( iServiceEmu->GetServiceIdL(serviceName, serviceId) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: serviceId: %d", serviceId);
-TInt contentId(0);
-User::LeaveIfError( aItem.GetNextInt( contentId ) );
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: contentId: %d", contentId);
-TInt minimumProgress( 0 );
-User::LeaveIfError( aItem.GetNextInt( minimumProgress ) );
-const TPtrC url = iServiceEmu->GetContentUrlL( serviceId, contentId );
-CVCXMyVideosTestDlWatcher* dlWatcher = iTester->GetDownloadWatcher();
-TInt err( KErrNotReady );
-if( dlWatcher )
-{
-CVCXMyVideosTestDownload* dl = dlWatcher->GetDownload( serviceId, contentId, url );
-if( dl )
-{
-if( dl->iProgress < minimumProgress )
-{
-err = KErrCorrupt;
-}
-else
-{
-err = KErrNone;
-}
-}
-}
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CheckDownloadProgressL <----------");
-return VCXMVTEST_ERR( err );
-}
-// -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::WaitAllDownloadsL
-// -----------------------------------------------------------------------------
-//
-TInt CVCXMyVideosCollectionPluginTest::WaitAllDownloadsL( CStifItemParser& aItem )
-{
-VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::WaitAllDownloadsL ---------->");
-// Print to UI
-_LIT( KVCXMyVideosCollectionPluginTest, "VCXMyVideosCollectionPluginTest" );
-_LIT( KWhere, "In WaitAllDownloadsL" );
-TestModuleIf().Printf( 0, KVCXMyVideosCollectionPluginTest, KWhere );
-// Print to log file
-iLog->Log( KWhere );
-TInt err( KErrNone );
-TInt minutes(0);
-if( aItem.GetNextInt( minutes ) != KErrNone )
-{
-minutes = 10;
-}
-iTimeoutTimer->After( KTimeoutMinute * minutes );
-iWaitingForAllDownloads = ETrue;
-VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::WaitAllDownloadsL <----------");
-return VCXMVTEST_ERR( err );
-}
-// -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::WaitForMessageL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::WaitForMessageL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::WaitForMessageL ---------->");
 TRAPD( err, WaitForMessagesL( EFalse, messages, timeout, ETrue ) );
 messages.Reset();
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::WaitForMessageL <----------");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::WaitForAnyMessageL
+// CVcxMyVideosApiTest::WaitForAnyMessageL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::WaitForAnyMessageL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::WaitForAnyMessageL ---------->");
 }
 messages.Reset();
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::WaitForAnyMessageL <----------");
-return VCXMVTEST_ERR( error );
+return error;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::WaitForMessagesL
+// CVcxMyVideosApiTest::WaitForMessagesL
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::WaitForMessagesL( CStifItemParser& aItem )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::WaitForMessagesL ---------->");
 }
 messages.Reset();
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::WaitForMessagesL <----------");
-return VCXMVTEST_ERR( error );
+return error;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::WaitForMessagesL
+// CVcxMyVideosApiTest::WaitForMessagesL
 // -----------------------------------------------------------------------------
 //
 void CVCXMyVideosCollectionPluginTest::WaitForMessagesL( TBool aBlock, RArray<TInt>& aMessages, TInt aTimeout,
 TBool aWaitAll )
 {
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::DeleteDirectoryIfEmpty");
 return KErrNone;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::MapMpxMediaAttribute
+// CVcxMyVideosApiTest::MapMpxMediaAttribute
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::MapMpxMediaAttribute(
 TVcxTestMediaAttributeIdMapping aMapping, TMPXAttributeData& aAttribute, TVcxTestMediaAttributeType& aType )
 {
 {
 err = KErrNotFound;
 }
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::MapMpxMediaAttribute");
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::GetMessageDesc
+// CVcxMyVideosApiTest::GetMessageDesc
 // -----------------------------------------------------------------------------
 //
 void CVCXMyVideosCollectionPluginTest::GetMessageDesc( TInt aMessage, TDes& aMsgBuff )
 {
 switch( aMessage )
 case KVCXMYVideosTestMessageCollectionGeneral:
 {
 aMsgBuff.Copy( _L("KVCXMYVideosTestMessageCollectionGeneral") );
 }
 break;
-case KVCXMYVideosTestMessageCollectionItemChanged:
+case KVCXMYVideosTestMessageMpxVideoInserted:
 {
-aMsgBuff.Copy( _L("KVCXMYVideosTestMessageCollectionItemChanged") );
+aMsgBuff.Copy( _L("KVCXMYVideosTestMessageMpxVideoInserted") );
 }
 break;
-case KVCXMYVideosTestMessageCollectionCategoryChanged:
+case KVCXMYVideosTestMessageMpxCategoryInserted:
 {
-aMsgBuff.Copy( _L("KVCXMYVideosTestMessageCollectionCategoryChanged") );
+aMsgBuff.Copy( _L("KVCXMYVideosTestMessageMpxCategoryInserted") );
 }
 break;
-case KVCXMYVideosTestMessageMpxItemInserted:
+case KVCXMYVideosTestMessageMpxAlbumInserted:
 {
-aMsgBuff.Copy( _L("KVCXMYVideosTestMessageMpxItemInserted") );
+aMsgBuff.Copy( _L("KVCXMYVideosTestMessageMpxAlbumInserted") );
 }
 break;
-case KVCXMYVideosTestMessageMpxItemDeleted:
+case KVCXMYVideosTestMessageMpxVideoDeleted:
 {
-aMsgBuff.Copy( _L("KVCXMYVideosTestMessageMpxItemDeleted") );
+aMsgBuff.Copy( _L("KVCXMYVideosTestMessageMpxVideoDeleted") );
 }
 break;
-case KVCXMYVideosTestMessageMpxItemModified:
+case KVCXMYVideosTestMessageMpxCategoryDeleted:
 {
-aMsgBuff.Copy( _L("KVCXMYVideosTestMessageMpxItemModified") );
+aMsgBuff.Copy( _L("KVCXMYVideosTestMessageMpxCategoryDeleted") );
+}
+break;
+case KVCXMYVideosTestMessageMpxAlbumDeleted:
+{
+aMsgBuff.Copy( _L("KVCXMYVideosTestMessageMpxAlbumDeleted") );
+}
+break;
+case KVCXMYVideosTestMessageMpxVideoModified:
+{
+aMsgBuff.Copy( _L("KVCXMYVideosTestMessageMpxVideoModified") );
+}
+break;
+case KVCXMYVideosTestMessageMpxCategoryModified:
+{
+aMsgBuff.Copy( _L("KVCXMYVideosTestMessageMpxCategoryModified") );
+}
+break;
+case KVCXMYVideosTestMessageMpxAlbumModified:
+{
+aMsgBuff.Copy( _L("KVCXMYVideosTestMessageMpxAlbumModified") );
 }
 break;
 case KVCXMyVideosTestMessageVideoListOrderChanged:
 {
 aMsgBuff.Copy( _L("KVCXMyVideosTestMessageVideoListOrderChanged") );
 }
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::CheckMediasL
+// CVcxMyVideosApiTest::CheckMediasL
 // -----------------------------------------------------------------------------
 //
 void CVCXMyVideosCollectionPluginTest::CheckMediasL( TInt aExpectedVideoCount, TInt aDrive, TInt aCheckType )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::CheckMediasL");
+WaitForRefreshL( false );
 TInt actualVideoCount(0);
 // File check
 TInt videoCount = iTester->GetMediaCount();
 }
 }
 actualVideoCount++;
-TInt state = -1;
+if( !iFileCheckDisabled )
-if( media->IsSupported( KVcxMediaMyVideosDownloadState ) )
-{
-state = media->ValueTObjectL<TUint8>( KVcxMediaMyVideosDownloadState );
-}
-TUint32 downloadId = 0;
-if( media->IsSupported( KVcxMediaMyVideosDownloadId ) )
-{
-downloadId = media->ValueTObjectL<TUint32>( KVcxMediaMyVideosDownloadId );
-}
-// No file check for ongoing downloads
-if( !iFileCheckDisabled && ( downloadId == 0 || state == EVcxMyVideosDlStateDownloaded ) )
 {
 if( !iFs.IsValidName( localFilePath ) )
 {
 VCXLOGLO1("CVCXMyVideosCollectionPluginTest: ERROR. File path is not valid.");
 VCXLOGLO2("Local file path: %S", &localFilePath);
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::CheckMediasL");
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::GetDriveParam
+// CVcxMyVideosApiTest::GetDriveParam
 // -----------------------------------------------------------------------------
 //
 TInt CVCXMyVideosCollectionPluginTest::GetDriveParam( CStifItemParser& aItem, TInt& aDrive )
 {
 aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
 err = iFs.CharToDrive( driveLetter[0], aDrive );
 VCXLOGLO3("CVCXMyVideosCollectionPluginTest:: drive: %S = %d", &driveLetter, aDrive );
 }
 }
-return VCXMVTEST_ERR( err );
+return err;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::DoTotalRefreshL
+// CVcxMyVideosApiTest::DoTotalRefreshL
 // -----------------------------------------------------------------------------
 //
 void CVCXMyVideosCollectionPluginTest::DoTotalRefreshL()
 {
 if( iTester && iTester->GetCurrentLevel() == 3 )
 	}
 }
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::WaitForRefreshL
+// CVcxMyVideosApiTest::WaitForRefreshL
 // -----------------------------------------------------------------------------
 //
 void CVCXMyVideosCollectionPluginTest::WaitForRefreshL( TBool aForcedWait )
 {
 if( iTester && ( iTester->IsRefreshing() || aForcedWait ) )
 CleanupStack::PopAndDestroy( &messages );
 }
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::GetMediasForLevelL
+// CVcxMyVideosApiTest::GetMediasForLevelL
 // -----------------------------------------------------------------------------
 //
 CMPXMediaArray* CVCXMyVideosCollectionPluginTest::GetMediasForLevelL( TInt aLevel, TUint aFlagsFilter )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::GetMediasForLevelL ---------->");
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::GetMediasForLevelL <----------");
 return medias;
 }
 // -----------------------------------------------------------------------------
-// CIptvMyVideosApiTest::HandleVcxMvTesterMessageL
+// CVcxMyVideosApiTest::HandleVcxMvTesterMessageL
 // -----------------------------------------------------------------------------
 //
 void CVCXMyVideosCollectionPluginTest::HandleVcxMvTesterMessageL( TInt aMessage, TInt aError )
 {
 VCXLOGLO1(">>>CVCXMyVideosCollectionPluginTest::HandleVcxMvTesterMessageL");
 if( aMessage == KVCXMYVideosTestMessageCollectionOpened ||
 aMessage == KVCXMYVideosTestMessageListComplete ||
 aMessage == KVCXMYVideosTestMessageCollectionOpened ||
 aMessage == KVCXMYVideosTestMessageGotMediasByKMpxId )
 {
-_LIT(KWhat, "VidCount");
-_LIT(KDesc, "%d");
 TInt videoCount = iTester->GetMediaCount();
-TestModuleIf().Printf( 0, KWhat, KDesc, videoCount );
+if( iTester->GetCurrentOpenLevelIndex() == -1 )
-}
+{
+TestModuleIf().Printf( 0, _L("Mv"), _L("CatCount %d"), videoCount );
+}
+else
+{
+TestModuleIf().Printf( 0, _L("Mv"), _L("VidCount %d"), videoCount );
+}
+}
 // Waiting for messages from mpx plugin to stop.
 if( iCoolDownWait )
 {
 VCXLOGLO1("CVCXMyVideosCollectionPluginTest:: MsgQueue: Cooling down.");
 iCoolDownTimer->After( KTimeoutSecond * 5 );
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::HandleVcxMvTesterMessageL");
 return;
 }
-if( aMessage == KVCXMYVideosTestMessageDlSucceeded ||
-aMessage == KVCXMYVideosTestMessageDlFailed ||
-aMessage == KVCXMYVideosTestMessageDlPaused ||
-aMessage == KVCXMYVideosTestMessageDlGeneral ||
-aMessage == KVCXMYVideosTestErrorDownloadNotFound )
-{
-TInt activeDownloads = iTester->GetActiveDownloadCountL();
-TInt downloads = iTester->GetDownloadWatcher()->GetDownloadCount();
-_LIT(KWhat, "Downloads");
-_LIT(KDesc, "%d/%d");
-TestModuleIf().Printf( 0, KWhat, KDesc, activeDownloads, downloads );
-if( aError != KErrNone )
-{
-iLastDownloadError = aError;
-}
-}
-// Inform script of paused download when auto resume is off.
-if( !iWaitingForAllDownloads && aMessage == KVCXMYVideosTestMessageDlPaused && !iAutoResume )
-{
-// Add message to waited list and continue processing, check for signaling is done later.
-iWaitedTestMessages.Reset();
-iWaitedTestMessages.AppendL( aMessage );
-}
-// Waiting for all downloads to complete. Check downloads and signal if needed.
-if( iWaitingForAllDownloads )
-{
-TInt activeDownloads = iTester->GetActiveDownloadCountL();
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: Ongoing download count: %d", activeDownloads);
-if( activeDownloads <= 0 )
-{
-iTimeoutTimer->CancelTimer();
-iWaitingForAllDownloads = EFalse;
-TInt downloadCount = iTester->GetDownloadWatcher()->GetDownloadCount();
-TInt maxFailsToSucceed = downloadCount / 3;
-TInt fails = iTester->GetDownloadWatcher()->GetFailedDownloadCount();
-if( maxFailsToSucceed <= 0 )
-{
-maxFailsToSucceed = 0;
-}
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: download count: %d", downloadCount);
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: failed download count: %d", fails);
-VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: max allowed fails: %d", maxFailsToSucceed);
-if( fails > maxFailsToSucceed )
-{
-if( iLastDownloadError != KErrNone )
-{
-iEventError = iLastDownloadError;
-}
-else
-{
-iEventError = KVCXMYVideosTestMessageDlFailed;
-}
-}
-else
-{
-iEventError = KErrNone;
-}
-// Add message to waited list and continue processing, check for signaling is done later.
-iWaitedTestMessages.Reset();
-iWaitedTestMessages.AppendL( aMessage );
-}
-}
 // See if there's cancel needed for move, copy or delete.
 if( aError == KErrNone && iCancelNextOperation )
 {
 if( aMessage == KVCXMYVideosTestMessageCopyOrMoveStarted )
 iCancelNextOperation = EFalse;
 }
 }
 // Check for errors.
-if( aError != KErrNone && !iWaitingForAllDownloads )
+if( aError != KErrNone )
 {
 VCXLOGLO1("CVCXMyVideosCollectionPluginTest:: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
 VCXLOGLO2("CVCXMyVideosCollectionPluginTest:: ----------> MsgQueue: Error: %d <----------", aError);
 VCXLOGLO1("CVCXMyVideosCollectionPluginTest:: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
 iLastReceivedMessage = 0;
 if( !iMessageWaitIsBlocking )
 {
 VCXLOGLO1("CVCXMyVideosCollectionPluginTest:: ----------> MsgQueue: Signaling <----------");
-Signal( VCXMVTEST_ERR( aError ) );
+Signal( aError );
 TestModuleIf().Printf( 0, _L("Signal"), _L("%d"), aError );
 iEventError = KErrNone;
 }
 else
 {
 }
 if( !iMessageWaitIsBlocking )
 {
 VCXLOGLO1("CVCXMyVideosCollectionPluginTest:: ----------> MsgQueue: Signaling <----------");
-Signal( VCXMVTEST_ERR( iEventError ) );
+Signal( iEventError );
 TestModuleIf().Printf( 0, _L("Signal"), _L("%d"), iEventError );
 iEventError = KErrNone;
 }
 else
 {
 VCXLOGLO1("<<<CVCXMyVideosCollectionPluginTest::HandleVcxMvTesterMessageL");
 }
 // -----------------------------------------------------------------------------
-// CIptvEpgEngineTest::TimerComplete
+// CVcxEpgEngineTest::TimerComplete
 // -----------------------------------------------------------------------------
 //
 void CVCXMyVideosCollectionPluginTest::TimerComplete(TInt aTimerId, TInt aError)
 {
 if( aTimerId == 0 )
 // Script is waiting for signal.
 if( !iMessageWaitIsBlocking )
 {
 VCXLOGLO2( "CVCXMyVideosCollectionPluginTest:: Signaling: %d", iEventError);
-Signal( VCXMVTEST_ERR( iEventError ) );
+Signal( iEventError );
 }
-TRAP_IGNORE( iStats->ActionEndL( 0, iEventError ) );
 TestModuleIf().Printf( 0, _L("Timedout"), _L("%d"), iEventError );
 }
 }
 if( aTimerId == 1 )
 {
 VCXLOGLO1("CVCXMyVideosCollectionPluginTest::TimerComplete: Cooldown done. ------->");
 iActiveWait->Stop();
 iCoolDownWait = EFalse;
-iWaitingForAllDownloads = EFalse;
 iWaitedTestMessages.Reset();
 iLastReceivedMessage = 0;
 }
 }

changeset 34	bbb98528c666
parent 0	96612d01cf9f
child 35	3738fe97f027