--- a/mmsharing/mmshmanagersrv/tsrc/ut_managersrv/src/UT_CMusManagerServerCore.cpp	Tue Aug 31 15:12:07 2010 +0300
+++ b/mmsharing/mmshmanagersrv/tsrc/ut_managersrv/src/UT_CMusManagerServerCore.cpp	Wed Sep 01 12:31:01 2010 +0100
@@ -30,8 +30,6 @@
 #include <apgtask.h>
 #include <digia/eunit/eunitmacros.h>
 
-_LIT8( KMusEngineName, "MultimediaSharing" );
-_LIT8( KAnotherEngineName, "AnotherEngine" );
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -120,7 +118,8 @@
     iCore = CMusManagerServerCore::NewL( *this );
     iStopServerCalled = EFalse;
     iAvailabilityChangedLCalled = EFalse;
-    iSessionCount = 0;
+    iSessionCount = 0;    
+    TApaTask::iApaTaskCalledFunction = TApaTask::ENone;
     }
 
 
@@ -131,8 +130,7 @@
 void UT_CMusManagerServerCore::Teardown()
     {
     delete iCore;
-    PropertyHelper::Close();
-    Dll::FreeTls(); // Used by the RProcess and TFindProcess stubs 
+    PropertyHelper::Close(); 
     }
 
 
@@ -192,32 +190,17 @@
 //
 void UT_CMusManagerServerCore::UT_CMusManagerServerCore_InvitationReceivedLL()
     {
-    // 1. The cases with MuS engine
-    iCore->iPluginName = KMusEngineName;
-    
     TUid uid = { 0x10101010 }; // Not a valid UID in musmanager.h
     // since used UID is not in appropriate, this should leave
     EUNIT_ASSERT_SPECIFIC_LEAVE(
         iCore->InvitationReceivedL( uid ), KErrNotReady );
 
     uid.iUid = 0x1028238D; // ESipInviteNotDesired from musmanager.h
-    iCore->InvitationReceivedL( uid );
+    EUNIT_ASSERT_NO_LEAVE( iCore->InvitationReceivedL( uid ) );
 
     uid.iUid = 0x10282391; // ESipInviteDesired from musmanager.h
     EUNIT_ASSERT_SPECIFIC_LEAVE(
         iCore->InvitationReceivedL( uid ), KErrNotReady );
-
-    // 2. The cases with non-MuS engine
-    iCore->iPluginName = KAnotherEngineName;
-    
-    uid.iUid = 0x10101010; // Not a valid UID in musmanager.h
-    iCore->InvitationReceivedL( uid );
-
-    uid.iUid = 0x1028238D; // ESipInviteNotDesired from musmanager.h
-    iCore->InvitationReceivedL( uid );
-
-    uid.iUid = 0x10282391; // ESipInviteDesired from musmanager.h
-    iCore->InvitationReceivedL( uid );    
     }
 
 
@@ -228,22 +211,16 @@
 void UT_CMusManagerServerCore::UT_CMusManagerServerCore_OptionsReceivedLL()
     {
     TUid uid = { 0x10101010 };
-    iCore->iPluginName = KMusEngineName;
-    iCore->iPluginManager->iPluginStarted = EFalse;
     iCore->OptionsReceivedL( uid );
     EUNIT_ASSERT( iCore->iPluginManager->iPluginStarted );
-    
-    iCore->iPluginName = KAnotherEngineName;
-    iCore->iPluginManager->iPluginStarted = EFalse;
-    iCore->OptionsReceivedL( uid );
-    EUNIT_ASSERT ( !(iCore->iPluginManager->iPluginStarted) );
     }
 
 
 // ---------------------------------------------------------------------------
 // Asserts that tested method does not leave. In certain case it could leave
 // with KErrPermissionDenied, but with this this test, used capabilities
-// and used stubs, tested method shouldn't leave.
+// and used stubs, tested method shouldn't leave. Checks also that
+// TApaTask function TaskExists is called.
 // ---------------------------------------------------------------------------
 //
 void UT_CMusManagerServerCore::
@@ -264,6 +241,10 @@
     // Test for "if( !iApplicationManager->ApplicationRunning() &&
     // iPluginManager->ApplicationAllowed() ) branch ->
     // -----------------------------------------------------------------------
+	
+    // CMusApplicationManager::ApplicationRunning = EFalse
+    TApaTask::iApplicationExist = EFalse;
+
     // CMusAvailabilityPluginManager::ApplicationAllowed = ETrue
     abilityStub->iNameStub = MMusAvaObserver::EMusAvaNameRegistration;
     abilityStub->iStatusStub = MMusAvaObserver::EMusAvaStatusAvailable;
@@ -282,6 +263,7 @@
     MUS_EUNIT_ASSERT_NO_LEAVE(
         iCore->StartMultimediaSharingL( MultimediaSharing::EMusLiveVideo ) );
     EUNIT_ASSERT( PropertyHelper::GetCalledFunction() == RProperty::EDefine );
