diff -r 73a1feb507fb -r bc78a40cd63c mmsharing/mmshavailability/tsrc/ut_availability/src/UT_CMusAvaNetworkAvailability.cpp
--- a/mmsharing/mmshavailability/tsrc/ut_availability/src/UT_CMusAvaNetworkAvailability.cpp	Tue Aug 31 15:12:07 2010 +0300
+++ b/mmsharing/mmshavailability/tsrc/ut_availability/src/UT_CMusAvaNetworkAvailability.cpp	Wed Sep 01 12:31:01 2010 +0100
@@ -32,7 +32,7 @@
 #include "mussesseioninformationapi.h"
 
 _LIT( KTelNumber, "12345" );
-_LIT( KSipUri, "sip:uri@host" );
+_LIT( KAnotherTelNumber, "54321" );
 
 // CONSTRUCTION
 UT_CMusAvaNetworkAvailability* UT_CMusAvaNetworkAvailability::NewL()
@@ -86,6 +86,12 @@
                        NMusSessionInformationApi::KMusCallDirection,
                        RProperty::EInt,
                        0 );
+    
+	
+    RProperty::Define( NMusSessionInformationApi::KCategoryUid,
+                       NMusSessionInformationApi::KMUSPrivacy,
+                       RProperty::EInt,
+                       0 );
                        
     }
 
@@ -117,6 +123,10 @@
     User::LeaveIfError( RProperty::Set( NMusSessionInformationApi::KCategoryUid,
                     	NMusSessionInformationApi::KMusCallEvent,
                     	0 ));
+
+    User::LeaveIfError( RProperty::Set( NMusSessionInformationApi::KCategoryUid,
+                        NMusSessionInformationApi::KMUSPrivacy,
+                        0 ));
     
     iNetworkAvailability->DoExecuteL();    
     EUNIT_ASSERT_EQUALS( iNetworkAvailability->State(), 
@@ -128,50 +138,22 @@
                     	NMusSessionInformationApi::KMusCallEvent,
                     	1 ));
                     
-	User::LeaveIfError( RProperty::Set( NMusSessionInformationApi::KCategoryUid,
-                    	NMusSessionInformationApi::KMusTelNumber,
-                    	KTelNumber ));
-                    
-	User::LeaveIfError( RProperty::Set( NMusSessionInformationApi::KCategoryUid,
-                    NMusSessionInformationApi::KMusCallDirection,
-                    0 ));
+    User::LeaveIfError( RProperty::Set( NMusSessionInformationApi::KCategoryUid,
+                    NMusSessionInformationApi::KMusTelNumber,
+                    KTelNumber ));
+                
+    User::LeaveIfError( RProperty::Set( NMusSessionInformationApi::KCategoryUid,
+                NMusSessionInformationApi::KMusCallDirection,
+                0 ));
                                                                          
     iNetworkAvailability->DoExecuteL();
     EUNIT_ASSERT_EQUALS( iNetworkAvailability->State(), 
                          MMusAvaObserver::EMusAvaStatusAvailable );
     EUNIT_ASSERT_EQUALS( iSettings->TelNumber(), KTelNumber );
-    const MDesCArray& sipAddresses = iSettings->SipAddresses();
-    EUNIT_ASSERT_EQUALS( sipAddresses.MdcaCount(), 0 );
     EUNIT_ASSERT_EQUALS( iSettings->CallDirection(), 0 );
+    
     }
     
-void UT_CMusAvaNetworkAvailability::UT_CMusAvaNetworkAvailability_DoExecuteL_SipUriL()
-    {
-    // one call, SIP URI given
-    User::LeaveIfError( RProperty::Set( NMusSessionInformationApi::KCategoryUid,
-                        NMusSessionInformationApi::KMusCallEvent,
-                        1 ));
-                    
-    User::LeaveIfError( RProperty::Set( NMusSessionInformationApi::KCategoryUid,
-                        NMusSessionInformationApi::KMusTelNumber,
-                        KSipUri ));
-                    
-    User::LeaveIfError( RProperty::Set( NMusSessionInformationApi::KCategoryUid,
-                    NMusSessionInformationApi::KMusCallDirection,
-                    0 ));
-                                                                         
-    iNetworkAvailability->DoExecuteL();
-    EUNIT_ASSERT_EQUALS( iNetworkAvailability->State(), 
-                         MMusAvaObserver::EMusAvaStatusAvailable );
-    EUNIT_ASSERT_EQUALS( iSettings->TelNumber(), KNullDesC );
-
-    const MDesCArray& sipAddresses = iSettings->SipAddresses();
-    EUNIT_ASSERT_EQUALS( sipAddresses.MdcaCount(), 1 );
-    EUNIT_ASSERT_EQUALS( sipAddresses.MdcaPoint( 0 ), KSipUri );
-    
-    EUNIT_ASSERT_EQUALS( iSettings->CallDirection(), 0 );
-    }
-
 void UT_CMusAvaNetworkAvailability::UT_CMusAvaNetworkAvailability_StopL()
     {
     iNetworkAvailability->Stop();
@@ -190,20 +172,26 @@
     User::LeaveIfError( RProperty::Set( NMusSessionInformationApi::KCategoryUid,
                    		NMusSessionInformationApi::KMusCallDirection,
                     	0 ));
-                    	                                                     
-    iNetworkAvailability->CallConnectedL( KTelNumber, EFalse );
+
+    User::LeaveIfError( RProperty::Set( NMusSessionInformationApi::KCategoryUid,
+                        NMusSessionInformationApi::KMUSPrivacy,
+                        0 ));
+    
+    iNetworkAvailability->iConfcall = ETrue;
+    iNetworkAvailability->iSettings.SetOptionSentNumber( KTelNumber );
+    iNetworkAvailability->CallConnectedL( KTelNumber );
     EUNIT_ASSERT_EQUALS( iNetworkAvailability->State(), 
                          MMusAvaObserver::EMusAvaStatusAvailable );
-    EUNIT_ASSERT_EQUALS( iSettings->TelNumber(), KTelNumber );
+    
     
-
-    // Test SIP URI
-    iNetworkAvailability->CallConnectedL( KSipUri, ETrue );
-    // Tel number should not have been modified
-    EUNIT_ASSERT_EQUALS( iSettings->TelNumber(), KTelNumber );
-    const MDesCArray& sipAddresses = iSettings->SipAddresses();
-    EUNIT_ASSERT_EQUALS( sipAddresses.MdcaCount(), 1 );
-    EUNIT_ASSERT_EQUALS( sipAddresses.MdcaPoint( 0 ), KSipUri );
+    iNetworkAvailability->iSettings.SetOptionSentNumber( KAnotherTelNumber );
+    iNetworkAvailability->CallConnectedL( KTelNumber );   
+    EUNIT_ASSERT_EQUALS( iNetworkAvailability->State(), 
+                         MMusAvaObserver::EMusAvaStatusInProgress );
+    EUNIT_ASSERT( iNetworkAvailability->iSettings.OptionSentTelNumber().Length() == 0 );
+    
+    
+    EUNIT_ASSERT_EQUALS( iSettings->TelNumber(), KTelNumber );    
     }
     
 void UT_CMusAvaNetworkAvailability::UT_CMusAvaNetworkAvailability_ConferenceCallLL()
