diff -r 33a5d2bbf6fc -r 73a1feb507fb mmsharing/mmshmanagersrv/tsrc/ut_managersrv/src/UT_CMusavailabilityPluginManager.cpp --- a/mmsharing/mmshmanagersrv/tsrc/ut_managersrv/src/UT_CMusavailabilityPluginManager.cpp Thu Aug 19 09:51:39 2010 +0300 +++ b/mmsharing/mmshmanagersrv/tsrc/ut_managersrv/src/UT_CMusavailabilityPluginManager.cpp Tue Aug 31 15:12:07 2010 +0300 @@ -27,7 +27,6 @@ #include "cmusavainterfacestub.h" #include "musmanagerservercommon.h" #include "musapplicationmanager.h" -#include "mussesseioninformationapi.h" #include #include #include @@ -48,10 +47,6 @@ */ _LIT( KUsedSipAddress, "sip:stadi@hesa.fi" ); -/* - * Privacy status from MusAvaSettingsStub. - */ -_LIT( KUsedPrivacyStatus, "1" ); // ======== MEMBER FUNCTIONS ======== @@ -118,7 +113,8 @@ // From class MMusAvailabilityPluginManagerObserver. // --------------------------------------------------------------------------- // -void UT_CMusAvailabilityPluginManager::StartLiveSharingL() +void UT_CMusAvailabilityPluginManager::StartSharingWithUseCaseL( + MultimediaSharing::TMusUseCase /*aUseCase*/ ) { iCalledAStartLiveSharing = ETrue; } @@ -145,7 +141,8 @@ delete iManager; iManager = NULL; delete iAppManager; - PropertyHelper::Close(); + PropertyHelper::Close(); + Dll::FreeTls(); // Used by the RProcess and TFindProcess stubs } @@ -256,15 +253,10 @@ // void UT_CMusAvailabilityPluginManager::UT_CMusAvailabilityPluginManager_SessionParametersL() { - CMusAvaInterface* interface = iManager->iPlugin; - CMusAvaInterface2* interface2 = static_cast( interface ); - interface2->iSettings->iCallPrivacy = 1; - MDesCArray* params = &iManager->SessionParametersL(); EUNIT_ASSERT_EQUALS( KUsedTelNumber(), params->MdcaPoint( KTelNumber ) ); EUNIT_ASSERT_EQUALS( KUsedSipAddress(), params->MdcaPoint( KSipAddress ) ); EUNIT_ASSERT_EQUALS( KUsedVideoCodec(), params->MdcaPoint( KVideoCodec ) ); - EUNIT_ASSERT( !params->MdcaPoint( KPrivacyStatus ).Compare( KUsedPrivacyStatus() ) ); } // --------------------------------------------------------------------------- @@ -402,15 +394,11 @@ // void UT_CMusAvailabilityPluginManager:: UT_CMusAvailabilityPluginManager_UpdateSessionParametersLL() - { + { MDesCArray* params = &iManager->SessionParametersL(); - CMusAvaInterface* interface = iManager->iPlugin; - CMusAvaInterface2* interface2 = static_cast( interface ); - interface2->iSettings->iCallPrivacy = 1; EUNIT_ASSERT_EQUALS( KUsedTelNumber(), iManager->SessionParametersL().MdcaPoint( KTelNumber ) ); EUNIT_ASSERT_EQUALS( KUsedSipAddress(), iManager->SessionParametersL().MdcaPoint( KSipAddress ) ); EUNIT_ASSERT_EQUALS( KUsedVideoCodec(), iManager->SessionParametersL().MdcaPoint( KVideoCodec ) ); - EUNIT_ASSERT( !iManager->SessionParametersL().MdcaPoint( KPrivacyStatus ).Compare( KUsedPrivacyStatus() ) ); } @@ -482,6 +470,19 @@ iManager->IndicateAvailabilityL(); } +void UT_CMusAvailabilityPluginManager::UT_CMusAvailabilityPluginManager_PrepareForReceivedInviteLL() + { + CMusAvaInterface* interface = iManager->iPlugin; + CMusAvaInterface2* interface2 = static_cast( interface ); + + CMusAvaAvailabilityStub* abilityStub = + static_cast( interface2->iAvailabilities[0] ); + abilityStub->iPrepareForInviteCalled = EFalse; + + iManager->PrepareForReceivedInviteL(); + EUNIT_ASSERT( abilityStub->iPrepareForInviteCalled ); + } + // ======== EUNIT TEST TABLE ======== @@ -603,6 +604,12 @@ "IndicateAvailabilityL", "FUNCTIONALITY", SetupL, UT_CMusAvailabilityPluginManager_IndicateAvailabilityLL, Teardown ) - + +EUNIT_TEST( + "PrepareForReceivedInviteL - test ", + "CMusAvailabilityPluginManager", + "PrepareForReceivedInviteL", + "FUNCTIONALITY", + SetupL, UT_CMusAvailabilityPluginManager_PrepareForReceivedInviteLL, Teardown ) EUNIT_END_TEST_TABLE