# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284490597 -10800 # Node ID 482d5cf4c4b4814efedfa601d2d97db514c9c9d2 # Parent 113b91e0a2ada772777d5ce8bd14436c8a830e7e Revision: 201033 Kit: 201035 diff -r 113b91e0a2ad -r 482d5cf4c4b4 imservices/instantmessagingcache/tsrc/group/bld.inf --- a/imservices/instantmessagingcache/tsrc/group/bld.inf Wed Sep 01 12:27:45 2010 +0100 +++ b/imservices/instantmessagingcache/tsrc/group/bld.inf Tue Sep 14 21:56:37 2010 +0300 @@ -22,11 +22,11 @@ // defaults to WINS MARM so you can ignore this if you just build these DEFAULT -PRJ_TESTEXPORTS +PRJ_EXPORTS // NOTE: If using ARS requirements all export operations should be done under this. // 'abld test export' -PRJ_EXPORTS +PRJ_TESTEXPORTS // Specify the source file followed by its destination here // copy will be used to copy the source file to its destination // If there's no destination then the source file will be copied diff -r 113b91e0a2ad -r 482d5cf4c4b4 imservices/instantmessagingcache/tsrc/src/imcache_testBlocks.cpp --- a/imservices/instantmessagingcache/tsrc/src/imcache_testBlocks.cpp Wed Sep 01 12:27:45 2010 +0100 +++ b/imservices/instantmessagingcache/tsrc/src/imcache_testBlocks.cpp Tue Sep 14 21:56:37 2010 +0300 @@ -273,6 +273,7 @@ { CIMCacheFactory* instance = CIMCacheFactory::InstanceL(); TInt error = KErrNotFound; + iMessageFetch = 0; MIMCacheUpdater* updater = instance->CreateUpdaterL(1, _L("testlm123@gmail.com") ,ETrue); // tow message appended hence counter will be two. updater->AppendReceiveMessageL( _L("testui123@gmail.com"),_L("hello this is test first message appended") ) ; @@ -280,10 +281,10 @@ updater->RegisterObserverL(*this); - if( !iWait.IsStarted() ) + /* if( !iWait.IsStarted() ) { iWait.Start(); - } + }*/ updater->StartNewConversationL( _L("testui123@gmail.com") ) ; @@ -415,11 +416,22 @@ TInt Cimcache_test::ConversationUnExistTestL(CStifItemParser& /*aItem*/) { CIMCacheFactory* instance = CIMCacheFactory::InstanceL(); - + MIMCacheUpdater* updater = instance->CreateUpdaterL(1, _L("testlm123@gmail.com"), ETrue ); + updater->RegisterObserverL(*this); + + updater->StartNewConversationL( _L("testui123@gmail.com") ) ; + + if( !iWait.IsStarted() ) + { + iWait.Start(); + } + + updater->CloseAllConversationL(); + MIMCacheAccessor* accessor = instance->CreateAccessorL(1, _L("testlm123@gmail.com") ); // not yest conversation open so must be EFalse here TBool ret = accessor->IsConversationExistL(_L("testui123@gmail.com") ); - + updater->UnRegisterObserver(*this); CIMCacheFactory::Release(); if(!ret) @@ -617,7 +629,7 @@ case EIMCacheNewMessage : { iMessageFetch++; - if( iWait.IsStarted() && iMessageFetch == 2 ) + if( iWait.IsStarted() /*&& iMessageFetch == 2 */) { iWait.AsyncStop(); } diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/bld.inf --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/bld.inf Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/bld.inf Tue Sep 14 21:56:37 2010 +0300 @@ -54,6 +54,8 @@ ../src/t_presenceall/t_presenceall.mmp // Export the .iby for module release tests -PRJ_EXPORTS +PRJ_TESTEXPORTS ximpfwmrt.iby /epoc32/rom/include/ximpfwmrt.iby - +#ifdef WINSCW_UDEB +GNUMAKEFILE test_mover.make +#endif diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/ximpfw_release_tests.pkg --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/ximpfw_release_tests.pkg Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/ximpfw_release_tests.pkg Tue Sep 14 21:56:37 2010 +0300 @@ -38,7 +38,7 @@ ;EUnit test dlls -;"\EPOC32\RELEASE\ARMV5\UREL\t_presenceall.dll" - "!:\sys\bin\t_presenceall.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presenceall.dll" - "!:\sys\bin\t_presenceall.dll" "\EPOC32\RELEASE\ARMV5\UREL\t_rootservices.dll" - "!:\sys\bin\t_rootservices.dll" "\EPOC32\RELEASE\ARMV5\UREL\t_sessionmng.dll" - "!:\sys\bin\t_sessionmng.dll" "\EPOC32\RELEASE\ARMV5\UREL\t_presencepublishing.dll" - "!:\sys\bin\t_presencepublishing.dll" diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/ximpfwmrt.iby --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/ximpfwmrt.iby Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/ximpfwmrt.iby Tue Sep 14 21:56:37 2010 +0300 @@ -38,7 +38,7 @@ file=ABI_DIR\BUILD_DIR\t_presenceauthorization.dll SHARED_LIB_DIR\t_presenceauthorization.dll file=ABI_DIR\BUILD_DIR\t_presenceblocking.dll SHARED_LIB_DIR\t_presenceblocking.dll file=ABI_DIR\BUILD_DIR\t_utils.dll SHARED_LIB_DIR\t_utils.dll -file=ABI_DIR\BUILD_DIR\t_presencecache.dll SHARED_LIB_DIR\t_presencecache.dll +file=ABI_DIR\BUILD_DIR\t_presencegrantrequestmngt.dll SHARED_LIB_DIR\t_presencegrantrequestmngt.dll //ProcessMaster file=ABI_DIR\BUILD_DIR\prfwtestprocessmaster.exe SHARED_LIB_DIR\prfwtestprocessmaster.exe diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/Nokia_RnDCert_02.der Binary file imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/Nokia_RnDCert_02.der has changed diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/Nokia_RnDCert_02.key --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/Nokia_RnDCert_02.key Tue Sep 14 21:56:37 2010 +0300 @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXQIBAAKBgQC/TDP7KKIaf5+uW4OD2iVZuUMC2a+SeQTjf6srlKcOm+CpPNXn +uLNm/8fdEnyOIuRXPRKmqhs1n0JkxEGHynELWMTuKXbQx9SRAGUXzyneGn+IJNnO +vOKHWgKCouX2hfI8rtkdqJpqmO460gGsMgw+lsbeyWyW9lnfLxq+ZC7sqQIDAQAB +AoGBALmUWZE8GBaQ3P4u9WUCSd3DJkkrmXIFSULSZeH/chlwCwDjbbhArHothVzo +REE3hEFFlERvHbplZ+mNouzy7boduvgUzbksGrbGMLJ2qO1GzWWVwV+GzOWKd3ss +/98Gwoy5R8pjnkqUE2wP1iJFw0FjvUTKcYv/z6t3LLJ0CsoBAkEA+c7ixvsviQ3J +s0INytCKU2bf8fqFQJi1VI82ukxNsujGTQ9upVSjuvqPvWyDvvTdrUBHqO+3qPut +sEh01Q8aiQJBAMQKDJPVRu4ud3mwUfEavzL5EjqwG1k9VCNGYsT4FwtrHcxu1oP/ +pk6M3rIZukqomoEEnHWPMwhrK3fhBqi0OSECQQDr40VXege4FnH5OI2Hj4afHMyp +VdQQXGMWFyopnzXblFz0lXb43cTCIiorR9XcMqNFHybLypkWE5o+lRzlt55pAkBQ +P/zeF5Sts//cpL0mgdh7OVKpC6ZmZaCnwAx2rUhhuDu+kDDoYCLoTOps5fNI1LRK +1GRoC3LMo3Jr5IYhUYWBAkBpCpN6k4JU/mszq98EojHerQNxk8sPqvQKUzTutohT +1gLX9yepGayB/TtT2EEJDkWOlnTy/dvN6W3vzbJYz97x +-----END RSA PRIVATE KEY----- diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/ximpfw_release_tests.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/ximpfw_release_tests.pkg Tue Sep 14 21:56:37 2010 +0300 @@ -0,0 +1,56 @@ +; +; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +; All rights reserved. +; This component and the accompanying materials are made available +; under the terms of "Eclipse Public License v1.0" +; which accompanies this distribution, and is available +; at the URL "http://www.eclipse.org/legal/epl-v10.html". +; +; Initial Contributors: +; Nokia Corporation - initial contribution. +; +; Contributors: +; +; Description: XIMP Framewor Test code Package File +; +;Header +#{"XIMPFW ReleaseTests"}, (0x10282DE4), 1, 0, 0 + +;Language +&EN + +;Localised VendorID +%{"Nokia"} + +;VendorID +:"Nokia" + + +;Supports Series 60 v 0.9 +(0x101F6F88), 0, 0, 0, +{"Series60ProductID"} + + +;Needed test protocols and test helpers +"\EPOC32\RELEASE\ARMV5\UREL\pr_prfwtestprotocol.dll" - "!:\sys\bin\pr_prfwtestprotocol.dll" +"\EPOC32\DATA\Z\Resource\Plugins\pr_prfwtestprotocol.RSC"-"!:\resource\plugins\pr_prfwtestprotocol.rsc" +"\EPOC32\RELEASE\ARMV5\UREL\prfwtestcaseutils.dll" - "!:\sys\bin\prfwtestcaseutils.dll" + + +;EUnit test dlls +;"\EPOC32\RELEASE\ARMV5\UREL\t_presenceall.dll" - "!:\sys\bin\t_presenceall.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_rootservices.dll" - "!:\sys\bin\t_rootservices.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_sessionmng.dll" - "!:\sys\bin\t_sessionmng.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presencepublishing.dll" - "!:\sys\bin\t_presencepublishing.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presencewatching.dll" - "!:\sys\bin\t_presencewatching.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presencegrouplistmngt.dll" - "!:\sys\bin\t_presencegrouplistmngt.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presencegroupmembermngt.dll" - "!:\sys\bin\t_presencegroupmembermngt.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presencewatcherlistmngt.dll" - "!:\sys\bin\t_presencewatcherlistmngt.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presencegrantrequestmngt.dll" - "!:\sys\bin\t_presencegrantrequestmngt.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presenceauthorization.dll" - "!:\sys\bin\t_presenceauthorization.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presenceblocking.dll" - "!:\sys\bin\t_presenceblocking.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_utils.dll" - "!:\sys\bin\t_utils.dll" + +;ProcessMaster +"\EPOC32\RELEASE\ARMV5\UREL\prfwtestprocessmaster.exe" - "!:\sys\bin\prfwtestprocessmaster.exe" + diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/ximpfw_release_tests.sis Binary file imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/ximpfw_release_tests.sis has changed diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/ximpfw_release_tests.sisx Binary file imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/ximpfw_release_tests.sisx has changed diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.cpp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.cpp Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,11 @@ #include "eunittools.h" -#include + +#include +#include + + #include #include diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.h Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.h Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,12 @@ #ifndef T_PRESENCEALL_H #define T_PRESENCEALL_H -#include + +// EXTERNAL INCLUDES +#include +#include + + #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.mmp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.mmp Tue Sep 14 21:56:37 2010 +0300 @@ -18,8 +18,12 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_presenceall.dll -CAPABILITY ALL -TCB +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS + SOURCEPATH . SOURCE t_presenceall.cpp @@ -33,6 +37,17 @@ USERINCLUDE ../../../../../ximpfw/presence/srcpresencedatamodel/presenceinfo USERINCLUDE ../../../../../ximpfw/core/srcutils +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif LIBRARY ecom.lib LIBRARY bafl.lib LIBRARY ximpdatamodel.lib @@ -40,6 +55,8 @@ LIBRARY estor.lib LIBRARY ximputils.lib LIBRARY eunit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,10 @@ #include "eunittools.h" -#include + +#include +#include + #include #include diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.h Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.h Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,11 @@ #ifndef T_PRESENCEAUTHORIZATION_H #define T_PRESENCEAUTHORIZATION_H -#include + +// EXTERNAL INCLUDES +#include +#include + #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp Tue Sep 14 21:56:37 2010 +0300 @@ -18,9 +18,13 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_presenceauthorization.dll -CAPABILITY ALL -TCB +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS + SOURCEPATH . SOURCE t_presenceauthorization.cpp @@ -35,6 +39,17 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils // TODO remove unnecessary +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -51,7 +66,8 @@ LIBRARY estor.lib LIBRARY ximputils.lib LIBRARY eunit.lib - +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.cpp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.cpp Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,10 @@ #include "eunittools.h" -#include +//#include +#include +#include + #include #include diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.h Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.h Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,12 @@ #ifndef T_PRESENCEBLOCKING_H #define T_PRESENCEBLOCKING_H -#include + +//#include +// EXTERNAL INCLUDES +#include +#include + #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.mmp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.mmp Tue Sep 14 21:56:37 2010 +0300 @@ -18,8 +18,12 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_presenceblocking.dll -CAPABILITY ALL -TCB -DRM +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS + SOURCEPATH . SOURCE t_presenceblocking.cpp @@ -34,6 +38,17 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils // TODO remove unnecessary +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -50,6 +65,8 @@ LIBRARY ximputils.lib LIBRARY estor.lib LIBRARY eunit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,9 @@ #include "eunittools.h" -#include +#include +#include + #include #include diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,11 @@ #ifndef T_PRESENCEGRANTREQUESTMANAGEMENT_H #define T_PRESENCEGRANTREQUESTMANAGEMENT_H -#include + +// EXTERNAL INCLUDES +#include +#include + #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp Tue Sep 14 21:56:37 2010 +0300 @@ -18,8 +18,12 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_presencegrantrequestmngt.dll -CAPABILITY ALL -TCB +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS + SOURCEPATH . SOURCE t_presencegrantrequestmngt.cpp @@ -34,6 +38,17 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils // TODO remove unnecessary +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -50,6 +65,8 @@ LIBRARY ximputils.lib LIBRARY estor.lib LIBRARY EUnit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,11 @@ #include "eunittools.h" -#include + + +#include +#include + #include #include diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,11 @@ #ifndef T_PRESENCEGROUPLISTMANAGEMENT_H #define T_PRESENCEGROUPLISTMANAGEMENT_H -#include + +// EXTERNAL INCLUDES +#include +#include + #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp Tue Sep 14 21:56:37 2010 +0300 @@ -18,8 +18,12 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_presencegrouplistmngt.dll -CAPABILITY ALL -TCB +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS + SOURCEPATH . SOURCE t_presencegrouplistmngt.cpp @@ -33,6 +37,18 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils // TODO remove unnecessary +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif + SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -50,6 +66,8 @@ LIBRARY ximputils.lib LIBRARY estor.lib LIBRARY EUnit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,10 @@ #include "eunittools.h" -#include + +#include +#include + #include #include #include diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,12 @@ #ifndef T_PRESENCEGROUPMEMBERMANAGEMENT_H #define T_PRESENCEGROUPMEMBERMANAGEMENT_H -#include + + +// EXTERNAL INCLUDES +#include +#include + #include #include #include "prfwteststatuseventlistener.h" diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp Tue Sep 14 21:56:37 2010 +0300 @@ -18,8 +18,13 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include + TARGET t_presencegroupmembermngt.dll -CAPABILITY ALL -TCB +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS + SOURCEPATH . SOURCE t_presencegroupmembermngt.cpp @@ -34,6 +39,18 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils // TODO remove unnecessary +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif + SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -50,6 +67,8 @@ LIBRARY ximputils.lib LIBRARY estor.lib LIBRARY EUnit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.cpp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.cpp Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,9 @@ #include "eunittools.h" -#include +#include +#include + #include #include diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.h Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.h Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,11 @@ #ifndef T_PRESENCEPUBLISHING_H #define T_PRESENCEPUBLISHING_H -#include + +// EXTERNAL INCLUDES +#include +#include + #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.mmp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.mmp Tue Sep 14 21:56:37 2010 +0300 @@ -18,8 +18,13 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include + TARGET t_presencepublishing.dll -CAPABILITY ALL -TCB +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS + SOURCEPATH . SOURCE t_presencepublishing.cpp @@ -34,6 +39,17 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils // TODO remove unnecessary +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -47,7 +63,11 @@ LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib +LIBRARY estor.lib +LIBRARY ximputils.lib LIBRARY EUnit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,10 @@ #include "eunittools.h" -#include +#include +#include + + #include #include diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,11 @@ #ifndef T_PRESENCEWATCHERLISTMANAGEMENT_H #define T_PRESENCEWATCHERLISTMANAGEMENT_H -#include + +// EXTERNAL INCLUDES +#include +#include + #include #include #include "presencetypehelpers.h" diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp Tue Sep 14 21:56:37 2010 +0300 @@ -18,8 +18,12 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_presencewatcherlistmngt.dll -CAPABILITY ALL -TCB +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS + SOURCEPATH . SOURCE t_presencewatcherlistmngt.cpp @@ -33,6 +37,17 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils // TODO remove unnecessary +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -46,9 +61,12 @@ LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib +LIBRARY euser.lib LIBRARY ximputils.lib +LIBRARY eunit.lib +LIBRARY eunitutil.lib LIBRARY estor.lib -LIBRARY EUnit.lib + // end of file diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.cpp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.cpp Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,9 @@ #include "eunittools.h" -#include + +#include +#include #include #include diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.h Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.h Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,10 @@ #ifndef T_PRESENCEWATCHING_H #define T_PRESENCEWATCHING_H -#include + +// EXTERNAL INCLUDES +#include +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.mmp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.mmp Tue Sep 14 21:56:37 2010 +0300 @@ -18,8 +18,11 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_presencewatching.dll -CAPABILITY ALL -TCB -DRM +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presencewatching.cpp @@ -36,6 +39,17 @@ USERINCLUDE ../../tsrcprotocols // TODO remove unnecessary +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -53,6 +67,8 @@ LIBRARY presencedatamodel.lib LIBRARY ximputils.lib LIBRARY EUnit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.cpp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.cpp Tue Sep 14 21:56:37 2010 +0300 @@ -18,10 +18,14 @@ #include "t_rootservices.h" #include "eunittools.h" -#include + #include #include + +#include +#include + //XIMP headers #include #include diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.h Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.h Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,10 @@ #ifndef T_ROOTSERVICES_H__ #define T_ROOTSERVICES_H__ -#include + +// EXTERNAL INCLUDES +#include +#include #include class MXIMPProtocolInfo; diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.mmp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.mmp Tue Sep 14 21:56:37 2010 +0300 @@ -18,8 +18,11 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_rootservices.dll -CAPABILITY ALL -TCB +CAPABILITY EUNIT_CAPS + SOURCEPATH . SOURCE t_rootservices.cpp @@ -34,10 +37,26 @@ USERINCLUDE ../../tsrcprotocols +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif LIBRARY ecom.lib LIBRARY bafl.lib +LIBRARY ximpdatamodel.lib +LIBRARY presencedatamodel.lib +LIBRARY estor.lib +LIBRARY ximputils.lib LIBRARY EUnit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.cpp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.cpp Tue Sep 14 21:56:37 2010 +0300 @@ -15,7 +15,7 @@ * */ -#include + #include #include #include @@ -43,6 +43,8 @@ +#include +#include diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.h Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.h Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,10 @@ #ifndef T_SESSIONMNG_H__ #define T_SESSIONMNG_H__ -#include + +// EXTERNAL INCLUDES +#include +#include #include #include "prfwteststatuseventlistener.h" diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.mmp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.mmp Tue Sep 14 21:56:37 2010 +0300 @@ -18,8 +18,11 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_sessionmng.dll -CAPABILITY ALL -TCB +CAPABILITY EUNIT_CAPS + SOURCEPATH . SOURCE t_sessionmng.cpp @@ -33,12 +36,26 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils USERINCLUDE ../../tsrcprotocols +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif LIBRARY ecom.lib LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib +LIBRARY estor.lib +LIBRARY ximputils.lib LIBRARY EUnit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.cpp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.cpp Tue Sep 14 21:56:37 2010 +0300 @@ -16,16 +16,21 @@ */ -#include + #include #include #include #include #include +#include "eunittools.h" + + +#include +#include #include "t_utils.h" -#include "eunittools.h" + #include #include diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.h Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.h Tue Sep 14 21:56:37 2010 +0300 @@ -18,7 +18,10 @@ #ifndef T_UTILS_H__ #define T_UTILS_H__ -#include + +// EXTERNAL INCLUDES +#include +#include #include #include "prfwteststatuseventlistener.h" diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.mmp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.mmp Tue Sep 14 21:56:37 2010 +0300 @@ -16,13 +16,17 @@ */ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" +#include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_utils.dll -CAPABILITY ALL -TCB +CAPABILITY EUNIT_CAPS + SOURCEPATH . SOURCE t_utils.cpp -#include "../../tsrcutils/processmaster/pm.h" + USERINCLUDE ../../../../../ximpfw/core/srcdatamodel USERINCLUDE ../../../../../ximpfw/presence/srcpresencedatamodel @@ -34,6 +38,17 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils // TODO remove unnecessary +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -47,8 +62,12 @@ LIBRARY ecom.lib LIBRARY bafl.lib LIBRARY ximpdatamodel.lib +LIBRARY presencedatamodel.lib +LIBRARY estor.lib LIBRARY ximputils.lib LIBRARY EUnit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp Tue Sep 14 21:56:37 2010 +0300 @@ -17,12 +17,14 @@ #include #include "../prfwtestprotocols_resource.hrh" +#include TARGET pr_prfwtestprotocol.dll TARGETTYPE PLUGIN UID XIMP_DLL_UID_ECOM_PLUGIN PRFW_DLL_UID_PR_PRFWTESTPROTOCOL VENDORID VID_DEFAULT -CAPABILITY ALL -TCB -DRM +//CAPABILITY ALL -TCB +CAPABILITY EUNIT_CAPS //ECOM RESOURCE @@ -58,7 +60,17 @@ SYSTEMINCLUDE ../../../../../ximpfw/inc/presence/presenceprotocolplugin SYSTEMINCLUDE ../../../../../ximpfw/inc/presence/presenceprotocolpluginhost +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif MW_LAYER_SYSTEMINCLUDE SYSTEMINCLUDE /epoc32/include/ecom diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/eunitcommon/eunittools.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/eunitcommon/eunittools.h Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/eunitcommon/eunittools.h Tue Sep 14 21:56:37 2010 +0300 @@ -19,11 +19,16 @@ #define EUNITTOOLS_H #include -#include -#include -#include -#include -//#include "cglobalwaitingnote.h" + +#include +#include + + +#include +#include + + +#include "cglobalwaitingnote.h" @@ -145,7 +150,7 @@ msg.Append( _L("Entering to test case. Test process:") ); msg.Append( processImage ); - // CGlobalWaitingNote::ShowMsgL( msg, 15000000, 15 ); //15 seconds, 1 second steps + CGlobalWaitingNote::ShowMsgL( msg, 15000000, 15 ); //15 seconds, 1 second steps EUNIT_ENABLE_ANY_DECORATOR; } diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp Tue Sep 14 21:56:37 2010 +0300 @@ -17,17 +17,28 @@ // To get the MW_LAYER_SYSTEMINCLUDE-definition #include - +#include TARGET prfwtestprocessmaster.exe TARGETTYPE exe UID 0x0 0x10282DDE VENDORID VID_DEFAULT -CAPABILITY CAP_SERVER ProtServ PowerMgmt AllFiles ReadDeviceData +CAPABILITY CAP_SERVER ProtServ PowerMgmt AllFiles ReadDeviceData EUNIT_CAPS TARGETPATH /system/libs SOURCEPATH . SOURCE prfwtestprocessmaster.cpp +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif MW_LAYER_SYSTEMINCLUDE USERINCLUDE ../testcaseutils diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp Tue Sep 14 21:56:37 2010 +0300 @@ -15,14 +15,18 @@ * */ -#include -#include "prfwtestdlluids.hrh" +#include +#include + +#include "prfwtestdlluids.hrh" TARGET prfwtestcaseutils.dll TARGETTYPE dll UID PRFWTEST_DLL_UID_STATIC_INTERFACE PRFWTEST_DLL_UID_COMMON -CAPABILITY ALL -TCB +//CAPABILITY ALL -TCB -DRM +CAPABILITY EUNIT_CAPS + VENDORID VID_DEFAULT @@ -60,6 +64,17 @@ // TODO remove unnecessary +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -69,7 +84,7 @@ SYSTEMINCLUDE ../../../../../ximpfw/inc/presence/presenceprotocolplugin SYSTEMINCLUDE ../../../../../ximpfw/inc/presence/presenceprotocolpluginhost -SYSTEMINCLUDE /epoc32/include/digia/eunit +SYSTEMINCLUDE /epoc32/include/platform/digia/eunit MW_LAYER_SYSTEMINCLUDE @@ -84,6 +99,8 @@ LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib LIBRARY ximputils.lib +LIBRARY aknnotify.lib +LIBRARY eiksrv.lib EXPORTUNFROZEN diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp Tue Sep 14 21:56:37 2010 +0300 @@ -65,13 +65,13 @@ { // check if we've already defined the keys. if we redefine and set // defaults, the test logic breaks. - TInt pubSubDefined = GetValueFor( EXIMPTestMetaPubSubDefined ); + /*TInt pubSubDefined = GetValueFor( EXIMPTestMetaPubSubDefined ); if ( pubSubDefined ) { // all done return; } - +*/ TInt r = 0; // special behavioral keys diff -r 113b91e0a2ad -r 482d5cf4c4b4 imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h Wed Sep 01 12:27:45 2010 +0100 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h Tue Sep 14 21:56:37 2010 +0300 @@ -21,7 +21,9 @@ // INCLUDES #include -#include +//#include +#include +#include #include "prfwtestprocessmaster.h" #include "userafter.h" #include "prfwtestfiletool.h" diff -r 113b91e0a2ad -r 482d5cf4c4b4 ximpfw/tsrc/group/bld.inf --- a/ximpfw/tsrc/group/bld.inf Wed Sep 01 12:27:45 2010 +0100 +++ b/ximpfw/tsrc/group/bld.inf Tue Sep 14 21:56:37 2010 +0300 @@ -58,3 +58,6 @@ PRJ_TESTEXPORTS ximpfwmrt.iby /epoc32/rom/include/ximpfwmrt.iby +#ifdef WINSCW_UDEB +GNUMAKEFILE test_mover.make +#endif diff -r 113b91e0a2ad -r 482d5cf4c4b4 ximpfw/tsrc/group/test_mover.make --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ximpfw/tsrc/group/test_mover.make Tue Sep 14 21:56:37 2010 +0300 @@ -0,0 +1,20 @@ +FINAL : + echo Copying test DLL to z\sys\bin + copy %epocroot%epoc32\release\winscw\udeb\pr_prfwtestprotocol.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y + copy %epocroot%epoc32\release\winscw\udeb\prfwtestcaseutils.lib %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y + copy %epocroot%epoc32\release\winscw\udeb\prfwtestcaseutils.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y + copy %epocroot%epoc32\release\winscw\udeb\t_presenceall.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y + copy %epocroot%epoc32\release\winscw\udeb\t_utils.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y + copy %epocroot%epoc32\release\winscw\udeb\t_presenceauthorization.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y + copy %epocroot%epoc32\release\winscw\udeb\t_presencegrantrequestmngt.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y + copy %epocroot%epoc32\release\winscw\udeb\t_presencewatcherlistmngt.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y + copy %epocroot%epoc32\release\winscw\udeb\t_presencegroupmembermngt.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y + copy %epocroot%epoc32\release\winscw\udeb\t_presencegrouplistmngt.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y + copy %epocroot%epoc32\release\winscw\udeb\t_presencewatching.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y + copy %epocroot%epoc32\release\winscw\udeb\t_presencepublishing.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y + copy %epocroot%epoc32\release\winscw\udeb\t_sessionmng.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y + copy %epocroot%epoc32\release\winscw\udeb\t_rootservices.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y + copy %epocroot%epoc32\release\winscw\udeb\t_presenceblocking.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y + copy %epocroot%epoc32\release\winscw\udeb\prfwtestprocessmaster.exe %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y + +MAKMAKE FREEZE LIB CLEANLIB RESOURCE RELEASABLES CLEAN BLD SAVESPACE : \ No newline at end of file diff -r 113b91e0a2ad -r 482d5cf4c4b4 ximpfw/tsrc/group/ximpfwmrt.iby --- a/ximpfw/tsrc/group/ximpfwmrt.iby Wed Sep 01 12:27:45 2010 +0100 +++ b/ximpfw/tsrc/group/ximpfwmrt.iby Tue Sep 14 21:56:37 2010 +0300 @@ -38,7 +38,7 @@ file=ABI_DIR\BUILD_DIR\t_presenceauthorization.dll SHARED_LIB_DIR\t_presenceauthorization.dll file=ABI_DIR\BUILD_DIR\t_presenceblocking.dll SHARED_LIB_DIR\t_presenceblocking.dll file=ABI_DIR\BUILD_DIR\t_utils.dll SHARED_LIB_DIR\t_utils.dll -file=ABI_DIR\BUILD_DIR\t_presencecache.dll SHARED_LIB_DIR\t_presencecache.dll +file=ABI_DIR\BUILD_DIR\t_presencegrantrequestmngt.dll SHARED_LIB_DIR\t_presencegrantrequestmngt.dll //ProcessMaster file=ABI_DIR\BUILD_DIR\prfwtestprocessmaster.exe SHARED_LIB_DIR\prfwtestprocessmaster.exe diff -r 113b91e0a2ad -r 482d5cf4c4b4 ximpfw/tsrc/sis/ximpfw_release_tests.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ximpfw/tsrc/sis/ximpfw_release_tests.pkg Tue Sep 14 21:56:37 2010 +0300 @@ -0,0 +1,56 @@ +; +; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +; All rights reserved. +; This component and the accompanying materials are made available +; under the terms of "Eclipse Public License v1.0" +; which accompanies this distribution, and is available +; at the URL "http://www.eclipse.org/legal/epl-v10.html". +; +; Initial Contributors: +; Nokia Corporation - initial contribution. +; +; Contributors: +; +; Description: XIMP Framewor Test code Package File +; +;Header +#{"XIMPFW ReleaseTests"}, (0x10282DE4), 1, 0, 0 + +;Language +&EN + +;Localised VendorID +%{"Nokia"} + +;VendorID +:"Nokia" + + +;Supports Series 60 v 0.9 +(0x101F6F88), 0, 0, 0, +{"Series60ProductID"} + + +;Needed test protocols and test helpers +"\EPOC32\RELEASE\ARMV5\UREL\pr_prfwtestprotocol.dll" - "!:\sys\bin\pr_prfwtestprotocol.dll" +"\EPOC32\DATA\Z\Resource\Plugins\pr_prfwtestprotocol.RSC"-"!:\resource\plugins\pr_prfwtestprotocol.rsc" +"\EPOC32\RELEASE\ARMV5\UREL\prfwtestcaseutils.dll" - "!:\sys\bin\prfwtestcaseutils.dll" + + +;EUnit test dlls +"\EPOC32\RELEASE\ARMV5\UREL\t_presenceall.dll" - "!:\sys\bin\t_presenceall.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_rootservices.dll" - "!:\sys\bin\t_rootservices.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_sessionmng.dll" - "!:\sys\bin\t_sessionmng.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presencepublishing.dll" - "!:\sys\bin\t_presencepublishing.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presencewatching.dll" - "!:\sys\bin\t_presencewatching.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presencegrouplistmngt.dll" - "!:\sys\bin\t_presencegrouplistmngt.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presencegroupmembermngt.dll" - "!:\sys\bin\t_presencegroupmembermngt.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presencewatcherlistmngt.dll" - "!:\sys\bin\t_presencewatcherlistmngt.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presencegrantrequestmngt.dll" - "!:\sys\bin\t_presencegrantrequestmngt.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presenceauthorization.dll" - "!:\sys\bin\t_presenceauthorization.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_presenceblocking.dll" - "!:\sys\bin\t_presenceblocking.dll" +"\EPOC32\RELEASE\ARMV5\UREL\t_utils.dll" - "!:\sys\bin\t_utils.dll" + +;ProcessMaster +"\EPOC32\RELEASE\ARMV5\UREL\prfwtestprocessmaster.exe" - "!:\sys\bin\prfwtestprocessmaster.exe" +