--- a/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/src/ut_muscalleventmonitor.cpp	Thu Aug 19 09:51:39 2010 +0300
+++ b/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/src/ut_muscalleventmonitor.cpp	Tue Aug 31 15:12:07 2010 +0300
@@ -111,7 +111,7 @@
                      NMusSessionInformationApi::KMusCallEvent,
                      0 );
     
-    iCallEventMonitor = CMusCallEventMonitor::NewL( iCall, *this );
+    iCallEventMonitor = CMusCallEventMonitor::NewL( iCall, *this, *this );
     
     }
 
@@ -170,17 +170,13 @@
 
 	// Test : Local Transfered. Means no call.
     iCallEventMonitor->Cancel();
-    RProperty::Get( NMusSessionInformationApi::KCategoryUid,
-                    NMusSessionInformationApi::KMusCallEvent,
-                    val );
-    TInt callEnt = val;
     RTelHelper::SetCallEvent( RMobileCall::ELocalTransfer );    
     iCallEventMonitor->RunL();
     RProperty::Get( NMusSessionInformationApi::KCategoryUid,
                      NMusSessionInformationApi::KMusCallEvent,
                      val );
                      
-    EUNIT_ASSERT( callEnt==val );
+    EUNIT_ASSERT( val==NMusSessionInformationApi::ENoCall);
     
 	// Test : Remote is on hold
     iCallEventMonitor->Cancel();
@@ -216,16 +212,12 @@
     
 	// Test : Remote is on conference
     iCallEventMonitor->Cancel();
-    RProperty::Get( NMusSessionInformationApi::KCategoryUid,
-                    NMusSessionInformationApi::KMusCallEvent,
-                    val );
-    callEnt = val;
     RTelHelper::SetCallEvent( RMobileCall::ERemoteConferenceCreate );
     iCallEventMonitor->RunL();
     RProperty::Get( NMusSessionInformationApi::KCategoryUid,
                      NMusSessionInformationApi::KMusCallEvent,
                      val );
-    EUNIT_ASSERT( callEnt==val );
+    EUNIT_ASSERT( val==NMusSessionInformationApi::EConferenceCall);
 
 	// Test : Remote conference transfer
     iCallEventMonitor->Cancel();
@@ -234,7 +226,7 @@
     RProperty::Get( NMusSessionInformationApi::KCategoryUid,
                      NMusSessionInformationApi::KMusCallEvent,
                      val );
-    EUNIT_ASSERT( val==callEnt );
+    EUNIT_ASSERT( val==NMusSessionInformationApi::EConferenceCall);//Previous state.   
 
     // remote is connected state and local resume
     iCallEventMonitor->Cancel();
@@ -300,12 +292,18 @@
     {
     EUNIT_ASSERT( iCallEventMonitor );
     TInt error = KErrNotFound;
-    EUNIT_ASSERT_EQUALS(iCallEventMonitor->RunError(error), KErrNone);
-    EUNIT_ASSERT_EQUALS(iCallEventMonitor->RunError(KErrNone), KErrNone);
+    iCallEventMonitor->RunError(error);
     }
 
 
-   
+// -----------------------------------------------------------------------------
+//  MusCallStateChanged from the MusCallStateObserver 
+// -----------------------------------------------------------------------------
+//
+void UT_CMusCallEventMonitor::MusCallStateChanged()
+    {
+    //NOP:
+    }   
 
 
 //  TEST TABLE