--- a/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/src/ut_muscallstatusmonitor.cpp	Tue Aug 31 15:12:07 2010 +0300
+++ b/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/src/ut_muscallstatusmonitor.cpp	Wed Sep 01 12:31:01 2010 +0100
@@ -111,7 +111,7 @@
                      NMusSessionInformationApi::KMusCallEvent,
                      NMusSessionInformationApi::ENoCall );
     
-    iCallStatusMonitor = CMusCallStatusMonitor::NewL( iCall, *this, *this ); 
+    iCallStatusMonitor = CMusCallStatusMonitor::NewL( iCall, *this ); 
     }
 
 
@@ -173,34 +173,40 @@
         callEvent  )
     
     // RMobileCall::EStatusDisconnecting
+    User::LeaveIfError(
+        RProperty::Get( NMusSessionInformationApi::KCategoryUid,
+                        NMusSessionInformationApi::KMusCallEvent,
+                        callEvent ) );
+    TInt callEnt = callEvent;
     iCallStatusMonitor->iCallStatus = RMobileCall::EStatusDisconnecting;
     iCallStatusMonitor->CheckStateL();
     User::LeaveIfError(
         RProperty::Get( NMusSessionInformationApi::KCategoryUid,
                         NMusSessionInformationApi::KMusCallEvent,
                         callEvent ) );  
-    EUNIT_ASSERT_EQUALS( 
-        static_cast< TInt >( NMusSessionInformationApi::ENoCall ),
-        callEvent )
+    EUNIT_ASSERT( callEnt==callEvent );
     EUNIT_ASSERT( iCallStatusMonitor == NULL )
     
     // RMobileCall::EStatusDisconnectingWithInband
     // iCallStatusMonitor was deleted by the previous call
-    iCallStatusMonitor = CMusCallStatusMonitor::NewL( iCall, *this, *this );
+    iCallStatusMonitor = CMusCallStatusMonitor::NewL( iCall, *this );
+    User::LeaveIfError(
+        RProperty::Get( NMusSessionInformationApi::KCategoryUid,
+                        NMusSessionInformationApi::KMusCallEvent,
+                        callEvent ) );
+    callEnt = callEvent;
     iCallStatusMonitor->iCallStatus = RMobileCall::EStatusDisconnectingWithInband;
     iCallStatusMonitor->CheckStateL();
     User::LeaveIfError(
         RProperty::Get( NMusSessionInformationApi::KCategoryUid,
                         NMusSessionInformationApi::KMusCallEvent,
                         callEvent ) );    
-    EUNIT_ASSERT_EQUALS( 
-        static_cast< TInt >( NMusSessionInformationApi::ENoCall ),
-        callEvent )
+    EUNIT_ASSERT( callEnt == callEvent );
     EUNIT_ASSERT( iCallStatusMonitor == NULL )
     
     // RMobileCall::EStatusHold
     // iCallStatusMonitor was deleted by the previous call
-    iCallStatusMonitor = CMusCallStatusMonitor::NewL( iCall, *this, *this ); 
+    iCallStatusMonitor = CMusCallStatusMonitor::NewL( iCall, *this ); 
     iCallStatusMonitor->iCallStatus = RMobileCall::EStatusHold;
     iCallStatusMonitor->CheckStateL();
     User::LeaveIfError(
@@ -294,14 +300,7 @@
     }
 
 
-// -----------------------------------------------------------------------------
-//  MusCallStateChanged from the MusCallStateObserver 
-// -----------------------------------------------------------------------------
-//
-void UT_CMusCallStatusMonitor::MusCallStateChanged()
-    {
-    // NOP
-    }   
+   
 
 
 //  TEST TABLE