Mercurial Mercurial > oss > FCL > sf > app > mmsharinguis / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mmsharing/mmshavailability/tsrc/ut_availability/src/UT_CMusAvaConnectionAvailability.cpp
branchRCL_3
changeset 33 bc78a40cd63c
parent 32 73a1feb507fb 
--- a/mmsharing/mmshavailability/tsrc/ut_availability/src/UT_CMusAvaConnectionAvailability.cpp	Tue Aug 31 15:12:07 2010 +0300
+++ b/mmsharing/mmshavailability/tsrc/ut_availability/src/UT_CMusAvaConnectionAvailability.cpp	Wed Sep 01 12:31:01 2010 +0100
@@ -135,14 +135,28 @@
 
 void UT_CMusAvaConnectionAvailability::UT_CMusAvaConnectionAvailability_DoExecuteLL()
     {
-	// Test: VS is allowed in All Netwoks by Default. 
+    TInt ret = 0;
+    iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeGsm );
+    iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredOnHomeNetwork );
+    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
+    MultimediaSharingSettings::SetEdgeDtmSupportSettingL( MusSettingsKeys::EDtmModeNotAllowed );
+    TRAPD( error, iConnectionAvailability->DoExecuteL() );
+    if ( error == KErrNoMemory ) User::Leave( error );
+    EUNIT_ASSERT ( error == KErrNone );
 
-	// Test1: VS in 3G Always Allowed. 
-	TInt error = KErrArgument;
-	TInt count = KErrNone;
+    TInt count = 0;
+    EUNIT_GET_ALLOC_DECORATOR_FAILCOUNT( count );
+    if ( count > 0 && iConnectionAvailability->State() 
+        == MMusAvaObserver::EMusActivationError )
+        {
+        User::Leave( KErrNoMemory );
+        }
+    EUNIT_ASSERT( iConnectionAvailability->State() ==  MMusAvaObserver::EMusAvaNetworkType );
     iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeWcdma );
     iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredOnHomeNetwork );
-    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EActiveInHomeNetworks );
+    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
+    MultimediaSharingSettings::SetOperatorVariantSettingL( MusSettingsKeys::EStandard );
+    
     TRAP( error, iConnectionAvailability->DoExecuteL() );
     if ( error == KErrNoMemory ) User::Leave( error );
     EUNIT_ASSERT ( error == KErrNone );
@@ -155,131 +169,27 @@
         }
     EUNIT_ASSERT( iConnectionAvailability->State() ==  MMusAvaObserver::EMusAvaStatusAvailable );
 
-
-	//Test2 : VS is even allowed when Network type is Unknown
-	iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeUnknown );
-    iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredOnHomeNetwork );
+    // No roaming for operator variant
     MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
-    CMusAvaConnectionMonitor& avaConnectionMonitor = iSharedObject->ConnectionMonitor();
-    avaConnectionMonitor.iConnectionMonitor.iConnectionId = 1; 
-    avaConnectionMonitor.iConnectionMonitor.iConnectionCounter = 1;
-    avaConnectionMonitor.iConnectionMonitor.iUintAttributeValue = 1;
-    avaConnectionMonitor.iConnectionMonitor.iConnectionInfoError = KErrNone;    
-    
-    //EUNIT_DISABLE_ALLOC_DECORATOR;
-    
-    TRAP( error, iConnectionAvailability->DoExecuteL() );
-    if ( error == KErrNoMemory ) User::Leave( error );
-    
-    //EUNIT_DISABLE_ALLOC_DECORATOR;
-    
-    EUNIT_ASSERT ( error == KErrNone );
-    EUNIT_GET_ALLOC_DECORATOR_FAILCOUNT( count );
+    MultimediaSharingSettings::SetOperatorVariantSettingL( MusSettingsKeys::EOperatorSpecific );
+    iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredRoaming );
     
