mmshplugins/mmshaiwplugin/tsrc/ut_aiwplugin/src/ut_musaiwprovider.cpp
branchRCL_3
changeset 33 bc78a40cd63c
parent 32 73a1feb507fb
--- a/mmshplugins/mmshaiwplugin/tsrc/ut_aiwplugin/src/ut_musaiwprovider.cpp	Tue Aug 31 15:12:07 2010 +0300
+++ b/mmshplugins/mmshaiwplugin/tsrc/ut_aiwplugin/src/ut_musaiwprovider.cpp	Wed Sep 01 12:31:01 2010 +0100
@@ -15,7 +15,7 @@
 *
 */
 
-
+#include <eikmenup.h>
 #include "ut_musaiwprovider.h"
 #include "musaiwprovider.h"
 #include "musaiwprovider.hrh"
@@ -27,7 +27,6 @@
 #include "mussesseioninformationapi.h"
 #include "mussettings.h"
 #include "mustesthelp.h"
-#include "mussessionproperties.h"
 #define MUS_MEMORY_LEAVE_CHECKING_ON
 
 #include <e32property.h>
@@ -39,8 +38,6 @@
 #include <digia/eunit/eunitmacros.h>
 #include <aknglobalnote.h>
 #include <apgtask.h>
-#include <eikmenup.h>
-#include <uikoninternalpskeys.h>
 
 
 // Next row is to disable warning emerging from EUnit code.
@@ -52,8 +49,6 @@
 _LIT( KMusAiwProviderResource, "c:\\sys\\bin\\musaiwproviderui.rsc" );
 _LIT( KResourceFilenameRom,"z:\\sys\\bin\\musaiwproviderui.rsc" );
 
-_LIT( KMusOnHold, "On hold" );
-
 _LIT8( KMusOnHold8, "On hold" );
 _LIT8( KMusNetworkIncompatible8, "Network incompatible" );
 _LIT8( KMusConferenceCall8, "Conference call" );
@@ -164,8 +159,6 @@
     CMusManager::SetUseCase( MultimediaSharing::EMusContinue );
     CMusManager::SetStartError( KErrNone );
     CMusManager::SetAvailability( KErrNone );
-    MultimediaSharingSettings::SetPropertyValueL( 
-                  MusSettingsKeys::KFastStartupMode, MusSettingsKeys::EFastModeOff );
     
     }
 
@@ -177,7 +170,6 @@
 void UT_CMusAiwProvider::Teardown(  )
     {
     delete iProvider;
-    PropertyHelper::Close();
     }
 
 