@@ -218,21 +206,17 @@
     User::LeaveIfError( RProperty::Set( NMusSessionInformationApi::KCategoryUid,
                    		NMusSessionInformationApi::KMusCallDirection,
                     	0 ));
+    User::LeaveIfError( RProperty::Set( NMusSessionInformationApi::KCategoryUid,
+                        NMusSessionInformationApi::KMUSPrivacy,
+                        0 ));
     
-    iNetworkAvailability->CallHoldL( KTelNumber, EFalse );
+    
+    iNetworkAvailability->CallHoldL( KTelNumber );
     EUNIT_ASSERT_EQUALS( iNetworkAvailability->State(), 
                          MMusAvaObserver::EMusAvaStatusCallOnHold );
-    EUNIT_ASSERT_EQUALS( iSettings->TelNumber(), KTelNumber );
+    EUNIT_ASSERT_EQUALS( iSettings->TelNumber(), KTelNumber );    
+    }
     
-    // Test SIP URI
-    iNetworkAvailability->CallConnectedL( KSipUri, ETrue );    
-    // Tel number should not have been modified
-    EUNIT_ASSERT_EQUALS( iSettings->TelNumber(), KTelNumber );
-    const MDesCArray& sipAddresses = iSettings->SipAddresses();
-    EUNIT_ASSERT_EQUALS( sipAddresses.MdcaCount(), 1 );
-    EUNIT_ASSERT_EQUALS( sipAddresses.MdcaPoint( 0 ), KSipUri );
-    }
-
 void UT_CMusAvaNetworkAvailability::UT_CMusAvaNetworkAvailability_NoActiveCallLL()
     {
     iNetworkAvailability->NoActiveCallL();
@@ -241,17 +225,6 @@
     EUNIT_ASSERT_EQUALS( iSettings->TelNumber(), KNullDesC );    
     }                
 
-void UT_CMusAvaNetworkAvailability::UT_CMusAvaNetworkAvailability_SetRemoteHostLL()
-    {
-    _LIT( KMusTestPhoneNum, "12341234" );
-    iNetworkAvailability->SetRemoteHostL( KMusTestPhoneNum(), EFalse );
-    EUNIT_ASSERT_EQUALS( iSettings->TelNumber(), KMusTestPhoneNum );
-    EUNIT_ASSERT_EQUALS( iSettings->ContactResolvingUri(), KNullDesC );
-    
-    _LIT( KMusTestSipUri, "sip:12341234@1.2.3.4" );
-    iNetworkAvailability->SetRemoteHostL( KMusTestSipUri(), ETrue );
-    EUNIT_ASSERT_EQUALS( iSettings->ContactResolvingUri(), KMusTestSipUri );
-    }                
 
 
 //  TEST TABLE
@@ -269,13 +242,6 @@
     SetupL, UT_CMusAvaNetworkAvailability_DoExecuteLL, Teardown)
 
 EUNIT_TEST(
-    "DoExecuteL - test SIP URI ",
-    "CMusAvaNetworkAvailability",
-    "DoExecuteL",
-    "FUNCTIONALITY",
-    SetupL, UT_CMusAvaNetworkAvailability_DoExecuteL_SipUriL, Teardown)
-
-EUNIT_TEST(
     "Stop - test ",
     "CMusAvaNetworkAvailability",
     "Stop",
@@ -316,13 +282,6 @@
     "NoActiveCallL",
     "FUNCTIONALITY",
     SetupL, UT_CMusAvaNetworkAvailability_NoActiveCallLL, Teardown )      
-
-EUNIT_TEST(
-    "SetRemoteHostL - test ",
-    "CMusAvaNetworkAvailability",
-    "SetRemoteHostL",
-    "FUNCTIONALITY",
-    SetupL, UT_CMusAvaNetworkAvailability_SetRemoteHostLL, Teardown )  
     
 
 EUNIT_END_TEST_TABLE