-    //HKK Define own error condition in which it can fil. 
-    
-    
-    if ( count > 0 && ( iConnectionAvailability->State() 
-        == MMusAvaObserver::EMusActivationError) ||
-        (iConnectionAvailability->State() == MMusAvaObserver::EMusAvaNetworkType ))
-        {
-        User::Leave( KErrNoMemory );
-        }
-    EUNIT_ASSERT( iConnectionAvailability->State() ==  MMusAvaObserver::EMusAvaStatusAvailable );
-	
-	// Test3: VS in GSM Network is Allowed Ensure, PDP Context Need to be up to ensure network does 
-	// support data connection; Note DTM Flag is not needed anymore since VS is allowed in all network. 
-    iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeGsm );
-    iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredOnHomeNetwork );
-    
-    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
-    avaConnectionMonitor.iConnectionMonitor.iConnectionId = 1; 
-    avaConnectionMonitor.iConnectionMonitor.iConnectionCounter = 1;
-    avaConnectionMonitor.iConnectionMonitor.iUintAttributeValue = 1;
-    avaConnectionMonitor.iConnectionMonitor.iConnectionInfoError = KErrNone;    
     TRAP( error, iConnectionAvailability->DoExecuteL() );
     if ( error == KErrNoMemory ) User::Leave( error );
     EUNIT_ASSERT ( error == KErrNone );
     EUNIT_GET_ALLOC_DECORATOR_FAILCOUNT( count );
-    if ( count > 0 && ( iConnectionAvailability->State() 
-        == MMusAvaObserver::EMusActivationError ) ||
-        (iConnectionAvailability->State() == MMusAvaObserver::EMusAvaNetworkType ))
-        
-        {
-        User::Leave( KErrNoMemory );
-        }
-    EUNIT_ASSERT( iConnectionAvailability->State() ==  MMusAvaObserver::EMusAvaStatusAvailable );
-	
-	
-	// Test4: VS in GSM Network is dis-allowed if PDP context is not up. 
-    iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeGsm );
-    iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredOnHomeNetwork );
-    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
-    avaConnectionMonitor.iConnectionMonitor.iConnectionId = 1; 
-    avaConnectionMonitor.iConnectionMonitor.iConnectionCounter = 0;
-    avaConnectionMonitor.iConnectionMonitor.iUintAttributeValue = 1;
-    avaConnectionMonitor.iConnectionMonitor.iConnectionInfoError = KErrNone;    
-    TRAP( error, iConnectionAvailability->DoExecuteL() );
-    if ( error == KErrNoMemory ) User::Leave( error );
-    EUNIT_ASSERT ( error == KErrNone );
-    EUNIT_GET_ALLOC_DECORATOR_FAILCOUNT( count );
-    if ( count > 0 && ( iConnectionAvailability->State() 
-        == MMusAvaObserver::EMusActivationError ) ||
-        (iConnectionAvailability->State() == MMusAvaObserver::EMusAvaNetworkType ))
-        
-        {
-        User::Leave( KErrNoMemory );
-        }
-    EUNIT_ASSERT( iConnectionAvailability->State() ==  MMusAvaObserver::EMusAvaEdgeDtmStatusUnknown );
-    }
-
-
-void UT_CMusAvaConnectionAvailability::UT_CMusAvaConnectionAvailability_DoExecuteLL2()
-    {
-    // Restrict VS to be only Used in 3G mode, 
-    
-   	iStorage->Set ( MusSettingsKeys::KAllowOnlyIn3GNetwork,
-   	MusSettingsKeys::EAllowed3GOnly );       
-	
-	// Test: In GSM VS is not Allowed when its restricted to be only used in 3G
-    
-    TInt ret = 0;
-    iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeGsm );
-    iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredOnHomeNetwork );
-    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
-    MultimediaSharingSettings::SetEdgeDtmSupportSettingL( MusSettingsKeys::EDtmModeNotAllowed );
-    TRAPD( error, iConnectionAvailability->DoExecuteL() );
-    if ( error == KErrNoMemory ) User::Leave( error );
-    EUNIT_ASSERT ( error == KErrNone );
-
-    TInt count = 0;
-    EUNIT_GET_ALLOC_DECORATOR_FAILCOUNT( count );
-    if ( count > 0 &&
-         iConnectionAvailability->State() !=  MMusAvaObserver::EMusAvaNetworkType )
-        {
-        User::Leave( KErrNoMemory );
-        }
-    EUNIT_ASSERT( iConnectionAvailability->State() ==  MMusAvaObserver::EMusAvaNetworkType );
-
-    // Test2: In 3G VS is allowed.
-    
-    iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeWcdma );
-    iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredOnHomeNetwork );
-    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EActiveInHomeNetworks );
-    TRAP( error, iConnectionAvailability->DoExecuteL() );
-    if ( error == KErrNoMemory ) User::Leave( error );
-    EUNIT_ASSERT ( error == KErrNone );
-
-    EUNIT_GET_ALLOC_DECORATOR_FAILCOUNT( count );
     if ( count > 0 && iConnectionAvailability->State() 
         == MMusAvaObserver::EMusActivationError )
         {
         User::Leave( KErrNoMemory );
         }