@@ -281,17 +273,28 @@
 //
 void UT_CMusAiwProvider::UT_CMusAiwProvider_InitializeMenuPaneLL()
     {    
+
+    
     RFs fs;
     User::LeaveIfError( fs.Connect() );
+
     CleanupClosePushL( fs );
-    
+
     BaflUtils::CopyFile( fs, KMusAiwProviderResource(),
                          KResourceFilenameRom() );
 
     CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
 
-    CEikMenuPane* eikPane = NULL;
-    CAiwMenuPane* aiwPane = CreateAiwMenuPaneLC( &eikPane );
+    CEikMenuPane* eikPane = new( ELeave ) CEikMenuPane( this );
+    CleanupStack::PushL( eikPane );
+
+    // Constructing eikPane is not compulsory for testing and leads to a memory
+    // leak.
+    //eikPane->ConstructL( NULL, this );
+
+    CAiwMenuPane* aiwPane = new( ELeave ) CAiwMenuPane( *eikPane, 0 ); //Takes ownership
+    CleanupStack::Pop( eikPane );
+    CleanupStack::PushL( aiwPane );
 
     // ResourceFile is empty 
     delete iProvider->iResourceFileName;
@@ -369,18 +372,28 @@
 
 void UT_CMusAiwProvider::UT_CMusAiwProvider_InitializeMenuPaneL2L()
     {    
+
     RFs fs;
     User::LeaveIfError( fs.Connect() );
+
     CleanupClosePushL( fs );
-    
+
     BaflUtils::CopyFile( fs, KMusAiwProviderResource(),
                          KResourceFilenameRom() );
 
     CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
 
-    CEikMenuPane* eikPane = NULL;
-    CAiwMenuPane* aiwPane = CreateAiwMenuPaneLC( &eikPane );
-    
+    CEikMenuPane* eikPane = new( ELeave ) CEikMenuPane( this );
+    CleanupStack::PushL( eikPane );
+
+    // Constructing eikPane is not compulsory for testing and leads to a memory
+    // leak.
+    //eikPane->ConstructL( NULL, this );
+
+    CAiwMenuPane* aiwPane = new( ELeave ) CAiwMenuPane( *eikPane, 0 ); //Takes ownership
+    CleanupStack::Pop( eikPane );
+    CleanupStack::PushL( aiwPane );
+
     // ResourceFile is empty 
     delete iProvider->iResourceFileName;
     
@@ -428,17 +441,27 @@
 
 void UT_CMusAiwProvider::UT_CMusAiwProvider_InitializeMenuPaneL3L()
     {    
+
     RFs fs;
     User::LeaveIfError( fs.Connect() );
+
     CleanupClosePushL( fs );
-    
+
     BaflUtils::CopyFile( fs, KMusAiwProviderResource(),
                          KResourceFilenameRom() );
 
     CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
 
-    CEikMenuPane* eikPane = NULL;
-    CAiwMenuPane* aiwPane = CreateAiwMenuPaneLC( &eikPane );
+    CEikMenuPane* eikPane = new( ELeave ) CEikMenuPane( this );
+    CleanupStack::PushL( eikPane );
+
+    // Constructing eikPane is not compulsory for testing and leads to a memory
+    // leak.
+    //eikPane->ConstructL( NULL, this );
+
+    CAiwMenuPane* aiwPane = new( ELeave ) CAiwMenuPane( *eikPane, 0 ); //Takes ownership
+    CleanupStack::Pop( eikPane );
+    CleanupStack::PushL( aiwPane );
 
     // ResourceFile is empty 
     delete iProvider->iResourceFileName;
@@ -485,17 +508,27 @@
 
 void UT_CMusAiwProvider::UT_CMusAiwProvider_InitializeMenuPaneL4L()
     {    
+
     RFs fs;
     User::LeaveIfError( fs.Connect() );
+
     CleanupClosePushL( fs );
-    
+
     BaflUtils::CopyFile( fs, KMusAiwProviderResource(),
                          KResourceFilenameRom() );
 
     CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
 
-    CEikMenuPane* eikPane = NULL;
-    CAiwMenuPane* aiwPane = CreateAiwMenuPaneLC( &eikPane );
+    CEikMenuPane* eikPane = new( ELeave ) CEikMenuPane( this );
+    CleanupStack::PushL( eikPane );
+
+    // Constructing eikPane is not compulsory for testing and leads to a memory
+    // leak.
+    //eikPane->ConstructL( NULL, this );
+
+    CAiwMenuPane* aiwPane = new( ELeave ) CAiwMenuPane( *eikPane, 0 ); //Takes ownership
+    CleanupStack::Pop( eikPane );
+    CleanupStack::PushL( aiwPane );
 
     // ResourceFile is empty 
     delete iProvider->iResourceFileName;
@@ -542,17 +575,27 @@
 
 void UT_CMusAiwProvider::UT_CMusAiwProvider_InitializeMenuPaneL5L()
     {    
+
     RFs fs;
     User::LeaveIfError( fs.Connect() );
+
     CleanupClosePushL( fs );
-    
+
     BaflUtils::CopyFile( fs, KMusAiwProviderResource(),
                          KResourceFilenameRom() );
 
     CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
 
-    CEikMenuPane* eikPane = NULL;
-    CAiwMenuPane* aiwPane = CreateAiwMenuPaneLC( &eikPane );
+    CEikMenuPane* eikPane = new( ELeave ) CEikMenuPane( this );
+    CleanupStack::PushL( eikPane );
+
+    // Constructing eikPane is not compulsory for testing and leads to a memory
+    // leak.
+    //eikPane->ConstructL( NULL, this );
+
+    CAiwMenuPane* aiwPane = new( ELeave ) CAiwMenuPane( *eikPane, 0 ); //Takes ownership
+    CleanupStack::Pop( eikPane );
+    CleanupStack::PushL( aiwPane );
 
     // ResourceFile is empty 
     delete iProvider->iResourceFileName;
@@ -601,17 +644,27 @@
 
 void UT_CMusAiwProvider::UT_CMusAiwProvider_InitializeMenuPaneL6L()
     {    
+
     RFs fs;
     User::LeaveIfError( fs.Connect() );
+
     CleanupClosePushL( fs );
-    
+
     BaflUtils::CopyFile( fs, KMusAiwProviderResource(),
                          KResourceFilenameRom() );
 
     CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
 
-    CEikMenuPane* eikPane = NULL;
-    CAiwMenuPane* aiwPane = CreateAiwMenuPaneLC( &eikPane );
+    CEikMenuPane* eikPane = new( ELeave ) CEikMenuPane( this );
+    CleanupStack::PushL( eikPane );
+
+    // Constructing eikPane is not compulsory for testing and leads to a memory
+    // leak.
+    //eikPane->ConstructL( NULL, this );
+
+    CAiwMenuPane* aiwPane = new( ELeave ) CAiwMenuPane( *eikPane, 0 ); //Takes ownership
+    CleanupStack::Pop( eikPane );
+    CleanupStack::PushL( aiwPane );
 
     // ResourceFile is empty 
     delete iProvider->iResourceFileName;
@@ -657,19 +710,30 @@
     
     }
 
-void UT_CMusAiwProvider::UT_CMusAiwProvider_InitializeMenuPaneLFastModeL()
+
+void UT_CMusAiwProvider::UT_CMusAiwProvider_InitializeMenuPaneL7L()
     {    
+
     RFs fs;
     User::LeaveIfError( fs.Connect() );
+
     CleanupClosePushL( fs );
-    
+
     BaflUtils::CopyFile( fs, KMusAiwProviderResource(),
                          KResourceFilenameRom() );
 
     CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
 
-    CEikMenuPane* eikPane = NULL;
-    CAiwMenuPane* aiwPane = CreateAiwMenuPaneLC( &eikPane );
+    CEikMenuPane* eikPane = new( ELeave ) CEikMenuPane( this );
+    CleanupStack::PushL( eikPane );
+
+    // Constructing eikPane is not compulsory for testing and leads to a memory
+    // leak.
+    //eikPane->ConstructL( NULL, this );
+
+    CAiwMenuPane* aiwPane = new( ELeave ) CAiwMenuPane( *eikPane, 0 ); //Takes ownership
+    CleanupStack::Pop( eikPane );
+    CleanupStack::PushL( aiwPane );
 
     // ResourceFile is empty 
     delete iProvider->iResourceFileName;
@@ -680,35 +744,31 @@
     // Menu item counter
     TInt menuPaneCount = eikPane->NumberOfItemsInPane();
 
+    // test "forbidden" feature: mus NOT allowed, operator variant set to operator
+    MultimediaSharingSettings::SetOperatorVariantSettingL(
+                     MusSettingsKeys::EOperatorSpecific );
+    RProperty::Set( NMusSessionInformationApi::KCategoryUid,
+                    NMusSessionInformationApi::KMUSForbidden,
+                    NMusSessionInformationApi::EMUSForbidden );    
+    EUNIT_ASSERT( eikPane->NumberOfItemsInPane() == menuPaneCount )
+
     // set operator back to standard and allow mus
     RProperty::Set( NMusSessionInformationApi::KCategoryUid ,
                     NMusSessionInformationApi::KMUSForbidden ,
                     NMusSessionInformationApi::EMUSAllowed );
     MultimediaSharingSettings::SetOperatorVariantSettingL(
                      MusSettingsKeys::EStandard );
-    MultimediaSharingSettings::SetPropertyValueL( 
-              MusSettingsKeys::KFastStartupMode, MusSettingsKeys::EFastModeOn );
- 
-    // Options not enabled, mus shown in menu
-    //
-    MultimediaSharingSettings::SetCapabilityQuerySettingL(
-              MusSettingsKeys::ENoOptions );
-    CMusManager::SetAvailability(MultimediaSharing::EMultimediaSharingAvailable);
+
+    // Cases for "Mush not supported"
+    FeatureManager::MultimediaSharingNotSupported();
+    CMusManager::SetAvailability( MultimediaSharing::EMultimediaSharingAvailable );
     menuPaneCount = eikPane->NumberOfItemsInPane();
     iProvider->InitializeMenuPaneL( *aiwPane, 0, 0, *list );
-    
-    MUS_CHECK_MEMORY_LEAVE( eikPane->NumberOfItemsInPane() == menuPaneCount + 3 )
+    MUS_CHECK_MEMORY_LEAVE( eikPane->NumberOfItemsInPane() == menuPaneCount )
+    FeatureManager::MultimediaSharingSupported();
 
-    // Options supported, not yet available, mus not shown in menu
-    //
-    MultimediaSharingSettings::SetCapabilityQuerySettingL(
-                  MusSettingsKeys::EParallel );
-    CMusManager::SetAvailability(MultimediaSharing::ESipOptionsSent);
-    menuPaneCount = eikPane->NumberOfItemsInPane();
-    iProvider->InitializeMenuPaneL( *aiwPane, 0, 0, *list );
-   
-    MUS_CHECK_MEMORY_LEAVE( eikPane->NumberOfItemsInPane() == menuPaneCount )
-    
+    // set camera support on
+    FeatureManager::CameraSupported();
     CleanupStack::PopAndDestroy( aiwPane );
     CleanupStack::PopAndDestroy( list );
     BaflUtils::DeleteFile( fs, KResourceFilenameRom() );
@@ -716,53 +776,8 @@
     CleanupStack::PopAndDestroy(); // fs
     
     }
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-void UT_CMusAiwProvider::UT_CMusAiwProvider_InitializeMenuPaneLFastMode2L()
-    {
-    RFs fs;
-    User::LeaveIfError( fs.Connect() );
-    CleanupClosePushL( fs );
-    
-    BaflUtils::CopyFile( fs, KMusAiwProviderResource(),
-                         KResourceFilenameRom() );
-
-    CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
-
-    CEikMenuPane* eikPane = NULL;
-    CAiwMenuPane* aiwPane = CreateAiwMenuPaneLC( &eikPane );
-   
-    // ResourceFile is empty 
-    delete iProvider->iResourceFileName;
-    
-    iProvider->iResourceFileName = NULL ;
-    iProvider->InitializeMenuPaneL( *aiwPane, 0, 0, *list );
-    EUNIT_ASSERT( iProvider->iResourceFileName != NULL )
-
-    // Options supported, available, mus shown in menu
-    //
-    MultimediaSharingSettings::SetPropertyValueL( 
-              MusSettingsKeys::KFastStartupMode, MusSettingsKeys::EFastModeOn );
-
-    MultimediaSharingSettings::SetCapabilityQuerySettingL(
-                  MusSettingsKeys::EParallel );
-
-    CMusManager::SetAvailability(MultimediaSharing::EMultimediaSharingAvailable);
-    TInt menuPaneCount = eikPane->NumberOfItemsInPane();
-    iProvider->InitializeMenuPaneL( *aiwPane, 0, 0, *list );
-
-    MUS_CHECK_MEMORY_LEAVE( eikPane->NumberOfItemsInPane() == menuPaneCount + 3 )
-    
-    CleanupStack::PopAndDestroy( aiwPane );
-    CleanupStack::PopAndDestroy( list );
-    BaflUtils::DeleteFile( fs, KResourceFilenameRom() );
-
-    CleanupStack::PopAndDestroy(); // fs
-    }
-
+	
+	
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -777,15 +792,12 @@
     EUNIT_ASSERT( CMusManager::UseCase() == MultimediaSharing::EMusLiveVideo )
 
     iProvider->HandleMenuCmdL( EMusCommandClipShare, *pl, *pl, 0, this );
-    MUS_CHECK_MEMORY_LEAVE( CMusManager::UseCase() == MultimediaSharing::EMusClipVideo  )
     EUNIT_ASSERT( CMusManager::UseCase() == MultimediaSharing::EMusClipVideo )
 
     iProvider->HandleMenuCmdL( EMusCommandImageShare, *pl, *pl, 0, this );
-    MUS_CHECK_MEMORY_LEAVE( CMusManager::UseCase() == MultimediaSharing::EMusStillImage  )
     EUNIT_ASSERT( CMusManager::UseCase() == MultimediaSharing::EMusStillImage )
 
     iProvider->HandleMenuCmdL( EMusCommandContinue, *pl, *pl, 0, this );
-    MUS_CHECK_MEMORY_LEAVE( CMusManager::UseCase() == MultimediaSharing::EMusContinue  )
     EUNIT_ASSERT( CMusManager::UseCase() == MultimediaSharing::EMusContinue )
 
     CMusManager::SetStartError(
@@ -826,59 +838,9 @@
 //
 // -----------------------------------------------------------------------------
 //
-void UT_CMusAiwProvider::UT_CMusAiwProvider_HandleMenuCmdLFastModeL()
-    {
-    CAiwGenericParamList* pl = CAiwGenericParamList::NewLC();
-    
-    MultimediaSharingSettings::SetPropertyValueL( 
-               MusSettingsKeys::KFastStartupMode, MusSettingsKeys::EFastModeOn );
-    
-    // Fast mode, start live sharing (handle normally)
-    CMusManager::SetUseCase( MultimediaSharing::EMusContinue );
-    iProvider->HandleMenuCmdL( EMusCommandLiveShare, *pl, *pl, 0, this );
-    MUS_CHECK_MEMORY_LEAVE( CMusManager::UseCase() == MultimediaSharing::EMusLiveVideo  )
-    EUNIT_ASSERT( CMusManager::UseCase() == MultimediaSharing::EMusLiveVideo )
-
-    // Fast mode, start clip sharing, app not running nor hidden (handle normally)
-    CMusManager::SetUseCase( MultimediaSharing::EMusContinue );
-    iProvider->HandleMenuCmdL( EMusCommandClipShare, *pl, *pl, 0, this );
-    MUS_CHECK_MEMORY_LEAVE( CMusManager::UseCase() == MultimediaSharing::EMusClipVideo  )
-    EUNIT_ASSERT( CMusManager::UseCase() == MultimediaSharing::EMusClipVideo )
-        
-    // Fast mode, start clip sharing, app running and hidden (mus mgr is not
-    // used for starting application, only usecase P&S value is changed)
-    CMusManager::SetUseCase( MultimediaSharing::EMusContinue );
-    
-    TApaTask::iApplicationExist = ETrue;
-    
-    TBuf16< 10 > listOkMus; 
-    TUint16 upperBits = KMusUiUid >> 16;  
-    listOkMus.Append( upperBits );
-    listOkMus.Append( KMusUiUid );
-    listOkMus.Append( 0 );
-    listOkMus.Append( 0 );
-    RProperty::Set( KPSUidUikon, KUikAppHiddenList, listOkMus );  
-    
-    RProperty::Set( NMusSessionApi::KCategoryUid, NMusSessionApi::KUseCase, MultimediaSharing::EMusContinue );
-    
-    iProvider->HandleMenuCmdL( EMusCommandClipShare, *pl, *pl, 0, this );
-    EUNIT_ASSERT( CMusManager::UseCase() == MultimediaSharing::EMusContinue )
-    
-    TInt usecaseAfterFakeStart( 0 );
-    RProperty::Get( NMusSessionApi::KCategoryUid, NMusSessionApi::KUseCase, usecaseAfterFakeStart );
-    EUNIT_ASSERT( usecaseAfterFakeStart == MultimediaSharing::EMusClipVideo );
-    
-    CleanupStack::PopAndDestroy( pl );
-
-    }
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
 void UT_CMusAiwProvider::UT_CMusAiwProvider_ApplicationRunningLL()
     {
-    TApaTask::iApplicationExist = EFalse;
+    // Stub returns EFalse as default
     EUNIT_ASSERT( !iProvider->ApplicationRunningL() )
 
     // Use stub to mimic the existence of application
@@ -1009,90 +971,8 @@
     ImplementationGroupProxy( tableCount );
     }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-void UT_CMusAiwProvider::UT_HiddenFromFastSwapL()
-    {
-    // Normal mode
-    MultimediaSharingSettings::SetPropertyValueL( 
-                MusSettingsKeys::KFastStartupMode, MusSettingsKeys::EFastModeOff );
-    EUNIT_ASSERT( !iProvider->HiddenFromFastSwapL() )
-    
-    // Fast mode
-    //
-    MultimediaSharingSettings::SetPropertyValueL( 
-               MusSettingsKeys::KFastStartupMode, MusSettingsKeys::EFastModeOn );
-    
-    // Key not found
-    PropertyHelper::SetErrorCode( KErrNotFound );
-    EUNIT_ASSERT( !iProvider->HiddenFromFastSwapL() )
-    
-    // Malformed key value
-    PropertyHelper::SetErrorCode( KErrNone );
-    TBuf16< 5 > listMalformed;
-    listMalformed.Copy( _L("05645") );
-    RProperty::Set( KPSUidUikon, KUikAppHiddenList, listMalformed );   
-    MUS_EUNIT_ASSERT_SPECIFIC_LEAVE( iProvider->HiddenFromFastSwapL(), KErrEof );
-    
-    // No musuid in value list
-    TBuf16< 6 > listOkNoMus;
-    TUint32 uid1 = 10002000;
-    TUint32 uid2 = 20003000;
-    // avkoncapserver publishes values in following manner
-    TUint16 upperBits = uid1 >> 16;
-    listOkNoMus.Append( upperBits );
-    listOkNoMus.Append( uid1 );
-    upperBits = uid2 >> 16;
-    listOkNoMus.Append( upperBits );
-    listOkNoMus.Append( uid2 );
-    listOkNoMus.Append( 0 );
-    listOkNoMus.Append( 0 );
-    RProperty::Set( KPSUidUikon, KUikAppHiddenList, listOkNoMus );  
-    EUNIT_ASSERT( !iProvider->HiddenFromFastSwapL() )
-    
-    // Musuid in value list
-    TBuf16< 10 > listOkMus;
-    TUint32 uid3 = 30005000;
-    upperBits = uid1 >> 16;
-    listOkMus.Append( upperBits );
-    listOkMus.Append( uid1 );
-    upperBits = uid2 >> 16;
-    listOkMus.Append( upperBits );
-    listOkMus.Append( uid2 );
-    
-    upperBits = KMusUiUid >> 16;  
-    listOkMus.Append( upperBits );
-    listOkMus.Append( KMusUiUid );
-    
-    upperBits = uid3 >> 16;
-    listOkMus.Append( upperBits );
-    listOkMus.Append( uid3 );
-    
-    listOkMus.Append( 0 );
-    listOkMus.Append( 0 );
-    RProperty::Set( KPSUidUikon, KUikAppHiddenList, listOkMus );  
-    EUNIT_ASSERT( iProvider->HiddenFromFastSwapL() )
-    }
 
-// HELPERS
 
-CAiwMenuPane* UT_CMusAiwProvider::CreateAiwMenuPaneLC( CEikMenuPane** aEikPane )
-    {
-    CEikMenuPane* eikPane = new( ELeave ) CEikMenuPane( this );
-    CleanupStack::PushL( eikPane );
-
-    // Constructing eikPane is not compulsory for testing and leads to a memory
-    // leak.
-    //eikPane->ConstructL( NULL, this );
-
-    CAiwMenuPane* aiwPane = new( ELeave ) CAiwMenuPane( *eikPane, 0 ); //Takes ownership
-    CleanupStack::Pop( eikPane );
-    CleanupStack::PushL( aiwPane );
-    *aEikPane = eikPane;
-    return aiwPane;
-    }
 
 //  TEST TABLE
 
@@ -1153,21 +1033,14 @@
     "InitializeMenuPaneL",
     "FUNCTIONALITY",
     SetupL, UT_CMusAiwProvider_InitializeMenuPaneL6L, Teardown)
-
+    
 EUNIT_TEST(
-    "InitializeMenuPaneL - fast mode",
+    "InitializeMenuPaneL - test7",
     "CMusAiwProvider",
     "InitializeMenuPaneL",
     "FUNCTIONALITY",
-    SetupL, UT_CMusAiwProvider_InitializeMenuPaneLFastModeL, Teardown)
-
-EUNIT_TEST(
-    "InitializeMenuPaneL - fast mode 2",
-    "CMusAiwProvider",
-    "InitializeMenuPaneL",
-    "FUNCTIONALITY",
-    SetupL, UT_CMusAiwProvider_InitializeMenuPaneLFastMode2L, Teardown)
-
+    SetupL, UT_CMusAiwProvider_InitializeMenuPaneL7L, Teardown)
+	     
 EUNIT_TEST(
     "HandleMenuCmdL - test",
     "CMusAiwProvider",
@@ -1176,13 +1049,6 @@
     SetupL, UT_CMusAiwProvider_HandleMenuCmdLL, Teardown)
 
 EUNIT_TEST(
-    "HandleMenuCmdL - fastmode test",
-    "CMusAiwProvider",
-    "HandleMenuCmdL",
-    "FUNCTIONALITY",
-    SetupL, UT_CMusAiwProvider_HandleMenuCmdLFastModeL, Teardown)   
-
-EUNIT_TEST(
     "ApplicationRunningL - test",
     "CMusAiwProvider",
     "ApplicationRunningL",
@@ -1216,13 +1082,6 @@
     "ImplementationGroupProxy",
     "FUNCTIONALITY",
     SetupL, UT_ImplementationGroupProxyL, Teardown)
-    
-EUNIT_TEST(
-    "HiddenFromFastSwapL",
-    "CMusAiwProvider",
-    "HiddenFromFastSwapL",
-    "FUNCTIONALITY",
-    SetupL, UT_HiddenFromFastSwapL, Teardown)
 
 EUNIT_END_TEST_TABLE