summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Sinitsyn <Ilya.Sinitsyn@nokia.com>2011-05-26 13:24:35 +0300
committerIlya Sinitsyn <Ilya.Sinitsyn@nokia.com>2011-05-26 13:24:35 +0300
commitf4b298d21cb813f9e05314a75c811e9a312e0378 (patch)
treed4aef4c66736556c749c3cba1b2329a0a4e0c10b
parent5dcb6b8c8d77602ef967161795948075c3a96a3c (diff)
symbian contacts backend: fixing linux env compatibility issues
-rw-r--r--plugins/contacts/symbian/contactsmodel/cntdbdumper/group/dbdumper.mmp10
-rw-r--r--plugins/contacts/symbian/contactsmodel/cntphone/cntphone.mmp2
-rw-r--r--plugins/contacts/symbian/contactsmodel/cntsrv/src/ccntstatemachine.cpp18
-rw-r--r--plugins/contacts/symbian/contactsmodel/cntview/remoteview.cpp4
-rw-r--r--plugins/contacts/symbian/contactsmodel/contactsmodel.pro2
-rw-r--r--plugins/contacts/symbian/contactsmodel/group/cntmodeltest.iby270
-rw-r--r--plugins/contacts/symbian/contactsmodel/group/common.inf4
-rw-r--r--plugins/contacts/symbian/contactsmodel/group/plperformancetest.iby2
-rw-r--r--plugins/contacts/symbian/contactsmodel/groupsql/cntmodelteftest.iby6
-rw-r--r--plugins/contacts/symbian/contactsmodel/tsrc/cntmodel2/t_cprogressnotification.mmp10
-rw-r--r--plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/group/t_cntplsql.mmp4
-rw-r--r--plugins/contacts/symbian/contactsmodel/tsrc/imagerescaling/group/mt_imagefieldprocessing.mmp2
-rw-r--r--plugins/contacts/symbian/contactsmodel/tsrc/imagerescaling/group/t_cntimagerescaler.mmp2
-rw-r--r--plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/group/cntperftestserver.iby44
-rw-r--r--plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/group/te_performancefunctionalitysuite.iby28
-rw-r--r--plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/template/cap_param_svr_suitename.iby2
-rw-r--r--plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/group/testcontactsuite.iby2
-rw-r--r--plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/group/tef_cntmodelcit.iby192
-rw-r--r--plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/group/tef_cnts_startuptests.iby8
19 files changed, 306 insertions, 306 deletions
diff --git a/plugins/contacts/symbian/contactsmodel/cntdbdumper/group/dbdumper.mmp b/plugins/contacts/symbian/contactsmodel/cntdbdumper/group/dbdumper.mmp
index 949d9545f1..4198048fe0 100644
--- a/plugins/contacts/symbian/contactsmodel/cntdbdumper/group/dbdumper.mmp
+++ b/plugins/contacts/symbian/contactsmodel/cntdbdumper/group/dbdumper.mmp
@@ -16,7 +16,7 @@
*/
-target DBDumper.EXE
+target dbdumper.exe
targettype EXE
CAPABILITY ReadUserData WriteUserData
UID 0x1000097a
@@ -28,11 +28,11 @@ systeminclude /EPOC32/INCLUDE
userinclude ../src ../../src
source dbdbmsdumper.CPP
-library EUSER.LIB
-library EFSRV.LIB
+library euser.lib
+library efsrv.lib
library edbms.lib
library estor.lib
-library BAFL.LIB
-library PIMTestClient.lib
+library bafl.lib
+library pimtestclient.lib
SMPSAFE
diff --git a/plugins/contacts/symbian/contactsmodel/cntphone/cntphone.mmp b/plugins/contacts/symbian/contactsmodel/cntphone/cntphone.mmp
index 7144c39467..d8a3932aec 100644
--- a/plugins/contacts/symbian/contactsmodel/cntphone/cntphone.mmp
+++ b/plugins/contacts/symbian/contactsmodel/cntphone/cntphone.mmp
@@ -24,7 +24,7 @@ TARGET cntphone.dll
APP_LAYER_SYSTEMINCLUDE_SYMBIAN
UID 0x10009D8D 0x102035FB
- start resource 102035fb.RSS
+ start resource 102035fb.rss
TARGET cntphone.rsc
end
LIBRARY cntmodel.lib
diff --git a/plugins/contacts/symbian/contactsmodel/cntsrv/src/ccntstatemachine.cpp b/plugins/contacts/symbian/contactsmodel/cntsrv/src/ccntstatemachine.cpp
index 4db9862220..e520aa8a5b 100644
--- a/plugins/contacts/symbian/contactsmodel/cntsrv/src/ccntstatemachine.cpp
+++ b/plugins/contacts/symbian/contactsmodel/cntsrv/src/ccntstatemachine.cpp
@@ -21,21 +21,21 @@
@released
*/
-#include "CCntStateMachine.h"
-#include "CCntRequest.h"
-#include "CCntDbManager.h"
-#include "CCntBackupRestoreAgent.h"
+#include "ccntstatemachine.h"
+#include "ccntrequest.h"
+#include "ccntdbmanager.h"
+#include "ccntbackuprestoreagent.h"
#include "persistencelayer.h"
-#include "CntSpeedDials.h"
+#include "cntspeeddials.h"
#include <cntfldst.h> // for ccontacttextfield
#include <cntfield.h> // for ccontacttextfield
-#include "CNTSTD.H" // for Panic codes
+#include "cntstd.h" // for Panic codes
// Event related headers
#include <cntdbobs.h> // for ccontactdbobserver
-#include "CCntServer.h" // for KCntNullConnectionId.
-#include "CCntEventQueue.h" // for KMaxNumberOfEventsInEventQueue, KCntEventGranularity
-#include "CCntLogger.h"
+#include "ccntserver.h" // for KCntNullConnectionId.
+#include "ccnteventqueue.h" // for KMaxNumberOfEventsInEventQueue, KCntEventGranularity
+#include "ccntlogger.h"
// Require SQL header for leave code checking
#include <sqldb.h>
diff --git a/plugins/contacts/symbian/contactsmodel/cntview/remoteview.cpp b/plugins/contacts/symbian/contactsmodel/cntview/remoteview.cpp
index 6bf77568bc..f7c4705021 100644
--- a/plugins/contacts/symbian/contactsmodel/cntview/remoteview.cpp
+++ b/plugins/contacts/symbian/contactsmodel/cntview/remoteview.cpp
@@ -22,11 +22,11 @@
#include <cntviewsortpluginbase.h>
#endif
-#include "CCntServer.h" //for KSlot1 and KSlot2
+#include "ccntserver.h" //for KSlot1 and KSlot2
#include "rcntmodel.h"
// uncomment define in header to select debug prints for API profiling
-#include "CntApiProfile.h"
+#include "cntapiprofile.h"
//
diff --git a/plugins/contacts/symbian/contactsmodel/contactsmodel.pro b/plugins/contacts/symbian/contactsmodel/contactsmodel.pro
index 3c76ec4979..2c1f77c0dc 100644
--- a/plugins/contacts/symbian/contactsmodel/contactsmodel.pro
+++ b/plugins/contacts/symbian/contactsmodel/contactsmodel.pro
@@ -42,7 +42,7 @@ iby.sources = cntmodel.iby
# which doesn't get installed to epoc32/include
# Try to handle both cases here. (cntplsql needs Qt)
#
-exists($${EPOCROOT}epoc32/include/mw/QtCore) {
+exists($${EPOCROOT}epoc32/include/mw/qtcore) {
message(Adding cntplsql)
BLD_INF_RULES.prj_mmpfiles += "./groupsql/cntplsql.mmp"
iby.sources += cntplsql.iby
diff --git a/plugins/contacts/symbian/contactsmodel/group/cntmodeltest.iby b/plugins/contacts/symbian/contactsmodel/group/cntmodeltest.iby
index 893f5cb5a4..fb15371e84 100644
--- a/plugins/contacts/symbian/contactsmodel/group/cntmodeltest.iby
+++ b/plugins/contacts/symbian/contactsmodel/group/cntmodeltest.iby
@@ -18,36 +18,36 @@
#define __CNTTESTCODE_IBY__
#include <cntmodel.iby>
-#include <CoreAppsTest.iby>
+#include <coreappstest.iby>
REM Needed for CenRep file for default view definitions
#include <contacts.iby>
REM Contacts Model testcode
-file=ABI_DIR\BUILD_DIR\CNTTUTIL.DLL System\Libs\CNTTUTIL.DLL
+file=ABI_DIR\BUILD_DIR\cnttutil.dll System\Libs\cnttutil.dll
ECOM_PLUGIN(cnttestsync.dll,102035fe.rsc)
-file=ABI_DIR\BUILD_DIR\CNTSYNCCHECKER.DLL System\Libs\CNTSYNCCHECKER.DLL
-data=DATAZ_\private\10202BE9\1020384e.txt private\10202be9\1020384e.txt
+file=ABI_DIR\BUILD_DIR\cntsyncchecker.dll System\Libs\cntsyncchecker.dll
+data=DATAZ_\private\10202be9\1020384e.txt private\10202be9\1020384e.txt
data=DATAZ_\t_view2\t_view2_initial_contacts.txt T_VIEW2\t_view2_initial_contacts.txt
data=DATAZ_\t_view2\t_view2_initial_contacts_small.txt T_VIEW2\t_view2_initial_contacts_small.txt
data=DATAZ_\t_view2\t_view2_more_contacts_1.txt T_VIEW2\t_view2_more_contacts_1.txt
data=DATAZ_\t_view2\t_view2_more_contacts_2.txt T_VIEW2\t_view2_more_contacts_2.txt
-data=DATAZ_\t_HintExtension_original.cdb t_HintExtension_original.cdb
+data=DATAZ_\t_hintextension_original.cdb t_hintextension_original.cdb
data=DATAZ_\t_apac\t_apac_initial_contacts.txt t_apac\t_apac_initial_contacts.txt
data=DATAZ_\t_old_contacts_original.cdb t_old_contacts_original.cdb
-data=DATAZ_\t_cnt_backup_Corrupted_100065FF.cdb t_cnt_backup_Corrupted_100065FF.cdb
+data=DATAZ_\t_cnt_backup_corrupted_100065ff.cdb t_cnt_backup_corrupted_100065ff.cdb
-data=DATAZ_\t_timeis\Connectivity.vcf T_TimeIS\Connectivity.vcf
+data=DATAZ_\t_timeis\connectivity.vcf t_timeis\connectivity.vcf
data=DATAZ_\cntvcard\testvcard1.vcf cntvcard\testvcard1.vcf
data=DATAZ_\cntvcard\testvcard.vcf cntvcard\testvcard.vcf
data=DATAZ_\cntvcard\address-with-trailing-white-space.vcf cntvcard\address-with-trailing-white-space.vcf
data=DATAZ_\cntvcard\names.first.2gm cntvcard\names.first.2gm
data=DATAZ_\cntvcard\names.last.2gm cntvcard\names.last.2gm
-data=DATAZ_\t_cntvcard\cntvcardLF.vcf t_cntvcard\cntvcardLF.vcf
-data=DATAZ_\t_cntvcard\cntvcardUID.vcf t_cntvcard\cntvcardUID.vcf
+data=DATAZ_\t_cntvcard\cntvcardlf.vcf t_cntvcard\cntvcardlf.vcf
+data=DATAZ_\t_cntvcard\cntvcarduid.vcf t_cntvcard\cntvcarduid.vcf
//t_cntvcard email update test
data=DATAZ_\t_cntvcard\email1.vcf t_cntvcard\email1.vcf
@@ -61,150 +61,150 @@ data=DATAZ_\t_cntvcard\withoutcompany.vcf t_cntvcard\withoutcompany.vcf
data=DATAZ_\t_cntvcard\vcardwithlargephoto.vcf t_cntvcard\vcardwithlargephoto.vcf
// Type check
-data=DATAZ_\t_cntvcard\testTypeVcard.vcf t_cntvcard\testTypeVcard.vcf
-data=DATAZ_\t_cntvcard\testNoTypeVcard.vcf t_cntvcard\testNoTypeVcard.vcf
+data=DATAZ_\t_cntvcard\testtypevcard.vcf t_cntvcard\testtypevcard.vcf
+data=DATAZ_\t_cntvcard\testnotypevcard.vcf t_cntvcard\testnotypevcard.vcf
data=DATAZ_\t_cntvcard\t_vexporttypewithgif.vcf t_cntvcard\t_vexporttypewithgif.vcf
-data=ZSYSTEM\Programs\CntmodelTest\cnt2.csv CntmodelTest\cnt2.csv
-data=ZSYSTEM\Programs\CntmodelTest\mat2.csv CntmodelTest\mat2.csv
-data=ZSYSTEM\Programs\CntmodelTest\res2.csv CntmodelTest\res2.csv
+data=ZSYSTEM\programs\cntmodeltest\cnt2.csv cntmodeltest\cnt2.csv
+data=ZSYSTEM\programs\cntmodeltest\mat2.csv cntmodeltest\mat2.csv
+data=ZSYSTEM\programs\cntmodeltest\res2.csv cntmodeltest\res2.csv
-data=ZSYSTEM\programs\cntmodeltest\vcardupdate1.vcf System\Programs\Cntmodeltest\vcardupdate1.vcf
-data=ZSYSTEM\Programs\Cntmodeltest\vcardupdate2.vcf System\Programs\Cntmodeltest\vcardupdate2.vcf
-data=ZSYSTEM\Programs\Cntmodeltest\vcardupdate3.vcf System\Programs\Cntmodeltest\vcardupdate3.vcf
+data=ZSYSTEM\programs\cntmodeltest\vcardupdate1.vcf System\programs\cntmodeltest\vcardupdate1.vcf
+data=ZSYSTEM\programs\cntmodeltest\vcardupdate2.vcf System\programs\cntmodeltest\vcardupdate2.vcf
+data=ZSYSTEM\programs\cntmodeltest\vcardupdate3.vcf System\programs\cntmodeltest\vcardupdate3.vcf
define CNTMODEL_PERF Core-Apps\App-Engines\CntModel\Performance
data=DATAZ_\CNTMODEL_PERF\corp_std.vcf CNTMODEL_PERF\corp_std.vcf
data=DATAZ_\CNTMODEL_PERF\corporate-1000-0.vcf CNTMODEL_PERF\corporate-1000-0.vcf
-data=DATAZ_\cntvcard\T_ViewSortPlugin.vcf cntvcard\T_ViewSortPlugin.vcf
+data=DATAZ_\cntvcard\t_viewsortplugin.vcf cntvcard\t_viewsortplugin.vcf
define CNTMODEL_DATA Core-Apps\App-Engines\CntModel\Databases
data=DATAZ_\CNTMODEL_DATA\SQLite__Contacts.cdb CNTMODEL_DATA\SQLite__Contacts.cdb
data=DATAZ_\CNTMODEL_DATA\SQLite__Contacts58920.cdb CNTMODEL_DATA\SQLite__Contacts58920.cdb
-file=ABI_DIR\BUILD_DIR\t_launchTest.exe System\Programs\CntmodelTest\t_launchTest.exe
-file=ABI_DIR\BUILD_DIR\T_ITEM.EXE System\Programs\CntmodelTest\T_ITEM.EXE
-file=ABI_DIR\BUILD_DIR\T_FIELD.EXE System\Programs\CntmodelTest\T_FIELD.EXE
-file=ABI_DIR\BUILD_DIR\T_DBASE2.EXE System\Programs\CntmodelTest\T_DBASE2.EXE
-file=ABI_DIR\BUILD_DIR\T_VIEW.EXE System\Programs\CntmodelTest\T_VIEW.EXE
-file=ABI_DIR\BUILD_DIR\T_TEMPL.EXE System\Programs\CntmodelTest\T_TEMPL.EXE
-file=ABI_DIR\BUILD_DIR\T_VERS.EXE System\Programs\CntmodelTest\T_VERS.EXE
-file=ABI_DIR\BUILD_DIR\T_EXPDEL.EXE System\Programs\CntmodelTest\T_EXPDEL.EXE
-file=ABI_DIR\BUILD_DIR\T_TTVERS.EXE System\Programs\CntmodelTest\T_TTVERS.EXE
-file=ABI_DIR\BUILD_DIR\T_NOMACH.EXE System\Programs\CntmodelTest\T_NOMACH.EXE
-file=ABI_DIR\DEBUG_DIR\T_CntMatch.EXE System\Programs\CntmodelTest\T_CntMatch.EXE
-file=ABI_DIR\BUILD_DIR\T_CARDTM.EXE System\Programs\CntmodelTest\T_CARDTM.EXE
-file=ABI_DIR\BUILD_DIR\T_OWNCAR.EXE System\Programs\CntmodelTest\T_OWNCAR.EXE
-file=ABI_DIR\BUILD_DIR\T_GROUPS.EXE System\Programs\CntmodelTest\T_GROUPS.EXE
-file=ABI_DIR\BUILD_DIR\T_CONNEC.EXE System\Programs\CntmodelTest\T_CONNEC.EXE
-file=ABI_DIR\BUILD_DIR\T_VIEW2.EXE System\Programs\CntmodelTest\T_VIEW2.EXE
-file=ABI_DIR\DEBUG_DIR\T_FILTERVIEW.EXE System\Programs\CntmodelTest\T_FILTERVIEW.EXE
-file=ABI_DIR\DEBUG_DIR\T_CUSTFILTER.EXE System\Programs\CntmodelTest\T_CUSTFILTER.EXE
-file=ABI_DIR\BUILD_DIR\T_GROUPVIEW.EXE System\Programs\CntmodelTest\T_GROUPVIEW.EXE
-file=ABI_DIR\BUILD_DIR\T_SERVERSTART.EXE System\Programs\CntmodelTest\T_SERVERSTART.EXE
-file=ABI_DIR\BUILD_DIR\T_LOCALVIEWDUPLICATES.EXE System\Programs\CntmodelTest\T_LOCALVIEWDUPLICATES.EXE
-file=ABI_DIR\BUILD_DIR\T_FILTEREDVIEWUPDATE.EXE System\Programs\CntmodelTest\T_FILTEREDVIEWUPDATE.EXE
-file=ABI_DIR\BUILD_DIR\T_GROUPVIEWUPDATE.EXE System\Programs\CntmodelTest\T_GROUPVIEWUPDATE.EXE
-file=ABI_DIR\DEBUG_DIR\T_VIEWSOOM.EXE System\Programs\CntmodelTest\T_VIEWSOOM.EXE
-file=ABI_DIR\BUILD_DIR\T_REFINEFINDVIEWL.EXE System\Programs\CntmodelTest\T_REFINEFINDVIEWL.EXE
-file=ABI_DIR\BUILD_DIR\T_VIEWOBSERVERSBUG.EXE System\Programs\CntmodelTest\T_VIEWOBSERVERSBUG.EXE
-file=ABI_DIR\BUILD_DIR\T_GROUPVIEWPANIC.EXE System\Programs\CntmodelTest\T_GROUPVIEWPANIC.EXE
-file=ABI_DIR\BUILD_DIR\T_FILTERFINDCONTACTS.EXE System\Programs\CntmodelTest\T_FILTERFINDCONTACTS.EXE
-file=ABI_DIR\BUILD_DIR\T_CONCURRENT.EXE System\Programs\CntmodelTest\T_CONCURRENT.EXE
-
-file=ABI_DIR\BUILD_DIR\T_LONGSQL.EXE System\Programs\CntmodelTest\T_LONGSQL.EXE
-file=ABI_DIR\BUILD_DIR\T_SEC_CNTDBASE.EXE System\Programs\CntmodelTest\T_SEC_CNTDBASE.EXE
-file=ABI_DIR\BUILD_DIR\T_CONTENTTYPE.EXE System\Programs\CntmodelTest\T_CONTENTTYPE.EXE
-
-file=ABI_DIR\BUILD_DIR\T_ICCENTRY.EXE System\Programs\CntmodelTest\T_ICCENTRY.EXE
-file=ABI_DIR\BUILD_DIR\T_ICCSTARTUP.EXE System\Programs\CntmodelTest\T_ICCSTARTUP.EXE
-file=ABI_DIR\BUILD_DIR\T_ICCVIEW.EXE System\Programs\CntmodelTest\T_ICCVIEW.EXE
-file=ABI_DIR\BUILD_DIR\T_ICCMULTIPLEPHONEBOOK.EXE System\Programs\CntmodelTest\T_ICCMULTIPLEPHONEBOOK.EXE
-
-file=ABI_DIR\BUILD_DIR\T_CASESENSITIVEDB.EXE System\Programs\CntmodelTest\T_CASESENSITIVEDB.EXE
-file=ABI_DIR\BUILD_DIR\T_CONTACTAT.EXE System\Programs\CntmodelTest\T_CONTACTAT.EXE
-file=ABI_DIR\BUILD_DIR\T_FILTEREDVIEWEVENTS.EXE System\Programs\CntmodelTest\T_FILTEREDVIEWEVENTS.EXE
-file=ABI_DIR\BUILD_DIR\T_GROUPDELETEBUG.EXE System\Programs\CntmodelTest\T_GROUPDELETEBUG.EXE
-file=ABI_DIR\BUILD_DIR\T_CNTIDTEST.EXE System\Programs\CntmodelTest\T_CNTIDTEST.EXE
-file=ABI_DIR\BUILD_DIR\T_VIEWCONTACTID.EXE System\Programs\CntmodelTest\T_VIEWCONTACTID.EXE
-file=ABI_DIR\BUILD_DIR\T_CNTVCARD.EXE System\Programs\CntmodelTest\T_CNTVCARD.EXE
-file=ABI_DIR\BUILD_DIR\T_VIEWSORT.EXE System\Programs\CntmodelTest\T_VIEWSORT.EXE
-file=ABI_DIR\BUILD_DIR\T_PREFIXFULLSEARCH.EXE System\Programs\CntmodelTest\T_PREFIXFULLSEARCH.EXE
-file=ABI_DIR\BUILD_DIR\T_WRONGFIELDMATCH.EXE System\Programs\CntmodelTest\T_WRONGFIELDMATCH.EXE
-file=ABI_DIR\BUILD_DIR\T_UPDATEFORSYNC.EXE System\Programs\CntmodelTest\T_UPDATEFORSYNC.EXE
-file=ABI_DIR\BUILD_DIR\T_GROUPVIEW_UNFILED_PROFILE.EXE System\Programs\CntmodelTest\T_GROUPVIEW_UNFILED_PROFILE.EXE
-file=ABI_DIR\BUILD_DIR\T_DBASE.EXE System\Programs\CntmodelTest\T_DBASE.EXE
-file=ABI_DIR\BUILD_DIR\T_TIME.EXE System\Programs\CntmodelTest\T_TIME.EXE
-file=ABI_DIR\DEBUG_DIR\T_ERROR.EXE System\Programs\CntmodelTest\T_ERROR.EXE
-file=ABI_DIR\BUILD_DIR\T_FERROR.EXE System\Programs\CntmodelTest\T_FERROR.EXE
-file=ABI_DIR\BUILD_DIR\T_CURRENTDB.EXE System\Programs\CntmodelTest\T_CURRENTDB.EXE
-file=ABI_DIR\BUILD_DIR\T_BENCH.EXE System\Programs\CntmodelTest\T_BENCH.EXE
-file=ABI_DIR\BUILD_DIR\T_PREFERENCESBUG.EXE System\Programs\CntmodelTest\T_PREFERENCESBUG.EXE
-file=ABI_DIR\BUILD_DIR\T_DATABASE_KILLER.EXE System\Programs\CntmodelTest\T_DATABASE_KILLER.EXE
-file=ABI_DIR\BUILD_DIR\T_OWNCARD.EXE System\Programs\CntmodelTest\T_OWNCARD.EXE
-file=ABI_DIR\DEBUG_DIR\T_ICCIMPORTLOCK.EXE System\Programs\CntmodelTest\T_ICCIMPORTLOCK.EXE
-file=ABI_DIR\DEBUG_DIR\T_FILTEREDVIEWSORT.EXE System\Programs\CntmodelTest\T_FILTEREDVIEWSORT.EXE
-file=ABI_DIR\DEBUG_DIR\T_LOCALVIEWREMOVE.EXE System\Programs\CntmodelTest\T_LOCALVIEWREMOVE.EXE
-file=ABI_DIR\DEBUG_DIR\T_GENERALADDRESS.EXE System\Programs\CntmodelTest\T_GENERALADDRESS.EXE
-file=ABI_DIR\BUILD_DIR\T_APAC.EXE System\Programs\CntmodelTest\T_APAC.EXE
-file=ABI_DIR\BUILD_DIR\T_Performance.EXE System\Programs\CntmodelTest\T_Performance.EXE
+file=ABI_DIR\BUILD_DIR\t_launchTest.exe System\Programs\cntmodeltest\t_launchTest.exe
+file=ABI_DIR\BUILD_DIR\t_item.exe System\Programs\cntmodeltest\t_item.exe
+file=ABI_DIR\BUILD_DIR\t_field.exe System\Programs\cntmodeltest\t_field.exe
+file=ABI_DIR\BUILD_DIR\t_dbase2.exe System\Programs\cntmodeltest\t_dbase2.exe
+file=ABI_DIR\BUILD_DIR\t_view.exe System\Programs\cntmodeltest\t_view.exe
+file=ABI_DIR\BUILD_DIR\t_templ.EXE System\Programs\cntmodeltest\t_templ.exe
+file=ABI_DIR\BUILD_DIR\t_vers.exe System\Programs\cntmodeltest\t_vers.exe
+file=ABI_DIR\BUILD_DIR\t_expdel.exe System\Programs\cntmodeltest\t_expdel.exe
+file=ABI_DIR\BUILD_DIR\t_ttvers.exe System\Programs\cntmodeltest\t_ttvers.exe
+file=ABI_DIR\BUILD_DIR\t_nomach.exe System\Programs\cntmodeltest\t_nomach.exe
+file=ABI_DIR\DEBUG_DIR\t_cntmatch.exe System\Programs\cntmodeltest\t_cntmatch.exe
+file=ABI_DIR\BUILD_DIR\t_cardtm.exe System\Programs\cntmodeltest\t_cardtm.exe
+file=ABI_DIR\BUILD_DIR\t_owncar.exe System\Programs\cntmodeltest\t_owncar.exe
+file=ABI_DIR\BUILD_DIR\t_groups.exe System\Programs\cntmodeltest\t_groups.exe
+file=ABI_DIR\BUILD_DIR\t_connec.exe System\Programs\cntmodeltest\t_connec.exe
+file=ABI_DIR\BUILD_DIR\t_view2.exe System\Programs\cntmodeltest\t_view2.exe
+file=ABI_DIR\DEBUG_DIR\t_filterview.exe System\Programs\cntmodeltest\t_filterview.exe
+file=ABI_DIR\DEBUG_DIR\t_custfilter.exe System\Programs\cntmodeltest\t_custfilter.exe
+file=ABI_DIR\BUILD_DIR\t_groupview.exe System\Programs\cntmodeltest\t_groupview.exe
+file=ABI_DIR\BUILD_DIR\t_serverstart.exe System\Programs\cntmodeltest\t_serverstart.exe
+file=ABI_DIR\BUILD_DIR\t_localviewduplicates.exe System\Programs\cntmodeltest\t_localviewduplicates.exe
+file=ABI_DIR\BUILD_DIR\t_filteredviewupdate.exe System\Programs\cntmodeltest\t_filteredviewupdate.exe
+file=ABI_DIR\BUILD_DIR\t_groupviewupdate.exe System\Programs\cntmodeltest\t_groupviewupdate.exe
+file=ABI_DIR\DEBUG_DIR\t_viewsoom.exe System\Programs\cntmodeltest\t_viewsoom.exe
+file=ABI_DIR\BUILD_DIR\t_refinefindviewl.exe System\Programs\cntmodeltest\t_refinefindviewl.exe
+file=ABI_DIR\BUILD_DIR\t_viewobserversbug.exe System\Programs\cntmodeltest\t_viewobserversbug.exe
+file=ABI_DIR\BUILD_DIR\t_groupviewpanic.exe System\Programs\cntmodeltest\t_groupviewpanic.exe
+file=ABI_DIR\BUILD_DIR\t_filterfindcontacts.exe System\Programs\cntmodeltest\t_filterfindcontacts.exe
+file=ABI_DIR\BUILD_DIR\t_concurrent.exe System\Programs\cntmodeltest\t_concurrent.exe
+
+file=ABI_DIR\BUILD_DIR\t_longsql.exe System\Programs\cntmodeltest\t_longsql.exe
+file=ABI_DIR\BUILD_DIR\t_sec_cntdbase.exe System\Programs\cntmodeltest\t_sec_cntdbase.exe
+file=ABI_DIR\BUILD_DIR\t_contenttype.exe System\Programs\cntmodeltest\t_contenttype.exe
+
+file=ABI_DIR\BUILD_DIR\t_iccentry.exe System\Programs\cntmodeltest\t_iccentry.exe
+file=ABI_DIR\BUILD_DIR\t_iccstartup.exe System\Programs\cntmodeltest\t_iccstartup.exe
+file=ABI_DIR\BUILD_DIR\t_iccview.exe System\Programs\cntmodeltest\t_iccview.exe
+file=ABI_DIR\BUILD_DIR\t_iccmultiplephonebook.exe System\Programs\cntmodeltest\t_iccmultiplephonebook.exe
+
+file=ABI_DIR\BUILD_DIR\t_casesensitivedb.exe System\Programs\cntmodeltest\t_casesensitivedb.exe
+file=ABI_DIR\BUILD_DIR\t_contactat.exe System\Programs\cntmodeltest\t_contactat.exe
+file=ABI_DIR\BUILD_DIR\t_filteredviewevents.exe System\Programs\cntmodeltest\t_filteredviewevents.exe
+file=ABI_DIR\BUILD_DIR\t_groupdeletebug.exe System\Programs\cntmodeltest\t_groupdeletebug.exe
+file=ABI_DIR\BUILD_DIR\t_cntidtest.exe System\Programs\cntmodeltest\t_cntidtest.exe
+file=ABI_DIR\BUILD_DIR\t_viewcontactid.exe System\Programs\cntmodeltest\t_viewcontactid.exe
+file=ABI_DIR\BUILD_DIR\t_cntvcard.exe System\Programs\cntmodeltest\t_cntvcard.exe
+file=ABI_DIR\BUILD_DIR\t_viewsort.exe System\Programs\cntmodeltest\t_viewsort.exe
+file=ABI_DIR\BUILD_DIR\t_prefixfullsearch.exe System\Programs\cntmodeltest\t_prefixfullsearch.exe
+file=ABI_DIR\BUILD_DIR\t_wrongfieldmatch.exe System\Programs\cntmodeltest\t_wrongfieldmatch.exe
+file=ABI_DIR\BUILD_DIR\t_updateforsync.exe System\Programs\cntmodeltest\t_updateforsync.exe
+file=ABI_DIR\BUILD_DIR\t_groupview_unfiled_profile.exe System\Programs\cntmodeltest\t_groupview_unfiled_profile.exe
+file=ABI_DIR\BUILD_DIR\t_dbase.exe System\Programs\cntmodeltest\t_dbase.exe
+file=ABI_DIR\BUILD_DIR\t_time.exe System\Programs\cntmodeltest\t_time.exe
+file=ABI_DIR\DEBUG_DIR\t_error.exe System\Programs\cntmodeltest\t_error.exe
+file=ABI_DIR\BUILD_DIR\t_ferror.exe System\Programs\cntmodeltest\t_ferror.exe
+file=ABI_DIR\BUILD_DIR\t_currentdb.exe System\Programs\cntmodeltest\t_currentdb.exe
+file=ABI_DIR\BUILD_DIR\t_bench.exe System\Programs\cntmodeltest\t_bench.exe
+file=ABI_DIR\BUILD_DIR\t_preferencesbug.exe System\Programs\cntmodeltest\t_preferencesbug.exe
+file=ABI_DIR\BUILD_DIR\t_database_killer.exe System\Programs\cntmodeltest\t_database_killer.exe
+file=ABI_DIR\BUILD_DIR\t_owncard.exe System\Programs\cntmodeltest\t_owncard.exe
+file=ABI_DIR\DEBUG_DIR\t_iccimportlock.exe System\Programs\cntmodeltest\t_iccimportlock.exe
+file=ABI_DIR\DEBUG_DIR\t_filteredviewsort.exe System\Programs\cntmodeltest\t_filteredviewsort.exe
+file=ABI_DIR\DEBUG_DIR\t_localviewremove.exe System\Programs\cntmodeltest\t_localviewremove.exe
+file=ABI_DIR\DEBUG_DIR\t_generaladdress.exe System\Programs\cntmodeltest\t_generaladdress.exe
+file=ABI_DIR\BUILD_DIR\t_apac.exe System\Programs\cntmodeltest\t_apac.exe
+file=ABI_DIR\BUILD_DIR\t_performance.exe System\Programs\cntmodeltest\t_performance.exe
ECOM_PLUGIN(cntfindplugin.dll,101f8010.rsc)
-file=ABI_DIR\BUILD_DIR\T_SPEEDDIALTEST.EXE System\Programs\CntmodelTest\T_SPEEDDIALTEST.EXE
-file=ABI_DIR\BUILD_DIR\T_VIEWEVENTS.EXE System\Programs\CntmodelTest\T_VIEWEVENTS.EXE
-file=ABI_DIR\BUILD_DIR\asynaccess.EXE System\Programs\CntmodelTest\asynaccess.EXE
-file=ABI_DIR\BUILD_DIR\t_groupviewmodifiedContact.EXE system\Programs\CntmodelTest\t_groupviewmodifiedContact.EXE
-file=ABI_DIR\BUILD_DIR\t_filterview_matching_profile.EXE system\Programs\CntmodelTest\t_filterview_matching_profile.EXE
-file=ABI_DIR\BUILD_DIR\T_TimeIS.EXE system\Programs\CntmodelTest\T_TimeIS.EXE
-file=ABI_DIR\DEBUG_DIR\T_CVIEWCONTACT.EXE System\Programs\CntmodelTest\T_CVIEWCONTACT.EXE
-file=ABI_DIR\DEBUG_DIR\T_FILTERBROADCAST.EXE System\Programs\CntmodelTest\T_FILTERBROADCAST.EXE
-file=ABI_DIR\BUILD_DIR\T_SecondName.EXE System\Programs\CntmodelTest\T_SecondName.EXE
-file=ABI_DIR\BUILD_DIR\T_RemoteView.EXE System\Programs\CntmodelTest\T_RemoteView.EXE
-file=ABI_DIR\BUILD_DIR\T_FilterviewSpeed.EXE System\Programs\CntmodelTest\T_FilterviewSpeed.EXE
-file=ABI_DIR\BUILD_DIR\T_ViewNotificationError.EXE System\Programs\CntmodelTest\T_ViewNotificationError.EXE
-file=ABI_DIR\BUILD_DIR\T_VExportBirthday.EXE System\Programs\CntmodelTest\T_VExportBirthday.EXE
-file=ABI_DIR\BUILD_DIR\T_VExportType.EXE System\Programs\CntmodelTest\T_VExportType.EXE
-file=ABI_DIR\BUILD_DIR\T_VExportORG.EXE System\Programs\CntmodelTest\T_VExportORG.EXE
-file=ABI_DIR\BUILD_DIR\T_Cnt_ViewSortProfiling.exe System\Programs\CntmodelTest\T_Cnt_ViewSortProfiling.exe
-file=ABI_DIR\BUILD_DIR\T_ViewSortProfiling.EXE System\Programs\CntmodelTest\T_ViewSortProfiling.EXE
-file=ABI_DIR\BUILD_DIR\t_ViewSortPlugin.EXE System\Programs\CntmodelTest\t_ViewSortPlugin.EXE
-file=ABI_DIR\BUILD_DIR\T_AsyncOpen.EXE System\Programs\CntmodelTest\T_AsyncOpen.EXE
-file=ABI_DIR\BUILD_DIR\T_Sec_AsyncOpen.EXE System\Programs\CntmodelTest\T_Sec_AsyncOpen.EXE
-file=ABI_DIR\BUILD_DIR\t_datacompatibility.exe System\Programs\CntmodelTest\t_datacompatibility.exe
-file=ABI_DIR\BUILD_DIR\t_cnt_backup.EXE System\Programs\CntmodelTest\t_cnt_backup.EXE
-file=ABI_DIR\BUILD_DIR\T_platsec.EXE System\Programs\CntmodelTest\T_platsec.EXE
-file=ABI_DIR\BUILD_DIR\T_SampProf.exe System\Programs\CntmodelTest\T_SampProf.exe
-file=ABI_DIR\BUILD_DIR\t_lowdiskspace.exe System\Programs\CntmodelTest\t_lowdiskspace.exe
-file=ABI_DIR\BUILD_DIR\t_cntfindall.exe System\Programs\CntmodelTest\t_cntfindall.exe
-file=ABI_DIR\BUILD_DIR\t_dbfill.exe System\Programs\CntmodelTest\t_dbfill.exe
-file=ABI_DIR\BUILD_DIR\Profiler.exe System\Programs\Profiler.exe
-file=ABI_DIR\BUILD_DIR\T_ContactViewEvents.exe System\Programs\CntmodelTest\T_ContactViewEvents.exe
-file=ABI_DIR\BUILD_DIR\t_contactdbevent.exe System\Programs\CntmodelTest\t_contactdbevent.exe
-file=ABI_DIR\BUILD_DIR\T_EVENTORDER.EXE System\Programs\CntmodelTest\T_EVENTORDER.EXE
-file=ABI_DIR\BUILD_DIR\t_GroupViewEvents.exe System\Programs\CntmodelTest\t_GroupViewEvents.exe
+file=ABI_DIR\BUILD_DIR\t_speeddialtest.exe System\Programs\cntmodeltest\t_speeddialtest.exe
+file=ABI_DIR\BUILD_DIR\t_viewevents.exe System\Programs\cntmodeltest\t_viewevents.exe
+file=ABI_DIR\BUILD_DIR\asynaccess.exe System\Programs\cntmodeltest\asynaccess.exe
+file=ABI_DIR\BUILD_DIR\t_groupviewmodifiedcontact.exe system\Programs\cntmodeltest\t_groupviewmodifiedcontact.exe
+file=ABI_DIR\BUILD_DIR\t_filterview_matching_profile.exe system\Programs\cntmodeltest\t_filterview_matching_profile.exe
+file=ABI_DIR\BUILD_DIR\t_timeis.exe system\Programs\cntmodeltest\t_timeis.exe
+file=ABI_DIR\DEBUG_DIR\t_cviewcontact.exe System\Programs\cntmodeltest\t_cviewcontact.exe
+file=ABI_DIR\DEBUG_DIR\t_filterbroadcast.exe System\Programs\cntmodeltest\t_filterbroadcast.exe
+file=ABI_DIR\BUILD_DIR\t_secondname.exe System\Programs\cntmodeltest\t_secondname.exe
+file=ABI_DIR\BUILD_DIR\t_remoteview.exe System\Programs\cntmodeltest\t_remoteview.exe
+file=ABI_DIR\BUILD_DIR\t_filterviewspeed.exe System\Programs\cntmodeltest\t_filterviewspeed.exe
+file=ABI_DIR\BUILD_DIR\t_viewnotificationerror.exe System\Programs\cntmodeltest\t_viewnotificationerror.exe
+file=ABI_DIR\BUILD_DIR\t_vexportbirthday.exe System\Programs\cntmodeltest\t_vexportbirthday.exe
+file=ABI_DIR\BUILD_DIR\t_vexporttype.exe System\Programs\cntmodeltest\t_vexporttype.exe
+file=ABI_DIR\BUILD_DIR\t_vexportorg.exe System\Programs\cntmodeltest\t_vexportorg.exe
+file=ABI_DIR\BUILD_DIR\t_cnt_viewsortprofiling.exe System\Programs\cntmodeltest\t_cnt_viewsortprofiling.exe
+file=ABI_DIR\BUILD_DIR\t_viewsortprofiling.exe System\Programs\cntmodeltest\t_viewsortprofiling.exe
+file=ABI_DIR\BUILD_DIR\t_viewsortplugin.exe System\Programs\cntmodeltest\t_viewsortplugin.exe
+file=ABI_DIR\BUILD_DIR\t_asyncopen.exe System\Programs\cntmodeltest\t_asyncopen.exe
+file=ABI_DIR\BUILD_DIR\t_sec_asyncopen.exe System\Programs\cntmodeltest\t_sec_asyncopen.exe
+file=ABI_DIR\BUILD_DIR\t_datacompatibility.exe System\Programs\cntmodeltest\t_datacompatibility.exe
+file=ABI_DIR\BUILD_DIR\t_cnt_backup.exe System\Programs\cntmodeltest\t_cnt_backup.exe
+file=ABI_DIR\BUILD_DIR\t_platsec.exe System\Programs\cntmodeltest\t_platsec.exe
+file=ABI_DIR\BUILD_DIR\t_sampprof.exe System\Programs\cntmodeltest\t_sampprof.exe
+file=ABI_DIR\BUILD_DIR\t_lowdiskspace.exe System\Programs\cntmodeltest\t_lowdiskspace.exe
+file=ABI_DIR\BUILD_DIR\t_cntfindall.exe System\Programs\cntmodeltest\t_cntfindall.exe
+file=ABI_DIR\BUILD_DIR\t_dbfill.exe System\Programs\cntmodeltest\t_dbfill.exe
+file=ABI_DIR\BUILD_DIR\profiler.exe System\Programs\profiler.exe
+file=ABI_DIR\BUILD_DIR\t_contactviewevents.exe System\Programs\cntmodeltest\t_contactviewevents.exe
+file=ABI_DIR\BUILD_DIR\t_contactdbevent.exe System\Programs\cntmodeltest\t_contactdbevent.exe
+file=ABI_DIR\BUILD_DIR\t_eventorder.exe System\Programs\cntmodeltest\t_eventorder.exe
+file=ABI_DIR\BUILD_DIR\t_groupviewevents.exe System\Programs\cntmodeltest\t_groupviewevents.exe
data=ABI_DIR\BUILD_DIR\Sampler.ldd System\Libs\Sampler.ldd
ECOM_PLUGIN(cntsimplesortplugin.dll,10200fbc.rsc)
-file=ABI_DIR\BUILD_DIR\NBCNTTESTLIB.DLL System\Libs\NBCNTTESTLIB.DLL
-file=ABI_DIR\BUILD_DIR\T_PERSISTENCELAYER.exe System\Programs\CntmodelTest\T_PERSISTENCELAYER.exe
-file=ABI_DIR\BUILD_DIR\T_PLPERFORMANCE.exe System\Programs\CntmodelTest\T_PLPERFORMANCE.exe
-file=ABI_DIR\BUILD_DIR\t_contactsramtest.exe System\Programs\CntmodelTest\t_contactsramtest.exe
-file=ABI_DIR\BUILD_DIR\t_cntdelete.exe System\Programs\CntmodelTest\t_cntdelete.exe
-file=ABI_DIR\BUILD_DIR\t_owncarddelete.exe System\Programs\CntmodelTest\t_owncarddelete.exe
-
-file=ABI_DIR\BUILD_DIR\t_viewstore.exe System\Programs\CntmodelTest\t_viewstore.exe
-file=ABI_DIR\BUILD_DIR\t_CntPBAPSupport.exe System\Programs\CntmodelTest\t_CntPBAPSupport.exe
-file=ABI_DIR\BUILD_DIR\t_vtel_email.exe System\Programs\CntmodelTest\t_vtel_email.exe
-file=ABI_DIR\BUILD_DIR\t_AGENT.exe System\Programs\CntmodelTest\t_AGENT.exe
-file=ABI_DIR\BUILD_DIR\t_geo.exe System\Programs\CntmodelTest\t_geo.exe
-data=DATAZ_\ImportContacts.vcf ImportContacts.vcf
-data=DATAZ_\Expectedcontact.vcf Expectedcontact.vcf
-
-file=ABI_DIR\BUILD_DIR\t_dbnametest.exe System\Programs\CntmodelTest\t_dbnametest.exe
-file=ABI_DIR\BUILD_DIR\t_requeststoretest.exe System\Programs\CntmodelTest\t_requeststoretest.exe
-file=ABI_DIR\BUILD_DIR\t_db_sortl_test.exe System\Programs\CntmodelTest\t_db_sortl_test.exe
-file=ABI_DIR\BUILD_DIR\t_subview.exe System\Programs\CntmodelTest\t_subview.exe
+file=ABI_DIR\BUILD_DIR\nbcnttestlib.dll System\Libs\nbcnttestlib.dll
+file=ABI_DIR\BUILD_DIR\t_persistencelayer.exe System\Programs\cntmodeltest\t_persistencelayer.exe
+file=ABI_DIR\BUILD_DIR\t_plperformance.exe System\Programs\cntmodeltest\t_plperformance.exe
+file=ABI_DIR\BUILD_DIR\t_contactsramtest.exe System\Programs\cntmodeltest\t_contactsramtest.exe
+file=ABI_DIR\BUILD_DIR\t_cntdelete.exe System\Programs\cntmodeltest\t_cntdelete.exe
+file=ABI_DIR\BUILD_DIR\t_owncarddelete.exe System\Programs\cntmodeltest\t_owncarddelete.exe
+
+file=ABI_DIR\BUILD_DIR\t_viewstore.exe System\Programs\cntmodeltest\t_viewstore.exe
+file=ABI_DIR\BUILD_DIR\t_cntpbapsupport.exe System\Programs\cntmodeltest\t_cntpbapsupport.exe
+file=ABI_DIR\BUILD_DIR\t_vtel_email.exe System\Programs\cntmodeltest\t_vtel_email.exe
+file=ABI_DIR\BUILD_DIR\t_agent.exe System\Programs\cntmodeltest\t_agent.exe
+file=ABI_DIR\BUILD_DIR\t_geo.exe System\Programs\cntmodeltest\t_geo.exe
+data=DATAZ_\importcontacts.vcf importcontacts.vcf
+data=DATAZ_\expectedcontact.vcf expectedcontact.vcf
+
+file=ABI_DIR\BUILD_DIR\t_dbnametest.exe System\Programs\cntmodeltest\t_dbnametest.exe
+file=ABI_DIR\BUILD_DIR\t_requeststoretest.exe System\Programs\cntmodeltest\t_requeststoretest.exe
+file=ABI_DIR\BUILD_DIR\t_db_sortl_test.exe System\Programs\cntmodeltest\t_db_sortl_test.exe
+file=ABI_DIR\BUILD_DIR\t_subview.exe System\Programs\cntmodeltest\t_subview.exe
REM Testcode for Log Engine contact matching plug-in
#include <cntmatchtest.iby>
diff --git a/plugins/contacts/symbian/contactsmodel/group/common.inf b/plugins/contacts/symbian/contactsmodel/group/common.inf
index 93b36b4873..50d182f543 100644
--- a/plugins/contacts/symbian/contactsmodel/group/common.inf
+++ b/plugins/contacts/symbian/contactsmodel/group/common.inf
@@ -278,5 +278,5 @@ PRJ_TESTEXPORTS
../tsrc/vcardwithlargephoto.vcf z:/t_cntvcard/vcardwithlargephoto.vcf
// Integration test suites that have not been configured for PREQ1187
-#include "../tsrc/Integration/TestStartUp/group/bld.inf"
-#include "../tsrc/Integration/TestContactSuite/group/bld.inf"
+#include "../tsrc/integration/teststartup/group/bld.inf"
+#include "../tsrc/integration/testcontactsuite/group/bld.inf"
diff --git a/plugins/contacts/symbian/contactsmodel/group/plperformancetest.iby b/plugins/contacts/symbian/contactsmodel/group/plperformancetest.iby
index d0882e3753..d1ccfca4cf 100644
--- a/plugins/contacts/symbian/contactsmodel/group/plperformancetest.iby
+++ b/plugins/contacts/symbian/contactsmodel/group/plperformancetest.iby
@@ -21,7 +21,7 @@
#include <cntmodel.iby>
-file=ABI_DIR\BUILD_DIR\T_PlPerformance.exe System\Programs\T_PlPerformance.exe
+file=ABI_DIR\BUILD_DIR\t_plperformance.exe System\Programs\t_plperformance.exe
#endif \ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/groupsql/cntmodelteftest.iby b/plugins/contacts/symbian/contactsmodel/groupsql/cntmodelteftest.iby
index 835c0b1888..77afcee54b 100644
--- a/plugins/contacts/symbian/contactsmodel/groupsql/cntmodelteftest.iby
+++ b/plugins/contacts/symbian/contactsmodel/groupsql/cntmodelteftest.iby
@@ -20,11 +20,11 @@
#include <testexecute.iby>
-#include <CntPerfTestServer.iby>
-#include <te_PerformanceFunctionalitySuite.iby>
+#include <cntperftestserver.iby>
+#include <te_performancefunctionalitysuite.iby>
#include <TE_Cntsrv_API_Policing.IBY>
#include <TestContactSuite.iby>
-#include <TEF_CntModelCIT.iby>
+#include <tef_cntmodelcit.iby>
#endif
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntmodel2/t_cprogressnotification.mmp b/plugins/contacts/symbian/contactsmodel/tsrc/cntmodel2/t_cprogressnotification.mmp
index fd27e4a6cb..f1146cac95 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntmodel2/t_cprogressnotification.mmp
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/cntmodel2/t_cprogressnotification.mmp
@@ -16,7 +16,7 @@
*/
-target T_CProgressNotification.exe
+target t_cprogressnotification.exe
targettype EXE
CAPABILITY ReadUserData WriteUserData
UID 0x102744D4
@@ -33,8 +33,8 @@ source T_CProgressNotification.cpp
source T_CProgressNotificationMain.cpp
-library EUSER.LIB
-library ESTOR.LIB
-library BAFL.LIB
+library euser.lib
+library estor.lib
+library bafl.lib
library cntmodel.lib
-library NbCntTestLib.LIB \ No newline at end of file
+library nbcnttestlib.lib \ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/group/t_cntplsql.mmp b/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/group/t_cntplsql.mmp
index 64484505f6..7f4d3646a4 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/group/t_cntplsql.mmp
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/group/t_cntplsql.mmp
@@ -78,8 +78,8 @@ LIBRARY euser.lib
LIBRARY bafl.lib // CDes16Array
LIBRARY sqldb.lib // RSql*
LIBRARY cntmodel.lib // CContactItem
-LIBRARY qtcore.lib
-LIBRARY HbCore.lib // Orbit keymap
+LIBRARY QtCore.lib
+LIBRARY hbcore.lib // Orbit keymap
LIBRARY libstdcppv5.lib
LIBRARY libc.lib
LIBRARY libm.lib
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/imagerescaling/group/mt_imagefieldprocessing.mmp b/plugins/contacts/symbian/contactsmodel/tsrc/imagerescaling/group/mt_imagefieldprocessing.mmp
index 998f141e6d..92e4fb9981 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/imagerescaling/group/mt_imagefieldprocessing.mmp
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/imagerescaling/group/mt_imagefieldprocessing.mmp
@@ -16,7 +16,7 @@
*/
-target MT_CntImageField.exe
+target mt_cntimagefield.exe
targettype EXE
CAPABILITY ALL -TCB
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/imagerescaling/group/t_cntimagerescaler.mmp b/plugins/contacts/symbian/contactsmodel/tsrc/imagerescaling/group/t_cntimagerescaler.mmp
index 58bacc7871..c8009a7dcc 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/imagerescaling/group/t_cntimagerescaler.mmp
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/imagerescaling/group/t_cntimagerescaler.mmp
@@ -16,7 +16,7 @@
*/
-target T_CntImageRescaler.exe
+target t_cntimagerescaler.exe
targettype EXE
CAPABILITY All -TCB
MACRO UNIT_TEST
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/group/cntperftestserver.iby b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/group/cntperftestserver.iby
index bc90a3289f..88beb38229 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/group/cntperftestserver.iby
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/group/cntperftestserver.iby
@@ -20,28 +20,28 @@
#include <testexecute.iby>
-file=ABI_DIR\BUILD_DIR\CntPerfTestServer.exe Sys\Bin\CntPerfTestServer.exe
-
-data=EPOCROOT##Epoc32\data\c\CntPerfTest\configs\CntPerfTest.ini CntPerfTest\configs\CntPerfTest.ini
-data=EPOCROOT##Epoc32\data\c\CntPerfTest\scripts\CntPerfTest.script CntPerfTest\scripts\CntPerfTest.script
-data=EPOCROOT##Epoc32\data\c\CntPerfTest\scripts\CustomLabelUid.script CntPerfTest\scripts\CustomLabelUid.script
-data=EPOCROOT##Epoc32\data\c\CntPerfTest\scripts\UnifiedSingular.script CntPerfTest\scripts\UnifiedSingular.script
-data=EPOCROOT##Epoc32\data\c\CntPerfTest\scripts\ViewDefCustomFieldsTest.script CntPerfTest\scripts\ViewDefCustomFieldsTest.script
-data=EPOCROOT##Epoc32\data\c\CntPerfTest\scripts\CustomTemplateTest.script CntPerfTest\scripts\CustomTemplateTest.script
-data=EPOCROOT##Epoc32\data\c\CntPerfTest\scripts\AcessCountTests.script CntPerfTest\scripts\AcessCountTests.script
-data=EPOCROOT##Epoc32\data\c\CntPerfTest\scripts\ContactViewTest.script CntPerfTest\scripts\ContactViewTest.script
-data=EPOCROOT##Epoc32\data\c\CntPerfTest\scripts\ViewDefAnyFieldsTest.script CntPerfTest\scripts\ViewDefAnyFieldsTest.script
-data=EPOCROOT##Epoc32\data\c\cntviewtest\scripts\TestContactViewSuite.script cntviewtest\scripts\TestContactViewSuite.script
-data=EPOCROOT##Epoc32\data\c\cntviewtest\configs\TestContactViewSuite.ini cntviewtest\configs\TestContactViewSuite.ini
-data=EPOCROOT##Epoc32\data\c\cntviewtest\scripts\TestContactViewUnderBackUpRestoreStep.Script cntviewtest\scripts\TestContactViewUnderBackUpRestoreStep.Script
-data=EPOCROOT##Epoc32\data\c\cntviewtest\configs\TestContactViewUnderBackUpRestoreStep.ini cntviewtest\configs\TestContactViewUnderBackUpRestoreStep.ini
-data=EPOCROOT##Epoc32\data\c\cntviewtest\scripts\TestContactViewUnderlyingViewUpdateStep.Script cntviewtest\scripts\TestContactViewUnderlyingViewUpdateStep.Script
-data=EPOCROOT##Epoc32\data\c\cntviewtest\configs\TestContactViewUnderlyingViewUpdateStep.ini cntviewtest\configs\TestContactViewUnderlyingViewUpdateStep.ini
-data=EPOCROOT##Epoc32\data\c\cntviewtest\scripts\TestContactViewCRUDOperationsStep.Script cntviewtest\scripts\TestContactViewCRUDOperationsStep.Script
-data=EPOCROOT##Epoc32\data\c\cntviewtest\configs\TestContactViewCRUDOperationsStep.ini cntviewtest\configs\TestContactViewCRUDOperationsStep.ini
-data=EPOCROOT##Epoc32\data\c\cntviewtest\configs\vcf\vcard01.vcf cntviewtest\configs\vcf\vcard01.vcf
-data=EPOCROOT##Epoc32\data\c\cntviewtest\configs\vcf\vcard02.vcf cntviewtest\configs\vcf\vcard02.vcf
-data=EPOCROOT##Epoc32\data\c\cntviewtest\configs\vcf\vcard100.vcf cntviewtest\configs\vcf\vcard100.vcf
+file=ABI_DIR\BUILD_DIR\cntperftestserver.exe Sys\Bin\cntperftestserver.exe
+
+data=EPOCROOT##epoc32\data\c\cntperftest\configs\cntperftest.ini cntperftest\configs\cntperftest.ini
+data=EPOCROOT##epoc32\data\c\cntperftest\scripts\cntperftest.script cntperftest\scripts\cntperftest.script
+data=EPOCROOT##epoc32\data\c\cntperftest\scripts\customlabeluid.script cntperftest\scripts\customlabeluid.script
+data=EPOCROOT##epoc32\data\c\cntperftest\scripts\unifiedsingular.script cntperftest\scripts\unifiedsingular.script
+data=EPOCROOT##epoc32\data\c\cntperftest\scripts\viewdefcustomfieldstest.script cntperftest\scripts\viewdefcustomfieldstest.script
+data=EPOCROOT##epoc32\data\c\cntperftest\scripts\customtemplatetest.script cntperftest\scripts\customtemplatetest.script
+data=EPOCROOT##epoc32\data\c\cntperftest\scripts\acesscounttests.script cntperftest\scripts\acesscounttests.script
+data=EPOCROOT##epoc32\data\c\cntperftest\scripts\contactviewtest.script cntperftest\scripts\contactviewtest.script
+data=EPOCROOT##epoc32\data\c\cntperftest\scripts\viewdefanyfieldstest.script cntperftest\scripts\viewdefanyfieldstest.script
+data=EPOCROOT##epoc32\data\c\cntviewtest\scripts\testcontactviewsuite.script cntviewtest\scripts\testcontactviewsuite.script
+data=EPOCROOT##epoc32\data\c\cntviewtest\configs\testcontactviewsuite.ini cntviewtest\configs\testcontactviewsuite.ini
+data=EPOCROOT##epoc32\data\c\cntviewtest\scripts\testcontactviewunderbackuprestorestep.script cntviewtest\scripts\testcontactviewunderbackuprestorestep.script
+data=EPOCROOT##epoc32\data\c\cntviewtest\configs\testcontactviewunderbackuprestorestep.ini cntviewtest\configs\testcontactviewunderbackuprestorestep.ini
+data=EPOCROOT##epoc32\data\c\cntviewtest\scripts\testcontactviewunderlyingviewupdatestep.script cntviewtest\scripts\testcontactviewunderlyingviewupdatestep.script
+data=EPOCROOT##epoc32\data\c\cntviewtest\configs\testcontactviewunderlyingviewupdatestep.ini cntviewtest\configs\testcontactviewunderlyingviewupdatestep.ini
+data=EPOCROOT##epoc32\data\c\cntviewtest\scripts\testcontactviewcrudoperationsstep.script cntviewtest\scripts\testcontactviewcrudoperationsstep.script
+data=EPOCROOT##epoc32\data\c\cntviewtest\configs\testcontactviewcrudoperationsstep.ini cntviewtest\configs\testcontactviewcrudoperationsstep.ini
+data=EPOCROOT##epoc32\data\c\cntviewtest\configs\vcf\vcard01.vcf cntviewtest\configs\vcf\vcard01.vcf
+data=EPOCROOT##epoc32\data\c\cntviewtest\configs\vcf\vcard02.vcf cntviewtest\configs\vcf\vcard02.vcf
+data=EPOCROOT##epoc32\data\c\cntviewtest\configs\vcf\vcard100.vcf cntviewtest\configs\vcf\vcard100.vcf
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/group/te_performancefunctionalitysuite.iby b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/group/te_performancefunctionalitysuite.iby
index 46592969e6..51dc101418 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/group/te_performancefunctionalitysuite.iby
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/group/te_performancefunctionalitysuite.iby
@@ -20,20 +20,20 @@
#include <testexecute.iby>
-file=ABI_DIR\BUILD_DIR\Te_PerformanceFunctionalitySuite.exe System\bin\Te_PerformanceFunctionalitySuite.exe
+file=ABI_DIR\BUILD_DIR\te_performancefunctionalitysuite.exe System\bin\te_performancefunctionalitysuite.exe
-data=EPOCROOT##epoc32\data\C\PerformanceFunc\configs\te_PerformanceFunctionalitySuite.ini PerformanceFunc\configs\te_PerformanceFunctionalitySuite.ini
-data=EPOCROOT##epoc32\data\C\PerformanceFunc\scripts\te_PerformanceFunctionalitySuite.script PerformanceFunc\Scripts\te_PerformanceFunctionalitySuite.Script
-data=EPOCROOT##epoc32\data\C\PerformanceFunc\scripts\te_PerformanceFunctionalityConcurrent.script PerformanceFunc\Scripts\te_PerformanceFunctionalityConcurrent.script
-data=EPOCROOT##epoc32\data\C\PerformanceFunc\scripts\te_PerformanceFunctionalityTimeoutConcurrent.script PerformanceFunc\Scripts\te_PerformanceFunctionalityTimeoutConcurrent.script
-data=EPOCROOT##epoc32\data\C\PerformanceFunc\scripts\RequestMixStep.script PerformanceFunc\Scripts\RequestMixStep.script
-data=EPOCROOT##epoc32\data\C\PerformanceFunc\scripts\TransactionsStep.script PerformanceFunc\Scripts\TransactionsStep.script
-data=EPOCROOT##epoc32\data\C\PerformanceFunc\scripts\CRUDOOMStep.script PerformanceFunc\Scripts\CRUDOOMStep.script
-data=EPOCROOT##epoc32\data\C\PerformanceFunc\scripts\TimeoutStep.script PerformanceFunc\Scripts\TimeoutStep.script
-data=EPOCROOT##epoc32\data\C\PerformanceFunc\scripts\RandomBlobStep.script PerformanceFunc\Scripts\RandomBlobStep.script
-data=EPOCROOT##epoc32\data\C\PerformanceFunc\scripts\NotificationStep.script PerformanceFunc\Scripts\NotificationStep.script
-data=EPOCROOT##epoc32\data\C\PerformanceFunc\scripts\LowDiskSpaceStep.script PerformanceFunc\Scripts\LowDiskSpaceStep.script
-data=EPOCROOT##epoc32\data\C\PerformanceFunc\scripts\CompactAndRecoverStep.script PerformanceFunc\Scripts\CompactAndRecoverStep.script
-data=EPOCROOT##epoc32\data\C\PerformanceFunc\scripts\StateMachineStep.script PerformanceFunc\Scripts\StateMachineStep.script
+data=EPOCROOT##epoc32\data\c\performancefunc\configs\te_performancefunctionalitysuite.ini performancefunc\configs\te_performancefunctionalitysuite.ini
+data=EPOCROOT##epoc32\data\c\performancefunc\scripts\te_performancefunctionalitysuite.script performancefunc\scripts\te_performancefunctionalitysuite.script
+data=EPOCROOT##epoc32\data\c\performancefunc\scripts\te_performancefunctionalityconcurrent.script performancefunc\scripts\te_performancefunctionalityconcurrent.script
+data=EPOCROOT##epoc32\data\c\performancefunc\scripts\te_performancefunctionalitytimeoutconcurrent.script performancefunc\scripts\te_performancefunctionalitytimeoutconcurrent.script
+data=EPOCROOT##epoc32\data\c\performancefunc\scripts\requestmixstep.script performancefunc\scripts\requestmixstep.script
+data=EPOCROOT##epoc32\data\c\performancefunc\scripts\transactionsstep.script performancefunc\scripts\transactionsstep.script
+data=EPOCROOT##epoc32\data\c\performancefunc\scripts\crudoomstep.script performancefunc\scripts\crudoomstep.script
+data=EPOCROOT##epoc32\data\c\performancefunc\scripts\timeoutstep.script performancefunc\scripts\timeoutstep.script
+data=EPOCROOT##epoc32\data\c\performancefunc\scripts\randomblobstep.script performancefunc\scripts\randomblobstep.script
+data=EPOCROOT##epoc32\data\c\performancefunc\scripts\notificationstep.script performancefunc\scripts\notificationstep.script
+data=EPOCROOT##epoc32\data\c\performancefunc\scripts\lowdiskspacestep.script performancefunc\scripts\lowdiskspacestep.script
+data=EPOCROOT##epoc32\data\c\performancefunc\scripts\compactandrecoverstep.script performancefunc\scripts\compactandrecoverstep.script
+data=EPOCROOT##epoc32\data\c\performancefunc\scripts\statemachinestep.script performancefunc\scripts\statemachinestep.script
#endif
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/template/cap_param_svr_suitename.iby b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/template/cap_param_svr_suitename.iby
index 4e5425b4c8..6f7666e94e 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/template/cap_param_svr_suitename.iby
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/template/cap_param_svr_suitename.iby
@@ -18,6 +18,6 @@
#ifndef __Cap_PARAM_SVR_SUITENAME_IBY__
#define __Cap_PARAM_SVR_SUITENAME_IBY__
-file=ABI_DIR\DEBUG_DIR\Cap_PARAM_SVR_SUITENAME.DLL System\bin\Cap_PARAM_SVR_SUITENAME.DLL
+file=ABI_DIR\DEBUG_DIR\cap_param_svr_suitename.dll System\bin\cap_param_svr_suitename.dll
#endif
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/group/testcontactsuite.iby b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/group/testcontactsuite.iby
index 1c6067e8cd..d8014baba1 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/group/testcontactsuite.iby
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/group/testcontactsuite.iby
@@ -23,7 +23,7 @@
REM Contacts Model TEF testcode
// TEST EXECUTE
-file=ABI_DIR\BUILD_DIR\TestContactSuite.exe System\bin\TestContactSuite.exe
+file=ABI_DIR\BUILD_DIR\testcontactsuite.exe System\bin\testcontactsuite.exe
data=EPOCROOT##epoc32\data\c\ContactTestCases.script ContactTestCases.script
data=EPOCROOT##epoc32\data\c\ContactTestCases.ini ContactTestCases.ini
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/group/tef_cntmodelcit.iby b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/group/tef_cntmodelcit.iby
index 334b915313..ba971f2f44 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/group/tef_cntmodelcit.iby
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/group/tef_cntmodelcit.iby
@@ -23,111 +23,111 @@
REM Contacts Model TEF testcode
// TEST EXECUTE
-file=ABI_DIR\BUILD_DIR\TestImpExvCardSuite.exe System\bin\TestImpExvCardSuite.exe
+file=ABI_DIR\BUILD_DIR\testimpexvcardsuite.exe System\bin\testimpexvcardsuite.exe
// Import export 1286 data
-data=EPOCROOT##epoc32\data\c\ImportExportTestCases.script ImportExportTestCases.script
-data=EPOCROOT##epoc32\data\c\ImportExportTestCases.ini ImportExportTestCases.ini
+data=EPOCROOT##epoc32\data\c\importexporttestcases.script importexporttestcases.script
+data=EPOCROOT##epoc32\data\c\importexporttestcases.ini importexporttestcases.ini
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportAnniMergeMode2File.vcf 1286TestData\ImportAnniMergeMode2File.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportAnniMergeMode3File.vcf 1286TestData\ImportAnniMergeMode3File.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportAsstMergeMode2File.vcf 1286TestData\ImportAsstMergeMode2File.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportAsstMergeMode3File.vcf 1286TestData\ImportAsstMergeMode3File.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportAsstTelMergeMode2File.vcf 1286TestData\ImportAsstTelMergeMode2File.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportAsstTelMergeMode3File.vcf 1286TestData\ImportAsstTelMergeMode3File.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportChildrenMergeMode2File.vcf 1286TestData\ImportChildrenMergeMode2File.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportChildrenMergeMode3File.vcf 1286TestData\ImportChildrenMergeMode3File.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportClassMergeMode2File.vcf 1286TestData\ImportClassMergeMode2File.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportClassMergeMode3File.vcf 1286TestData\ImportClassMergeMode3File.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportCompanyMergeMode2File.vcf 1286TestData\ImportCompanyMergeMode2File.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportCompanyMergeMode3File.vcf 1286TestData\ImportCompanyMergeMode3File.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportDeptMergeMode2File.vcf 1286TestData\ImportDeptMergeMode2File.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportDeptMergeMode3File.vcf 1286TestData\ImportDeptMergeMode3File.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportSpouseMergeMode2File.vcf 1286TestData\ImportSpouseMergeMode2File.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportSpouseMergeMode3File.vcf 1286TestData\ImportSpouseMergeMode3File.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importannimergemode2file.vcf 1286testdata\importannimergemode2file.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importannimergemode3file.vcf 1286testdata\importannimergemode3file.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importasstmergemode2file.vcf 1286testdata\importasstmergemode2file.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importasstmergemode3file.vcf 1286testdata\importasstmergemode3file.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importassttelmergemode2file.vcf 1286testdata\importassttelmergemode2file.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importassttelmergemode3file.vcf 1286testdata\importassttelmergemode3file.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importchildrenmergemode2file.vcf 1286testdata\importchildrenmergemode2file.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importchildrenmergemode3file.vcf 1286testdata\importchildrenmergemode3file.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importclassmergemode2file.vcf 1286testdata\importclassmergemode2file.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importclassmergemode3file.vcf 1286testdata\importclassmergemode3file.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importcompanymergemode2file.vcf 1286testdata\importcompanymergemode2file.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importcompanymergemode3file.vcf 1286testdata\importcompanymergemode3file.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importdeptmergemode2file.vcf 1286testdata\importdeptmergemode2file.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importdeptmergemode3file.vcf 1286testdata\importdeptmergemode3file.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importspousemergemode2file.vcf 1286testdata\importspousemergemode2file.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importspousemergemode3file.vcf 1286testdata\importspousemergemode3file.vcf
//Import corrupt data
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportAsstCorruptData.vcf 1286TestData\ImportAsstCorruptData.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportAsstTelCorruptData.vcf 1286TestData\ImportAsstTelCorruptData.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportAnniCorruptData.vcf 1286TestData\ImportAnniCorruptData.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportSpouseCorruptData.vcf 1286TestData\ImportSpouseCorruptData.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportChildrenCorruptData.vcf 1286TestData\ImportChildrenCorruptData.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportClassCorruptData.vcf 1286TestData\ImportClassCorruptData.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportDeptCorruptData.vcf 1286TestData\ImportDeptCorruptData.vcf
-data=EPOCROOT##epoc32\data\c\1286TestData\ImportCompanyCorruptData.vcf 1286TestData\ImportCompanyCorruptData.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importasstcorruptdata.vcf 1286testdata\importasstcorruptdata.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importassttelcorruptdata.vcf 1286testdata\importassttelcorruptdata.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importannicorruptdata.vcf 1286testdata\importannicorruptdata.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importspousecorruptdata.vcf 1286testdata\importspousecorruptdata.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importchildrencorruptdata.vcf 1286testdata\importchildrencorruptdata.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importclasscorruptdata.vcf 1286testdata\importclasscorruptdata.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importdeptcorruptdata.vcf 1286testdata\importdeptcorruptdata.vcf
+data=EPOCROOT##epoc32\data\c\1286testdata\importcompanycorruptdata.vcf 1286testdata\importcompanycorruptdata.vcf
-data=DATAC_\citeximvcard\testdata\ImportBDay\ImportBDay0.vcf CITExImvCard\testdata\ImportBDay\ImportBDay0.vcf
-data=DATAC_\citeximvcard\testdata\ImportBDay\ImportBDay1.vcf CITExImvCard\testdata\ImportBDay\ImportBDay1.vcf
-data=DATAC_\citeximvcard\testdata\ImportBDay\ImportBDay2.vcf CITExImvCard\testdata\ImportBDay\ImportBDay2.vcf
-data=DATAC_\citeximvcard\testdata\ImportNoBDay\ImportNoBDay0.vcf CITExImvCard\testdata\ImportNoBDay\ImportNoBDay0.vcf
-data=DATAC_\citeximvcard\testdata\ImportNoBDay\ImportNoBDay1.vcf CITExImvCard\testdata\ImportNoBDay\ImportNoBDay1.vcf
-data=DATAC_\citeximvcard\testdata\ImportNoRev\ImportNoREV0.vcf CITExImvCard\testdata\ImportNoRev\ImportNoREV0.vcf
-data=DATAC_\citeximvcard\testdata\ImportNoRev\ImportNoREV1.vcf CITExImvCard\testdata\ImportNoRev\ImportNoREV1.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocal\ImportREVLocal0.vcf CITExImvCard\testdata\ImportREVLocal\ImportREVLocal0.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocal\ImportREVLocal1.vcf CITExImvCard\testdata\ImportREVLocal\ImportREVLocal1.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ0.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ0.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ1.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ1.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ2.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ2.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ3.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ3.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ4.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ4.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ5.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ5.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ6.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ6.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ7.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ7.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ8.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ8.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ9.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ9.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ10.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ10.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ11.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ11.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ12.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ12.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ13.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ13.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ14.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ14.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ15.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ15.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ16.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ16.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ17.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ17.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ18.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ18.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ19.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ19.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ20.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ20.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ21.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ21.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ22.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ22.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ23.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ23.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ24.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ24.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ25.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ25.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ26.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ26.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ27.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ27.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ28.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ28.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ29.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ29.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ30.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ30.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ31.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ31.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ32.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ32.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ33.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ33.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ34.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ34.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ35.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ35.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ36.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ36.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ37.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ37.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ38.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ38.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ39.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ39.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ40.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ40.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ41.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ41.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ42.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ42.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ43.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ43.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ44.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ44.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ45.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ45.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ46.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ46.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ47.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ47.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ48.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ48.vcf
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ImportREVLocalTZ49.vcf CITExImvCard\testdata\ImportREVLocalTZ\ImportREVLocalTZ49.vcf
-data=DATAC_\citeximvcard\testdata\ImportRevUTC\ImportRevUTC0.vcf CITExImvCard\testdata\ImportRevUTC\ImportRevUTC0.vcf
-data=DATAC_\citeximvcard\testdata\ImportRevUTC\ImportRevUTC1.vcf CITExImvCard\testdata\ImportRevUTC\ImportRevUTC1.vcf
-data=DATAC_\citeximvcard\testdata\ImportRevUTC\ImportRevUTC2.vcf CITExImvCard\testdata\ImportRevUTC\ImportRevUTC2.vcf
-data=DATAC_\citeximvcard\testdata\ImportOOM\ImportOOM.vcf CITExImvCard\testdata\ImportOOM\ImportOOM.vcf
+data=DATAC_\citeximvcard\testdata\importbday\importbday0.vcf citeximvcard\testdata\importbday\importbday0.vcf
+data=DATAC_\citeximvcard\testdata\importbday\importbday1.vcf citeximvcard\testdata\importbday\importbday1.vcf
+data=DATAC_\citeximvcard\testdata\importbday\importbday2.vcf citeximvcard\testdata\importbday\importbday2.vcf
+data=DATAC_\citeximvcard\testdata\importnobday\importnobday0.vcf citeximvcard\testdata\importnobday\importnobday0.vcf
+data=DATAC_\citeximvcard\testdata\importnobday\importnobday1.vcf citeximvcard\testdata\importnobday\importnobday1.vcf
+data=DATAC_\citeximvcard\testdata\importnorev\importnorev0.vcf citeximvcard\testdata\importnorev\importnorev0.vcf
+data=DATAC_\citeximvcard\testdata\importnorev\importnorev1.vcf citeximvcard\testdata\importnorev\importnorev1.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocal\importrevlocal0.vcf citeximvcard\testdata\importrevlocal\importrevlocal0.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocal\importrevlocal1.vcf citeximvcard\testdata\importrevlocal\importrevlocal1.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz0.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz0.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz1.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz1.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz2.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz2.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz3.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz3.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz4.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz4.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz5.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz5.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz6.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz6.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz7.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz7.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz8.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz8.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz9.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz9.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz10.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz10.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz11.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz11.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz12.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz12.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz13.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz13.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz14.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz14.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz15.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz15.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz16.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz16.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz17.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz17.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz18.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz18.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz19.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz19.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz20.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz20.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz21.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz21.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz22.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz22.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz23.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz23.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz24.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz24.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz25.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz25.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz26.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz26.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz27.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz27.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz28.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz28.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz29.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz29.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz30.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz30.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz31.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz31.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz32.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz32.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz33.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz33.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz34.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz34.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz35.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz35.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz36.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz36.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz37.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz37.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz38.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz38.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz39.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz39.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz40.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz40.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz41.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz41.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz42.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz42.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz43.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz43.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz44.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz44.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz45.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz45.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz46.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz46.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz47.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz47.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz48.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz48.vcf
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\importrevlocaltz49.vcf citeximvcard\testdata\importrevlocaltz\importrevlocaltz49.vcf
+data=DATAC_\citeximvcard\testdata\importrevutc\importrevutc0.vcf citeximvcard\testdata\importrevutc\importrevutc0.vcf
+data=DATAC_\citeximvcard\testdata\importrevutc\importrevutc1.vcf citeximvcard\testdata\importrevutc\importrevutc1.vcf
+data=DATAC_\citeximvcard\testdata\importrevutc\importrevutc2.vcf citeximvcard\testdata\importrevutc\importrevutc2.vcf
+data=DATAC_\citeximvcard\testdata\importoom\importoom.vcf citeximvcard\testdata\importoom\importoom.vcf
-data=DATAC_\citeximvcard\scripts\TestImpExvCard.script scripts\TestImpExvCard.script
+data=DATAC_\citeximvcard\scripts\testimpexvcard.script scripts\testimpexvcard.script
-data=DATAC_\citeximvcard\testdata\ExportBDayLocal\ExportBDayLocal.ini CITExImvCard\testdata\ExportBDayLocal\ExportBDayLocal.ini
-data=DATAC_\citeximvcard\testdata\ImportBDay\ExpectedBDAY.ini CITExImvCard\testdata\ImportBDay\ExpectedBDAY.ini
-data=DATAC_\citeximvcard\testdata\ImportREVLocal\ExpectedUTC.ini CITExImvCard\testdata\ImportREVLocal\ExpectedUTC.ini
-data=DATAC_\citeximvcard\testdata\ImportREVLocalTZ\ExpectedUTC.ini CITExImvCard\testdata\ImportREVLocalTZ\ExpectedUTC.ini
-data=DATAC_\citeximvcard\testdata\ImportRevUTC\ExpectedUTC.ini CITExImvCard\testdata\ImportRevUTC\ExpectedUTC.ini
+data=DATAC_\citeximvcard\testdata\exportbdaylocal\exportbdaylocal.ini citeximvcard\testdata\exportbdaylocal\exportbdaylocal.ini
+data=DATAC_\citeximvcard\testdata\importbday\expectedbday.ini citeximvcard\testdata\importbday\expectedbday.ini
+data=DATAC_\citeximvcard\testdata\importrevlocal\expectedutc.ini citeximvcard\testdata\importrevlocal\expectedutc.ini
+data=DATAC_\citeximvcard\testdata\importrevlocaltz\expectedutc.ini citeximvcard\testdata\importrevlocaltz\expectedutc.ini
+data=DATAC_\citeximvcard\testdata\importrevutc\expectedutc.ini citeximvcard\testdata\importrevutc\expectedutc.ini
#endif
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/group/tef_cnts_startuptests.iby b/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/group/tef_cnts_startuptests.iby
index 6a645c059f..7d4c9564b2 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/group/tef_cnts_startuptests.iby
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/group/tef_cnts_startuptests.iby
@@ -21,11 +21,11 @@
#include <testexecute.iby>
#include <cntmodel.iby>
-file=ABI_DIR\BUILD_DIR\TestStartUpSuite.exe Sys\Bin\TestStartUpSuite.exe
+file=ABI_DIR\BUILD_DIR\teststartupsuite.exe Sys\Bin\teststartupsuite.exe
-data=EPOCROOT##Epoc32\data\c\test\data\StartUpData.ini test\data\StartUpData.ini
-data=EPOCROOT##Epoc32\data\c\test\scripts\TestContactsStartUpSuite.script test\scripts\TestContactsStartUpSuite.script
-data=DATAZ_\private\10202BE9\10003A73.txt private\10202be9\10003A73.txt
+data=EPOCROOT##Epoc32\data\c\test\data\startupdata.ini test\data\startupdata.ini
+data=EPOCROOT##Epoc32\data\c\test\scripts\testcontactsstartupsuite.script test\scripts\testcontactsstartupsuite.script
+data=DATAZ_\private\10202be9\10003a73.txt private\10202be9\10003a73.txt