-    EUNIT_ASSERT( iConnectionAvailability->State() ==  MMusAvaObserver::EMusAvaStatusAvailable );
+    EUNIT_ASSERT( iConnectionAvailability->State() ==  MMusAvaObserver::EMusActivationError );
     
-    // Test3: Active in home networks
-    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EActiveInHomeNetworks );
+    // operator variant OK
+    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
+    MultimediaSharingSettings::SetOperatorVariantSettingL( MusSettingsKeys::EOperatorSpecific );
+    iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredOnHomeNetwork );
+    
     TRAP( error, iConnectionAvailability->DoExecuteL() );
     if ( error == KErrNoMemory ) User::Leave( error );
     EUNIT_ASSERT ( error == KErrNone );
@@ -290,8 +200,9 @@
         User::Leave( KErrNoMemory );
         }
     EUNIT_ASSERT( iConnectionAvailability->State() ==  MMusAvaObserver::EMusAvaStatusAvailable );
+    MultimediaSharingSettings::SetOperatorVariantSettingL( MusSettingsKeys::EStandard );
     
-    //Test4: activation set off
+    // activation set off
     iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeWcdma );
     iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredOnHomeNetwork );
     MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::ENever );
@@ -300,7 +211,7 @@
     EUNIT_ASSERT ( error == KErrNone );
     EUNIT_ASSERT( iConnectionAvailability->State() ==  MMusAvaObserver::EMusActivationError ); 
 
-    // Test5: Edge/Dtm activation settings
+    //Edge/Dtm activation settings
     // case 1 Dtm mode allowed and atleast one pdp context exist
     iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeGsm );
     iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredOnHomeNetwork );
@@ -322,7 +233,6 @@
         }
     EUNIT_ASSERT( iConnectionAvailability->State() ==  MMusAvaObserver::EMusAvaStatusAvailable );
     
-    // Test5: Edge DTM is allowed but no pdp context
     // case 2 Dtm mode allowed and no pdp context exist
     iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeGsm );
     iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredOnHomeNetwork );
@@ -343,7 +253,7 @@
         }
     EUNIT_ASSERT( iConnectionAvailability->State() ==  MMusAvaObserver::EMusAvaEdgeDtmStatusUnknown );
     
-    // Test6: case 2 Dtm mode not allowed
+    // case 2 Dtm mode not allowed
     iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeGsm );
     iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredOnHomeNetwork );
     MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
@@ -358,12 +268,6 @@
         User::Leave( KErrNoMemory );
         }
     EUNIT_ASSERT( iConnectionAvailability->State() ==  MMusAvaObserver::EMusAvaNetworkType );
