1.1 --- a/epoc32/include/mw/sipdialog.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mw/sipdialog.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -2,9 +2,9 @@
     1.4  * Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  * All rights reserved.
     1.6  * This component and the accompanying materials are made available
     1.7 -* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 +* under the terms of "Eclipse Public License v1.0"
     1.9  * which accompanies this distribution, and is available
    1.10 -* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +* at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  *
    1.13  * Initial Contributors:
    1.14  * Nokia Corporation - initial contribution.
    1.15 @@ -28,7 +28,6 @@
    1.16  // INCLUDES
    1.17  #include <e32base.h>
    1.18  #include <stringpool.h>
    1.19 -#include "_sipcodecdefs.h"
    1.20  
    1.21  // FORWARD DECLARATIONS
    1.22  class CSIPConnection;
    1.23 @@ -240,13 +239,14 @@
    1.24  		CSIPDialogImplementation* iImplementation;
    1.25  
    1.26  private: // For testing purposes
    1.27 +#ifdef CPPUNIT_TEST
    1.28 +	    friend class CSIP_Test;
    1.29 +        friend class CSIPInviteDialogAssoc_Test;
    1.30 +        friend class CSIPSubscribeDialogAssoc_Test;
    1.31 +        friend class CSIPReferDialogAssoc_Test;
    1.32 +#endif
    1.33 +	void __DbgTestInvariant() const;
    1.34  
    1.35 -	    UNIT_TEST(CSIP_Test)
    1.36 -        UNIT_TEST(CSIPInviteDialogAssoc_Test)
    1.37 -        UNIT_TEST(CSIPSubscribeDialogAssoc_Test)
    1.38 -        UNIT_TEST(CSIPReferDialogAssoc_Test)
    1.39 -
    1.40 -        __DECLARE_TEST;
    1.41  	};
    1.42  
    1.43  #endif