+    EUNIT_ASSERT( TApaTask::iApaTaskCalledFunction == TApaTask::EExists );
 
     // <- Test for "if( !iApplicationManager->ApplicationRunning() &&
     // iPluginManager->ApplicationAllowed() ) branch
@@ -297,8 +279,12 @@
 
 
     // CMusApplicationManager::ApplicationRunning = EFalse
+    TApaTask::iApplicationExist = EFalse;
     MUS_EUNIT_ASSERT_NO_LEAVE(
         iCore->StartMultimediaSharingL( MultimediaSharing::EMusLiveVideo ) );
+    EUNIT_ASSERT( TApaTask::iApaTaskCalledFunction == TApaTask::EExists );
+
+    // <- Test for else branch
     }
 
 
@@ -310,17 +296,15 @@
 void UT_CMusManagerServerCore::
     UT_CMusManagerServerCore_StopMultimediaSharingLL()
     {
-    // MuS not running
+    TApaTask::iApplicationExist = EFalse;
     iCore->StopMultimediaSharingL();
+    EUNIT_ASSERT( TApaTask::iApaTaskCalledFunction == TApaTask::EExists )
     
-    // MuS running
-    User::LeaveIfError( 
-        Dll::SetTls( reinterpret_cast< TAny* >( 1 ) ) ); 
-    // TLS is used by TFindProcess stub
+    TApaTask::iApplicationExist = ETrue;
     iCore->StopMultimediaSharingL();
     TInt availability = MultimediaSharing::EMultimediaSharingAvailable;
-    TUint key( NMusSessionApi::KStatus );
-    RProperty::Get( key, availability );
+    TUint key(NMusSessionApi::KStatus);
+    RProperty::Get( key,availability);
     EUNIT_ASSERT_EQUALS( PropertyHelper::GetCalledFunction(), RProperty::EDefine ) 
     EUNIT_ASSERT_EQUALS( availability, 
                          MultimediaSharing::EMultimediaSharingNotAvailable )
@@ -334,16 +318,7 @@
 //
 void UT_CMusManagerServerCore::UT_CMusManagerServerCore_EventNoSessionsL()
     {
-    iCore->iPluginName = KMusEngineName;
-    iCore->iPluginManager->iPluginStarted = ETrue;
     iCore->EventNoSessions();
-    EUNIT_ASSERT ( !(iCore->iPluginManager->iPluginStarted) );
-    EUNIT_ASSERT( iStopServerCalled );
-
-    iCore->iPluginName = KAnotherEngineName;
-    iCore->iPluginManager->iPluginStarted = ETrue;
-    iCore->EventNoSessions();
-    EUNIT_ASSERT ( iCore->iPluginManager->iPluginStarted );
     EUNIT_ASSERT( iStopServerCalled );
     }
 
@@ -374,15 +349,11 @@
 void UT_CMusManagerServerCore::
     UT_CMusManagerServerCore_AvailabilityChangedLL()
     {
-    iCore->iPluginName = KMusEngineName;
     MUS_EUNIT_ASSERT_NO_LEAVE( iCore->AvailabilityChangedL(
         (MultimediaSharing::TMusAvailabilityStatus) KErrNone ) );
+
     EUNIT_ASSERT( iCore->iAvailabilityMonitors.Count() == 0 );
 
-    iCore->iPluginName = KAnotherEngineName;
-    MUS_EUNIT_ASSERT_NO_LEAVE( iCore->AvailabilityChangedL(
-        (MultimediaSharing::TMusAvailabilityStatus) KErrNone ) );
-    EUNIT_ASSERT( iCore->iAvailabilityMonitors.Count() == 0 );
     }
 
 
@@ -399,15 +370,6 @@
     EUNIT_ASSERT( iCore->iAvailabilityMonitors.Count() == monitors );
     }
 
-void UT_CMusManagerServerCore::UT_CMusManagerServerCore_IsMusEnginePluginL()
-    {
-    iCore->iPluginName = KMusEngineName;
-    EUNIT_ASSERT( iCore->IsMusEnginePlugin() );
-    
-    iCore->iPluginName = KAnotherEngineName;
-    EUNIT_ASSERT( !(iCore->IsMusEnginePlugin()) );
-    }
-
 
 // ======== EUNIT TEST TABLE ========
 
@@ -502,11 +464,5 @@
     "FUNCTIONALITY",
     SetupL, UT_CMusManagerServerCore_AvailabilityChangedLL, Teardown)
 
-EUNIT_TEST(
-    "IsMusEnginePlugin - test ",
-    "CMusManagerServerCore",
-    "IsMusEnginePlugin",
-    "FUNCTIONALITY",
-    SetupL, UT_CMusManagerServerCore_IsMusEnginePluginL, Teardown)
 
 EUNIT_END_TEST_TABLE