-    
-    // Reset the Central Reppository to the default value to avoid 
-    // poluting common storage.
-    
-   	iStorage->Set ( MusSettingsKeys::KAllowOnlyIn3GNetwork,
-   	MusSettingsKeys::EAllowedAllBearers );       
     }
  		
 void UT_CMusAvaConnectionAvailability::UT_CMusAvaConnectionAvailability_NameL()
@@ -379,80 +283,26 @@
 
 void UT_CMusAvaConnectionAvailability::UT_CMusAvaConnectionAvailability_PhoneNetworkModeStatusL()
     {
-    //Test1:  VS by default would allow all type of Networks. 
-    // Unknow Network Type : Allowed
     iConnectionAvailability->PhoneNetworkModeStatus( RMobilePhone::ENetworkModeUnknown );
-    TInt count = 0;
-    EUNIT_GET_ALLOC_DECORATOR_FAILCOUNT( count );
-    if ( count > 0 && ( iConnectionAvailability->State() ==  MMusAvaObserver::EMusActivationError ) ||
-    					(iConnectionAvailability->State() == MMusAvaObserver::EMusAvaNetworkType ))
-        {
-        User::Leave( KErrNoMemory );
-        }
-    EUNIT_ASSERT( iConnectionAvailability->iState ==  MMusAvaObserver::EMusAvaStatusAvailable );
-    
-    //GSM Network is Allowed:
-    iConnectionAvailability->PhoneNetworkModeStatus( RMobilePhone::ENetworkModeGsm );
-    
-    count = 0;
-    EUNIT_GET_ALLOC_DECORATOR_FAILCOUNT( count );
-    if ( count > 0 && ( iConnectionAvailability->State() ==  MMusAvaObserver::EMusActivationError ) ||
-    					(iConnectionAvailability->State() == MMusAvaObserver::EMusAvaNetworkType ))
-        {
-        User::Leave( KErrNoMemory );
-        }
-    
-    EUNIT_ASSERT( iConnectionAvailability->iState ==  MMusAvaObserver::EMusAvaStatusAvailable );
-    
-    //WCDMA: 3G is Allowed
+    EUNIT_ASSERT( iConnectionAvailability->iState ==  MMusAvaObserver::EMusAvaNetworkType );
     iConnectionAvailability->PhoneNetworkModeStatus( RMobilePhone::ENetworkModeWcdma );
     MMusAvaObserver::TAvailabilityStatus state = MMusAvaObserver::EMusAvaStatusNotExecuted;
     state = iConnectionAvailability->State();
-    count = 0;
+    TInt count = 0;
     EUNIT_GET_ALLOC_DECORATOR_FAILCOUNT( count );
-    if ( count > 0 && (state == MMusAvaObserver::EMusActivationError ) ||
-    				    ( state == MMusAvaObserver::EMusAvaNetworkType ))
+    if ( count > 0 && state == MMusAvaObserver::EMusActivationError )
         {
         User::Leave( KErrNoMemory );
         }
     EUNIT_ASSERT( state ==  MMusAvaObserver::EMusAvaStatusAvailable );
-
-    //Test2:  Restrict VS to be only used in 3G
-	iStorage->Set ( MusSettingsKeys::KAllowOnlyIn3GNetwork,
-      	MusSettingsKeys::EAllowed3GOnly );       
-	
-	//Unknown Network DisAllowed
-    iConnectionAvailability->PhoneNetworkModeStatus( RMobilePhone::ENetworkModeUnknown );
-    EUNIT_ASSERT( iConnectionAvailability->iState ==  MMusAvaObserver::EMusAvaNetworkType );
-    
-    //GSM Network is Dis-Allowed:
-    iConnectionAvailability->PhoneNetworkModeStatus( RMobilePhone::ENetworkModeGsm );
-    EUNIT_ASSERT( iConnectionAvailability->iState ==  MMusAvaObserver::EMusAvaNetworkType );
-
-    
-    //3G is Allowed:
-    iConnectionAvailability->PhoneNetworkModeStatus( RMobilePhone::ENetworkModeWcdma );
-    MMusAvaObserver::TAvailabilityStatus state1 = MMusAvaObserver::EMusAvaStatusNotExecuted;
-    state1 = iConnectionAvailability->State();
-    TInt count1 = 0;
-    EUNIT_GET_ALLOC_DECORATOR_FAILCOUNT( count );
-    if ( count1 > 0 && state1 == MMusAvaObserver::EMusActivationError )
-        {
-        User::Leave( KErrNoMemory );
-        }
-    EUNIT_ASSERT( state1 ==  MMusAvaObserver::EMusAvaStatusAvailable );
-    
-    //Reset the key to the default value.
-   	iStorage->Set ( MusSettingsKeys::KAllowOnlyIn3GNetwork,
-      	MusSettingsKeys::EAllowedAllBearers );       
     }
                           
 void UT_CMusAvaConnectionAvailability::UT_CMusAvaConnectionAvailability_NetworkRegistrationStatusL()
     {
-    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EActiveInHomeNetworks );
+    MultimediaSharingSettings::SetOperatorVariantSettingL( MusSettingsKeys::EOperatorSpecific );
+    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
     iConnectionAvailability->iState = MMusAvaObserver::EMusAvaStatusAvailable;
     iConnectionAvailability->NetworkRegistrationStatus( RMobilePhone::ERegistrationUnknown );
-    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
     TInt count = 0;
     EUNIT_GET_ALLOC_DECORATOR_FAILCOUNT( count );
     if ( count > 0 && iConnectionAvailability->iState 
@@ -462,7 +312,8 @@
         }
     EUNIT_ASSERT( iConnectionAvailability->iState ==  MMusAvaObserver::EMusAvaRoamingError );
     iConnectionAvailability->iState = MMusAvaObserver::EMusAvaStatusAvailable;
-    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EActiveInHomeNetworks );
+    MultimediaSharingSettings::SetOperatorVariantSettingL( MusSettingsKeys::EStandard );
+    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
     iConnectionAvailability->NetworkRegistrationStatus( RMobilePhone::ERegisteredOnHomeNetwork );
     EUNIT_GET_ALLOC_DECORATOR_FAILCOUNT( count );
     if ( count > 0 && iConnectionAvailability->iState 
@@ -735,12 +586,6 @@
     == MMusAvaObserver::EMusAvaStatusAvailable );
     
     iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeWcdma );
-    iStorage->SetRegistrationStatus( RMobilePhone::ERegistrationUnknown );
-    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EActiveInHomeNetworks );
-    EUNIT_ASSERT( iConnectionAvailability->NetworkRegistrationAndSettingsL()
-    == MMusAvaObserver::EMusActivationError );
-    
-    iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeWcdma );
     iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredOnHomeNetwork );
     MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::ENever );
     EUNIT_ASSERT( iConnectionAvailability->NetworkRegistrationAndSettingsL()
@@ -748,7 +593,7 @@
     
     iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeWcdma );
     iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredOnHomeNetwork );
-    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EActiveInHomeNetworks );
+    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
     EUNIT_ASSERT( iConnectionAvailability->NetworkRegistrationAndSettingsL()
     == MMusAvaObserver::EMusAvaStatusAvailable );
     
@@ -763,7 +608,7 @@
      	iConcreteSettings->SetManualActivation( MMusAvaSettings::EActivationAllowed);
     MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
     EUNIT_ASSERT( iConnectionAvailability->NetworkRegistrationAndSettingsL()
-    == MMusAvaObserver::EMusAvaStatusAvailable );
+    == MMusAvaObserver::EMusActivationError );
     
     iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeWcdma );
     iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredOnHomeNetwork );
@@ -773,6 +618,7 @@
     == MMusAvaObserver::EMusAvaStatusAvailable );
     
     
+    MultimediaSharingSettings::SetOperatorVariantSettingL( MusSettingsKeys::EStandard );
     iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeWcdma );
     iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredRoaming );
     MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
@@ -791,20 +637,12 @@
     iConcreteSettings->SetManualActivation( MMusAvaSettings::EActivationExecuted);
     MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
     EUNIT_ASSERT( iConnectionAvailability->NetworkRegistrationAndSettingsL()
-    == MMusAvaObserver::EMusAvaStatusAvailable );
+    == MMusAvaObserver::EMusActivationError );
     
     iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeWcdma );
     iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredRoaming );
-    iConcreteSettings->SetManualActivation( MMusAvaSettings::EActivationExecuted);
-    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EActiveInHomeNetworks );
-    EUNIT_ASSERT( iConnectionAvailability->NetworkRegistrationAndSettingsL()
-    == MMusAvaObserver::EMusActivationError );
-    
-    MultimediaSharingSettings::SetOperatorVariantSettingL( MusSettingsKeys::EStandard );
-    iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeWcdma );
-    iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredRoaming );
     iConcreteSettings->SetManualActivation( MMusAvaSettings::EActivationNotExecuted);
-    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EActiveInHomeNetworks );
+    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
     EUNIT_ASSERT( iConnectionAvailability->NetworkRegistrationAndSettingsL()
     == MMusAvaObserver::EMusAvaManualActivation );
     
@@ -822,21 +660,13 @@
     iConcreteSettings->SetManualActivation( MMusAvaSettings::EActivationNotAllowed);
     MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
     EUNIT_ASSERT( iConnectionAvailability->NetworkRegistrationAndSettingsL()
-    == MMusAvaObserver::EMusAvaStatusAvailable );
-    
-    MultimediaSharingSettings::SetOperatorVariantSettingL( MusSettingsKeys::EStandard );
-    iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeWcdma );
-    iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredRoaming );
-    iConcreteSettings->SetManualActivation( MMusAvaSettings::EActivationNotAllowed);
-    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EActiveInHomeNetworks );
-    EUNIT_ASSERT( iConnectionAvailability->NetworkRegistrationAndSettingsL()
     == MMusAvaObserver::EMusActivationError );
     
     MultimediaSharingSettings::SetOperatorVariantSettingL( MusSettingsKeys::EStandard );
     iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeWcdma );
     iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredRoaming );
     iConcreteSettings->SetManualActivation( MMusAvaSettings::EActivationNotExecuted);
-    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EActiveInHomeNetworks );
+    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
     EUNIT_ASSERT( iConnectionAvailability->NetworkRegistrationAndSettingsL()
     == MMusAvaObserver::EMusAvaManualActivation );
     
@@ -844,7 +674,7 @@
     iStorage->SetPhoneNetworkModeStatus( RMobilePhone::ENetworkModeWcdma );
     iStorage->SetRegistrationStatus( RMobilePhone::ERegisteredRoaming );
     iConcreteSettings->SetManualActivation( MMusAvaSettings::EActivationAllowed);
-    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EActiveInHomeNetworks );
+    MultimediaSharingSettings::SetActivationSettingL( MusSettingsKeys::EAlwaysActive );
     EUNIT_ASSERT( iConnectionAvailability->NetworkRegistrationAndSettingsL()
     == MMusAvaObserver::EMusAvaStatusAvailable );
     }
@@ -888,14 +718,6 @@
     SetupL, UT_CMusAvaConnectionAvailability_DoExecuteLL, Teardown)
     
 EUNIT_TEST(
-    "DoExecuteL - test 3G Restricted",
-    "CMusAvaConnectionAvailability",
-    "DoExecuteL",
-    "FUNCTIONALITY",
-    SetupL, UT_CMusAvaConnectionAvailability_DoExecuteLL2, Teardown)
-    
-    
-EUNIT_TEST(
     "Name - test ",
     "CMusAvaConnectionAvailability",
     "Name",
FCL/sf/app/mmsharinguis