Revision: 201037
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Fri, 17 Sep 2010 08:36:26 +0300
changeset 75 a365cb779476
parent 71 c5f26e3de961
child 79 cf589eb1e31e
Revision: 201037 Kit: 201037
commsconfig/commsdatabaseshim/TE_commdb/group/Db_1_create.MMP
commsconfig/commsdatabaseshim/TE_commdb/group/Db_7_create.MMP
commsconfig/commsdatabaseshim/TE_commdb/group/TE_commdb.mmp
commsconfig/commsdatabaseshim/TE_commdb/inc/CommDbPreCopy.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_003_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_007_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_008_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_009_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_010_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_011_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_012_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_013_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_014_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_015_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_016_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_017_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_018_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_019_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_020_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_021_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_022_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_023_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_024_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_025_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_026_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_027_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_028_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_029_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_030_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_031_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_032_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_033_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_034_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_035_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_036_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_037_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_038_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_039_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_040_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_041_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_042_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_043_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_044_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_045_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_046_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_047_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_061_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_062_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Step_064_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/TE_commdbServer.h
commsconfig/commsdatabaseshim/TE_commdb/inc/Teststepcommdb.h
commsconfig/commsdatabaseshim/TE_commdb/inc/step_001_01.h
commsconfig/commsdatabaseshim/TE_commdb/inc/step_002_01.h
commsconfig/commsdatabaseshim/TE_commdb/inc/step_004_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/step_005_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/step_006_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/step_051_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/step_052_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/step_053_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/step_054_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/step_055_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/step_056_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/step_057_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/step_058_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/step_059_xx.h
commsconfig/commsdatabaseshim/TE_commdb/inc/step_063_xx.h
commsconfig/commsdatabaseshim/TE_commdb/scripts/008.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/020.xml
commsconfig/commsdatabaseshim/TE_commdb/scripts/021.xml
commsconfig/commsdatabaseshim/TE_commdb/scripts/022.xml
commsconfig/commsdatabaseshim/TE_commdb/scripts/022_30.xml
commsconfig/commsdatabaseshim/TE_commdb/scripts/023.xml
commsconfig/commsdatabaseshim/TE_commdb/scripts/024.xml
commsconfig/commsdatabaseshim/TE_commdb/scripts/061_01.xml
commsconfig/commsdatabaseshim/TE_commdb/scripts/061_02.xml
commsconfig/commsdatabaseshim/TE_commdb/scripts/061_03.xml
commsconfig/commsdatabaseshim/TE_commdb/scripts/061_04.xml
commsconfig/commsdatabaseshim/TE_commdb/scripts/064_01.cfg
commsconfig/commsdatabaseshim/TE_commdb/scripts/Cdb_udeb.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/CombinationalTest.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/Corrupt.xml
commsconfig/commsdatabaseshim/TE_commdb/scripts/Default.xml
commsconfig/commsdatabaseshim/TE_commdb/scripts/Default1.xml
commsconfig/commsdatabaseshim/TE_commdb/scripts/Default7.xml
commsconfig/commsdatabaseshim/TE_commdb/scripts/PanicTest.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/ProtectRecord-ConnPref.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/ProtectRecord-Normal.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/ProtectTable-ConnPref.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/ProtectTable-Normal.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/TestProtectRecord-ConnPref.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/TestProtectRecord-Normal.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/TestProtectTable-ConnPref.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/TestProtectTable-Normal.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/Test_All_Protection-precommsdat.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/Test_All_Protection.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/Test_Both_Types.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/cdb_udeb-precommsdat.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/cdb_urel.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/default3.xml
commsconfig/commsdatabaseshim/TE_commdb/scripts/default5.dat
commsconfig/commsdatabaseshim/TE_commdb/scripts/protect.xml
commsconfig/commsdatabaseshim/TE_commdb/scripts/te_cdb_udeb.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/te_cdb_urel.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/te_connpref.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/te_encrpt.script
commsconfig/commsdatabaseshim/TE_commdb/scripts/te_usecases.script
commsconfig/commsdatabaseshim/TE_commdb/src/CommDbPreCopy.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Db_1_create.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Db_7_create.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_003_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_007_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_008_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_009_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_010_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_011_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_012_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_013_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_014_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_015_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_016_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_017_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_018_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_019_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_020_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_021_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_022_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_023_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_024_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_025_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_026_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_027_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_028_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_029_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_030_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_031_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_032_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_033_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_034_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_035_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_036_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_037_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_038_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_039_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_040_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_041_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_042_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_043_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_044_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_045_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_046_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_047_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_061_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_062_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Step_064_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/TE_commdbServer.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/Teststepcommdb.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/step_001_01.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/step_002_01.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/step_004_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/step_005_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/step_006_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/step_051_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/step_052_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/step_053_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/step_054_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/step_055_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/step_056_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/step_057_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/step_058_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/step_059_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/src/step_063_xx.cpp
commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/bwins/TE_cdmacommdbsettingsSVRU.DEF
commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/config/te_cdmacommdbsettings.cfg
commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/config/te_cdmacommdbsettings.ini
commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/config/te_cdmacommdbsettings.xml
commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/group/bld.inf
commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/group/te_cdmacommdbsettings.iby
commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/group/te_cdmacommdbsettings.mmp
commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/inc/Cdma2000settingsstep.h
commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/inc/te_cdmacommdbsettingssvr.h
commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/scripts/te_cdmacommdbsettings.script
commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/src/Cdma2000settingsstep.cpp
commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/src/te_cdmacommdbsettingssvr.cpp
commsconfig/commsdatabaseshim/TE_commdb/te_connpref/group/te_connpref.mmp
commsconfig/commsdatabaseshim/TE_commdb/te_connpref/inc/TE_ConnPrefHelperSteps.h
commsconfig/commsdatabaseshim/TE_commdb/te_connpref/inc/TE_ConnPrefServer.h
commsconfig/commsdatabaseshim/TE_commdb/te_connpref/inc/TE_ConnPrefStep.h
commsconfig/commsdatabaseshim/TE_commdb/te_connpref/inc/TE_ConnPrefSteps.h
commsconfig/commsdatabaseshim/TE_commdb/te_connpref/src/TE_ConnPrefHelperSteps.cpp
commsconfig/commsdatabaseshim/TE_commdb/te_connpref/src/TE_ConnPrefServer.cpp
commsconfig/commsdatabaseshim/TE_commdb/te_connpref/src/TE_ConnPrefStep.cpp
commsconfig/commsdatabaseshim/TE_commdb/te_connpref/src/TE_ConnPrefSteps.cpp
commsconfig/commsdatabaseshim/TE_commdb/te_encrpt/group/te_encrpt.mmp
commsconfig/commsdatabaseshim/TE_commdb/te_encrpt/inc/TE_EncrptServer.h
commsconfig/commsdatabaseshim/TE_commdb/te_encrpt/inc/TE_EncrptStep.h
commsconfig/commsdatabaseshim/TE_commdb/te_encrpt/inc/TE_EncrptSteps.h
commsconfig/commsdatabaseshim/TE_commdb/te_encrpt/src/TE_EncrptServer.cpp
commsconfig/commsdatabaseshim/TE_commdb/te_encrpt/src/TE_EncrptStep.cpp
commsconfig/commsdatabaseshim/TE_commdb/te_encrpt/src/TE_EncrptSteps.cpp
commsconfig/commsdatabaseshim/TE_commdb/te_usecases/group/te_usecases.mmp
commsconfig/commsdatabaseshim/TE_commdb/te_usecases/inc/TE_UseCasesServer.h
commsconfig/commsdatabaseshim/TE_commdb/te_usecases/inc/TE_UseCasesStep.h
commsconfig/commsdatabaseshim/TE_commdb/te_usecases/inc/TE_UseCasesSteps.h
commsconfig/commsdatabaseshim/TE_commdb/te_usecases/src/TE_UseCasesServer.cpp
commsconfig/commsdatabaseshim/TE_commdb/te_usecases/src/TE_UseCasesStep.cpp
commsconfig/commsdatabaseshim/TE_commdb/te_usecases/src/TE_UseCasesSteps.cpp
commsconfig/commsdatabaseshim/bwins/TE_COMMDBu.def
commsconfig/commsdatabaseshim/bwins/TE_CONNPREFU.DEF
commsconfig/commsdatabaseshim/bwins/TE_ENCRPTU.DEF
commsconfig/commsdatabaseshim/bwins/TE_USECASESU.DEF
commsconfig/commsdatabaseshim/group/ABLD.BAT
commsconfig/commsdatabaseshim/group/BLD.INF
commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp
commsconfig/commsdatabaseshim/group/tcommdb.iby
commsconfig/commsdatabaseshim/group/te_tcommdb.iby
commsconfig/commsdatabaseshim/ts_commdb/CommDbPreCopy.cpp
commsconfig/commsdatabaseshim/ts_commdb/CommDbPreCopy.h
commsconfig/commsdatabaseshim/ts_commdb/Db_1_create.MMP
commsconfig/commsdatabaseshim/ts_commdb/Db_1_create.cpp
commsconfig/commsdatabaseshim/ts_commdb/Db_7_create.MMP
commsconfig/commsdatabaseshim/ts_commdb/Db_7_create.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_003_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_003_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_007_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_007_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_008_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_008_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_009_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_009_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_010_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_010_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_011_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_011_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_012_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_012_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_013_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_013_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_014_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_014_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_015_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_015_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_016_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_016_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_017_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_017_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_018_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_018_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_019_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_019_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_020_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_020_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_021_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_021_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_022_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_022_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_023_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_023_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_024_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_024_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_025_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_025_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_026_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_026_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_027_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_027_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_028_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_028_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_029_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_029_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_030_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_030_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_031_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_031_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_032_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_032_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_033_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_033_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_034_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_034_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_035_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_035_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_036_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_036_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_037_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_037_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_038_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_038_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_039_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_039_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_040_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_040_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_041_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_041_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_042_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_042_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_043_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_043_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_044_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_044_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_045_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_045_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_046_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_046_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_047_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_047_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_061_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_061_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_062_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_062_xx.h
commsconfig/commsdatabaseshim/ts_commdb/Step_064_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/Step_064_xx.h
commsconfig/commsdatabaseshim/ts_commdb/TestSuiteCommdb.h
commsconfig/commsdatabaseshim/ts_commdb/Teststepcommdb.cpp
commsconfig/commsdatabaseshim/ts_commdb/Teststepcommdb.h
commsconfig/commsdatabaseshim/ts_commdb/Testsuitecommdb.cpp
commsconfig/commsdatabaseshim/ts_commdb/Ts_commdb.mmp
commsconfig/commsdatabaseshim/ts_commdb/scripts/008.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/020.xml
commsconfig/commsdatabaseshim/ts_commdb/scripts/021.xml
commsconfig/commsdatabaseshim/ts_commdb/scripts/022.xml
commsconfig/commsdatabaseshim/ts_commdb/scripts/022_30.xml
commsconfig/commsdatabaseshim/ts_commdb/scripts/023.xml
commsconfig/commsdatabaseshim/ts_commdb/scripts/024.xml
commsconfig/commsdatabaseshim/ts_commdb/scripts/061_01.xml
commsconfig/commsdatabaseshim/ts_commdb/scripts/061_02.xml
commsconfig/commsdatabaseshim/ts_commdb/scripts/061_03.xml
commsconfig/commsdatabaseshim/ts_commdb/scripts/061_04.xml
commsconfig/commsdatabaseshim/ts_commdb/scripts/064_01.cfg
commsconfig/commsdatabaseshim/ts_commdb/scripts/Cdb_udeb.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/CombinationalTest.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/Corrupt.xml
commsconfig/commsdatabaseshim/ts_commdb/scripts/Default.xml
commsconfig/commsdatabaseshim/ts_commdb/scripts/Default1.xml
commsconfig/commsdatabaseshim/ts_commdb/scripts/Default7.xml
commsconfig/commsdatabaseshim/ts_commdb/scripts/PanicTest.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/ProtectRecord-ConnPref.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/ProtectRecord-Normal.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/ProtectTable-ConnPref.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/ProtectTable-Normal.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/TestProtectRecord-ConnPref.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/TestProtectRecord-Normal.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/TestProtectTable-ConnPref.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/TestProtectTable-Normal.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/Test_All_Protection-precommsdat.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/Test_All_Protection.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/Test_Both_Types.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/cdb_udeb-precommsdat.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/cdb_urel.script
commsconfig/commsdatabaseshim/ts_commdb/scripts/default3.xml
commsconfig/commsdatabaseshim/ts_commdb/scripts/default5.dat
commsconfig/commsdatabaseshim/ts_commdb/scripts/protect.xml
commsconfig/commsdatabaseshim/ts_commdb/step_001_01.cpp
commsconfig/commsdatabaseshim/ts_commdb/step_001_01.h
commsconfig/commsdatabaseshim/ts_commdb/step_002_01.cpp
commsconfig/commsdatabaseshim/ts_commdb/step_002_01.h
commsconfig/commsdatabaseshim/ts_commdb/step_004_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/step_004_xx.h
commsconfig/commsdatabaseshim/ts_commdb/step_005_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/step_005_xx.h
commsconfig/commsdatabaseshim/ts_commdb/step_006_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/step_006_xx.h
commsconfig/commsdatabaseshim/ts_commdb/step_051_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/step_051_xx.h
commsconfig/commsdatabaseshim/ts_commdb/step_052_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/step_052_xx.h
commsconfig/commsdatabaseshim/ts_commdb/step_053_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/step_053_xx.h
commsconfig/commsdatabaseshim/ts_commdb/step_054_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/step_054_xx.h
commsconfig/commsdatabaseshim/ts_commdb/step_055_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/step_055_xx.h
commsconfig/commsdatabaseshim/ts_commdb/step_056_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/step_056_xx.h
commsconfig/commsdatabaseshim/ts_commdb/step_057_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/step_057_xx.h
commsconfig/commsdatabaseshim/ts_commdb/step_058_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/step_058_xx.h
commsconfig/commsdatabaseshim/ts_commdb/step_059_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/step_059_xx.h
commsconfig/commsdatabaseshim/ts_commdb/step_063_xx.cpp
commsconfig/commsdatabaseshim/ts_commdb/step_063_xx.h
commsconfig/commsdatabaseshim/ts_commdb/te_cdma2000Settings/config/te_cdmacommdbsettings.xml
commsconfig/commsdatabaseshim/ts_commdb/te_cdma2000Settings/group/bld.inf
commsconfig/commsdatabaseshim/ts_commdb/te_cdma2000Settings/group/te_cdmacommdbsettings.mmp
commsconfig/commsdatabaseshim/ts_commdb/te_cdma2000Settings/inc/Cdma2000settingsstep.h
commsconfig/commsdatabaseshim/ts_commdb/te_cdma2000Settings/inc/te_cdmacommdbsettingssvr.h
commsconfig/commsdatabaseshim/ts_commdb/te_cdma2000Settings/scripts/te_cdmacommdbsettings.script
commsconfig/commsdatabaseshim/ts_commdb/te_cdma2000Settings/src/Cdma2000settingsstep.cpp
commsconfig/commsdatabaseshim/ts_commdb/te_cdma2000Settings/src/te_cdmacommdbsettingssvr.cpp
commsconfig/commsdatabaseshim/ts_commdb/ts_connpref.mmp
commsconfig/commsdatabaseshim/ts_commdb/ts_connpref/TS_ConnPrefHelperSteps.cpp
commsconfig/commsdatabaseshim/ts_commdb/ts_connpref/TS_ConnPrefHelperSteps.h
commsconfig/commsdatabaseshim/ts_commdb/ts_connpref/TS_ConnPrefStep.cpp
commsconfig/commsdatabaseshim/ts_commdb/ts_connpref/TS_ConnPrefStep.h
commsconfig/commsdatabaseshim/ts_commdb/ts_connpref/TS_ConnPrefSteps.cpp
commsconfig/commsdatabaseshim/ts_commdb/ts_connpref/TS_ConnPrefSteps.h
commsconfig/commsdatabaseshim/ts_commdb/ts_connpref/TS_ConnPrefSuite.cpp
commsconfig/commsdatabaseshim/ts_commdb/ts_connpref/TS_ConnPrefSuite.h
commsconfig/commsdatabaseshim/ts_commdb/ts_encrpt.mmp
commsconfig/commsdatabaseshim/ts_commdb/ts_encrpt/TS_EncrptStep.cpp
commsconfig/commsdatabaseshim/ts_commdb/ts_encrpt/TS_EncrptStep.h
commsconfig/commsdatabaseshim/ts_commdb/ts_encrpt/TS_EncrptSteps.h
commsconfig/commsdatabaseshim/ts_commdb/ts_encrpt/TS_EncrptSuite.cpp
commsconfig/commsdatabaseshim/ts_commdb/ts_encrpt/TS_EncrptSuite.h
commsconfig/commsdatabaseshim/ts_commdb/ts_encrpt/Ts_EncrptSteps.cpp
commsconfig/commsdatabaseshim/ts_commdb/ts_usecases.mmp
commsconfig/commsdatabaseshim/ts_commdb/ts_usecases/TS_UseCasesStep.cpp
commsconfig/commsdatabaseshim/ts_commdb/ts_usecases/TS_UseCasesStep.h
commsconfig/commsdatabaseshim/ts_commdb/ts_usecases/TS_UseCasesSteps.cpp
commsconfig/commsdatabaseshim/ts_commdb/ts_usecases/TS_UseCasesSteps.h
commsconfig/commsdatabaseshim/ts_commdb/ts_usecases/TS_UseCasesSuite.cpp
commsconfig/commsdatabaseshim/ts_commdb/ts_usecases/TS_UseCasesSuite.h
commsfwutils/commsbufs/TE_mbufmgr/group/TE_mbufmgr.mmp
commsfwutils/commsbufs/TE_mbufmgr/inc/TE_mbufmgrServer.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test01CreateDeleteMBufMgr.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test02AllocDealloc.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test03AllocLeave.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test04CopyInOut.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test05CopyInOutOffset.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test06SplitL.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test07TrimStart.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test08TrimEnd.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test09Align.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test10CopyL.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test11AsyncAlloc.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test12General.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test13Performance.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test14HeapFreeCheck.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test15Concurrency.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test19Prepend.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test22Append.h
commsfwutils/commsbufs/TE_mbufmgr/inc/Test23RMBufQ.h
commsfwutils/commsbufs/TE_mbufmgr/inc/TestStepCTMbufmgr.h
commsfwutils/commsbufs/TE_mbufmgr/inc/test16memoryfull.h
commsfwutils/commsbufs/TE_mbufmgr/inc/test17requestsizelimits.h
commsfwutils/commsbufs/TE_mbufmgr/inc/test18exhaustmidsizepools.h
commsfwutils/commsbufs/TE_mbufmgr/inc/test20poolceilingfull.h
commsfwutils/commsbufs/TE_mbufmgr/inc/test21commsbufs.h
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest05-CopyIn.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest05-CopyOut.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest06-1st.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest06-2nd.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest06-3rd.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest06-4th.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest07-1st.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest07-2nd.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest07-3rd.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest08-1st.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest08-2nd.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest08-3rd.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest09-1st.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest09-2nd.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest09-3rd.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest09-4th.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest09-5th.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest10-1st.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest13-1st.ini
commsfwutils/commsbufs/TE_mbufmgr/scripts/mbuftest.script
commsfwutils/commsbufs/TE_mbufmgr/scripts/te_mbuftest.script
commsfwutils/commsbufs/TE_mbufmgr/src/TE_mbufmgrServer.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test01CreateDeleteMBufMgr.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test02AllocDealloc.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test03AllocLeave.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test04CopyInOut.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test05CopyInOutOffset.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test06SplitL.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test07TrimStart.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test08TrimEnd.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test09Align.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test10CopyL.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test11AsyncAlloc.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test12General.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test13Performance.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test14HeapFreeCheck.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test15Concurrency.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test19Prepend.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test22Append.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/Test23RMBufQ.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/TestStepCTMbufmgr.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/test16memoryfull.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/test17requestsizelimits.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/test18exhaustmidsizepools.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/test20poolceilingfull.cpp
commsfwutils/commsbufs/TE_mbufmgr/src/test21commsbufs.cpp
commsfwutils/commsbufs/TS_mbufmgr/TS_Mbufmgr.mmp
commsfwutils/commsbufs/TS_mbufmgr/Test01CreateDeleteMBufMgr.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test01CreateDeleteMBufMgr.h
commsfwutils/commsbufs/TS_mbufmgr/Test02AllocDealloc.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test02AllocDealloc.h
commsfwutils/commsbufs/TS_mbufmgr/Test03AllocLeave.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test03AllocLeave.h
commsfwutils/commsbufs/TS_mbufmgr/Test04CopyInOut.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test04CopyInOut.h
commsfwutils/commsbufs/TS_mbufmgr/Test05CopyInOutOffset.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test05CopyInOutOffset.h
commsfwutils/commsbufs/TS_mbufmgr/Test06SplitL.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test06SplitL.h
commsfwutils/commsbufs/TS_mbufmgr/Test07TrimStart.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test07TrimStart.h
commsfwutils/commsbufs/TS_mbufmgr/Test08TrimEnd.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test08TrimEnd.h
commsfwutils/commsbufs/TS_mbufmgr/Test09Align.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test09Align.h
commsfwutils/commsbufs/TS_mbufmgr/Test10CopyL.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test10CopyL.h
commsfwutils/commsbufs/TS_mbufmgr/Test11AsyncAlloc.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test11AsyncAlloc.h
commsfwutils/commsbufs/TS_mbufmgr/Test12General.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test12General.h
commsfwutils/commsbufs/TS_mbufmgr/Test13Performance.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test13Performance.h
commsfwutils/commsbufs/TS_mbufmgr/Test14HeapFreeCheck.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test14HeapFreeCheck.h
commsfwutils/commsbufs/TS_mbufmgr/Test15Concurrency.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test15Concurrency.h
commsfwutils/commsbufs/TS_mbufmgr/Test19Prepend.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test19Prepend.h
commsfwutils/commsbufs/TS_mbufmgr/Test22Append.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test22Append.h
commsfwutils/commsbufs/TS_mbufmgr/Test23RMBufQ.cpp
commsfwutils/commsbufs/TS_mbufmgr/Test23RMBufQ.h
commsfwutils/commsbufs/TS_mbufmgr/TestStepCTMbufmgr.cpp
commsfwutils/commsbufs/TS_mbufmgr/TestStepCTMbufmgr.h
commsfwutils/commsbufs/TS_mbufmgr/TestSuiteCTMbufmgr.cpp
commsfwutils/commsbufs/TS_mbufmgr/TestSuiteCTMbufmgr.h
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest05-CopyIn.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest05-CopyOut.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest06-1st.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest06-2nd.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest06-3rd.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest06-4th.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest07-1st.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest07-2nd.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest07-3rd.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest08-1st.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest08-2nd.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest08-3rd.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest09-1st.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest09-2nd.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest09-3rd.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest09-4th.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest09-5th.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest10-1st.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest13-1st.ini
commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/mbuftest.script
commsfwutils/commsbufs/TS_mbufmgr/test16memoryfull.cpp
commsfwutils/commsbufs/TS_mbufmgr/test16memoryfull.h
commsfwutils/commsbufs/TS_mbufmgr/test17requestsizelimits.cpp
commsfwutils/commsbufs/TS_mbufmgr/test17requestsizelimits.h
commsfwutils/commsbufs/TS_mbufmgr/test18exhaustmidsizepools.cpp
commsfwutils/commsbufs/TS_mbufmgr/test18exhaustmidsizepools.h
commsfwutils/commsbufs/TS_mbufmgr/test20poolceilingfull.cpp
commsfwutils/commsbufs/TS_mbufmgr/test20poolceilingfull.h
commsfwutils/commsbufs/TS_mbufmgr/test21commsbufs.cpp
commsfwutils/commsbufs/TS_mbufmgr/test21commsbufs.h
commsfwutils/commsbufs/group/bld.inf
commsfwutils/commsbufs/group/te_testmbuf.iby
commsfwutils/commsbufs/group/testmbuf.iby
commsprocess/commsrootserverconfig/TE_rootserver/group/TE_rootserver.mmp
commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTest.h
commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTestSection1.h
commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTestSection2.h
commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTestSection3.h
commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTestSection4.h
commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTestSection5.h
commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTestSection6.h
commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTestSection7.h
commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTestSection8.h
commsprocess/commsrootserverconfig/TE_rootserver/inc/TE_RootServerServer.h
commsprocess/commsrootserverconfig/TE_rootserver/inc/TestAsynchHandler.h
commsprocess/commsrootserverconfig/TE_rootserver/inc/TestStepRootServer.h
commsprocess/commsrootserverconfig/TE_rootserver/scripts/te_rootserver.ini
commsprocess/commsrootserverconfig/TE_rootserver/scripts/te_rootserver_full.script
commsprocess/commsrootserverconfig/TE_rootserver/scripts/te_rootserver_light.script
commsprocess/commsrootserverconfig/TE_rootserver/scripts/te_rootserver_main.script
commsprocess/commsrootserverconfig/TE_rootserver/scripts/te_rootserver_main_platsec.script
commsprocess/commsrootserverconfig/TE_rootserver/src/RootServerTestSection1.cpp
commsprocess/commsrootserverconfig/TE_rootserver/src/RootServerTestSection2.cpp
commsprocess/commsrootserverconfig/TE_rootserver/src/RootServerTestSection3.cpp
commsprocess/commsrootserverconfig/TE_rootserver/src/RootServerTestSection4.cpp
commsprocess/commsrootserverconfig/TE_rootserver/src/RootServerTestSection5.cpp
commsprocess/commsrootserverconfig/TE_rootserver/src/RootServerTestSection6.cpp
commsprocess/commsrootserverconfig/TE_rootserver/src/RootServerTestSection7.cpp
commsprocess/commsrootserverconfig/TE_rootserver/src/RootServerTestSection8.cpp
commsprocess/commsrootserverconfig/TE_rootserver/src/TE_RootServerServer.cpp
commsprocess/commsrootserverconfig/TE_rootserver/src/TestAsynchHandler.cpp
commsprocess/commsrootserverconfig/TE_rootserver/src/TestStepRootServer.cpp
commsprocess/commsrootserverconfig/TE_rootserver/testcpm/testcpm.cpp
commsprocess/commsrootserverconfig/group/TS_rootserver.mmp
commsprocess/commsrootserverconfig/group/bld.inf
commsprocess/commsrootserverconfig/group/te_rootserver.iby
commsprocess/commsrootserverconfig/group/testcpm.mmp
commsprocess/commsrootserverconfig/group/ts_rootserver.iby
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTest.h
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection1.cpp
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection1.h
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection2.cpp
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection2.h
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection3.cpp
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection3.h
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection4.cpp
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection4.h
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection5.cpp
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection5.h
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection6.cpp
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection6.h
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection7.cpp
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection7.h
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection8.cpp
commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection8.h
commsprocess/commsrootserverconfig/ts_rootserver/TestAsynchHandler.cpp
commsprocess/commsrootserverconfig/ts_rootserver/TestAsynchHandler.h
commsprocess/commsrootserverconfig/ts_rootserver/TestStepRootServer.cpp
commsprocess/commsrootserverconfig/ts_rootserver/TestStepRootServer.h
commsprocess/commsrootserverconfig/ts_rootserver/TestSuiteRootServer.cpp
commsprocess/commsrootserverconfig/ts_rootserver/TestSuiteRootServer.h
commsprocess/commsrootserverconfig/ts_rootserver/scriptfiles/te_rootserver_main.script
commsprocess/commsrootserverconfig/ts_rootserver/scriptfiles/te_rootserver_main_platsec.script
commsprocess/commsrootserverconfig/ts_rootserver/scriptfiles/ts_rootserver.ini
commsprocess/commsrootserverconfig/ts_rootserver/scriptfiles/ts_rootserver_full.script
commsprocess/commsrootserverconfig/ts_rootserver/scriptfiles/ts_rootserver_light.script
commsprocess/commsrootserverconfig/ts_rootserver/testcpm/testcpm.cpp
datacommsserver/esockserver/test/CapTests/RConnServ/Common/Te_Cap_RConnServ.MMP
datacommsserver/esockserver/test/TE_ESock/group/TE_Esock.iby
datacommsserver/esockserver/test/TE_ESock/scriptfiles/te_esock.xml
datacommsserver/esockserver/test/TE_ESock/scriptfiles/te_esock_wlan.xml
datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765428.ini
datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765429.ini
datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765430.ini
datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765431.ini
datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765432.ini
datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765433.ini
datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765434.ini
datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765435.ini
datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765436.ini
datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765437.ini
datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765438.ini
datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765439.ini
datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765440.ini
datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/DataMonitoring.ced.cfg
datacommsserver/esockserver/test/TE_RConnectionServ/configs/RConnectionServ.cfg
datacommsserver/esockserver/test/TE_RConnectionServ/configs/RConnectionServ_01_050.ini
datacommsserver/esockserver/test/TE_RConnectionServ/configs/RConnectionServ_11_070.ini
datacommsserver/esockserver/test/TE_RConnectionServ/configs/RConnectionServ_MixedAPTypes.cfg
datacommsserver/esockserver/test/TE_RConnectionSuite/config/RConnectionNTRAS_Bad.xml
datacommsserver/esockserver/test/TE_RConnectionSuite/config/ainntras.xml
datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionntras.xml
datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest.ini
datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest_vlan2.ini
datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest_vlan7.ini
datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionudp.xml
datacommsserver/esockserver/test/TE_Socket/scriptfiles/te_socket_tests.script
general/commsframeworktest.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/group/Db_1_create.MMP	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,34 @@
+//
+//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:
+//
+//
+
+TARGET        DB_1.EXE
+TARGETTYPE    EXE
+
+
+SOURCEPATH		..\src		
+SOURCE			DB_1_CREATE.CPP
+
+USERINCLUDE   ..\inc
+
+
+SYSTEMINCLUDE \EPOC32\INCLUDE
+
+LIBRARY       EUSER.LIB EFSRV.LIB COMMDB.LIB 
+
+CAPABILITY ALL -Tcb
+
+VENDORID 0x70000001
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/group/Db_7_create.MMP	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,34 @@
+//
+//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:
+//
+//
+
+TARGET        DB_7.EXE
+TARGETTYPE    EXE
+
+
+SOURCEPATH		..\src		
+SOURCE			DB_7_CREATE.CPP
+
+USERINCLUDE   ..\inc
+
+
+SYSTEMINCLUDE \EPOC32\INCLUDE
+
+LIBRARY       EUSER.LIB EFSRV.LIB COMMDB.LIB 
+
+CAPABILITY ALL -Tcb
+
+VENDORID 0x70000001
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/group/TE_commdb.mmp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,133 @@
+// TE_commdb.mmp
+//
+//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:
+//
+//
+
+// using relative paths for sourcepath and user includes
+
+TARGET        te_commdb.exe
+TARGETTYPE    EXE
+UID           0x1000008d 0x101F52C4
+VENDORID 0x70000001
+
+#if defined(WINS)
+deffile		  ../../BWINS/TE_COMMDB.def
+#endif
+
+EPOCALLOWDLLDATA 
+
+SOURCEPATH    ../src
+SOURCE        TE_commdbServer.cpp
+SOURCE		  Teststepcommdb.cpp
+SOURCE		  step_001_01.cpp
+SOURCE		  step_002_01.cpp
+SOURCE		  Step_003_xx.cpp
+SOURCE		  step_004_xx.cpp
+SOURCE		  step_005_xx.cpp
+SOURCE		  step_006_xx.cpp
+SOURCE		  Step_007_xx.cpp
+SOURCE		  Step_008_xx.cpp
+SOURCE		  Step_009_xx.cpp
+SOURCE		  Step_010_xx.cpp
+SOURCE		  Step_011_xx.cpp
+SOURCE		  Step_012_xx.cpp
+SOURCE		  Step_013_xx.cpp
+SOURCE		  Step_014_xx.cpp
+SOURCE		  Step_015_xx.cpp
+SOURCE		  Step_016_xx.cpp
+SOURCE		  Step_017_xx.cpp
+SOURCE        	  Step_018_xx.cpp
+SOURCE        	  Step_019_xx.cpp
+SOURCE        	  Step_020_xx.cpp
+SOURCE        	  Step_021_xx.cpp
+SOURCE        	  Step_022_xx.cpp
+SOURCE	        Step_023_xx.cpp
+SOURCE	        Step_024_xx.cpp
+SOURCE        	  Step_025_xx.cpp
+SOURCE		  Step_026_xx.cpp
+SOURCE		  Step_027_xx.cpp
+SOURCE		  Step_028_xx.cpp
+SOURCE		  Step_029_xx.cpp
+SOURCE		  Step_030_xx.cpp
+SOURCE		  Step_031_xx.cpp
+SOURCE		  Step_032_xx.cpp
+SOURCE		  Step_033_xx.cpp
+SOURCE		  Step_034_xx.cpp
+SOURCE		  Step_035_xx.cpp
+SOURCE		  Step_036_xx.cpp
+SOURCE		  Step_037_xx.cpp
+SOURCE		  Step_038_xx.cpp
+SOURCE		  Step_039_xx.cpp
+SOURCE		  Step_040_xx.cpp
+SOURCE		  Step_041_xx.cpp
+SOURCE		  Step_042_xx.cpp
+SOURCE		  Step_043_xx.cpp
+SOURCE		  Step_044_xx.cpp
+SOURCE		  Step_045_xx.cpp
+SOURCE		  Step_046_xx.cpp
+SOURCE              Step_047_xx.cpp
+SOURCE		  step_051_xx.cpp
+SOURCE		  step_052_xx.cpp
+SOURCE		  step_053_xx.cpp
+SOURCE		  step_054_xx.cpp
+SOURCE		  step_055_xx.cpp
+SOURCE		  step_056_xx.cpp
+SOURCE		  step_057_xx.cpp
+SOURCE		  step_058_xx.cpp
+SOURCE		  step_059_xx.cpp
+SOURCE		  Step_061_xx.cpp
+SOURCE		  Step_062_xx.cpp
+SOURCE		  step_063_xx.cpp
+SOURCE		  Step_064_xx.cpp
+SOURCE		CommDbPreCopy.cpp
+
+USERINCLUDE   ../inc
+USERINCLUDE   ../../commdbshim/INC
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY       euser.lib commdb.lib
+LIBRARY       efsrv.lib
+LIBRARY	      estor.lib bafl.lib
+LIBRARY	      edbms.lib
+LIBRARY	      commsdat.lib
+LIBRARY	      TestExecuteUtils.lib
+
+
+CAPABILITY ALL -Tcb
+
+
+//From the orig sheduletest mmp
+//################################
+//USERINCLUDE   ../ts_commdb
+//USERINCLUDE   ../commdbshim/INC
+//
+//SYSTEMINCLUDE /epoc32/include
+//
+//LIBRARY       euser.lib commdb.lib
+//LIBRARY       efsrv.lib
+//LIBRARY	      integrationtestutils.lib estor.lib bafl.lib
+//
+//       LIBRARY	      edbms.lib
+//
+//       LIBRARY	      commsdat.lib
+//
+//
+//CAPABILITY ALL -Tcb
+
+SMPSAFE
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/CommDbPreCopy.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,42 @@
+/*
+* 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:
+*
+*/
+
+/*
+@file
+@internalComponent
+This Copies cdbv3.dat to one temp dat file
+*/
+
+#ifndef __CCOMMDB_PRECOPY_H
+#define __CCOMMDB_PRECOPY_H
+
+_LIT(KTempDb3, "c:\\system\\data\\default3.dat");
+
+///////////////////////////////////////////////
+// Test Copy Test
+NONSHARABLE_CLASS (CCommDbPreCopy) : public CTestStepCommDb
+{
+public:
+	CCommDbPreCopy();
+	virtual ~CCommDbPreCopy();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+};
+
+#endif // __CCOMMDB_PRECOPY_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_003_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,180 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 003.XX group of scenarios 
+
+
+#if (!defined __STEP_003_XX_H__)
+#define __STEP_003_XX_H__
+
+
+////////////////////
+//	Test step 003.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest003_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest003_01();
+	~CCommDbTest003_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TInt myOpenTableL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+
+};
+
+////////////////////
+//	Test step 003.02
+////////////////////
+class CCommsDatabase;
+
+NONSHARABLE_CLASS(CCommDbTest003_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest003_02();
+	~CCommDbTest003_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+	TInt myOpenTableL();
+
+
+};
+
+////////////////////
+//	Test step 003.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest003_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest003_03();
+	~CCommDbTest003_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+	TInt myOpenTableL();
+
+
+};
+
+////////////////////
+//	Test step 003.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest003_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest003_04();
+	~CCommDbTest003_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TVerdict doTestStepPreambleL();
+	TInt executeStepL();
+
+private:
+	TInt myOpenTableL();
+
+
+};
+
+////////////////////
+//	Test step 003.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest003_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest003_05();
+	~CCommDbTest003_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+	TInt myOpenTableL();
+	TBool iLocalObjects; //Flag set when objects of this class have created iTheDb and iTheView
+
+};
+
+////////////////////
+//	Test step 003.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest003_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest003_06();
+	~CCommDbTest003_06();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+	TInt myOpenTableL();
+	TBool iLocalObjects; //Flag set when objects of this class have created iTheDb and iTheView
+
+};
+
+////////////////////
+//	Test step 003.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest003_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest003_07();
+	~CCommDbTest003_07();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+	TBool iLocalObjects; //Flag set when objects of this class have created iTheDb and iTheView
+
+};
+
+////////////////////
+//	Test step 003.08
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest003_08) : public CTestStepCommDb
+{
+public:
+	CCommDbTest003_08();
+	~CCommDbTest003_08();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+	TBool iLocalObjects; //Flag set when objects of this class have created iTheDb and iTheView
+
+};
+
+
+#endif //(__STEP_003_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_007_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,369 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 007.XX group of scenarios 
+
+
+#if (!defined __STEP_007_XX_H__)
+#define __STEP_007_XX_H__
+
+
+////////////////////
+//	Test step 007.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_01();
+	~CCommDbTest007_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 007.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_02();
+	~CCommDbTest007_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 007.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_03();
+	~CCommDbTest007_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+////////////////////
+//	Test step 007.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_04();
+	~CCommDbTest007_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 007.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_05();
+	~CCommDbTest007_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+////////////////////
+//	Test step 007.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_06();
+	~CCommDbTest007_06();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+////////////////////
+//	Test step 007.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_07();
+	~CCommDbTest007_07();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+////////////////////
+//	Test step 007.08
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_08) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_08();
+	~CCommDbTest007_08();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+////////////////////
+//	Test step 007.09
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_09) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_09();
+	~CCommDbTest007_09();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+////////////////////
+//	Test step 007.10
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_10) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_10();
+	~CCommDbTest007_10();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+////////////////////
+//	Test step 007.11
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_11) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_11();
+	~CCommDbTest007_11();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+////////////////////
+//	Test step 007.12
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_12) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_12();
+	~CCommDbTest007_12();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+////////////////////
+//	Test step 007.13
+////////////////////
+/*
+//Removed since this test will not compile on Code warrior due to having an array of zero length
+
+NONSHARABLE_CLASS(CCommDbTest007_13) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_13();
+	~CCommDbTest007_13();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+*/
+
+////////////////////
+//	Test step 007.14
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_14) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_14();
+	~CCommDbTest007_14();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+////////////////////
+//	Test step 007.15
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_15) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_15();
+	~CCommDbTest007_15();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 007.16
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_16) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_16();
+	~CCommDbTest007_16();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 007.17
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_17) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_17();
+	~CCommDbTest007_17();
+
+	virtual enum TVerdict doTestStepL( void );
+	
+private:
+
+};
+
+////////////////////
+//	Test step 007.18
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_18) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_18();
+	~CCommDbTest007_18();
+
+	virtual enum TVerdict doTestStepL( void );
+	
+private:
+
+};
+
+////////////////////
+//	Test step 007.19
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_19) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_19();
+	~CCommDbTest007_19();
+
+	virtual enum TVerdict doTestStepL( void );
+	
+private:
+
+};
+
+////////////////////
+//	Test step 007.20
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest007_20) : public CTestStepCommDb
+{
+public:
+	CCommDbTest007_20();
+	~CCommDbTest007_20();
+
+	virtual enum TVerdict doTestStepL( void );
+	
+private:
+
+};
+
+#endif //(__STEP_007_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_008_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,92 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 008.XX group of scenarios 
+
+
+#if (!defined __STEP_008_XX_H__)
+#define __STEP_008_XX_H__
+
+
+////////////////////
+//	Test step 008.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest008_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest008_01();
+	~CCommDbTest008_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 008.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest008_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest008_02();
+	~CCommDbTest008_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	
+private:
+
+};
+
+////////////////////
+//	Test step 008.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest008_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest008_03();
+	~CCommDbTest008_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 008.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest008_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest008_04();
+	~CCommDbTest008_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	
+private:
+
+};
+
+#endif //(__STEP_008_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_009_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,401 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 009.XX group of scenarios 
+
+
+#if (!defined __STEP_009_XX_H__)
+#define __STEP_009_XX_H__
+
+
+////////////////////
+//	Test step 009.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_01();
+	~CCommDbTest009_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TInt heapFailureTest();
+	TVerdict doTestStepPreambleL();
+
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 009.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_02();
+	~CCommDbTest009_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 009.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_03();
+	~CCommDbTest009_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 009.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_04();
+	~CCommDbTest009_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 009.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_05();
+	~CCommDbTest009_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 009.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_06();
+	~CCommDbTest009_06();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 009.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_07();
+	~CCommDbTest009_07();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 009.08
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_08) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_08();
+	~CCommDbTest009_08();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 009.09
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_09) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_09();
+	~CCommDbTest009_09();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 009.10
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_10) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_10();
+	~CCommDbTest009_10();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+////////////////////
+//	Test step 009.11
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_11) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_11();
+	~CCommDbTest009_11();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+//commsdat specific
+
+////////////////////
+//	Test step 009.12
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_12) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_12();
+	~CCommDbTest009_12();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+////////////////////
+//	Test step 009.13
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_13) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_13();
+	~CCommDbTest009_13();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+////////////////////
+//	Test step 009.14
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_14) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_14();
+	~CCommDbTest009_14();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+////////////////////
+//	Test step 009.15
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_15) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_15();
+	~CCommDbTest009_15();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+////////////////////
+//	Test step 009.16
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_16) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_16();
+	~CCommDbTest009_16();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+////////////////////
+//	Test step 009.17
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_17) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_17();
+	~CCommDbTest009_17();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 009.18
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_18) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_18();
+	~CCommDbTest009_18();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 009.19
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_19) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_19();
+	~CCommDbTest009_19();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 009.20
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_20) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_20();
+	~CCommDbTest009_20();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 009.21
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest009_21) : public CTestStepCommDb
+{
+public:
+	CCommDbTest009_21();
+	~CCommDbTest009_21();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+#endif //(__STEP_009_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_010_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,116 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 010.XX group of scenarios 
+
+
+#if (!defined __STEP_010_XX_H__)
+#define __STEP_010_XX_H__
+
+
+////////////////////
+//	Test step 010.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest010_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest010_01();
+	~CCommDbTest010_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+
+private:
+
+};
+
+////////////////////
+//	Test step 010.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest010_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest010_02();
+	~CCommDbTest010_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 010.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest010_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest010_03();
+	~CCommDbTest010_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 010.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest010_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest010_04();
+	~CCommDbTest010_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 010.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest010_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest010_05();
+	~CCommDbTest010_05();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+#endif //(__STEP_010_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_011_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,95 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 011.XX group of scenarios 
+
+
+#if (!defined __STEP_011_XX_H__)
+#define __STEP_011_XX_H__
+
+
+////////////////////
+//	Test step 011.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest011_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest011_01();
+	~CCommDbTest011_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+///////////////////
+//	Test step 011.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest011_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest011_02();
+	~CCommDbTest011_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+///////////////////
+//	Test step 011.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest011_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest011_03();
+	~CCommDbTest011_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+///////////////////
+//	Test step 011.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest011_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest011_04();
+	~CCommDbTest011_04();
+
+	enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+#endif //(__STEP_011_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_012_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,154 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 012.XX group of scenarios 
+
+
+#if (!defined __STEP_012_XX_H__)
+#define __STEP_012_XX_H__
+
+
+////////////////////
+//	Test step 012.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest012_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest012_01();
+	~CCommDbTest012_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+
+private:
+
+};
+
+////////////////////
+//	Test step 012.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest012_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest012_02();
+	~CCommDbTest012_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 012.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest012_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest012_03();
+	~CCommDbTest012_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 012.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest012_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest012_04();
+	~CCommDbTest012_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 012.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest012_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest012_05();
+	~CCommDbTest012_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TInt myOpenViewL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 012.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest012_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest012_06();
+	~CCommDbTest012_06();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TInt myOpenViewL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 012.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest012_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest012_07();
+	~CCommDbTest012_07();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+#endif //(__STEP_012_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_013_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,98 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 013.XX group of scenarios 
+
+
+#if (!defined __STEP_013_XX_H__)
+#define __STEP_013_XX_H__
+
+
+////////////////////
+//	Test step 013.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest013_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest013_01();
+	~CCommDbTest013_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 013.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest013_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest013_02();
+	~CCommDbTest013_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 013.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest013_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest013_03();
+	~CCommDbTest013_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 013.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest013_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest013_04();
+	~CCommDbTest013_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	
+private:
+
+};
+
+
+#endif //(__STEP_013_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_014_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,96 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 014.XX group of scenarios 
+
+
+#if (!defined __STEP_014_XX_H__)
+#define __STEP_014_XX_H__
+
+
+////////////////////
+//	Test step 014.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest014_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest014_01();
+	~CCommDbTest014_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 014.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest014_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest014_02();
+	~CCommDbTest014_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 014.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest014_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest014_03();
+	~CCommDbTest014_03();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+////////////////////
+//	Test step 014.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest014_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest014_04();
+	~CCommDbTest014_04();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+#endif //(__STEP_014_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_015_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,315 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 015.XX group of scenarios 
+
+
+#if (!defined __STEP_015_XX_H__)
+#define __STEP_015_XX_H__
+
+
+////////////////////
+//	Test step 015.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest015_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest015_01();
+	~CCommDbTest015_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+private:
+
+};
+
+
+////////////////////
+//	Test step 015.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest015_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest015_02();
+	~CCommDbTest015_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+
+private:
+
+};
+
+////////////////////
+//	Test step 015.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest015_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest015_03();
+	~CCommDbTest015_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+
+private:
+
+};
+
+////////////////////
+//	Test step 015.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest015_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest015_04();
+	~CCommDbTest015_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	virtual TVerdict doTestStepPostambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 015.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest015_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest015_05();
+	~CCommDbTest015_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	virtual TVerdict doTestStepPostambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 015.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest015_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest015_06();
+	~CCommDbTest015_06();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	virtual TVerdict doTestStepPostambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 015.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest015_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest015_07();
+	~CCommDbTest015_07();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 015.08
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest015_08) : public CTestStepCommDb
+{
+public:
+	CCommDbTest015_08();
+	~CCommDbTest015_08();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	
+private:
+	//These members are run as a separate thread
+	static	TInt step015_08Thread ( TAny * ptr );
+	static	TInt tryDatabaseWriteL(void);
+};
+
+////////////////////
+//	Test step 015.09
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest015_09) : public CTestStepCommDb
+{
+public:
+	CCommDbTest015_09();
+	~CCommDbTest015_09();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 015.10
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest015_10) : public CTestStepCommDb
+{
+public:
+	CCommDbTest015_10();
+	~CCommDbTest015_10();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+////////////////////
+//	Test step 015.11
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest015_11) : public CTestStepCommDb
+{
+public:
+	CCommDbTest015_11();
+	~CCommDbTest015_11();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+////////////////////
+//	Test step 015.12
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest015_12) : public CTestStepCommDb
+{
+public:
+	CCommDbTest015_12();
+	~CCommDbTest015_12();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+////////////////////
+//	Test step 015.13
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest015_13) : public CTestStepCommDb
+{
+public:
+	CCommDbTest015_13();
+	~CCommDbTest015_13();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+////////////////////
+//	Test step 015.14
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest015_14) : public CTestStepCommDb
+{
+public:
+	CCommDbTest015_14();
+	~CCommDbTest015_14();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+////////////////////
+//	Test step 015.15
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest015_15) : public CTestStepCommDb
+{
+public:
+	CCommDbTest015_15();
+	~CCommDbTest015_15();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+////////////////////
+//	Test step 015.16
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest015_16) : public CTestStepCommDb
+{
+public:
+	CCommDbTest015_16();
+	~CCommDbTest015_16();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+
+#endif //(__STEP_015_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_016_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,156 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 016.XX group of scenarios 
+
+
+#if (!defined __STEP_016_XX_H__)
+#define __STEP_016_XX_H__
+
+
+////////////////////
+//	Test step 016.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest016_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest016_01();
+	~CCommDbTest016_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 016.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest016_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest016_02();
+	~CCommDbTest016_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+////////////////////
+//	Test step 016.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest016_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest016_04();
+	~CCommDbTest016_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 016.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest016_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest016_05();
+	~CCommDbTest016_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+////////////////////
+//	Test step 016.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest016_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest016_07();
+	~CCommDbTest016_07();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 016.08
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest016_08) : public CTestStepCommDb
+{
+public:
+	CCommDbTest016_08();
+	~CCommDbTest016_08();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 016.09
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest016_09) : public CTestStepCommDb
+{
+public:
+	CCommDbTest016_09();
+	~CCommDbTest016_09();
+
+	virtual enum TVerdict doTestStepL( void );
+
+
+private:
+
+};
+
+#endif //(__STEP_016_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_017_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,156 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 017.XX group of scenarios 
+
+
+#if (!defined __STEP_017_XX_H__)
+#define __STEP_017_XX_H__
+
+
+////////////////////
+//	Test step 017.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest017_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest017_01();
+	~CCommDbTest017_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	virtual TVerdict doTestStepPostambleL();
+	TInt GlobalSettingTestL( const TDesC& aName );
+	TInt GlobalSettingClearL( const TDesC& aName );
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 017.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest017_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest017_02();
+	~CCommDbTest017_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+////////////////////
+//	Test step 017.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest017_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest017_03();
+	~CCommDbTest017_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+////////////////////
+//	Test step 017.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest017_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest017_04();
+	~CCommDbTest017_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 017.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest017_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest017_05();
+	~CCommDbTest017_05();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 017.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest017_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest017_06();
+	~CCommDbTest017_06();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 017.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest017_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest017_07();
+	~CCommDbTest017_07();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+
+#endif //(__STEP_017_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_018_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,168 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 018.XX group of scenarios 
+
+
+#if (!defined __STEP_018_XX_H__)
+#define __STEP_018_XX_H__
+
+
+////////////////////
+//	Test step 018.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest018_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest018_01();
+	~CCommDbTest018_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 018.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest018_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest018_02();
+	~CCommDbTest018_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+////////////////////
+//	Test step 018.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest018_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest018_03();
+	~CCommDbTest018_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+////////////////////
+//	Test step 018.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest018_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest018_04();
+	~CCommDbTest018_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 018.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest018_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest018_05();
+	~CCommDbTest018_05();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 018.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest018_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest018_06();
+	~CCommDbTest018_06();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 018.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest018_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest018_07();
+	~CCommDbTest018_07();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 018.08
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest018_08) : public CTestStepCommDb
+{
+public:
+	CCommDbTest018_08();
+	~CCommDbTest018_08();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+
+
+#endif //(__STEP_018_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_019_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,271 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 019.XX group of scenarios 
+
+
+#if (!defined __STEP_019_XX_H__)
+#define __STEP_019_XX_H__
+
+
+////////////////////
+//	Test step 019.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest019_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest019_01();
+	~CCommDbTest019_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 019.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest019_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest019_02();
+	~CCommDbTest019_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+
+////////////////////
+//	Test step 019.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest019_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest019_03();
+	~CCommDbTest019_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 019.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest019_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest019_04();
+	~CCommDbTest019_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 019.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest019_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest019_05();
+	~CCommDbTest019_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 019.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest019_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest019_06();
+	~CCommDbTest019_06();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 019.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest019_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest019_07();
+	~CCommDbTest019_07();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 019.08
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest019_08) : public CTestStepCommDb
+{
+public:
+	CCommDbTest019_08();
+	~CCommDbTest019_08();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 019.09
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest019_09) : public CTestStepCommDb
+{
+public:
+	CCommDbTest019_09();
+	~CCommDbTest019_09();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 019.10
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest019_10) : public CTestStepCommDb
+{
+public:
+	CCommDbTest019_10();
+	~CCommDbTest019_10();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+////////////////////
+//	Test step 019.11
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest019_11) : public CTestStepCommDb
+{
+public:
+	CCommDbTest019_11();
+	~CCommDbTest019_11();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 019.12
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest019_12) : public CTestStepCommDb
+{
+public:
+	CCommDbTest019_12();
+	~CCommDbTest019_12();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 019.13
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest019_13) : public CTestStepCommDb
+{
+public:
+	CCommDbTest019_13();
+	~CCommDbTest019_13();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 019.14
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest019_14) : public CTestStepCommDb
+{
+public:
+	CCommDbTest019_14();
+	~CCommDbTest019_14();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+
+#endif //(__STEP_019_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_020_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,176 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 020.XX group of scenarios 
+
+
+#if (!defined __STEP_020_XX_H__)
+#define __STEP_020_XX_H__
+
+
+////////////////////
+//	Test step 020.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest020_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest020_01();
+	~CCommDbTest020_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 020.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest020_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest020_02();
+	~CCommDbTest020_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+
+////////////////////
+//	Test step 020.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest020_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest020_03();
+	~CCommDbTest020_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 020.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest020_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest020_04();
+	~CCommDbTest020_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 020.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest020_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest020_05();
+	~CCommDbTest020_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 020.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest020_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest020_06();
+	~CCommDbTest020_06();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 020.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest020_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest020_07();
+	~CCommDbTest020_07();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+////////////////////
+//	Test step 020.08
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest020_08) : public CTestStepCommDb
+{
+public:
+	CCommDbTest020_08();
+	~CCommDbTest020_08();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+
+#endif //(__STEP_020_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_021_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,119 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 021.XX group of scenarios 
+
+
+#if (!defined __STEP_021_XX_H__)
+#define __STEP_021_XX_H__
+
+
+////////////////////
+//	Test step 021.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest021_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest021_01();
+	~CCommDbTest021_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 021.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest021_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest021_02();
+	~CCommDbTest021_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+
+////////////////////
+//	Test step 021.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest021_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest021_03();
+	~CCommDbTest021_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 021.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest021_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest021_04();
+	~CCommDbTest021_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 021.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest021_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest021_05();
+	~CCommDbTest021_05();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+
+#endif //(__STEP_021_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_022_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,556 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 022.XX group of scenarios 
+
+
+#if (!defined __STEP_022_XX_H__)
+#define __STEP_022_XX_H__
+
+
+////////////////////
+//	Test step 022.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_01();
+	~CCommDbTest022_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 022.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_02();
+	~CCommDbTest022_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+
+////////////////////
+//	Test step 022.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_03();
+	~CCommDbTest022_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 022.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_04();
+	~CCommDbTest022_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+
+////////////////////
+//	Test step 022.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_05();
+	~CCommDbTest022_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 022.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_06();
+	~CCommDbTest022_06();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 022.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_07();
+	~CCommDbTest022_07();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+////////////////////
+//	Test step 022.08
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_08) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_08();
+	~CCommDbTest022_08();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 022.09
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_09) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_09();
+	~CCommDbTest022_09();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 022.10
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_10) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_10();
+	~CCommDbTest022_10();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 022.11
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_11) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_11();
+	~CCommDbTest022_11();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 022.12
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_12) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_12();
+	~CCommDbTest022_12();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 022.13
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_13) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_13();
+	~CCommDbTest022_13();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 022.14
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_14) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_14();
+	~CCommDbTest022_14();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 022.15
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_15) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_15();
+	~CCommDbTest022_15();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 022.16
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_16) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_16();
+	~CCommDbTest022_16();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 022.17
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_17) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_17();
+	~CCommDbTest022_17();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 022.18
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_18) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_18();
+	~CCommDbTest022_18();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 022.19
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_19) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_19();
+	~CCommDbTest022_19();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 022.20
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_20) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_20();
+	~CCommDbTest022_20();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 022.21
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_21) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_21();
+	~CCommDbTest022_21();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 022.22
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_22) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_22();
+	~CCommDbTest022_22();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 022.23
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_23) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_23();
+	~CCommDbTest022_23();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 022.24
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_24) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_24();
+	~CCommDbTest022_24();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 022.25
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_25) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_25();
+	~CCommDbTest022_25();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 022.26
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_26) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_26();
+	~CCommDbTest022_26();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 022.27
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_27) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_27();
+	~CCommDbTest022_27();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 022.28
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_28) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_28();
+	~CCommDbTest022_28();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 022.29
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_29) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_29();
+	~CCommDbTest022_29();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 022.30
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest022_30) : public CTestStepCommDb
+{
+public:
+	CCommDbTest022_30();
+	~CCommDbTest022_30();
+
+	TInt executeStepL();
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+#endif //(__STEP_022_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_023_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,134 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 023.XX group of scenarios 
+
+
+#if (!defined __STEP_023_XX_H__)
+#define __STEP_023_XX_H__
+
+
+////////////////////
+//	Test step 023.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest023_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest023_01();
+	~CCommDbTest023_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 023.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest023_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest023_02();
+	~CCommDbTest023_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+////////////////////
+//	Test step 023.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest023_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest023_03();
+	~CCommDbTest023_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+
+////////////////////
+//	Test step 023.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest023_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest023_04();
+	~CCommDbTest023_04();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 023.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest023_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest023_05();
+	~CCommDbTest023_05();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+////////////////////
+//	Test step 023.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest023_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest023_06();
+	~CCommDbTest023_06();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+
+#endif //(__STEP_023_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_024_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,193 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 024.XX group of scenarios 
+
+
+#if (!defined __STEP_024_XX_H__)
+#define __STEP_024_XX_H__
+
+
+////////////////////
+//	Test step 024.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest024_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest024_01();
+	~CCommDbTest024_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 024.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest024_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest024_02();
+	~CCommDbTest024_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+////////////////////
+//	Test step 024.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest024_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest024_03();
+	~CCommDbTest024_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+
+
+////////////////////
+//	Test step 024.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest024_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest024_04();
+	~CCommDbTest024_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 024.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest024_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest024_05();
+	~CCommDbTest024_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 024.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest024_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest024_06();
+	~CCommDbTest024_06();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 024.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest024_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest024_07();
+	~CCommDbTest024_07();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 024.08
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest024_08) : public CTestStepCommDb
+{
+public:
+	CCommDbTest024_08();
+	~CCommDbTest024_08();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 024.09
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest024_09) : public CTestStepCommDb
+{
+public:
+	CCommDbTest024_09();
+	~CCommDbTest024_09();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+
+#endif //(__STEP_024_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_025_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,58 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 025.XX group of scenarios 
+
+#include<cdbpreftable.h>
+
+#if (!defined __STEP_025_XX_H__)
+#define __STEP_025_XX_H__
+
+
+////////////////////
+//	Test step 025.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest025_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest025_01();
+	~CCommDbTest025_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+
+////////////////////
+//	Test step 025.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest025_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest025_02();
+	~CCommDbTest025_02();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_025_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_026_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,308 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 026.XX group of scenarios 
+
+#include<cdbpreftable.h>
+
+#if (!defined __STEP_026_XX_H__)
+#define __STEP_026_XX_H__
+
+
+////////////////////
+//	Test step 026.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest026_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest026_01();
+	~CCommDbTest026_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+
+////////////////////
+//	Test step 026.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest026_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest026_02();
+	~CCommDbTest026_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 026.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest026_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest026_03();
+	~CCommDbTest026_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 026.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest026_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest026_04();
+	~CCommDbTest026_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 026.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest026_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest026_05();
+	~CCommDbTest026_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 026.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest026_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest026_06();
+	~CCommDbTest026_06();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 026.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest026_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest026_07();
+	~CCommDbTest026_07();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 026.08
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest026_08) : public CTestStepCommDb
+{
+public:
+	CCommDbTest026_08();
+	~CCommDbTest026_08();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 026.09
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest026_09) : public CTestStepCommDb
+{
+public:
+	CCommDbTest026_09();
+	~CCommDbTest026_09();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+
+////////////////////
+//	Test step 026.10
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest026_10) : public CTestStepCommDb
+{
+public:
+	CCommDbTest026_10();
+	~CCommDbTest026_10();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 026.10
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest026_11) : public CTestStepCommDb
+{
+public:
+	CCommDbTest026_11();
+	~CCommDbTest026_11();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 026.12
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest026_12) : public CTestStepCommDb
+{
+public:
+	CCommDbTest026_12();
+	~CCommDbTest026_12();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 026.13
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest026_13) : public CTestStepCommDb
+{
+public:
+	CCommDbTest026_13();
+	~CCommDbTest026_13();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 026.14
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest026_14) : public CTestStepCommDb
+{
+public:
+	CCommDbTest026_14();
+	~CCommDbTest026_14();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 026.10
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest026_15) : public CTestStepCommDb
+{
+public:
+	CCommDbTest026_15();
+	~CCommDbTest026_15();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 026.10
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest026_16) : public CTestStepCommDb
+{
+public:
+	CCommDbTest026_16();
+	~CCommDbTest026_16();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+
+#endif //__STEP_026_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_027_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,58 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 027.XX group of scenarios 
+
+#include<cdbpreftable.h>
+
+#if (!defined __STEP_027_XX_H__)
+#define __STEP_027_XX_H__
+
+
+////////////////////
+//	Test step 027.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest027_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest027_01();
+	~CCommDbTest027_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+
+////////////////////
+//	Test step 027.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest027_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest027_02();
+	~CCommDbTest027_02();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_027_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_028_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,152 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 028.XX group of scenarios 
+
+#include<cdbpreftable.h>
+
+#if (!defined __STEP_028_XX_H__)
+#define __STEP_028_XX_H__
+
+
+////////////////////
+//	Test step 028.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest028_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest028_01();
+	~CCommDbTest028_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 028.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest028_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest028_02();
+	~CCommDbTest028_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 028.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest028_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest028_03();
+	~CCommDbTest028_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 028.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest028_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest028_04();
+	~CCommDbTest028_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 028.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest028_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest028_05();
+	~CCommDbTest028_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 028.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest028_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest028_06();
+	~CCommDbTest028_06();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 028.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest028_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest028_07();
+	~CCommDbTest028_07();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_028_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_029_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,95 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 029.XX group of scenarios 
+
+#include<cdbpreftable.h>
+
+#if (!defined __STEP_029_XX_H__)
+#define __STEP_029_XX_H__
+
+
+////////////////////
+//	Test step 029.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest029_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest029_01();
+	~CCommDbTest029_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 029.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest029_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest029_02();
+	~CCommDbTest029_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 029.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest029_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest029_03();
+	~CCommDbTest029_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 029.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest029_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest029_04();
+	~CCommDbTest029_04();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_029_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_030_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,76 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 030.XX group of scenarios 
+
+#include<cdbpreftable.h>
+
+#if (!defined __STEP_030_XX_H__)
+#define __STEP_030_XX_H__
+
+
+////////////////////
+//	Test step 030.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest030_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest030_01();
+	~CCommDbTest030_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 030.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest030_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest030_02();
+	~CCommDbTest030_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 030.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest030_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest030_03();
+	~CCommDbTest030_03();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_030_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_031_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,114 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 031.XX group of scenarios 
+
+#include<cdbpreftable.h>
+
+#if (!defined __STEP_031_XX_H__)
+#define __STEP_031_XX_H__
+
+
+////////////////////
+//	Test step 031.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest031_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest031_01();
+	~CCommDbTest031_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 031.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest031_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest031_02();
+	~CCommDbTest031_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 031.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest031_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest031_03();
+	~CCommDbTest031_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 031.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest031_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest031_04();
+	~CCommDbTest031_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 031.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest031_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest031_05();
+	~CCommDbTest031_05();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_031_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_032_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,110 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 032.XX group of scenarios 
+
+#include<cdbpreftable.h>
+
+#if (!defined __STEP_032_XX_H__)
+#define __STEP_032_XX_H__
+
+
+////////////////////
+//	Test step 032.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest032_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest032_01();
+	~CCommDbTest032_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 032.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest032_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest032_02();
+	~CCommDbTest032_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 032.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest032_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest032_03();
+	~CCommDbTest032_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 032.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest032_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest032_04();
+	~CCommDbTest032_04();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+
+////////////////////
+//	Test step 032.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest032_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest032_05();
+	~CCommDbTest032_05();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+
+#endif //__STEP_032_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_033_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,173 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 033.XX group of scenarios 
+
+#include<cdbpreftable.h>
+
+#if (!defined __STEP_033_XX_H__)
+#define __STEP_033_XX_H__
+
+
+////////////////////
+//	Test step 033.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest033_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest033_01();
+	~CCommDbTest033_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 033.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest033_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest033_02();
+	~CCommDbTest033_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 033.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest033_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest033_03();
+	~CCommDbTest033_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 033.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest033_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest033_04();
+	~CCommDbTest033_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 033.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest033_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest033_05();
+	~CCommDbTest033_05();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+
+////////////////////
+//	Test step 033.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest033_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest033_06();
+	~CCommDbTest033_06();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 033.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest033_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest033_07();
+	~CCommDbTest033_07();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 033.08
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest033_08) : public CTestStepCommDb
+{
+public:
+	CCommDbTest033_08();
+	~CCommDbTest033_08();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 033.09
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest033_09) : public CTestStepCommDb
+{
+public:
+	CCommDbTest033_09();
+
+	virtual enum TVerdict doTestStepL();
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+
+#endif //__STEP_033_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_034_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,133 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 034.XX group of scenarios 
+
+#include<cdbpreftable.h>
+
+#if (!defined __STEP_034_XX_H__)
+#define __STEP_034_XX_H__
+
+
+////////////////////
+//	Test step 034.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest034_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest034_01();
+	~CCommDbTest034_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 034.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest034_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest034_02();
+	~CCommDbTest034_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 034.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest034_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest034_03();
+	~CCommDbTest034_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 034.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest034_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest034_04();
+	~CCommDbTest034_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 034.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest034_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest034_05();
+	~CCommDbTest034_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 034.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest034_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest034_06();
+	~CCommDbTest034_06();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_034_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_035_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,88 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 035.XX group of scenarios 
+
+
+#if (!defined __STEP_035_XX_H__)
+#define __STEP_035_XX_H__
+
+
+////////////////////
+//	Test step 035.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest035_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest035_01();
+	~CCommDbTest035_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 035.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest035_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest035_02();
+	~CCommDbTest035_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 035.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest035_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest035_03();
+	~CCommDbTest035_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 035.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest035_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest035_04();
+	~CCommDbTest035_04();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_035_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_036_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,318 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 036.XX group of scenarios 
+
+
+#if (!defined __STEP_036_XX_H__)
+#define __STEP_036_XX_H__
+
+
+////////////////////
+//	Test step 036.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_01();
+	~CCommDbTest036_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 036.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_02();
+	~CCommDbTest036_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 036.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_03();
+	~CCommDbTest036_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 036.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_04();
+	~CCommDbTest036_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 036.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_05();
+	~CCommDbTest036_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 036.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_06();
+	~CCommDbTest036_06();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 036.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_07();
+	~CCommDbTest036_07();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 036.08
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_08) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_08();
+	~CCommDbTest036_08();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 036.09
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_09) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_09();
+	~CCommDbTest036_09();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 036.10
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_10) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_10();
+	~CCommDbTest036_10();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 036.11
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_11) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_11();
+	~CCommDbTest036_11();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 036.12
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_12) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_12();
+	~CCommDbTest036_12();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 036.13
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_13) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_13();
+	~CCommDbTest036_13();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 036.14
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_14) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_14();
+	~CCommDbTest036_14();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 036.15
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_15) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_15();
+	~CCommDbTest036_15();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 036.16
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_16) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_16();
+	~CCommDbTest036_16();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 036.17
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_17) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_17();
+	~CCommDbTest036_17();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 036.18
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest036_18) : public CTestStepCommDb
+{
+public:
+	CCommDbTest036_18();
+	~CCommDbTest036_18();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_036_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_037_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,71 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 037.XX group of scenarios 
+
+
+#if (!defined __STEP_037_XX_H__)
+#define __STEP_037_XX_H__
+
+
+////////////////////
+//	Test step 037.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest037_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest037_01();
+	~CCommDbTest037_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 037.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest037_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest037_02();
+	~CCommDbTest037_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 037.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest037_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest037_03();
+	~CCommDbTest037_03();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_037_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_038_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,71 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 038.XX group of scenarios 
+
+
+#if (!defined __STEP_038_XX_H__)
+#define __STEP_038_XX_H__
+
+
+////////////////////
+//	Test step 038.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest038_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest038_01();
+	~CCommDbTest038_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 038.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest038_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest038_02();
+	~CCommDbTest038_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 038.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest038_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest038_03();
+	~CCommDbTest038_03();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_038_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_039_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,54 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 039.XX group of scenarios 
+
+
+#if (!defined __STEP_039_XX_H__)
+#define __STEP_039_XX_H__
+
+
+////////////////////
+//	Test step 039.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest039_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest039_01();
+	~CCommDbTest039_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 039.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest039_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest039_02();
+	~CCommDbTest039_02();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_038_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_040_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,76 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 040.XX group of scenarios 
+
+#include<cdbover.h>
+
+#if (!defined __STEP_040_XX_H__)
+#define __STEP_040_XX_H__
+
+
+////////////////////
+//	Test step 040.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest040_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest040_01();
+	~CCommDbTest040_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 040.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest040_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest040_02();
+	~CCommDbTest040_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 040.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest040_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest040_03();
+	~CCommDbTest040_03();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_040_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_041_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,573 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 041.XX group of scenarios 
+
+#include<cdbover.h>
+
+#if (!defined __STEP_041_XX_H__)
+#define __STEP_041_XX_H__
+
+
+////////////////////
+//	Test step 041.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_01();
+	~CCommDbTest041_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_02();
+	~CCommDbTest041_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_03();
+	~CCommDbTest041_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_04();
+	~CCommDbTest041_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_05();
+	~CCommDbTest041_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_06();
+	~CCommDbTest041_06();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.07
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_07();
+	~CCommDbTest041_07();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.08
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_08) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_08();
+	~CCommDbTest041_08();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.09
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_09) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_09();
+	~CCommDbTest041_09();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.10
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_10) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_10();
+	~CCommDbTest041_10();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.11
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_11) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_11();
+	~CCommDbTest041_11();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.12
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_12) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_12();
+	~CCommDbTest041_12();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.13
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_13) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_13();
+	~CCommDbTest041_13();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.14
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_14) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_14();
+	~CCommDbTest041_14();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.15
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_15) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_15();
+	~CCommDbTest041_15();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.16
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_16) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_16();
+	~CCommDbTest041_16();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.17
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_17) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_17();
+	~CCommDbTest041_17();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+////////////////////
+//	Test step 041.18
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_18) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_18();
+	~CCommDbTest041_18();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+
+
+
+////////////////////
+//	Test step 041.19
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_19) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_19();
+	~CCommDbTest041_19();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 041.20
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_20) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_20();
+	~CCommDbTest041_20();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 041.21
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_21) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_21();
+	~CCommDbTest041_21();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 041.22
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_22) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_22();
+	~CCommDbTest041_22();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 041.23
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_23) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_23();
+	~CCommDbTest041_23();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 041.24
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_24) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_24();
+	~CCommDbTest041_24();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 041.25
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_25) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_25();
+	~CCommDbTest041_25();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 041.26
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_26) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_26();
+	~CCommDbTest041_26();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 041.27
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_27) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_27();
+	~CCommDbTest041_27();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 041.28
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_28) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_28();
+	~CCommDbTest041_28();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 041.20
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_29) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_29();
+	~CCommDbTest041_29();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 041.30
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_30) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_30();
+	~CCommDbTest041_30();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 041.31
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_31) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_31();
+	~CCommDbTest041_31();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 041.32
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_32) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_32();
+	~CCommDbTest041_32();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 041.33
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_33) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_33();
+	~CCommDbTest041_33();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+////////////////////
+//	Test step 041.34
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest041_34) : public CTestStepCommDb
+{
+public:
+	CCommDbTest041_34();
+	~CCommDbTest041_34();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+
+#endif //__STEP_041_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_042_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,70 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 042.XX group of scenarios 
+
+#include<cdbover.h>
+
+#if (!defined __STEP_042_XX_H__)
+#define __STEP_042_XX_H__
+
+
+////////////////////
+//	Test step 042.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest042_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest042_01();
+	~CCommDbTest042_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+};
+
+////////////////////
+//	Test step 042.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest042_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest042_02();
+	~CCommDbTest042_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+};
+
+////////////////////
+//	Test step 042.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest042_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest042_03();
+	~CCommDbTest042_03();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_042_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_043_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,114 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 043.XX group of scenarios 
+
+#include<cdbover.h>
+
+#if (!defined __STEP_043_XX_H__)
+#define __STEP_043_XX_H__
+
+
+////////////////////
+//	Test step 043.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest043_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest043_01();
+	~CCommDbTest043_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 043.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest043_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest043_02();
+	~CCommDbTest043_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 043.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest043_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest043_03();
+	~CCommDbTest043_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 043.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest043_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest043_04();
+	~CCommDbTest043_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 043.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest043_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest043_05();
+	~CCommDbTest043_05();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_043_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_044_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,70 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 044.XX group of scenarios 
+
+#if (!defined __STEP_044_XX_H__)
+#define __STEP_044_XX_H__
+
+
+////////////////////
+//	Test step 044.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest044_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest044_01();
+	~CCommDbTest044_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 044.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest044_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest044_02();
+	~CCommDbTest044_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 044.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest044_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest044_03();
+	~CCommDbTest044_03();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_044_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_045_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,70 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 045.XX group of scenarios 
+
+#if (!defined __STEP_045_XX_H__)
+#define __STEP_045_XX_H__
+
+
+////////////////////
+//	Test step 045.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest045_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest045_01();
+	~CCommDbTest045_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 045.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest045_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest045_02();
+	~CCommDbTest045_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 045.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest045_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest045_03();
+	~CCommDbTest045_03();
+
+	virtual enum TVerdict doTestStepL( void );
+};
+
+#endif //__STEP_045_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_046_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,146 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 046.XX group of scenarios 
+
+#if (!defined __STEP_046_XX_H__)
+#define __STEP_046_XX_H__
+
+
+////////////////////
+//	Test step 046.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest046_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest046_01();
+	~CCommDbTest046_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 046.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest046_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest046_02();
+	~CCommDbTest046_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+	void insertTestRecordsL( TUint aQuantity );
+	void deleteLastRecordsL( TUint aQuantity );
+
+};
+
+////////////////////
+//	Test step 046.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest046_03) : public CTestStepCommDb
+{
+public:
+	struct TThreadInfo
+	{
+	TRequestStatus* iThread1Status;
+	TRequestStatus* iMainThreadStatus;
+	RThread iMainThread;
+	};
+
+	static void DoThread1TestL(TAny* aPtr);
+	CCommDbTest046_03();
+	~CCommDbTest046_03();
+
+	static TInt Thread1Function(TAny* aPtr);
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 046.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest046_04) : public CTestStepCommDb
+{
+public:
+	struct TThreadInfo
+	{
+	TRequestStatus* iStatus1;
+	TRequestStatus* iStatus2;
+	RThread iCaller;
+	};
+
+	static TInt Thread1Function(TAny* aPtr);
+	static void DoThread1TestL(TAny* aPtr);
+
+	CCommDbTest046_04();
+	~CCommDbTest046_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+};
+
+////////////////////
+//	Test step 046.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest046_05) : public CTestStepCommDb
+{
+public:
+	struct TThreadInfo
+	{
+	TRequestStatus* iStatus1;
+	RThread iCaller;
+	};
+
+	static TInt Thread1Function(TAny* aPtr);
+	static void DoThread1TestL(TAny* aPtr);
+
+	CCommDbTest046_05();
+	~CCommDbTest046_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	static TBool InsertTestRecordsL(TBool aCallerIsMainThread, TUint aQuantity, CCommsDatabase& aDb );
+	static void DeleteLastRecordsL( TBool aCallerIsMainThread, TUint aQuantity, CCommsDatabase& aDb );
+	static void RandomDelay(TInt64 &aSeed);
+	static void PrintDebug(TPtrC aString);
+};
+#endif //__STEP_046_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_047_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,153 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 047.XX group of scenarios 
+
+
+NONSHARABLE_CLASS(CCommDbTest047_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest047_01();
+	~CCommDbTest047_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+};
+
+NONSHARABLE_CLASS(CCommDbTest047_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest047_02();
+	~CCommDbTest047_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+};
+
+NONSHARABLE_CLASS(CCommDbTest047_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest047_03();
+	~CCommDbTest047_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+};
+
+NONSHARABLE_CLASS(CCommDbTest047_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest047_04();
+	~CCommDbTest047_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 047.05
+////////////////////
+NONSHARABLE_CLASS(CCommDbTest047_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest047_05();
+	~CCommDbTest047_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+};
+
+////////////////////
+//	Test step 047.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest047_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest047_06();
+	~CCommDbTest047_06();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 047.07
+////////////////////
+NONSHARABLE_CLASS(CCommDbTest047_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest047_07();
+	~CCommDbTest047_07();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+};
+
+////////////////////
+//	Test step 047.08
+////////////////////
+NONSHARABLE_CLASS(CCommDbTest047_08) : public CTestStepCommDb
+{
+public:
+	CCommDbTest047_08();
+	~CCommDbTest047_08();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommsDbConnectionPrefTableView* iPrefView;
+};
+
+////////////////////
+//	Test step 047.13
+////////////////////
+NONSHARABLE_CLASS(CCommDbTest047_13) : public CTestStepCommDb
+{
+public:
+	CCommDbTest047_13();
+	~CCommDbTest047_13();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_061_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,94 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 061.XX group of scenarios 
+
+#if (!defined __STEP_061_XX_H__)
+#define __STEP_061_XX_H__
+
+
+NONSHARABLE_CLASS(CCommDbTest061_xx) : public CTestStepCommDb
+{
+protected:
+	CCommsDbTableView *OpenIspTable(CCommsDatabase* aDb, TInt &NoOfRows, TInt ExpectedCount);
+
+};
+
+////////////////////
+//	Test step 061.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest061_01) : public CCommDbTest061_xx
+{
+public:
+	CCommDbTest061_01();
+	~CCommDbTest061_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+};
+
+////////////////////
+//	Test step 061.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest061_02) : public CCommDbTest061_xx
+{
+public:
+	CCommDbTest061_02();
+	~CCommDbTest061_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+};
+
+////////////////////
+//	Test step 061.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest061_03) : public CCommDbTest061_xx
+{
+public:
+	CCommDbTest061_03();
+	~CCommDbTest061_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+};
+
+////////////////////
+//	Test step 061.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest061_04) : public CCommDbTest061_xx
+{
+public:
+	CCommDbTest061_04();
+	~CCommDbTest061_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+};
+
+
+#endif //__STEP_061_XX_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_062_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,122 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 062.XX group of scenarios 
+
+
+#if (!defined __STEP_062_XX_H__)
+#define __STEP_062_XX_H__
+
+
+////////////////////
+//	Test step 062.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest062_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest062_01();
+	~CCommDbTest062_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 062.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest062_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest062_02();
+	~CCommDbTest062_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 062.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest062_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest062_03();
+	~CCommDbTest062_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 062.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest062_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest062_04();
+	~CCommDbTest062_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+
+};
+
+////////////////////
+//	Test step 062.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest062_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest062_05();
+	~CCommDbTest062_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+	TVerdict doTestStepPostambleL();
+
+private:
+	CCommDbOverrideSettings* iOverSet;
+
+};
+
+
+
+#endif //(__STEP_062_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Step_064_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,41 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 064.XX group of scenarios 
+
+
+#if (!defined __STEP_064_XX_H__)
+#define __STEP_064_XX_H__
+
+
+////////////////////
+//	Test step 064.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest064_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest064_01();
+	~CCommDbTest064_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+
+private:
+
+};
+
+#endif //(__STEP_064_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/TE_commdbServer.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,49 @@
+/*
+* 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:
+*
+*/
+
+#if (!defined __TE_commdbSUITE_H__)
+#define __TE_commdbSUITE_H__
+
+#include <test/TestExecuteServerBase.h>
+
+class CTE_commdbServer : public CTestServer
+	{
+public:
+	static CTE_commdbServer* NewL();
+	virtual CTestStep* CreateTestStep(const TDesC& aStepName);
+	
+	
+	// this should be a pure virtual so every test ddl
+	// has to provide a version but for now defaults to ?.?
+	virtual TPtrC GetVersion( void );
+		
+	};
+
+	
+// these values have been copied from Testenv.h
+const TInt KSmallBufSize = 256;
+const TInt KLargeBufSize = 2048;
+const TInt KHugeBufSize = 16384;
+
+// CommDb test macros copied from Testenv.h
+typedef TBuf8<KLargeBufSize> TLargeBuf;
+#define IPADDR(a,b,c,d) (TUint32)(((a)<<24)|((b)<<16)|((c)<<8)|(d))
+
+//Test suite parameters
+const TInt KHeapFailure	= 500;
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/Teststepcommdb.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,132 @@
+/*
+* 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:
+*
+*/
+// This contains CTestCaseCommDb which is the base class for all 
+// the CommDb suite test cases
+
+#if (!defined __COMMDBTESTSTEP_H__)
+#define __COMMDBTESTSTEP_H__
+
+#include "TE_commdbServer.h"
+
+_LIT(KCommDbName, "C:\\private\\100012a5\\DBS_10004e1d_CDBV3.DAT");
+
+
+class CTestSuite;
+class CTestSuiteCommDb;
+class CCommsDatabase;
+class CCommsDbTableView;
+class CCommsDbProtectTableView;
+class CCommsDbProtectConnectPrefTableView;
+
+NONSHARABLE_CLASS(CTestStepCommDb) : public CTestStep
+{
+public:
+	CTestStepCommDb();
+	~CTestStepCommDb();
+
+	// pointer to suite which owns this test 
+	CTestSuiteCommDb * iCommDbSuite;
+
+	//Functions to set and clear the database objects that will
+	//be used by test steps derived from this class.
+	//This prevents the test steps from creating their own database objects
+	void setRemoteDatabaseObjects( CCommsDatabase* aDb, CCommsDbTableView* aDbView );
+	void clearRemoteDatabaseObjects();
+
+	TInt executeStep( CTestStepCommDb& aTestStep );
+	TInt executeStep( );
+	virtual TInt executeStepL();
+	TVerdict doTestStepPostambleL();
+	TInt doTestStepWithHeapFailureL( CTestStepCommDb& aTestStep, TInt aReturnValue );
+	TInt doTestStepWithHeapFailureDb( CTestStepCommDb& aTestStep, TInt aReturnValue );
+
+	enum TDatabaseNumber
+		{
+		EDatabase_1,		//Records in ISP tables only
+		EDatabase_7			//No records
+		};
+	TInt copyTestDatabase( TDatabaseNumber aDbNumber );
+	TInt copyDatabaseToDefault( TDatabaseNumber aDbNumber );
+	void copyFileL (const TDesC& anOld,const TDesC& aNew);
+	void deleteFileL (const TDesC& aFileName);
+
+	void DeleteCurrentDatabaseL();
+	void CopyDatabaseL(const TDesC& aSource);
+
+
+	//Pointers to the current database objects
+	CCommsDatabase*		iTheDb;
+	CCommsDbTableView*	iTheView;
+
+
+protected:
+	//Set by derived steps when local database objects have been allocated
+	TBool	iLocalObjects;
+
+	//Opens a database object and assigns it to iTheDb
+	TBool openDbL();
+	//Opens a database and a table view, assigns them to iTheDb and iTheView
+	TBool openDbAndViewL( const TDesC16& aTable );
+	//Releases any objects assigned to iTheDb and iTheView
+	void popAndDestroyDatabaseObjects();
+
+	TInt ChangeCPRankingL(CCommsDbProtectConnectPrefTableView* aTable, TUint32& Ranking);
+	//Functions needed for Protection tests
+	void    CheckTableIsProtectedL(CCommsDbProtectTableView* aTable);
+	void    CheckTableIsNotProtectedL(CCommsDbProtectTableView* aTable);
+	void    GoToPositionL(CCommsDbProtectTableView* aTable,TInt aPos);
+
+	void    UpdateRecordL   (CCommsDbProtectTableView* aTable,TInt aResult);
+	void    DeleteRecordL   (CCommsDbProtectTableView* aTable,TInt aResult);
+	void    InsertRecordL   (CCommsDbProtectTableView* aTable,TInt aResult);
+	void    ModifyRecordL   (CCommsDbProtectTableView* aTable);
+	void    PopulateInsertedRecordL(CCommsDbProtectTableView* aTable);
+
+	void    CheckTableIsProtectedL(CCommsDbProtectConnectPrefTableView* aTable);
+	void    CheckTableIsNotProtectedL(CCommsDbProtectConnectPrefTableView* aTable);
+	void    GoToPositionL(CCommsDbProtectConnectPrefTableView* aTable,TInt aPos);
+
+	void    UpdateRecordL   (CCommsDbProtectConnectPrefTableView* aTable,TInt aResult);
+	void    DeleteRecordL   (CCommsDbProtectConnectPrefTableView* aTable,TInt aResult);
+	void    InsertRecordL   (CCommsDbProtectConnectPrefTableView* aTable,TInt aResult);
+	void    ModifyRecordL   (CCommsDbProtectConnectPrefTableView* aTable);
+	void    PopulateInsertedRecordL(CCommsDbProtectConnectPrefTableView* aTable);
+
+	void    CheckRecordAccessL(CCommsDbProtectConnectPrefTableView* aTable, TInt aExpectedAccess);
+
+	void    ProtectRecordL  (CCommsDbProtectTableView* aTable,TInt aResult);
+	void    UnprotectRecordL(CCommsDbProtectTableView* aTable,TInt aResult);
+
+    void    ProtectRecordL(CCommsDbProtectConnectPrefTableView* aTable, TInt aResult);
+	void    UnprotectRecordL(CCommsDbProtectConnectPrefTableView* aTable,TInt aResult);
+
+
+private:
+	//Set when remote database object are in use
+	TBool	iRemoteObjects;
+
+};
+
+#define CDBLEAVE( exp1, exp2 )			{	\
+											TInt _r;	\
+											_r = (exp1);  \
+											if ( _r!=exp2 ) User::Leave(_r);\
+										}
+
+_LIT(KInvalidColumnName, "InvalidColumn");
+
+#endif /* __COMMDBTESTSTEP_H__ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/step_001_01.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,113 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 001.01
+
+
+#if (!defined __STEP_001_01_H__)
+#define __STEP_001_01_H__
+
+NONSHARABLE_CLASS(CCommDbTest001_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest001_01();
+	~CCommDbTest001_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	virtual enum TVerdict doTestStepPreambleL();
+
+};
+
+NONSHARABLE_CLASS(CCommDbTest001_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest001_03();
+	~CCommDbTest001_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+
+};
+
+NONSHARABLE_CLASS(CCommDbTest001_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest001_04();
+	~CCommDbTest001_04();
+
+	virtual enum TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+
+};
+
+NONSHARABLE_CLASS(CCommDbTest001_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest001_05();
+	~CCommDbTest001_05();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	virtual enum TVerdict doTestStepPreambleL();
+
+};
+
+NONSHARABLE_CLASS(CCommDbTest001_07) : public CTestStepCommDb
+{
+public:
+	CCommDbTest001_07();
+	~CCommDbTest001_07();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+
+};
+
+NONSHARABLE_CLASS(CCommDbTest001_08) : public CTestStepCommDb
+{
+public:
+	CCommDbTest001_08();
+	~CCommDbTest001_08();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+
+};
+
+NONSHARABLE_CLASS(CCommDbTest001_09) : public CTestStepCommDb
+{
+public:
+	CCommDbTest001_09();
+	~CCommDbTest001_09();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+
+};
+
+NONSHARABLE_CLASS(CCommDbTest001_10) : public CTestStepCommDb
+{
+public:
+	CCommDbTest001_10();
+	~CCommDbTest001_10();
+
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+#endif //(__STEP_001_01_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/step_002_01.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,33 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 001.01
+
+
+#if (!defined __STEP_002_01_H__)
+#define __STEP_002_01_H__
+
+NONSHARABLE_CLASS(CCommDbTest002_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest002_01();
+	~CCommDbTest002_01();
+
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+#endif //(__STEP_002_01_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/step_004_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,132 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 004.XX group of scenarios 
+
+
+#if (!defined __STEP_004_XX_H__)
+#define __STEP_004_XX_H__
+
+
+////////////////////
+//	Test step 004.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest004_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest004_01();
+	~CCommDbTest004_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 004.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest004_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest004_02();
+	~CCommDbTest004_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TBool executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+
+};
+
+////////////////////
+//	Test step 004.03
+////////////////////
+
+//Removed since this test will not compile on Code warrior due to having an array of zero length
+
+NONSHARABLE_CLASS(CCommDbTest004_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest004_03();
+	~CCommDbTest004_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TBool executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 004.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest004_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest004_04();
+	~CCommDbTest004_04();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+
+};
+
+////////////////////
+//	Test step 004.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest004_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest004_05();
+	~CCommDbTest004_05();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+
+};
+
+////////////////////
+//	Test step 004.06
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest004_06) : public CTestStepCommDb
+{
+public:
+	CCommDbTest004_06();
+	~CCommDbTest004_06();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+
+};
+
+#endif //(__STEP_004_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/step_005_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,95 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 005.XX group of scenarios 
+
+
+#if (!defined __STEP_005_XX_H__)
+#define __STEP_005_XX_H__
+
+
+////////////////////
+//	Test step 005.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest005_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest005_01();
+	~CCommDbTest005_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict	doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 005.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest005_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest005_02();
+	~CCommDbTest005_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TBool executeStepL();
+	TVerdict	doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 005.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest005_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest005_03();
+	~CCommDbTest005_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TBool executeStepL();
+	TVerdict	doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 005.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest005_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest005_04();
+	~CCommDbTest005_04();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+#endif //(__STEP_005_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/step_006_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,113 @@
+/*
+* 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:
+*
+*/
+// This is the header file for CommDb test 006.XX group of scenarios 
+
+
+#if (!defined __STEP_006_XX_H__)
+#define __STEP_006_XX_H__
+
+
+////////////////////
+//	Test step 006.01
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest006_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest006_01();
+	~CCommDbTest006_01();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 006.02
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest006_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest006_02();
+	~CCommDbTest006_02();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+
+////////////////////
+//	Test step 006.03
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest006_03) : public CTestStepCommDb
+{
+public:
+	CCommDbTest006_03();
+	~CCommDbTest006_03();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 006.04
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest006_04) : public CTestStepCommDb
+{
+public:
+	CCommDbTest006_04();
+	~CCommDbTest006_04();
+
+	virtual enum TVerdict doTestStepL( void );
+	TInt executeStepL();
+	TVerdict doTestStepPreambleL();
+
+private:
+
+};
+
+////////////////////
+//	Test step 006.05
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest006_05) : public CTestStepCommDb
+{
+public:
+	CCommDbTest006_05();
+	~CCommDbTest006_05();
+
+	virtual enum TVerdict doTestStepL( void );
+
+private:
+
+};
+
+#endif //(__STEP_006_XX_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/step_051_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,49 @@
+/*
+* 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:
+*
+*/ 
+
+#if !defined(__STEP051_01_H__)
+#define __STEP051_01_H__
+
+
+////////////////////
+//Normal Table protection
+////////////////////
+
+NONSHARABLE_CLASS(CCommDbTest051_01) : public CTestStepCommDb
+{
+public:
+	CCommDbTest051_01();
+	virtual ~CCommDbTest051_01();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+};
+
+
+////////////////////
+//Normal Table Unprotection
+////////////////////
+NONSHARABLE_CLASS(CCommDbTest051_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest051_02();
+	virtual ~CCommDbTest051_02();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+#endif 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/step_052_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,47 @@
+/*
+* 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:
+*
+*/ 
+ 
+#if !defined(__STEP_052_XX_H__)
+#define __STEP_052_XX_H__
+
+
+
+NONSHARABLE_CLASS(CCommDbTest052_01 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest052_01();
+	virtual ~CCommDbTest052_01();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+
+////////////////////
+//Normal Table Unprotection
+////////////////////
+NONSHARABLE_CLASS(CCommDbTest052_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest052_02();
+	virtual ~CCommDbTest052_02();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/step_053_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,50 @@
+/*
+* 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:
+*
+*/ 
+ 
+#if !defined(__STEP_053_XX_H__)
+#define __STEP_053_XX_H__
+
+////////////////////
+//Connection Pref Table Protection
+////////////////////
+
+
+NONSHARABLE_CLASS(CCommDbTest053_01 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest053_01();
+	virtual ~CCommDbTest053_01();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+
+////////////////////
+//Connection Pref Table Unprotection
+////////////////////
+NONSHARABLE_CLASS(CCommDbTest053_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest053_02();
+	virtual ~CCommDbTest053_02();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/step_054_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,47 @@
+/*
+* 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:
+*
+*/ 
+ 
+#if !defined(__STEP_054_XX_H__)
+#define __STEP_054_XX_H__
+
+
+
+NONSHARABLE_CLASS(CCommDbTest054_01 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest054_01();
+	virtual ~CCommDbTest054_01();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+
+////////////////////
+//Normal Table Unprotection
+////////////////////
+NONSHARABLE_CLASS(CCommDbTest054_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest054_02();
+	virtual ~CCommDbTest054_02();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/step_055_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,44 @@
+/*
+* 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:
+*
+*/ 
+ 
+#if !defined(__STEP_055_XX_H__)
+#define __STEP_055_XX_H__
+
+
+
+NONSHARABLE_CLASS(CCommDbTest055_01 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest055_01();
+	virtual ~CCommDbTest055_01();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+
+NONSHARABLE_CLASS(CCommDbTest055_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest055_02();
+	virtual ~CCommDbTest055_02();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/step_056_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,44 @@
+/*
+* 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:
+*
+*/ 
+ 
+#if !defined(__STEP_056_XX_H__)
+#define __STEP_056_XX_H__
+
+
+
+NONSHARABLE_CLASS(CCommDbTest056_01 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest056_01();
+	virtual ~CCommDbTest056_01();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+
+NONSHARABLE_CLASS(CCommDbTest056_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest056_02();
+	virtual ~CCommDbTest056_02();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/step_057_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,44 @@
+/*
+* 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:
+*
+*/ 
+ 
+#if !defined(__STEP_057_XX_H__)
+#define __STEP_057_XX_H__
+
+
+
+NONSHARABLE_CLASS(CCommDbTest057_01 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest057_01();
+	virtual ~CCommDbTest057_01();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+
+NONSHARABLE_CLASS(CCommDbTest057_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest057_02();
+	virtual ~CCommDbTest057_02();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/step_058_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,44 @@
+/*
+* 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:
+*
+*/ 
+ 
+#if !defined(__STEP_058_XX_H__)
+#define __STEP_058_XX_H__
+
+
+
+NONSHARABLE_CLASS(CCommDbTest058_01 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest058_01();
+	virtual ~CCommDbTest058_01();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+
+NONSHARABLE_CLASS(CCommDbTest058_02) : public CTestStepCommDb
+{
+public:
+	CCommDbTest058_02();
+	virtual ~CCommDbTest058_02();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/step_059_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,53 @@
+/*
+* 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:
+*
+*/ 
+ 
+#if !defined(__STEP_059_XX_H__)
+#define __STEP_059_XX_H__
+
+
+
+NONSHARABLE_CLASS(CCommDbTest059_01 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest059_01();
+	virtual ~CCommDbTest059_01();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+//PAnic Test
+NONSHARABLE_CLASS(CCommDbTest060_01 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest060_01();
+	virtual ~CCommDbTest060_01();
+	TVerdict doTestStepPreambleL();
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+NONSHARABLE_CLASS(CCommDbTest060_02 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest060_02();
+	virtual ~CCommDbTest060_02();
+	virtual enum TVerdict doTestStepL( void );	
+	void ProtectISPTableL(CCommsDatabase*);
+	void RemoveProtectionL(CCommsDatabase*);
+};
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/inc/step_063_xx.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,108 @@
+/*
+* 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:
+*
+*/ 
+
+#include "comms-infras/commdb/protection/protectdb.h"
+#include "comms-infras/commdb/protection/protectcpdb.h"
+ 
+#if !defined(__STEP_063_XX_H__)
+#define __STEP_063_XX_H__
+
+NONSHARABLE_CLASS(CCommDbTest063_01 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest063_01();
+	virtual ~CCommDbTest063_01();
+	virtual enum TVerdict doTestStepL( void );
+private:
+	CCommsDatabaseProtect* iTheProtectedDb;
+};
+
+NONSHARABLE_CLASS(CCommDbTest063_02 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest063_02();
+	virtual ~CCommDbTest063_02();
+	virtual enum TVerdict doTestStepL( void );
+private:
+	CCommsDatabaseProtect* iTheProtectedDb;
+};
+
+NONSHARABLE_CLASS(CCommDbTest063_03 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest063_03();
+	virtual ~CCommDbTest063_03();
+	virtual enum TVerdict doTestStepL( void );
+private:
+	CCommsDatabaseProtect* iTheProtectedDb;
+};
+
+NONSHARABLE_CLASS(CCommDbTest063_04 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest063_04();
+	virtual ~CCommDbTest063_04();
+	virtual enum TVerdict doTestStepL( void );
+private:
+	CCommsDatabaseProtect* iTheProtectedDb;
+};
+
+#endif
+
+
+
+
+NONSHARABLE_CLASS(CCommDbTest063_05 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest063_05();
+	virtual ~CCommDbTest063_05();
+	virtual enum TVerdict doTestStepL( void );
+private:
+	CCommsDatabaseProtect* iTheProtectedDb;
+};
+
+NONSHARABLE_CLASS(CCommDbTest063_06 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest063_06();
+	virtual ~CCommDbTest063_06();
+	virtual enum TVerdict doTestStepL( void );
+private:
+	CCommsDatabaseProtect* iTheProtectedDb;
+};
+
+NONSHARABLE_CLASS(CCommDbTest063_07 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest063_07();
+	virtual ~CCommDbTest063_07();
+	virtual enum TVerdict doTestStepL( void );
+private:
+	CCommsDatabaseProtect* iTheProtectedDb;
+};
+
+NONSHARABLE_CLASS(CCommDbTest063_08 ) : public CTestStepCommDb
+{
+public:
+	CCommDbTest063_08();
+	virtual ~CCommDbTest063_08();
+	virtual enum TVerdict doTestStepL( void );
+private:
+	CCommsDatabaseProtect* iTheProtectedDb;
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/008.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,34 @@
+// 
+// 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:
+// 
+// //
+PRINT example CommDb test
+PRINT 
+//
+LOAD_SUITE TS_CommDb.dll
+
+MULTITHREAD
+
+RUN_TEST_STEP -1, TS_CommDb,step_008_01
+TEST_COMPLETE 
+
+RUN_TEST_STEP -1, TS_CommDb,step_008_02
+TEST_COMPLETE 
+
+RUN_TEST_STEP -1, TS_CommDb,step_008_03
+TEST_COMPLETE 
+
+RUN_TEST_STEP -1, TS_CommDb,step_008_04
+TEST_COMPLETE 
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/020.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,259 @@
+<!--
+* 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:
+*
+-->
+
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>record1</Name>
+        <IAPService>DialOutISP.record1</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>record2</Name>
+        <IAPService>DialOutISP.record2</IAPService>
+        <ChargecardRef>Chargecard.Dummy Mercury Chargecard</ChargecardRef>
+    </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+</ModemBearerTable>
+
+<LANBearerTable>
+</LANBearerTable>
+
+<LANServiceTable>
+</LANServiceTable>
+
+<DialInISPTable>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="add">
+        <Name>record1</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>1243</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfName>ppp</IfName>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>me</IfAuthName>
+        <IfAuthPass>wt</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>TRUE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>48</ChannelCoding>
+        <AIUR>9600</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>record2</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>435t</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfName>ppp</IfName>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>fgh</IfAuthName>
+        <IfAuthPass>dfgb</IfAuthPass>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>TRUE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+    <Chargecard operation="add">
+        <Name>Dummy BT Chargecard</Name>
+        <AccountNumber>144,12345678</AccountNumber>
+        <Pin>0000</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>HFG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+    <Chargecard operation="add">
+        <Name>Dummy Mercury Chargecard</Name>
+        <AccountNumber>0500800800,,12345678</AccountNumber>
+        <Pin>****</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>J,K,0FG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsBearer>2</SmsBearer>
+        <SmsReceiveMode>2</SmsReceiveMode>
+        <GPRSAttachMode>1</GPRSAttachMode>
+        <AcceptIncomingGprs>1</AcceptIncomingGprs>
+        <ConnectionAttempts>2</ConnectionAttempts>
+        <GPRSClassCBearer>GSM</GPRSClassCBearer>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+</DefaultGPRSTable>
+
+<ProxyTable>
+</ProxyTable>
+
+<LocationTable>
+    <Location operation="add">
+        <Name>Default Location</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+        <DialOutCode>9,</DialOutCode>
+    </Location>
+    <Location operation="add">
+        <Name>Mobile</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/021.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,306 @@
+<!--
+* 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:
+*
+-->
+
+
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>record1</Name>
+        <IAPService>DialOutISP.record1</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>record2</Name>
+        <IAPService>DialOutISP.record2</IAPService>
+        <ChargecardRef>Chargecard.Dummy Mercury Chargecard</ChargecardRef>
+    </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+</ModemBearerTable>
+
+<LANBearerTable>
+</LANBearerTable>
+
+<LANServiceTable>
+</LANServiceTable>
+
+<DialInISPTable>
+    <DialInISP operation="template">
+        <Name>Default Dial In ISP</Name> 
+        <UseLoginScript>FALSE</UseLoginScript> 
+        <IpAddrFromServer>TRUE</IpAddrFromServer> 
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer> 
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp> 
+        <EnableLCPExtension>FALSE</EnableLCPExtension> 
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth> 
+        <EnableSWComp>FALSE</EnableSWComp> 
+        <UseEdge>FALSE</UseEdge> 
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Record #1</Name> 
+        <UseLoginScript>FALSE</UseLoginScript> 
+        <IpAddrFromServer>TRUE</IpAddrFromServer> 
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer> 
+        <Authentication>0</Authentication> 
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp> 
+        <EnableLCPExtension>FALSE</EnableLCPExtension> 
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth> 
+        <EnableSWComp>FALSE</EnableSWComp> 
+        <BearerName>ASYNCHRONOUS</BearerName> 
+        <BearerSpeed>UNSPECIFIED</BearerSpeed> 
+        <BearerCE>UNSPECIFIED</BearerCE> 
+        <UseEdge>FALSE</UseEdge> 
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Record #2</Name> 
+        <UseLoginScript>FALSE</UseLoginScript> 
+        <IpAddrFromServer>FALSE</IpAddrFromServer> 
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer> 
+        <LoginScript>New Record</LoginScript> 
+        <Authentication>0</Authentication> 
+        <IfNetworks>ip</IfNetworks> 
+        <IpAddr>New Record</IpAddr> 
+        <IpNameServer1>New Record</IpNameServer1> 
+        <IpNameServer2>New Record</IpNameServer2> 
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp> 
+        <EnableLCPExtension>FALSE</EnableLCPExtension> 
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth> 
+        <EnableSWComp>FALSE</EnableSWComp> 
+        <BearerName>ASYNCHRONOUS</BearerName> 
+        <BearerSpeed>UNSPECIFIED</BearerSpeed> 
+        <BearerCE>UNSPECIFIED</BearerCE> 
+        <UseEdge>FALSE</UseEdge> 
+    </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="add">
+        <Name>record1</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>1243</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfName>ppp</IfName>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>me</IfAuthName>
+        <IfAuthPass>wt</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>TRUE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>48</ChannelCoding>
+        <AIUR>9600</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>record2</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>435t</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfName>ppp</IfName>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>fgh</IfAuthName>
+        <IfAuthPass>dfgb</IfAuthPass>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>TRUE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+    <Chargecard operation="add">
+        <Name>Dummy BT Chargecard</Name>
+        <AccountNumber>144,12345678</AccountNumber>
+        <Pin>0000</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>HFG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+    <Chargecard operation="add">
+        <Name>Dummy Mercury Chargecard</Name>
+        <AccountNumber>0500800800,,12345678</AccountNumber>
+        <Pin>****</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>J,K,0FG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsBearer>2</SmsBearer>
+        <SmsReceiveMode>2</SmsReceiveMode>
+        <GPRSAttachMode>1</GPRSAttachMode>
+        <AcceptIncomingGprs>1</AcceptIncomingGprs>
+        <ConnectionAttempts>2</ConnectionAttempts>
+        <GPRSClassCBearer>GSM</GPRSClassCBearer>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+</DefaultGPRSTable>
+
+<ProxyTable>
+</ProxyTable>
+
+<LocationTable>
+    <Location operation="add">
+        <Name>Default Location</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+        <DialOutCode>9,</DialOutCode>
+    </Location>
+    <Location operation="add">
+        <Name>Mobile</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/022.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,815 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+* 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:
+*
+-->
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+    <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>Record #1</Name>
+        <IAPService>DialOutISP.Record #1</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office Direct Dial</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #5</Name>
+        <IAPService>OutgoingGPRS.Record #5</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #2</Name>
+        <IAPService>DialOutISP.Record #2</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #3</Name>
+        <IAPService>DialInISP.Record #3</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Home</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #7</Name>
+        <IAPService>OutgoingGPRS.Record #5</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #4</Name>
+        <IAPService>DialInISP.Record #4</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #6</Name>
+        <IAPService>DialInISP.Record #4</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #9</Name>
+        <IAPService>IncomingGPRS.Record #9</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #10</Name>
+        <IAPService>IncomingGPRS.Record #10</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #11</Name>
+        <IAPService>LANService.Record #11</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #12</Name>
+        <IAPService>LANService.Record #12</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+    <ModemBearer operation="template">
+        <Name>Default Modem</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>0</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>Null Modem 115200bps</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>NTRASTSY</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageValidityPeriod>0</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+</ModemBearerTable>
+
+<LANBearerTable>
+    <LANBearer operation="add">
+        <Name>Dummy LAN Bearer</Name>
+        <Agent>PSD.agt</Agent>
+        <IfName>ppp</IfName>
+        <LDDName>Dummy LDD</LDDName>
+        <PDDName>Dummy PDD</PDDName>
+    </LANBearer>
+</LANBearerTable>
+
+<LANServiceTable>
+    <LANService operation="add">
+        <Name>Record #11</Name>
+        <IfNetworks>ip,ip6</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>194.72.6.1</IpGateway>
+        <IpAddr>192.168.0.100</IpAddr>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.52</IpNameServer2>
+    </LANService>
+    <LANService operation="add">
+        <Name>Record #12</Name>
+        <IfNetworks>New Record</IfNetworks>
+        <IpNetMask>0.0.0.0</IpNetMask>
+        <IpGateway>0.0.0.0</IpGateway>
+        <IpAddr>0.0.0.0</IpAddr>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>0.0.0.0</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+    </LANService>
+</LANServiceTable>
+
+<DialInISPTable>
+    <DialInISP operation="template">
+        <Name>Default Dial In ISP</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Record #3</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Authentication>0</Authentication>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Record #4</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <LoginScript>New Record</LoginScript>
+        <Authentication>0</Authentication>
+        <IfNetworks>ip</IfNetworks>
+        <IpAddr>New Record</IpAddr>
+        <IpNameServer1>New Record</IpNameServer1>
+        <IpNameServer2>New Record</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="template">
+        <Name>Default Dial Out ISP</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>TRUE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Record #1</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>TRUE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND &quot;CLIENT&quot;+&lt;0x0d&gt;\nWAIT 3\n{\n&quot;SERVER&quot; OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>9600</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Record #2</Name>
+        <DialResolution>FALSE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <LoginScript>New Record</LoginScript>
+        <LoginName>New Record</LoginName>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>New Record</IfAuthName>
+        <IfAuthPass>New Record</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <IfCallbackType>IETF0</IfCallbackType>
+        <IfCallbackInfo>New Record</IfCallbackInfo>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpAddr>New Record</IpAddr>
+        <IpNameServer1>New Record</IpNameServer1>
+        <IpNameServer2>New Record</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>9600</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<ChargecardTable>
+    <Chargecard operation="add">
+        <Name>Dummy BT Chargecard</Name>
+        <AccountNumber>144,12345678</AccountNumber>
+        <Pin>0000</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>HFG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+    <Chargecard operation="add">
+        <Name>Dummy Mercury Chargecard</Name>
+        <AccountNumber>0500800800,,12345678</AccountNumber>
+        <Pin>****</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>J,K,0FG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>2</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>PROMPT</DialogPref>
+        <BearerSet>PSD</BearerSet>
+        <IAPRef>IAP.Record #5</IAPRef>
+    </ConnectionPreferences>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable2</Name>
+        <Ranking>0</Ranking>
+        <Direction>INCOMING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.Record #3</IAPRef>
+    </ConnectionPreferences>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable3</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>PROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.Record #1</IAPRef>
+    </ConnectionPreferences>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsBearer>2</SmsBearer>
+        <SmsReceiveMode>2</SmsReceiveMode>
+        <GPRSAttachMode>1</GPRSAttachMode>
+        <AcceptIncomingGprs>1</AcceptIncomingGprs>
+        <ConnectionAttempts>2</ConnectionAttempts>
+        <ModemForDataAndFax>2</ModemForDataAndFax>
+        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
+        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
+        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
+        <GPRSClassCBearer>GSM</GPRSClassCBearer>
+        <DefaultNetwork>Network.Intranet</DefaultNetwork>
+        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+    <IncomingGPRS operation="add">
+        <Name>Record #9</Name>
+        <APN>Test</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>0.0.0.0</PDPAddress>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>1</ReqPrecedence>
+        <ReqDelay>1</ReqDelay>
+        <ReqReliability>1</ReqReliability>
+        <ReqPeakThroughput>1</ReqPeakThroughput>
+        <ReqMeanThroughput>1</ReqMeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNameServer1>0.0.0.0</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </IncomingGPRS>
+    <IncomingGPRS operation="add">
+        <Name>Record #10</Name>
+        <APN>New Record</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>New Record</PDPAddress>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>1</ReqPrecedence>
+        <ReqDelay>1</ReqDelay>
+        <ReqReliability>1</ReqReliability>
+        <ReqPeakThroughput>1</ReqPeakThroughput>
+        <ReqMeanThroughput>1</ReqMeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <GprsUseEdge>TRUE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>-1</QosWarningTimeout>
+    </IncomingGPRS>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+    <OutgoingGPRS operation="add">
+        <Name>Record #5</Name>
+        <APN>Test</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>2</ReqPrecedence>
+        <ReqDelay>4</ReqDelay>
+        <ReqReliability>3</ReqReliability>
+        <ReqPeakThroughput>3</ReqPeakThroughput>
+        <ReqMeanThroughput>31</ReqMeanThroughput>
+        <MinPrecedence>2</MinPrecedence>
+        <MinDelay>4</MinDelay>
+        <MinReliability>3</MinReliability>
+        <MinPeakThroughput>3</MinPeakThroughput>
+        <MinMeanThroughput>31</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.51</IpNameServer2>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>Record #6</Name>
+        <APN>New Record</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>New Record</PDPAddress>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>2</ReqPrecedence>
+        <ReqDelay>4</ReqDelay>
+        <ReqReliability>3</ReqReliability>
+        <ReqPeakThroughput>3</ReqPeakThroughput>
+        <ReqMeanThroughput>31</ReqMeanThroughput>
+        <MinPrecedence>2</MinPrecedence>
+        <MinDelay>4</MinDelay>
+        <MinReliability>3</MinReliability>
+        <MinPeakThroughput>3</MinPeakThroughput>
+        <MinMeanThroughput>31</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <GprsUseEdge>TRUE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>-1</QosWarningTimeout>
+    </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+    <DefaultGPRS operation="add">
+        <Name>Dummy Default GPRS Settings</Name>
+        <APN>Access point name</APN>
+        <PDPType>IPV6</PDPType>
+        <PDPAddress>www.wid.com</PDPAddress>
+        <Usage>1</Usage>
+        <Precedence>1</Precedence>
+        <Delay>1</Delay>
+        <Reliability>1</Reliability>
+        <PeakThroughput>1</PeakThroughput>
+        <MeanThroughput>1</MeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+    </DefaultGPRS>
+</DefaultGPRSTable>
+
+<ProxyTable>
+    <Proxy operation="add">
+        <Name>ProxyTable1</Name>
+        <ISPRef>DialOutISP.Record #1</ISPRef>
+        <UseProxyServer>TRUE</UseProxyServer>
+        <ProtocolName>http</ProtocolName>
+        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
+        <PortNumber>80</PortNumber>
+        <Exceptions>www.dummyproxy.com/exception</Exceptions>
+    </Proxy>
+</ProxyTable>
+
+<LocationTable>
+    <Location operation="template">
+        <Name>Default Location</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+        <DialOutCode>9,</DialOutCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office Direct Dial</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+    </Location>
+    <Location operation="add">
+        <Name>Mobile</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Home</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>TRUE</UsePulseDial>
+        <WaitForDialTone>TRUE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>181</AreaCode>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable1</Name>
+        <ProtocolName>ssl3.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable2</Name>
+        <ProtocolName>tls1.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+    <WAPAccessPoint operation="template">
+        <Name>Default Dial In ISP</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+    </WAPAccessPoint>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+    <WAPIPBearer operation="template">
+        <Name>WAPIPBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.-1</IAPRef>
+        <ProxyPortNumber>0</ProxyPortNumber>
+    </WAPIPBearer>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+    <WAPSMSBearer operation="template">
+        <Name>WAPSMSBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/022_30.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+* 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:
+*
+-->
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+    <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>Telia online</Name>
+		<IAPService>OutgoingGPRS.Default Outgoing Gprs</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps PSD</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+    <ModemBearer operation="template">
+        <Name>Default Modem</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::5</PortName>
+        <ControlChannelPortName>COMM::5</ControlChannelPortName>
+        <TSYName>trpat</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>0</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>Null Modem 115200bps PSD</Name>
+        <Agent>PSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::5</PortName>
+        <ControlChannelPortName>COMM::5</ControlChannelPortName>
+        <TSYName>SEMC</TSYName>
+        <CSYName>CAIFMUX</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>52</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>635040</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>600</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+</ModemBearerTable>
+
+<LANBearerTable>
+</LANBearerTable>
+
+<LANServiceTable>
+</LANServiceTable>
+
+<DialInISPTable>
+    <DialInISP operation="add">
+        <Name>Record #1</Name> 
+        <UseLoginScript>FALSE</UseLoginScript> 
+        <IpAddrFromServer>TRUE</IpAddrFromServer> 
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer> 
+        <Authentication>0</Authentication> 
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp> 
+        <EnableLCPExtension>FALSE</EnableLCPExtension> 
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth> 
+        <EnableSWComp>FALSE</EnableSWComp> 
+        <BearerName>ASYNCHRONOUS</BearerName> 
+        <BearerSpeed>UNSPECIFIED</BearerSpeed> 
+        <BearerCE>UNSPECIFIED</BearerCE> 
+        <UseEdge>FALSE</UseEdge> 
+    </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>DefaultRecordName-1</Name>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsBearer>2</SmsBearer>
+        <SmsReceiveMode>2</SmsReceiveMode>
+        <GPRSAttachMode>1</GPRSAttachMode>
+        <AcceptIncomingGprs>1</AcceptIncomingGprs>
+        <GPRSClassCBearer>GPRS</GPRSClassCBearer>
+        <ConnectionAttempts>1</ConnectionAttempts>
+        <ModemForDataAndFax>2</ModemForDataAndFax>
+        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
+        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
+        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
+        <MaxMBufHeap>2</MaxMBufHeap>
+        <DefaultNetwork>Network.Intranet</DefaultNetwork>
+        <BearerAvailabilityCheckTSY>SEMC</BearerAvailabilityCheckTSY>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+    <OutgoingGPRS operation="template">
+        <Name>Default Outgoing Gprs</Name>
+        <APN>www.sonyericsson.com</APN>
+        <PDPType>IPV4</PDPType>
+        <ReqPrecedence>1</ReqPrecedence>
+        <ReqDelay>1</ReqDelay>
+        <ReqReliability>1</ReqReliability>
+        <ReqPeakThroughput>1</ReqPeakThroughput>
+        <ReqMeanThroughput>1</ReqMeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpAddr>0.0.0.0</IpAddr>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <IpNameServer1>0.0.0.0</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>1000000</QosWarningTimeout>
+    </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+</DefaultGPRSTable>
+
+<ProxyTable>
+</ProxyTable>
+
+<LocationTable>
+    <Location operation="template">
+        <Name>Default Location</Name>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+    </Location>
+    <Location operation="add">
+        <Name>Office</Name>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+        <DialOutCode>9</DialOutCode>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+    <WAPAccessPoint operation="template">
+        <Name>Default Dial In ISP</Name> 
+        <CurrentBearer>WAPIPBearer</CurrentBearer> 
+    </WAPAccessPoint>
+    <WAPAccessPoint operation="add">
+        <Name>Dummy WAP Settings</Name> 
+        <CurrentBearer>WAPIPBearer</CurrentBearer> 
+        <StartPage>www.wapstart.com</StartPage> 
+    </WAPAccessPoint>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+    <WAPSMSBearer operation="template">
+        <Name>WAPSMSBearerTable1</Name> 
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint> 
+        <WSPOption>CONNECTIONLESS</WSPOption> 
+        <Security>FALSE</Security> 
+    </WAPSMSBearer>
+    <WAPSMSBearer operation="add">
+        <Name>WAPSMSBearerTable2</Name> 
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint> 
+        <GatewayAddress>+4412345678901</GatewayAddress> 
+        <WSPOption>CONNECTIONORIENTED</WSPOption> 
+        <Security>FALSE</Security> 
+        <ServiceCentreAddress>+442071234567</ServiceCentreAddress> 
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+<WLANServiceExtensionTable>
+</WLANServiceExtensionTable>
+
+<PANServiceExtensionsTable>
+</PANServiceExtensionsTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/023.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,506 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+* 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:
+*
+-->
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>Record #1</Name>
+        <IAPService>DialOutISP.Record #1</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #2</Name>
+        <IAPService>DialOutISP.Record #2</IAPService>
+        <ChargecardRef>Chargecard.Dummy Mercury Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #3</Name>
+        <IAPService>DialInISP.Record #1</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #4</Name>
+        <IAPService>DialInISP.Record #2</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #5</Name>
+        <IAPService>OutgoingGPRS.Record #1</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #6</Name>
+        <IAPService>OutgoingGPRS.Record #2</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #7</Name>
+        <IAPService>OutgoingGPRS.Record #2</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #8</Name>
+        <IAPService>DialInISP.Record #2</IAPService>
+        <ChargecardRef>Chargecard.Dummy Mercury Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #9</Name>
+        <IAPService>IncomingGPRS.Record #1</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #10</Name>
+        <IAPService>IncomingGPRS.Record #2</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #11</Name>
+        <IAPService>LANService.Record #1</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #12</Name>
+        <IAPService>LANService.Record #2</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+</ModemBearerTable>
+
+<LANBearerTable>
+</LANBearerTable>
+
+<LANServiceTable>
+    <LANService operation="add">
+        <Name>Record #1</Name>
+        <IfNetworks>Record #1</IfNetworks>
+        <IpNetMask>0.0.0.0</IpNetMask>
+        <IpGateway>0.0.0.0</IpGateway>
+        <IpAddr>0.0.0.0</IpAddr>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>0.0.0.0</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+    </LANService>
+    <LANService operation="add">
+        <Name>Record #2</Name>
+        <IfNetworks>Record #2</IfNetworks>
+        <IpNetMask>0.0.0.0</IpNetMask>
+        <IpGateway>0.0.0.0</IpGateway>
+        <IpAddr>0.0.0.0</IpAddr>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>0.0.0.0</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+    </LANService>
+</LANServiceTable>
+
+<DialInISPTable>
+    <DialInISP operation="add">
+        <Name>Record #1</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <LoginScript>New Record</LoginScript>
+        <Authentication>0</Authentication>
+        <IfName>ppp</IfName>
+        <IfNetworks>ip</IfNetworks>
+        <IpAddr>New Record</IpAddr>
+        <IpNameServer1>New Record</IpNameServer1>
+        <IpNameServer2>New Record</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Record #2</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <LoginScript>New Record</LoginScript>
+        <Authentication>0</Authentication>
+        <IfName>ppp</IfName>
+        <IfNetworks>ip</IfNetworks>
+        <IpAddr>New Record</IpAddr>
+        <IpNameServer1>New Record</IpNameServer1>
+        <IpNameServer2>New Record</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+    </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="add">
+        <Name>Record #1</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>1243</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfName>ppp</IfName>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>me</IfAuthName>
+        <IfAuthPass>wt</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>TRUE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>48</ChannelCoding>
+        <AIUR>9600</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Record #2</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>435t</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfName>ppp</IfName>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>fgh</IfAuthName>
+        <IfAuthPass>dfgb</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>TRUE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>48</ChannelCoding>
+        <AIUR>9600</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<ChargecardTable>
+    <Chargecard operation="add">
+        <Name>Dummy BT Chargecard</Name>
+        <AccountNumber>144,12345678</AccountNumber>
+        <Pin>0000</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>HFG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+    <Chargecard operation="add">
+        <Name>Dummy Mercury Chargecard</Name>
+        <AccountNumber>0500800800,,12345678</AccountNumber>
+        <Pin>****</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>J,K,0FG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsBearer>2</SmsBearer>
+        <SmsReceiveMode>2</SmsReceiveMode>
+        <GPRSAttachMode>1</GPRSAttachMode>
+        <AcceptIncomingGprs>1</AcceptIncomingGprs>
+        <ConnectionAttempts>2</ConnectionAttempts>
+        <GPRSClassCBearer>GSM</GPRSClassCBearer>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+    <IncomingGPRS operation="add">
+        <Name>Record #1</Name>
+        <APN>1234</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>4321</PDPAddress>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+        <IfName>New Record</IfName>
+        <AuthRetries>0</AuthRetries>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>-1</QosWarningTimeout>
+    </IncomingGPRS>
+    <IncomingGPRS operation="add">
+        <Name>Record #2</Name>
+        <APN>7890</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>0987</PDPAddress>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+        <IfName>New Record</IfName>
+        <AuthRetries>0</AuthRetries>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>-1</QosWarningTimeout>
+    </IncomingGPRS>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+    <OutgoingGPRS operation="add">
+        <Name>Record #1</Name>
+        <APN>1234</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>4321</PDPAddress>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+        <IfName>New Record</IfName>
+        <AuthRetries>0</AuthRetries>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>-1</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>Record #2</Name>
+        <APN>0987</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>7890</PDPAddress>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+        <IfName>New Record</IfName>
+        <AuthRetries>0</AuthRetries>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>-1</QosWarningTimeout>
+    </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+</DefaultGPRSTable>
+
+<ProxyTable>
+    <Proxy operation="add">
+        <Name>ProxyTable1</Name>
+        <ISPRef>DialOutISP.Record #1</ISPRef>
+        <UseProxyServer>FALSE</UseProxyServer>
+        <ProtocolName>New Record</ProtocolName>
+        <ProxyServerName>New Record</ProxyServerName>
+        <PortNumber>0</PortNumber>
+        <Exceptions>New Record</Exceptions>
+    </Proxy>
+    <Proxy operation="add">
+        <Name>ProxyTable2</Name>
+        <ISPRef>DialOutISP.Record #2</ISPRef>
+        <UseProxyServer>FALSE</UseProxyServer>
+        <ProtocolName>New Record</ProtocolName>
+        <ProxyServerName>New Record</ProxyServerName>
+        <PortNumber>0</PortNumber>
+        <Exceptions>New Record</Exceptions>
+    </Proxy>
+</ProxyTable>
+
+<LocationTable>
+    <Location operation="add">
+        <Name>Default Location</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+        <DialOutCode>9,</DialOutCode>
+    </Location>
+    <Location operation="add">
+        <Name>Mobile</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/024.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,482 @@
+<!--
+* 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:
+*
+-->
+
+
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>Record #1</Name>
+        <IAPService>DialOutISP.Record #1</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #2</Name>
+        <IAPService>DialOutISP.Record #2</IAPService>
+        <ChargecardRef>Chargecard.Dummy Mercury Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #3</Name>
+        <IAPService>DialInISP.Record #1</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #4</Name>
+        <IAPService>DialInISP.Record #2</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #5</Name>
+        <IAPService>OutgoingGPRS.Record #1</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #6</Name>
+        <IAPService>OutgoingGPRS.Record #2</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #9</Name>
+        <IAPService>IncomingGPRS.Record #1</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #10</Name>
+        <IAPService>IncomingGPRS.Record #2</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #11</Name>
+        <IAPService>LANService.Record #1</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Record #12</Name>
+        <IAPService>LANService.Record #2</IAPService>
+        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
+    </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+</ModemBearerTable>
+
+<LANBearerTable>
+</LANBearerTable>
+
+<LANServiceTable>
+    <LANService operation="add">
+        <Name>Record #1</Name>
+        <IfNetworks>Record #1</IfNetworks>
+        <IpNetMask>0.0.0.0</IpNetMask>
+        <IpGateway>0.0.0.0</IpGateway>
+        <IpAddr>0.0.0.0</IpAddr>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>0.0.0.0</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+    </LANService>
+    <LANService operation="add">
+        <Name>Record #2</Name>
+        <IfNetworks>Record #2</IfNetworks>
+        <IpNetMask>0.0.0.0</IpNetMask>
+        <IpGateway>0.0.0.0</IpGateway>
+        <IpAddr>0.0.0.0</IpAddr>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>0.0.0.0</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+    </LANService>
+</LANServiceTable>
+
+<DialInISPTable>
+    <DialInISP operation="add">
+        <Name>Record #1</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <LoginScript>New Record</LoginScript>
+        <Authentication>0</Authentication>
+        <IfName>ppp</IfName>
+        <IfNetworks>ip</IfNetworks>
+        <IpAddr>New Record</IpAddr>
+        <IpNameServer1>New Record</IpNameServer1>
+        <IpNameServer2>New Record</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Record #2</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <LoginScript>New Record</LoginScript>
+        <Authentication>0</Authentication>
+        <IfName>ppp</IfName>
+        <IfNetworks>ip</IfNetworks>
+        <IpAddr>New Record</IpAddr>
+        <IpNameServer1>New Record</IpNameServer1>
+        <IpNameServer2>New Record</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+    </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="add">
+        <Name>Record #1</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>1243</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfName>ppp</IfName>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>me</IfAuthName>
+        <IfAuthPass>wt</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>TRUE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>48</ChannelCoding>
+        <AIUR>9600</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Record #2</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>435t</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfName>ppp</IfName>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>fgh</IfAuthName>
+        <IfAuthPass>dfgb</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>TRUE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>48</ChannelCoding>
+        <AIUR>9600</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<ChargecardTable>
+    <Chargecard operation="add">
+        <Name>Dummy BT Chargecard</Name>
+        <AccountNumber>144,12345678</AccountNumber>
+        <Pin>0000</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>HFG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+    <Chargecard operation="add">
+        <Name>Dummy Mercury Chargecard</Name>
+        <AccountNumber>0500800800,,12345678</AccountNumber>
+        <Pin>****</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>J,K,0FG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsBearer>2</SmsBearer>
+        <SmsReceiveMode>2</SmsReceiveMode>
+        <GPRSAttachMode>1</GPRSAttachMode>
+        <AcceptIncomingGprs>1</AcceptIncomingGprs>
+        <ConnectionAttempts>2</ConnectionAttempts>
+        <ModemForDataAndFax>3</ModemForDataAndFax>
+        <LocationForDataAndFax>Location.Default Location</LocationForDataAndFax>
+        <GPRSClassCBearer>GSM</GPRSClassCBearer>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+    <IncomingGPRS operation="add">
+        <Name>Record #1</Name>
+        <APN>1234</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>4321</PDPAddress>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+        <IfName>New Record</IfName>
+        <AuthRetries>0</AuthRetries>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>-1</QosWarningTimeout>
+    </IncomingGPRS>
+    <IncomingGPRS operation="add">
+        <Name>Record #2</Name>
+        <APN>7890</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>0987</PDPAddress>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+        <IfName>New Record</IfName>
+        <AuthRetries>0</AuthRetries>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>-1</QosWarningTimeout>
+    </IncomingGPRS>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+    <OutgoingGPRS operation="add">
+        <Name>Record #1</Name>
+        <APN>1234</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>4321</PDPAddress>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+        <IfName>New Record</IfName>
+        <AuthRetries>0</AuthRetries>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>-1</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>Record #2</Name>
+        <APN>0987</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>7890</PDPAddress>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+        <IfName>New Record</IfName>
+        <AuthRetries>0</AuthRetries>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>-1</QosWarningTimeout>
+    </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+</DefaultGPRSTable>
+
+<ProxyTable>
+</ProxyTable>
+
+<LocationTable>
+    <Location operation="add">
+        <Name>Default Location</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+        <DialOutCode>9,</DialOutCode>
+    </Location>
+    <Location operation="add">
+        <Name>Mobile</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/061_01.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,1281 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+// 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:
+//
+-->
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+    <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>Pipex CSD Serial</Name>
+        <IAPService>DialOutISP.Protocol Test 1</IAPService>
+        <IAPBearer>ModemBearer.GSM Mobile Phone via Serial</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office Direct Dial</LocationRef>
+    </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+    <ModemBearer operation="template">
+        <Name>Default Modem</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>0</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>30</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GSM Mobile Phone via Serial</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>19200</Rate>
+        <Handshaking>196</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>6</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+</ModemBearerTable>
+
+<LANBearerTable>
+    <LANBearer operation="add">
+        <Name>Assabet on-board Ethernet</Name>
+        <Agent>nullagent.agt</Agent>
+        <IfName>ethint</IfName>
+        <LDDName>not used</LDDName>
+        <PDDName>not used</PDDName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+</LANBearerTable>
+
+<LANServiceTable>
+    <LANService operation="add">
+        <Name>Ethernet</Name>
+        <IfNetworks>ip,ip6</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>194.72.6.1</IpGateway>
+        <IpAddr>192.168.0.100</IpAddr>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.52</IpNameServer2>
+    </LANService>
+</LANServiceTable>
+
+<DialInISPTable>
+    <DialInISP operation="template">
+        <Name>Default Dial In ISP</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Dial In ISP01</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="template">
+        <Name>Default Dial Out ISP</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>TRUE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Protocol Test 1</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Protocol UNSPECIFIED</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Protocol Test 2</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Protocol 0</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Protocol Test 3</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Nondescript</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>V22BIS</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Protocol Test 4</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Protocol V32</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>V32</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Protocol Test 5</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Protocol V34</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>V34</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Protocol Test 6</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Protocol V110</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>V110</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Protocol Test 7</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Protocol V120</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>V120</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Protocol Test 8</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Protocol X31FLAGSTUFFING</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>X31FLAGSTUFFING</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Protocol Test 9</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Protocol PIAFS</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>PIAFS</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Protocol Test 10</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Protocol BITTRANSPARENT</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>BITTRANSPARENT</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Protocol Test 11</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Protocol PSTNMULTIMEDIAVOICEFALLBACK</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>PSTNMULTIMEDIAVOICEFALLBACK</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Protocol Test 12</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Protocol PSTNMULTIMEDIA</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>PSTNMULTIMEDIA</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Protocol Test 13</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Protocol ISDNMULTIMEDIA</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>ISDNMULTIMEDIA</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+    <CDMA2000PacketService operation="add">
+        <Name>test name cdma2000</Name>
+        <IwfName>Test2000</IwfName>
+        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
+        <PdpType>IPV4</PdpType>
+        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
+        <ReqRevPriority>PRIORITY04</ReqRevPriority>
+        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
+        <ReqRevBitrate>32KBPS</ReqRevBitrate>
+        <ReqFwdLoss>LOSS1</ReqFwdLoss>
+        <ReqRevLoss>LOSS1</ReqRevLoss>
+        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
+        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
+        <MinFwdBitrate>32KBPS</MinFwdBitrate>
+        <MinRevBitrate>32KBPS</MinRevBitrate>
+        <AccptFwdLoss>LOSS2</AccptFwdLoss>
+        <AccptRevLoss>LOSS2</AccptRevLoss>
+        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
+        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNetMask>0.255.255.255</IpNetMask>
+        <IpGateway>10.0.0.1</IpGateway>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <ApType>2</ApType>
+        <QosWarningTimeout>1000000</QosWarningTimeout>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <RlpMode>TRANSPARENT</RlpMode>
+        <CDMAMobileIP>FALSE</CDMAMobileIP>
+        <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
+        <CDMANaiType>0</CDMANaiType>        
+    </CDMA2000PacketService>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+    <Chargecard operation="add">
+        <Name>Dummy BT Chargecard</Name>
+        <AccountNumber>144,12345678</AccountNumber>
+        <Pin>0000</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>HFG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+    <Chargecard operation="add">
+        <Name>Dummy Mercury Chargecard</Name>
+        <AccountNumber>0500800800,,12345678</AccountNumber>
+        <Pin>****</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>J,K,0FG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>PROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
+    </ConnectionPreferences>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable2</Name>
+        <Ranking>2</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>PROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
+    </ConnectionPreferences>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsBearer>2</SmsBearer>
+        <SmsReceiveMode>2</SmsReceiveMode>
+        <GPRSAttachMode>1</GPRSAttachMode>
+        <AcceptIncomingGprs>1</AcceptIncomingGprs>
+        <ConnectionAttempts>2</ConnectionAttempts>
+        <ModemForDataAndFax>2</ModemForDataAndFax>
+        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
+        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
+        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
+        <GPRSClassCBearer>GSM</GPRSClassCBearer>
+        <DefaultNetwork>Network.Intranet</DefaultNetwork>
+        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+    <IncomingGPRS operation="add">
+        <Name>Incoming GPRS Settings PlaceHolder</Name>
+        <APN>Test</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>0.0.0.0</PDPAddress>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>1</ReqPrecedence>
+        <ReqDelay>1</ReqDelay>
+        <ReqReliability>1</ReqReliability>
+        <ReqPeakThroughput>1</ReqPeakThroughput>
+        <ReqMeanThroughput>1</ReqMeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNameServer1>0.0.0.0</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+    </IncomingGPRS>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS01</Name>
+        <APN>gprs01APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS02</Name>
+        <APN>gprs02APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS03</Name>
+        <APN>gprs03APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+    <DefaultGPRS operation="add">
+        <Name>Dummy Default GPRS Settings</Name>
+        <APN>Access point name</APN>
+        <PDPType>IPV6</PDPType>
+        <PDPAddress>www.wid.com</PDPAddress>
+        <Usage>1</Usage>
+        <Precedence>1</Precedence>
+        <Delay>1</Delay>
+        <Reliability>1</Reliability>
+        <PeakThroughput>1</PeakThroughput>
+        <MeanThroughput>1</MeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+    </DefaultGPRS>
+</DefaultGPRSTable>
+
+<ProxyTable>
+    <Proxy operation="add">
+        <Name>ProxyTable1</Name>
+        <ISPRef>DialOutISP.Protocol Test 1</ISPRef>
+        <UseProxyServer>TRUE</UseProxyServer>
+        <ProtocolName>http</ProtocolName>
+        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
+        <PortNumber>80</PortNumber>
+        <Exceptions>www.dummyproxy.com/exception</Exceptions>
+    </Proxy>
+</ProxyTable>
+
+<LocationTable>
+    <Location operation="template">
+        <Name>Default Location</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+        <DialOutCode>9,</DialOutCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office Direct Dial</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+    </Location>
+    <Location operation="add">
+        <Name>Mobile</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Home</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>TRUE</UsePulseDial>
+        <WaitForDialTone>TRUE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>181</AreaCode>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable1</Name>
+        <ProtocolName>ssl3.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable2</Name>
+        <ProtocolName>tls1.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+    <WAPAccessPoint operation="template">
+        <Name>Default Dial In ISP</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+    </WAPAccessPoint>
+    <WAPAccessPoint operation="add">
+        <Name>Dummy WAP Settings</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+        <StartPage>www.wapstart.com</StartPage>
+    </WAPAccessPoint>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+    <WAPIPBearer operation="template">
+        <Name>WAPIPBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.-1</IAPRef>
+        <ProxyPortNumber>0</ProxyPortNumber>
+    </WAPIPBearer>
+    <WAPIPBearer operation="add">
+        <Name>WAPIPBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>www.wapgateway.com</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
+        <ProxyPortNumber>1</ProxyPortNumber>
+    </WAPIPBearer>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+    <WAPSMSBearer operation="template">
+        <Name>WAPSMSBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+    </WAPSMSBearer>
+    <WAPSMSBearer operation="add">
+        <Name>WAPSMSBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>+4412345678901</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/061_02.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,1093 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+// 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:
+//
+-->
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+    <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>Pipex CSD Serial</Name>
+        <IAPService>DialOutISP.Bearer Name Test 1</IAPService>
+        <IAPBearer>ModemBearer.GSM Mobile Phone via Serial</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office Direct Dial</LocationRef>
+    </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+    <ModemBearer operation="template">
+        <Name>Default Modem</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>0</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>30</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GSM Mobile Phone via Serial</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>19200</Rate>
+        <Handshaking>196</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>6</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+</ModemBearerTable>
+
+<LANBearerTable>
+    <LANBearer operation="add">
+        <Name>Assabet on-board Ethernet</Name>
+        <Agent>nullagent.agt</Agent>
+        <IfName>ethint</IfName>
+        <LDDName>not used</LDDName>
+        <PDDName>not used</PDDName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+</LANBearerTable>
+
+<LANServiceTable>
+    <LANService operation="add">
+        <Name>Ethernet</Name>
+        <IfNetworks>ip,ip6</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>194.72.6.1</IpGateway>
+        <IpAddr>192.168.0.100</IpAddr>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.52</IpNameServer2>
+    </LANService>
+</LANServiceTable>
+
+<DialInISPTable>
+    <DialInISP operation="template">
+        <Name>Default Dial In ISP</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Dial In ISP01</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="template">
+        <Name>Default Dial Out ISP</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>TRUE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Name Test 1</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Name ASYNCHRONOUS</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Name Test 2</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Name ASYNCHRONOUSRDI</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUSRDI</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Name Test 3</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Name SYNCHRONOUS</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>SYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Name Test 4</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Name SYNCHRONOUSRDI</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>SYNCHRONOUSRDI</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Name Test 5</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Name PADASYNCUDI</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>PADASYNCUDI</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Name Test 6</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Name PADASYNCRDI</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>PADASYNCRDI</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Name Test 7</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Name DADS</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>DADS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Name Test 8</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Name ACCESSSYNCRDI</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ACCESSSYNCRDI</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Name Test 9</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Name SERVICEEXTENDED</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>SERVICEEXTENDED</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+    <CDMA2000PacketService operation="add">
+        <Name>test name cdma2000</Name>
+        <IwfName>Test2000</IwfName>
+        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
+        <PdpType>IPV4</PdpType>
+        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
+        <ReqRevPriority>PRIORITY04</ReqRevPriority>
+        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
+        <ReqRevBitrate>32KBPS</ReqRevBitrate>
+        <ReqFwdLoss>LOSS1</ReqFwdLoss>
+        <ReqRevLoss>LOSS1</ReqRevLoss>
+        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
+        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
+        <MinFwdBitrate>32KBPS</MinFwdBitrate>
+        <MinRevBitrate>32KBPS</MinRevBitrate>
+        <AccptFwdLoss>LOSS2</AccptFwdLoss>
+        <AccptRevLoss>LOSS2</AccptRevLoss>
+        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
+        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNetMask>0.255.255.255</IpNetMask>
+        <IpGateway>10.0.0.1</IpGateway>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <ApType>2</ApType>
+        <QosWarningTimeout>1000000</QosWarningTimeout>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <RlpMode>TRANSPARENT</RlpMode>
+        <CDMAMobileIP>FALSE</CDMAMobileIP>
+        <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
+        <CDMANaiType>0</CDMANaiType>        
+    </CDMA2000PacketService>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+    <Chargecard operation="add">
+        <Name>Dummy BT Chargecard</Name>
+        <AccountNumber>144,12345678</AccountNumber>
+        <Pin>0000</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>HFG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+    <Chargecard operation="add">
+        <Name>Dummy Mercury Chargecard</Name>
+        <AccountNumber>0500800800,,12345678</AccountNumber>
+        <Pin>****</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>J,K,0FG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>PROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
+    </ConnectionPreferences>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable2</Name>
+        <Ranking>2</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>PROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
+    </ConnectionPreferences>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsBearer>2</SmsBearer>
+        <SmsReceiveMode>2</SmsReceiveMode>
+        <GPRSAttachMode>1</GPRSAttachMode>
+        <AcceptIncomingGprs>1</AcceptIncomingGprs>
+        <ConnectionAttempts>2</ConnectionAttempts>
+        <ModemForDataAndFax>2</ModemForDataAndFax>
+        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
+        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
+        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
+        <GPRSClassCBearer>GSM</GPRSClassCBearer>
+        <DefaultNetwork>Network.Intranet</DefaultNetwork>
+        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+    <IncomingGPRS operation="add">
+        <Name>Incoming GPRS Settings PlaceHolder</Name>
+        <APN>Test</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>0.0.0.0</PDPAddress>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>1</ReqPrecedence>
+        <ReqDelay>1</ReqDelay>
+        <ReqReliability>1</ReqReliability>
+        <ReqPeakThroughput>1</ReqPeakThroughput>
+        <ReqMeanThroughput>1</ReqMeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNameServer1>0.0.0.0</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+    </IncomingGPRS>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS01</Name>
+        <APN>gprs01APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS02</Name>
+        <APN>gprs02APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS03</Name>
+        <APN>gprs03APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+    <DefaultGPRS operation="add">
+        <Name>Dummy Default GPRS Settings</Name>
+        <APN>Access point name</APN>
+        <PDPType>IPV6</PDPType>
+        <PDPAddress>www.wid.com</PDPAddress>
+        <Usage>1</Usage>
+        <Precedence>1</Precedence>
+        <Delay>1</Delay>
+        <Reliability>1</Reliability>
+        <PeakThroughput>1</PeakThroughput>
+        <MeanThroughput>1</MeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+    </DefaultGPRS>
+</DefaultGPRSTable>
+
+<ProxyTable>
+    <Proxy operation="add">
+        <Name>ProxyTable1</Name>
+        <ISPRef>DialOutISP.Bearer Name Test 1</ISPRef>
+        <UseProxyServer>TRUE</UseProxyServer>
+        <ProtocolName>http</ProtocolName>
+        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
+        <PortNumber>80</PortNumber>
+        <Exceptions>www.dummyproxy.com/exception</Exceptions>
+    </Proxy>
+</ProxyTable>
+
+<LocationTable>
+    <Location operation="template">
+        <Name>Default Location</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+        <DialOutCode>9,</DialOutCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office Direct Dial</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+    </Location>
+    <Location operation="add">
+        <Name>Mobile</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Home</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>TRUE</UsePulseDial>
+        <WaitForDialTone>TRUE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>181</AreaCode>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable1</Name>
+        <ProtocolName>ssl3.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable2</Name>
+        <ProtocolName>tls1.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+    <WAPAccessPoint operation="template">
+        <Name>Default Dial In ISP</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+    </WAPAccessPoint>
+    <WAPAccessPoint operation="add">
+        <Name>Dummy WAP Settings</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+        <StartPage>www.wapstart.com</StartPage>
+    </WAPAccessPoint>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+    <WAPIPBearer operation="template">
+        <Name>WAPIPBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.-1</IAPRef>
+        <ProxyPortNumber>0</ProxyPortNumber>
+    </WAPIPBearer>
+    <WAPIPBearer operation="add">
+        <Name>WAPIPBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>www.wapgateway.com</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.1</IAPRef>
+        <ProxyPortNumber>1</ProxyPortNumber>
+    </WAPIPBearer>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+    <WAPSMSBearer operation="template">
+        <Name>WAPSMSBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+    </WAPSMSBearer>
+    <WAPSMSBearer operation="add">
+        <Name>WAPSMSBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>+4412345678901</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/061_03.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,1424 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+//
+// 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:
+//
+//
+-->
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+    <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>Pipex CSD Serial</Name>
+        <IAPService>DialOutISP.Bearer Speed Test 1</IAPService>
+        <IAPBearer>ModemBearer.GSM Mobile Phone via Serial</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office Direct Dial</LocationRef>
+    </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+    <ModemBearer operation="template">
+        <Name>Default Modem</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>0</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>30</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GSM Mobile Phone via Serial</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>19200</Rate>
+        <Handshaking>196</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>6</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+</ModemBearerTable>
+
+<LANBearerTable>
+    <LANBearer operation="add">
+        <Name>Assabet on-board Ethernet</Name>
+        <Agent>nullagent.agt</Agent>
+        <IfName>ethint</IfName>
+        <LDDName>not used</LDDName>
+        <PDDName>not used</PDDName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+</LANBearerTable>
+
+<LANServiceTable>
+    <LANService operation="add">
+        <Name>Ethernet</Name>
+        <IfNetworks>ip,ip6</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>194.72.6.1</IpGateway>
+        <IpAddr>192.168.0.100</IpAddr>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.52</IpNameServer2>
+    </LANService>
+</LANServiceTable>
+
+<DialInISPTable>
+    <DialInISP operation="template">
+        <Name>Default Dial In ISP</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Dial In ISP01</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="template">
+        <Name>Default Dial Out ISP</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>TRUE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Speed Test 1</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Speed UNSPECIFIED</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Speed Test 2</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Speed AUTOBAUDING</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>AUTOBAUDING</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Speed Test 3</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Speed 2400</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>2400</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Speed Test 4</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Speed 4800</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>4800</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Speed Test 5</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Speed 9600</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>9600</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Speed Test 6</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Speed 14400</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>14400</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Speed Test 7</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Speed 19200</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>19200</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Speed Test 8</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Speed 28800</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>28800</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Speed Test 9</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Speed 32000</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>32000</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Speed Test 10</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Speed 33600</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>33600</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Speed Test 11</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Speed 38400</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>38400</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Speed Test 12</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Speed 43200</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>43200</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Speed Test 13</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Speed 48000</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>48000</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Speed Test 14</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Speed 56000</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>56000</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Speed Test 15</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Speed 57600</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>57600</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Speed Test 16</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer Speed 64000</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>64000</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+    <CDMA2000PacketService operation="add">
+        <Name>test name cdma2000</Name>
+        <IwfName>Test2000</IwfName>
+        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
+        <PdpType>IPV4</PdpType>
+        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
+        <ReqRevPriority>PRIORITY04</ReqRevPriority>
+        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
+        <ReqRevBitrate>32KBPS</ReqRevBitrate>
+        <ReqFwdLoss>LOSS1</ReqFwdLoss>
+        <ReqRevLoss>LOSS1</ReqRevLoss>
+        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
+        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
+        <MinFwdBitrate>32KBPS</MinFwdBitrate>
+        <MinRevBitrate>32KBPS</MinRevBitrate>
+        <AccptFwdLoss>LOSS2</AccptFwdLoss>
+        <AccptRevLoss>LOSS2</AccptRevLoss>
+        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
+        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNetMask>0.255.255.255</IpNetMask>
+        <IpGateway>10.0.0.1</IpGateway>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <ApType>2</ApType>
+        <QosWarningTimeout>1000000</QosWarningTimeout>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <RlpMode>TRANSPARENT</RlpMode>
+        <CDMAMobileIP>FALSE</CDMAMobileIP>
+        <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
+        <CDMANaiType>0</CDMANaiType>        
+    </CDMA2000PacketService>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+    <Chargecard operation="add">
+        <Name>Dummy BT Chargecard</Name>
+        <AccountNumber>144,12345678</AccountNumber>
+        <Pin>0000</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>HFG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+    <Chargecard operation="add">
+        <Name>Dummy Mercury Chargecard</Name>
+        <AccountNumber>0500800800,,12345678</AccountNumber>
+        <Pin>****</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>J,K,0FG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>PROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
+    </ConnectionPreferences>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable2</Name>
+        <Ranking>2</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>PROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
+    </ConnectionPreferences>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsBearer>2</SmsBearer>
+        <SmsReceiveMode>2</SmsReceiveMode>
+        <GPRSAttachMode>1</GPRSAttachMode>
+        <AcceptIncomingGprs>1</AcceptIncomingGprs>
+        <ConnectionAttempts>2</ConnectionAttempts>
+        <ModemForDataAndFax>2</ModemForDataAndFax>
+        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
+        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
+        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
+        <GPRSClassCBearer>GSM</GPRSClassCBearer>
+        <DefaultNetwork>Network.Intranet</DefaultNetwork>
+        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+    <IncomingGPRS operation="add">
+        <Name>Incoming GPRS Settings PlaceHolder</Name>
+        <APN>Test</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>0.0.0.0</PDPAddress>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>1</ReqPrecedence>
+        <ReqDelay>1</ReqDelay>
+        <ReqReliability>1</ReqReliability>
+        <ReqPeakThroughput>1</ReqPeakThroughput>
+        <ReqMeanThroughput>1</ReqMeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNameServer1>0.0.0.0</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+    </IncomingGPRS>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS01</Name>
+        <APN>gprs01APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS02</Name>
+        <APN>gprs02APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS03</Name>
+        <APN>gprs03APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+    <DefaultGPRS operation="add">
+        <Name>Dummy Default GPRS Settings</Name>
+        <APN>Access point name</APN>
+        <PDPType>IPV6</PDPType>
+        <PDPAddress>www.wid.com</PDPAddress>
+        <Usage>1</Usage>
+        <Precedence>1</Precedence>
+        <Delay>1</Delay>
+        <Reliability>1</Reliability>
+        <PeakThroughput>1</PeakThroughput>
+        <MeanThroughput>1</MeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+    </DefaultGPRS>
+</DefaultGPRSTable>
+
+<ProxyTable>
+    <Proxy operation="add">
+        <Name>ProxyTable1</Name>
+        <ISPRef>DialOutISP.Bearer Speed Test 1</ISPRef>
+        <UseProxyServer>TRUE</UseProxyServer>
+        <ProtocolName>http</ProtocolName>
+        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
+        <PortNumber>80</PortNumber>
+        <Exceptions>www.dummyproxy.com/exception</Exceptions>
+    </Proxy>
+</ProxyTable>
+
+<LocationTable>
+    <Location operation="template">
+        <Name>Default Location</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+        <DialOutCode>9,</DialOutCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office Direct Dial</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+    </Location>
+    <Location operation="add">
+        <Name>Mobile</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Home</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>TRUE</UsePulseDial>
+        <WaitForDialTone>TRUE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>181</AreaCode>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable1</Name>
+        <ProtocolName>ssl3.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable2</Name>
+        <ProtocolName>tls1.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+    <WAPAccessPoint operation="template">
+        <Name>Default Dial In ISP</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+    </WAPAccessPoint>
+    <WAPAccessPoint operation="add">
+        <Name>Dummy WAP Settings</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+        <StartPage>www.wapstart.com</StartPage>
+    </WAPAccessPoint>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+    <WAPIPBearer operation="template">
+        <Name>WAPIPBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.-1</IAPRef>
+        <ProxyPortNumber>0</ProxyPortNumber>
+    </WAPIPBearer>
+    <WAPIPBearer operation="add">
+        <Name>WAPIPBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>www.wapgateway.com</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.1</IAPRef>
+        <ProxyPortNumber>1</ProxyPortNumber>
+    </WAPIPBearer>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+    <WAPSMSBearer operation="template">
+        <Name>WAPSMSBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+    </WAPSMSBearer>
+    <WAPSMSBearer operation="add">
+        <Name>WAPSMSBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>+4412345678901</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/061_04.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,907 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+//
+// 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:
+//
+//
+-->
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+    <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>Pipex CSD Serial</Name>
+        <IAPService>DialOutISP.Bearer Name Test 1</IAPService>
+        <IAPBearer>ModemBearer.GSM Mobile Phone via Serial</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office Direct Dial</LocationRef>
+    </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+    <ModemBearer operation="template">
+        <Name>Default Modem</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>0</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>30</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GSM Mobile Phone via Serial</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>19200</Rate>
+        <Handshaking>196</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>6</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+</ModemBearerTable>
+
+<LANBearerTable>
+    <LANBearer operation="add">
+        <Name>Assabet on-board Ethernet</Name>
+        <Agent>nullagent.agt</Agent>
+        <IfName>ethint</IfName>
+        <LDDName>not used</LDDName>
+        <PDDName>not used</PDDName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+</LANBearerTable>
+
+<LANServiceTable>
+    <LANService operation="add">
+        <Name>Ethernet</Name>
+        <IfNetworks>ip,ip6</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>194.72.6.1</IpGateway>
+        <IpAddr>192.168.0.100</IpAddr>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.52</IpNameServer2>
+    </LANService>
+</LANServiceTable>
+
+<DialInISPTable>
+    <DialInISP operation="template">
+        <Name>Default Dial In ISP</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Dial In ISP01</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="template">
+        <Name>Default Dial Out ISP</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>TRUE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Name Test 1</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer CE UNSPECIFIED</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Name Test 2</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer CE TRANSPARENT</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>TRANSPARENT</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Name Test 3</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer CE NONTRANSPARENT</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>NONTRANSPARENT</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Name Test 4</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer CE TRANSPARENTPREF</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>TRANSPARENTPREF</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bearer Name Test 5</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Description>Bearer CE NONTRANSPARENTPREF</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>08450885336</DefaultTelNum>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>solabf75</IfAuthName>
+        <IfAuthPass>oodifama</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>158.43.128.1</IpNameServer1>
+        <IpNameServer2>158.43.192.1</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>NONTRANSPARENTPREF</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+    <CDMA2000PacketService operation="add">
+        <Name>test name cdma2000</Name>
+        <IwfName>Test2000</IwfName>
+        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
+        <PdpType>IPV4</PdpType>
+        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
+        <ReqRevPriority>PRIORITY04</ReqRevPriority>
+        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
+        <ReqRevBitrate>32KBPS</ReqRevBitrate>
+        <ReqFwdLoss>LOSS1</ReqFwdLoss>
+        <ReqRevLoss>LOSS1</ReqRevLoss>
+        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
+        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
+        <MinFwdBitrate>32KBPS</MinFwdBitrate>
+        <MinRevBitrate>32KBPS</MinRevBitrate>
+        <AccptFwdLoss>LOSS2</AccptFwdLoss>
+        <AccptRevLoss>LOSS2</AccptRevLoss>
+        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
+        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNetMask>0.255.255.255</IpNetMask>
+        <IpGateway>10.0.0.1</IpGateway>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <ApType>2</ApType>
+        <QosWarningTimeout>1000000</QosWarningTimeout>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <RlpMode>TRANSPARENT</RlpMode>
+        <CDMAMobileIP>FALSE</CDMAMobileIP>
+        <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
+        <CDMANaiType>0</CDMANaiType>        
+    </CDMA2000PacketService>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+    <Chargecard operation="add">
+        <Name>Dummy BT Chargecard</Name>
+        <AccountNumber>144,12345678</AccountNumber>
+        <Pin>0000</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>HFG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+    <Chargecard operation="add">
+        <Name>Dummy Mercury Chargecard</Name>
+        <AccountNumber>0500800800,,12345678</AccountNumber>
+        <Pin>****</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>J,K,0FG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>PROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
+    </ConnectionPreferences>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable2</Name>
+        <Ranking>2</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>PROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
+    </ConnectionPreferences>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsBearer>2</SmsBearer>
+        <SmsReceiveMode>2</SmsReceiveMode>
+        <GPRSAttachMode>1</GPRSAttachMode>
+        <AcceptIncomingGprs>1</AcceptIncomingGprs>
+        <ConnectionAttempts>2</ConnectionAttempts>
+        <ModemForDataAndFax>2</ModemForDataAndFax>
+        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
+        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
+        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
+        <GPRSClassCBearer>GSM</GPRSClassCBearer>
+        <DefaultNetwork>Network.Intranet</DefaultNetwork>
+        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+    <IncomingGPRS operation="add">
+        <Name>Incoming GPRS Settings PlaceHolder</Name>
+        <APN>Test</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>0.0.0.0</PDPAddress>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>1</ReqPrecedence>
+        <ReqDelay>1</ReqDelay>
+        <ReqReliability>1</ReqReliability>
+        <ReqPeakThroughput>1</ReqPeakThroughput>
+        <ReqMeanThroughput>1</ReqMeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNameServer1>0.0.0.0</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+    </IncomingGPRS>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS01</Name>
+        <APN>gprs01APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS02</Name>
+        <APN>gprs02APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS03</Name>
+        <APN>gprs03APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+    <DefaultGPRS operation="add">
+        <Name>Dummy Default GPRS Settings</Name>
+        <APN>Access point name</APN>
+        <PDPType>IPV6</PDPType>
+        <PDPAddress>www.wid.com</PDPAddress>
+        <Usage>1</Usage>
+        <Precedence>1</Precedence>
+        <Delay>1</Delay>
+        <Reliability>1</Reliability>
+        <PeakThroughput>1</PeakThroughput>
+        <MeanThroughput>1</MeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+    </DefaultGPRS>
+</DefaultGPRSTable>
+
+<ProxyTable>
+    <Proxy operation="add">
+        <Name>ProxyTable1</Name>
+        <ISPRef>DialOutISP.Bearer Name Test 1</ISPRef>
+        <UseProxyServer>TRUE</UseProxyServer>
+        <ProtocolName>http</ProtocolName>
+        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
+        <PortNumber>80</PortNumber>
+        <Exceptions>www.dummyproxy.com/exception</Exceptions>
+    </Proxy>
+</ProxyTable>
+
+<LocationTable>
+    <Location operation="template">
+        <Name>Default Location</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+        <DialOutCode>9,</DialOutCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office Direct Dial</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+    </Location>
+    <Location operation="add">
+        <Name>Mobile</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Home</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>TRUE</UsePulseDial>
+        <WaitForDialTone>TRUE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>181</AreaCode>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable1</Name>
+        <ProtocolName>ssl3.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable2</Name>
+        <ProtocolName>tls1.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+    <WAPAccessPoint operation="template">
+        <Name>Default Dial In ISP</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+    </WAPAccessPoint>
+    <WAPAccessPoint operation="add">
+        <Name>Dummy WAP Settings</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+        <StartPage>www.wapstart.com</StartPage>
+    </WAPAccessPoint>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+    <WAPIPBearer operation="template">
+        <Name>WAPIPBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.-1</IAPRef>
+        <ProxyPortNumber>0</ProxyPortNumber>
+    </WAPIPBearer>
+    <WAPIPBearer operation="add">
+        <Name>WAPIPBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>www.wapgateway.com</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.1</IAPRef>
+        <ProxyPortNumber>1</ProxyPortNumber>
+    </WAPIPBearer>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+    <WAPSMSBearer operation="template">
+        <Name>WAPSMSBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+    </WAPSMSBearer>
+    <WAPSMSBearer operation="add">
+        <Name>WAPSMSBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>+4412345678901</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/064_01.cfg	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,3 @@
+############################################################
+## EMPTY FILE FOR te_commsdat tests
+## 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/Cdb_udeb.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,2120 @@
+//
+// 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:
+//
+//
+//
+PRINT example CommDb test
+PRINT
+//Do all our moving round & making databases first
+
+//run_script z:\TestData\scripts\esock_test_unloadesock.script
+
+//LOAD_SUITE TS_Esock.dll
+
+run_utils copyfile z:\testdata\configs\default5.dat c:\corrupt.dat
+
+//Ready to go.
+//run protection tests
+run_script z:\testdata\scripts\test_all_protection
+
+LOAD_SUITE te_commdb
+
+// ced processing tests.
+
+//run_script z:\TestData\scripts\esock_test_unloadesock.script
+
+CED z:\testdata\configs\061_01.xml -f
+
+START_TESTCASE			COMINF-commdb-0101
+//! @SYMTestCaseID		COMINF-commdb-0101
+RUN_TEST_STEP 100000 te_commdb step_061_01
+END_TESTCASE			COMINF-commdb-0101
+
+CED z:\testdata\configs\061_02.xml -f
+
+START_TESTCASE			COMINF-commdb-0102
+//! @SYMTestCaseID		COMINF-commdb-0102
+RUN_TEST_STEP 100000 te_commdb step_061_02
+END_TESTCASE			COMINF-commdb-0102
+
+CED z:\testdata\configs\061_03.xml -f
+
+START_TESTCASE			COMINF-commdb-0103
+//! @SYMTestCaseID		COMINF-commdb-0103
+RUN_TEST_STEP 100000 te_commdb step_061_03
+END_TESTCASE			COMINF-commdb-0103
+
+CED z:\testdata\configs\061_04.xml -f
+
+START_TESTCASE			COMINF-commdb-0104
+//! @SYMTestCaseID		COMINF-commdb-0104
+RUN_TEST_STEP 100000 te_commdb step_061_04
+END_TESTCASE			COMINF-commdb-0104
+
+// finished ced processing tests.
+
+// database creation tests
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0105
+//! @SYMTestCaseID		COMINF-commdb-0105
+RUN_TEST_STEP 100000 te_commdb step_001_01
+END_TESTCASE			COMINF-commdb-0105
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0106
+//! @SYMTestCaseID		COMINF-commdb-0106
+RUN_TEST_STEP 100000 te_commdb step_001_03
+END_TESTCASE			COMINF-commdb-0106
+
+CED z:\testdata\configs\corrupt.xml -f
+
+// Note - this test modified for 9.1 as manipulates cdbv3.dat file
+START_TESTCASE			COMINF-commdb-0107
+//! @SYMTestCaseID		COMINF-commdb-0107
+RUN_TEST_STEP 100000 te_commdb step_001_04
+END_TESTCASE			COMINF-commdb-0107
+
+START_TESTCASE			COMINF-commdb-0108
+//! @SYMTestCaseID		COMINF-commdb-0108
+RUN_TEST_STEP 100000 te_commdb step_001_05
+END_TESTCASE			COMINF-commdb-0108
+
+START_TESTCASE			COMINF-commdb-0109
+//! @SYMTestCaseID		COMINF-commdb-0109
+RUN_TEST_STEP 100000 te_commdb step_001_07
+END_TESTCASE			COMINF-commdb-0109
+
+START_TESTCASE			COMINF-commdb-0110
+//! @SYMTestCaseID		COMINF-commdb-0110
+RUN_TEST_STEP 100000 te_commdb step_001_08
+END_TESTCASE			COMINF-commdb-0110
+
+START_TESTCASE			COMINF-commdb-0111
+//! @SYMTestCaseID		COMINF-commdb-0111
+RUN_TEST_STEP 100000 te_commdb step_001_09
+END_TESTCASE			COMINF-commdb-0111
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0112
+//! @SYMTestCaseID		COMINF-commdb-0112
+RUN_TEST_STEP 1000000 te_commdb step_001_10
+END_TESTCASE			COMINF-commdb-0112
+
+START_TESTCASE			COMINF-commdb-0113
+//! @SYMTestCaseID		COMINF-commdb-0113
+RUN_TEST_STEP 100000 te_commdb step_002_01
+END_TESTCASE			COMINF-commdb-0113
+
+// finished database creation tests
+
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
+
+START_TESTCASE			COMINF-commdb-0114
+//! @SYMTestCaseID		COMINF-commdb-0114
+RUN_TEST_STEP 100000 te_commdb step_003_01
+END_TESTCASE			COMINF-commdb-0114
+
+START_TESTCASE			COMINF-commdb-0115
+//! @SYMTestCaseID		COMINF-commdb-0115
+RUN_TEST_STEP 100000 te_commdb step_003_02
+END_TESTCASE			COMINF-commdb-0115
+
+START_TESTCASE			COMINF-commdb-0116
+//! @SYMTestCaseID		COMINF-commdb-0116
+RUN_TEST_STEP 100000 te_commdb step_003_03
+END_TESTCASE			COMINF-commdb-0116
+
+START_TESTCASE			COMINF-commdb-0117
+//! @SYMTestCaseID		COMINF-commdb-0117
+RUN_PANIC_STEP 100000 te_commdb step_003_04
+END_TESTCASE			COMINF-commdb-0117
+
+START_TESTCASE			COMINF-commdb-0118
+//! @SYMTestCaseID		COMINF-commdb-0118
+RUN_TEST_STEP 100000 te_commdb step_003_05
+END_TESTCASE			COMINF-commdb-0118
+
+START_TESTCASE			COMINF-commdb-0119
+//! @SYMTestCaseID		COMINF-commdb-0119
+RUN_TEST_STEP 100000 te_commdb step_003_06
+END_TESTCASE			COMINF-commdb-0119
+
+START_TESTCASE			COMINF-commdb-0120
+//! @SYMTestCaseID		COMINF-commdb-0120
+RUN_TEST_STEP 1000000 te_commdb step_003_07 
+END_TESTCASE			COMINF-commdb-0120
+
+START_TESTCASE			COMINF-commdb-0121
+//! @SYMTestCaseID		COMINF-commdb-0121
+RUN_PANIC_STEP 1000000 te_commdb step_003_08 
+END_TESTCASE			COMINF-commdb-0121
+
+START_TESTCASE			COMINF-commdb-0122
+//! @SYMTestCaseID		COMINF-commdb-0122
+RUN_TEST_STEP 100000 te_commdb step_004_01
+END_TESTCASE			COMINF-commdb-0122
+
+START_TESTCASE			COMINF-commdb-0123
+//! @SYMTestCaseID		COMINF-commdb-0123
+RUN_PANIC_STEP 100000 te_commdb step_004_02
+END_TESTCASE			COMINF-commdb-0123
+
+START_TESTCASE			COMINF-commdb-0124
+//! @SYMTestCaseID		COMINF-commdb-0124
+RUN_PANIC_STEP 100000 te_commdb step_004_03
+END_TESTCASE			COMINF-commdb-0124
+
+START_TESTCASE			COMINF-commdb-0125
+//! @SYMTestCaseID		COMINF-commdb-0125
+RUN_TEST_STEP 1000000 te_commdb step_004_04
+END_TESTCASE			COMINF-commdb-0125
+
+START_TESTCASE			COMINF-commdb-0126
+//! @SYMTestCaseID		COMINF-commdb-0126
+RUN_PANIC_STEP 1000000 te_commdb step_004_05
+END_TESTCASE			COMINF-commdb-0126
+
+START_TESTCASE			COMINF-commdb-0127
+//! @SYMTestCaseID		COMINF-commdb-0127
+RUN_PANIC_STEP 1000000 te_commdb step_004_06
+END_TESTCASE			COMINF-commdb-0127
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0128
+//! @SYMTestCaseID		COMINF-commdb-0128
+RUN_TEST_STEP 100000 te_commdb step_005_01
+END_TESTCASE			COMINF-commdb-0128
+
+START_TESTCASE			COMINF-commdb-0129
+//! @SYMTestCaseID		COMINF-commdb-0129
+RUN_TEST_STEP 100000 te_commdb step_005_02
+END_TESTCASE			COMINF-commdb-0129
+
+START_TESTCASE			COMINF-commdb-0130
+//! @SYMTestCaseID		COMINF-commdb-0130
+RUN_TEST_STEP 100000 te_commdb step_005_03
+END_TESTCASE			COMINF-commdb-0130
+
+START_TESTCASE			COMINF-commdb-0131
+//! @SYMTestCaseID		COMINF-commdb-0131
+RUN_TEST_STEP 1000000 te_commdb step_005_04
+END_TESTCASE			COMINF-commdb-0131
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0132
+//! @SYMTestCaseID		COMINF-commdb-0132
+RUN_TEST_STEP 100000 te_commdb step_006_01
+END_TESTCASE			COMINF-commdb-0132
+
+START_TESTCASE			COMINF-commdb-0133
+//! @SYMTestCaseID		COMINF-commdb-0133
+RUN_TEST_STEP 100000 te_commdb step_006_02
+END_TESTCASE			COMINF-commdb-0133
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0134
+//! @SYMTestCaseID		COMINF-commdb-0134
+RUN_TEST_STEP 100000 te_commdb step_006_03
+END_TESTCASE			COMINF-commdb-0134
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0135
+//! @SYMTestCaseID		COMINF-commdb-0135
+RUN_TEST_STEP 100000 te_commdb step_006_04
+
+CED z:\testdata\configs\default1.xml -f
+
+END_TESTCASE			COMINF-commdb-0135
+
+START_TESTCASE			COMINF-commdb-0136
+//! @SYMTestCaseID		COMINF-commdb-0136
+RUN_TEST_STEP 1000000 te_commdb step_006_05
+END_TESTCASE			COMINF-commdb-0136
+      
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0137
+//! @SYMTestCaseID		COMINF-commdb-0137
+RUN_TEST_STEP 100000 te_commdb step_007_01
+END_TESTCASE			COMINF-commdb-0137
+
+START_TESTCASE			COMINF-commdb-0138
+//! @SYMTestCaseID		COMINF-commdb-0138
+RUN_TEST_STEP 100000 te_commdb step_007_02
+END_TESTCASE			COMINF-commdb-0138
+
+START_TESTCASE			COMINF-commdb-0139
+//! @SYMTestCaseID		COMINF-commdb-0139
+RUN_TEST_STEP 100000 te_commdb step_007_03
+END_TESTCASE			COMINF-commdb-0139
+
+START_TESTCASE			COMINF-commdb-0140
+//! @SYMTestCaseID		COMINF-commdb-0140
+RUN_TEST_STEP 100000 te_commdb step_007_04
+END_TESTCASE			COMINF-commdb-0140
+
+START_TESTCASE			COMINF-commdb-0141
+//! @SYMTestCaseID		COMINF-commdb-0141
+RUN_TEST_STEP 100000 te_commdb step_007_05
+END_TESTCASE			COMINF-commdb-0141
+
+START_TESTCASE			COMINF-commdb-0142
+//! @SYMTestCaseID		COMINF-commdb-0142
+RUN_TEST_STEP 100000 te_commdb step_007_06
+END_TESTCASE			COMINF-commdb-0142
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0143
+//! @SYMTestCaseID		COMINF-commdb-0143
+RUN_TEST_STEP 100000 te_commdb step_007_07
+END_TESTCASE			COMINF-commdb-0143
+
+START_TESTCASE			COMINF-commdb-0144
+//! @SYMTestCaseID		COMINF-commdb-0144
+RUN_TEST_STEP 100000 te_commdb step_007_08
+END_TESTCASE			COMINF-commdb-0144
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0145
+//! @SYMTestCaseID		COMINF-commdb-0145
+RUN_TEST_STEP 100000 te_commdb step_007_09
+END_TESTCASE			COMINF-commdb-0145
+
+START_TESTCASE			COMINF-commdb-0146
+//! @SYMTestCaseID		COMINF-commdb-0146
+RUN_TEST_STEP 100000 te_commdb step_007_10
+END_TESTCASE			COMINF-commdb-0146
+
+START_TESTCASE			COMINF-commdb-0147
+//! @SYMTestCaseID		COMINF-commdb-0147
+RUN_TEST_STEP 100000 te_commdb step_007_11
+END_TESTCASE			COMINF-commdb-0147
+
+START_TESTCASE			COMINF-commdb-0148
+//! @SYMTestCaseID		COMINF-commdb-0148
+RUN_TEST_STEP 100000 te_commdb step_007_12
+END_TESTCASE			COMINF-commdb-0148
+
+START_TESTCASE			COMINF-commdb-0149
+//! @SYMTestCaseID		COMINF-commdb-0149
+RUN_PANIC_STEP 100000 te_commdb step_007_14
+END_TESTCASE			COMINF-commdb-0149
+
+START_TESTCASE			COMINF-commdb-0150
+//! @SYMTestCaseID		COMINF-commdb-0150
+RUN_TEST_STEP 1000000 te_commdb step_007_15
+END_TESTCASE			COMINF-commdb-0150
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0151
+//! @SYMTestCaseID		COMINF-commdb-0151
+RUN_TEST_STEP 1000000 te_commdb step_007_16
+END_TESTCASE			COMINF-commdb-0151
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0152
+//! @SYMTestCaseID		COMINF-commdb-0152
+RUN_TEST_STEP 1000000 te_commdb step_007_17
+END_TESTCASE			COMINF-commdb-0152
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0153
+//! @SYMTestCaseID		COMINF-commdb-0153
+RUN_TEST_STEP 1000000 te_commdb step_007_18
+END_TESTCASE			COMINF-commdb-0153
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0154
+//! @SYMTestCaseID		COMINF-commdb-0154
+RUN_TEST_STEP 1000000 te_commdb step_007_19
+END_TESTCASE			COMINF-commdb-0154
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0155
+//! @SYMTestCaseID		COMINF-commdb-0155
+RUN_PANIC_STEP 1000000 te_commdb step_007_20
+END_TESTCASE			COMINF-commdb-0155
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0156
+//! @SYMTestCaseID		COMINF-commdb-0156
+RUN_TEST_STEP 100000 te_commdb step_008_01
+END_TESTCASE			COMINF-commdb-0156
+
+START_TESTCASE			COMINF-commdb-0157
+//! @SYMTestCaseID		COMINF-commdb-0157
+RUN_TEST_STEP 1000000 te_commdb step_008_02
+END_TESTCASE			COMINF-commdb-0157
+
+START_TESTCASE			COMINF-commdb-0158
+//! @SYMTestCaseID		COMINF-commdb-0158
+RUN_TEST_STEP 100000 te_commdb step_008_03
+END_TESTCASE			COMINF-commdb-0158
+
+START_TESTCASE			COMINF-commdb-0159
+//! @SYMTestCaseID		COMINF-commdb-0159
+RUN_TEST_STEP 1000000 te_commdb step_008_04
+END_TESTCASE			COMINF-commdb-0159
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0160
+//! @SYMTestCaseID		COMINF-commdb-0160
+RUN_TEST_STEP 100000 te_commdb step_009_01
+END_TESTCASE			COMINF-commdb-0160
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0161
+//! @SYMTestCaseID		COMINF-commdb-0161
+RUN_TEST_STEP 100000 te_commdb step_009_02
+END_TESTCASE			COMINF-commdb-0161
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0162
+//! @SYMTestCaseID		COMINF-commdb-0162
+RUN_TEST_STEP 100000 te_commdb step_009_03
+END_TESTCASE			COMINF-commdb-0162
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0163
+//! @SYMTestCaseID		COMINF-commdb-0163
+RUN_TEST_STEP 100000 te_commdb step_009_04
+END_TESTCASE			COMINF-commdb-0163
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0164
+//! @SYMTestCaseID		COMINF-commdb-0164
+RUN_TEST_STEP 100000 te_commdb step_009_05
+END_TESTCASE			COMINF-commdb-0164
+
+START_TESTCASE			COMINF-commdb-0165
+//! @SYMTestCaseID		COMINF-commdb-0165
+RUN_TEST_STEP 100000 te_commdb step_009_06
+END_TESTCASE			COMINF-commdb-0165
+
+START_TESTCASE			COMINF-commdb-0166
+//! @SYMTestCaseID		COMINF-commdb-0166
+RUN_PANIC_STEP 100000 te_commdb step_009_07
+END_TESTCASE			COMINF-commdb-0166
+
+START_TESTCASE			COMINF-commdb-0167
+//! @SYMTestCaseID		COMINF-commdb-0167
+RUN_PANIC_STEP 100000 te_commdb step_009_08
+END_TESTCASE			COMINF-commdb-0167
+
+START_TESTCASE			COMINF-commdb-0168
+//! @SYMTestCaseID		COMINF-commdb-0168
+RUN_TEST_STEP 100000 te_commdb step_009_09
+END_TESTCASE			COMINF-commdb-0168
+
+START_TESTCASE			COMINF-commdb-0169
+//! @SYMTestCaseID		COMINF-commdb-0169
+RUN_TEST_STEP 100000 te_commdb step_009_10
+END_TESTCASE			COMINF-commdb-0169
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0170
+//! @SYMTestCaseID		COMINF-commdb-0170
+RUN_TEST_STEP 1000000 te_commdb step_009_11
+END_TESTCASE			COMINF-commdb-0170
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0171
+//! @SYMTestCaseID		COMINF-commdb-0171
+RUN_TEST_STEP 1000000 te_commdb step_009_12
+END_TESTCASE			COMINF-commdb-0171
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0172
+//! @SYMTestCaseID		COMINF-commdb-0172
+RUN_TEST_STEP 1000000 te_commdb step_009_13
+END_TESTCASE			COMINF-commdb-0172
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0173
+//! @SYMTestCaseID		COMINF-commdb-0173
+RUN_TEST_STEP 1000000 te_commdb step_009_14
+END_TESTCASE			COMINF-commdb-0173
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0174
+//! @SYMTestCaseID		COMINF-commdb-0174
+RUN_TEST_STEP 1000000 te_commdb step_009_15
+END_TESTCASE			COMINF-commdb-0174
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0175
+//! @SYMTestCaseID		COMINF-commdb-0175
+RUN_TEST_STEP 1000000 te_commdb step_009_16
+END_TESTCASE			COMINF-commdb-0175
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0176
+//! @SYMTestCaseID		COMINF-commdb-0176
+RUN_TEST_STEP 1000000 te_commdb step_009_17
+END_TESTCASE			COMINF-commdb-0176
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0177
+//! @SYMTestCaseID		COMINF-commdb-0177
+RUN_TEST_STEP 1000000 te_commdb step_009_18
+END_TESTCASE			COMINF-commdb-0177
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0178
+//! @SYMTestCaseID		COMINF-commdb-0178
+RUN_TEST_STEP 1000000 te_commdb step_009_19
+END_TESTCASE			COMINF-commdb-0178
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0179
+//! @SYMTestCaseID		COMINF-commdb-0179
+RUN_PANIC_STEP 100000 te_commdb step_009_20
+END_TESTCASE			COMINF-commdb-0179
+
+START_TESTCASE			COMINF-commdb-0180
+//! @SYMTestCaseID		COMINF-commdb-0180
+RUN_PANIC_STEP 100000 te_commdb step_009_21
+END_TESTCASE			COMINF-commdb-0180
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0181
+//! @SYMTestCaseID		COMINF-commdb-0181
+RUN_TEST_STEP 100000 te_commdb step_010_01
+END_TESTCASE			COMINF-commdb-0181
+
+START_TESTCASE			COMINF-commdb-0182
+//! @SYMTestCaseID		COMINF-commdb-0182
+RUN_TEST_STEP 100000 te_commdb step_010_02
+END_TESTCASE			COMINF-commdb-0182
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0183
+//! @SYMTestCaseID		COMINF-commdb-0183
+RUN_TEST_STEP 100000 te_commdb step_010_03
+END_TESTCASE			COMINF-commdb-0183
+
+START_TESTCASE			COMINF-commdb-0184
+//! @SYMTestCaseID		COMINF-commdb-0184
+RUN_TEST_STEP 100000 te_commdb step_010_04
+END_TESTCASE			COMINF-commdb-0184
+
+START_TESTCASE			COMINF-commdb-0185
+//! @SYMTestCaseID		COMINF-commdb-0185
+RUN_TEST_STEP 1000000 te_commdb step_010_05
+END_TESTCASE			COMINF-commdb-0185
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0186
+//! @SYMTestCaseID		COMINF-commdb-0186
+RUN_TEST_STEP 100000 te_commdb step_011_01
+END_TESTCASE			COMINF-commdb-0186
+
+START_TESTCASE			COMINF-commdb-0187
+//! @SYMTestCaseID		COMINF-commdb-0187
+RUN_TEST_STEP 100000 te_commdb step_011_02
+END_TESTCASE			COMINF-commdb-0187
+
+START_TESTCASE			COMINF-commdb-0188
+//! @SYMTestCaseID		COMINF-commdb-0188
+RUN_TEST_STEP 100000 te_commdb step_011_03
+
+CED z:\testdata\configs\default1.xml -f
+
+END_TESTCASE			COMINF-commdb-0188
+
+START_TESTCASE			COMINF-commdb-0189
+//! @SYMTestCaseID		COMINF-commdb-0189
+RUN_TEST_STEP 1000000 te_commdb step_011_04
+END_TESTCASE			COMINF-commdb-0189
+
+
+START_TESTCASE			COMINF-commdb-0190
+//! @SYMTestCaseID		COMINF-commdb-0190
+RUN_TEST_STEP 100000 te_commdb step_013_01
+END_TESTCASE			COMINF-commdb-0190
+
+START_TESTCASE			COMINF-commdb-0191
+//! @SYMTestCaseID		COMINF-commdb-0191
+RUN_TEST_STEP 100000 te_commdb step_013_02
+END_TESTCASE			COMINF-commdb-0191
+
+START_TESTCASE			COMINF-commdb-0192
+//! @SYMTestCaseID		COMINF-commdb-0192
+RUN_TEST_STEP 100000 te_commdb step_013_03
+END_TESTCASE			COMINF-commdb-0192
+
+START_TESTCASE			COMINF-commdb-0193
+//! @SYMTestCaseID		COMINF-commdb-0193
+RUN_TEST_STEP 1000000 te_commdb step_013_04
+END_TESTCASE			COMINF-commdb-0193
+
+START_TESTCASE			COMINF-commdb-0194
+//! @SYMTestCaseID		COMINF-commdb-0194
+RUN_TEST_STEP 100000 te_commdb step_014_01
+END_TESTCASE			COMINF-commdb-0194
+
+START_TESTCASE			COMINF-commdb-0195
+//! @SYMTestCaseID		COMINF-commdb-0195
+RUN_TEST_STEP 100000 te_commdb step_014_02
+END_TESTCASE			COMINF-commdb-0195
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0196
+//! @SYMTestCaseID		COMINF-commdb-0196
+RUN_TEST_STEP 1000000 te_commdb step_014_03
+END_TESTCASE			COMINF-commdb-0196
+
+START_TESTCASE			COMINF-commdb-0197
+//! @SYMTestCaseID		COMINF-commdb-0197
+RUN_TEST_STEP 1000000 te_commdb step_014_04
+END_TESTCASE			COMINF-commdb-0197
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0198
+//! @SYMTestCaseID		COMINF-commdb-0198
+RUN_TEST_STEP 100000 te_commdb step_015_01
+END_TESTCASE			COMINF-commdb-0198
+
+START_TESTCASE			COMINF-commdb-0199
+//! @SYMTestCaseID		COMINF-commdb-0199
+RUN_TEST_STEP 100000 te_commdb step_015_02
+END_TESTCASE			COMINF-commdb-0199
+
+START_TESTCASE			COMINF-commdb-0201
+//! @SYMTestCaseID		COMINF-commdb-0201
+RUN_TEST_STEP 100000 te_commdb step_015_03
+END_TESTCASE			COMINF-commdb-0201
+
+START_TESTCASE			COMINF-commdb-0202
+//! @SYMTestCaseID		COMINF-commdb-0202
+RUN_TEST_STEP 100000 te_commdb step_015_04
+END_TESTCASE			COMINF-commdb-0202
+
+START_TESTCASE			COMINF-commdb-0203
+//! @SYMTestCaseID		COMINF-commdb-0203
+RUN_TEST_STEP 100000 te_commdb step_015_05
+END_TESTCASE			COMINF-commdb-0203
+
+START_TESTCASE			COMINF-commdb-0204
+//! @SYMTestCaseID		COMINF-commdb-0204
+RUN_TEST_STEP 100000 te_commdb step_015_06
+
+END_TESTCASE			COMINF-commdb-0204
+
+START_TESTCASE			COMINF-commdb-0205
+//! @SYMTestCaseID		COMINF-commdb-0205
+RUN_TEST_STEP 100000 te_commdb step_015_07
+END_TESTCASE			COMINF-commdb-0205
+
+START_TESTCASE			COMINF-commdb-0206
+//! @SYMTestCaseID		COMINF-commdb-0206
+RUN_TEST_STEP 100000 te_commdb step_015_08
+END_TESTCASE			COMINF-commdb-0206
+
+START_TESTCASE			COMINF-commdb-0207
+//! @SYMTestCaseID		COMINF-commdb-0207
+RUN_TEST_STEP 1000000 te_commdb step_015_09
+END_TESTCASE			COMINF-commdb-0207
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0208
+//! @SYMTestCaseID		COMINF-commdb-0208
+RUN_TEST_STEP 1000000 te_commdb step_015_10
+END_TESTCASE			COMINF-commdb-0208
+
+START_TESTCASE			COMINF-commdb-0209
+//! @SYMTestCaseID		COMINF-commdb-0209
+RUN_TEST_STEP 1000000 te_commdb step_015_11
+END_TESTCASE			COMINF-commdb-0209
+
+START_TESTCASE			COMINF-commdb-0210
+//! @SYMTestCaseID		COMINF-commdb-0210
+RUN_TEST_STEP 1000000 te_commdb step_015_12
+END_TESTCASE			COMINF-commdb-0210
+
+START_TESTCASE			COMINF-commdb-0211
+//! @SYMTestCaseID		COMINF-commdb-0211
+RUN_TEST_STEP 1000000 te_commdb step_015_13  
+END_TESTCASE			COMINF-commdb-0211
+
+START_TESTCASE			COMINF-commdb-0212
+//! @SYMTestCaseID		COMINF-commdb-0212                           
+RUN_TEST_STEP 1000000 te_commdb step_015_14
+END_TESTCASE			COMINF-commdb-0212
+
+START_TESTCASE			COMINF-commdb-0213
+//! @SYMTestCaseID		COMINF-commdb-0213
+RUN_TEST_STEP 1000000 te_commdb step_015_15 
+END_TESTCASE			COMINF-commdb-0213
+
+START_TESTCASE			COMINF-commdb-0214
+//! @SYMTestCaseID		COMINF-commdb-0214                          
+RUN_TEST_STEP 1000000 te_commdb step_015_16
+END_TESTCASE			COMINF-commdb-0214
+
+CED z:\testdata\configs\default1.xml -f
+
+// TODO - these 7 tests should pass - are failing because of notifications
+
+START_TESTCASE			COMINF-commdb-0215
+//! @SYMTestCaseID		COMINF-commdb-0215
+RUN_TEST_STEP 100000 te_commdb step_016_01
+END_TESTCASE			COMINF-commdb-0215
+
+START_TESTCASE			COMINF-commdb-0216
+//! @SYMTestCaseID		COMINF-commdb-0216
+RUN_TEST_STEP 100000 te_commdb step_016_02
+END_TESTCASE			COMINF-commdb-0216
+
+START_TESTCASE			COMINF-commdb-0217
+//! @SYMTestCaseID		COMINF-commdb-0217
+RUN_TEST_STEP 100000 te_commdb step_016_04
+END_TESTCASE			COMINF-commdb-0217
+
+START_TESTCASE			COMINF-commdb-0218
+//! @SYMTestCaseID		COMINF-commdb-0218
+RUN_TEST_STEP 100000 te_commdb step_016_05
+END_TESTCASE			COMINF-commdb-0218
+
+START_TESTCASE			COMINF-commdb-0219
+//! @SYMTestCaseID		COMINF-commdb-0219
+RUN_TEST_STEP 100000 te_commdb step_016_07
+END_TESTCASE			COMINF-commdb-0219
+
+START_TESTCASE			COMINF-commdb-0220
+//! @SYMTestCaseID		COMINF-commdb-0220
+RUN_TEST_STEP 100000 te_commdb step_016_08
+END_TESTCASE			COMINF-commdb-0220
+
+START_TESTCASE			COMINF-commdb-0221
+//! @SYMTestCaseID		COMINF-commdb-0221
+RUN_TEST_STEP 2000000 te_commdb step_016_09
+END_TESTCASE			COMINF-commdb-0221
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0222
+//! @SYMTestCaseID		COMINF-commdb-0222
+RUN_TEST_STEP 100000 te_commdb step_017_01
+END_TESTCASE			COMINF-commdb-0222
+
+CED z:\testdata\configs\default1.xml -f
+
+// These 5 steps should pass - notifications
+
+START_TESTCASE			COMINF-commdb-0223
+//! @SYMTestCaseID		COMINF-commdb-0223
+RUN_TEST_STEP 100000 te_commdb step_017_02
+END_TESTCASE			COMINF-commdb-0223
+
+//CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0224
+//! @SYMTestCaseID		COMINF-commdb-0224
+RUN_TEST_STEP 100000 te_commdb step_017_03
+END_TESTCASE			COMINF-commdb-0224
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0225
+//! @SYMTestCaseID		COMINF-commdb-0225
+RUN_TEST_STEP 100000 te_commdb step_017_04
+END_TESTCASE			COMINF-commdb-0225
+
+
+//CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0226
+//! @SYMTestCaseID		COMINF-commdb-0226
+RUN_TEST_STEP 2000000 te_commdb step_017_05
+END_TESTCASE			COMINF-commdb-0226
+
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0227
+//! @SYMTestCaseID		COMINF-commdb-0227
+RUN_TEST_STEP 2000000 te_commdb step_017_06
+END_TESTCASE			COMINF-commdb-0227
+
+START_TESTCASE			COMINF-commdb-0228
+//! @SYMTestCaseID		COMINF-commdb-0228
+RUN_TEST_STEP 2000000 te_commdb step_017_07
+END_TESTCASE			COMINF-commdb-0228
+
+START_TESTCASE			COMINF-commdb-0229
+//! @SYMTestCaseID		COMINF-commdb-0229
+RUN_TEST_STEP 100000 te_commdb step_018_01
+END_TESTCASE			COMINF-commdb-0229
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0230
+//! @SYMTestCaseID		COMINF-commdb-0230
+RUN_TEST_STEP 100000 te_commdb step_018_02
+END_TESTCASE			COMINF-commdb-0230
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0231
+//! @SYMTestCaseID		COMINF-commdb-0231
+RUN_TEST_STEP 100000 te_commdb step_018_03
+END_TESTCASE			COMINF-commdb-0231
+
+START_TESTCASE			COMINF-commdb-0232
+//! @SYMTestCaseID		COMINF-commdb-0232
+RUN_TEST_STEP 1000000 te_commdb step_018_04
+END_TESTCASE			COMINF-commdb-0232
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0233
+//! @SYMTestCaseID		COMINF-commdb-0233
+RUN_TEST_STEP 1000000 te_commdb step_018_05
+END_TESTCASE			COMINF-commdb-0233
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0234
+//! @SYMTestCaseID		COMINF-commdb-0234
+RUN_TEST_STEP 1000000 te_commdb step_018_06
+END_TESTCASE			COMINF-commdb-0234
+
+START_TESTCASE			COMINF-commdb-0235
+//! @SYMTestCaseID		COMINF-commdb-0235
+RUN_TEST_STEP 1000000 te_commdb step_018_07
+END_TESTCASE			COMINF-commdb-0235
+
+START_TESTCASE			COMINF-commdb-0236
+//! @SYMTestCaseID		COMINF-commdb-0236
+RUN_TEST_STEP 1000000 te_commdb step_018_08
+END_TESTCASE			COMINF-commdb-0236
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0237
+//! @SYMTestCaseID		COMINF-commdb-0237
+RUN_TEST_STEP 100000 te_commdb step_019_01
+END_TESTCASE			COMINF-commdb-0237
+
+START_TESTCASE			COMINF-commdb-0238
+//! @SYMTestCaseID		COMINF-commdb-0238
+RUN_TEST_STEP 100000 te_commdb step_019_02
+END_TESTCASE			COMINF-commdb-0238
+
+START_TESTCASE			COMINF-commdb-0239
+//! @SYMTestCaseID		COMINF-commdb-0239
+RUN_TEST_STEP 100000 te_commdb step_019_03
+END_TESTCASE			COMINF-commdb-0239
+
+START_TESTCASE			COMINF-commdb-0240
+//! @SYMTestCaseID		COMINF-commdb-0240
+RUN_TEST_STEP 100000 te_commdb step_019_04
+END_TESTCASE			COMINF-commdb-0240
+
+START_TESTCASE			COMINF-commdb-0241
+//! @SYMTestCaseID		COMINF-commdb-0241
+RUN_TEST_STEP 100000 te_commdb step_019_05
+END_TESTCASE			COMINF-commdb-0241
+
+START_TESTCASE			COMINF-commdb-0242
+//! @SYMTestCaseID		COMINF-commdb-0242
+RUN_TEST_STEP 100000 te_commdb step_019_06
+END_TESTCASE			COMINF-commdb-0242
+
+START_TESTCASE			COMINF-commdb-0243
+//! @SYMTestCaseID		COMINF-commdb-0243
+RUN_TEST_STEP 100000 te_commdb step_019_07
+END_TESTCASE			COMINF-commdb-0243
+
+START_TESTCASE			COMINF-commdb-0244
+//! @SYMTestCaseID		COMINF-commdb-0244
+RUN_TEST_STEP 1000000 te_commdb step_019_08
+END_TESTCASE			COMINF-commdb-0244
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0245
+//! @SYMTestCaseID		COMINF-commdb-0245
+RUN_TEST_STEP 1000000 te_commdb step_019_09
+END_TESTCASE			COMINF-commdb-0245
+
+START_TESTCASE			COMINF-commdb-0246
+//! @SYMTestCaseID		COMINF-commdb-0246
+RUN_TEST_STEP 1000000 te_commdb step_019_10
+END_TESTCASE			COMINF-commdb-0246
+
+START_TESTCASE			COMINF-commdb-0247
+//! @SYMTestCaseID		COMINF-commdb-0247
+RUN_TEST_STEP 1000000 te_commdb step_019_11
+END_TESTCASE			COMINF-commdb-0247
+
+START_TESTCASE			COMINF-commdb-0248
+//! @SYMTestCaseID		COMINF-commdb-0248
+RUN_TEST_STEP 1000000 te_commdb step_019_12
+END_TESTCASE			COMINF-commdb-0248
+
+//OOM run when _19_07 is fixed
+START_TESTCASE			COMINF-commdb-0249
+//! @SYMTestCaseID		COMINF-commdb-0249
+RUN_TEST_STEP 1000000 te_commdb step_019_13
+END_TESTCASE			COMINF-commdb-0249
+
+//OOM run when 19_07 is fixed
+START_TESTCASE			COMINF-commdb-0250
+//! @SYMTestCaseID		COMINF-commdb-0250
+RUN_TEST_STEP 1000000 te_commdb step_019_14
+END_TESTCASE			COMINF-commdb-0250
+
+CED z:\testdata\configs\020.xml -f
+
+START_TESTCASE			COMINF-commdb-0251
+//! @SYMTestCaseID		COMINF-commdb-0251
+RUN_TEST_STEP 100000 te_commdb step_020_01
+END_TESTCASE			COMINF-commdb-0251
+
+START_TESTCASE			COMINF-commdb-0252
+//! @SYMTestCaseID		COMINF-commdb-0252
+RUN_TEST_STEP 100000 te_commdb step_020_02
+END_TESTCASE			COMINF-commdb-0252
+
+START_TESTCASE			COMINF-commdb-0253
+//! @SYMTestCaseID		COMINF-commdb-0253
+RUN_TEST_STEP 100000 te_commdb step_020_03
+END_TESTCASE			COMINF-commdb-0253
+
+START_TESTCASE			COMINF-commdb-0254
+//! @SYMTestCaseID		COMINF-commdb-0254
+RUN_TEST_STEP 100000 te_commdb step_020_04
+END_TESTCASE			COMINF-commdb-0254
+
+START_TESTCASE			COMINF-commdb-0255
+//! @SYMTestCaseID		COMINF-commdb-0255
+RUN_TEST_STEP 100000 te_commdb step_020_05
+END_TESTCASE			COMINF-commdb-0255
+
+START_TESTCASE			COMINF-commdb-0256
+//! @SYMTestCaseID		COMINF-commdb-0256
+RUN_TEST_STEP 100000 te_commdb step_020_06
+END_TESTCASE			COMINF-commdb-0256
+
+START_TESTCASE			COMINF-commdb-0257
+//! @SYMTestCaseID		COMINF-commdb-0257
+RUN_TEST_STEP 100000 te_commdb step_020_07
+END_TESTCASE			COMINF-commdb-0257
+
+START_TESTCASE			COMINF-commdb-0258
+//! @SYMTestCaseID		COMINF-commdb-0258
+RUN_TEST_STEP 1000000 te_commdb step_020_08
+END_TESTCASE			COMINF-commdb-0258
+
+CED z:\testdata\configs\021.xml -f
+
+START_TESTCASE			COMINF-commdb-0259
+//! @SYMTestCaseID		COMINF-commdb-0259
+RUN_TEST_STEP 100000 te_commdb step_021_01
+END_TESTCASE			COMINF-commdb-0259
+
+START_TESTCASE			COMINF-commdb-0260
+//! @SYMTestCaseID		COMINF-commdb-0260
+RUN_TEST_STEP 100000 te_commdb step_021_02
+END_TESTCASE			COMINF-commdb-0260
+
+START_TESTCASE			COMINF-commdb-0261
+//! @SYMTestCaseID		COMINF-commdb-0261
+RUN_TEST_STEP 100000 te_commdb step_021_03
+END_TESTCASE			COMINF-commdb-0261
+
+START_TESTCASE			COMINF-commdb-0262
+//! @SYMTestCaseID		COMINF-commdb-0262
+RUN_TEST_STEP 100000 te_commdb step_021_04
+
+END_TESTCASE			COMINF-commdb-0262
+
+START_TESTCASE			COMINF-commdb-0263
+//! @SYMTestCaseID		COMINF-commdb-0263
+RUN_TEST_STEP 1000000 te_commdb step_021_05
+END_TESTCASE			COMINF-commdb-0263
+
+CED z:\testdata\configs\022.xml -f
+
+START_TESTCASE			COMINF-commdb-0264
+//! @SYMTestCaseID		COMINF-commdb-0264
+RUN_TEST_STEP 100000 te_commdb step_022_01
+END_TESTCASE			COMINF-commdb-0264
+
+START_TESTCASE			COMINF-commdb-0265
+//! @SYMTestCaseID		COMINF-commdb-0265
+RUN_TEST_STEP 100000 te_commdb step_022_02
+END_TESTCASE			COMINF-commdb-0265
+
+START_TESTCASE			COMINF-commdb-0266
+//! @SYMTestCaseID		COMINF-commdb-0266
+RUN_TEST_STEP 100000 te_commdb step_022_03
+END_TESTCASE			COMINF-commdb-0266
+
+START_TESTCASE			COMINF-commdb-0267
+//! @SYMTestCaseID		COMINF-commdb-0267
+RUN_TEST_STEP 100000 te_commdb step_022_04
+END_TESTCASE			COMINF-commdb-0267
+
+START_TESTCASE			COMINF-commdb-0268
+//! @SYMTestCaseID		COMINF-commdb-0268
+RUN_TEST_STEP 100000 te_commdb step_022_05
+END_TESTCASE			COMINF-commdb-0268
+
+START_TESTCASE			COMINF-commdb-0269
+//! @SYMTestCaseID		COMINF-commdb-0269
+RUN_TEST_STEP 100000 te_commdb step_022_06
+END_TESTCASE			COMINF-commdb-0269
+
+START_TESTCASE			COMINF-commdb-0270
+//! @SYMTestCaseID		COMINF-commdb-0270
+RUN_TEST_STEP 100000 te_commdb step_022_07
+END_TESTCASE			COMINF-commdb-0270
+
+START_TESTCASE			COMINF-commdb-0271
+//! @SYMTestCaseID		COMINF-commdb-0271
+RUN_TEST_STEP 100000 te_commdb step_022_08
+END_TESTCASE			COMINF-commdb-0271
+
+START_TESTCASE			COMINF-commdb-0272
+//! @SYMTestCaseID		COMINF-commdb-0272
+RUN_TEST_STEP 100000 te_commdb step_022_09
+END_TESTCASE			COMINF-commdb-0272
+
+START_TESTCASE			COMINF-commdb-0273
+//! @SYMTestCaseID		COMINF-commdb-0273
+RUN_TEST_STEP 100000 te_commdb step_022_10
+END_TESTCASE			COMINF-commdb-0273
+
+START_TESTCASE			COMINF-commdb-0274
+//! @SYMTestCaseID		COMINF-commdb-0274
+RUN_TEST_STEP 100000 te_commdb step_022_11
+END_TESTCASE			COMINF-commdb-0274
+
+START_TESTCASE			COMINF-commdb-0275
+//! @SYMTestCaseID		COMINF-commdb-0275
+RUN_TEST_STEP 100000 te_commdb step_022_12
+END_TESTCASE			COMINF-commdb-0275
+
+START_TESTCASE			COMINF-commdb-0276
+//! @SYMTestCaseID		COMINF-commdb-0276
+RUN_TEST_STEP 100000 te_commdb step_022_13
+END_TESTCASE			COMINF-commdb-0276
+
+START_TESTCASE			COMINF-commdb-0277
+//! @SYMTestCaseID		COMINF-commdb-0277
+RUN_TEST_STEP 100000 te_commdb step_022_14
+END_TESTCASE			COMINF-commdb-0277
+
+START_TESTCASE			COMINF-commdb-0278
+//! @SYMTestCaseID		COMINF-commdb-0278
+RUN_TEST_STEP 100000 te_commdb step_022_16
+END_TESTCASE			COMINF-commdb-0278
+
+CED z:\testdata\configs\022.xml -f
+
+START_TESTCASE			COMINF-commdb-0279
+//! @SYMTestCaseID		COMINF-commdb-0279
+RUN_TEST_STEP 1000000 te_commdb step_022_17
+END_TESTCASE			COMINF-commdb-0279
+
+START_TESTCASE			COMINF-commdb-0280
+//! @SYMTestCaseID		COMINF-commdb-0280
+RUN_TEST_STEP 1000000 te_commdb step_022_18
+END_TESTCASE			COMINF-commdb-0280
+
+START_TESTCASE			COMINF-commdb-0281
+//! @SYMTestCaseID		COMINF-commdb-0281
+RUN_TEST_STEP 1000000 te_commdb step_022_19
+END_TESTCASE			COMINF-commdb-0281
+
+START_TESTCASE			COMINF-commdb-0282
+//! @SYMTestCaseID		COMINF-commdb-0282
+RUN_TEST_STEP 1000000 te_commdb step_022_20
+END_TESTCASE			COMINF-commdb-0282
+
+START_TESTCASE			COMINF-commdb-0283
+//! @SYMTestCaseID		COMINF-commdb-0283
+RUN_TEST_STEP 1000000 te_commdb step_022_21
+END_TESTCASE			COMINF-commdb-0283
+
+START_TESTCASE			COMINF-commdb-0284
+//! @SYMTestCaseID		COMINF-commdb-0284
+RUN_TEST_STEP 1000000 te_commdb step_022_22
+END_TESTCASE			COMINF-commdb-0284
+
+START_TESTCASE			COMINF-commdb-0285
+//! @SYMTestCaseID		COMINF-commdb-0285
+RUN_TEST_STEP 1000000 te_commdb step_022_23
+END_TESTCASE			COMINF-commdb-0285
+
+START_TESTCASE			COMINF-commdb-0286
+//! @SYMTestCaseID		COMINF-commdb-0286
+RUN_TEST_STEP 1000000 te_commdb step_022_24
+END_TESTCASE			COMINF-commdb-0286
+
+START_TESTCASE			COMINF-commdb-0287
+//! @SYMTestCaseID		COMINF-commdb-0287
+RUN_TEST_STEP 1000000 te_commdb step_022_25
+END_TESTCASE			COMINF-commdb-0287
+
+START_TESTCASE			COMINF-commdb-0288
+//! @SYMTestCaseID		COMINF-commdb-0288
+RUN_TEST_STEP 1000000 te_commdb step_022_26
+END_TESTCASE			COMINF-commdb-0288
+
+START_TESTCASE			COMINF-commdb-0289
+//! @SYMTestCaseID		COMINF-commdb-0289
+RUN_TEST_STEP 1000000 te_commdb step_022_27
+END_TESTCASE			COMINF-commdb-0289
+
+START_TESTCASE			COMINF-commdb-0290
+//! @SYMTestCaseID		COMINF-commdb-0290
+RUN_TEST_STEP 1000000 te_commdb step_022_28
+END_TESTCASE			COMINF-commdb-0290
+
+START_TESTCASE			COMINF-commdb-0291
+//! @SYMTestCaseID		COMINF-commdb-0291
+RUN_TEST_STEP 1000000 te_commdb step_022_29
+END_TESTCASE			COMINF-commdb-0291
+
+CED z:\testdata\configs\022_30.xml -f
+START_TESTCASE			COMINF-commdb-0292
+//! @SYMTestCaseID		COMINF-commdb-0292
+RUN_TEST_STEP 1000 te_commdb step_022_30
+END_TESTCASE			COMINF-commdb-0292
+
+CED z:\testdata\configs\023.xml -f
+
+START_TESTCASE			COMINF-commdb-0293
+//! @SYMTestCaseID		COMINF-commdb-0293
+RUN_TEST_STEP 100000 te_commdb step_023_01
+END_TESTCASE			COMINF-commdb-0293
+
+START_TESTCASE			COMINF-commdb-0294
+//! @SYMTestCaseID		COMINF-commdb-0294
+RUN_TEST_STEP 100000 te_commdb step_023_02
+END_TESTCASE			COMINF-commdb-0294
+
+START_TESTCASE			COMINF-commdb-0295
+//! @SYMTestCaseID		COMINF-commdb-0295
+RUN_TEST_STEP 100000 te_commdb step_023_03
+END_TESTCASE			COMINF-commdb-0295
+
+START_TESTCASE			COMINF-commdb-0296
+//! @SYMTestCaseID		COMINF-commdb-0296
+RUN_TEST_STEP 1000000 te_commdb step_023_04
+END_TESTCASE			COMINF-commdb-0296
+
+CED z:\testdata\configs\023.xml -f
+
+START_TESTCASE			COMINF-commdb-0297
+//! @SYMTestCaseID		COMINF-commdb-0297
+RUN_TEST_STEP 1000000 te_commdb step_023_05
+END_TESTCASE			COMINF-commdb-0297
+
+START_TESTCASE			COMINF-commdb-0298
+//! @SYMTestCaseID		COMINF-commdb-0298
+RUN_TEST_STEP 1000000 te_commdb step_023_06
+END_TESTCASE			COMINF-commdb-0298
+
+CED z:\testdata\configs\024.xml -f
+
+START_TESTCASE			COMINF-commdb-0299
+//! @SYMTestCaseID		COMINF-commdb-0299
+RUN_TEST_STEP 100000 te_commdb step_024_01
+END_TESTCASE			COMINF-commdb-0299
+
+START_TESTCASE			COMINF-commdb-0301
+//! @SYMTestCaseID		COMINF-commdb-0301
+RUN_TEST_STEP 100000 te_commdb step_024_02
+END_TESTCASE			COMINF-commdb-0301
+
+START_TESTCASE			COMINF-commdb-0302
+//! @SYMTestCaseID		COMINF-commdb-0302
+RUN_TEST_STEP 100000 te_commdb step_024_03
+END_TESTCASE			COMINF-commdb-0302
+
+START_TESTCASE			COMINF-commdb-0303
+//! @SYMTestCaseID		COMINF-commdb-0303
+RUN_TEST_STEP 100000 te_commdb step_024_04
+END_TESTCASE			COMINF-commdb-0303
+
+START_TESTCASE			COMINF-commdb-0304
+//! @SYMTestCaseID		COMINF-commdb-0304
+RUN_TEST_STEP 100000 te_commdb step_024_05
+END_TESTCASE			COMINF-commdb-0304
+
+START_TESTCASE			COMINF-commdb-0305
+//! @SYMTestCaseID		COMINF-commdb-0305
+RUN_TEST_STEP 100000 te_commdb step_024_06
+END_TESTCASE			COMINF-commdb-0305
+
+START_TESTCASE			COMINF-commdb-0306
+//! @SYMTestCaseID		COMINF-commdb-0306
+RUN_TEST_STEP 100000 te_commdb step_024_07
+END_TESTCASE			COMINF-commdb-0306
+
+START_TESTCASE			COMINF-commdb-0307
+//! @SYMTestCaseID		COMINF-commdb-0307
+RUN_TEST_STEP 100000 te_commdb step_024_08
+END_TESTCASE			COMINF-commdb-0307
+
+START_TESTCASE			COMINF-commdb-0308
+//! @SYMTestCaseID		COMINF-commdb-0308
+RUN_TEST_STEP 1000000 te_commdb step_024_09
+END_TESTCASE			COMINF-commdb-0308
+
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0309
+//! @SYMTestCaseID		COMINF-commdb-0309
+RUN_TEST_STEP 100000 te_commdb step_025_01
+END_TESTCASE			COMINF-commdb-0309
+
+START_TESTCASE			COMINF-commdb-0310
+//! @SYMTestCaseID		COMINF-commdb-0310
+RUN_TEST_STEP 1000000 te_commdb step_025_02
+END_TESTCASE			COMINF-commdb-0310
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0311
+//! @SYMTestCaseID		COMINF-commdb-0311
+RUN_TEST_STEP 100000 te_commdb step_026_01
+
+END_TESTCASE			COMINF-commdb-0311
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0312
+//! @SYMTestCaseID		COMINF-commdb-0312
+RUN_TEST_STEP 100000 te_commdb step_026_02
+END_TESTCASE			COMINF-commdb-0312
+
+START_TESTCASE			COMINF-commdb-0313
+//! @SYMTestCaseID		COMINF-commdb-0313
+RUN_TEST_STEP 100000 te_commdb step_026_03
+END_TESTCASE			COMINF-commdb-0313
+
+START_TESTCASE			COMINF-commdb-0314
+//! @SYMTestCaseID		COMINF-commdb-0314
+RUN_TEST_STEP 100000 te_commdb step_026_04
+END_TESTCASE			COMINF-commdb-0314
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0315
+//! @SYMTestCaseID		COMINF-commdb-0315
+RUN_TEST_STEP 100000 te_commdb step_026_05
+END_TESTCASE			COMINF-commdb-0315
+
+START_TESTCASE			COMINF-commdb-0316
+//! @SYMTestCaseID		COMINF-commdb-0316
+RUN_TEST_STEP 100000 te_commdb step_026_06
+END_TESTCASE			COMINF-commdb-0316
+
+START_TESTCASE			COMINF-commdb-0317
+//! @SYMTestCaseID		COMINF-commdb-0317
+RUN_TEST_STEP 100000 te_commdb step_026_07
+END_TESTCASE			COMINF-commdb-0317
+
+START_TESTCASE			COMINF-commdb-0318
+//! @SYMTestCaseID		COMINF-commdb-0318
+RUN_TEST_STEP 100000 te_commdb step_026_08
+END_TESTCASE			COMINF-commdb-0318
+
+START_TESTCASE			COMINF-commdb-0319
+//! @SYMTestCaseID		COMINF-commdb-0319
+RUN_TEST_STEP 1000000 te_commdb step_026_09
+END_TESTCASE			COMINF-commdb-0319
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0320
+//! @SYMTestCaseID		COMINF-commdb-0320
+RUN_TEST_STEP 1000000 te_commdb step_026_10
+END_TESTCASE			COMINF-commdb-0320
+
+START_TESTCASE			COMINF-commdb-0321
+//! @SYMTestCaseID		COMINF-commdb-0321
+RUN_TEST_STEP 1000000 te_commdb step_026_11
+END_TESTCASE			COMINF-commdb-0321
+
+START_TESTCASE			COMINF-commdb-0322
+//! @SYMTestCaseID		COMINF-commdb-0322
+RUN_TEST_STEP 1000000 te_commdb step_026_12
+END_TESTCASE			COMINF-commdb-0322
+
+START_TESTCASE			COMINF-commdb-0323
+//! @SYMTestCaseID		COMINF-commdb-0323
+RUN_TEST_STEP 1000000 te_commdb step_026_13
+END_TESTCASE			COMINF-commdb-0323
+
+//OOM run when 26_06 is fixed
+START_TESTCASE			COMINF-commdb-0324
+//! @SYMTestCaseID		COMINF-commdb-0324
+RUN_TEST_STEP 1000000 te_commdb step_026_14
+END_TESTCASE			COMINF-commdb-0324
+
+START_TESTCASE			COMINF-commdb-0325
+//! @SYMTestCaseID		COMINF-commdb-0325
+RUN_TEST_STEP 1000000 te_commdb step_026_15
+END_TESTCASE			COMINF-commdb-0325
+
+START_TESTCASE			COMINF-commdb-0326
+//! @SYMTestCaseID		COMINF-commdb-0326
+RUN_TEST_STEP 1000000 te_commdb step_026_16
+
+END_TESTCASE			COMINF-commdb-0326
+
+CED z:\testdata\configs\022.xml -f
+
+START_TESTCASE			COMINF-commdb-0327
+//! @SYMTestCaseID		COMINF-commdb-0327
+RUN_TEST_STEP 100000 te_commdb step_027_01
+END_TESTCASE			COMINF-commdb-0327
+
+START_TESTCASE			COMINF-commdb-0328
+//! @SYMTestCaseID		COMINF-commdb-0328
+RUN_TEST_STEP 1000000 te_commdb step_027_02
+END_TESTCASE			COMINF-commdb-0328
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0329
+//! @SYMTestCaseID		COMINF-commdb-0329
+RUN_TEST_STEP 100000 te_commdb step_028_01
+END_TESTCASE			COMINF-commdb-0329
+ 
+START_TESTCASE			COMINF-commdb-0330
+//! @SYMTestCaseID		COMINF-commdb-0330
+RUN_TEST_STEP 100000 te_commdb step_028_02
+END_TESTCASE			COMINF-commdb-0330
+
+START_TESTCASE			COMINF-commdb-0331
+//! @SYMTestCaseID		COMINF-commdb-0331
+RUN_TEST_STEP 100000 te_commdb step_028_03
+END_TESTCASE			COMINF-commdb-0331
+
+START_TESTCASE			COMINF-commdb-0332
+//! @SYMTestCaseID		COMINF-commdb-0332
+RUN_TEST_STEP 100000 te_commdb step_028_04
+END_TESTCASE			COMINF-commdb-0332
+
+START_TESTCASE			COMINF-commdb-0333
+//! @SYMTestCaseID		COMINF-commdb-0333
+RUN_TEST_STEP 100000 te_commdb step_028_05
+END_TESTCASE			COMINF-commdb-0333
+
+START_TESTCASE			COMINF-commdb-0334
+//! @SYMTestCaseID		COMINF-commdb-0334
+RUN_TEST_STEP 100000 te_commdb step_028_06
+END_TESTCASE			COMINF-commdb-0334
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0335
+//! @SYMTestCaseID		COMINF-commdb-0335
+RUN_TEST_STEP 1000000 te_commdb step_028_07
+END_TESTCASE			COMINF-commdb-0335
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0336
+//! @SYMTestCaseID		COMINF-commdb-0336
+RUN_TEST_STEP 100000 te_commdb step_029_01
+END_TESTCASE			COMINF-commdb-0336
+ 
+START_TESTCASE			COMINF-commdb-0337
+//! @SYMTestCaseID		COMINF-commdb-0337
+RUN_TEST_STEP 100000 te_commdb step_029_02
+END_TESTCASE			COMINF-commdb-0337
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0338
+//! @SYMTestCaseID		COMINF-commdb-0338
+RUN_TEST_STEP 100000 te_commdb step_029_03
+END_TESTCASE			COMINF-commdb-0338
+
+START_TESTCASE			COMINF-commdb-0339
+//! @SYMTestCaseID		COMINF-commdb-0339
+RUN_TEST_STEP 1000000 te_commdb step_029_04
+END_TESTCASE			COMINF-commdb-0339
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0340
+//! @SYMTestCaseID		COMINF-commdb-0340
+RUN_TEST_STEP 100000 te_commdb step_030_01
+END_TESTCASE			COMINF-commdb-0340
+
+START_TESTCASE			COMINF-commdb-0341
+//! @SYMTestCaseID		COMINF-commdb-0341
+RUN_TEST_STEP 100000 te_commdb step_030_02
+END_TESTCASE			COMINF-commdb-0341
+
+CED z:\testdata\configs\default3.xml -f
+START_TESTCASE			COMINF-commdb-0342
+//! @SYMTestCaseID		COMINF-commdb-0342
+RUN_TEST_STEP 1000000 te_commdb step_030_03
+END_TESTCASE			COMINF-commdb-0342
+
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0343
+//! @SYMTestCaseID		COMINF-commdb-0343
+RUN_TEST_STEP 100000 te_commdb step_031_01
+END_TESTCASE			COMINF-commdb-0343
+
+START_TESTCASE			COMINF-commdb-0344
+//! @SYMTestCaseID		COMINF-commdb-0344
+RUN_TEST_STEP 100000 te_commdb step_031_02
+END_TESTCASE			COMINF-commdb-0344
+
+START_TESTCASE			COMINF-commdb-0345
+//! @SYMTestCaseID		COMINF-commdb-0345
+RUN_TEST_STEP 100000 te_commdb step_031_03
+END_TESTCASE			COMINF-commdb-0345
+
+START_TESTCASE			COMINF-commdb-0346
+//! @SYMTestCaseID		COMINF-commdb-0346
+RUN_TEST_STEP 100000 te_commdb step_031_04
+END_TESTCASE			COMINF-commdb-0346
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0347
+//! @SYMTestCaseID		COMINF-commdb-0347
+RUN_TEST_STEP 1000000 te_commdb step_031_05
+END_TESTCASE			COMINF-commdb-0347
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0348
+//! @SYMTestCaseID		COMINF-commdb-0348
+RUN_TEST_STEP 100000 te_commdb step_032_01
+END_TESTCASE			COMINF-commdb-0348
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0349
+//! @SYMTestCaseID		COMINF-commdb-0349
+RUN_TEST_STEP 100000 te_commdb step_032_02
+END_TESTCASE			COMINF-commdb-0349
+
+START_TESTCASE			COMINF-commdb-0350
+//! @SYMTestCaseID		COMINF-commdb-0350
+RUN_TEST_STEP 100000 te_commdb step_032_03
+END_TESTCASE			COMINF-commdb-0350
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0351
+//! @SYMTestCaseID		COMINF-commdb-0351
+RUN_TEST_STEP 1000000 te_commdb step_032_04
+END_TESTCASE			COMINF-commdb-0351
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0352
+//! @SYMTestCaseID		COMINF-commdb-0352
+RUN_TEST_STEP 1000000 te_commdb step_032_05
+END_TESTCASE			COMINF-commdb-0352
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0353
+//! @SYMTestCaseID		COMINF-commdb-0353
+RUN_TEST_STEP 100000 te_commdb step_033_01
+END_TESTCASE			COMINF-commdb-0353
+
+START_TESTCASE			COMINF-commdb-0354
+//! @SYMTestCaseID		COMINF-commdb-0354
+RUN_TEST_STEP 100000 te_commdb step_033_02
+END_TESTCASE			COMINF-commdb-0354
+
+START_TESTCASE			COMINF-commdb-0355
+//! @SYMTestCaseID		COMINF-commdb-0355
+RUN_TEST_STEP 100000 te_commdb step_033_03
+END_TESTCASE			COMINF-commdb-0355
+
+START_TESTCASE			COMINF-commdb-0356
+//! @SYMTestCaseID		COMINF-commdb-0356
+RUN_TEST_STEP 100000 te_commdb step_033_04
+END_TESTCASE			COMINF-commdb-0356
+
+CED z:\testdata\configs\default3.xml -f
+//OOM run when 33_01 is fixed
+START_TESTCASE			COMINF-commdb-0357
+//! @SYMTestCaseID		COMINF-commdb-0357
+RUN_TEST_STEP 1000000 te_commdb step_033_05
+END_TESTCASE			COMINF-commdb-0357
+
+CED z:\testdata\configs\default3.xml -f
+
+//OOM run when 33_02 is fixed
+START_TESTCASE			COMINF-commdb-0358
+//! @SYMTestCaseID		COMINF-commdb-0358
+RUN_TEST_STEP 1000000 te_commdb step_033_06
+END_TESTCASE			COMINF-commdb-0358
+
+START_TESTCASE			COMINF-commdb-0359
+//! @SYMTestCaseID		COMINF-commdb-0359
+RUN_TEST_STEP 1000000 te_commdb step_033_07
+END_TESTCASE			COMINF-commdb-0359
+
+START_TESTCASE			COMINF-commdb-0360
+//! @SYMTestCaseID		COMINF-commdb-0360
+RUN_TEST_STEP 1000000 te_commdb step_033_08
+END_TESTCASE			COMINF-commdb-0360
+
+START_TESTCASE			COMINF-commdb-0361
+//! @SYMTestCaseID		COMINF-commdb-0361
+RUN_TEST_STEP 1000000 te_commdb step_033_09
+END_TESTCASE			COMINF-commdb-0361
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0362
+//! @SYMTestCaseID		COMINF-commdb-0362
+RUN_TEST_STEP 100000 te_commdb step_034_01
+END_TESTCASE			COMINF-commdb-0362
+
+START_TESTCASE			COMINF-commdb-0363
+//! @SYMTestCaseID		COMINF-commdb-0363
+RUN_TEST_STEP 100000 te_commdb step_034_02
+END_TESTCASE			COMINF-commdb-0363
+
+START_TESTCASE			COMINF-commdb-0364
+//! @SYMTestCaseID		COMINF-commdb-0364
+RUN_TEST_STEP 100000 te_commdb step_034_03
+END_TESTCASE			COMINF-commdb-0364
+
+START_TESTCASE			COMINF-commdb-0365
+//! @SYMTestCaseID		COMINF-commdb-0365
+RUN_TEST_STEP 100000 te_commdb step_034_04
+END_TESTCASE			COMINF-commdb-0365
+
+START_TESTCASE			COMINF-commdb-0366
+//! @SYMTestCaseID		COMINF-commdb-0366
+RUN_TEST_STEP 100000 te_commdb step_034_05
+END_TESTCASE			COMINF-commdb-0366
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0367
+//! @SYMTestCaseID		COMINF-commdb-0367
+RUN_TEST_STEP 1000000 te_commdb step_034_06
+END_TESTCASE			COMINF-commdb-0367
+
+
+CED z:\testdata\configs\default.xml -f
+
+START_TESTCASE			COMINF-commdb-0368
+//! @SYMTestCaseID		COMINF-commdb-0368
+RUN_TEST_STEP 100000 te_commdb step_035_01
+END_TESTCASE			COMINF-commdb-0368
+
+START_TESTCASE			COMINF-commdb-0369
+//! @SYMTestCaseID		COMINF-commdb-0369
+RUN_TEST_STEP 100000 te_commdb step_035_02
+END_TESTCASE			COMINF-commdb-0369
+
+START_TESTCASE			COMINF-commdb-0370
+//! @SYMTestCaseID		COMINF-commdb-0370
+RUN_TEST_STEP 100000 te_commdb step_035_03
+END_TESTCASE			COMINF-commdb-0370
+
+START_TESTCASE			COMINF-commdb-0371
+//! @SYMTestCaseID		COMINF-commdb-0371
+RUN_TEST_STEP 1000000 te_commdb step_035_04
+END_TESTCASE			COMINF-commdb-0371
+
+
+CED z:\testdata\configs\022.xml -f
+
+START_TESTCASE			COMINF-commdb-0372
+//! @SYMTestCaseID		COMINF-commdb-0372
+RUN_TEST_STEP 100000 te_commdb step_036_01
+TEST_COMPLETEND_TESTCASE			COMINF-commdb-0372
+
+START_TESTCASE			COMINF-commdb-0373
+//! @SYMTestCaseID		COMINF-commdb-0373
+RUN_TEST_STEP 100000 te_commdb step_036_02
+END_TESTCASE			COMINF-commdb-0373
+
+START_TESTCASE			COMINF-commdb-0374
+//! @SYMTestCaseID		COMINF-commdb-0374
+RUN_TEST_STEP 100000 te_commdb step_036_03
+END_TESTCASE			COMINF-commdb-0374
+
+START_TESTCASE			COMINF-commdb-0375
+//! @SYMTestCaseID		COMINF-commdb-0375
+RUN_TEST_STEP 100000 te_commdb step_036_04
+END_TESTCASE			COMINF-commdb-0375
+
+START_TESTCASE			COMINF-commdb-0376
+//! @SYMTestCaseID		COMINF-commdb-0376
+RUN_TEST_STEP 100000 te_commdb step_036_05
+END_TESTCASE			COMINF-commdb-0376
+
+START_TESTCASE			COMINF-commdb-0377
+//! @SYMTestCaseID		COMINF-commdb-0377
+RUN_TEST_STEP 100000 te_commdb step_036_06
+END_TESTCASE			COMINF-commdb-0377
+
+START_TESTCASE			COMINF-commdb-0378
+//! @SYMTestCaseID		COMINF-commdb-0378
+RUN_TEST_STEP 100000 te_commdb step_036_07
+END_TESTCASE			COMINF-commdb-0378
+
+START_TESTCASE			COMINF-commdb-0379
+//! @SYMTestCaseID		COMINF-commdb-0379
+RUN_TEST_STEP 100000 te_commdb step_036_08
+END_TESTCASE			COMINF-commdb-0379
+
+START_TESTCASE			COMINF-commdb-0380
+//! @SYMTestCaseID		COMINF-commdb-0380
+RUN_TEST_STEP 100000 te_commdb step_036_09
+END_TESTCASE			COMINF-commdb-0380
+
+START_TESTCASE			COMINF-commdb-0381
+//! @SYMTestCaseID		COMINF-commdb-0381
+RUN_TEST_STEP 100000 te_commdb step_036_10
+END_TESTCASE			COMINF-commdb-0381
+
+START_TESTCASE			COMINF-commdb-0382
+//! @SYMTestCaseID		COMINF-commdb-0382
+RUN_PANIC_STEP 100000 te_commdb step_036_11
+END_TESTCASE			COMINF-commdb-0382
+
+START_TESTCASE			COMINF-commdb-0383
+//! @SYMTestCaseID		COMINF-commdb-0383
+RUN_PANIC_STEP 100000 te_commdb step_036_12
+END_TESTCASE			COMINF-commdb-0383
+
+START_TESTCASE			COMINF-commdb-0384
+//! @SYMTestCaseID		COMINF-commdb-0384
+RUN_TEST_STEP 100000 te_commdb step_036_13
+END_TESTCASE			COMINF-commdb-0384
+
+START_TESTCASE			COMINF-commdb-0385
+//! @SYMTestCaseID		COMINF-commdb-0385
+RUN_TEST_STEP 100000 te_commdb step_036_14
+END_TESTCASE			COMINF-commdb-0385
+
+START_TESTCASE			COMINF-commdb-0386
+//! @SYMTestCaseID		COMINF-commdb-0386
+RUN_TEST_STEP 100000 te_commdb step_036_15
+END_TESTCASE			COMINF-commdb-0386
+
+START_TESTCASE			COMINF-commdb-0387
+//! @SYMTestCaseID		COMINF-commdb-0387
+RUN_TEST_STEP 1000000 te_commdb step_036_16
+END_TESTCASE			COMINF-commdb-0387
+
+START_TESTCASE			COMINF-commdb-0388
+//! @SYMTestCaseID		COMINF-commdb-0388
+RUN_PANIC_STEP 1000000 te_commdb step_036_17
+END_TESTCASE			COMINF-commdb-0388
+
+START_TESTCASE			COMINF-commdb-0389
+//! @SYMTestCaseID		COMINF-commdb-0389
+RUN_PANIC_STEP 1000000 te_commdb step_036_18
+END_TESTCASE			COMINF-commdb-0389
+
+CED z:\testdata\configs\default.xml -f
+
+START_TESTCASE			COMINF-commdb-0390
+//! @SYMTestCaseID		COMINF-commdb-0390
+RUN_TEST_STEP 100000 te_commdb step_037_01
+END_TESTCASE			COMINF-commdb-0390
+
+START_TESTCASE			COMINF-commdb-0391
+//! @SYMTestCaseID		COMINF-commdb-0391
+RUN_TEST_STEP 100000 te_commdb step_037_02
+END_TESTCASE			COMINF-commdb-0391
+
+START_TESTCASE			COMINF-commdb-0392
+//! @SYMTestCaseID		COMINF-commdb-0392
+RUN_TEST_STEP 1000000 te_commdb step_037_03
+END_TESTCASE			COMINF-commdb-0392
+
+START_TESTCASE			COMINF-commdb-0393
+//! @SYMTestCaseID		COMINF-commdb-0393
+RUN_TEST_STEP 100000 te_commdb step_038_01
+END_TESTCASE			COMINF-commdb-0393
+
+START_TESTCASE			COMINF-commdb-0394
+//! @SYMTestCaseID		COMINF-commdb-0394
+RUN_TEST_STEP 100000 te_commdb step_038_02
+END_TESTCASE			COMINF-commdb-0394
+
+START_TESTCASE			COMINF-commdb-0395
+//! @SYMTestCaseID		COMINF-commdb-0395
+RUN_TEST_STEP 1000000 te_commdb step_038_03
+END_TESTCASE			COMINF-commdb-0395
+
+START_TESTCASE			COMINF-commdb-0396
+//! @SYMTestCaseID		COMINF-commdb-0396
+RUN_TEST_STEP 100000 te_commdb step_039_01
+END_TESTCASE			COMINF-commdb-0396
+
+START_TESTCASE			COMINF-commdb-0397
+//! @SYMTestCaseID		COMINF-commdb-0397
+RUN_TEST_STEP 1000000 te_commdb step_039_02
+END_TESTCASE			COMINF-commdb-0397
+
+START_TESTCASE			COMINF-commdb-0398
+//! @SYMTestCaseID		COMINF-commdb-0398
+RUN_TEST_STEP 100000 te_commdb step_040_01
+END_TESTCASE			COMINF-commdb-0398
+
+START_TESTCASE			COMINF-commdb-0399
+//! @SYMTestCaseID		COMINF-commdb-0399
+RUN_TEST_STEP 100000 te_commdb step_040_02
+END_TESTCASE			COMINF-commdb-0399
+
+START_TESTCASE			COMINF-commdb-0401
+//! @SYMTestCaseID		COMINF-commdb-0401
+RUN_TEST_STEP 1000000 te_commdb step_040_03
+END_TESTCASE			COMINF-commdb-0401
+
+START_TESTCASE			COMINF-commdb-0402
+//! @SYMTestCaseID		COMINF-commdb-0402
+RUN_TEST_STEP 100000 te_commdb step_041_01
+END_TESTCASE			COMINF-commdb-0402
+
+START_TESTCASE			COMINF-commdb-0403
+//! @SYMTestCaseID		COMINF-commdb-0403
+RUN_TEST_STEP 100000 te_commdb step_041_02
+END_TESTCASE			COMINF-commdb-0403
+
+START_TESTCASE			COMINF-commdb-0404
+//! @SYMTestCaseID		COMINF-commdb-0404
+RUN_TEST_STEP 100000 te_commdb step_041_03
+END_TESTCASE			COMINF-commdb-0404
+
+START_TESTCASE			COMINF-commdb-0405
+//! @SYMTestCaseID		COMINF-commdb-0405
+RUN_TEST_STEP 100000 te_commdb step_041_04
+END_TESTCASE			COMINF-commdb-0405
+
+START_TESTCASE			COMINF-commdb-0406
+//! @SYMTestCaseID		COMINF-commdb-0406
+RUN_TEST_STEP 100000 te_commdb step_041_05
+END_TESTCASE			COMINF-commdb-0406
+
+START_TESTCASE			COMINF-commdb-0407
+//! @SYMTestCaseID		COMINF-commdb-0407
+RUN_TEST_STEP 100000 te_commdb step_041_06
+END_TESTCASE			COMINF-commdb-0407
+
+START_TESTCASE			COMINF-commdb-0408
+//! @SYMTestCaseID		COMINF-commdb-0408
+RUN_TEST_STEP 100000 te_commdb step_041_07
+END_TESTCASE			COMINF-commdb-0408
+
+START_TESTCASE			COMINF-commdb-0409
+//! @SYMTestCaseID		COMINF-commdb-0409
+RUN_TEST_STEP 100000 te_commdb step_041_08
+END_TESTCASE			COMINF-commdb-0409
+
+START_TESTCASE			COMINF-commdb-0410
+//! @SYMTestCaseID		COMINF-commdb-0410
+RUN_TEST_STEP 100000 te_commdb step_041_09
+END_TESTCASE			COMINF-commdb-0410
+
+START_TESTCASE			COMINF-commdb-0411
+//! @SYMTestCaseID		COMINF-commdb-0411
+RUN_TEST_STEP 100000 te_commdb step_041_10
+END_TESTCASE			COMINF-commdb-0411
+
+START_TESTCASE			COMINF-commdb-0412
+//! @SYMTestCaseID		COMINF-commdb-0412
+RUN_TEST_STEP 100000 te_commdb step_041_11
+END_TESTCASE			COMINF-commdb-0412
+
+START_TESTCASE			COMINF-commdb-0413
+//! @SYMTestCaseID		COMINF-commdb-0413
+RUN_TEST_STEP 100000 te_commdb step_041_12
+END_TESTCASE			COMINF-commdb-0413
+
+START_TESTCASE			COMINF-commdb-0414
+//! @SYMTestCaseID		COMINF-commdb-0414
+RUN_TEST_STEP 100000 te_commdb step_041_13
+END_TESTCASE			COMINF-commdb-0414
+
+START_TESTCASE			COMINF-commdb-0415
+//! @SYMTestCaseID		COMINF-commdb-0415
+RUN_TEST_STEP 100000 te_commdb step_041_14
+END_TESTCASE			COMINF-commdb-0415
+
+START_TESTCASE			COMINF-commdb-0416
+//! @SYMTestCaseID		COMINF-commdb-0416
+RUN_TEST_STEP 100000 te_commdb step_041_15
+END_TESTCASE			COMINF-commdb-0416
+
+START_TESTCASE			COMINF-commdb-0417
+//! @SYMTestCaseID		COMINF-commdb-0417
+RUN_TEST_STEP 100000 te_commdb step_041_16
+END_TESTCASE			COMINF-commdb-0417
+
+START_TESTCASE			COMINF-commdb-0418
+//! @SYMTestCaseID		COMINF-commdb-0418
+RUN_TEST_STEP 100000 te_commdb step_041_17
+END_TESTCASE			COMINF-commdb-0418
+
+START_TESTCASE			COMINF-commdb-0419
+//! @SYMTestCaseID		COMINF-commdb-0419
+RUN_TEST_STEP 1000000 te_commdb step_041_18
+END_TESTCASE			COMINF-commdb-0419
+
+
+CED z:\testdata\configs\default.xml -f
+
+START_TESTCASE			COMINF-commdb-0420
+//! @SYMTestCaseID		COMINF-commdb-0420
+RUN_TEST_STEP 1000000 te_commdb step_041_19
+END_TESTCASE			COMINF-commdb-0420
+
+START_TESTCASE			COMINF-commdb-0421
+//! @SYMTestCaseID		COMINF-commdb-0421
+RUN_TEST_STEP 1000000 te_commdb step_041_20
+END_TESTCASE			COMINF-commdb-0421
+
+START_TESTCASE			COMINF-commdb-0422
+//! @SYMTestCaseID		COMINF-commdb-0422
+RUN_TEST_STEP 1000000 te_commdb step_041_21
+END_TESTCASE			COMINF-commdb-0422
+
+START_TESTCASE			COMINF-commdb-0423
+//! @SYMTestCaseID		COMINF-commdb-0423
+RUN_TEST_STEP 1000000 te_commdb step_041_22
+END_TESTCASE			COMINF-commdb-0423
+
+START_TESTCASE			COMINF-commdb-0424
+//! @SYMTestCaseID		COMINF-commdb-0424
+RUN_TEST_STEP 1000000 te_commdb step_041_23
+END_TESTCASE			COMINF-commdb-0424
+
+START_TESTCASE			COMINF-commdb-0425
+//! @SYMTestCaseID		COMINF-commdb-0425
+RUN_TEST_STEP 1000000 te_commdb step_041_24
+END_TESTCASE			COMINF-commdb-0425
+
+START_TESTCASE			COMINF-commdb-0426
+//! @SYMTestCaseID		COMINF-commdb-0426
+RUN_TEST_STEP 1000000 te_commdb step_041_25
+END_TESTCASE			COMINF-commdb-0426
+
+START_TESTCASE			COMINF-commdb-0427
+//! @SYMTestCaseID		COMINF-commdb-0427
+RUN_TEST_STEP 1000000 te_commdb step_041_26
+END_TESTCASE			COMINF-commdb-0427
+
+START_TESTCASE			COMINF-commdb-0428
+//! @SYMTestCaseID		COMINF-commdb-0428
+RUN_TEST_STEP 1000000 te_commdb step_041_27
+END_TESTCASE			COMINF-commdb-0428
+
+START_TESTCASE			COMINF-commdb-0429
+//! @SYMTestCaseID		COMINF-commdb-0429
+RUN_TEST_STEP 1000000 te_commdb step_041_28
+END_TESTCASE			COMINF-commdb-0429
+
+START_TESTCASE			COMINF-commdb-0430
+//! @SYMTestCaseID		COMINF-commdb-0430
+RUN_TEST_STEP 1000000 te_commdb step_041_29
+END_TESTCASE			COMINF-commdb-0430
+
+START_TESTCASE			COMINF-commdb-0431
+//! @SYMTestCaseID		COMINF-commdb-0431
+RUN_TEST_STEP 1000000 te_commdb step_041_30
+END_TESTCASE			COMINF-commdb-0431
+
+START_TESTCASE			COMINF-commdb-0432
+//! @SYMTestCaseID		COMINF-commdb-0432
+RUN_TEST_STEP 1000000 te_commdb step_041_31
+END_TESTCASE			COMINF-commdb-0432
+
+START_TESTCASE			COMINF-commdb-0433
+//! @SYMTestCaseID		COMINF-commdb-0433
+RUN_TEST_STEP 1000000 te_commdb step_041_32
+END_TESTCASE			COMINF-commdb-0433
+
+START_TESTCASE			COMINF-commdb-0434
+//! @SYMTestCaseID		COMINF-commdb-0434
+RUN_TEST_STEP 1000000 te_commdb step_041_33
+END_TESTCASE			COMINF-commdb-0434
+
+START_TESTCASE			COMINF-commdb-0435
+//! @SYMTestCaseID		COMINF-commdb-0435
+RUN_TEST_STEP 1000000 te_commdb step_041_34
+END_TESTCASE			COMINF-commdb-0435
+
+START_TESTCASE			COMINF-commdb-0436
+//! @SYMTestCaseID		COMINF-commdb-0436
+RUN_TEST_STEP 100000 te_commdb step_042_01
+END_TESTCASE			COMINF-commdb-0436
+
+START_TESTCASE			COMINF-commdb-0437
+//! @SYMTestCaseID		COMINF-commdb-0437
+RUN_TEST_STEP 100000 te_commdb step_042_02
+END_TESTCASE			COMINF-commdb-0437
+
+START_TESTCASE			COMINF-commdb-0438
+//! @SYMTestCaseID		COMINF-commdb-0438
+RUN_TEST_STEP 1000000 te_commdb step_042_03
+END_TESTCASE			COMINF-commdb-0438
+
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0439
+//! @SYMTestCaseID		COMINF-commdb-0439
+RUN_TEST_STEP 100000 te_commdb step_043_01
+END_TESTCASE			COMINF-commdb-0439
+
+START_TESTCASE			COMINF-commdb-0440
+//! @SYMTestCaseID		COMINF-commdb-0440
+RUN_TEST_STEP 100000 te_commdb step_043_02
+END_TESTCASE			COMINF-commdb-0440
+
+START_TESTCASE			COMINF-commdb-0441
+//! @SYMTestCaseID		COMINF-commdb-0441
+RUN_TEST_STEP 100000 te_commdb step_043_03
+END_TESTCASE			COMINF-commdb-0441
+
+START_TESTCASE			COMINF-commdb-0442
+//! @SYMTestCaseID		COMINF-commdb-0442
+RUN_TEST_STEP 100000 te_commdb step_043_04
+END_TESTCASE			COMINF-commdb-0442
+
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0443
+//! @SYMTestCaseID		COMINF-commdb-0443
+RUN_TEST_STEP 1000000 te_commdb step_043_05
+END_TESTCASE			COMINF-commdb-0443
+
+
+CED z:\testdata\configs\default.xml -f
+
+START_TESTCASE			COMINF-commdb-0444
+//! @SYMTestCaseID		COMINF-commdb-0444
+RUN_TEST_STEP 100000 te_commdb step_044_01
+END_TESTCASE			COMINF-commdb-0444
+
+START_TESTCASE			COMINF-commdb-0445
+//! @SYMTestCaseID		COMINF-commdb-0445
+RUN_TEST_STEP 100000 te_commdb step_044_02
+END_TESTCASE			COMINF-commdb-0445
+
+START_TESTCASE			COMINF-commdb-0446
+//! @SYMTestCaseID		COMINF-commdb-0446
+RUN_TEST_STEP 1000000 te_commdb step_044_03
+END_TESTCASE			COMINF-commdb-0446
+
+START_TESTCASE			COMINF-commdb-0447
+//! @SYMTestCaseID		COMINF-commdb-0447
+RUN_TEST_STEP 100000 te_commdb step_045_01
+END_TESTCASE			COMINF-commdb-0447
+
+START_TESTCASE			COMINF-commdb-0448
+//! @SYMTestCaseID		COMINF-commdb-0448
+RUN_TEST_STEP 100000 te_commdb step_045_02
+END_TESTCASE			COMINF-commdb-0448
+
+START_TESTCASE			COMINF-commdb-0449
+//! @SYMTestCaseID		COMINF-commdb-0449
+RUN_TEST_STEP 1000000 te_commdb step_045_03
+END_TESTCASE			COMINF-commdb-0449
+
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0450
+//! @SYMTestCaseID		COMINF-commdb-0450
+RUN_TEST_STEP 100000 te_commdb step_046_01
+END_TESTCASE			COMINF-commdb-0450
+
+// These 3 tests need to pass.  Are broken because of transactions needing to complete differently
+
+START_TESTCASE			COMINF-commdb-0451
+//! @SYMTestCaseID		COMINF-commdb-0451
+RUN_TEST_STEP 500000 te_commdb step_046_02
+END_TESTCASE			COMINF-commdb-0451
+
+
+CED z:\testdata\configs\default.xml -f
+
+START_TESTCASE			COMINF-commdb-0452
+//! @SYMTestCaseID		COMINF-commdb-0452
+RUN_TEST_STEP 500000 te_commdb step_046_03
+END_TESTCASE			COMINF-commdb-0452
+
+
+CED z:\testdata\configs\default.xml -f
+
+START_TESTCASE			COMINF-commdb-0453
+//! @SYMTestCaseID		COMINF-commdb-0453
+RUN_TEST_STEP 500000 te_commdb step_046_04
+END_TESTCASE			COMINF-commdb-0453
+
+//
+// This test is broken in a number of ways. The test uses two threads to access the
+// CommDB, but there behaviour of CommsDAT is slightly different to that of CommDB.
+// Sometimes some functions leave with KErrLocked and this causes the test to fail.
+// Other times a panic occurs as the two accesses to the same data cause the API
+// to panic, which the test does not expect.
+//
+// For now it will have to remain commented out.
+//
+//START_TESTCASE			COMINF-commdb-0454
+////! @SYMTestCaseID		COMINF-commdb-0454
+//RUN_TEST_STEP 2000000 te_commdb step_046_05
+//
+//END_TESTCASE			COMINF-commdb-0454
+
+
+CED z:\testdata\configs\default1.xml -f
+
+// BC tests of Modem table renaming.
+
+START_TESTCASE			COMINF-commdb-0455
+//! @SYMTestCaseID		COMINF-commdb-0455
+RUN_TEST_STEP 100000 te_commdb step_062_01
+END_TESTCASE			COMINF-commdb-0455
+
+CED z:\testdata\configs\default.xml -f
+
+START_TESTCASE			COMINF-commdb-0456
+//! @SYMTestCaseID		COMINF-commdb-0456
+RUN_TEST_STEP 100000 te_commdb step_062_03
+END_TESTCASE			COMINF-commdb-0456
+
+START_TESTCASE			COMINF-commdb-0457
+//! @SYMTestCaseID		COMINF-commdb-0457
+RUN_TEST_STEP 100000 te_commdb step_062_04
+END_TESTCASE			COMINF-commdb-0457
+
+START_TESTCASE			COMINF-commdb-0458
+//! @SYMTestCaseID		COMINF-commdb-0458
+RUN_TEST_STEP 100000 te_commdb step_062_05
+END_TESTCASE			COMINF-commdb-0458
+
+
+CED  Z:\testdata\configs\064_01.cfg
+
+START_TESTCASE			COMINF-commdb-0459
+//! @SYMTestCaseID		COMINF-commdb-0459
+RUN_TEST_STEP 100000 te_commdb step_064_01
+END_TESTCASE			COMINF-commdb-0459
+
+
+MULTITHREAD
+
+CED z:\testdata\configs\default.xml -f
+
+START_TESTCASE			COMINF-commdb-0460
+//! @SYMTestCaseID		COMINF-commdb-0460
+RUN_TEST_STEP -1 te_commdb step_047_01
+END_TESTCASE			COMINF-commdb-0460
+
+START_TESTCASE			COMINF-commdb-0461
+//! @SYMTestCaseID		COMINF-commdb-0461
+RUN_TEST_STEP -1 te_commdb step_047_02
+END_TESTCASE			COMINF-commdb-0461
+
+START_TESTCASE			COMINF-commdb-0462
+//! @SYMTestCaseID		COMINF-commdb-0462
+RUN_TEST_STEP -1 te_commdb step_047_03
+END_TESTCASE			COMINF-commdb-0462
+
+START_TESTCASE			COMINF-commdb-0463
+//! @SYMTestCaseID		COMINF-commdb-0463
+RUN_TEST_STEP -1 te_commdb step_047_04
+END_TESTCASE			COMINF-commdb-0463
+
+START_TESTCASE			COMINF-commdb-0464
+//! @SYMTestCaseID		COMINF-commdb-0464
+RUN_TEST_STEP -1 te_commdb step_047_05
+END_TESTCASE			COMINF-commdb-0464
+
+START_TESTCASE			COMINF-commdb-0465
+//! @SYMTestCaseID		COMINF-commdb-0465
+RUN_TEST_STEP -1 te_commdb step_047_06
+END_TESTCASE			COMINF-commdb-0465
+
+START_TESTCASE			COMINF-commdb-0466
+//! @SYMTestCaseID		COMINF-commdb-0466
+RUN_TEST_STEP -1 te_commdb step_047_07
+END_TESTCASE			COMINF-commdb-0466
+
+START_TESTCASE			COMINF-commdb-0467
+//! @SYMTestCaseID		COMINF-commdb-0467
+RUN_TEST_STEP -1 te_commdb step_047_08
+END_TESTCASE			COMINF-commdb-0467
+
+START_TESTCASE			COMINF-commdb-0468
+//! @SYMTestCaseID		COMINF-commdb-0468
+RUN_TEST_STEP -1 te_commdb step_047_13
+END_TESTCASE			COMINF-commdb-0468
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/CombinationalTest.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,31 @@
+//
+// 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:
+//
+//
+//
+PRINT example CommDb Protect test
+PRINT 
+//
+run_script z:\TestData\scripts\esock_test_unloadesock.script
+CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
+run_script z:\TestData\scripts\esock_test_loadesock.script
+
+LOAD_SUITE TS_CommDb.dll
+
+
+RUN_TEST_STEP -1, TS_CommDb,step_059_01
+TEST_COMPLETE
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/Corrupt.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,2041 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+//
+// 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:
+//
+//
+-->
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+    <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+    <Network operation="add">
+        <Name>mRouter</Name>
+    </Network>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>NT RAS with Null Modem</Name>
+        <IAPService>DialOutISP.NT RAS</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>CSD IAP PlaceHolder01</Name>
+        <IAPService>DialOutISP.ISP01</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>CSD IAP PlaceHolder02</Name>
+        <IAPService>DialOutISP.ISP02</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>GPRS IAP PlaceHolder01</Name>
+        <IAPService>OutgoingGPRS.GPRS01</IAPService>
+        <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>GPRS IAP PlaceHolder02</Name>
+        <IAPService>OutgoingGPRS.GPRS02</IAPService>
+        <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>mRouter Rs232</Name>
+        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
+        <IAPBearer>ModemBearer.mRouterRs232Bearer</IAPBearer>
+        <IAPNetwork>Network.mRouter</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>mRouter Ir</Name>
+        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
+        <IAPBearer>ModemBearer.mRouterIrBearer</IAPBearer>
+        <IAPNetwork>Network.mRouter</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>mRouter BT</Name>
+        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
+        <IAPBearer>ModemBearer.mRouterBtBearer</IAPBearer>
+        <IAPNetwork>Network.mRouter</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>mRouter USB</Name>
+        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
+        <IAPBearer>ModemBearer.mRouterUsbBearer</IAPBearer>
+        <IAPNetwork>Network.mRouter</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>mRouter Wins</Name>
+        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
+        <IAPBearer>ModemBearer.mRouterWinsBearer</IAPBearer>
+        <IAPNetwork>Network.mRouter</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>VPN IAP</Name>
+        <IAPService>VpnService.VPN1</IAPService>
+        <IAPBearer>VirtualBearer.VPN Bearer1</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>EKA1 Assabet on-board ethernet</Name>
+        <IAPService>LANService.Ethernet</IAPService>
+        <IAPBearer>LANBearer.EKA1 Assabet on-board Ethernet</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>EKA2 Assabet on-board ethernet</Name>
+        <IAPService>LANService.Ethernet</IAPService>
+        <IAPBearer>LANBearer.EKA2 Assabet on-board Ethernet</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>EKA1 emulator ethernet</Name>
+        <IAPService>LANService.Ethernet</IAPService>
+        <IAPBearer>LANBearer.EKA1 emulator Ethernet</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>EKA2 emulator ethernet</Name>
+        <IAPService>LANService.Ethernet</IAPService>
+        <IAPBearer>LANBearer.EKA2 emulator Ethernet</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+    <ModemBearer operation="template">
+        <Name>Default Modem</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>0</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>Null Modem 115200bps</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>US Robotics Sportster</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>57600</Rate>
+        <Handshaking>244</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT&amp;F1</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT&amp;d2</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>Dacom Surfer</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>57600</Rate>
+        <Handshaking>244</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT&amp;F</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT&amp;d2</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GSM Mobile Phone via Infrared</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>IRCOMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>IRCOMM</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>196</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GSM Mobile Phone via Serial</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>19200</Rate>
+        <Handshaking>196</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GPRS Ericsson R520m via IR</Name>
+        <Agent>PSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>IRCOMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>IRCOMM</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GPRS Ericsson R520m/T68i via Serial</Name>
+        <Agent>PSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>19200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <IspInitString>*99***1#</IspInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GPRS Motorola Mobile Phone via Serial</Name>
+        <Agent>PSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>57600</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>WinTunnel Modem</Name>
+        <Agent>null.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::6</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>mRouterWinsBearer</Name>
+        <Agent>mRouterAgent.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>WINS::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>WINSCSY</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>mRouterRs232Bearer</Name>
+        <Agent>mRouterAgent.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>mRouterIrBearer</Name>
+        <Agent>mRouterAgent.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>IRCOMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>IRCOMM</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>mRouterBtBearer</Name>
+        <Agent>mRouterAgent.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>BTCOMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>BTCOMM</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>mRouterUsbBearer</Name>
+        <Agent>mRouterAgent.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>ACM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECACM</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+</ModemBearerTable>
+
+<LANBearerTable>
+    <LANBearer operation="add">
+        <Name>EKA1 Assabet on-board Ethernet</Name>
+        <Agent>nullagt.agt</Agent>
+        <IfName>ethint</IfName>
+        <LDDName>EtherCard</LDDName>
+        <PDDName>EtherCard.Smc</PDDName>
+        <LDDFilename>ethercard</LDDFilename>
+        <PDDFilename>EtherSmc</PDDFilename>
+        <PacketDriverName>EtherPkt.drv</PacketDriverName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+    <LANBearer operation="add">
+        <Name>EKA2 Assabet on-board Ethernet</Name>
+        <Agent>nullagt.agt</Agent>
+        <IfName>ethint</IfName>
+        <LDDName>Ethernet</LDDName>
+        <PDDName>Ethernet.Assabet</PDDName>
+        <LDDFilename>enet</LDDFilename>
+        <PDDFilename>ethernet</PDDFilename>
+        <PacketDriverName>EtherPkt.drv</PacketDriverName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+    <LANBearer operation="add">
+        <Name>EKA1 emulator Ethernet</Name>
+        <Agent>nullagt.agt</Agent>
+        <IfName>ethint</IfName>
+        <LDDName>Ethercard</LDDName>
+        <PDDName>Ethercard.wins</PDDName>
+        <LDDFilename>ethercard</LDDFilename>
+        <PDDFilename>etherwins</PDDFilename>
+        <PacketDriverName>EtherPkt.drv</PacketDriverName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+    <LANBearer operation="add">
+        <Name>EKA2 emulator Ethernet</Name>
+        <Agent>nullagt.agt</Agent>
+        <IfName>ethint</IfName>
+        <LDDName>Ethernet</LDDName>
+        <PDDName>Ethernet.Wins</PDDName>
+        <LDDFilename>enet</LDDFilename>
+        <PDDFilename>ethernet</PDDFilename>
+        <PacketDriverName>EtherPkt.drv</PacketDriverName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+</LANBearerTable>
+
+<LANServiceTable>
+    <LANService operation="add">
+        <Name>Ethernet</Name>
+        <IfNetworks>ip,ip6</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>194.72.6.1</IpGateway>
+        <IpAddr>192.168.0.100</IpAddr>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.52</IpNameServer2>
+    </LANService>
+</LANServiceTable>
+
+<DialInISPTable>
+    <DialInISP operation="template">
+        <Name>Default Dial In ISP</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Dial In ISP01</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="template">
+        <Name>Default Dial Out ISP</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>TRUE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>NT RAS</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>TRUE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>Test</Description>
+        <Type>INTERNETONLY</Type>
+        <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND &quot;CLIENT&quot;+&lt;0x0d&gt;\nWAIT 3\n{\n&quot;SERVER&quot; OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>ISP01</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>PlaceHolder for ISP01</Description>
+        <Type>INTERNETONLY</Type>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>xxx</IfAuthName>
+        <IfAuthPass>yyy</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>ISP02</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>PlaceHolder for ISP02</Description>
+        <Type>INTERNETONLY</Type>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>xxx</IfAuthName>
+        <IfAuthPass>yyy</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>ISP03</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>PlaceHolder for ISP03</Description>
+        <Type>INTERNETONLY</Type>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>xxx</IfAuthName>
+        <IfAuthPass>yyy</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>ISP04</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>PlaceHolder for ISP04</Description>
+        <Type>INTERNETONLY</Type>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>xxx</IfAuthName>
+        <IfAuthPass>yyy</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>ISP05</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>PlaceHolder for ISP05</Description>
+        <Type>INTERNETONLY</Type>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>xxx</IfAuthName>
+        <IfAuthPass>yyy</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>mRouterDialOutIsp</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>mRouterDialOutIsp</Description>
+        <Type>INTERNETONLY</Type>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>IfAuthPass=</IfAuthName>
+        <IfAuthPass>AuthRetries=0</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+    <CDMA2000PacketService operation="add">
+        <Name>test name cdma2000</Name>
+        <IwfName>Test2000</IwfName>
+        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
+        <PdpType>IPV4</PdpType>
+        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
+        <ReqRevPriority>PRIORITY04</ReqRevPriority>
+        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
+        <ReqRevBitrate>32KBPS</ReqRevBitrate>
+        <ReqFwdLoss>LOSS1</ReqFwdLoss>
+        <ReqRevLoss>LOSS1</ReqRevLoss>
+        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
+        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
+        <MinFwdBitrate>32KBPS</MinFwdBitrate>
+        <MinRevBitrate>32KBPS</MinRevBitrate>
+        <AccptFwdLoss>LOSS2</AccptFwdLoss>
+        <AccptRevLoss>LOSS2</AccptRevLoss>
+        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
+        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <AuthRetries>1</AuthRetries>
+        <IpNetMask>0.255.255.255</IpNetMask>
+        <IpGateway>10.0.0.1</IpGateway>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <ApType>2</ApType>
+        <QosWarningTimeout>1000000</QosWarningTimeout>
+        <RlpMode>TRANSPARENT</RlpMode>
+        <CDMANaiType>0</CDMANaiType>
+    </CDMA2000PacketService>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+    <Chargecard operation="add">
+        <Name>Dummy BT Chargecard</Name>
+        <AccountNumber>144,12345678</AccountNumber>
+        <Pin>0000</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>HFG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+    <Chargecard operation="add">
+        <Name>Dummy Mercury Chargecard</Name>
+        <AccountNumber>0500800800,,12345678</AccountNumber>
+        <Pin>****</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>J,K,0FG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>0</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>PROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.NT RAS with Null Modem</IAPRef>
+    </ConnectionPreferences>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable2</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>PROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.NT RAS with Null Modem</IAPRef>
+    </ConnectionPreferences>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <WAPAccess>WAPAccessPoint.Default Dial In ISP</WAPAccess>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsBearer>2</SmsBearer>
+        <SmsReceiveMode>2</SmsReceiveMode>
+        <GPRSAttachMode>1</GPRSAttachMode>
+        <AcceptIncomingGprs>1</AcceptIncomingGprs>
+        <ConnectionAttempts>2</ConnectionAttempts>
+        <ModemForDataAndFax>2</ModemForDataAndFax>
+        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
+        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
+        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
+        <GPRSClassCBearer>GSM</GPRSClassCBearer>
+        <DefaultNetwork>Network.Intranet</DefaultNetwork>
+        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+    <IncomingGPRS operation="add">
+        <Name>Incoming GPRS Settings PlaceHolder</Name>
+        <APN>Test</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>0.0.0.0</PDPAddress>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>1</ReqPrecedence>
+        <ReqDelay>1</ReqDelay>
+        <ReqReliability>1</ReqReliability>
+        <ReqPeakThroughput>1</ReqPeakThroughput>
+        <ReqMeanThroughput>1</ReqMeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNameServer1>0.0.0.0</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+    </IncomingGPRS>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS01</Name>
+        <APN>gprs01APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS02</Name>
+        <APN>gprs02APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS03</Name>
+        <APN>gprs03APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+    <DefaultGPRS operation="add">
+        <Name>Dummy Default GPRS Settings</Name>
+        <APN>Access point name</APN>
+        <PDPType>IPV6</PDPType>
+        <PDPAddress>www.wid.com</PDPAddress>
+        <Usage>1</Usage>
+        <Precedence>1</Precedence>
+        <Delay>1</Delay>
+        <Reliability>1</Reliability>
+        <PeakThroughput>1</PeakThroughput>
+        <MeanThroughput>1</MeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+    </DefaultGPRS>
+</DefaultGPRSTable>
+
+<ProxyTable>
+    <Proxy operation="add">
+        <Name>ProxyTable1</Name>
+        <ISPRef>DialOutISP.NT RAS</ISPRef>
+        <UseProxyServer>TRUE</UseProxyServer>
+        <ProtocolName>http</ProtocolName>
+        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
+        <PortNumber>80</PortNumber>
+        <Exceptions>www.dummyproxy.com/exception</Exceptions>
+    </Proxy>
+</ProxyTable>
+
+<LocationTable>
+    <Location operation="template">
+        <Name>Default Location</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+        <DialOutCode>9,</DialOutCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office Direct Dial</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+    </Location>
+    <Location operation="add">
+        <Name>Mobile</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Home</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>TRUE</UsePulseDial>
+        <WaitForDialTone>TRUE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>181</AreaCode>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable1</Name>
+        <ProtocolName>ssl3.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable2</Name>
+        <ProtocolName>tls1.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+    <WAPAccessPoint operation="template">
+        <Name>Default Dial In ISP</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+    </WAPAccessPoint>
+    <WAPAccessPoint operation="add">
+        <Name>Dummy WAP Settings</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+        <StartPage>www.wapstart.com</StartPage>
+    </WAPAccessPoint>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+    <WAPIPBearer operation="template">
+        <Name>WAPIPBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.-1</IAPRef>
+        <ProxyPortNumber>0</ProxyPortNumber>
+    </WAPIPBearer>
+    <WAPIPBearer operation="add">
+        <Name>WAPIPBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>www.wapgateway.com</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.CSD IAP PlaceHolder01</IAPRef>
+        <ProxyPortNumber>1</ProxyPortNumber>
+    </WAPIPBearer>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+    <WAPSMSBearer operation="template">
+        <Name>WAPSMSBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+    </WAPSMSBearer>
+    <WAPSMSBearer operation="add">
+        <Name>WAPSMSBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>+4412345678901</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+    <VirtualBearer operation="template">
+        <Name>Default VPN Bearer</Name>
+        <Agent>VPN.agt</Agent>
+        <IfName>VPN.nif</IfName>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+    </VirtualBearer>
+    <VirtualBearer operation="add">
+        <Name>VPN Bearer1</Name>
+        <Agent>ntras.agt</Agent>
+        <IfName>ppp.nif</IfName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </VirtualBearer>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+    <VpnService operation="template">
+        <Name>Default VPN</Name>
+        <Policy>DefaultVPNpolicy</Policy>
+        <HomeIAP>IAP.NT RAS with Null Modem</HomeIAP>
+        <HomeNetwork>Network.-1</HomeNetwork>
+    </VpnService>
+    <VpnService operation="add">
+        <Name>VPN1</Name>
+        <Policy>VPNpolicy1</Policy>
+        <HomeIAP>IAP.CSD IAP PlaceHolder01</HomeIAP>
+        <HomeNetwork>Network.Intranet</HomeNetwork>
+    </VpnService>
+</VpnServiceTable>
+
+<WLANServiceExtensionTable>
+</WLANServiceExtensionTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/Default.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,2041 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+//
+// 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:
+//
+//
+-->
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+    <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+    <Network operation="add">
+        <Name>mRouter</Name>
+    </Network>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>NT RAS with Null Modem</Name>
+        <IAPService>DialOutISP.NT RAS</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>CSD IAP PlaceHolder01</Name>
+        <IAPService>DialOutISP.ISP01</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>CSD IAP PlaceHolder02</Name>
+        <IAPService>DialOutISP.ISP02</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>GPRS IAP PlaceHolder01</Name>
+        <IAPService>OutgoingGPRS.GPRS01</IAPService>
+        <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>GPRS IAP PlaceHolder02</Name>
+        <IAPService>OutgoingGPRS.GPRS02</IAPService>
+        <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>mRouter Rs232</Name>
+        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
+        <IAPBearer>ModemBearer.mRouterRs232Bearer</IAPBearer>
+        <IAPNetwork>Network.mRouter</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>mRouter Ir</Name>
+        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
+        <IAPBearer>ModemBearer.mRouterIrBearer</IAPBearer>
+        <IAPNetwork>Network.mRouter</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>mRouter BT</Name>
+        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
+        <IAPBearer>ModemBearer.mRouterBtBearer</IAPBearer>
+        <IAPNetwork>Network.mRouter</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>mRouter USB</Name>
+        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
+        <IAPBearer>ModemBearer.mRouterUsbBearer</IAPBearer>
+        <IAPNetwork>Network.mRouter</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>mRouter Wins</Name>
+        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
+        <IAPBearer>ModemBearer.mRouterWinsBearer</IAPBearer>
+        <IAPNetwork>Network.mRouter</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>VPN IAP</Name>
+        <IAPService>VpnService.VPN1</IAPService>
+        <IAPBearer>VirtualBearer.VPN Bearer1</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>EKA1 Assabet on-board ethernet</Name>
+        <IAPService>LANService.Ethernet</IAPService>
+        <IAPBearer>LANBearer.EKA1 Assabet on-board Ethernet</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>EKA2 Assabet on-board ethernet</Name>
+        <IAPService>LANService.Ethernet</IAPService>
+        <IAPBearer>LANBearer.EKA2 Assabet on-board Ethernet</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>EKA1 emulator ethernet</Name>
+        <IAPService>LANService.Ethernet</IAPService>
+        <IAPBearer>LANBearer.EKA1 emulator Ethernet</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>EKA2 emulator ethernet</Name>
+        <IAPService>LANService.Ethernet</IAPService>
+        <IAPBearer>LANBearer.EKA2 emulator Ethernet</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+    <ModemBearer operation="template">
+        <Name>Default Modem</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>0</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>Null Modem 115200bps</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>US Robotics Sportster</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>57600</Rate>
+        <Handshaking>244</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT&amp;F1</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT&amp;d2</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>Dacom Surfer</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>57600</Rate>
+        <Handshaking>244</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT&amp;F</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT&amp;d2</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GSM Mobile Phone via Infrared</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>IRCOMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>IRCOMM</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>196</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GSM Mobile Phone via Serial</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>19200</Rate>
+        <Handshaking>196</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GPRS Ericsson R520m via IR</Name>
+        <Agent>PSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>IRCOMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>IRCOMM</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GPRS Ericsson R520m/T68i via Serial</Name>
+        <Agent>PSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>19200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <IspInitString>*99***1#</IspInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GPRS Motorola Mobile Phone via Serial</Name>
+        <Agent>PSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>57600</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>WinTunnel Modem</Name>
+        <Agent>null.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::6</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>mRouterWinsBearer</Name>
+        <Agent>mRouterAgent.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>WINS::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>WINSCSY</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>mRouterRs232Bearer</Name>
+        <Agent>mRouterAgent.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>mRouterIrBearer</Name>
+        <Agent>mRouterAgent.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>IRCOMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>IRCOMM</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>mRouterBtBearer</Name>
+        <Agent>mRouterAgent.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>BTCOMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>BTCOMM</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>mRouterUsbBearer</Name>
+        <Agent>mRouterAgent.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>ACM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECACM</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+</ModemBearerTable>
+
+<LANBearerTable>
+    <LANBearer operation="add">
+        <Name>EKA1 Assabet on-board Ethernet</Name>
+        <Agent>nullagt.agt</Agent>
+        <IfName>ethint</IfName>
+        <LDDName>EtherCard</LDDName>
+        <PDDName>EtherCard.Smc</PDDName>
+        <LDDFilename>ethercard</LDDFilename>
+        <PDDFilename>EtherSmc</PDDFilename>
+        <PacketDriverName>EtherPkt.drv</PacketDriverName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+    <LANBearer operation="add">
+        <Name>EKA2 Assabet on-board Ethernet</Name>
+        <Agent>nullagt.agt</Agent>
+        <IfName>ethint</IfName>
+        <LDDName>Ethernet</LDDName>
+        <PDDName>Ethernet.Assabet</PDDName>
+        <LDDFilename>enet</LDDFilename>
+        <PDDFilename>ethernet</PDDFilename>
+        <PacketDriverName>EtherPkt.drv</PacketDriverName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+    <LANBearer operation="add">
+        <Name>EKA1 emulator Ethernet</Name>
+        <Agent>nullagt.agt</Agent>
+        <IfName>ethint</IfName>
+        <LDDName>Ethercard</LDDName>
+        <PDDName>Ethercard.wins</PDDName>
+        <LDDFilename>ethercard</LDDFilename>
+        <PDDFilename>etherwins</PDDFilename>
+        <PacketDriverName>EtherPkt.drv</PacketDriverName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+    <LANBearer operation="add">
+        <Name>EKA2 emulator Ethernet</Name>
+        <Agent>nullagt.agt</Agent>
+        <IfName>ethint</IfName>
+        <LDDName>Ethernet</LDDName>
+        <PDDName>Ethernet.Wins</PDDName>
+        <LDDFilename>enet</LDDFilename>
+        <PDDFilename>ethernet</PDDFilename>
+        <PacketDriverName>EtherPkt.drv</PacketDriverName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+</LANBearerTable>
+
+<LANServiceTable>
+    <LANService operation="add">
+        <Name>Ethernet</Name>
+        <IfNetworks>ip,ip6</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>194.72.6.1</IpGateway>
+        <IpAddr>192.168.0.100</IpAddr>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.52</IpNameServer2>
+    </LANService>
+</LANServiceTable>
+
+<DialInISPTable>
+    <DialInISP operation="template">
+        <Name>Default Dial In ISP</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Dial In ISP01</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="template">
+        <Name>Default Dial Out ISP</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>TRUE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>NT RAS</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>TRUE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>Test</Description>
+        <Type>INTERNETONLY</Type>
+        <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND &quot;CLIENT&quot;+&lt;0x0d&gt;\nWAIT 3\n{\n&quot;SERVER&quot; OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>ISP01</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>PlaceHolder for ISP01</Description>
+        <Type>INTERNETONLY</Type>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>xxx</IfAuthName>
+        <IfAuthPass>yyy</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>ISP02</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>PlaceHolder for ISP02</Description>
+        <Type>INTERNETONLY</Type>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>xxx</IfAuthName>
+        <IfAuthPass>yyy</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>ISP03</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>PlaceHolder for ISP03</Description>
+        <Type>INTERNETONLY</Type>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>xxx</IfAuthName>
+        <IfAuthPass>yyy</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>ISP04</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>PlaceHolder for ISP04</Description>
+        <Type>INTERNETONLY</Type>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>xxx</IfAuthName>
+        <IfAuthPass>yyy</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>ISP05</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>PlaceHolder for ISP05</Description>
+        <Type>INTERNETONLY</Type>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>xxx</IfAuthName>
+        <IfAuthPass>yyy</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>mRouterDialOutIsp</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>mRouterDialOutIsp</Description>
+        <Type>INTERNETONLY</Type>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>IfAuthPass=</IfAuthName>
+        <IfAuthPass>AuthRetries=0</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+    <CDMA2000PacketService operation="add">
+        <Name>test name cdma2000</Name>
+        <IwfName>Test2000</IwfName>
+        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
+        <PdpType>IPV4</PdpType>
+        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
+        <ReqRevPriority>PRIORITY04</ReqRevPriority>
+        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
+        <ReqRevBitrate>32KBPS</ReqRevBitrate>
+        <ReqFwdLoss>LOSS1</ReqFwdLoss>
+        <ReqRevLoss>LOSS1</ReqRevLoss>
+        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
+        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
+        <MinFwdBitrate>32KBPS</MinFwdBitrate>
+        <MinRevBitrate>32KBPS</MinRevBitrate>
+        <AccptFwdLoss>LOSS2</AccptFwdLoss>
+        <AccptRevLoss>LOSS2</AccptRevLoss>
+        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
+        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <AuthRetries>1</AuthRetries>
+        <IpNetMask>0.255.255.255</IpNetMask>
+        <IpGateway>10.0.0.1</IpGateway>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <ApType>2</ApType>
+        <QosWarningTimeout>1000000</QosWarningTimeout>
+        <RlpMode>TRANSPARENT</RlpMode>
+        <CDMANaiType>0</CDMANaiType>
+    </CDMA2000PacketService>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+    <Chargecard operation="add">
+        <Name>Dummy BT Chargecard</Name>
+        <AccountNumber>144,12345678</AccountNumber>
+        <Pin>0000</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>HFG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+    <Chargecard operation="add">
+        <Name>Dummy Mercury Chargecard</Name>
+        <AccountNumber>0500800800,,12345678</AccountNumber>
+        <Pin>****</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>J,K,0FG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>0</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>PROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.NT RAS with Null Modem</IAPRef>
+    </ConnectionPreferences>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable2</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>PROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.NT RAS with Null Modem</IAPRef>
+    </ConnectionPreferences>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <WAPAccess>WAPAccessPoint.Default Dial In ISP</WAPAccess>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsBearer>2</SmsBearer>
+        <SmsReceiveMode>2</SmsReceiveMode>
+        <GPRSAttachMode>1</GPRSAttachMode>
+        <AcceptIncomingGprs>1</AcceptIncomingGprs>
+        <ConnectionAttempts>2</ConnectionAttempts>
+        <ModemForDataAndFax>2</ModemForDataAndFax>
+        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
+        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
+        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
+        <GPRSClassCBearer>GSM</GPRSClassCBearer>
+        <DefaultNetwork>Network.Intranet</DefaultNetwork>
+        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+    <IncomingGPRS operation="add">
+        <Name>Incoming GPRS Settings PlaceHolder</Name>
+        <APN>Test</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>0.0.0.0</PDPAddress>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>1</ReqPrecedence>
+        <ReqDelay>1</ReqDelay>
+        <ReqReliability>1</ReqReliability>
+        <ReqPeakThroughput>1</ReqPeakThroughput>
+        <ReqMeanThroughput>1</ReqMeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNameServer1>0.0.0.0</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+    </IncomingGPRS>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS01</Name>
+        <APN>gprs01APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS02</Name>
+        <APN>gprs02APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS03</Name>
+        <APN>gprs03APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+    <DefaultGPRS operation="add">
+        <Name>Dummy Default GPRS Settings</Name>
+        <APN>Access point name</APN>
+        <PDPType>IPV6</PDPType>
+        <PDPAddress>www.wid.com</PDPAddress>
+        <Usage>1</Usage>
+        <Precedence>1</Precedence>
+        <Delay>1</Delay>
+        <Reliability>1</Reliability>
+        <PeakThroughput>1</PeakThroughput>
+        <MeanThroughput>1</MeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+    </DefaultGPRS>
+</DefaultGPRSTable>
+
+<ProxyTable>
+    <Proxy operation="add">
+        <Name>ProxyTable1</Name>
+        <ISPRef>DialOutISP.NT RAS</ISPRef>
+        <UseProxyServer>TRUE</UseProxyServer>
+        <ProtocolName>http</ProtocolName>
+        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
+        <PortNumber>80</PortNumber>
+        <Exceptions>www.dummyproxy.com/exception</Exceptions>
+    </Proxy>
+</ProxyTable>
+
+<LocationTable>
+    <Location operation="template">
+        <Name>Default Location</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+        <DialOutCode>9,</DialOutCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office Direct Dial</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+    </Location>
+    <Location operation="add">
+        <Name>Mobile</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Home</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>TRUE</UsePulseDial>
+        <WaitForDialTone>TRUE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>181</AreaCode>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable1</Name>
+        <ProtocolName>ssl3.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable2</Name>
+        <ProtocolName>tls1.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+    <WAPAccessPoint operation="template">
+        <Name>Default Dial In ISP</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+    </WAPAccessPoint>
+    <WAPAccessPoint operation="add">
+        <Name>Dummy WAP Settings</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+        <StartPage>www.wapstart.com</StartPage>
+    </WAPAccessPoint>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+    <WAPIPBearer operation="template">
+        <Name>WAPIPBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.-1</IAPRef>
+        <ProxyPortNumber>0</ProxyPortNumber>
+    </WAPIPBearer>
+    <WAPIPBearer operation="add">
+        <Name>WAPIPBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>www.wapgateway.com</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.CSD IAP PlaceHolder01</IAPRef>
+        <ProxyPortNumber>1</ProxyPortNumber>
+    </WAPIPBearer>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+    <WAPSMSBearer operation="template">
+        <Name>WAPSMSBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+    </WAPSMSBearer>
+    <WAPSMSBearer operation="add">
+        <Name>WAPSMSBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>+4412345678901</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+    <VirtualBearer operation="template">
+        <Name>Default VPN Bearer</Name>
+        <Agent>VPN.agt</Agent>
+        <IfName>VPN.nif</IfName>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+    </VirtualBearer>
+    <VirtualBearer operation="add">
+        <Name>VPN Bearer1</Name>
+        <Agent>ntras.agt</Agent>
+        <IfName>ppp.nif</IfName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </VirtualBearer>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+    <VpnService operation="template">
+        <Name>Default VPN</Name>
+        <Policy>DefaultVPNpolicy</Policy>
+        <HomeIAP>IAP.NT RAS with Null Modem</HomeIAP>
+        <HomeNetwork>Network.-1</HomeNetwork>
+    </VpnService>
+    <VpnService operation="add">
+        <Name>VPN1</Name>
+        <Policy>VPNpolicy1</Policy>
+        <HomeIAP>IAP.CSD IAP PlaceHolder01</HomeIAP>
+        <HomeNetwork>Network.Intranet</HomeNetwork>
+    </VpnService>
+</VpnServiceTable>
+
+<WLANServiceExtensionTable>
+</WLANServiceExtensionTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/Default1.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+//
+// 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:
+//
+//
+-->
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+</NetworkTable>
+
+<IAPTable>
+</IAPTable>
+
+<ModemBearerTable>
+    <ModemBearer operation="template">
+        <Name>Default Modem</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>0</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+</ModemBearerTable>
+
+<LANBearerTable>
+</LANBearerTable>
+
+<LANServiceTable>
+</LANServiceTable>
+
+<DialInISPTable>
+    <DialInISP operation="add">
+        <Name>Record #1</Name>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Record #2</Name>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Record #3</Name>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Record #4 (Read Only)</Name>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Record #5 (Read Only)</Name>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+    </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="add">
+        <Name>Record #1</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>TRUE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>Isp #1</Description>
+        <Type>INTERNETANDWAP</Type>
+        <DisplayPCT>TRUE</DisplayPCT>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>TRUE</IfCallbackEnabled>
+        <IfCallbackInfo>Call me back</IfCallbackInfo>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <EnableSWComp>TRUE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Record #2</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>TRUE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Record #3</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>TRUE</UseLoginScript>
+        <PromptForLogin>TRUE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <DisplayPCT>TRUE</DisplayPCT>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>TRUE</IfCallbackEnabled>
+        <IfCallbackInfo>Call me back</IfCallbackInfo>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <EnableSWComp>TRUE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+    <OutgoingGPRS operation="add">
+        <Name>Record #5</Name>
+        <APN>Test</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>2</ReqPrecedence>
+        <ReqDelay>4</ReqDelay>
+        <ReqReliability>3</ReqReliability>
+        <ReqPeakThroughput>3</ReqPeakThroughput>
+        <ReqMeanThroughput>31</ReqMeanThroughput>
+        <MinPrecedence>2</MinPrecedence>
+        <MinDelay>4</MinDelay>
+        <MinReliability>3</MinReliability>
+        <MinPeakThroughput>3</MinPeakThroughput>
+        <MinMeanThroughput>31</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.51</IpNameServer2>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>Record #6</Name>
+<APN>TheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDog1234</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>New Record</PDPAddress>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>2</ReqPrecedence>
+        <ReqDelay>4</ReqDelay>
+        <ReqReliability>3</ReqReliability>
+        <ReqPeakThroughput>3</ReqPeakThroughput>
+        <ReqMeanThroughput>31</ReqMeanThroughput>
+        <MinPrecedence>2</MinPrecedence>
+        <MinDelay>4</MinDelay>
+        <MinReliability>3</MinReliability>
+        <MinPeakThroughput>3</MinPeakThroughput>
+        <MinMeanThroughput>31</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <GprsUseEdge>TRUE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>-1</QosWarningTimeout>
+    </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+</DefaultGPRSTable>
+
+<ProxyTable>
+</ProxyTable>
+
+<LocationTable>
+</LocationTable>
+
+<SecureSocketTable>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/Default7.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+//
+// 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:
+//
+//
+-->
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+</NetworkTable>
+
+<IAPTable>
+</IAPTable>
+
+<ModemBearerTable>
+</ModemBearerTable>
+
+<LANBearerTable>
+</LANBearerTable>
+
+<LANServiceTable>
+</LANServiceTable>
+
+<DialInISPTable>
+</DialInISPTable>
+
+<DialOutISPTable>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+</DefaultGPRSTable>
+
+<ProxyTable>
+</ProxyTable>
+
+<LocationTable>
+</LocationTable>
+
+<SecureSocketTable>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/PanicTest.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,29 @@
+//
+// 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:
+//
+//
+//
+PRINT example CommDb Protect test
+PRINT 
+//
+MULTITHREAD
+//
+LOAD_SUITE TS_CommDb.dll
+
+
+RUN_PANIC_STEP 10000, TS_CommDb,step_060_01
+TEST_COMPLETE
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/ProtectRecord-ConnPref.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,31 @@
+//
+// 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:
+//
+//
+//
+PRINT example CommDb Protect test
+PRINT 
+//
+run_script z:\TestData\scripts\esock_test_unloadesock.script
+CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
+run_script z:\TestData\scripts\esock_test_loadesock.script
+
+LOAD_SUITE TS_CommDb.dll
+
+RUN_TEST_STEP -1, TS_CommDb,step_054_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_054_02
+TEST_COMPLETE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/ProtectRecord-Normal.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,33 @@
+//
+// 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:
+//
+//
+//
+PRINT example CommDb Protect test
+PRINT 
+//
+run_script z:\TestData\scripts\esock_test_unloadesock.script
+CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
+run_script z:\TestData\scripts\esock_test_loadesock.script
+
+LOAD_SUITE TS_CommDb.dll
+
+
+RUN_TEST_STEP -1, TS_CommDb,step_052_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_052_02
+TEST_COMPLETE
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/ProtectTable-ConnPref.script	Fri Sep 17 08:36:26 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:
+//
+//
+//
+PRINT example CommDb Protect test
+PRINT 
+//
+run_script z:\TestData\scripts\esock_test_unloadesock.script
+CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
+run_script z:\TestData\scripts\esock_test_loadesock.script
+
+LOAD_SUITE TS_CommDb.dll
+LOAD_SUITE ts_connpref.dll
+
+RUN_TEST_STEP -1, ts_connpref, ConstructAndVersion
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, ts_connpref, SetAndGetConnPrefs
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, ts_connpref, ComparePrefs
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, ts_connpref, AssignAndCopyConstruct
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, ts_connpref, ExtensionIdAndCast
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, ts_connpref, MultiConnPref
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, ts_connpref, MultiConnPrefVersion
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, ts_connpref, MultiConnectionAttempts
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,   step_053_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,  step_053_02
+TEST_COMPLETE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/ProtectTable-Normal.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,33 @@
+//
+// 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:
+//
+//
+//
+PRINT example CommDb Protect test
+PRINT 
+//
+run_script z:\TestData\scripts\esock_test_unloadesock.script
+CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
+run_script z:\TestData\scripts\esock_test_loadesock.script
+
+LOAD_SUITE TS_CommDb.dll
+
+
+RUN_TEST_STEP -1, TS_CommDb,step_051_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_051_02
+TEST_COMPLETE
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/TestProtectRecord-ConnPref.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,33 @@
+//
+// 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:
+//
+//
+//
+PRINT example CommDb Protect test
+PRINT 
+//
+run_script z:\TestData\scripts\esock_test_unloadesock.script
+CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
+run_script z:\TestData\scripts\esock_test_loadesock.script
+
+LOAD_SUITE TS_CommDb.dll
+
+
+RUN_TEST_STEP -1, TS_CommDb,step_058_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_058_02
+TEST_COMPLETE
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/TestProtectRecord-Normal.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,33 @@
+//
+// 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:
+//
+//
+//
+PRINT example CommDb Protect test
+PRINT 
+//
+run_script z:\TestData\scripts\esock_test_unloadesock.script
+CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
+run_script z:\TestData\scripts\esock_test_loadesock.script
+
+LOAD_SUITE TS_CommDb.dll
+
+
+RUN_TEST_STEP -1, TS_CommDb,step_056_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_056_02
+TEST_COMPLETE
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/TestProtectTable-ConnPref.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,33 @@
+//
+// 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:
+//
+//
+//
+PRINT example CommDb Protect test
+PRINT 
+//
+run_script z:\TestData\scripts\esock_test_unloadesock.script
+CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
+run_script z:\TestData\scripts\esock_test_loadesock.script
+
+LOAD_SUITE TS_CommDb.dll
+
+
+RUN_TEST_STEP -1, TS_CommDb,step_057_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_057_02
+TEST_COMPLETE
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/TestProtectTable-Normal.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,33 @@
+//
+// 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:
+//
+//
+//
+PRINT example CommDb Protect test
+PRINT 
+//
+run_script z:\TestData\scripts\esock_test_unloadesock.script
+CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
+run_script z:\TestData\scripts\esock_test_loadesock.script
+
+LOAD_SUITE TS_CommDb.dll
+
+
+RUN_TEST_STEP -1, TS_CommDb,step_055_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_055_02
+TEST_COMPLETE
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/Test_All_Protection-precommsdat.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,104 @@
+//
+// 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:
+//
+//
+//
+PRINT example CommDb Protect test
+PRINT 
+//
+//run_script z:\TestData\scripts\esock_test_unloadesock.script
+CED z:\testdata\configs\Protect.xml -f
+//run_script z:\TestData\scripts\esock_test_loadesock.script
+
+LOAD_SUITE TS_CommDb.dll
+
+RUN_TEST_STEP -1, TS_CommDb,step_051_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_051_02
+TEST_COMPLETE
+
+
+RUN_TEST_STEP -1, TS_CommDb,step_052_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_052_02
+TEST_COMPLETE
+
+
+RUN_TEST_STEP -1, TS_CommDb,step_053_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_053_02
+TEST_COMPLETE
+
+
+RUN_TEST_STEP -1, TS_CommDb,step_054_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_054_02
+TEST_COMPLETE
+
+
+RUN_TEST_STEP -1, TS_CommDb,step_055_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_055_02
+TEST_COMPLETE
+
+
+RUN_TEST_STEP -1, TS_CommDb,step_056_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_056_02
+TEST_COMPLETE
+
+
+RUN_TEST_STEP -1, TS_CommDb,step_057_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_057_02
+TEST_COMPLETE
+
+
+RUN_TEST_STEP -1, TS_CommDb,step_058_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_058_02
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_059_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_060_01
+TEST_COMPLETE
+
+//Added new test to test the fix for 
+//DEF035522: CommDb protection is easily circumvented using public APIs
+RUN_TEST_STEP -1, TS_CommDb,step_060_02
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_063_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_063_02
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_063_03
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_063_04
+TEST_COMPLETE
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/Test_All_Protection.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,159 @@
+//
+// 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:
+//
+//
+//
+PRINT example CommDb Protect test
+PRINT 
+//
+//run_script z:\TestData\scripts\esock_test_unloadesock.script
+CED z:\testdata\configs\Protect.xml -f
+//run_script z:\TestData\scripts\esock_test_loadesock.script
+
+LOAD_SUITE te_commdb
+
+START_TESTCASE			COMINF-commdb-0701
+//! @SYMTestCaseID		COMINF-commdb-0701
+RUN_TEST_STEP 100000 te_commdb step_051_01
+END_TESTCASE			COMINF-commdb-0701
+
+START_TESTCASE			COMINF-commdb-0702
+//! @SYMTestCaseID		COMINF-commdb-0702
+RUN_TEST_STEP 100000 te_commdb step_051_02
+END_TESTCASE			COMINF-commdb-0702
+
+START_TESTCASE			COMINF-commdb-0703
+//! @SYMTestCaseID		COMINF-commdb-0703
+RUN_TEST_STEP 100000 te_commdb step_052_01
+END_TESTCASE			COMINF-commdb-0703
+
+START_TESTCASE			COMINF-commdb-0704
+//! @SYMTestCaseID		COMINF-commdb-0704
+RUN_TEST_STEP 100000 te_commdb step_052_02
+END_TESTCASE			COMINF-commdb-0704
+
+START_TESTCASE			COMINF-commdb-0705
+//! @SYMTestCaseID		COMINF-commdb-0705
+RUN_TEST_STEP 100000 te_commdb step_053_01
+END_TESTCASE			COMINF-commdb-0705
+
+START_TESTCASE			COMINF-commdb-0705
+//! @SYMTestCaseID		COMINF-commdb-0705
+RUN_TEST_STEP 100000 te_commdb step_053_02
+END_TESTCASE			COMINF-commdb-0705
+
+START_TESTCASE			COMINF-commdb-0706
+//! @SYMTestCaseID		COMINF-commdb-0706
+RUN_TEST_STEP 100000 te_commdb step_054_01
+END_TESTCASE			COMINF-commdb-0706
+
+START_TESTCASE			COMINF-commdb-0707
+//! @SYMTestCaseID		COMINF-commdb-0707
+RUN_TEST_STEP 100000 te_commdb step_054_02
+END_TESTCASE			COMINF-commdb-0707
+
+START_TESTCASE			COMINF-commdb-0708
+//! @SYMTestCaseID		COMINF-commdb-0708
+RUN_TEST_STEP 100000 te_commdb step_055_01
+END_TESTCASE			COMINF-commdb-0708
+
+START_TESTCASE			COMINF-commdb-0709
+//! @SYMTestCaseID		COMINF-commdb-0709
+RUN_TEST_STEP 100000 te_commdb step_055_02
+END_TESTCASE			COMINF-commdb-0709
+
+START_TESTCASE			COMINF-commdb-0710
+//! @SYMTestCaseID		COMINF-commdb-0710
+RUN_TEST_STEP 100000 te_commdb step_056_01
+END_TESTCASE			COMINF-commdb-0710
+
+START_TESTCASE			COMINF-commdb-0711
+//! @SYMTestCaseID		COMINF-commdb-0711
+RUN_TEST_STEP 100000 te_commdb step_056_02
+END_TESTCASE			COMINF-commdb-0711
+
+START_TESTCASE			COMINF-commdb-0712
+//! @SYMTestCaseID		COMINF-commdb-0712
+RUN_TEST_STEP 100000 te_commdb step_057_01
+END_TESTCASE			COMINF-commdb-0712
+
+START_TESTCASE			COMINF-commdb-0713
+//! @SYMTestCaseID		COMINF-commdb-0713
+RUN_TEST_STEP 100000 te_commdb step_057_02
+END_TESTCASE			COMINF-commdb-0713
+
+START_TESTCASE			COMINF-commdb-0714
+//! @SYMTestCaseID		COMINF-commdb-0714
+RUN_TEST_STEP 100000 te_commdb step_058_01
+END_TESTCASE			COMINF-commdb-0714
+
+START_TESTCASE			COMINF-commdb-0715
+//! @SYMTestCaseID		COMINF-commdb-0715
+RUN_TEST_STEP 100000 te_commdb step_058_02
+END_TESTCASE			COMINF-commdb-0715
+
+START_TESTCASE			COMINF-commdb-0716
+//! @SYMTestCaseID		COMINF-commdb-0716
+RUN_TEST_STEP 100000 te_commdb step_059_01
+END_TESTCASE			COMINF-commdb-0716
+
+//Added new test to test the fix for 
+//DEF035522: CommDb protection is easily circumvented using public APIs
+START_TESTCASE			COMINF-commdb-0718
+//! @SYMTestCaseID		COMINF-commdb-0718
+RUN_TEST_STEP 100000 te_commdb step_060_02
+END_TESTCASE			COMINF-commdb-0718
+
+START_TESTCASE			COMINF-commdb-0719
+//! @SYMTestCaseID		COMINF-commdb-0719
+RUN_TEST_STEP 100000 te_commdb step_063_01
+END_TESTCASE			COMINF-commdb-0719
+
+START_TESTCASE			COMINF-commdb-0720
+//! @SYMTestCaseID		COMINF-commdb-0720
+RUN_TEST_STEP 100000 te_commdb step_063_02
+END_TESTCASE			COMINF-commdb-0720
+
+START_TESTCASE			COMINF-commdb-0721
+//! @SYMTestCaseID		COMINF-commdb-0721
+RUN_TEST_STEP 100000 te_commdb step_063_03
+END_TESTCASE			COMINF-commdb-0721
+
+START_TESTCASE			COMINF-commdb-0722
+//! @SYMTestCaseID		COMINF-commdb-0722
+RUN_TEST_STEP 100000 te_commdb step_063_04
+END_TESTCASE			COMINF-commdb-0722
+
+//Added new tests for codebase 
+START_TESTCASE			COMINF-commdb-0723
+//! @SYMTestCaseID		COMINF-commdb-0723
+RUN_TEST_STEP 100000 te_commdb step_063_05
+END_TESTCASE			COMINF-commdb-0723
+
+START_TESTCASE			COMINF-commdb-0724
+//! @SYMTestCaseID		COMINF-commdb-0724
+RUN_TEST_STEP 100000 te_commdb step_063_06
+END_TESTCASE			COMINF-commdb-0724
+
+START_TESTCASE			COMINF-commdb-0725
+//! @SYMTestCaseID		COMINF-commdb-0725
+RUN_TEST_STEP 100000 te_commdb step_063_07
+END_TESTCASE			COMINF-commdb-0725
+
+START_TESTCASE			COMINF-commdb-0726
+//! @SYMTestCaseID		COMINF-commdb-0726
+RUN_TEST_STEP 100000 te_commdb step_063_08
+END_TESTCASE			COMINF-commdb-0726
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/Test_Both_Types.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,82 @@
+//
+// 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:
+//
+//
+//
+PRINT example CommDb Protect test
+PRINT 
+//
+run_script z:\TestData\scripts\esock_test_unloadesock.script
+CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
+run_script z:\TestData\scripts\esock_test_loadesock.script
+
+LOAD_SUITE TS_CommDb.dll
+
+//Protecting Normal table
+RUN_TEST_STEP -1, TS_CommDb,step_051_01
+TEST_COMPLETE
+//Protecting Connection Pref Table
+RUN_TEST_STEP -1, TS_CommDb,step_053_01
+TEST_COMPLETE
+
+//UProtecting Normal table
+RUN_TEST_STEP -1, TS_CommDb,step_051_02
+TEST_COMPLETE
+//UProtecting Connection Pref Table
+RUN_TEST_STEP -1, TS_CommDb,step_053_02
+TEST_COMPLETE
+
+//Protecting Normal Record
+RUN_TEST_STEP -1, TS_CommDb,step_052_01
+TEST_COMPLETE
+//Protecting Connection Pref Record
+RUN_TEST_STEP -1, TS_CommDb,step_054_01
+TEST_COMPLETE
+
+//UProtecting Normal Record
+RUN_TEST_STEP -1, TS_CommDb,step_052_02
+TEST_COMPLETE
+//UProtecting Connection Pref Record
+RUN_TEST_STEP -1, TS_CommDb,step_054_02
+TEST_COMPLETE
+
+
+//Test Protecting Normal table
+RUN_TEST_STEP -1, TS_CommDb,step_055_01
+TEST_COMPLETE
+//Protecting Connection Pref Table
+RUN_TEST_STEP -1, TS_CommDb,step_057_01
+TEST_COMPLETE
+
+//Test UProtecting Normal table
+RUN_TEST_STEP -1, TS_CommDb,step_055_02
+TEST_COMPLETE
+//UProtecting Connection Pref Table
+RUN_TEST_STEP -1, TS_CommDb,step_057_02
+TEST_COMPLETE
+
+//Test Protecting Normal Record
+RUN_TEST_STEP -1, TS_CommDb,step_056_01
+TEST_COMPLETE
+//TEst Protecting Connection Pref Record
+RUN_TEST_STEP -1, TS_CommDb,step_058_01
+TEST_COMPLETE
+
+//Test UProtecting Normal Record
+RUN_TEST_STEP -1, TS_CommDb,step_056_02
+TEST_COMPLETE
+//Test UProtecting Connection Pref Record
+RUN_TEST_STEP -1, TS_CommDb,step_058_02
+TEST_COMPLETE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/cdb_udeb-precommsdat.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,996 @@
+//
+// 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:
+//
+//
+//
+PRINT example CommDb test
+PRINT
+//Do all our moving round & making databases first
+
+//run_script z:\TestData\scripts\esock_test_unloadesock.script
+
+//LOAD_SUITE TS_Esock.dll
+
+run_utils copyfile z:\testdata\configs\default5.dat c:\corrupt.dat
+
+//Ready to go.
+//run protection tests
+run_script z:\testdata\scripts\test_all_protection
+
+LOAD_SUITE TS_CommDb.dll
+
+// ced processing tests.
+
+//run_script z:\TestData\scripts\esock_test_unloadesock.script
+
+CED z:\testdata\configs\061_01.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_061_01
+TEST_COMPLETE
+
+CED z:\testdata\configs\061_02.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_061_02
+TEST_COMPLETE
+
+CED z:\testdata\configs\061_03.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_061_03
+TEST_COMPLETE
+
+CED z:\testdata\configs\061_04.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_061_04
+TEST_COMPLETE
+
+// finished ced processing tests.
+
+// database creation tests
+
+CED z:\testdata\configs\default7.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_001_01
+TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_001_03
+TEST_COMPLETE
+
+CED z:\testdata\configs\corrupt.xml -f
+
+// Note - this test modified for 9.1 as manipulates cdbv3.dat file
+RUN_TEST_STEP 100000, TS_CommDb,step_001_04
+TEST_COMPLETE
+
+
+RUN_TEST_STEP 100000, TS_CommDb,step_001_05
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_001_07
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_001_08
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_001_09
+TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_001_10
+TEST_COMPLETE
+
+
+RUN_TEST_STEP 100000, TS_CommDb,step_002_01
+TEST_COMPLETE
+
+// finished database creation tests
+
+//run_script z:\TestData\scripts\esock_test_loadesock.script
+
+
+RUN_TEST_STEP 100000, TS_CommDb,step_003_01
+TEST_COMPLETE 
+
+RUN_TEST_STEP 100000, TS_CommDb,step_003_02
+TEST_COMPLETE 
+
+RUN_TEST_STEP 100000, TS_CommDb,step_003_03
+TEST_COMPLETE 
+
+RUN_TEST_STEP 100000, TS_CommDb,step_003_05
+TEST_COMPLETE 
+
+RUN_TEST_STEP 100000, TS_CommDb,step_003_06 
+TEST_COMPLETE
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_003_07 
+TEST_COMPLETE
+
+
+RUN_TEST_STEP 100000, TS_CommDb,step_004_01
+TEST_COMPLETE 
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_004_04
+TEST_COMPLETE 
+
+CED z:\testdata\configs\default7.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_005_01
+TEST_COMPLETE 
+RUN_TEST_STEP 100000, TS_CommDb,step_005_02
+TEST_COMPLETE 
+RUN_TEST_STEP 100000, TS_CommDb,step_005_03
+TEST_COMPLETE 
+RUN_TEST_STEP 1000000, TS_CommDb,step_005_04
+TEST_COMPLETE 
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_006_01
+TEST_COMPLETE 
+RUN_TEST_STEP 100000, TS_CommDb,step_006_02
+TEST_COMPLETE
+
+CED z:\testdata\configs\default7.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_006_03
+TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_006_04
+
+CED z:\testdata\configs\default1.xml -f
+
+TEST_COMPLETE 
+RUN_TEST_STEP 1000000, TS_CommDb,step_006_05
+TEST_COMPLETE 
+      
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_007_01
+TEST_COMPLETE 
+RUN_TEST_STEP 100000, TS_CommDb,step_007_02
+TEST_COMPLETE 
+RUN_TEST_STEP 100000, TS_CommDb,step_007_03
+TEST_COMPLETE 
+RUN_TEST_STEP 100000, TS_CommDb,step_007_04
+TEST_COMPLETE 
+RUN_TEST_STEP 100000, TS_CommDb,step_007_05
+TEST_COMPLETE 
+RUN_TEST_STEP 100000, TS_CommDb,step_007_06
+TEST_COMPLETE 
+
+CED z:\testdata\configs\default7.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_007_07
+TEST_COMPLETE 
+RUN_TEST_STEP 100000, TS_CommDb,step_007_08
+TEST_COMPLETE 
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_007_09
+TEST_COMPLETE 
+RUN_TEST_STEP 100000, TS_CommDb,step_007_10
+TEST_COMPLETE 
+RUN_TEST_STEP 100000, TS_CommDb,step_007_11
+TEST_COMPLETE 
+RUN_TEST_STEP 100000, TS_CommDb,step_007_12
+TEST_COMPLETE 
+RUN_TEST_STEP 1000000, TS_CommDb,step_007_15
+TEST_COMPLETE 
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_007_16
+TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_007_17
+TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_008_01
+TEST_COMPLETE 
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_008_02
+TEST_COMPLETE 
+
+RUN_TEST_STEP 100000, TS_CommDb,step_008_03
+TEST_COMPLETE 
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_008_04
+TEST_COMPLETE
+
+CED z:\testdata\configs\default7.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_009_01
+TEST_COMPLETE
+
+CED z:\testdata\configs\default7.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_009_02
+TEST_COMPLETE
+
+CED z:\testdata\configs\default7.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_009_03
+TEST_COMPLETE
+
+CED z:\testdata\configs\default7.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_009_04
+TEST_COMPLETE
+
+CED z:\testdata\configs\default7.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_009_05
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_009_06
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_009_09
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_009_10
+TEST_COMPLETE
+
+CED z:\testdata\configs\default7.xml -f
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_009_11
+TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_010_01
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_010_02
+TEST_COMPLETE
+
+CED z:\testdata\configs\default7.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_010_03
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_010_04
+TEST_COMPLETE
+RUN_TEST_STEP 1000000, TS_CommDb,step_010_05
+TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_011_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_011_03
+TEST_COMPLETE
+RUN_TEST_STEP 1000000, TS_CommDb,step_011_04
+TEST_COMPLETE
+
+
+// Step 01 and 02 not run anymore
+//RUN_TEST_STEP 100000, TS_CommDb,step_012_01
+//TEST_COMPLETE
+//RUN_TEST_STEP 100000, TS_CommDb,step_012_02
+//TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_012_03
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_012_04
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_012_05
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_012_06
+TEST_COMPLETE
+RUN_TEST_STEP 1000000, TS_CommDb,step_012_07
+TEST_COMPLETE
+
+
+RUN_TEST_STEP 100000, TS_CommDb,step_013_01
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_013_03
+TEST_COMPLETE
+RUN_TEST_STEP 1000000, TS_CommDb,step_013_04
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_014_01
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_014_02
+TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_014_03
+TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_015_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_015_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_015_03
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_015_04
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_015_07
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_015_08
+TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_015_09
+TEST_COMPLETE
+
+// TODO - these 7 tests should pass - are failing because of notifications
+
+RUN_TEST_STEP 100000, TS_CommDb,step_016_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_016_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_016_04
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_016_05
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_016_07
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_016_08
+TEST_COMPLETE
+
+RUN_TEST_STEP 2000000, TS_CommDb,step_016_09
+TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_017_01
+TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+// These 5 steps should pass - notifications
+
+RUN_TEST_STEP 100000, TS_CommDb,step_017_02
+TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_017_03
+TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_017_04
+TEST_COMPLETE
+
+
+//CED z:\testdata\configs\default1.xml -f
+
+//RUN_TEST_STEP 2000000, TS_CommDb,step_017_05
+//TEST_COMPLETE
+
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 2000000, TS_CommDb,step_017_06
+TEST_COMPLETE
+
+
+RUN_TEST_STEP 100000, TS_CommDb,step_018_01
+TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_018_02
+TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_018_03
+TEST_COMPLETE
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_018_04
+TEST_COMPLETE
+
+//CED z:\testdata\configs\default1.xml -f
+
+//RUN_TEST_STEP 1000000, TS_CommDb,step_018_05
+//TEST_COMPLETE
+
+CED z:\testdata\configs\default1.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_019_01
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_019_02
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_019_03
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_019_04
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_019_05
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_019_06
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_019_07
+TEST_COMPLETE
+RUN_TEST_STEP 1000000, TS_CommDb,step_019_08
+TEST_COMPLETE
+
+
+CED z:\testdata\configs\020.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_020_01
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_020_02
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_020_03
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_020_04
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_020_05
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_020_06
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_020_07
+TEST_COMPLETE
+RUN_TEST_STEP 1000000, TS_CommDb,step_020_08
+TEST_COMPLETE
+
+CED z:\testdata\configs\021.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_021_01
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_021_02
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_021_03
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_021_04
+TEST_COMPLETE
+RUN_TEST_STEP 1000000, TS_CommDb,step_021_05
+TEST_COMPLETE
+
+CED z:\testdata\configs\022.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_022_01
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_022_02
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_022_03
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_022_04
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_022_05
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_022_06
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_022_07
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_022_08
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_022_09
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_022_10
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_022_11
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_022_12
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_022_13
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_022_14
+TEST_COMPLETE
+RUN_TEST_STEP 1000000, TS_CommDb,step_022_16
+TEST_COMPLETE
+
+CED z:\testdata\configs\023.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_023_01
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_023_02
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_023_03
+TEST_COMPLETE
+RUN_TEST_STEP 1000000, TS_CommDb,step_023_04
+TEST_COMPLETE
+
+
+CED z:\testdata\configs\024.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_024_01
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_024_02
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_024_03
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_024_04
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_024_05
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_024_06
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_024_07
+TEST_COMPLETE
+RUN_TEST_STEP 100000, TS_CommDb,step_024_08
+TEST_COMPLETE
+RUN_TEST_STEP 1000000, TS_CommDb,step_024_09
+TEST_COMPLETE
+
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_025_01
+TEST_COMPLETE 
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_025_02
+TEST_COMPLETE 
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_026_01
+TEST_COMPLETE
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_026_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_026_03
+TEST_COMPLETE 
+
+RUN_TEST_STEP 100000, TS_CommDb,step_026_04
+TEST_COMPLETE 
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_026_05
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_026_06
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_026_07
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_026_08
+TEST_COMPLETE
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_026_09
+TEST_COMPLETE
+
+
+CED z:\testdata\configs\022.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_027_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_027_02
+TEST_COMPLETE
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_028_01
+TEST_COMPLETE
+ 
+RUN_TEST_STEP 100000, TS_CommDb,step_028_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_028_03
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_028_04
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_028_05
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_028_06
+TEST_COMPLETE
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_028_07
+TEST_COMPLETE
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_029_01
+TEST_COMPLETE
+ 
+RUN_TEST_STEP 100000, TS_CommDb,step_029_02
+TEST_COMPLETE
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_029_04
+TEST_COMPLETE
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_030_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_030_02
+TEST_COMPLETE
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_030_03
+TEST_COMPLETE
+
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_031_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_031_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_031_03
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_031_04
+TEST_COMPLETE
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_031_05
+TEST_COMPLETE
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_032_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_032_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_032_03
+TEST_COMPLETE
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_032_04
+TEST_COMPLETE
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_033_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_033_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_033_03
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_033_04
+TEST_COMPLETE
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_033_05
+TEST_COMPLETE
+
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_034_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_034_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_034_03
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_034_05
+TEST_COMPLETE
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_034_06
+TEST_COMPLETE
+
+
+CED z:\testdata\configs\default.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_035_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_035_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_035_03
+TEST_COMPLETE
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_035_04
+TEST_COMPLETE
+
+
+CED z:\testdata\configs\022.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_036_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_036_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_036_03
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_036_04
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_036_05
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_036_06
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_036_07
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_036_08
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_036_09
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_036_10
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_036_13
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_036_14
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_036_15
+TEST_COMPLETE
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_036_16
+TEST_COMPLETE
+
+
+CED z:\testdata\configs\default.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_037_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_037_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_037_03
+TEST_COMPLETE
+
+
+
+RUN_TEST_STEP 100000, TS_CommDb,step_038_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_038_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_038_03
+TEST_COMPLETE
+
+
+RUN_TEST_STEP 100000, TS_CommDb,step_039_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_039_02
+TEST_COMPLETE
+
+
+RUN_TEST_STEP 100000, TS_CommDb,step_040_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_040_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_040_03
+TEST_COMPLETE
+
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_03
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_04
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_05
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_06
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_07
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_08
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_09
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_10
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_11
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_12
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_13
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_14
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_15
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_16
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_041_17
+TEST_COMPLETE
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_041_18
+TEST_COMPLETE
+
+
+RUN_TEST_STEP 100000, TS_CommDb,step_042_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_042_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_042_03
+TEST_COMPLETE
+
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_043_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_043_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_043_03
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_043_04
+TEST_COMPLETE
+
+CED z:\testdata\configs\default3.xml -f
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_043_05
+TEST_COMPLETE
+
+CED z:\testdata\configs\default.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_044_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_044_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_044_03
+TEST_COMPLETE
+
+
+RUN_TEST_STEP 100000, TS_CommDb,step_045_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_045_02
+TEST_COMPLETE
+
+RUN_TEST_STEP 1000000, TS_CommDb,step_045_03
+TEST_COMPLETE
+
+
+CED z:\testdata\configs\default7.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_046_01
+TEST_COMPLETE
+
+// These 3 tests need to pass.  Are broken because of transactions needing to complete differently
+
+RUN_TEST_STEP 500000, TS_CommDb,step_046_02
+TEST_COMPLETE
+
+CED z:\testdata\configs\default.xml -f
+
+RUN_TEST_STEP 500000, TS_CommDb,step_046_04
+TEST_COMPLETE
+
+// Maybe broken, too long to wait
+RUN_TEST_STEP 2000000, TS_CommDb,step_046_05
+TEST_COMPLETE
+
+
+CED z:\testdata\configs\default1.xml -f
+
+// BC tests of Modem table renaming.
+
+RUN_TEST_STEP 100000, TS_CommDb,step_062_01
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_062_02
+TEST_COMPLETE
+
+CED z:\testdata\configs\default.xml -f
+
+RUN_TEST_STEP 100000, TS_CommDb,step_062_03
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_062_04
+TEST_COMPLETE
+
+RUN_TEST_STEP 100000, TS_CommDb,step_062_05
+TEST_COMPLETE
+
+MULTITHREAD
+
+CED z:\testdata\configs\default.xml -f
+
+RUN_TEST_STEP -1, TS_CommDb,step_047_01
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_047_02
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_047_03
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_047_04
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_047_05
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_047_06
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_047_07
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_047_08
+TEST_COMPLETE
+
+RUN_TEST_STEP -1, TS_CommDb,step_047_13
+TEST_COMPLETE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/cdb_urel.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,158 @@
+//
+// 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:
+//
+//
+//run_script z:\TestData\scripts\esock_test_unloadesock.script
+
+//LOAD_SUITE TS_Esock.dll
+
+//
+PRINT example CommDb test
+PRINT 
+//
+
+LOAD_SUITE te_commdb
+
+CED  z:\testdata\configs\061_01.xml -f
+
+START_TESTCASE			COMINF-commdb-0501
+//! @SYMTestCaseID		COMINF-commdb-0501
+RUN_TEST_STEP 100000 te_commdb step_061_01
+END_TESTCASE			COMINF-commdb-0501
+
+CED  z:\testdata\configs\061_02.xml -f
+
+START_TESTCASE			COMINF-commdb-0502
+//! @SYMTestCaseID		COMINF-commdb-0502
+RUN_TEST_STEP 100000 te_commdb step_061_02
+END_TESTCASE			COMINF-commdb-0502
+
+CED  z:\testdata\configs\061_03.xml -f
+
+START_TESTCASE			COMINF-commdb-0503
+//! @SYMTestCaseID		COMINF-commdb-0503
+RUN_TEST_STEP 100000 te_commdb step_061_03
+END_TESTCASE			COMINF-commdb-0503
+
+CED  z:\testdata\configs\061_04.xml -f
+
+START_TESTCASE			COMINF-commdb-0504
+//! @SYMTestCaseID		COMINF-commdb-0504
+RUN_TEST_STEP 100000 te_commdb step_061_04
+END_TESTCASE			COMINF-commdb-0504
+
+
+// CED processing tests.
+
+CED  z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0505
+//! @SYMTestCaseID		COMINF-commdb-0505
+RUN_PANIC_STEP 100000 te_commdb step_003_04
+END_TESTCASE			COMINF-commdb-0505 
+
+START_TESTCASE			COMINF-commdb-0506
+//! @SYMTestCaseID		COMINF-commdb-0506
+RUN_PANIC_STEP 100000 te_commdb step_004_02
+END_TESTCASE			COMINF-commdb-0506 
+
+START_TESTCASE			COMINF-commdb-0507
+//! @SYMTestCaseID		COMINF-commdb-0507
+RUN_PANIC_STEP 100000 te_commdb step_007_14
+END_TESTCASE			COMINF-commdb-0507 
+
+START_TESTCASE			COMINF-commdb-0508
+//! @SYMTestCaseID		COMINF-commdb-0508
+RUN_PANIC_STEP 100000 te_commdb step_009_07
+END_TESTCASE			COMINF-commdb-0508
+
+START_TESTCASE			COMINF-commdb-0509
+//! @SYMTestCaseID		COMINF-commdb-0509 
+RUN_PANIC_STEP 100000 te_commdb step_009_08
+END_TESTCASE			COMINF-commdb-0509 
+
+START_TESTCASE			COMINF-commdb-0510
+//! @SYMTestCaseID		COMINF-commdb-0510
+RUN_TEST_STEP 100000 te_commdb step_013_02
+END_TESTCASE			COMINF-commdb-0510
+
+START_TESTCASE			COMINF-commdb-0511
+//! @SYMTestCaseID		COMINF-commdb-0511
+RUN_TEST_STEP 100000 te_commdb step_015_05
+END_TESTCASE			COMINF-commdb-0511
+
+START_TESTCASE			COMINF-commdb-0512
+//! @SYMTestCaseID		COMINF-commdb-0512
+RUN_TEST_STEP 100000 te_commdb step_015_06
+END_TESTCASE			COMINF-commdb-0512
+
+CED  z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0513
+//! @SYMTestCaseID		COMINF-commdb-0513
+RUN_TEST_STEP 100000 te_commdb step_029_03
+END_TESTCASE			COMINF-commdb-0513
+
+START_TESTCASE			COMINF-commdb-0514
+//! @SYMTestCaseID		COMINF-commdb-0514
+RUN_TEST_STEP 100000 te_commdb step_034_04
+END_TESTCASE			COMINF-commdb-0514
+
+START_TESTCASE			COMINF-commdb-0515
+//! @SYMTestCaseID		COMINF-commdb-0515
+RUN_TEST_STEP 100000 te_commdb step_046_03
+END_TESTCASE			COMINF-commdb-0515
+
+// BC tests of Modem table renaming.
+START_TESTCASE			COMINF-commdb-0516
+//! @SYMTestCaseID		COMINF-commdb-0516
+RUN_TEST_STEP 100000 te_commdb step_062_01
+END_TESTCASE			COMINF-commdb-0516
+
+START_TESTCASE			COMINF-commdb-0517
+//! @SYMTestCaseID		COMINF-commdb-0517
+RUN_TEST_STEP 100000 te_commdb step_062_02
+END_TESTCASE			COMINF-commdb-0517
+
+START_TESTCASE			COMINF-commdb-0518
+//! @SYMTestCaseID		COMINF-commdb-0518
+RUN_TEST_STEP 100000 te_commdb step_062_03
+END_TESTCASE			COMINF-commdb-0518
+
+START_TESTCASE			COMINF-commdb-0519
+//! @SYMTestCaseID		COMINF-commdb-0519
+RUN_TEST_STEP 100000 te_commdb step_062_04
+END_TESTCASE			COMINF-commdb-0519
+
+START_TESTCASE			COMINF-commdb-0520
+//! @SYMTestCaseID		COMINF-commdb-0520
+RUN_TEST_STEP 100000 te_commdb step_062_05
+END_TESTCASE			COMINF-commdb-0520
+
+// The following two steps should always be last two step cases for EKA2
+
+START_TESTCASE			COMINF-commdb-0521
+//! @SYMTestCaseID		COMINF-commdb-0521
+RUN_PANIC_STEP 100000 te_commdb step_036_11
+END_TESTCASE			COMINF-commdb-0521
+
+START_TESTCASE			COMINF-commdb-0522
+//! @SYMTestCaseID		COMINF-commdb-0522
+RUN_PANIC_STEP 100000 te_commdb step_036_12
+END_TESTCASE			COMINF-commdb-0522
+
+
+//Cleanup other files we've left
+//run_script z:\TestData\scripts\esock_test_loadesock.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/default3.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,638 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+//
+// 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:
+//
+//
+-->
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+    <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>record1</Name>
+        <IAPService>DialOutISP.record1</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>record2</Name>
+        <IAPService>DialOutISP.record2</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Home</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>record1</Name>
+        <IAPService>DialInISP.Default Dial In ISP</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Home</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>record2</Name>
+        <IAPService>DialInISP.record2</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.3</LocationRef>
+    </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+    <ModemBearer operation="template">
+        <Name>Default Modem</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>0</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>Null Modem 115200bps</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>NTRASTSY</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageValidityPeriod>0</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+</ModemBearerTable>
+
+<LANBearerTable>
+</LANBearerTable>
+
+<LANServiceTable>
+</LANServiceTable>
+
+<DialInISPTable>
+    <DialInISP operation="template">
+        <Name>Default Dial In ISP</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>record1</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Authentication>0</Authentication>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>record2</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <LoginScript>New Record</LoginScript>
+        <Authentication>0</Authentication>
+        <IfNetworks>ip</IfNetworks>
+        <IpAddr>New Record</IpAddr>
+        <IpNameServer1>New Record</IpNameServer1>
+        <IpNameServer2>New Record</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="template">
+        <Name>Default Dial Out ISP</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>TRUE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>record1</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>TRUE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND &quot;CLIENT&quot;+&lt;0x0d&gt;\nWAIT 3\n{\n&quot;SERVER&quot; OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>asdfs</IfAuthName>
+        <IfAuthPass>asdfas</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>9600</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>record2</Name>
+        <DialResolution>FALSE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <LoginScript>New Record</LoginScript>
+        <LoginName>New Record</LoginName>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>New Record</IfAuthName>
+        <IfAuthPass>New Record</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <IfCallbackType>IETF0</IfCallbackType>
+        <IfCallbackInfo>New Record</IfCallbackInfo>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpAddr>New Record</IpAddr>
+        <IpNameServer1>New Record</IpNameServer1>
+        <IpNameServer2>New Record</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>9600</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+    <Chargecard operation="add">
+        <Name>New Record</Name>
+        <AccountNumber>New Record</AccountNumber>
+        <Pin>New Record</Pin>
+        <LocalRule>New Record</LocalRule>
+        <NatRule>New Record</NatRule>
+        <IntlRule>New Record</IntlRule>
+    </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsBearer>2</SmsBearer>
+        <SmsReceiveMode>2</SmsReceiveMode>
+        <GPRSAttachMode>1</GPRSAttachMode>
+        <AcceptIncomingGprs>1</AcceptIncomingGprs>
+        <ConnectionAttempts>2</ConnectionAttempts>
+        <ModemForDataAndFax>2</ModemForDataAndFax>
+        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
+        <LocationForDataAndFax>Location.Office Direct Dial</LocationForDataAndFax>
+        <LocationForPhoneServicesAndSMS>Location.Office Direct Dial</LocationForPhoneServicesAndSMS>
+        <GPRSClassCBearer>GSM</GPRSClassCBearer>
+        <DefaultNetwork>Network.Intranet</DefaultNetwork>
+        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+    <OutgoingGPRS operation="add">
+        <Name>Record #5</Name>
+        <APN>Test</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>2</ReqPrecedence>
+        <ReqDelay>4</ReqDelay>
+        <ReqReliability>3</ReqReliability>
+        <ReqPeakThroughput>3</ReqPeakThroughput>
+        <ReqMeanThroughput>31</ReqMeanThroughput>
+        <MinPrecedence>2</MinPrecedence>
+        <MinDelay>4</MinDelay>
+        <MinReliability>3</MinReliability>
+        <MinPeakThroughput>3</MinPeakThroughput>
+        <MinMeanThroughput>31</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.51</IpNameServer2>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>Record #6</Name>
+        <APN>TheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDog1234</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>New Record</PDPAddress>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>2</ReqPrecedence>
+        <ReqDelay>4</ReqDelay>
+        <ReqReliability>3</ReqReliability>
+        <ReqPeakThroughput>3</ReqPeakThroughput>
+        <ReqMeanThroughput>31</ReqMeanThroughput>
+        <MinPrecedence>2</MinPrecedence>
+        <MinDelay>4</MinDelay>
+        <MinReliability>3</MinReliability>
+        <MinPeakThroughput>3</MinPeakThroughput>
+        <MinMeanThroughput>31</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <GprsUseEdge>TRUE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>-1</QosWarningTimeout>
+    </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+    <DefaultGPRS operation="add">
+        <Name>Dummy Default GPRS Settings</Name>
+        <APN>Access point name</APN>
+        <PDPType>IPV6</PDPType>
+        <PDPAddress>www.wid.com</PDPAddress>
+        <Usage>1</Usage>
+        <Precedence>1</Precedence>
+        <Delay>1</Delay>
+        <Reliability>1</Reliability>
+        <PeakThroughput>1</PeakThroughput>
+        <MeanThroughput>1</MeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+    </DefaultGPRS>
+</DefaultGPRSTable>
+
+<ProxyTable>
+</ProxyTable>
+
+<LocationTable>
+    <Location operation="template">
+        <Name>Default Location</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office Direct Dial</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+    </Location>
+    <Location operation="add">
+        <Name>Mobile</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Home</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>TRUE</UsePulseDial>
+        <WaitForDialTone>TRUE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>181</AreaCode>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable1</Name>
+        <ProtocolName>ssl3.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable2</Name>
+        <ProtocolName>tls1.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+    <WAPAccessPoint operation="template">
+        <Name>Default Dial In ISP</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+    </WAPAccessPoint>
+    <WAPAccessPoint operation="add">
+        <Name>Dummy WAP Settings</Name> 
+        <CurrentBearer>WAPIPBearer</CurrentBearer> 
+        <StartPage>www.wapstart.com</StartPage> 
+    </WAPAccessPoint>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+    <WAPIPBearer operation="template">
+        <Name>WAPIPBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.-1</IAPRef>
+        <ProxyPortNumber>0</ProxyPortNumber>
+    </WAPIPBearer>
+    <WAPIPBearer operation="add">
+        <Name>WAPIPBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.1</AccessPoint>
+        <GatewayAddress>www.wapgateway.com</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.record2</IAPRef>
+        <ProxyPortNumber>1</ProxyPortNumber>
+    </WAPIPBearer>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+    <WAPSMSBearer operation="template">
+        <Name>WAPSMSBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/default5.dat	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,3 @@
+P  ¾ N 0V‘ÙÐS      %  ‡Ý	@         @	   •   
+   @   s          @   0        @      @   P        @      @   q     @5   P       @      @      @   °        @      @   Ð        @      @   ð        @      @          @      @   0       @      @   P       @      @3   0       @      @          @      @   °       @      @   Ð       @      @   ð       @      @!          @      @#   0       @      @%   P       @      @'   p       @      @)          @      @+   °       @      @-   Ð       @      @/   ð       @      @1          @      @3   0       @      @5   P       Ô^i     4NetworkIdName2Hidden  ReadOnly      IAPIdName2Hidden  ReadOnly (IAPService8IAPServiceType2$IAPBearer4IAPBearerType2(IAPNetworkLIAPNetworkWeighting Location      (DialOutISPvIdName2Hidden  ReadOnly 8DialResolution 8UseLoginScript 8PromptForLogin <IfPromptForAuth @IpAddrFromServer LIpDNSAddrFromServer ,Description 2Type 4DefaultTelNum 2,LoginScript $LoginName 2$LoginPass 2(Chargecard (DisplayPCT   IfParams 2(IfNetworks 2(IfAuthName 2(IfAuthPass 2,AuthRetries DIfCallbackEnabled  8IfCallbackType 8IfCallbackInfo 2<CallbackTimeout IpAddr 2$IpNetMask 2$IpGateway 24IpNameServer1 24IpNameServer2 2HEnableIPHeaderComp  HEnableLCPExtension  PDisablePlainTextAuth  0EnableSWComp  (BearerName ,BearerSpeed  BearerCE (InitString 2(BearerType 4ChannelCoding AIUR HRequestedTimeSlots @MaximumTimeSlots 4BearerService 8BearerProtocol (RlpVersion IwfToMs MsToIwf  AckTimer XRetransmissionAttempts @ResequencePeriod 8V42Compression 0V42Codewords 0V42MaxLength $Asymmetry <UserInitUpgrade  UseEdge       $DialInISP8IdName2Hidden  ReadOnly @IpAddrFromServer LIpDNSAddrFromServer ,Description 2Type 8UseLoginScript  ,LoginScript 8Authentication ,AuthRetries  IfParams 2(IfNetworks 2IpAddr 2$IpNetMask 2$IpGateway 24IpNameServer1 24IpNameServer2 2HEnableIPHeaderComp  HEnableLCPExtension  PDisablePlainTextAuth  0EnableSWComp  (BearerName ,BearerSpeed  BearerCE (InitString 2UseEdge   
+    8WAPAccessPointIdName2Hidden  ReadOnly 4CurrentBearer2$StartPage      ,WAPIPBearerIdHidden  ReadOnly 4AccessPointId<ProxyPortNumber8GatewayAddress 2IAP $WSPOption  Security  (ProxyLogin 24ProxyPassword 2     0WAPSMSBearerIdHidden  ReadOnly 4AccessPointId8GatewayAddress 2PServiceCentreAddress 2$WSPOption  Security       0OutgoingGPRSLIdName2Hidden  ReadOnly PDPType<IfPromptForAuth @IpAddrFromServer LIpDNSAddrFromServer APN (PDPAddress 24ReqPrecedence  ReqDelay 8ReqReliability DReqPeakThroughput DReqMeanThroughput 4MinPrecedence  MinDelay 8MinReliability DMinPeakThroughput DMinMeanThroughput <DataCompression  DHeaderCompression  ,GprsUseEdge  <AnonymousAccess   IfParams 2(IfNetworks 2(IfAuthName 2(IfAuthPass 2,AuthRetries $IpNetMask 2$IpGateway 2IpAddr 24IpNameServer1 24IpNameServer2 2HEnableLCPExtension  PDisablePlainTextAuth  LGprsAccessPointType DQosWarningTimeout      0IncomingGPRSLIdName2@@@@@@@dOnly PDPType<IfPromptForAuth @IpAddrFromServer LIpDNSAddrFromServer APN (PDPAddress 24ReqPrecedence  ReqDelay 8ReqReliability DReqPeakThroughput DReqMeanThroughput 4MinPrecedence  MinDelay 8MinReliability DMinPeakThroughput DMinMeanThroughput <DataCompression  DHeaderCompression  ,GprsUseEdge  <AnonymousAccess   IfParams 2(IfNetworks 2(IfAuthName 2(IfAuthPass 2,AuthRetries $IpNetMask 2$IpGateway 2IpAddr 24IpNameServer1 24IpNameServer2 2HEnableLCPExtension  PDisablePlainTextAuth  LGprsAccessPointType DQosWarningTimeout      (LANServiceIdName2Hidden  ReadOnly @IpAddrFromServer LIpDNSAddrFromServer (IfNetworks 2$IpNetMask 2$IpGateway 2IpAddr 24IpNameServer1 24IpNameServer2 2     ,ModemBearer˜IdName2Hidden  ReadOnly Agent 2IfName 2 PortName 2XControlChannelPortName 2TSYName 2CSYName 2 DataBits  StopBits Parity Rate ,Handshaking ,SpecialRate XonChar  XoffChar 0FaxClassPref ,SpeakerPref 8SpeakerVolPref <ModemInitString 28DataInitString 24FaxInitString 24IspInitString 2<DialPauseLength 28CarrierTimeout 2LAutoAnswerRingCount 2PSpeakerVolContorlLow 2\SpeakerVolControlMedium 2TSpeakerVolControlHigh 2@SpeakerAlwaysOff 2TSpeakerOnUntilCarrier 2<SpeakerAlwaysOn 2hSpeakerOnAfterUntilCarrier 2PDialToneWaitModifier 24CallProgress1 24CallProgress2 24CallProgress3 24CallProgress4 2EchoOff 2,VerboseText 2 QuietOff 2QuietOn 2`DialCommandStateModifier 2OnLine 2HResetConfiguration 2LReturnToFactoryDefs 2<DCDOnDuringLink 2$DTRHangUp 2,DSRAlwaysOn 2<RTSCTSHandshake 2@XonXoffHandshake 2<EscapeCharacter 2DEscapeGuardPeriod 2LFaxClassInterrogate 2 FaxClass 2(NoDialTone 2Busy 2 NoAnswer 2Carrier 2Connect 2DCompressionClass5 2DCompressionV42bis 2<CompressionNone 20ProtocolLAPD 2,ProtocolALT 2LProtocolALTCELLULAR 20ProtocolNone 2LMessageCentreNumber 2TMessageValidityPeriod TMessageDeliveryReport  HMinimumSignalLevel dLastSocketActivityTimeout `LastSessionClosedTimeout \LastSocketClosedTimeout      $LANBearerIdName2Hidden  ReadOnly Agent2IfName2LDDName2PDDName2dLastSocketActivityTimeout `LastSessionClosedTimeout \LastSocketClosedTimeout  
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/protect.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,1105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+//
+// 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:
+//
+//
+-->
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+    <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>NT RAS</Name>
+        <IAPService>DialOutISP.NT RAS</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office Direct Dial</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>NTRas GPRS</Name>
+        <IAPService>OutgoingGPRS.NTRas GPRS</IAPService>
+        <IAPBearer>ModemBearer.GPRS Ericsson R520m via IR</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>iTest name cdma2000</Name>
+	<IAPService>OutgoingGPRS.NTRas GPRS</IAPService>
+        <IAPBearer>ModemBearer.GPRS Ericsson R520m via IR</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Default Dial In ISP</Name>
+        <IAPService>DialInISP.Dial In CS ISP</IAPService>
+        <IAPBearer>ModemBearer.US Robotics Sportster</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Home</LocationRef>
+    </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+    <ModemBearer operation="template">
+        <Name>Default Modem</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>0</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>Null Modem 115200bps</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::3</PortName>
+        <TSYName>NTRASTSY</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageValidityPeriod>0</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>US Robotics Sportster</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>57600</Rate>
+        <Handshaking>244</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT&amp;F1</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT&amp;d2</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>Dacom Surfer</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>57600</Rate>
+        <Handshaking>244</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT&amp;F</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT&amp;d2</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GSM Mobile Phone via Infrared</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>IRCOMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>IRCOMM</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>196</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GSM Mobile Phone via Serial</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>19200</Rate>
+        <Handshaking>196</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GPRS Ericsson R520m via IR</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>IRCOMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>IRCOMM</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GPRS Ericsson R520m via Serial</Name>
+        <Agent>null.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GPRS Motorola Mobile Phone via Serial</Name>
+        <Agent>null.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>57600</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageCentreNumber>+44123456789</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+</ModemBearerTable>
+
+<LANBearerTable>
+    <LANBearer operation="add">
+        <Name>Assabet on-board Ethernet</Name>
+        <Agent>nullagent.agt</Agent>
+        <IfName>ethint</IfName>
+        <LDDName>not used</LDDName>
+        <PDDName>not used</PDDName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+</LANBearerTable>
+
+<LANServiceTable>
+    <LANService operation="add">
+        <Name>Ethernet</Name>
+        <IfNetworks>ip,ip6</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>194.72.6.1</IpGateway>
+        <IpAddr>192.168.0.100</IpAddr>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.52</IpNameServer2>
+    </LANService>
+</LANServiceTable>
+
+<DialInISPTable>
+    <DialInISP operation="template">
+        <Name>Default Dial In ISP</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Dial In CS ISP</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="template">
+        <Name>Default Dial Out ISP</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>TRUE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>NT RAS</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>TRUE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND &quot;CLIENT&quot;+&lt;0x0d&gt;\nWAIT 3\n{\n&quot;SERVER&quot; OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip,ip6</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>UNSPECIFIED</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<ChargecardTable>
+    <Chargecard operation="add">
+        <Name>Dummy BT Chargecard</Name>
+        <AccountNumber>144,12345678</AccountNumber>
+        <Pin>0000</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>HFG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+    <Chargecard operation="add">
+        <Name>Dummy Mercury Chargecard</Name>
+        <AccountNumber>0500800800,,12345678</AccountNumber>
+        <Pin>****</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>J,K,0FG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>2</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>PROMPT</DialogPref>
+        <BearerSet>PSD</BearerSet>
+        <IAPRef>IAP.NTRas GPRS</IAPRef>
+    </ConnectionPreferences>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable2</Name>
+        <Ranking>0</Ranking>
+        <Direction>INCOMING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.Default Dial In ISP</IAPRef>
+    </ConnectionPreferences>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable3</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.NT RAS</IAPRef>
+    </ConnectionPreferences>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsBearer>2</SmsBearer>
+        <SmsReceiveMode>2</SmsReceiveMode>
+        <GPRSAttachMode>1</GPRSAttachMode>
+        <AcceptIncomingGprs>1</AcceptIncomingGprs>
+        <ConnectionAttempts>2</ConnectionAttempts>
+        <ModemForDataAndFax>2</ModemForDataAndFax>
+        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
+        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
+        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
+        <GPRSClassCBearer>GSM</GPRSClassCBearer>
+        <DefaultNetwork>Network.Intranet</DefaultNetwork>
+        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+    <IncomingGPRS operation="add">
+        <Name>Dummy Incoming GPRS Settings</Name>
+        <APN>Test</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>0.0.0.0</PDPAddress>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>1</ReqPrecedence>
+        <ReqDelay>1</ReqDelay>
+        <ReqReliability>1</ReqReliability>
+        <ReqPeakThroughput>1</ReqPeakThroughput>
+        <ReqMeanThroughput>1</ReqMeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNameServer1>0.0.0.0</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+    </IncomingGPRS>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+    <OutgoingGPRS operation="add">
+        <Name>NTRas GPRS</Name>
+        <APN>Test</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>2</ReqPrecedence>
+        <ReqDelay>4</ReqDelay>
+        <ReqReliability>3</ReqReliability>
+        <ReqPeakThroughput>3</ReqPeakThroughput>
+        <ReqMeanThroughput>31</ReqMeanThroughput>
+        <MinPrecedence>2</MinPrecedence>
+        <MinDelay>4</MinDelay>
+        <MinReliability>3</MinReliability>
+        <MinPeakThroughput>3</MinPeakThroughput>
+        <MinMeanThroughput>31</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.51</IpNameServer2>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+    </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+    <DefaultGPRS operation="add">
+        <Name>Dummy Default GPRS Settings</Name>
+        <APN>Access point name</APN>
+        <PDPType>IPV6</PDPType>
+        <PDPAddress>www.wid.com</PDPAddress>
+        <Usage>1</Usage>
+        <Precedence>1</Precedence>
+        <Delay>1</Delay>
+        <Reliability>1</Reliability>
+        <PeakThroughput>1</PeakThroughput>
+        <MeanThroughput>1</MeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+    </DefaultGPRS>
+</DefaultGPRSTable>
+
+<ProxyTable>
+    <Proxy operation="add">
+        <Name>ProxyTable1</Name>
+        <ISPRef>DialOutISP.NT RAS</ISPRef>
+        <UseProxyServer>TRUE</UseProxyServer>
+        <ProtocolName>http</ProtocolName>
+        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
+        <PortNumber>80</PortNumber>
+        <Exceptions>www.dummyproxy.com/exception</Exceptions>
+    </Proxy>
+</ProxyTable>
+
+<LocationTable>
+    <Location operation="template">
+        <Name>Default Location</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+        <DialOutCode>9,</DialOutCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office Direct Dial</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+    </Location>
+    <Location operation="add">
+        <Name>Mobile</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Home</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>TRUE</UsePulseDial>
+        <WaitForDialTone>TRUE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>181</AreaCode>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable1</Name>
+        <ProtocolName>ssl3.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable2</Name>
+        <ProtocolName>tls1.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+    <WAPAccessPoint operation="template">
+        <Name>Default Dial In ISP</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+    </WAPAccessPoint>
+    <WAPAccessPoint operation="add">
+        <Name>Dummy WAP Settings</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+        <StartPage>www.wapstart.com</StartPage>
+    </WAPAccessPoint>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+    <WAPIPBearer operation="template">
+        <Name>WAPIPBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.-1</IAPRef>
+        <ProxyPortNumber>0</ProxyPortNumber>
+    </WAPIPBearer>
+    <WAPIPBearer operation="add">
+        <Name>WAPIPBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>www.wapgateway.com</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.NTRas GPRS</IAPRef>
+        <ProxyPortNumber>1</ProxyPortNumber>
+    </WAPIPBearer>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+    <WAPSMSBearer operation="template">
+        <Name>WAPSMSBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+    </WAPSMSBearer>
+    <WAPSMSBearer operation="add">
+        <Name>WAPSMSBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>+4412345678901</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/te_cdb_udeb.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,2119 @@
+//
+// 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:
+//
+//
+//
+PRINT example CommDb test
+PRINT
+//Do all our moving round & making databases first
+
+//run_script z:\TestData\scripts\esock_test_unloadesock.script
+
+//LOAD_SUITE TE_Esock.dll
+
+run_utils copyfile z:\testdata\configs\default5.dat c:\corrupt.dat
+
+//Ready to go.
+//run protection tests
+run_script z:\testdata\scripts\test_all_protection
+
+LOAD_SUITE te_commdb
+
+// ced processing tests.
+
+//run_script z:\TestData\scripts\esock_test_unloadesock.script
+
+CED z:\testdata\configs\061_01.xml -f
+
+START_TESTCASE			COMINF-commdb-0101
+//! @SYMTestCaseID		COMINF-commdb-0101
+RUN_TEST_STEP 100000 te_commdb step_061_01
+END_TESTCASE			COMINF-commdb-0101
+
+CED z:\testdata\configs\061_02.xml -f
+
+START_TESTCASE			COMINF-commdb-0102
+//! @SYMTestCaseID		COMINF-commdb-0102
+RUN_TEST_STEP 100000 te_commdb step_061_02
+END_TESTCASE			COMINF-commdb-0102
+
+CED z:\testdata\configs\061_03.xml -f
+
+START_TESTCASE			COMINF-commdb-0103
+//! @SYMTestCaseID		COMINF-commdb-0103
+RUN_TEST_STEP 100000 te_commdb step_061_03
+END_TESTCASE			COMINF-commdb-0103
+
+CED z:\testdata\configs\061_04.xml -f
+
+START_TESTCASE			COMINF-commdb-0104
+//! @SYMTestCaseID		COMINF-commdb-0104
+RUN_TEST_STEP 100000 te_commdb step_061_04
+END_TESTCASE			COMINF-commdb-0104
+
+// finished ced processing tests.
+
+// database creation tests
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0105
+//! @SYMTestCaseID		COMINF-commdb-0105
+RUN_TEST_STEP 100000 te_commdb step_001_01
+END_TESTCASE			COMINF-commdb-0105
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0106
+//! @SYMTestCaseID		COMINF-commdb-0106
+RUN_TEST_STEP 100000 te_commdb step_001_03
+END_TESTCASE			COMINF-commdb-0106
+
+CED z:\testdata\configs\corrupt.xml -f
+
+// Note - this test modified for 9.1 as manipulates cdbv3.dat file
+START_TESTCASE			COMINF-commdb-0107
+//! @SYMTestCaseID		COMINF-commdb-0107
+RUN_TEST_STEP 100000 te_commdb step_001_04
+END_TESTCASE			COMINF-commdb-0107
+
+START_TESTCASE			COMINF-commdb-0108
+//! @SYMTestCaseID		COMINF-commdb-0108
+RUN_TEST_STEP 100000 te_commdb step_001_05
+END_TESTCASE			COMINF-commdb-0108
+
+START_TESTCASE			COMINF-commdb-0109
+//! @SYMTestCaseID		COMINF-commdb-0109
+RUN_TEST_STEP 100000 te_commdb step_001_07
+END_TESTCASE			COMINF-commdb-0109
+
+START_TESTCASE			COMINF-commdb-0110
+//! @SYMTestCaseID		COMINF-commdb-0110
+RUN_TEST_STEP 100000 te_commdb step_001_08
+END_TESTCASE			COMINF-commdb-0110
+
+START_TESTCASE			COMINF-commdb-0111
+//! @SYMTestCaseID		COMINF-commdb-0111
+RUN_TEST_STEP 100000 te_commdb step_001_09
+END_TESTCASE			COMINF-commdb-0111
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0112
+//! @SYMTestCaseID		COMINF-commdb-0112
+RUN_TEST_STEP 1000000 te_commdb step_001_10
+END_TESTCASE			COMINF-commdb-0112
+
+START_TESTCASE			COMINF-commdb-0113
+//! @SYMTestCaseID		COMINF-commdb-0113
+RUN_TEST_STEP 100000 te_commdb step_002_01
+END_TESTCASE			COMINF-commdb-0113
+
+// finished database creation tests
+
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
+
+START_TESTCASE			COMINF-commdb-0114
+//! @SYMTestCaseID		COMINF-commdb-0114
+RUN_TEST_STEP 100000 te_commdb step_003_01
+END_TESTCASE			COMINF-commdb-0114
+
+START_TESTCASE			COMINF-commdb-0115
+//! @SYMTestCaseID		COMINF-commdb-0115
+RUN_TEST_STEP 100000 te_commdb step_003_02
+END_TESTCASE			COMINF-commdb-0115
+
+START_TESTCASE			COMINF-commdb-0116
+//! @SYMTestCaseID		COMINF-commdb-0116
+RUN_TEST_STEP 100000 te_commdb step_003_03
+END_TESTCASE			COMINF-commdb-0116
+
+START_TESTCASE			COMINF-commdb-0117
+//! @SYMTestCaseID		COMINF-commdb-0117
+RUN_PANIC_STEP 100000 te_commdb step_003_04
+END_TESTCASE			COMINF-commdb-0117
+
+START_TESTCASE			COMINF-commdb-0118
+//! @SYMTestCaseID		COMINF-commdb-0118
+RUN_TEST_STEP 100000 te_commdb step_003_05
+END_TESTCASE			COMINF-commdb-0118
+
+START_TESTCASE			COMINF-commdb-0119
+//! @SYMTestCaseID		COMINF-commdb-0119
+RUN_TEST_STEP 100000 te_commdb step_003_06
+END_TESTCASE			COMINF-commdb-0119
+
+START_TESTCASE			COMINF-commdb-0120
+//! @SYMTestCaseID		COMINF-commdb-0120
+RUN_TEST_STEP 1000000 te_commdb step_003_07 
+END_TESTCASE			COMINF-commdb-0120
+
+START_TESTCASE			COMINF-commdb-0121
+//! @SYMTestCaseID		COMINF-commdb-0121
+RUN_PANIC_STEP 1000000 te_commdb step_003_08 
+END_TESTCASE			COMINF-commdb-0121
+
+START_TESTCASE			COMINF-commdb-0122
+//! @SYMTestCaseID		COMINF-commdb-0122
+RUN_TEST_STEP 100000 te_commdb step_004_01
+END_TESTCASE			COMINF-commdb-0122
+
+START_TESTCASE			COMINF-commdb-0123
+//! @SYMTestCaseID		COMINF-commdb-0123
+RUN_PANIC_STEP 100000 te_commdb step_004_02
+END_TESTCASE			COMINF-commdb-0123
+
+START_TESTCASE			COMINF-commdb-0124
+//! @SYMTestCaseID		COMINF-commdb-0124
+RUN_PANIC_STEP 100000 te_commdb step_004_03
+END_TESTCASE			COMINF-commdb-0124
+
+START_TESTCASE			COMINF-commdb-0125
+//! @SYMTestCaseID		COMINF-commdb-0125
+RUN_TEST_STEP 1000000 te_commdb step_004_04
+END_TESTCASE			COMINF-commdb-0125
+
+START_TESTCASE			COMINF-commdb-0126
+//! @SYMTestCaseID		COMINF-commdb-0126
+RUN_PANIC_STEP 1000000 te_commdb step_004_05
+END_TESTCASE			COMINF-commdb-0126
+
+START_TESTCASE			COMINF-commdb-0127
+//! @SYMTestCaseID		COMINF-commdb-0127
+RUN_PANIC_STEP 1000000 te_commdb step_004_06
+END_TESTCASE			COMINF-commdb-0127
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0128
+//! @SYMTestCaseID		COMINF-commdb-0128
+RUN_TEST_STEP 100000 te_commdb step_005_01
+END_TESTCASE			COMINF-commdb-0128
+
+START_TESTCASE			COMINF-commdb-0129
+//! @SYMTestCaseID		COMINF-commdb-0129
+RUN_TEST_STEP 100000 te_commdb step_005_02
+END_TESTCASE			COMINF-commdb-0129
+
+START_TESTCASE			COMINF-commdb-0130
+//! @SYMTestCaseID		COMINF-commdb-0130
+RUN_TEST_STEP 100000 te_commdb step_005_03
+END_TESTCASE			COMINF-commdb-0130
+
+START_TESTCASE			COMINF-commdb-0131
+//! @SYMTestCaseID		COMINF-commdb-0131
+RUN_TEST_STEP 1000000 te_commdb step_005_04
+END_TESTCASE			COMINF-commdb-0131
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0132
+//! @SYMTestCaseID		COMINF-commdb-0132
+RUN_TEST_STEP 100000 te_commdb step_006_01
+END_TESTCASE			COMINF-commdb-0132
+
+START_TESTCASE			COMINF-commdb-0133
+//! @SYMTestCaseID		COMINF-commdb-0133
+RUN_TEST_STEP 100000 te_commdb step_006_02
+END_TESTCASE			COMINF-commdb-0133
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0134
+//! @SYMTestCaseID		COMINF-commdb-0134
+RUN_TEST_STEP 100000 te_commdb step_006_03
+END_TESTCASE			COMINF-commdb-0134
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0135
+//! @SYMTestCaseID		COMINF-commdb-0135
+RUN_TEST_STEP 100000 te_commdb step_006_04
+
+CED z:\testdata\configs\default1.xml -f
+
+END_TESTCASE			COMINF-commdb-0135
+
+START_TESTCASE			COMINF-commdb-0136
+//! @SYMTestCaseID		COMINF-commdb-0136
+RUN_TEST_STEP 1000000 te_commdb step_006_05
+END_TESTCASE			COMINF-commdb-0136
+      
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0137
+//! @SYMTestCaseID		COMINF-commdb-0137
+RUN_TEST_STEP 100000 te_commdb step_007_01
+END_TESTCASE			COMINF-commdb-0137
+
+START_TESTCASE			COMINF-commdb-0138
+//! @SYMTestCaseID		COMINF-commdb-0138
+RUN_TEST_STEP 100000 te_commdb step_007_02
+END_TESTCASE			COMINF-commdb-0138
+
+START_TESTCASE			COMINF-commdb-0139
+//! @SYMTestCaseID		COMINF-commdb-0139
+RUN_TEST_STEP 100000 te_commdb step_007_03
+END_TESTCASE			COMINF-commdb-0139
+
+START_TESTCASE			COMINF-commdb-0140
+//! @SYMTestCaseID		COMINF-commdb-0140
+RUN_TEST_STEP 100000 te_commdb step_007_04
+END_TESTCASE			COMINF-commdb-0140
+
+START_TESTCASE			COMINF-commdb-0141
+//! @SYMTestCaseID		COMINF-commdb-0141
+RUN_TEST_STEP 100000 te_commdb step_007_05
+END_TESTCASE			COMINF-commdb-0141
+
+START_TESTCASE			COMINF-commdb-0142
+//! @SYMTestCaseID		COMINF-commdb-0142
+RUN_TEST_STEP 100000 te_commdb step_007_06
+END_TESTCASE			COMINF-commdb-0142
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0143
+//! @SYMTestCaseID		COMINF-commdb-0143
+RUN_TEST_STEP 100000 te_commdb step_007_07
+END_TESTCASE			COMINF-commdb-0143
+
+START_TESTCASE			COMINF-commdb-0144
+//! @SYMTestCaseID		COMINF-commdb-0144
+RUN_TEST_STEP 100000 te_commdb step_007_08
+END_TESTCASE			COMINF-commdb-0144
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0145
+//! @SYMTestCaseID		COMINF-commdb-0145
+RUN_TEST_STEP 100000 te_commdb step_007_09
+END_TESTCASE			COMINF-commdb-0145
+
+START_TESTCASE			COMINF-commdb-0146
+//! @SYMTestCaseID		COMINF-commdb-0146
+RUN_TEST_STEP 100000 te_commdb step_007_10
+END_TESTCASE			COMINF-commdb-0146
+
+START_TESTCASE			COMINF-commdb-0147
+//! @SYMTestCaseID		COMINF-commdb-0147
+RUN_TEST_STEP 100000 te_commdb step_007_11
+END_TESTCASE			COMINF-commdb-0147
+
+START_TESTCASE			COMINF-commdb-0148
+//! @SYMTestCaseID		COMINF-commdb-0148
+RUN_TEST_STEP 100000 te_commdb step_007_12
+END_TESTCASE			COMINF-commdb-0148
+
+START_TESTCASE			COMINF-commdb-0149
+//! @SYMTestCaseID		COMINF-commdb-0149
+RUN_PANIC_STEP 100000 te_commdb step_007_14
+END_TESTCASE			COMINF-commdb-0149
+
+START_TESTCASE			COMINF-commdb-0150
+//! @SYMTestCaseID		COMINF-commdb-0150
+RUN_TEST_STEP 1000000 te_commdb step_007_15
+END_TESTCASE			COMINF-commdb-0150
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0151
+//! @SYMTestCaseID		COMINF-commdb-0151
+RUN_TEST_STEP 1000000 te_commdb step_007_16
+END_TESTCASE			COMINF-commdb-0151
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0152
+//! @SYMTestCaseID		COMINF-commdb-0152
+RUN_TEST_STEP 1000000 te_commdb step_007_17
+END_TESTCASE			COMINF-commdb-0152
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0153
+//! @SYMTestCaseID		COMINF-commdb-0153
+RUN_TEST_STEP 1000000 te_commdb step_007_18
+END_TESTCASE			COMINF-commdb-0153
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0154
+//! @SYMTestCaseID		COMINF-commdb-0154
+RUN_TEST_STEP 1000000 te_commdb step_007_19
+END_TESTCASE			COMINF-commdb-0154
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0155
+//! @SYMTestCaseID		COMINF-commdb-0155
+RUN_PANIC_STEP 1000000 te_commdb step_007_20
+END_TESTCASE			COMINF-commdb-0155
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0156
+//! @SYMTestCaseID		COMINF-commdb-0156
+RUN_TEST_STEP 100000 te_commdb step_008_01
+END_TESTCASE			COMINF-commdb-0156
+
+START_TESTCASE			COMINF-commdb-0157
+//! @SYMTestCaseID		COMINF-commdb-0157
+RUN_TEST_STEP 1000000 te_commdb step_008_02
+END_TESTCASE			COMINF-commdb-0157
+
+START_TESTCASE			COMINF-commdb-0158
+//! @SYMTestCaseID		COMINF-commdb-0158
+RUN_TEST_STEP 100000 te_commdb step_008_03
+END_TESTCASE			COMINF-commdb-0158
+
+START_TESTCASE			COMINF-commdb-0159
+//! @SYMTestCaseID		COMINF-commdb-0159
+RUN_TEST_STEP 1000000 te_commdb step_008_04
+END_TESTCASE			COMINF-commdb-0159
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0160
+//! @SYMTestCaseID		COMINF-commdb-0160
+RUN_TEST_STEP 100000 te_commdb step_009_01
+END_TESTCASE			COMINF-commdb-0160
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0161
+//! @SYMTestCaseID		COMINF-commdb-0161
+RUN_TEST_STEP 100000 te_commdb step_009_02
+END_TESTCASE			COMINF-commdb-0161
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0162
+//! @SYMTestCaseID		COMINF-commdb-0162
+RUN_TEST_STEP 100000 te_commdb step_009_03
+END_TESTCASE			COMINF-commdb-0162
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0163
+//! @SYMTestCaseID		COMINF-commdb-0163
+RUN_TEST_STEP 100000 te_commdb step_009_04
+END_TESTCASE			COMINF-commdb-0163
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0164
+//! @SYMTestCaseID		COMINF-commdb-0164
+RUN_TEST_STEP 100000 te_commdb step_009_05
+END_TESTCASE			COMINF-commdb-0164
+
+START_TESTCASE			COMINF-commdb-0165
+//! @SYMTestCaseID		COMINF-commdb-0165
+RUN_TEST_STEP 100000 te_commdb step_009_06
+END_TESTCASE			COMINF-commdb-0165
+
+START_TESTCASE			COMINF-commdb-0166
+//! @SYMTestCaseID		COMINF-commdb-0166
+RUN_PANIC_STEP 100000 te_commdb step_009_07
+END_TESTCASE			COMINF-commdb-0166
+
+START_TESTCASE			COMINF-commdb-0167
+//! @SYMTestCaseID		COMINF-commdb-0167
+RUN_PANIC_STEP 100000 te_commdb step_009_08
+END_TESTCASE			COMINF-commdb-0167
+
+START_TESTCASE			COMINF-commdb-0168
+//! @SYMTestCaseID		COMINF-commdb-0168
+RUN_TEST_STEP 100000 te_commdb step_009_09
+END_TESTCASE			COMINF-commdb-0168
+
+START_TESTCASE			COMINF-commdb-0169
+//! @SYMTestCaseID		COMINF-commdb-0169
+RUN_TEST_STEP 100000 te_commdb step_009_10
+END_TESTCASE			COMINF-commdb-0169
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0170
+//! @SYMTestCaseID		COMINF-commdb-0170
+RUN_TEST_STEP 1000000 te_commdb step_009_11
+END_TESTCASE			COMINF-commdb-0170
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0171
+//! @SYMTestCaseID		COMINF-commdb-0171
+RUN_TEST_STEP 1000000 te_commdb step_009_12
+END_TESTCASE			COMINF-commdb-0171
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0172
+//! @SYMTestCaseID		COMINF-commdb-0172
+RUN_TEST_STEP 1000000 te_commdb step_009_13
+END_TESTCASE			COMINF-commdb-0172
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0173
+//! @SYMTestCaseID		COMINF-commdb-0173
+RUN_TEST_STEP 1000000 te_commdb step_009_14
+END_TESTCASE			COMINF-commdb-0173
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0174
+//! @SYMTestCaseID		COMINF-commdb-0174
+RUN_TEST_STEP 1000000 te_commdb step_009_15
+END_TESTCASE			COMINF-commdb-0174
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0175
+//! @SYMTestCaseID		COMINF-commdb-0175
+RUN_TEST_STEP 1000000 te_commdb step_009_16
+END_TESTCASE			COMINF-commdb-0175
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0176
+//! @SYMTestCaseID		COMINF-commdb-0176
+RUN_TEST_STEP 1000000 te_commdb step_009_17
+END_TESTCASE			COMINF-commdb-0176
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0177
+//! @SYMTestCaseID		COMINF-commdb-0177
+RUN_TEST_STEP 1000000 te_commdb step_009_18
+END_TESTCASE			COMINF-commdb-0177
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0178
+//! @SYMTestCaseID		COMINF-commdb-0178
+RUN_TEST_STEP 1000000 te_commdb step_009_19
+END_TESTCASE			COMINF-commdb-0178
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0179
+//! @SYMTestCaseID		COMINF-commdb-0179
+RUN_PANIC_STEP 100000 te_commdb step_009_20
+END_TESTCASE			COMINF-commdb-0179
+
+START_TESTCASE			COMINF-commdb-0180
+//! @SYMTestCaseID		COMINF-commdb-0180
+RUN_PANIC_STEP 100000 te_commdb step_009_21
+END_TESTCASE			COMINF-commdb-0180
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0181
+//! @SYMTestCaseID		COMINF-commdb-0181
+RUN_TEST_STEP 100000 te_commdb step_010_01
+END_TESTCASE			COMINF-commdb-0181
+
+START_TESTCASE			COMINF-commdb-0182
+//! @SYMTestCaseID		COMINF-commdb-0182
+RUN_TEST_STEP 100000 te_commdb step_010_02
+END_TESTCASE			COMINF-commdb-0182
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0183
+//! @SYMTestCaseID		COMINF-commdb-0183
+RUN_TEST_STEP 100000 te_commdb step_010_03
+END_TESTCASE			COMINF-commdb-0183
+
+START_TESTCASE			COMINF-commdb-0184
+//! @SYMTestCaseID		COMINF-commdb-0184
+RUN_TEST_STEP 100000 te_commdb step_010_04
+END_TESTCASE			COMINF-commdb-0184
+
+START_TESTCASE			COMINF-commdb-0185
+//! @SYMTestCaseID		COMINF-commdb-0185
+RUN_TEST_STEP 1000000 te_commdb step_010_05
+END_TESTCASE			COMINF-commdb-0185
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0186
+//! @SYMTestCaseID		COMINF-commdb-0186
+RUN_TEST_STEP 100000 te_commdb step_011_01
+END_TESTCASE			COMINF-commdb-0186
+
+START_TESTCASE			COMINF-commdb-0187
+//! @SYMTestCaseID		COMINF-commdb-0187
+RUN_TEST_STEP 100000 te_commdb step_011_02
+END_TESTCASE			COMINF-commdb-0187
+
+START_TESTCASE			COMINF-commdb-0188
+//! @SYMTestCaseID		COMINF-commdb-0188
+RUN_TEST_STEP 100000 te_commdb step_011_03
+
+CED z:\testdata\configs\default1.xml -f
+
+END_TESTCASE			COMINF-commdb-0188
+
+START_TESTCASE			COMINF-commdb-0189
+//! @SYMTestCaseID		COMINF-commdb-0189
+RUN_TEST_STEP 1000000 te_commdb step_011_04
+END_TESTCASE			COMINF-commdb-0189
+
+
+START_TESTCASE			COMINF-commdb-0190
+//! @SYMTestCaseID		COMINF-commdb-0190
+RUN_TEST_STEP 100000 te_commdb step_013_01
+END_TESTCASE			COMINF-commdb-0190
+
+START_TESTCASE			COMINF-commdb-0191
+//! @SYMTestCaseID		COMINF-commdb-0191
+RUN_TEST_STEP 100000 te_commdb step_013_02
+END_TESTCASE			COMINF-commdb-0191
+
+START_TESTCASE			COMINF-commdb-0192
+//! @SYMTestCaseID		COMINF-commdb-0192
+RUN_TEST_STEP 100000 te_commdb step_013_03
+END_TESTCASE			COMINF-commdb-0192
+
+START_TESTCASE			COMINF-commdb-0193
+//! @SYMTestCaseID		COMINF-commdb-0193
+RUN_TEST_STEP 1000000 te_commdb step_013_04
+END_TESTCASE			COMINF-commdb-0193
+
+START_TESTCASE			COMINF-commdb-0194
+//! @SYMTestCaseID		COMINF-commdb-0194
+RUN_TEST_STEP 100000 te_commdb step_014_01
+END_TESTCASE			COMINF-commdb-0194
+
+START_TESTCASE			COMINF-commdb-0195
+//! @SYMTestCaseID		COMINF-commdb-0195
+RUN_TEST_STEP 100000 te_commdb step_014_02
+END_TESTCASE			COMINF-commdb-0195
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0196
+//! @SYMTestCaseID		COMINF-commdb-0196
+RUN_TEST_STEP 1000000 te_commdb step_014_03
+END_TESTCASE			COMINF-commdb-0196
+
+START_TESTCASE			COMINF-commdb-0197
+//! @SYMTestCaseID		COMINF-commdb-0197
+RUN_TEST_STEP 1000000 te_commdb step_014_04
+END_TESTCASE			COMINF-commdb-0197
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0198
+//! @SYMTestCaseID		COMINF-commdb-0198
+RUN_TEST_STEP 100000 te_commdb step_015_01
+END_TESTCASE			COMINF-commdb-0198
+
+START_TESTCASE			COMINF-commdb-0199
+//! @SYMTestCaseID		COMINF-commdb-0199
+RUN_TEST_STEP 100000 te_commdb step_015_02
+END_TESTCASE			COMINF-commdb-0199
+
+START_TESTCASE			COMINF-commdb-0201
+//! @SYMTestCaseID		COMINF-commdb-0201
+RUN_TEST_STEP 100000 te_commdb step_015_03
+END_TESTCASE			COMINF-commdb-0201
+
+START_TESTCASE			COMINF-commdb-0202
+//! @SYMTestCaseID		COMINF-commdb-0202
+RUN_TEST_STEP 100000 te_commdb step_015_04
+END_TESTCASE			COMINF-commdb-0202
+
+START_TESTCASE			COMINF-commdb-0203
+//! @SYMTestCaseID		COMINF-commdb-0203
+RUN_TEST_STEP 100000 te_commdb step_015_05
+END_TESTCASE			COMINF-commdb-0203
+
+START_TESTCASE			COMINF-commdb-0204
+//! @SYMTestCaseID		COMINF-commdb-0204
+RUN_PANIC_STEP 100000 te_commdb step_015_06
+
+END_TESTCASE			COMINF-commdb-0204
+
+START_TESTCASE			COMINF-commdb-0205
+//! @SYMTestCaseID		COMINF-commdb-0205
+RUN_TEST_STEP 100000 te_commdb step_015_07
+END_TESTCASE			COMINF-commdb-0205
+
+START_TESTCASE			COMINF-commdb-0206
+//! @SYMTestCaseID		COMINF-commdb-0206
+RUN_TEST_STEP 100000 te_commdb step_015_08
+END_TESTCASE			COMINF-commdb-0206
+
+START_TESTCASE			COMINF-commdb-0207
+//! @SYMTestCaseID		COMINF-commdb-0207
+RUN_TEST_STEP 1000000 te_commdb step_015_09
+END_TESTCASE			COMINF-commdb-0207
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0208
+//! @SYMTestCaseID		COMINF-commdb-0208
+RUN_TEST_STEP 1000000 te_commdb step_015_10
+END_TESTCASE			COMINF-commdb-0208
+
+START_TESTCASE			COMINF-commdb-0209
+//! @SYMTestCaseID		COMINF-commdb-0209
+RUN_TEST_STEP 1000000 te_commdb step_015_11
+END_TESTCASE			COMINF-commdb-0209
+
+START_TESTCASE			COMINF-commdb-0210
+//! @SYMTestCaseID		COMINF-commdb-0210
+RUN_TEST_STEP 1000000 te_commdb step_015_12
+END_TESTCASE			COMINF-commdb-0210
+
+START_TESTCASE			COMINF-commdb-0211
+//! @SYMTestCaseID		COMINF-commdb-0211
+RUN_TEST_STEP 1000000 te_commdb step_015_13  
+END_TESTCASE			COMINF-commdb-0211
+
+START_TESTCASE			COMINF-commdb-0212
+//! @SYMTestCaseID		COMINF-commdb-0212                           
+RUN_TEST_STEP 1000000 te_commdb step_015_14
+END_TESTCASE			COMINF-commdb-0212
+
+START_TESTCASE			COMINF-commdb-0213
+//! @SYMTestCaseID		COMINF-commdb-0213
+RUN_TEST_STEP 1000000 te_commdb step_015_15 
+END_TESTCASE			COMINF-commdb-0213
+
+START_TESTCASE			COMINF-commdb-0214
+//! @SYMTestCaseID		COMINF-commdb-0214                          
+RUN_TEST_STEP 1000000 te_commdb step_015_16
+END_TESTCASE			COMINF-commdb-0214
+
+CED z:\testdata\configs\default1.xml -f
+
+// TODO - these 7 tests should pass - are failing because of notifications
+
+START_TESTCASE			COMINF-commdb-0215
+//! @SYMTestCaseID		COMINF-commdb-0215
+RUN_TEST_STEP 100000 te_commdb step_016_01
+END_TESTCASE			COMINF-commdb-0215
+
+START_TESTCASE			COMINF-commdb-0216
+//! @SYMTestCaseID		COMINF-commdb-0216
+RUN_TEST_STEP 100000 te_commdb step_016_02
+END_TESTCASE			COMINF-commdb-0216
+
+START_TESTCASE			COMINF-commdb-0217
+//! @SYMTestCaseID		COMINF-commdb-0217
+RUN_TEST_STEP 100000 te_commdb step_016_04
+END_TESTCASE			COMINF-commdb-0217
+
+START_TESTCASE			COMINF-commdb-0218
+//! @SYMTestCaseID		COMINF-commdb-0218
+RUN_TEST_STEP 100000 te_commdb step_016_05
+END_TESTCASE			COMINF-commdb-0218
+
+START_TESTCASE			COMINF-commdb-0219
+//! @SYMTestCaseID		COMINF-commdb-0219
+RUN_TEST_STEP 100000 te_commdb step_016_07
+END_TESTCASE			COMINF-commdb-0219
+
+START_TESTCASE			COMINF-commdb-0220
+//! @SYMTestCaseID		COMINF-commdb-0220
+RUN_TEST_STEP 100000 te_commdb step_016_08
+END_TESTCASE			COMINF-commdb-0220
+
+START_TESTCASE			COMINF-commdb-0221
+//! @SYMTestCaseID		COMINF-commdb-0221
+RUN_TEST_STEP 2000000 te_commdb step_016_09
+END_TESTCASE			COMINF-commdb-0221
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0222
+//! @SYMTestCaseID		COMINF-commdb-0222
+RUN_TEST_STEP 100000 te_commdb step_017_01
+END_TESTCASE			COMINF-commdb-0222
+
+CED z:\testdata\configs\default1.xml -f
+
+// These 5 steps should pass - notifications
+
+START_TESTCASE			COMINF-commdb-0223
+//! @SYMTestCaseID		COMINF-commdb-0223
+RUN_TEST_STEP 100000 te_commdb step_017_02
+END_TESTCASE			COMINF-commdb-0223
+
+//CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0224
+//! @SYMTestCaseID		COMINF-commdb-0224
+RUN_TEST_STEP 100000 te_commdb step_017_03
+END_TESTCASE			COMINF-commdb-0224
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0225
+//! @SYMTestCaseID		COMINF-commdb-0225
+RUN_TEST_STEP 100000 te_commdb step_017_04
+END_TESTCASE			COMINF-commdb-0225
+
+
+//CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0226
+//! @SYMTestCaseID		COMINF-commdb-0226
+RUN_TEST_STEP 2000000 te_commdb step_017_05
+END_TESTCASE			COMINF-commdb-0226
+
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0227
+//! @SYMTestCaseID		COMINF-commdb-0227
+RUN_TEST_STEP 2000000 te_commdb step_017_06
+END_TESTCASE			COMINF-commdb-0227
+
+START_TESTCASE			COMINF-commdb-0228
+//! @SYMTestCaseID		COMINF-commdb-0228
+RUN_TEST_STEP 2000000 te_commdb step_017_07
+END_TESTCASE			COMINF-commdb-0228
+
+START_TESTCASE			COMINF-commdb-0229
+//! @SYMTestCaseID		COMINF-commdb-0229
+RUN_TEST_STEP 100000 te_commdb step_018_01
+END_TESTCASE			COMINF-commdb-0229
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0230
+//! @SYMTestCaseID		COMINF-commdb-0230
+RUN_TEST_STEP 100000 te_commdb step_018_02
+END_TESTCASE			COMINF-commdb-0230
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0231
+//! @SYMTestCaseID		COMINF-commdb-0231
+RUN_TEST_STEP 100000 te_commdb step_018_03
+END_TESTCASE			COMINF-commdb-0231
+
+START_TESTCASE			COMINF-commdb-0232
+//! @SYMTestCaseID		COMINF-commdb-0232
+RUN_TEST_STEP 1000000 te_commdb step_018_04
+END_TESTCASE			COMINF-commdb-0232
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0233
+//! @SYMTestCaseID		COMINF-commdb-0233
+RUN_TEST_STEP 1000000 te_commdb step_018_05
+END_TESTCASE			COMINF-commdb-0233
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0234
+//! @SYMTestCaseID		COMINF-commdb-0234
+RUN_TEST_STEP 1000000 te_commdb step_018_06
+END_TESTCASE			COMINF-commdb-0234
+
+START_TESTCASE			COMINF-commdb-0235
+//! @SYMTestCaseID		COMINF-commdb-0235
+RUN_TEST_STEP 1000000 te_commdb step_018_07
+END_TESTCASE			COMINF-commdb-0235
+
+START_TESTCASE			COMINF-commdb-0236
+//! @SYMTestCaseID		COMINF-commdb-0236
+RUN_TEST_STEP 1000000 te_commdb step_018_08
+END_TESTCASE			COMINF-commdb-0236
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0237
+//! @SYMTestCaseID		COMINF-commdb-0237
+RUN_TEST_STEP 100000 te_commdb step_019_01
+END_TESTCASE			COMINF-commdb-0237
+
+START_TESTCASE			COMINF-commdb-0238
+//! @SYMTestCaseID		COMINF-commdb-0238
+RUN_TEST_STEP 100000 te_commdb step_019_02
+END_TESTCASE			COMINF-commdb-0238
+
+START_TESTCASE			COMINF-commdb-0239
+//! @SYMTestCaseID		COMINF-commdb-0239
+RUN_TEST_STEP 100000 te_commdb step_019_03
+END_TESTCASE			COMINF-commdb-0239
+
+START_TESTCASE			COMINF-commdb-0240
+//! @SYMTestCaseID		COMINF-commdb-0240
+RUN_TEST_STEP 100000 te_commdb step_019_04
+END_TESTCASE			COMINF-commdb-0240
+
+START_TESTCASE			COMINF-commdb-0241
+//! @SYMTestCaseID		COMINF-commdb-0241
+RUN_TEST_STEP 100000 te_commdb step_019_05
+END_TESTCASE			COMINF-commdb-0241
+
+START_TESTCASE			COMINF-commdb-0242
+//! @SYMTestCaseID		COMINF-commdb-0242
+RUN_TEST_STEP 100000 te_commdb step_019_06
+END_TESTCASE			COMINF-commdb-0242
+
+START_TESTCASE			COMINF-commdb-0243
+//! @SYMTestCaseID		COMINF-commdb-0243
+RUN_TEST_STEP 100000 te_commdb step_019_07
+END_TESTCASE			COMINF-commdb-0243
+
+START_TESTCASE			COMINF-commdb-0244
+//! @SYMTestCaseID		COMINF-commdb-0244
+RUN_TEST_STEP 1000000 te_commdb step_019_08
+END_TESTCASE			COMINF-commdb-0244
+
+CED z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0245
+//! @SYMTestCaseID		COMINF-commdb-0245
+RUN_TEST_STEP 1000000 te_commdb step_019_09
+END_TESTCASE			COMINF-commdb-0245
+
+START_TESTCASE			COMINF-commdb-0246
+//! @SYMTestCaseID		COMINF-commdb-0246
+RUN_TEST_STEP 1000000 te_commdb step_019_10
+END_TESTCASE			COMINF-commdb-0246
+
+START_TESTCASE			COMINF-commdb-0247
+//! @SYMTestCaseID		COMINF-commdb-0247
+RUN_TEST_STEP 1000000 te_commdb step_019_11
+END_TESTCASE			COMINF-commdb-0247
+
+START_TESTCASE			COMINF-commdb-0248
+//! @SYMTestCaseID		COMINF-commdb-0248
+RUN_TEST_STEP 1000000 te_commdb step_019_12
+END_TESTCASE			COMINF-commdb-0248
+
+//OOM run when _19_07 is fixed
+START_TESTCASE			COMINF-commdb-0249
+//! @SYMTestCaseID		COMINF-commdb-0249
+RUN_TEST_STEP 1000000 te_commdb step_019_13
+END_TESTCASE			COMINF-commdb-0249
+
+//OOM run when 19_07 is fixed
+START_TESTCASE			COMINF-commdb-0250
+//! @SYMTestCaseID		COMINF-commdb-0250
+RUN_TEST_STEP 1000000 te_commdb step_019_14
+END_TESTCASE			COMINF-commdb-0250
+
+CED z:\testdata\configs\020.xml -f
+
+START_TESTCASE			COMINF-commdb-0251
+//! @SYMTestCaseID		COMINF-commdb-0251
+RUN_TEST_STEP 100000 te_commdb step_020_01
+END_TESTCASE			COMINF-commdb-0251
+
+START_TESTCASE			COMINF-commdb-0252
+//! @SYMTestCaseID		COMINF-commdb-0252
+RUN_TEST_STEP 100000 te_commdb step_020_02
+END_TESTCASE			COMINF-commdb-0252
+
+START_TESTCASE			COMINF-commdb-0253
+//! @SYMTestCaseID		COMINF-commdb-0253
+RUN_TEST_STEP 100000 te_commdb step_020_03
+END_TESTCASE			COMINF-commdb-0253
+
+START_TESTCASE			COMINF-commdb-0254
+//! @SYMTestCaseID		COMINF-commdb-0254
+RUN_TEST_STEP 100000 te_commdb step_020_04
+END_TESTCASE			COMINF-commdb-0254
+
+START_TESTCASE			COMINF-commdb-0255
+//! @SYMTestCaseID		COMINF-commdb-0255
+RUN_TEST_STEP 100000 te_commdb step_020_05
+END_TESTCASE			COMINF-commdb-0255
+
+START_TESTCASE			COMINF-commdb-0256
+//! @SYMTestCaseID		COMINF-commdb-0256
+RUN_TEST_STEP 100000 te_commdb step_020_06
+END_TESTCASE			COMINF-commdb-0256
+
+START_TESTCASE			COMINF-commdb-0257
+//! @SYMTestCaseID		COMINF-commdb-0257
+RUN_TEST_STEP 100000 te_commdb step_020_07
+END_TESTCASE			COMINF-commdb-0257
+
+START_TESTCASE			COMINF-commdb-0258
+//! @SYMTestCaseID		COMINF-commdb-0258
+RUN_TEST_STEP 1000000 te_commdb step_020_08
+END_TESTCASE			COMINF-commdb-0258
+
+CED z:\testdata\configs\021.xml -f
+
+START_TESTCASE			COMINF-commdb-0259
+//! @SYMTestCaseID		COMINF-commdb-0259
+RUN_TEST_STEP 100000 te_commdb step_021_01
+END_TESTCASE			COMINF-commdb-0259
+
+START_TESTCASE			COMINF-commdb-0260
+//! @SYMTestCaseID		COMINF-commdb-0260
+RUN_TEST_STEP 100000 te_commdb step_021_02
+END_TESTCASE			COMINF-commdb-0260
+
+START_TESTCASE			COMINF-commdb-0261
+//! @SYMTestCaseID		COMINF-commdb-0261
+RUN_TEST_STEP 100000 te_commdb step_021_03
+END_TESTCASE			COMINF-commdb-0261
+
+START_TESTCASE			COMINF-commdb-0262
+//! @SYMTestCaseID		COMINF-commdb-0262
+RUN_TEST_STEP 100000 te_commdb step_021_04
+
+END_TESTCASE			COMINF-commdb-0262
+
+START_TESTCASE			COMINF-commdb-0263
+//! @SYMTestCaseID		COMINF-commdb-0263
+RUN_TEST_STEP 1000000 te_commdb step_021_05
+END_TESTCASE			COMINF-commdb-0263
+
+CED z:\testdata\configs\022.xml -f
+
+START_TESTCASE			COMINF-commdb-0264
+//! @SYMTestCaseID		COMINF-commdb-0264
+RUN_TEST_STEP 100000 te_commdb step_022_01
+END_TESTCASE			COMINF-commdb-0264
+
+START_TESTCASE			COMINF-commdb-0265
+//! @SYMTestCaseID		COMINF-commdb-0265
+RUN_TEST_STEP 100000 te_commdb step_022_02
+END_TESTCASE			COMINF-commdb-0265
+
+START_TESTCASE			COMINF-commdb-0266
+//! @SYMTestCaseID		COMINF-commdb-0266
+RUN_TEST_STEP 100000 te_commdb step_022_03
+END_TESTCASE			COMINF-commdb-0266
+
+START_TESTCASE			COMINF-commdb-0267
+//! @SYMTestCaseID		COMINF-commdb-0267
+RUN_TEST_STEP 100000 te_commdb step_022_04
+END_TESTCASE			COMINF-commdb-0267
+
+START_TESTCASE			COMINF-commdb-0268
+//! @SYMTestCaseID		COMINF-commdb-0268
+RUN_TEST_STEP 100000 te_commdb step_022_05
+END_TESTCASE			COMINF-commdb-0268
+
+START_TESTCASE			COMINF-commdb-0269
+//! @SYMTestCaseID		COMINF-commdb-0269
+RUN_TEST_STEP 100000 te_commdb step_022_06
+END_TESTCASE			COMINF-commdb-0269
+
+START_TESTCASE			COMINF-commdb-0270
+//! @SYMTestCaseID		COMINF-commdb-0270
+RUN_TEST_STEP 100000 te_commdb step_022_07
+END_TESTCASE			COMINF-commdb-0270
+
+START_TESTCASE			COMINF-commdb-0271
+//! @SYMTestCaseID		COMINF-commdb-0271
+RUN_TEST_STEP 100000 te_commdb step_022_08
+END_TESTCASE			COMINF-commdb-0271
+
+START_TESTCASE			COMINF-commdb-0272
+//! @SYMTestCaseID		COMINF-commdb-0272
+RUN_TEST_STEP 100000 te_commdb step_022_09
+END_TESTCASE			COMINF-commdb-0272
+
+START_TESTCASE			COMINF-commdb-0273
+//! @SYMTestCaseID		COMINF-commdb-0273
+RUN_TEST_STEP 100000 te_commdb step_022_10
+END_TESTCASE			COMINF-commdb-0273
+
+START_TESTCASE			COMINF-commdb-0274
+//! @SYMTestCaseID		COMINF-commdb-0274
+RUN_TEST_STEP 100000 te_commdb step_022_11
+END_TESTCASE			COMINF-commdb-0274
+
+START_TESTCASE			COMINF-commdb-0275
+//! @SYMTestCaseID		COMINF-commdb-0275
+RUN_TEST_STEP 100000 te_commdb step_022_12
+END_TESTCASE			COMINF-commdb-0275
+
+START_TESTCASE			COMINF-commdb-0276
+//! @SYMTestCaseID		COMINF-commdb-0276
+RUN_TEST_STEP 100000 te_commdb step_022_13
+END_TESTCASE			COMINF-commdb-0276
+
+START_TESTCASE			COMINF-commdb-0277
+//! @SYMTestCaseID		COMINF-commdb-0277
+RUN_TEST_STEP 100000 te_commdb step_022_14
+END_TESTCASE			COMINF-commdb-0277
+
+START_TESTCASE			COMINF-commdb-0278
+//! @SYMTestCaseID		COMINF-commdb-0278
+RUN_TEST_STEP 100000 te_commdb step_022_16
+END_TESTCASE			COMINF-commdb-0278
+
+CED z:\testdata\configs\022.xml -f
+
+START_TESTCASE			COMINF-commdb-0279
+//! @SYMTestCaseID		COMINF-commdb-0279
+RUN_TEST_STEP 1000000 te_commdb step_022_17
+END_TESTCASE			COMINF-commdb-0279
+
+START_TESTCASE			COMINF-commdb-0280
+//! @SYMTestCaseID		COMINF-commdb-0280
+RUN_TEST_STEP 1000000 te_commdb step_022_18
+END_TESTCASE			COMINF-commdb-0280
+
+START_TESTCASE			COMINF-commdb-0281
+//! @SYMTestCaseID		COMINF-commdb-0281
+RUN_TEST_STEP 1000000 te_commdb step_022_19
+END_TESTCASE			COMINF-commdb-0281
+
+START_TESTCASE			COMINF-commdb-0282
+//! @SYMTestCaseID		COMINF-commdb-0282
+RUN_TEST_STEP 1000000 te_commdb step_022_20
+END_TESTCASE			COMINF-commdb-0282
+
+START_TESTCASE			COMINF-commdb-0283
+//! @SYMTestCaseID		COMINF-commdb-0283
+RUN_TEST_STEP 1000000 te_commdb step_022_21
+END_TESTCASE			COMINF-commdb-0283
+
+START_TESTCASE			COMINF-commdb-0284
+//! @SYMTestCaseID		COMINF-commdb-0284
+RUN_TEST_STEP 1000000 te_commdb step_022_22
+END_TESTCASE			COMINF-commdb-0284
+
+START_TESTCASE			COMINF-commdb-0285
+//! @SYMTestCaseID		COMINF-commdb-0285
+RUN_TEST_STEP 1000000 te_commdb step_022_23
+END_TESTCASE			COMINF-commdb-0285
+
+START_TESTCASE			COMINF-commdb-0286
+//! @SYMTestCaseID		COMINF-commdb-0286
+RUN_TEST_STEP 1000000 te_commdb step_022_24
+END_TESTCASE			COMINF-commdb-0286
+
+START_TESTCASE			COMINF-commdb-0287
+//! @SYMTestCaseID		COMINF-commdb-0287
+RUN_TEST_STEP 1000000 te_commdb step_022_25
+END_TESTCASE			COMINF-commdb-0287
+
+START_TESTCASE			COMINF-commdb-0288
+//! @SYMTestCaseID		COMINF-commdb-0288
+RUN_TEST_STEP 1000000 te_commdb step_022_26
+END_TESTCASE			COMINF-commdb-0288
+
+START_TESTCASE			COMINF-commdb-0289
+//! @SYMTestCaseID		COMINF-commdb-0289
+RUN_TEST_STEP 1000000 te_commdb step_022_27
+END_TESTCASE			COMINF-commdb-0289
+
+START_TESTCASE			COMINF-commdb-0290
+//! @SYMTestCaseID		COMINF-commdb-0290
+RUN_TEST_STEP 1000000 te_commdb step_022_28
+END_TESTCASE			COMINF-commdb-0290
+
+START_TESTCASE			COMINF-commdb-0291
+//! @SYMTestCaseID		COMINF-commdb-0291
+RUN_TEST_STEP 1000000 te_commdb step_022_29
+END_TESTCASE			COMINF-commdb-0291
+
+CED z:\testdata\configs\022_30.xml -f
+START_TESTCASE			COMINF-commdb-0292
+//! @SYMTestCaseID		COMINF-commdb-0292
+RUN_TEST_STEP 1000 te_commdb step_022_30
+END_TESTCASE			COMINF-commdb-0292
+
+CED z:\testdata\configs\023.xml -f
+
+START_TESTCASE			COMINF-commdb-0293
+//! @SYMTestCaseID		COMINF-commdb-0293
+RUN_TEST_STEP 100000 te_commdb step_023_01
+END_TESTCASE			COMINF-commdb-0293
+
+START_TESTCASE			COMINF-commdb-0294
+//! @SYMTestCaseID		COMINF-commdb-0294
+RUN_TEST_STEP 100000 te_commdb step_023_02
+END_TESTCASE			COMINF-commdb-0294
+
+START_TESTCASE			COMINF-commdb-0295
+//! @SYMTestCaseID		COMINF-commdb-0295
+RUN_TEST_STEP 100000 te_commdb step_023_03
+END_TESTCASE			COMINF-commdb-0295
+
+START_TESTCASE			COMINF-commdb-0296
+//! @SYMTestCaseID		COMINF-commdb-0296
+RUN_TEST_STEP 1000000 te_commdb step_023_04
+END_TESTCASE			COMINF-commdb-0296
+
+CED z:\testdata\configs\023.xml -f
+
+START_TESTCASE			COMINF-commdb-0297
+//! @SYMTestCaseID		COMINF-commdb-0297
+RUN_TEST_STEP 1000000 te_commdb step_023_05
+END_TESTCASE			COMINF-commdb-0297
+
+START_TESTCASE			COMINF-commdb-0298
+//! @SYMTestCaseID		COMINF-commdb-0298
+RUN_TEST_STEP 1000000 te_commdb step_023_06
+END_TESTCASE			COMINF-commdb-0298
+
+CED z:\testdata\configs\024.xml -f
+
+START_TESTCASE			COMINF-commdb-0299
+//! @SYMTestCaseID		COMINF-commdb-0299
+RUN_TEST_STEP 100000 te_commdb step_024_01
+END_TESTCASE			COMINF-commdb-0299
+
+START_TESTCASE			COMINF-commdb-0301
+//! @SYMTestCaseID		COMINF-commdb-0301
+RUN_TEST_STEP 100000 te_commdb step_024_02
+END_TESTCASE			COMINF-commdb-0301
+
+START_TESTCASE			COMINF-commdb-0302
+//! @SYMTestCaseID		COMINF-commdb-0302
+RUN_TEST_STEP 100000 te_commdb step_024_03
+END_TESTCASE			COMINF-commdb-0302
+
+START_TESTCASE			COMINF-commdb-0303
+//! @SYMTestCaseID		COMINF-commdb-0303
+RUN_TEST_STEP 100000 te_commdb step_024_04
+END_TESTCASE			COMINF-commdb-0303
+
+START_TESTCASE			COMINF-commdb-0304
+//! @SYMTestCaseID		COMINF-commdb-0304
+RUN_TEST_STEP 100000 te_commdb step_024_05
+END_TESTCASE			COMINF-commdb-0304
+
+START_TESTCASE			COMINF-commdb-0305
+//! @SYMTestCaseID		COMINF-commdb-0305
+RUN_TEST_STEP 100000 te_commdb step_024_06
+END_TESTCASE			COMINF-commdb-0305
+
+START_TESTCASE			COMINF-commdb-0306
+//! @SYMTestCaseID		COMINF-commdb-0306
+RUN_TEST_STEP 100000 te_commdb step_024_07
+END_TESTCASE			COMINF-commdb-0306
+
+START_TESTCASE			COMINF-commdb-0307
+//! @SYMTestCaseID		COMINF-commdb-0307
+RUN_TEST_STEP 100000 te_commdb step_024_08
+END_TESTCASE			COMINF-commdb-0307
+
+START_TESTCASE			COMINF-commdb-0308
+//! @SYMTestCaseID		COMINF-commdb-0308
+RUN_TEST_STEP 1000000 te_commdb step_024_09
+END_TESTCASE			COMINF-commdb-0308
+
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0309
+//! @SYMTestCaseID		COMINF-commdb-0309
+RUN_TEST_STEP 100000 te_commdb step_025_01
+END_TESTCASE			COMINF-commdb-0309
+
+START_TESTCASE			COMINF-commdb-0310
+//! @SYMTestCaseID		COMINF-commdb-0310
+RUN_TEST_STEP 1000000 te_commdb step_025_02
+END_TESTCASE			COMINF-commdb-0310
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0311
+//! @SYMTestCaseID		COMINF-commdb-0311
+RUN_TEST_STEP 100000 te_commdb step_026_01
+
+END_TESTCASE			COMINF-commdb-0311
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0312
+//! @SYMTestCaseID		COMINF-commdb-0312
+RUN_TEST_STEP 100000 te_commdb step_026_02
+END_TESTCASE			COMINF-commdb-0312
+
+START_TESTCASE			COMINF-commdb-0313
+//! @SYMTestCaseID		COMINF-commdb-0313
+RUN_TEST_STEP 100000 te_commdb step_026_03
+END_TESTCASE			COMINF-commdb-0313
+
+START_TESTCASE			COMINF-commdb-0314
+//! @SYMTestCaseID		COMINF-commdb-0314
+RUN_TEST_STEP 100000 te_commdb step_026_04
+END_TESTCASE			COMINF-commdb-0314
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0315
+//! @SYMTestCaseID		COMINF-commdb-0315
+RUN_TEST_STEP 100000 te_commdb step_026_05
+END_TESTCASE			COMINF-commdb-0315
+
+START_TESTCASE			COMINF-commdb-0316
+//! @SYMTestCaseID		COMINF-commdb-0316
+RUN_TEST_STEP 100000 te_commdb step_026_06
+END_TESTCASE			COMINF-commdb-0316
+
+START_TESTCASE			COMINF-commdb-0317
+//! @SYMTestCaseID		COMINF-commdb-0317
+RUN_TEST_STEP 100000 te_commdb step_026_07
+END_TESTCASE			COMINF-commdb-0317
+
+START_TESTCASE			COMINF-commdb-0318
+//! @SYMTestCaseID		COMINF-commdb-0318
+RUN_TEST_STEP 100000 te_commdb step_026_08
+END_TESTCASE			COMINF-commdb-0318
+
+START_TESTCASE			COMINF-commdb-0319
+//! @SYMTestCaseID		COMINF-commdb-0319
+RUN_TEST_STEP 1000000 te_commdb step_026_09
+END_TESTCASE			COMINF-commdb-0319
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0320
+//! @SYMTestCaseID		COMINF-commdb-0320
+RUN_TEST_STEP 1000000 te_commdb step_026_10
+END_TESTCASE			COMINF-commdb-0320
+
+START_TESTCASE			COMINF-commdb-0321
+//! @SYMTestCaseID		COMINF-commdb-0321
+RUN_TEST_STEP 1000000 te_commdb step_026_11
+END_TESTCASE			COMINF-commdb-0321
+
+START_TESTCASE			COMINF-commdb-0322
+//! @SYMTestCaseID		COMINF-commdb-0322
+RUN_TEST_STEP 1000000 te_commdb step_026_12
+END_TESTCASE			COMINF-commdb-0322
+
+START_TESTCASE			COMINF-commdb-0323
+//! @SYMTestCaseID		COMINF-commdb-0323
+RUN_TEST_STEP 1000000 te_commdb step_026_13
+END_TESTCASE			COMINF-commdb-0323
+
+//OOM run when 26_06 is fixed
+START_TESTCASE			COMINF-commdb-0324
+//! @SYMTestCaseID		COMINF-commdb-0324
+RUN_TEST_STEP 1000000 te_commdb step_026_14
+END_TESTCASE			COMINF-commdb-0324
+
+START_TESTCASE			COMINF-commdb-0325
+//! @SYMTestCaseID		COMINF-commdb-0325
+RUN_TEST_STEP 1000000 te_commdb step_026_15
+END_TESTCASE			COMINF-commdb-0325
+
+START_TESTCASE			COMINF-commdb-0326
+//! @SYMTestCaseID		COMINF-commdb-0326
+RUN_TEST_STEP 1000000 te_commdb step_026_16
+
+END_TESTCASE			COMINF-commdb-0326
+
+CED z:\testdata\configs\022.xml -f
+
+START_TESTCASE			COMINF-commdb-0327
+//! @SYMTestCaseID		COMINF-commdb-0327
+RUN_TEST_STEP 100000 te_commdb step_027_01
+END_TESTCASE			COMINF-commdb-0327
+
+START_TESTCASE			COMINF-commdb-0328
+//! @SYMTestCaseID		COMINF-commdb-0328
+RUN_TEST_STEP 1000000 te_commdb step_027_02
+END_TESTCASE			COMINF-commdb-0328
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0329
+//! @SYMTestCaseID		COMINF-commdb-0329
+RUN_TEST_STEP 100000 te_commdb step_028_01
+END_TESTCASE			COMINF-commdb-0329
+ 
+START_TESTCASE			COMINF-commdb-0330
+//! @SYMTestCaseID		COMINF-commdb-0330
+RUN_TEST_STEP 100000 te_commdb step_028_02
+END_TESTCASE			COMINF-commdb-0330
+
+START_TESTCASE			COMINF-commdb-0331
+//! @SYMTestCaseID		COMINF-commdb-0331
+RUN_TEST_STEP 100000 te_commdb step_028_03
+END_TESTCASE			COMINF-commdb-0331
+
+START_TESTCASE			COMINF-commdb-0332
+//! @SYMTestCaseID		COMINF-commdb-0332
+RUN_TEST_STEP 100000 te_commdb step_028_04
+END_TESTCASE			COMINF-commdb-0332
+
+START_TESTCASE			COMINF-commdb-0333
+//! @SYMTestCaseID		COMINF-commdb-0333
+RUN_TEST_STEP 100000 te_commdb step_028_05
+END_TESTCASE			COMINF-commdb-0333
+
+START_TESTCASE			COMINF-commdb-0334
+//! @SYMTestCaseID		COMINF-commdb-0334
+RUN_TEST_STEP 100000 te_commdb step_028_06
+END_TESTCASE			COMINF-commdb-0334
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0335
+//! @SYMTestCaseID		COMINF-commdb-0335
+RUN_TEST_STEP 1000000 te_commdb step_028_07
+END_TESTCASE			COMINF-commdb-0335
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0336
+//! @SYMTestCaseID		COMINF-commdb-0336
+RUN_TEST_STEP 100000 te_commdb step_029_01
+END_TESTCASE			COMINF-commdb-0336
+ 
+START_TESTCASE			COMINF-commdb-0337
+//! @SYMTestCaseID		COMINF-commdb-0337
+RUN_TEST_STEP 100000 te_commdb step_029_02
+END_TESTCASE			COMINF-commdb-0337
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0338
+//! @SYMTestCaseID		COMINF-commdb-0338
+RUN_TEST_STEP 100000 te_commdb step_029_03
+END_TESTCASE			COMINF-commdb-0338
+
+START_TESTCASE			COMINF-commdb-0339
+//! @SYMTestCaseID		COMINF-commdb-0339
+RUN_TEST_STEP 1000000 te_commdb step_029_04
+END_TESTCASE			COMINF-commdb-0339
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0340
+//! @SYMTestCaseID		COMINF-commdb-0340
+RUN_TEST_STEP 100000 te_commdb step_030_01
+END_TESTCASE			COMINF-commdb-0340
+
+START_TESTCASE			COMINF-commdb-0341
+//! @SYMTestCaseID		COMINF-commdb-0341
+RUN_TEST_STEP 100000 te_commdb step_030_02
+END_TESTCASE			COMINF-commdb-0341
+
+CED z:\testdata\configs\default3.xml -f
+START_TESTCASE			COMINF-commdb-0342
+//! @SYMTestCaseID		COMINF-commdb-0342
+RUN_TEST_STEP 1000000 te_commdb step_030_03
+END_TESTCASE			COMINF-commdb-0342
+
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0343
+//! @SYMTestCaseID		COMINF-commdb-0343
+RUN_TEST_STEP 100000 te_commdb step_031_01
+END_TESTCASE			COMINF-commdb-0343
+
+START_TESTCASE			COMINF-commdb-0344
+//! @SYMTestCaseID		COMINF-commdb-0344
+RUN_TEST_STEP 100000 te_commdb step_031_02
+END_TESTCASE			COMINF-commdb-0344
+
+START_TESTCASE			COMINF-commdb-0345
+//! @SYMTestCaseID		COMINF-commdb-0345
+RUN_TEST_STEP 100000 te_commdb step_031_03
+END_TESTCASE			COMINF-commdb-0345
+
+START_TESTCASE			COMINF-commdb-0346
+//! @SYMTestCaseID		COMINF-commdb-0346
+RUN_TEST_STEP 100000 te_commdb step_031_04
+END_TESTCASE			COMINF-commdb-0346
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0347
+//! @SYMTestCaseID		COMINF-commdb-0347
+RUN_TEST_STEP 1000000 te_commdb step_031_05
+END_TESTCASE			COMINF-commdb-0347
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0348
+//! @SYMTestCaseID		COMINF-commdb-0348
+RUN_TEST_STEP 100000 te_commdb step_032_01
+END_TESTCASE			COMINF-commdb-0348
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0349
+//! @SYMTestCaseID		COMINF-commdb-0349
+RUN_TEST_STEP 100000 te_commdb step_032_02
+END_TESTCASE			COMINF-commdb-0349
+
+START_TESTCASE			COMINF-commdb-0350
+//! @SYMTestCaseID		COMINF-commdb-0350
+RUN_TEST_STEP 100000 te_commdb step_032_03
+END_TESTCASE			COMINF-commdb-0350
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0351
+//! @SYMTestCaseID		COMINF-commdb-0351
+RUN_TEST_STEP 1000000 te_commdb step_032_04
+END_TESTCASE			COMINF-commdb-0351
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0352
+//! @SYMTestCaseID		COMINF-commdb-0352
+RUN_TEST_STEP 1000000 te_commdb step_032_05
+END_TESTCASE			COMINF-commdb-0352
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0353
+//! @SYMTestCaseID		COMINF-commdb-0353
+RUN_TEST_STEP 100000 te_commdb step_033_01
+END_TESTCASE			COMINF-commdb-0353
+
+START_TESTCASE			COMINF-commdb-0354
+//! @SYMTestCaseID		COMINF-commdb-0354
+RUN_TEST_STEP 100000 te_commdb step_033_02
+END_TESTCASE			COMINF-commdb-0354
+
+START_TESTCASE			COMINF-commdb-0355
+//! @SYMTestCaseID		COMINF-commdb-0355
+RUN_TEST_STEP 100000 te_commdb step_033_03
+END_TESTCASE			COMINF-commdb-0355
+
+START_TESTCASE			COMINF-commdb-0356
+//! @SYMTestCaseID		COMINF-commdb-0356
+RUN_TEST_STEP 100000 te_commdb step_033_04
+END_TESTCASE			COMINF-commdb-0356
+
+CED z:\testdata\configs\default3.xml -f
+//OOM run when 33_01 is fixed
+START_TESTCASE			COMINF-commdb-0357
+//! @SYMTestCaseID		COMINF-commdb-0357
+RUN_TEST_STEP 1000000 te_commdb step_033_05
+END_TESTCASE			COMINF-commdb-0357
+
+CED z:\testdata\configs\default3.xml -f
+
+//OOM run when 33_02 is fixed
+START_TESTCASE			COMINF-commdb-0358
+//! @SYMTestCaseID		COMINF-commdb-0358
+RUN_TEST_STEP 1000000 te_commdb step_033_06
+END_TESTCASE			COMINF-commdb-0358
+
+START_TESTCASE			COMINF-commdb-0359
+//! @SYMTestCaseID		COMINF-commdb-0359
+RUN_TEST_STEP 1000000 te_commdb step_033_07
+END_TESTCASE			COMINF-commdb-0359
+
+START_TESTCASE			COMINF-commdb-0360
+//! @SYMTestCaseID		COMINF-commdb-0360
+RUN_TEST_STEP 1000000 te_commdb step_033_08
+END_TESTCASE			COMINF-commdb-0360
+
+START_TESTCASE			COMINF-commdb-0361
+//! @SYMTestCaseID		COMINF-commdb-0361
+RUN_TEST_STEP 1000000 te_commdb step_033_09
+END_TESTCASE			COMINF-commdb-0361
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0362
+//! @SYMTestCaseID		COMINF-commdb-0362
+RUN_TEST_STEP 100000 te_commdb step_034_01
+END_TESTCASE			COMINF-commdb-0362
+
+START_TESTCASE			COMINF-commdb-0363
+//! @SYMTestCaseID		COMINF-commdb-0363
+RUN_TEST_STEP 100000 te_commdb step_034_02
+END_TESTCASE			COMINF-commdb-0363
+
+START_TESTCASE			COMINF-commdb-0364
+//! @SYMTestCaseID		COMINF-commdb-0364
+RUN_TEST_STEP 100000 te_commdb step_034_03
+END_TESTCASE			COMINF-commdb-0364
+
+START_TESTCASE			COMINF-commdb-0365
+//! @SYMTestCaseID		COMINF-commdb-0365
+RUN_TEST_STEP 100000 te_commdb step_034_04
+END_TESTCASE			COMINF-commdb-0365
+
+START_TESTCASE			COMINF-commdb-0366
+//! @SYMTestCaseID		COMINF-commdb-0366
+RUN_TEST_STEP 100000 te_commdb step_034_05
+END_TESTCASE			COMINF-commdb-0366
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0367
+//! @SYMTestCaseID		COMINF-commdb-0367
+RUN_TEST_STEP 1000000 te_commdb step_034_06
+END_TESTCASE			COMINF-commdb-0367
+
+
+CED z:\testdata\configs\default.xml -f
+
+START_TESTCASE			COMINF-commdb-0368
+//! @SYMTestCaseID		COMINF-commdb-0368
+RUN_TEST_STEP 100000 te_commdb step_035_01
+END_TESTCASE			COMINF-commdb-0368
+
+START_TESTCASE			COMINF-commdb-0369
+//! @SYMTestCaseID		COMINF-commdb-0369
+RUN_TEST_STEP 100000 te_commdb step_035_02
+END_TESTCASE			COMINF-commdb-0369
+
+START_TESTCASE			COMINF-commdb-0370
+//! @SYMTestCaseID		COMINF-commdb-0370
+RUN_TEST_STEP 100000 te_commdb step_035_03
+END_TESTCASE			COMINF-commdb-0370
+
+START_TESTCASE			COMINF-commdb-0371
+//! @SYMTestCaseID		COMINF-commdb-0371
+RUN_TEST_STEP 1000000 te_commdb step_035_04
+END_TESTCASE			COMINF-commdb-0371
+
+
+CED z:\testdata\configs\022.xml -f
+
+START_TESTCASE			COMINF-commdb-0372
+//! @SYMTestCaseID		COMINF-commdb-0372
+RUN_TEST_STEP 100000 te_commdb step_036_01
+TEST_COMPLETEND_TESTCASE			COMINF-commdb-0372
+
+START_TESTCASE			COMINF-commdb-0373
+//! @SYMTestCaseID		COMINF-commdb-0373
+RUN_TEST_STEP 100000 te_commdb step_036_02
+END_TESTCASE			COMINF-commdb-0373
+
+START_TESTCASE			COMINF-commdb-0374
+//! @SYMTestCaseID		COMINF-commdb-0374
+RUN_TEST_STEP 100000 te_commdb step_036_03
+END_TESTCASE			COMINF-commdb-0374
+
+START_TESTCASE			COMINF-commdb-0375
+//! @SYMTestCaseID		COMINF-commdb-0375
+RUN_TEST_STEP 100000 te_commdb step_036_04
+END_TESTCASE			COMINF-commdb-0375
+
+START_TESTCASE			COMINF-commdb-0376
+//! @SYMTestCaseID		COMINF-commdb-0376
+RUN_TEST_STEP 100000 te_commdb step_036_05
+END_TESTCASE			COMINF-commdb-0376
+
+START_TESTCASE			COMINF-commdb-0377
+//! @SYMTestCaseID		COMINF-commdb-0377
+RUN_TEST_STEP 100000 te_commdb step_036_06
+END_TESTCASE			COMINF-commdb-0377
+
+START_TESTCASE			COMINF-commdb-0378
+//! @SYMTestCaseID		COMINF-commdb-0378
+RUN_TEST_STEP 100000 te_commdb step_036_07
+END_TESTCASE			COMINF-commdb-0378
+
+START_TESTCASE			COMINF-commdb-0379
+//! @SYMTestCaseID		COMINF-commdb-0379
+RUN_TEST_STEP 100000 te_commdb step_036_08
+END_TESTCASE			COMINF-commdb-0379
+
+START_TESTCASE			COMINF-commdb-0380
+//! @SYMTestCaseID		COMINF-commdb-0380
+RUN_TEST_STEP 100000 te_commdb step_036_09
+END_TESTCASE			COMINF-commdb-0380
+
+START_TESTCASE			COMINF-commdb-0381
+//! @SYMTestCaseID		COMINF-commdb-0381
+RUN_TEST_STEP 100000 te_commdb step_036_10
+END_TESTCASE			COMINF-commdb-0381
+
+START_TESTCASE			COMINF-commdb-0382
+//! @SYMTestCaseID		COMINF-commdb-0382
+RUN_PANIC_STEP 100000 te_commdb step_036_11
+END_TESTCASE			COMINF-commdb-0382
+
+START_TESTCASE			COMINF-commdb-0383
+//! @SYMTestCaseID		COMINF-commdb-0383
+RUN_PANIC_STEP 100000 te_commdb step_036_12
+END_TESTCASE			COMINF-commdb-0383
+
+START_TESTCASE			COMINF-commdb-0384
+//! @SYMTestCaseID		COMINF-commdb-0384
+RUN_TEST_STEP 100000 te_commdb step_036_13
+END_TESTCASE			COMINF-commdb-0384
+
+START_TESTCASE			COMINF-commdb-0385
+//! @SYMTestCaseID		COMINF-commdb-0385
+RUN_TEST_STEP 100000 te_commdb step_036_14
+END_TESTCASE			COMINF-commdb-0385
+
+START_TESTCASE			COMINF-commdb-0386
+//! @SYMTestCaseID		COMINF-commdb-0386
+RUN_TEST_STEP 100000 te_commdb step_036_15
+END_TESTCASE			COMINF-commdb-0386
+
+START_TESTCASE			COMINF-commdb-0387
+//! @SYMTestCaseID		COMINF-commdb-0387
+RUN_TEST_STEP 1000000 te_commdb step_036_16
+END_TESTCASE			COMINF-commdb-0387
+
+START_TESTCASE			COMINF-commdb-0388
+//! @SYMTestCaseID		COMINF-commdb-0388
+RUN_PANIC_STEP 1000000 te_commdb step_036_17
+END_TESTCASE			COMINF-commdb-0388
+
+START_TESTCASE			COMINF-commdb-0389
+//! @SYMTestCaseID		COMINF-commdb-0389
+RUN_PANIC_STEP 1000000 te_commdb step_036_18
+END_TESTCASE			COMINF-commdb-0389
+
+CED z:\testdata\configs\default.xml -f
+
+START_TESTCASE			COMINF-commdb-0390
+//! @SYMTestCaseID		COMINF-commdb-0390
+RUN_TEST_STEP 100000 te_commdb step_037_01
+END_TESTCASE			COMINF-commdb-0390
+
+START_TESTCASE			COMINF-commdb-0391
+//! @SYMTestCaseID		COMINF-commdb-0391
+RUN_TEST_STEP 100000 te_commdb step_037_02
+END_TESTCASE			COMINF-commdb-0391
+
+START_TESTCASE			COMINF-commdb-0392
+//! @SYMTestCaseID		COMINF-commdb-0392
+RUN_TEST_STEP 1000000 te_commdb step_037_03
+END_TESTCASE			COMINF-commdb-0392
+
+START_TESTCASE			COMINF-commdb-0393
+//! @SYMTestCaseID		COMINF-commdb-0393
+RUN_TEST_STEP 100000 te_commdb step_038_01
+END_TESTCASE			COMINF-commdb-0393
+
+START_TESTCASE			COMINF-commdb-0394
+//! @SYMTestCaseID		COMINF-commdb-0394
+RUN_TEST_STEP 100000 te_commdb step_038_02
+END_TESTCASE			COMINF-commdb-0394
+
+START_TESTCASE			COMINF-commdb-0395
+//! @SYMTestCaseID		COMINF-commdb-0395
+RUN_TEST_STEP 1000000 te_commdb step_038_03
+END_TESTCASE			COMINF-commdb-0395
+
+START_TESTCASE			COMINF-commdb-0396
+//! @SYMTestCaseID		COMINF-commdb-0396
+RUN_TEST_STEP 100000 te_commdb step_039_01
+END_TESTCASE			COMINF-commdb-0396
+
+START_TESTCASE			COMINF-commdb-0397
+//! @SYMTestCaseID		COMINF-commdb-0397
+RUN_TEST_STEP 1000000 te_commdb step_039_02
+END_TESTCASE			COMINF-commdb-0397
+
+START_TESTCASE			COMINF-commdb-0398
+//! @SYMTestCaseID		COMINF-commdb-0398
+RUN_TEST_STEP 100000 te_commdb step_040_01
+END_TESTCASE			COMINF-commdb-0398
+
+START_TESTCASE			COMINF-commdb-0399
+//! @SYMTestCaseID		COMINF-commdb-0399
+RUN_TEST_STEP 100000 te_commdb step_040_02
+END_TESTCASE			COMINF-commdb-0399
+
+START_TESTCASE			COMINF-commdb-0401
+//! @SYMTestCaseID		COMINF-commdb-0401
+RUN_TEST_STEP 1000000 te_commdb step_040_03
+END_TESTCASE			COMINF-commdb-0401
+
+START_TESTCASE			COMINF-commdb-0402
+//! @SYMTestCaseID		COMINF-commdb-0402
+RUN_TEST_STEP 100000 te_commdb step_041_01
+END_TESTCASE			COMINF-commdb-0402
+
+START_TESTCASE			COMINF-commdb-0403
+//! @SYMTestCaseID		COMINF-commdb-0403
+RUN_TEST_STEP 100000 te_commdb step_041_02
+END_TESTCASE			COMINF-commdb-0403
+
+START_TESTCASE			COMINF-commdb-0404
+//! @SYMTestCaseID		COMINF-commdb-0404
+RUN_TEST_STEP 100000 te_commdb step_041_03
+END_TESTCASE			COMINF-commdb-0404
+
+START_TESTCASE			COMINF-commdb-0405
+//! @SYMTestCaseID		COMINF-commdb-0405
+RUN_TEST_STEP 100000 te_commdb step_041_04
+END_TESTCASE			COMINF-commdb-0405
+
+START_TESTCASE			COMINF-commdb-0406
+//! @SYMTestCaseID		COMINF-commdb-0406
+RUN_TEST_STEP 100000 te_commdb step_041_05
+END_TESTCASE			COMINF-commdb-0406
+
+START_TESTCASE			COMINF-commdb-0407
+//! @SYMTestCaseID		COMINF-commdb-0407
+RUN_TEST_STEP 100000 te_commdb step_041_06
+END_TESTCASE			COMINF-commdb-0407
+
+START_TESTCASE			COMINF-commdb-0408
+//! @SYMTestCaseID		COMINF-commdb-0408
+RUN_TEST_STEP 100000 te_commdb step_041_07
+END_TESTCASE			COMINF-commdb-0408
+
+START_TESTCASE			COMINF-commdb-0409
+//! @SYMTestCaseID		COMINF-commdb-0409
+RUN_TEST_STEP 100000 te_commdb step_041_08
+END_TESTCASE			COMINF-commdb-0409
+
+START_TESTCASE			COMINF-commdb-0410
+//! @SYMTestCaseID		COMINF-commdb-0410
+RUN_TEST_STEP 100000 te_commdb step_041_09
+END_TESTCASE			COMINF-commdb-0410
+
+START_TESTCASE			COMINF-commdb-0411
+//! @SYMTestCaseID		COMINF-commdb-0411
+RUN_TEST_STEP 100000 te_commdb step_041_10
+END_TESTCASE			COMINF-commdb-0411
+
+START_TESTCASE			COMINF-commdb-0412
+//! @SYMTestCaseID		COMINF-commdb-0412
+RUN_TEST_STEP 100000 te_commdb step_041_11
+END_TESTCASE			COMINF-commdb-0412
+
+START_TESTCASE			COMINF-commdb-0413
+//! @SYMTestCaseID		COMINF-commdb-0413
+RUN_TEST_STEP 100000 te_commdb step_041_12
+END_TESTCASE			COMINF-commdb-0413
+
+START_TESTCASE			COMINF-commdb-0414
+//! @SYMTestCaseID		COMINF-commdb-0414
+RUN_TEST_STEP 100000 te_commdb step_041_13
+END_TESTCASE			COMINF-commdb-0414
+
+START_TESTCASE			COMINF-commdb-0415
+//! @SYMTestCaseID		COMINF-commdb-0415
+RUN_TEST_STEP 100000 te_commdb step_041_14
+END_TESTCASE			COMINF-commdb-0415
+
+START_TESTCASE			COMINF-commdb-0416
+//! @SYMTestCaseID		COMINF-commdb-0416
+RUN_TEST_STEP 100000 te_commdb step_041_15
+END_TESTCASE			COMINF-commdb-0416
+
+START_TESTCASE			COMINF-commdb-0417
+//! @SYMTestCaseID		COMINF-commdb-0417
+RUN_TEST_STEP 100000 te_commdb step_041_16
+END_TESTCASE			COMINF-commdb-0417
+
+START_TESTCASE			COMINF-commdb-0418
+//! @SYMTestCaseID		COMINF-commdb-0418
+RUN_TEST_STEP 100000 te_commdb step_041_17
+END_TESTCASE			COMINF-commdb-0418
+
+START_TESTCASE			COMINF-commdb-0419
+//! @SYMTestCaseID		COMINF-commdb-0419
+RUN_TEST_STEP 1000000 te_commdb step_041_18
+END_TESTCASE			COMINF-commdb-0419
+
+
+CED z:\testdata\configs\default.xml -f
+
+START_TESTCASE			COMINF-commdb-0420
+//! @SYMTestCaseID		COMINF-commdb-0420
+RUN_TEST_STEP 1000000 te_commdb step_041_19
+END_TESTCASE			COMINF-commdb-0420
+
+START_TESTCASE			COMINF-commdb-0421
+//! @SYMTestCaseID		COMINF-commdb-0421
+RUN_TEST_STEP 1000000 te_commdb step_041_20
+END_TESTCASE			COMINF-commdb-0421
+
+START_TESTCASE			COMINF-commdb-0422
+//! @SYMTestCaseID		COMINF-commdb-0422
+RUN_TEST_STEP 1000000 te_commdb step_041_21
+END_TESTCASE			COMINF-commdb-0422
+
+START_TESTCASE			COMINF-commdb-0423
+//! @SYMTestCaseID		COMINF-commdb-0423
+RUN_TEST_STEP 1000000 te_commdb step_041_22
+END_TESTCASE			COMINF-commdb-0423
+
+START_TESTCASE			COMINF-commdb-0424
+//! @SYMTestCaseID		COMINF-commdb-0424
+RUN_TEST_STEP 1000000 te_commdb step_041_23
+END_TESTCASE			COMINF-commdb-0424
+
+START_TESTCASE			COMINF-commdb-0425
+//! @SYMTestCaseID		COMINF-commdb-0425
+RUN_TEST_STEP 1000000 te_commdb step_041_24
+END_TESTCASE			COMINF-commdb-0425
+
+START_TESTCASE			COMINF-commdb-0426
+//! @SYMTestCaseID		COMINF-commdb-0426
+RUN_TEST_STEP 1000000 te_commdb step_041_25
+END_TESTCASE			COMINF-commdb-0426
+
+START_TESTCASE			COMINF-commdb-0427
+//! @SYMTestCaseID		COMINF-commdb-0427
+RUN_TEST_STEP 1000000 te_commdb step_041_26
+END_TESTCASE			COMINF-commdb-0427
+
+START_TESTCASE			COMINF-commdb-0428
+//! @SYMTestCaseID		COMINF-commdb-0428
+RUN_TEST_STEP 1000000 te_commdb step_041_27
+END_TESTCASE			COMINF-commdb-0428
+
+START_TESTCASE			COMINF-commdb-0429
+//! @SYMTestCaseID		COMINF-commdb-0429
+RUN_TEST_STEP 1000000 te_commdb step_041_28
+END_TESTCASE			COMINF-commdb-0429
+
+START_TESTCASE			COMINF-commdb-0430
+//! @SYMTestCaseID		COMINF-commdb-0430
+RUN_TEST_STEP 1000000 te_commdb step_041_29
+END_TESTCASE			COMINF-commdb-0430
+
+START_TESTCASE			COMINF-commdb-0431
+//! @SYMTestCaseID		COMINF-commdb-0431
+RUN_TEST_STEP 1000000 te_commdb step_041_30
+END_TESTCASE			COMINF-commdb-0431
+
+START_TESTCASE			COMINF-commdb-0432
+//! @SYMTestCaseID		COMINF-commdb-0432
+RUN_TEST_STEP 1000000 te_commdb step_041_31
+END_TESTCASE			COMINF-commdb-0432
+
+START_TESTCASE			COMINF-commdb-0433
+//! @SYMTestCaseID		COMINF-commdb-0433
+RUN_TEST_STEP 1000000 te_commdb step_041_32
+END_TESTCASE			COMINF-commdb-0433
+
+START_TESTCASE			COMINF-commdb-0434
+//! @SYMTestCaseID		COMINF-commdb-0434
+RUN_TEST_STEP 1000000 te_commdb step_041_33
+END_TESTCASE			COMINF-commdb-0434
+
+START_TESTCASE			COMINF-commdb-0435
+//! @SYMTestCaseID		COMINF-commdb-0435
+RUN_TEST_STEP 1000000 te_commdb step_041_34
+END_TESTCASE			COMINF-commdb-0435
+
+START_TESTCASE			COMINF-commdb-0436
+//! @SYMTestCaseID		COMINF-commdb-0436
+RUN_TEST_STEP 100000 te_commdb step_042_01
+END_TESTCASE			COMINF-commdb-0436
+
+START_TESTCASE			COMINF-commdb-0437
+//! @SYMTestCaseID		COMINF-commdb-0437
+RUN_TEST_STEP 100000 te_commdb step_042_02
+END_TESTCASE			COMINF-commdb-0437
+
+START_TESTCASE			COMINF-commdb-0438
+//! @SYMTestCaseID		COMINF-commdb-0438
+RUN_TEST_STEP 1000000 te_commdb step_042_03
+END_TESTCASE			COMINF-commdb-0438
+
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0439
+//! @SYMTestCaseID		COMINF-commdb-0439
+RUN_TEST_STEP 100000 te_commdb step_043_01
+END_TESTCASE			COMINF-commdb-0439
+
+START_TESTCASE			COMINF-commdb-0440
+//! @SYMTestCaseID		COMINF-commdb-0440
+RUN_TEST_STEP 100000 te_commdb step_043_02
+END_TESTCASE			COMINF-commdb-0440
+
+START_TESTCASE			COMINF-commdb-0441
+//! @SYMTestCaseID		COMINF-commdb-0441
+RUN_TEST_STEP 100000 te_commdb step_043_03
+END_TESTCASE			COMINF-commdb-0441
+
+START_TESTCASE			COMINF-commdb-0442
+//! @SYMTestCaseID		COMINF-commdb-0442
+RUN_TEST_STEP 100000 te_commdb step_043_04
+END_TESTCASE			COMINF-commdb-0442
+
+
+CED z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0443
+//! @SYMTestCaseID		COMINF-commdb-0443
+RUN_TEST_STEP 1000000 te_commdb step_043_05
+END_TESTCASE			COMINF-commdb-0443
+
+
+CED z:\testdata\configs\default.xml -f
+
+START_TESTCASE			COMINF-commdb-0444
+//! @SYMTestCaseID		COMINF-commdb-0444
+RUN_TEST_STEP 100000 te_commdb step_044_01
+END_TESTCASE			COMINF-commdb-0444
+
+START_TESTCASE			COMINF-commdb-0445
+//! @SYMTestCaseID		COMINF-commdb-0445
+RUN_TEST_STEP 100000 te_commdb step_044_02
+END_TESTCASE			COMINF-commdb-0445
+
+START_TESTCASE			COMINF-commdb-0446
+//! @SYMTestCaseID		COMINF-commdb-0446
+RUN_TEST_STEP 1000000 te_commdb step_044_03
+END_TESTCASE			COMINF-commdb-0446
+
+START_TESTCASE			COMINF-commdb-0447
+//! @SYMTestCaseID		COMINF-commdb-0447
+RUN_TEST_STEP 100000 te_commdb step_045_01
+END_TESTCASE			COMINF-commdb-0447
+
+START_TESTCASE			COMINF-commdb-0448
+//! @SYMTestCaseID		COMINF-commdb-0448
+RUN_TEST_STEP 100000 te_commdb step_045_02
+END_TESTCASE			COMINF-commdb-0448
+
+START_TESTCASE			COMINF-commdb-0449
+//! @SYMTestCaseID		COMINF-commdb-0449
+RUN_TEST_STEP 1000000 te_commdb step_045_03
+END_TESTCASE			COMINF-commdb-0449
+
+
+CED z:\testdata\configs\default7.xml -f
+
+START_TESTCASE			COMINF-commdb-0450
+//! @SYMTestCaseID		COMINF-commdb-0450
+RUN_TEST_STEP 100000 te_commdb step_046_01
+END_TESTCASE			COMINF-commdb-0450
+
+// These 3 tests need to pass.  Are broken because of transactions needing to complete differently
+
+START_TESTCASE			COMINF-commdb-0451
+//! @SYMTestCaseID		COMINF-commdb-0451
+RUN_TEST_STEP 500000 te_commdb step_046_02
+END_TESTCASE			COMINF-commdb-0451
+
+
+CED z:\testdata\configs\default.xml -f
+
+START_TESTCASE			COMINF-commdb-0452
+//! @SYMTestCaseID		COMINF-commdb-0452
+RUN_TEST_STEP 500000 te_commdb step_046_03
+END_TESTCASE			COMINF-commdb-0452
+
+
+CED z:\testdata\configs\default.xml -f
+
+START_TESTCASE			COMINF-commdb-0453
+//! @SYMTestCaseID		COMINF-commdb-0453
+RUN_TEST_STEP 500000 te_commdb step_046_04
+END_TESTCASE			COMINF-commdb-0453
+
+//
+// This test is broken in a number of ways. The test uses two threads to access the
+// CommDB, but there behaviour of CommsDAT is slightly different to that of CommDB.
+// Sometimes some functions leave with KErrLocked and this causes the test to fail.
+// Other times a panic occurs as the two accesses to the same data cause the API
+// to panic, which the test does not expect.
+//
+// For now it will have to remain commented out.
+//
+//START_TESTCASE			COMINF-commdb-0454
+////! @SYMTestCaseID		COMINF-commdb-0454
+//RUN_TEST_STEP 2000000 te_commdb step_046_05
+//
+//END_TESTCASE			COMINF-commdb-0454
+
+CED z:\testdata\configs\default1.xml -f
+
+// BC tests of Modem table renaming.
+
+START_TESTCASE			COMINF-commdb-0455
+//! @SYMTestCaseID		COMINF-commdb-0455
+RUN_TEST_STEP 100000 te_commdb step_062_01
+END_TESTCASE			COMINF-commdb-0455
+
+CED z:\testdata\configs\default.xml -f
+
+START_TESTCASE			COMINF-commdb-0456
+//! @SYMTestCaseID		COMINF-commdb-0456
+RUN_TEST_STEP 100000 te_commdb step_062_03
+END_TESTCASE			COMINF-commdb-0456
+
+START_TESTCASE			COMINF-commdb-0457
+//! @SYMTestCaseID		COMINF-commdb-0457
+RUN_TEST_STEP 100000 te_commdb step_062_04
+END_TESTCASE			COMINF-commdb-0457
+
+START_TESTCASE			COMINF-commdb-0458
+//! @SYMTestCaseID		COMINF-commdb-0458
+RUN_TEST_STEP 100000 te_commdb step_062_05
+END_TESTCASE			COMINF-commdb-0458
+
+
+CED  Z:\testdata\configs\064_01.cfg
+
+START_TESTCASE			COMINF-commdb-0459
+//! @SYMTestCaseID		COMINF-commdb-0459
+RUN_TEST_STEP 100000 te_commdb step_064_01
+END_TESTCASE			COMINF-commdb-0459
+
+
+MULTITHREAD
+
+CED z:\testdata\configs\default.xml -f
+
+START_TESTCASE			COMINF-commdb-0460
+//! @SYMTestCaseID		COMINF-commdb-0460
+RUN_TEST_STEP -1 te_commdb step_047_01
+END_TESTCASE			COMINF-commdb-0460
+
+START_TESTCASE			COMINF-commdb-0461
+//! @SYMTestCaseID		COMINF-commdb-0461
+RUN_TEST_STEP -1 te_commdb step_047_02
+END_TESTCASE			COMINF-commdb-0461
+
+START_TESTCASE			COMINF-commdb-0462
+//! @SYMTestCaseID		COMINF-commdb-0462
+RUN_TEST_STEP -1 te_commdb step_047_03
+END_TESTCASE			COMINF-commdb-0462
+
+START_TESTCASE			COMINF-commdb-0463
+//! @SYMTestCaseID		COMINF-commdb-0463
+RUN_TEST_STEP -1 te_commdb step_047_04
+END_TESTCASE			COMINF-commdb-0463
+
+START_TESTCASE			COMINF-commdb-0464
+//! @SYMTestCaseID		COMINF-commdb-0464
+RUN_TEST_STEP -1 te_commdb step_047_05
+END_TESTCASE			COMINF-commdb-0464
+
+START_TESTCASE			COMINF-commdb-0465
+//! @SYMTestCaseID		COMINF-commdb-0465
+RUN_TEST_STEP -1 te_commdb step_047_06
+END_TESTCASE			COMINF-commdb-0465
+
+START_TESTCASE			COMINF-commdb-0466
+//! @SYMTestCaseID		COMINF-commdb-0466
+RUN_TEST_STEP -1 te_commdb step_047_07
+END_TESTCASE			COMINF-commdb-0466
+
+START_TESTCASE			COMINF-commdb-0467
+//! @SYMTestCaseID		COMINF-commdb-0467
+RUN_TEST_STEP -1 te_commdb step_047_08
+END_TESTCASE			COMINF-commdb-0467
+
+START_TESTCASE			COMINF-commdb-0468
+//! @SYMTestCaseID		COMINF-commdb-0468
+RUN_TEST_STEP -1 te_commdb step_047_13
+END_TESTCASE			COMINF-commdb-0468
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/te_cdb_urel.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,160 @@
+//
+// 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:
+//
+//
+//run_script z:\TestData\scripts\esock_test_unloadesock.script
+
+//LOAD_SUITE TE_Esock.dll
+
+//
+PRINT example CommDb test
+PRINT 
+//
+
+LOAD_SUITE te_commdb
+
+CED  z:\testdata\configs\061_01.xml -f
+
+START_TESTCASE			COMINF-commdb-0501
+//! @SYMTestCaseID		COMINF-commdb-0501
+RUN_TEST_STEP 100000 te_commdb step_061_01
+END_TESTCASE			COMINF-commdb-0501
+
+CED  z:\testdata\configs\061_02.xml -f
+
+START_TESTCASE			COMINF-commdb-0502
+//! @SYMTestCaseID		COMINF-commdb-0502
+RUN_TEST_STEP 100000 te_commdb step_061_02
+END_TESTCASE			COMINF-commdb-0502
+
+CED  z:\testdata\configs\061_03.xml -f
+
+START_TESTCASE			COMINF-commdb-0503
+//! @SYMTestCaseID		COMINF-commdb-0503
+RUN_TEST_STEP 100000 te_commdb step_061_03
+END_TESTCASE			COMINF-commdb-0503
+
+CED  z:\testdata\configs\061_04.xml -f
+
+START_TESTCASE			COMINF-commdb-0504
+//! @SYMTestCaseID		COMINF-commdb-0504
+RUN_TEST_STEP 100000 te_commdb step_061_04
+END_TESTCASE			COMINF-commdb-0504
+
+
+// CED processing tests.
+
+CED  z:\testdata\configs\default1.xml -f
+
+START_TESTCASE			COMINF-commdb-0505
+//! @SYMTestCaseID		COMINF-commdb-0505
+RUN_PANIC_STEP 100000 te_commdb step_003_04
+END_TESTCASE			COMINF-commdb-0505 
+
+START_TESTCASE			COMINF-commdb-0506
+//! @SYMTestCaseID		COMINF-commdb-0506
+RUN_PANIC_STEP 100000 te_commdb step_004_02
+END_TESTCASE			COMINF-commdb-0506 
+
+START_TESTCASE			COMINF-commdb-0507
+//! @SYMTestCaseID		COMINF-commdb-0507
+RUN_PANIC_STEP 100000 te_commdb step_007_14
+END_TESTCASE			COMINF-commdb-0507 
+
+START_TESTCASE			COMINF-commdb-0508
+//! @SYMTestCaseID		COMINF-commdb-0508
+RUN_PANIC_STEP 100000 te_commdb step_009_07
+END_TESTCASE			COMINF-commdb-0508
+
+START_TESTCASE			COMINF-commdb-0509
+//! @SYMTestCaseID		COMINF-commdb-0509 
+RUN_PANIC_STEP 100000 te_commdb step_009_08
+END_TESTCASE			COMINF-commdb-0509 
+
+START_TESTCASE			COMINF-commdb-0510
+//! @SYMTestCaseID		COMINF-commdb-0510
+RUN_TEST_STEP 100000 te_commdb step_013_02
+END_TESTCASE			COMINF-commdb-0510
+
+START_TESTCASE			COMINF-commdb-0511
+//! @SYMTestCaseID		COMINF-commdb-0511
+RUN_TEST_STEP 100000 te_commdb step_015_05
+END_TESTCASE			COMINF-commdb-0511
+
+START_TESTCASE			COMINF-commdb-0512
+//! @SYMTestCaseID		COMINF-commdb-0512
+RUN_PANIC_STEP 100000 te_commdb step_015_06
+END_TESTCASE			COMINF-commdb-0512
+
+CED  z:\testdata\configs\default3.xml -f
+
+START_TESTCASE			COMINF-commdb-0513
+//! @SYMTestCaseID		COMINF-commdb-0513
+RUN_TEST_STEP 100000 te_commdb step_029_03
+END_TESTCASE			COMINF-commdb-0513
+
+START_TESTCASE			COMINF-commdb-0514
+//! @SYMTestCaseID		COMINF-commdb-0514
+RUN_TEST_STEP 100000 te_commdb step_034_04
+END_TESTCASE			COMINF-commdb-0514
+
+START_TESTCASE			COMINF-commdb-0515
+//! @SYMTestCaseID		COMINF-commdb-0515
+RUN_TEST_STEP 100000 te_commdb step_046_03
+END_TESTCASE			COMINF-commdb-0515
+
+// BC tests of Modem table renaming.
+START_TESTCASE			COMINF-commdb-0516
+//! @SYMTestCaseID		COMINF-commdb-0516
+RUN_TEST_STEP 100000 te_commdb step_062_01
+END_TESTCASE			COMINF-commdb-0516
+
+START_TESTCASE			COMINF-commdb-0517
+//! @SYMTestCaseID		COMINF-commdb-0517
+RUN_TEST_STEP 100000 te_commdb step_062_02
+END_TESTCASE			COMINF-commdb-0517
+
+START_TESTCASE			COMINF-commdb-0518
+//! @SYMTestCaseID		COMINF-commdb-0518
+RUN_TEST_STEP 100000 te_commdb step_062_03
+END_TESTCASE			COMINF-commdb-0518
+
+START_TESTCASE			COMINF-commdb-0519
+//! @SYMTestCaseID		COMINF-commdb-0519
+RUN_TEST_STEP 100000 te_commdb step_062_04
+END_TESTCASE			COMINF-commdb-0519
+
+START_TESTCASE			COMINF-commdb-0520
+//! @SYMTestCaseID		COMINF-commdb-0520
+RUN_TEST_STEP 100000 te_commdb step_062_05
+END_TESTCASE			COMINF-commdb-0520
+
+// The following two steps should always be last two step cases for EKA2
+
+START_TESTCASE			COMINF-commdb-0521
+//! @SYMTestCaseID		COMINF-commdb-0521
+RUN_PANIC_STEP 100000 te_commdb step_036_11
+END_TESTCASE			COMINF-commdb-0521
+
+START_TESTCASE			COMINF-commdb-0522
+//! @SYMTestCaseID		COMINF-commdb-0522
+RUN_PANIC_STEP 100000 te_commdb step_036_12
+END_TESTCASE			COMINF-commdb-0522
+
+//Cleanup other files we've left
+//run_script z:\TestData\scripts\esock_test_loadesock.script
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/te_connpref.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,63 @@
+//
+// 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:
+//
+//
+
+LOAD_SUITE te_connpref
+
+START_TESTCASE			COMINF-commdb-0801
+//! @SYMTestCaseID		COMINF-commdb-0801
+RUN_TEST_STEP 10000 te_connpref ForceCCoverWrite
+END_TESTCASE			COMINF-commdb-0801
+
+START_TESTCASE			COMINF-commdb-0802
+//! @SYMTestCaseID		COMINF-commdb-0802
+RUN_TEST_STEP 10000 te_connpref ConstructAndVersion
+END_TESTCASE			COMINF-commdb-0802
+
+START_TESTCASE			COMINF-commdb-0803
+//! @SYMTestCaseID		COMINF-commdb-0803
+RUN_TEST_STEP 10000 te_connpref SetAndGetConnPrefs
+END_TESTCASE			COMINF-commdb-0803
+
+START_TESTCASE			COMINF-commdb-0804
+//! @SYMTestCaseID		COMINF-commdb-0804
+RUN_TEST_STEP 10000 te_connpref AssignAndCopyConstruct
+END_TESTCASE			COMINF-commdb-0804
+
+START_TESTCASE			COMINF-commdb-0805
+//! @SYMTestCaseID		COMINF-commdb-0805
+RUN_TEST_STEP 10000 te_connpref ComparePrefs
+END_TESTCASE			COMINF-commdb-0805
+
+START_TESTCASE			COMINF-commdb-0806
+//! @SYMTestCaseID		COMINF-commdb-0806
+RUN_TEST_STEP 10000 te_connpref ExtensionIdAndCast
+END_TESTCASE			COMINF-commdb-0806
+
+START_TESTCASE			COMINF-commdb-0807
+//! @SYMTestCaseID		COMINF-commdb-0807
+RUN_TEST_STEP 10000 te_connpref MultiConnPref
+END_TESTCASE			COMINF-commdb-0807
+
+START_TESTCASE			COMINF-commdb-0808
+//! @SYMTestCaseID		COMINF-commdb-0808
+RUN_TEST_STEP 10000 te_connpref MultiConnPrefVersion
+END_TESTCASE			COMINF-commdb-0808
+
+START_TESTCASE			COMINF-commdb-0809
+//! @SYMTestCaseID		COMINF-commdb-0809
+RUN_TEST_STEP 10000 te_connpref MultiConnectionAttempts
+END_TESTCASE			COMINF-commdb-0809
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/te_encrpt.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,32 @@
+//
+// 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:
+//
+//
+LOAD_SUITE te_Encrpt
+
+START_TESTCASE			COMINF-commdb-0901
+//! @SYMTestCaseID		COMINF-commdb-0901
+RUN_TEST_STEP 10000 te_Encrpt CreateEntries
+END_TESTCASE			COMINF-commdb-0901
+
+START_TESTCASE			COMINF-commdb-0902
+//! @SYMTestCaseID		COMINF-commdb-0902
+RUN_TEST_STEP 10000 te_Encrpt CheckPasswords
+END_TESTCASE			COMINF-commdb-0902
+
+START_TESTCASE			COMINF-commdb-0903
+//! @SYMTestCaseID		COMINF-commdb-0903
+RUN_TEST_STEP 10000 te_Encrpt DeleteEntries
+END_TESTCASE			COMINF-commdb-0903
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/scripts/te_usecases.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,47 @@
+//
+// 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:
+//
+//
+LOAD_SUITE te_usecases
+
+START_TESTCASE			COMINF-commdb-1001
+//! @SYMTestCaseID		COMINF-commdb-1001
+RUN_TEST_STEP 10000 te_usecases CreatingDatabaseAndView
+END_TESTCASE			COMINF-commdb-1001
+
+START_TESTCASE			COMINF-commdb-1002
+//! @SYMTestCaseID		COMINF-commdb-1002
+RUN_TEST_STEP 10000 te_usecases UsecaseReading
+END_TESTCASE			COMINF-commdb-1002
+
+START_TESTCASE			COMINF-commdb-1003
+//! @SYMTestCaseID		COMINF-commdb-1003
+RUN_TEST_STEP 10000 te_usecases UsecaseWriting
+END_TESTCASE			COMINF-commdb-1003
+
+START_TESTCASE			COMINF-commdb-1004
+//! @SYMTestCaseID		COMINF-commdb-1004
+RUN_TEST_STEP 10000 te_usecases UsecaseOverridingATableEntry
+END_TESTCASE			COMINF-commdb-1004
+
+START_TESTCASE			COMINF-commdb-1005
+//! @SYMTestCaseID		COMINF-commdb-1005
+RUN_TEST_STEP 10000 te_usecases UsecaseOverridingThePreferenceTable
+END_TESTCASE			COMINF-commdb-1005
+
+START_TESTCASE			COMINF-commdb-1006
+//! @SYMTestCaseID		COMINF-commdb-1006
+RUN_TEST_STEP 10000 te_usecases UsecaseUsingATemplate
+END_TESTCASE			COMINF-commdb-1006
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/CommDbPreCopy.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,52 @@
+//
+// 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:
+//
+//
+//
+// This contains copying cdbv3.dat to one temp dat file
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "CommDbPreCopy.h"
+
+////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////
+// Test Pre Copy
+/* This New Class is added to move copyfile command from script file
+   This test does a copy operation 	
+*/
+CCommDbPreCopy::CCommDbPreCopy()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("PreCopyTest"));
+	}
+
+CCommDbPreCopy::~CCommDbPreCopy()
+	{
+	}
+
+// Copy Test Main Code
+enum TVerdict CCommDbPreCopy::doTestStepL( void )
+	{
+	copyFileL(KCommDbName, KTempDb3);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Db_1_create.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,276 @@
+//
+// 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:
+//
+//
+//
+
+// Create a communications database 
+
+#include <e32test.h>
+#include <f32file.h>
+#include <commdb.h>
+#include <cdblen.h>
+#include <cdbpreftable.h>
+#include <faxdefn.h>
+#include <d32comm.h>
+#include <cdbtemp.h>
+
+
+_LIT(KEditorMess,"Database Editor");
+LOCAL_C RTest test(KEditorMess);
+LOCAL_C CCommsDatabase* theDb;
+
+
+//
+// The Dial Out ISP table will have 3 records, plus
+// two extra records that are read only
+//
+
+
+LOCAL_C CreateDialInISPTable()
+{
+	TUint32 id;
+
+	CCommsDbTableView* theView;
+
+	theView = theDb->OpenTableLC(TPtrC(DIAL_IN_ISP) );
+
+	//
+	//	Record #1
+	//
+	theView->InsertRecord( id );
+	theView->WriteTextL( TPtrC(COMMDB_NAME), _L("Record #1") ) ;
+	//Just write the columns that can't be null
+	theView->WriteTextL( TPtrC(ISP_IF_NAME), _L("PPP") ) ;
+	theView->WriteBoolL( TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue ) ;
+	theView->WriteBoolL( TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue ) ;
+	theView->WriteBoolL( TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue ) ;
+
+	theView->PutRecordChanges();
+
+	//
+	//	Record #2
+	//
+	theView->InsertRecord( id );
+	theView->WriteTextL( TPtrC(COMMDB_NAME), _L("Record #2") ) ;
+	//Just write the columns that can't be null
+	theView->WriteTextL( TPtrC(ISP_IF_NAME), _L("PPP") ) ;
+	theView->WriteBoolL( TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue ) ;
+	theView->WriteBoolL( TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue ) ;
+	theView->WriteBoolL( TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue ) ;
+	theView->PutRecordChanges();
+
+
+	//
+	//	Record #3
+	//
+	theView->InsertRecord( id );
+	theView->WriteTextL( TPtrC(COMMDB_NAME), _L("Record #3") ) ;
+	//Just write the columns that can't be null
+	theView->WriteTextL( TPtrC(ISP_IF_NAME), _L("SLIP") ) ;
+	theView->WriteBoolL( TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue ) ;
+	theView->WriteBoolL( TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue ) ;
+	theView->WriteBoolL( TPtrC(ISP6_IP_ADDR_FROM_SERVER), ETrue ) ;
+	theView->WriteBoolL( TPtrC(ISP6_IP_DNS_ADDR_FROM_SERVER), ETrue ) ;
+	theView->PutRecordChanges();
+
+	//
+	//	Record #4 ( Read Only )
+	//
+	theView->InsertRecord( id );
+	theView->WriteTextL( TPtrC(COMMDB_NAME), _L("Record #4 (Read Only)") ) ;
+	//Just write the columns that can't be null
+	theView->WriteTextL( TPtrC(ISP_IF_NAME), _L("SLIP") ) ;
+	theView->WriteBoolL( TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue ) ;
+	theView->WriteBoolL( TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue ) ;
+	theView->WriteBoolL( TPtrC(ISP6_IP_ADDR_FROM_SERVER), ETrue ) ;
+	theView->WriteBoolL( TPtrC(ISP6_IP_DNS_ADDR_FROM_SERVER), ETrue ) ;
+	theView->PutRecordChanges(EFalse, ETrue);
+
+	//
+	//	Record #5 ( Read Only )
+	//
+	theView->InsertRecord( id );
+	theView->WriteTextL( TPtrC(COMMDB_NAME), _L("Record #5 (Read Only)") ) ;
+	//Just write the columns that can't be null
+	theView->WriteTextL( TPtrC(ISP_IF_NAME), _L("PPP") ) ;
+	theView->WriteBoolL( TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue ) ;
+	theView->WriteBoolL( TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue ) ;
+	theView->WriteBoolL( TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue ) ;
+	theView->PutRecordChanges(EFalse, ETrue);
+
+	CleanupStack::PopAndDestroy( theView );
+}
+
+
+
+//
+// The Dial Out ISP table will have 3 records
+//
+
+LOCAL_C CreateDialOutISPTable()
+{
+	TUint32 id;
+
+	CCommsDbTableView* theView;
+
+	theView = theDb->OpenTableLC(TPtrC(DIAL_OUT_ISP) );
+
+	//
+	// Record #1
+	//
+	theView->InsertRecord( id );
+
+	theView->WriteTextL( TPtrC(COMMDB_NAME), _L("Record #1") ) ;
+	theView->WriteTextL( TPtrC(ISP_DESCRIPTION), _L("Isp #1") );
+	theView->WriteUintL( TPtrC(ISP_TYPE),EIspTypeWAPOnly);
+	theView->WriteBoolL( TPtrC(ISP_DISPLAY_PCT), ETrue);
+
+	//Must write to these columns as they cannot hold null values
+	theView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	theView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
+	theView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
+	theView->WriteTextL(TPtrC(ISP_IF_NAME), _L("PPP") );
+	theView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
+	theView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	theView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	theView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	theView->WriteTextL(TPtrC(ISP_IF_CALLBACK_INFO), _L8("Call me back") );
+	theView->PutRecordChanges();
+
+
+	//
+	// Record #2
+	//
+	theView->InsertRecord( id );
+
+	theView->WriteTextL( TPtrC(COMMDB_NAME), _L("Record #2") ) ;
+	theView->WriteUintL( TPtrC(ISP_TYPE),EIspTypeInternetAndWAP);
+
+	//Must write to these columns as they cannot hold null values
+	theView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	theView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
+	theView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
+	theView->WriteTextL(TPtrC(ISP_IF_NAME), _L("PPP") );
+	theView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
+	theView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	theView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	theView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	theView->WriteTextL(TPtrC(ISP_IF_CALLBACK_INFO), _L8("Call me back tomorrow") );
+	
+	theView->PutRecordChanges();
+	
+	//
+	// Record #3
+	//
+	theView->InsertRecord( id );
+
+	theView->WriteTextL( TPtrC(COMMDB_NAME), _L("Record #3") ) ;
+	theView->WriteUintL( TPtrC(ISP_TYPE),EIspTypeInternetAndWAP);
+
+	//Must write to these columns as they cannot hold null values
+	theView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	theView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
+	theView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
+	theView->WriteTextL(TPtrC(ISP_IF_NAME), _L("PPP") );
+	theView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
+	theView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	theView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	theView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	theView->WriteTextL(TPtrC(ISP_IF_CALLBACK_INFO), _L8("Call me back") );
+
+	theView->PutRecordChanges();
+
+	CleanupStack::PopAndDestroy( theView );
+
+}
+
+
+LOCAL_C void MainL() 
+    {
+	RFs fs;
+	test(fs.Connect()==KErrNone);
+	
+	TUint dummy;
+	
+	test.Printf(_L("Creating CommDb Unit test database  #1") );
+	
+	_LIT(KSvDbFileName,"C:\\private\\100012a5\\DBS[10004e1d]CDBV3.DAT");
+
+	if(fs.Att(KSvDbFileName,dummy)==KErrNone)
+		{
+		_LIT(KDbaseMess,"\nExisting Database File detected\n - Overwrite? [y/n]\n\n");
+		test.Printf(KDbaseMess);
+		TKeyCode key;
+		key=test.Getch();
+		if((key=='y')||(key=='Y'))
+			{
+			// Instantiate Database Server
+			RDbs rDbs;
+			User::LeaveIfError(rDbs.Connect());
+			CleanupClosePushL(rDbs);
+			_LIT(KCommDb,"c:cdbv3.dat"); 
+			const TUid KCommsDbFileUid = {0x10004e1d};
+			test(rDbs.DeleteDatabase(KCommDb, KCommsDbFileUid)==KErrNone);
+			CleanupStack::PopAndDestroy(&rDbs);
+			}
+		else
+			User::Leave(KErrNone);
+		}
+	fs.Close();
+
+	//Create a blank database
+	theDb=CCommsDatabase::NewL(EFalse);
+	CleanupStack::PushL(theDb);
+	test(theDb->BeginTransaction()==KErrNone);
+
+
+	CreateDialOutISPTable();
+	CreateDialInISPTable();
+
+
+	theDb->CommitTransaction();
+	CleanupStack::PopAndDestroy();
+	}
+
+GLDEF_C TInt E32Main()
+    {
+	__UHEAP_MARK;
+
+	CTrapCleanup* cleanup=CTrapCleanup::New();
+	
+	test.Title();
+	TRAPD(error,MainL());
+
+	if (error)
+		{
+		_LIT(KFailMess,"DbApp failed with error = %d");
+		test.Printf(KFailMess, error);
+		_LIT(KAnyKeyMess," [Press any key]");
+		test.Printf(KAnyKeyMess);
+		test.Getch();
+		}
+	else
+		{
+		_LIT(KCompleteMess,"DbApp Complete OK");
+		test.Printf(KCompleteMess);
+		}
+	_LIT(KPanicMess,"DbApp");
+	__ASSERT_ALWAYS(!error,test.Panic(KPanicMess,error));
+	test.Close();
+	delete cleanup;
+	__UHEAP_MARKEND;
+	return KErrNone;
+    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Db_7_create.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,104 @@
+//
+// 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:
+//
+//
+//
+
+// Create a totaly empty database
+
+#include <e32test.h>
+#include <f32file.h>
+#include <commdb.h>
+#include <cdblen.h>
+#include <cdbpreftable.h>
+#include <faxdefn.h>
+#include <d32comm.h>
+#include <cdbtemp.h>
+
+
+_LIT(KEditorMess,"Database Editor");
+LOCAL_C RTest test(KEditorMess);
+LOCAL_C CCommsDatabase* theDb;
+
+
+
+LOCAL_C void MainL() 
+    {
+	RFs fs;
+	test(fs.Connect()==KErrNone);
+	
+	TUint dummy;
+	
+	test.Printf(_L("Creating CommDb Unit test database  #7") );
+
+	_LIT(KSvDbFileName,"C:\\private\\100012a5\\DBS[10004e1d]CDBV3.DAT");
+	if(fs.Att(KSvDbFileName,dummy)==KErrNone)
+		{
+		_LIT(KDbaseMess,"\nExisting Database File detected\n - Overwrite? [y/n]\n\n");
+		test.Printf(KDbaseMess);
+		TKeyCode key;
+		key=test.Getch();
+		if((key=='y')||(key=='Y'))
+			{
+			// Instantiate Database Server
+			RDbs rDbs;
+			User::LeaveIfError(rDbs.Connect());
+			CleanupClosePushL(rDbs);
+			_LIT(KCommDb,"c:cdbv3.dat"); 
+			const TUid KCommsDbFileUid = {0x10004e1d};
+			test(rDbs.DeleteDatabase(KCommDb, KCommsDbFileUid)==KErrNone);
+			CleanupStack::PopAndDestroy(&rDbs);
+			}
+		else
+			User::Leave(KErrNone);
+		}
+	fs.Close();
+
+	//Create a blank database
+	theDb=CCommsDatabase::NewL(EFalse);
+	//and close it
+	delete theDb;
+
+	}
+
+GLDEF_C TInt E32Main()
+    {
+	__UHEAP_MARK;
+
+	CTrapCleanup* cleanup=CTrapCleanup::New();
+	
+	test.Title();
+	TRAPD(error,MainL());
+
+	if (error)
+		{
+		_LIT(KFailMess,"DbApp failed with error = %d");
+		test.Printf(KFailMess, error);
+		_LIT(KAnyKeyMess," [Press any key]");
+		test.Printf(KAnyKeyMess);
+		test.Getch();
+		}
+	else
+		{
+		_LIT(KCompleteMess,"DbApp Complete OK");
+		test.Printf(KCompleteMess);
+		}
+	_LIT(KPanicMess,"DbApp");
+	__ASSERT_ALWAYS(!error,test.Panic(KPanicMess,error));
+	test.Close();
+	delete cleanup;
+	__UHEAP_MARKEND;
+	return KErrNone;
+    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_003_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,538 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 003.01 - 003.07
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_003_xx.h"
+
+
+
+
+/////////////////////
+//	Test step 003.001
+/////////////////////
+
+// constructor
+CCommDbTest003_01::CCommDbTest003_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_003_01"));
+	}
+
+// destructor
+CCommDbTest003_01::~CCommDbTest003_01()
+ 	{
+	}
+
+
+TVerdict CCommDbTest003_01::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest003_01::myOpenTableL()
+	{
+	
+	// Because OpenTableLC puts an object on the cleanup stack, 
+	// we cant use TRAP() on it as this causes a Panic during the 
+	// UnTrap cleanup, so we write our own leaving wrapper function.
+	iTheView=iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
+	CleanupStack::Pop();
+
+	//if this test does not trap, it can only ever return KErrNone
+	return KErrNone;
+
+	}
+
+TInt CCommDbTest003_01::executeStepL()
+	{	
+	TInt ret=KErrNone;
+
+	TRAPD(r,  ret = myOpenTableL() );
+	
+	if ( r==KErrNone )
+		{
+		//if there were no traps, return the value call to the api
+		r=ret;
+		}
+
+	return r;
+	}
+
+	
+TVerdict CCommDbTest003_01::doTestStepL( )
+	{
+	
+	INFO_PRINTF1(_L("Step 003.01 called "));
+
+	if ( executeStepL() == KErrNone  )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);	
+	
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 003.002
+/////////////////////
+
+// constructor
+CCommDbTest003_02::CCommDbTest003_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_003_02"));
+	}
+
+// destructor
+CCommDbTest003_02::~CCommDbTest003_02()
+	{
+	}
+
+
+TVerdict CCommDbTest003_02::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+#define INVALID_TABLE_NAME	_S("Inval")
+
+
+TInt CCommDbTest003_02::myOpenTableL()
+	{
+	
+	// Because OpenTableLC puts an object on the cleanup stack, 
+	// we cant use TRAP() on it as this causes a Panic during the 
+	// UnTrap cleanup, so we write our own leaving wrapper function.
+	iTheView=iTheDb->OpenTableLC(TPtrC(INVALID_TABLE_NAME));
+	CleanupStack::Pop();
+
+	//This test should trap, if it gets here then something has gone wrong 
+	return KErrGeneral;
+
+	}
+
+
+TInt CCommDbTest003_02::executeStepL()
+	{	
+	TInt ret=KErrNone;
+
+	TRAPD(r,  ret = myOpenTableL() );
+	
+	if ( r==KErrNone )
+		{
+		//if there were no traps, return the value call to the api
+		r=ret;
+		}
+
+	return r;
+	}
+
+
+
+TVerdict CCommDbTest003_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 003.02 called "));
+	
+
+	//Test for the expected return value
+	if ( executeStepL() == KErrNotFound  )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 003.003
+/////////////////////
+
+// constructor
+CCommDbTest003_03::CCommDbTest003_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_003_03"));
+	}
+
+// destructor
+CCommDbTest003_03::~CCommDbTest003_03()
+	{
+	}
+
+
+TVerdict CCommDbTest003_03::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+#define ZERO_LENGTH_TABLE_NAME	_S("")
+
+TInt CCommDbTest003_03::myOpenTableL()
+	{
+	
+	// Because OpenTableLC puts an object on the cleanup stack, 
+	// we cant use TRAP() on it as this causes a Panic during the 
+	// UnTrap cleanup, so we write our own leaving wrapper function.
+
+	iTheView = iTheDb->OpenTableLC(TPtrC(ZERO_LENGTH_TABLE_NAME));
+	CleanupStack::Pop();
+
+	//This test should trap, if we get here something has gone wrong
+	return KErrGeneral; 
+	}
+
+
+TInt CCommDbTest003_03::executeStepL()
+	{
+	TInt ret=KErrNone;
+
+	TRAPD(r,  ret = myOpenTableL() );
+	
+	if ( r==KErrNone )
+		{
+		//if there were no traps, return the value call to the api
+		r=ret;
+		}
+
+	return r;
+	}
+
+
+TVerdict CCommDbTest003_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 003.03 called "));
+	
+
+	//Test for the expected return value
+	if ( executeStepL() == KErrArgument )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 003.04
+/////////////////////
+
+// constructor
+CCommDbTest003_04::CCommDbTest003_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_003_04"));
+	}
+
+// destructor
+CCommDbTest003_04::~CCommDbTest003_04()
+	{
+	}
+
+TVerdict CCommDbTest003_04::doTestStepPreambleL()
+	{
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+#define LONG_TABLE_NAME	_S("aVeryVeryLongTableNameThatIsLongerThanFiftyCharacters")
+
+
+TInt CCommDbTest003_04::myOpenTableL()
+	{
+	
+	// Because OpenTableLC puts an object on the cleanup stack, 
+	// we cant use TRAP() on it as this causes a Panic during the 
+	// UnTrap cleanup, so we write our own leaving wrapper function.
+	iTheView=iTheDb->OpenTableLC(TPtrC(LONG_TABLE_NAME));
+	CleanupStack::Pop();
+
+	//This test will cause a PANIC, so we will never get here
+	return KErrGeneral;
+	}
+
+
+TInt CCommDbTest003_04::executeStepL()
+	{
+	TInt ret=KErrNone;
+
+	TRAPD(r, myOpenTableL() );
+	
+	if ( r==KErrNone )
+		{
+		//if there were no traps, return the value call to the api
+		r=ret;
+		}
+
+	return r;
+}
+
+
+TVerdict CCommDbTest003_04::doTestStepL( )
+	{
+
+	User::SetJustInTime(EFalse);
+
+	if ( executeStepL() == KErrArgument )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);	
+	return TestStepResult();
+	}
+/////////////////////
+//	Test step 003.05
+/////////////////////
+
+// constructor
+CCommDbTest003_05::CCommDbTest003_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_003_05"));
+	}
+
+// destructor
+CCommDbTest003_05::~CCommDbTest003_05()
+	{
+	}
+
+
+TVerdict CCommDbTest003_05::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//The CONNECTION_PREFERENCES table isn't really a public table,
+//but someone still could try to open it.
+#define CONNECTION_PREFERENCES		_S("ConnectionPreferences")
+
+TInt CCommDbTest003_05::myOpenTableL()
+	{
+	
+	// Because OpenTableLC puts an object on the cleanup stack, 
+	// we cant use TRAP() on it as this causes a Panic during the 
+	// UnTrap cleanup, so we write our own leaving wrapper function.
+	iTheView=iTheDb->OpenTableLC(TPtrC( CONNECTION_PREFERENCES ));
+	CleanupStack::Pop();
+
+	//This test should leave, so we will never reach here
+	return KErrGeneral;
+	}
+
+TInt CCommDbTest003_05::executeStepL()
+{
+	TInt ret=KErrNone;
+
+	TRAPD(r,  ret = myOpenTableL() );
+	
+	if ( r==KErrNone )
+		{
+		//if there were no traps, return the value call to the api
+		r=ret;
+		}
+
+	return r;
+}
+	
+
+
+TVerdict CCommDbTest003_05::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 003.05 called "));
+	
+
+	if ( executeStepL() == KErrAccessDenied )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);	
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 003.006
+/////////////////////
+
+// constructor
+CCommDbTest003_06::CCommDbTest003_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_003_06"));
+	}
+
+// destructor
+CCommDbTest003_06::~CCommDbTest003_06()
+	{
+	}
+
+
+TVerdict CCommDbTest003_06::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+#define GLOBAL_SETTINGS				_S("GlobalSettings")
+
+TInt CCommDbTest003_06::myOpenTableL()
+	{
+	
+	// Because OpenTableLC puts an object on the cleanup stack, 
+	// we cant use TRAP() on it as this causes a Panic during the 
+	// UnTrap cleanup, so we write our own leaving wrapper function.
+	iTheView=iTheDb->OpenTableLC(TPtrC( GLOBAL_SETTINGS ));
+	CleanupStack::Pop();
+
+	//This test should leave, so we will never reach here
+	return KErrGeneral;
+	}
+
+TInt CCommDbTest003_06::executeStepL()
+{
+	TInt ret=KErrNone;
+
+
+	TRAPD(r,  ret = myOpenTableL() );
+	
+	if ( r==KErrNone )
+		{
+		//if there were no traps, return the value call to the api
+		r=ret;
+		}
+
+	return r;
+}
+	
+
+TVerdict CCommDbTest003_06::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 003.06 called "));
+	
+
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);	
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 003.07
+/////////////////////
+
+// constructor
+CCommDbTest003_07::CCommDbTest003_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_003_07"));
+	}
+
+// destructor
+CCommDbTest003_07::~CCommDbTest003_07()
+	{
+	}
+
+TVerdict CCommDbTest003_07::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 003.07 called "));
+
+	SetTestStepResult(EPass);
+	//Heap test for 003.01
+
+	CCommDbTest003_01* step003_01 = new CCommDbTest003_01;
+	CleanupStack::PushL(step003_01);
+	doTestStepWithHeapFailureL( *step003_01, KErrNone);
+	if( step003_01->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step003_01);
+		
+
+	//Heap test for 003.02
+
+	CCommDbTest003_02* step003_02 = new CCommDbTest003_02;
+	CleanupStack::PushL(step003_02);
+	doTestStepWithHeapFailureL( *step003_02, KErrNotFound);
+	if( step003_02->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step003_02);
+		
+
+	//Heap test for 003.03
+
+	CCommDbTest003_03* step003_03 = new CCommDbTest003_03;
+	CleanupStack::PushL(step003_03);
+	doTestStepWithHeapFailureL( *step003_03, KErrArgument);
+	if( step003_03->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step003_03);
+
+	//Heap test for 003.04 - see test step 3.08
+	
+	//Heap test for 003.05
+
+	CCommDbTest003_05* step003_05 = new CCommDbTest003_05;
+	CleanupStack::PushL(step003_05);
+	doTestStepWithHeapFailureL( *step003_05, KErrAccessDenied);
+	if( step003_05->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step003_05);
+		
+
+	//Heap test for 003.06
+
+	CCommDbTest003_06* step003_06 = new CCommDbTest003_06;
+	CleanupStack::PushL(step003_06);
+	doTestStepWithHeapFailureL( *step003_06, KErrNotFound);
+	if( step003_06->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step003_06);
+		
+
+	return TestStepResult();
+	}
+	
+/////////////////////
+//	Test step 003.08
+/////////////////////
+
+// constructor
+CCommDbTest003_08::CCommDbTest003_08()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_003_08"));
+	}
+
+// destructor
+CCommDbTest003_08::~CCommDbTest003_08()
+	{
+	}
+
+TVerdict CCommDbTest003_08::doTestStepL( )
+	{
+
+	SetTestStepResult(EPass);
+	//Heap test for 003.04 - a panic test
+	
+	CCommDbTest003_04* step003_04 = new CCommDbTest003_04;
+	CleanupStack::PushL(step003_04);
+	if ( doTestStepWithHeapFailureL( *step003_04, KErrNotFound) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step003_04); 
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_007_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,1171 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 007.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_007_xx.h"
+
+//#ifndef SYMBIAN_COMMS_REPOSITORY
+//	_LIT(KTempDb3, "c:\\system\\data\\default3.dat");
+//#endif
+
+/////////////////////
+//	Test step 007.001
+/////////////////////
+
+// constructor
+CCommDbTest007_01::CCommDbTest007_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_01"));
+	}
+
+// destructor
+CCommDbTest007_01::~CCommDbTest007_01()
+	{
+	}
+
+
+TVerdict CCommDbTest007_01::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+#define EXPECTED_FIELD_VALUE _L8("Call me back")
+
+TInt CCommDbTest007_01::executeStepL()
+	{
+	TInt ret = EFail;
+
+
+	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
+	//Read the value from the field and compare it to the expected value
+	TBuf8<KCommsDbSvrMaxFieldLength> value;
+
+	iTheView->ReadTextL( TPtrC(ISP_IF_CALLBACK_INFO), value );
+
+	if( !value.Compare( TPtrC8(EXPECTED_FIELD_VALUE) ) )
+		{
+		ret = EPass;
+		}
+
+	return ret;
+	}
+
+TVerdict CCommDbTest007_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 007.01 called "));
+
+	SetTestStepResult(EFail);
+
+	if ( executeStepL() == EPass )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 007.002
+/////////////////////
+
+// constructor
+CCommDbTest007_02::CCommDbTest007_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_02"));
+	}
+
+// destructor
+CCommDbTest007_02::~CCommDbTest007_02()
+	{
+	}
+
+
+TVerdict CCommDbTest007_02::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+#define EXPECTED_ISP_DESCRIPTION _S("Description")
+
+TInt CCommDbTest007_02::executeStepL()
+	{
+	TInt32 ret = EFail;
+
+
+	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
+	//Read the value from the field and compare it to the expected value
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(ISP_DESCRIPTION), value );
+
+	if( !value.Compare( TPtrC(EXPECTED_ISP_DESCRIPTION) ) )
+		{
+		ret = EPass;
+		}
+
+	return ret;
+	}
+
+TVerdict CCommDbTest007_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 007.02 called "));
+	SetTestStepResult(EFail);
+	if ( executeStepL() == EPass  )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 007.003
+/////////////////////
+
+// constructor
+CCommDbTest007_03::CCommDbTest007_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_03"));
+	}
+
+// destructor
+CCommDbTest007_03::~CCommDbTest007_03()
+	{
+	}
+
+TVerdict CCommDbTest007_03::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+#define EXPECTED_ISP_LOGIN_SCRIPT _S("wobble")
+
+TInt CCommDbTest007_03::executeStepL()
+	{
+	TInt32 ret = EFail;
+
+	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
+
+	//Read the value from the LongText field and compare it to the expected value
+	HBufC* value = iTheView->ReadLongTextLC( TPtrC(ISP_LOGIN_SCRIPT) );
+
+	if ( value )
+		{
+		if( !value->Compare( TPtrC(EXPECTED_ISP_LOGIN_SCRIPT) ) )
+			{
+			ret = EPass;
+			}
+		CleanupStack::PopAndDestroy();
+		}
+
+
+	return ret;
+	}
+
+TVerdict CCommDbTest007_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 007.03 called "));
+
+	if ( executeStepL() == EPass  )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 007.004
+/////////////////////
+
+// constructor
+CCommDbTest007_04::CCommDbTest007_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_04"));
+	}
+
+// destructor
+CCommDbTest007_04::~CCommDbTest007_04()
+	{
+	}
+
+TVerdict CCommDbTest007_04::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+#define EXPECTED_ISP_TYPE  2
+
+TInt CCommDbTest007_04::executeStepL()
+	{
+	TBool ret = EFail;
+
+
+	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone);
+	//Read the value from the Uint field and compare it to the expected value
+	TUint32 value;
+	iTheView->ReadUintL( TPtrC(ISP_TYPE), value );
+
+	if( value == EXPECTED_ISP_TYPE )
+		{
+		ret = EPass;
+		}
+
+	return ret;
+}
+
+TVerdict CCommDbTest007_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 007.04 called "));
+
+
+	if ( executeStepL() == EPass  )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 007.005
+/////////////////////
+
+// constructor
+CCommDbTest007_05::CCommDbTest007_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_05"));
+	// default to no local objects allocated
+	iLocalObjects = EFalse;
+	}
+
+// destructor
+CCommDbTest007_05::~CCommDbTest007_05()
+	{
+	}
+
+TVerdict CCommDbTest007_05::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest007_05::executeStepL()
+	{
+	TBool ret = EFail;
+
+	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone);
+	//Read the value from the Uint field and compare it to the expected value
+	TBool expectedValue;
+	iTheView->ReadBoolL( TPtrC(ISP_DISPLAY_PCT), expectedValue );
+
+	if( expectedValue )
+		{
+		SetTestStepResult(EPass);		}
+
+	return ret;
+	}
+
+TVerdict CCommDbTest007_05::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 007.05 called "));
+
+	if ( executeStepL() == EPass  )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 007.006
+/////////////////////
+
+// constructor
+CCommDbTest007_06::CCommDbTest007_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_06"));
+	}
+
+// destructor
+CCommDbTest007_06::~CCommDbTest007_06()
+	{
+	}
+
+TVerdict CCommDbTest007_06::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+#define EXPECTED_COLUMN_LENGTH	10		//Expected length of ISP_IP_ADDR column
+
+TInt CCommDbTest007_06::executeStepL()
+	{
+	TBool ret = EFail;
+
+	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
+
+	//Read the length of a column
+	TInt value;
+	iTheView->ReadColumnLengthL( TPtrC(ISP_IP_ADDR), value );
+
+	if( value == EXPECTED_COLUMN_LENGTH )
+		SetTestStepResult(EPass);
+	return ret;
+	}
+
+TVerdict CCommDbTest007_06::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 007.06 called "));
+
+	if ( executeStepL() == EPass  )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 007.007
+/////////////////////
+
+// constructor
+CCommDbTest007_07::CCommDbTest007_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_07"));
+	}
+
+// destructor
+CCommDbTest007_07::~CCommDbTest007_07()
+	{
+	}
+
+
+
+TVerdict CCommDbTest007_07::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest007_07::executeStepL()
+	{
+	TInt ret = KErrGeneral;
+
+	ret = iTheView->GotoFirstRecord();
+	if ( ret == KErrNotFound )
+		return ret;
+
+	//Try to read a column value from the empty view
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(ISP_DESCRIPTION), value );
+	return ret;
+	}
+
+TVerdict CCommDbTest007_07::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 007.07 called "));
+
+	//NB. create a view on an empty table
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 007.08
+/////////////////////
+
+// constructor
+CCommDbTest007_08::CCommDbTest007_08()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_08"));
+	// default to no local objects allocated
+	iLocalObjects = EFalse;
+	}
+
+// destructor
+CCommDbTest007_08::~CCommDbTest007_08()
+	{
+	}
+
+
+
+TVerdict CCommDbTest007_08::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest007_08::executeStepL()
+	{
+	TBool ret = EFail;
+
+	ret = iTheView->GotoFirstRecord();
+	if ( ret == KErrNotFound )
+		{
+         	SetTestStepResult(EPass);	
+		return TestStepResult();
+		}
+
+	//Read the length of a column
+	TInt value;
+	iTheView->ReadColumnLengthL( TPtrC(ISP_IF_PARAMS), value );
+	if ( value == 0 )
+		ret = EPass;
+
+	return ret;
+	}
+
+TVerdict CCommDbTest007_08::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 007.08 called "));
+
+	//NB. create a view on an empty table
+
+	if ( executeStepL() == EPass )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 007.09
+/////////////////////
+
+// constructor
+CCommDbTest007_09::CCommDbTest007_09()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_09"));
+	}
+
+// destructor
+CCommDbTest007_09::~CCommDbTest007_09()
+	{
+	}
+
+
+TVerdict CCommDbTest007_09::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest007_09::executeStepL()
+	{
+	TInt ret = KErrGeneral;
+
+	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone )
+
+	//Try to read from an invalid column
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	TRAPD(r, iTheView->ReadTextL( KInvalidColumnName, value ) );
+
+	ret = r;
+
+	return ret;
+	}
+
+TVerdict CCommDbTest007_09::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 007.09 called "));
+
+	//NB. create a view on an empty table
+
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 007.10
+/////////////////////
+
+// constructor
+CCommDbTest007_10::CCommDbTest007_10()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_10"));
+	}
+
+// destructor
+CCommDbTest007_10::~CCommDbTest007_10()
+	{
+	}
+
+
+TVerdict CCommDbTest007_10::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest007_10::executeStepL()
+	{
+	TInt ret = KErrGeneral;
+
+	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
+
+	//Try to read length of an invalid column
+	TInt value;
+	TRAPD(r,iTheView->ReadColumnLengthL( KInvalidColumnName, value ));
+	ret = r;
+
+	return ret;
+	}
+
+TVerdict CCommDbTest007_10::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 007.10 called "));
+
+	//NB. create a view on an empty table
+
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 007.11
+/////////////////////
+
+// constructor
+CCommDbTest007_11::CCommDbTest007_11()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_11"));
+	}
+
+// destructor
+CCommDbTest007_11::~CCommDbTest007_11()
+	{
+	}
+
+
+TVerdict CCommDbTest007_11::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest007_11::executeStepL()
+	{
+	TInt ret = KErrGeneral;
+
+	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone);
+
+	//Read a column that will have a NULL value
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	TRAPD( r, iTheView->ReadTextL( TPtrC( ISP_DESCRIPTION ), value ) );
+	if ( r==KErrNone && value.Size() == 0 )
+		{
+			//test passed
+			ret = KErrNone;
+		}
+	else if ( r != KErrNone )
+		{
+		//return the leave reason
+		ret = r;
+		}
+
+
+	return ret;
+	}
+
+TVerdict CCommDbTest007_11::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 007.11 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 007.12
+/////////////////////
+
+// constructor
+CCommDbTest007_12::CCommDbTest007_12()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_12"));
+	}
+
+// destructor
+CCommDbTest007_12::~CCommDbTest007_12()
+	{
+	}
+
+
+TVerdict CCommDbTest007_12::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest007_12::executeStepL()
+	{
+	TInt ret = KErrGeneral;
+
+	CDBLEAVE( ret =  iTheView->GotoFirstRecord(), KErrNone )
+
+	//Try to read length of column containing a NULL value
+	TInt value = -1;
+	TRAPD(r, iTheView->ReadColumnLengthL( TPtrC(ISP_DESCRIPTION), value ) );
+	if ( r==KErrNone && value == 0 )
+		{
+			//test passed
+			ret = KErrNone;
+		}
+	else if ( r != KErrNone )
+		{
+		//return the leave reason
+		ret = r;
+		}
+
+	return ret;
+	}
+
+TVerdict CCommDbTest007_12::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 007.12 called "));
+
+	//NB. create a view on an empty table
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+
+
+/////////////////////
+//	Test step 007.13
+/////////////////////
+/*
+//Removed since this test will not compile on Code warrior due to having an array of zero length
+// constructor
+CCommDbTest007_13::CCommDbTest007_13()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_13"));
+	}
+
+// destructor
+CCommDbTest007_13::~CCommDbTest007_13()
+	{
+	}
+
+
+TVerdict CCommDbTest007_13::doTestStepPreambleL()
+	{
+	copyTestDatabase( EDatabase_1 );
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest007_13::executeStepL()
+	{
+	TInt ret = KErrGeneral;
+
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+
+	//Read a column and pass a zero length buffer
+
+	//This next line causes a warning
+	TBuf<0> value;
+
+
+	TRAPD( r, iTheView->ReadTextL( TPtrC( ISP_DESCRIPTION ), value ) );
+	if ( r==KErrNone  )
+		{
+			//test passed
+			ret = KErrNone;
+		}
+	else if ( r != KErrNone )
+		{
+		//return the leave reason
+		ret = r;
+		}
+
+	return ret;
+	}
+
+TVerdict CCommDbTest007_13::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 007.13 called."));
+
+	//NB. create a view on an empty table
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+*/
+
+
+/////////////////////
+//	Test step 007.14
+/////////////////////
+
+// constructor
+CCommDbTest007_14::CCommDbTest007_14()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_14"));
+	}
+
+// destructor
+CCommDbTest007_14::~CCommDbTest007_14()
+	{
+	}
+
+
+TVerdict CCommDbTest007_14::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest007_14::executeStepL()
+	{
+	TInt ret = KErrGeneral;
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+
+	//Read a column and pass a small length buffer
+
+	TBuf<5> value;
+
+	TRAPD( r, iTheView->ReadTextL( TPtrC( ISP_DESCRIPTION ), value ) );
+	if ( r==KErrNone  )
+		{
+			//test passed
+			ret = KErrNone;
+		}
+	else if ( r != KErrNone )
+		{
+		//return the leave reason
+		ret = r;
+		}
+
+	return ret;
+	}
+
+TVerdict CCommDbTest007_14::doTestStepL( )
+	{
+	//NB. create a view on an empty table
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 007.15
+/////////////////////
+
+// constructor
+CCommDbTest007_15::CCommDbTest007_15()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_15"));
+	}
+
+// destructor
+CCommDbTest007_15::~CCommDbTest007_15()
+	{
+	}
+
+
+TVerdict CCommDbTest007_15::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+#define ISP_DESCRIPTION_VALUE	_S("Isp #1")
+
+TInt CCommDbTest007_15::executeStepL()
+	{
+	TInt ret = KErrGeneral;
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+
+	//Read a read only column
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	TRAPD( r, iTheView->ReadTextL( TPtrC( ISP_DESCRIPTION ), value ) );
+	if ( r==KErrNone && value.Compare(TPtrC(ISP_DESCRIPTION_VALUE) ) == 0 )
+		{
+			//test passed
+			ret = KErrNone;
+		}
+	else if ( r != KErrNone )
+		{
+		//return the leave reason
+		ret = r;
+		}
+
+	return ret;
+	}
+
+TVerdict CCommDbTest007_15::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 007.15 called"));
+
+	//NB. create a view on an empty table
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 007.16
+// Check different paths in ReadTextL
+/////////////////////
+
+// constructor
+CCommDbTest007_16::CCommDbTest007_16()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_16"));
+	}
+
+// destructor
+CCommDbTest007_16::~CCommDbTest007_16()
+	{
+	}
+
+
+TVerdict CCommDbTest007_16::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(OUTGOING_GPRS));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+#define SHORT_APN_VALUE	_S("Test")
+
+// this is KCommsDbSvrRealMaxFieldLength chars long (=255)
+#define LONG_APN_VALUE	_S("TheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDog123")
+
+TInt CCommDbTest007_16::executeStepL()
+	{
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+
+	// Read a short APN value
+	TBuf<KCommsDbSvrRealMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC( GPRS_APN ), value );
+
+	if (value.Compare(TPtrC(SHORT_APN_VALUE) ) != 0 )
+		{
+		User::Leave(KErrGeneral);
+		}
+
+	// check that the long desc test is valid - ie KCommsDbSvrRealMaxFieldLength
+	// hasn't changed since we wrote this
+	TPtrC longDesc(LONG_APN_VALUE);
+	if (longDesc.Length() != KCommsDbSvrRealMaxFieldLength)
+		{
+		User::Leave(KErrGeneral);
+		}
+
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	iTheView->ReadTextL( TPtrC( GPRS_APN ), value );
+
+	if (value.Compare(TPtrC(LONG_APN_VALUE) ) != 0 )
+		{
+		User::Leave(KErrGeneral);
+		}
+
+	return KErrNone;
+	}
+
+TVerdict CCommDbTest007_16::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 007.16 called"));
+
+	//NB. create a view on an empty table
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 007.17
+// Check different paths in ReadTextL
+/////////////////////
+
+// constructor
+CCommDbTest007_17::CCommDbTest007_17()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_17"));
+	}
+
+// destructor
+CCommDbTest007_17::~CCommDbTest007_17()
+	{
+	}
+
+TVerdict CCommDbTest007_17::doTestStepL()
+	{
+	INFO_PRINTF1(_L("Step 007.17 called"));
+
+	SetTestStepResult(EPass);
+	//Heap test for 007.01 - uses default1.xml 
+	CCommDbTest007_01* step007_01 = new CCommDbTest007_01;
+	CleanupStack::PushL(step007_01);
+	doTestStepWithHeapFailureL( *step007_01, KErrNone );
+	if ( step007_01->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step007_01);
+
+	//Heap test for 007.02 - uses default1.xml 
+	CCommDbTest007_02* step007_02 = new CCommDbTest007_02;
+	CleanupStack::PushL(step007_02);
+	doTestStepWithHeapFailureL( *step007_02, KErrNone );
+	if ( step007_02->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step007_02);
+
+	//Heap test for 007.03 - uses default1.xml 
+	CCommDbTest007_03* step007_03 = new CCommDbTest007_03;
+	CleanupStack::PushL(step007_03);
+	doTestStepWithHeapFailureL( *step007_03, KErrNone );
+	if ( step007_03->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step007_03);
+
+	//Heap test for 007.04 - uses default1.xml 
+	CCommDbTest007_04* step007_04 = new CCommDbTest007_04;
+	CleanupStack::PushL(step007_04);
+	doTestStepWithHeapFailureL( *step007_04, KErrNone );
+	if ( step007_04->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step007_04);
+
+	//Heap test for 007.05 - uses default1.xml 
+	CCommDbTest007_05* step007_05 = new CCommDbTest007_05;
+	CleanupStack::PushL(step007_05);
+	doTestStepWithHeapFailureL( *step007_05, KErrNone );
+	if ( step007_05->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step007_05);
+
+	//Heap test for 007.06 - uses default1.xml 
+	CCommDbTest007_06* step007_06 = new CCommDbTest007_06;
+	CleanupStack::PushL(step007_06);
+	doTestStepWithHeapFailureL( *step007_06, KErrNone );
+	if ( step007_06->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step007_06);
+
+	//Heap test for 007.07 - uses default7.xml 
+	//Heap test for 007.08 - uses default7.xml 
+
+	//Heap test for 007.09 - uses default1.xml 
+	CCommDbTest007_09* step007_09 = new CCommDbTest007_09;
+	CleanupStack::PushL(step007_09);
+	doTestStepWithHeapFailureL( *step007_09, KErrNotFound );
+	if ( step007_09->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step007_09);
+
+	//Heap test for 007.10 - uses default1.xml 
+	CCommDbTest007_10* step007_10 = new CCommDbTest007_10;
+	CleanupStack::PushL(step007_10);
+	doTestStepWithHeapFailureL( *step007_10, KErrNotFound );
+	if ( step007_10->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step007_10);
+
+	//Heap test for 007.11 - uses default1.xml 
+	CCommDbTest007_11* step007_11 = new CCommDbTest007_11;
+	CleanupStack::PushL(step007_11);
+	doTestStepWithHeapFailureL( *step007_11, KErrNone );
+	if ( step007_11->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step007_11);
+
+	//Heap test for 007.12 - uses default1.xml 
+	CCommDbTest007_12* step007_12 = new CCommDbTest007_12;
+	CleanupStack::PushL(step007_12);
+	doTestStepWithHeapFailureL( *step007_12, KErrNone );
+	if ( step007_12->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step007_12);
+
+	//Heap test for 007.14 - uses default1.xml - panic test see 7.20
+
+	//Heap test for 007.15 - uses default1.xml 
+	CCommDbTest007_15* step007_15 = new CCommDbTest007_15;
+	CleanupStack::PushL(step007_15);
+	doTestStepWithHeapFailureL( *step007_15, KErrNone );
+	if ( step007_15->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step007_15);
+	
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 007.18
+// Check different paths in ReadTextL
+/////////////////////
+
+// constructor
+CCommDbTest007_18::CCommDbTest007_18()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_18"));
+	}
+
+// destructor
+CCommDbTest007_18::~CCommDbTest007_18()
+	{
+	}
+
+TVerdict CCommDbTest007_18::doTestStepL()
+	{
+	INFO_PRINTF1(_L("Step 007.18 called"));
+
+	SetTestStepResult(EPass);
+	//Heap test for 007.07 - uses default7.xml 
+	copyTestDatabase( EDatabase_7 );
+	CCommDbTest007_07* step007_07 = new CCommDbTest007_07;
+	CleanupStack::PushL(step007_07);
+	doTestStepWithHeapFailureL( *step007_07, KErrNotFound );
+	if ( step007_07->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step007_07);
+
+
+	//Heap test for 007.08 - uses default7.xml
+	CCommDbTest007_08* step007_08 = new CCommDbTest007_08;
+	CleanupStack::PushL(step007_08);
+	doTestStepWithHeapFailureL( *step007_08, KErrNone );
+	if ( step007_08->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step007_08);
+
+	return TestStepResult();
+	}
+	
+/////////////////////
+//	Test step 007.19
+// Check different paths in ReadTextL
+/////////////////////
+
+// constructor
+CCommDbTest007_19::CCommDbTest007_19()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_19"));
+	}
+
+// destructor
+CCommDbTest007_19::~CCommDbTest007_19()
+	{
+	}
+
+TVerdict CCommDbTest007_19::doTestStepL()
+	{
+	INFO_PRINTF1(_L("Step 007.19 called"));
+
+	SetTestStepResult(EPass);
+	//Heap test for 007.16 - uses default3.xml
+	CCommDbTest007_16* step007_16 = new CCommDbTest007_16;
+	CleanupStack::PushL(step007_16);
+	doTestStepWithHeapFailureL( *step007_16, KErrNone );
+	if ( step007_16->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step007_16);
+
+	return TestStepResult();
+	}
+	
+/////////////////////
+//	Test step 007.20
+// Check different paths in ReadTextL
+/////////////////////
+
+// constructor
+CCommDbTest007_20::CCommDbTest007_20()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_007_20"));
+	}
+
+// destructor
+CCommDbTest007_20::~CCommDbTest007_20()
+	{
+	}
+
+TVerdict CCommDbTest007_20::doTestStepL()
+	{
+
+	SetTestStepResult(EPass);
+	//Heap test for 007.14 - uses default1.xml
+	CCommDbTest007_14* step007_14 = new CCommDbTest007_14;
+	CleanupStack::PushL(step007_14);
+	doTestStepWithHeapFailureL( *step007_14, KErrNone );
+	if ( step007_14->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step007_14);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_008_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,204 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 008.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_008_xx.h"
+
+
+
+/////////////////////
+//	Test step 008.001
+/////////////////////
+
+// constructor
+CCommDbTest008_01::CCommDbTest008_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_008_01"));
+
+	}
+
+// destructor
+CCommDbTest008_01::~CCommDbTest008_01()
+	{
+	}
+
+TVerdict CCommDbTest008_01::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest008_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id=0;
+
+	//Try to insert a record
+	TRAPD(r, ret = iTheView->InsertRecord( id ) );
+
+	//if we leave, return the leave value
+	if ( r!= KErrNone )
+		{
+		ret = r;
+		}
+		
+	return ret;
+	}
+
+
+TVerdict CCommDbTest008_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 008.01 called "));
+
+	
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+
+
+/////////////////////
+//	Test step 008.02
+/////////////////////
+
+// constructor
+CCommDbTest008_02::CCommDbTest008_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_008_02"));
+	}
+
+// destructor
+CCommDbTest008_02::~CCommDbTest008_02()
+	{
+	}
+
+TVerdict CCommDbTest008_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 008.02 called "));
+
+	SetTestStepResult(EPass);
+	// Heap test for 008.01
+
+	CCommDbTest008_01* step008_01 = new(ELeave) CCommDbTest008_01;
+	CleanupStack::PushL(step008_01);
+	doTestStepWithHeapFailureL( *step008_01, KErrNone);
+	if ( step008_01->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step008_01);
+
+	return TestStepResult();
+
+	}
+
+/////////////////////
+//	Test step 008.003
+/////////////////////
+
+// constructor
+CCommDbTest008_03::CCommDbTest008_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_008_03"));
+
+	}
+
+// destructor
+CCommDbTest008_03::~CCommDbTest008_03()
+	{
+	}
+
+TVerdict CCommDbTest008_03::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest008_03::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id=0;
+
+	//Position at record to copy
+	ret=iTheView->GotoFirstRecord();
+	if(ret != KErrNone)
+		{return ret;}
+
+	//Try to insert a copy of the first record
+	ret = iTheView->InsertCopyRecord(id);
+
+	return ret;
+	}
+
+TVerdict CCommDbTest008_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 008.03 called "));
+
+	
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 008.04
+/////////////////////
+
+// constructor
+CCommDbTest008_04::CCommDbTest008_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_008_04"));
+	}
+
+// destructor
+CCommDbTest008_04::~CCommDbTest008_04()
+	{
+	}
+
+TVerdict CCommDbTest008_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 008.04 called "));
+
+	SetTestStepResult(EPass);
+	// Heap test for 008.01
+
+	CCommDbTest008_03* step008_03 = new(ELeave) CCommDbTest008_03;
+	CleanupStack::PushL(step008_03);
+	doTestStepWithHeapFailureL( *step008_03, KErrNone);
+	if ( step008_03->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step008_03);
+
+	return TestStepResult();
+
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_009_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,1121 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 009.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_009_xx.h"
+
+
+
+/////////////////////
+//	Test step 009.001
+/////////////////////
+
+// constructor
+CCommDbTest009_01::CCommDbTest009_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_01"));
+	}
+
+// destructor
+CCommDbTest009_01::~CCommDbTest009_01()
+	{
+	}
+
+
+TVerdict CCommDbTest009_01::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+#define ISP_INIT_STRING_TEST_VALUE	_L8("Test Value")
+#define COMMDB_NAME_TEST_VALUE	_L("Test record")
+//#define ISP_IF_NAME_TEST_VALUE	_L("Test record")
+
+
+TInt CCommDbTest009_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id;
+
+	//NB. The table MUST be empty for this test to work!
+
+	//Try to insert a record
+	
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+
+	//Insert some text
+	iTheView->WriteTextL( TPtrC(ISP_INIT_STRING), ISP_INIT_STRING_TEST_VALUE );
+
+	//Must write to these columns as they cannot hold null values
+	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), ISP_IF_NAME_TEST_VALUE );
+	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),COMMDB_NAME_TEST_VALUE);
+
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+
+
+	//Read the value from the field and compare it to the value we've just written
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+
+	TBuf8<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(ISP_INIT_STRING), value );
+ 	if( !value.Compare( ISP_INIT_STRING_TEST_VALUE ) )
+		{
+		ret = KErrNone;
+		}
+
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest009_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 009.01 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+		
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 009.002
+/////////////////////
+
+// constructor
+CCommDbTest009_02::CCommDbTest009_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_02"));
+	}
+
+// destructor
+CCommDbTest009_02::~CCommDbTest009_02()
+	{
+	}
+
+
+TVerdict CCommDbTest009_02::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+#define ISP_DESCRIPTION_TEST_VALUE	_L16("ISP description test value")
+
+TInt CCommDbTest009_02::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id;
+
+	//NB. The table MUST be empty for this test to work!
+
+	//Try to insert a record
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+
+	//Insert some text
+	iTheView->WriteTextL( TPtrC(ISP_DESCRIPTION), ISP_DESCRIPTION_TEST_VALUE );
+
+	//Must write to these columns as they cannot hold null values
+	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), ISP_IF_NAME_TEST_VALUE );
+	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),COMMDB_NAME_TEST_VALUE);
+
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone);
+	
+	//Read the value from the field and compare it to the value we've just written
+	CDBLEAVE( iTheView->GotoFirstRecord(),  KErrNone ) ;
+
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(ISP_DESCRIPTION), value );
+	if( !value.Compare( ISP_DESCRIPTION_TEST_VALUE ) )
+		{
+		ret = KErrNone;
+		}
+	
+	return ret;
+	}
+
+
+TVerdict CCommDbTest009_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 009.02 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);	
+	return TestStepResult();
+	}
+
+
+
+
+/////////////////////
+//	Test step 009.003
+/////////////////////
+
+// constructor
+CCommDbTest009_03::CCommDbTest009_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_03"));
+	}
+
+// destructor
+CCommDbTest009_03::~CCommDbTest009_03()
+	{
+	}
+
+
+TVerdict CCommDbTest009_03::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+#define ISP_BEARER_TYPE_TEST_VALUE		0x1
+
+TInt CCommDbTest009_03::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id;
+
+	//NB. The table MUST be empty for this test to work!
+
+	//Try to insert a record
+	CDBLEAVE( iTheView->InsertRecord( id ),  KErrNone );
+
+	//Insert a value
+	iTheView->WriteUintL( TPtrC(ISP_BEARER_TYPE), ISP_BEARER_TYPE_TEST_VALUE );
+
+	//Must write to these columns as they cannot hold null values
+	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), ISP_IF_NAME_TEST_VALUE );
+	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),COMMDB_NAME_TEST_VALUE);
+
+	CDBLEAVE( iTheView->PutRecordChanges(),  KErrNone );
+
+	//Read the value from the field and compare it to the value we've just written
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+
+	TUint32 value;
+	iTheView->ReadUintL( TPtrC(ISP_BEARER_TYPE), value );
+	if( value == ISP_BEARER_TYPE_TEST_VALUE )
+		{
+		ret = KErrNone;
+		}
+		
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest009_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 009.03 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+
+
+
+
+
+/////////////////////
+//	Test step 009.004
+/////////////////////
+
+// constructor
+CCommDbTest009_04::CCommDbTest009_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_04"));
+	}
+
+// destructor
+CCommDbTest009_04::~CCommDbTest009_04()
+	{
+	}
+
+
+TVerdict CCommDbTest009_04::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+#define ISP_ENABLE_SW_COMP_TEST_VALUE	ETrue
+
+TInt CCommDbTest009_04::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id;
+
+	//NB. The table MUST be empty for this test to work!
+
+	//Try to insert a record
+	CDBLEAVE( iTheView->InsertRecord( id ),  KErrNone );
+		
+	//Insert a value
+	iTheView->WriteBoolL( TPtrC(ISP_ENABLE_SW_COMP), ISP_ENABLE_SW_COMP_TEST_VALUE );
+
+	//Must write to these columns as they cannot hold null values
+	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), ISP_IF_NAME_TEST_VALUE );
+	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),COMMDB_NAME_TEST_VALUE);
+
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+	
+	//Read the value from the field and compare it to the value we've just written
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	
+	TBool value;
+	iTheView->ReadBoolL( TPtrC(ISP_ENABLE_SW_COMP), value );
+	if( value )
+		{
+		ret = KErrNone;
+		}
+
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest009_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 009.04 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+
+
+
+/////////////////////
+//	Test step 009.005
+/////////////////////
+
+// constructor
+CCommDbTest009_05::CCommDbTest009_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_05"));
+	}
+
+// destructor
+CCommDbTest009_05::~CCommDbTest009_05()
+	{
+	}
+
+TVerdict CCommDbTest009_05::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+#define ISP_LOGIN_SCRIPT_TEST_VALUE	 _L("This is a test string that will be used in the test. It must be longer than 50 characters")
+
+TInt CCommDbTest009_05::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id;
+
+	//NB. The table MUST be empty for this test to work!
+
+	//Try to insert a record
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+
+	//Insert a value
+	iTheView->WriteLongTextL( TPtrC(ISP_LOGIN_SCRIPT), TPtrC(ISP_LOGIN_SCRIPT_TEST_VALUE) );
+
+	//Must write to these columns as they cannot hold null values
+	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), ISP_IF_NAME_TEST_VALUE );
+	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),COMMDB_NAME_TEST_VALUE);
+
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+
+
+	//Read the value from the field and compare it to the value we've just written
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	
+	HBufC* value = iTheView->ReadLongTextLC( TPtrC(ISP_LOGIN_SCRIPT) );
+
+	if ( value )
+		{
+		if( !value->Compare( ISP_LOGIN_SCRIPT_TEST_VALUE) )
+			{
+			ret = KErrNone;
+			}
+		CleanupStack::PopAndDestroy();
+		}
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest009_05::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 009.05 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);		
+	return TestStepResult();
+	}
+
+
+
+
+
+/////////////////////
+//	Test step 009.06
+/////////////////////
+
+// constructor
+CCommDbTest009_06::CCommDbTest009_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_06"));
+	}
+
+// destructor
+CCommDbTest009_06::~CCommDbTest009_06()
+	{
+	}
+
+
+TVerdict CCommDbTest009_06::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+#define TEST_DATA		_L("Test data")
+
+
+TInt CCommDbTest009_06::executeStepL()
+	{
+	TInt ret=KErrNone;
+	TUint32 id;
+
+	//NB. The table MUST be empty for this test to work!
+
+	//NB. This test will cause a PANIC
+
+	//Try to insert a record
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+
+	//Insert a value in an invalid column
+	iTheView->WriteTextL( KInvalidColumnName, TPtrC(TEST_DATA) );
+
+	// We should never get here because we should have hit a panic
+	// If the Panic doesnt happen, we'll cause a leave
+
+	User::Leave( KErrGeneral );
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest009_06::doTestStepL( )
+	{
+
+	//This test step needs to trap a Panic
+
+	TRAPD( r, executeStepL() );
+
+	if ( r == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+		
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 009.07
+/////////////////////
+
+// constructor
+CCommDbTest009_07::CCommDbTest009_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_07"));
+	}
+
+// destructor
+CCommDbTest009_07::~CCommDbTest009_07()
+	{
+	}
+
+
+TVerdict CCommDbTest009_07::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest009_07::executeStepL()
+	{
+	TInt ret=KErrNone;
+
+	//NB. This test will cause a PANIC
+
+	//Try to insert a record without a call to InsertRecord()
+	
+	//Insert a value in column
+	iTheView->WriteBoolL( TPtrC(ISP_ENABLE_SW_COMP), ETrue );
+
+	// We should never get here because we should have hit a panic
+	// If the Panic doesnt happen, we'll cause a leave
+
+	User::Leave( KErrGeneral );
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest009_07::doTestStepL( )
+	{
+	//This test step needs to trap a Panic
+
+	TRAPD( r, executeStepL() );
+
+	if ( r == KErrNone )
+		SetTestStepResult(EFail);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+
+
+
+
+
+/////////////////////
+//	Test step 009.08
+/////////////////////
+
+// constructor
+CCommDbTest009_08::CCommDbTest009_08()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_08"));
+
+	}
+
+// destructor
+CCommDbTest009_08::~CCommDbTest009_08()
+	{
+	}
+
+
+TVerdict CCommDbTest009_08::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest009_08::executeStepL()
+	{
+	TInt ret=KErrNone;
+
+	//NB. This test will cause a PANIC
+	//Try to PutRecordChanges() without a call to InsertRecord()
+
+	//Insert a value
+	iTheView->WriteUintL( TPtrC(ISP_ENABLE_SW_COMP), ISP_ENABLE_SW_COMP_TEST_VALUE );
+
+	//Must write to these columns as they cannot hold null values
+	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), ISP_IF_NAME_TEST_VALUE );
+	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),COMMDB_NAME_TEST_VALUE);
+
+	iTheView->PutRecordChanges();
+
+	// We should never get here because we should have hit a panic
+	// If the Panic doesnt happen, we'll cause a leave
+
+	User::Leave( KErrGeneral );
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest009_08::doTestStepL( )
+	{
+	//This test step needs to trap a Panic
+
+	if ( executeStepL() ==  KErrNone )
+		SetTestStepResult(EFail);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 009.09
+/////////////////////
+
+// constructor
+CCommDbTest009_09::CCommDbTest009_09()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_09"));
+	}
+
+// destructor
+CCommDbTest009_09::~CCommDbTest009_09()
+	{
+	}
+
+
+TVerdict CCommDbTest009_09::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+
+TInt CCommDbTest009_09::executeStepL()
+	{
+	return KErrInUse;
+	}
+
+
+TVerdict CCommDbTest009_09::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 009.09 called"));
+			
+	//This test step needs to trap a Panic
+
+	if ( executeStepL() == KErrInUse )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 009.10
+/////////////////////
+
+// constructor
+CCommDbTest009_10::CCommDbTest009_10()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_10"));
+	}
+
+// destructor
+CCommDbTest009_10::~CCommDbTest009_10()
+	{
+	}
+
+
+TVerdict CCommDbTest009_10::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+#define ISP_INIT_STRING_LONG_VALUE	_L8("aVeryVeryLongColumnValueThatIsLongerThanFiftyCharacters")
+
+
+TInt CCommDbTest009_10::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id;
+
+	//Try to insert a record
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+
+	//Write a long string
+	TRAP(ret, iTheView->WriteTextL( TPtrC(ISP_INIT_STRING), ISP_INIT_STRING_LONG_VALUE ) );
+	
+	return ret;
+	}
+
+
+TVerdict CCommDbTest009_10::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 009.10 called"));
+
+		if (  executeStepL() == KErrOverflow )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+
+/////////////////////
+//	Test step 009.11
+/////////////////////
+
+// constructor
+CCommDbTest009_11::CCommDbTest009_11()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_11"));
+	}
+
+// destructor
+CCommDbTest009_11::~CCommDbTest009_11()
+	{
+	}
+
+TVerdict CCommDbTest009_11::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 009.11 called "));
+
+	SetTestStepResult(EPass);
+	// Have backup of Database in c:\default7.dat
+	// Heap test for 009.01
+
+	CCommDbTest009_01* step009_01 = new(ELeave) CCommDbTest009_01;
+	CleanupStack::PushL(step009_01);
+	doTestStepWithHeapFailureL( *step009_01, KErrNone);
+	if ( step009_01->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step009_01);
+
+
+	return TestStepResult();
+
+	}
+
+
+// constructor
+CCommDbTest009_12::CCommDbTest009_12()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_12"));
+	}
+
+// destructor
+CCommDbTest009_12::~CCommDbTest009_12()
+	{
+	}
+
+TVerdict CCommDbTest009_12::doTestStepL( )
+	{
+		// store the name of this test case
+	SetTestStepName(_L("step_009_12"));
+	SetTestStepResult(EPass);	
+	CCommDbTest009_02* step009_02 = new(ELeave) CCommDbTest009_02;
+	CleanupStack::PushL(step009_02);
+	doTestStepWithHeapFailureL( *step009_02, KErrNone);
+	if ( step009_02->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step009_02);
+
+	return TestStepResult();
+	}
+	
+// constructor
+CCommDbTest009_13::CCommDbTest009_13()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_13"));
+	}
+
+// destructor
+CCommDbTest009_13::~CCommDbTest009_13()
+	{
+	}
+
+TVerdict CCommDbTest009_13::doTestStepL( )
+	{
+		// store the name of this test case
+	SetTestStepName(_L("step_009_13"));
+	SetTestStepResult(EPass);	
+		// Heap test for 009.03
+	CCommDbTest009_03* step009_03 = new(ELeave) CCommDbTest009_03;
+	CleanupStack::PushL(step009_03);
+	doTestStepWithHeapFailureL( *step009_03, KErrNone);
+	if ( step009_03->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step009_03);
+	
+	return TestStepResult();
+	}
+	
+// constructor
+CCommDbTest009_14::CCommDbTest009_14()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_14"));
+	}
+
+// destructor
+CCommDbTest009_14::~CCommDbTest009_14()
+	{
+	}
+
+TVerdict CCommDbTest009_14::doTestStepL( )
+	{
+		// store the name of this test case
+	SetTestStepName(_L("step_009_14"));
+	SetTestStepResult(EPass);	
+		// Heap test for 009.04
+	CCommDbTest009_04* step009_04 = new(ELeave) CCommDbTest009_04;
+	CleanupStack::PushL(step009_04);
+	doTestStepWithHeapFailureL( *step009_04, KErrNone);
+	if ( step009_04->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step009_04);
+
+	return TestStepResult();
+	}
+	
+// constructor
+CCommDbTest009_15::CCommDbTest009_15()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_15"));
+	}
+
+// destructor
+CCommDbTest009_15::~CCommDbTest009_15()
+	{
+	}
+
+TVerdict CCommDbTest009_15::doTestStepL( )
+	{
+		// store the name of this test case
+	SetTestStepName(_L("step_009_15"));
+	SetTestStepResult(EPass);	
+		// Heap test for 009.05
+	CCommDbTest009_05* step009_05 = new(ELeave) CCommDbTest009_05;
+	CleanupStack::PushL(step009_05);
+	doTestStepWithHeapFailureL( *step009_05, KErrNone);
+	if ( step009_05->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step009_05);
+	
+			// Heap test for 009.06
+	CCommDbTest009_06* step009_06 = new(ELeave) CCommDbTest009_06;
+	CleanupStack::PushL(step009_06);
+	doTestStepWithHeapFailureL( *step009_06, KErrNotFound);
+	if ( step009_06->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step009_06);
+
+	return TestStepResult();
+	}
+	
+// constructor
+CCommDbTest009_16::CCommDbTest009_16()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_16"));
+	}
+
+// destructor
+CCommDbTest009_16::~CCommDbTest009_16()
+	{
+	}
+
+TVerdict CCommDbTest009_16::doTestStepL( )
+	{
+		// store the name of this test case
+	SetTestStepName(_L("step_009_16"));
+	SetTestStepResult(EPass);	
+		// Heap test for 009.09
+	CCommDbTest009_09* step009_09 = new(ELeave) CCommDbTest009_09;
+	CleanupStack::PushL(step009_09);
+	doTestStepWithHeapFailureL( *step009_09, KErrInUse);
+	if ( step009_09->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step009_09);
+
+		// Heap test for 009.10
+	CCommDbTest009_10* step009_10 = new(ELeave) CCommDbTest009_10;
+	CleanupStack::PushL(step009_10);
+	doTestStepWithHeapFailureL( *step009_10, KErrOverflow);
+	if ( step009_10->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step009_10);
+
+	return TestStepResult();
+	}
+	
+
+// constructor
+CCommDbTest009_17::CCommDbTest009_17()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_17"));
+}
+
+// destructor
+CCommDbTest009_17::~CCommDbTest009_17()
+{
+}
+
+TVerdict CCommDbTest009_17::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest009_17::executeStepL()
+{
+	TBuf<50> buff;
+
+	TInt ret(0);
+
+	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
+
+	iTheView->UpdateRecord();
+	
+	iTheView->SetNullL( TPtrC(ISP_IF_CALLBACK_INFO ));
+	
+	User::LeaveIfError(iTheView->PutRecordChanges());
+		
+	iTheView->ReadTextL(TPtrC(ISP_IF_CALLBACK_INFO ), buff);
+
+	if(buff.Length() == 0)
+		{
+		ret = KErrNone;
+		}
+	else
+		{
+		ret	= KErrGeneral;
+		}
+
+	return ret;
+}
+
+// do Test step 009.17
+TVerdict CCommDbTest009_17::doTestStepL( )
+{
+
+	INFO_PRINTF1(_L("Step 009.17 called "));
+    if (executeStepL() == KErrNone)
+	SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+}
+
+/////////////////////
+//	Test step 009.18
+/////////////////////
+
+// constructor
+CCommDbTest009_18::CCommDbTest009_18()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_18"));
+	}
+
+// destructor
+CCommDbTest009_18::~CCommDbTest009_18()
+	{
+	}
+
+TVerdict CCommDbTest009_18::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest009_18::executeStepL()
+	{
+	TBuf<KCommsDbSvrMaxColumnNameLength> tableName;
+	SetTestStepResult(EFail);	iTheView->GetTableName( tableName ); 
+	if ( tableName.Compare( TPtrC(DIAL_OUT_ISP)) != KErrNone )
+		{	
+		SetTestStepResult(EFail);		}
+	else
+		{
+		SetTestStepResult(EPass);		} 
+	return TestStepResult();
+	}
+
+// do Test step 009.18
+TVerdict CCommDbTest009_18::doTestStepL( )
+	{
+	SetTestStepResult(EFail);	INFO_PRINTF1(_L("Step 009.18 called "));
+	if (executeStepL() != KErrNone)
+		{
+		SetTestStepResult(EFail);		}
+	else
+		{
+		SetTestStepResult(EPass);		}
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 009.19
+/////////////////////
+
+// constructor
+CCommDbTest009_19::CCommDbTest009_19()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_19"));
+	}
+
+// destructor
+CCommDbTest009_19::~CCommDbTest009_19()
+	{
+	}
+
+TVerdict CCommDbTest009_19::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 009.19 called "));
+
+	SetTestStepResult(EPass);
+		// Heap test for 009.17
+		
+	CCommDbTest009_17* step009_17 = new(ELeave) CCommDbTest009_17;
+	CleanupStack::PushL(step009_17);
+	if ( doTestStepWithHeapFailureL( *step009_17, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step009_17);
+
+	return TestStepResult();	
+
+	}
+
+/////////////////////
+//	Test step 009.20
+/////////////////////
+
+// constructor
+CCommDbTest009_20::CCommDbTest009_20()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_20"));
+	}
+
+// destructor
+CCommDbTest009_20::~CCommDbTest009_20()
+	{
+	}
+
+TVerdict CCommDbTest009_20::doTestStepL( )
+	{
+
+	SetTestStepResult(EPass);
+		// Heap test for 009.07
+		
+	CCommDbTest009_07* step009_07 = new(ELeave) CCommDbTest009_07;
+	CleanupStack::PushL(step009_07);
+	if ( doTestStepWithHeapFailureL( *step009_07, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step009_07);
+
+	return TestStepResult();	
+
+	}
+
+/////////////////////
+//	Test step 009.21
+/////////////////////
+
+// constructor
+CCommDbTest009_21::CCommDbTest009_21()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_009_21"));
+	}
+
+// destructor
+CCommDbTest009_21::~CCommDbTest009_21()
+	{
+	}
+
+TVerdict CCommDbTest009_21::doTestStepL( )
+	{
+
+	SetTestStepResult(EPass);
+		// Heap test for 009.08
+		
+	CCommDbTest009_08* step009_08 = new(ELeave) CCommDbTest009_08;
+	CleanupStack::PushL(step009_08);
+	if ( doTestStepWithHeapFailureL( *step009_08, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step009_08);
+
+	return TestStepResult();	
+
+	}
+
+//EOF
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_010_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,318 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 010.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_010_xx.h"
+
+
+
+/////////////////////
+//	Test step 010.001
+/////////////////////
+
+// constructor
+CCommDbTest010_01::CCommDbTest010_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_010_01"));
+	}
+
+// destructor
+CCommDbTest010_01::~CCommDbTest010_01()
+	{
+	}
+
+TVerdict CCommDbTest010_01::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest010_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+
+	//This test must be executed on a populated table
+	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
+
+
+	//Move through the records in the table until the last record is reached
+	while( ret == KErrNone )
+		{
+		TRAPD(r, ret = iTheView->GotoNextRecord() );
+		if ( r!= KErrNone )
+			User::Leave(r);
+		}
+
+
+	
+	return ret;
+	}
+
+
+TVerdict CCommDbTest010_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 010.01 called "));
+
+
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+
+
+/////////////////////
+//	Test step 010.02
+/////////////////////
+
+// constructor
+CCommDbTest010_02::CCommDbTest010_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_010_02"));
+	}
+
+// destructor
+CCommDbTest010_02::~CCommDbTest010_02()
+	{
+	}
+
+TVerdict CCommDbTest010_02::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest010_02::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Move through the records in the table from the last to the first
+
+	CDBLEAVE ( ret = iTheView->GotoFirstRecord(), KErrNone);
+
+	while( ret == KErrNone )
+		{
+		TRAPD(r, ret = iTheView->GotoNextRecord() );
+		if ( r!= KErrNone )
+			User::Leave(r);
+		}
+	//We should be at the end of the records in this table,
+	//and ret == KErrNotFound
+
+	CDBLEAVE( ret, KErrNotFound  );
+
+	//Now move back to the first record 
+	CDBLEAVE ( ret = iTheView->GotoPreviousRecord(), KErrNone);
+
+	while( ret == KErrNone )
+		{
+		TRAPD(r, ret = iTheView->GotoPreviousRecord() );
+		if ( r!=KErrNone )
+			User::Leave(r);
+		}
+
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest010_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 010.02 called "));
+
+	
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 010.03
+/////////////////////
+
+// constructor
+CCommDbTest010_03::CCommDbTest010_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_010_03"));
+	}
+
+// destructor
+CCommDbTest010_03::~CCommDbTest010_03()
+	{
+	}
+
+TVerdict CCommDbTest010_03::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest010_03::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//The view must contain zero records
+
+	TRAPD(r, ret = iTheView->GotoFirstRecord() );
+	if( r!=KErrNone )
+		ret =r;
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest010_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 010.03 called "));
+
+	
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 010.04
+/////////////////////
+
+// constructor
+CCommDbTest010_04::CCommDbTest010_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_010_04"));
+	}
+
+// destructor
+CCommDbTest010_04::~CCommDbTest010_04()
+	{
+	}
+
+
+TVerdict CCommDbTest010_04::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest010_04::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//The view must contain zero records
+
+	TRAPD( r, ret = iTheView->GotoNextRecord() );
+
+	if ( r!= KErrNone )
+		ret = r;
+
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest010_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 010.04 called "));
+
+	
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 010.05
+/////////////////////
+
+// constructor
+CCommDbTest010_05::CCommDbTest010_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_010_05"));
+	}
+
+// destructor
+CCommDbTest010_05::~CCommDbTest010_05()
+	{
+	}
+
+
+TVerdict CCommDbTest010_05::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 010.05 called "));
+
+	SetTestStepResult(EPass);
+	// Heap test for 010.01
+
+	CCommDbTest010_01* step010_01 = new CCommDbTest010_01;
+	CleanupStack::PushL(step010_01);
+	if ( doTestStepWithHeapFailureL( *step010_01, KErrNotFound) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step010_01);
+
+	//Heap test for 010.02
+
+	CCommDbTest010_02* step010_02 = new CCommDbTest010_02;
+	CleanupStack::PushL(step010_02);
+	if ( doTestStepWithHeapFailureL( *step010_02, KErrNotFound) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step010_02);
+
+	//Heap test for 010.03
+
+	CCommDbTest010_03* step010_03 = new CCommDbTest010_03;
+	CleanupStack::PushL(step010_03);
+	if ( doTestStepWithHeapFailureL( *step010_03, KErrNotFound) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step010_03);
+
+	//Heap test for 010.04
+
+	CCommDbTest010_04* step010_04 = new CCommDbTest010_04;
+	CleanupStack::PushL(step010_04);
+	if ( doTestStepWithHeapFailureL( *step010_04, KErrNotFound) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step010_04);
+
+
+
+	return TestStepResult();	
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_011_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,350 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 011.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_011_xx.h"
+
+
+
+/////////////////////
+//	Test step 011.001
+/////////////////////
+
+// constructor
+CCommDbTest011_01::CCommDbTest011_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_011_01"));
+	}
+
+// destructor
+CCommDbTest011_01::~CCommDbTest011_01()
+	{
+	}
+
+
+TVerdict CCommDbTest011_01::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+#define HIDDEN_RECORD_TEST_VALUE	_L("This is a hidden record")
+
+TInt CCommDbTest011_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id;
+
+	//Create a hidden record in the database
+	//NB. This step will panic if the bale used is empty, so use a
+	//populated table to simplify things.
+	
+	//Try to insert a record
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+
+	//Insert some text
+	iTheView->WriteTextL( TPtrC(COMMDB_NAME), HIDDEN_RECORD_TEST_VALUE ) ;
+
+	//Must write to these columns as they cannot hold null values
+	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), _L("PPP") );
+	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+
+	//Store the record as hidden
+	CDBLEAVE( iTheView->PutRecordChanges(ETrue), KErrNone );
+
+	//Now search through the table looking for this record
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	do {
+
+		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+		if ( !value.Compare(HIDDEN_RECORD_TEST_VALUE) )
+			{
+				//Found the record, even though it is hidden
+				ret = KErrGeneral;
+				break;
+			}
+		//Move on to the next record
+		TRAPD(r, ret = iTheView->GotoNextRecord() );
+		if( r!= KErrNone )
+			User::Leave( r );
+		} while (ret == KErrNone ) ;
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest011_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 011.01 called "));
+
+		
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+ /////////////////////
+ //	Test step 011.02
+ /////////////////////
+ 
+ // constructor
+CCommDbTest011_02::CCommDbTest011_02()
+ 	{
+ 	// store the name of this test case
+	SetTestStepName(_L("step_011_02"));
+ 	}
+ 
+ // destructor
+CCommDbTest011_02::~CCommDbTest011_02()
+ 	{
+ 	}
+ 
+TVerdict CCommDbTest011_02::doTestStepPreambleL()
+ 	{	
+ 	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+         SetTestStepResult(EPass); 	return TestStepResult();
+ 	}
+ 
+ 
+TInt CCommDbTest011_02::executeStepL()
+ 	{
+ 	TInt ret=KErrGeneral;
+ 	TUint32 id;
+
+	//Create a hidden record in the database, try to find it,
+	//make a call to ShowHiddenRecords the try to find the record again
+	
+	//Try to insert a test record
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+
+	//Insert some text
+	iTheView->WriteTextL( TPtrC(COMMDB_NAME), HIDDEN_RECORD_TEST_VALUE );
+
+	//Must write to these columns as they cannot hold null values
+	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), _L("PPP") );
+	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+
+	//Store the record as hidden
+	CDBLEAVE( iTheView->PutRecordChanges(ETrue), KErrNone );
+
+	//Now search through the table looking for this record
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+
+	//This first search through the table should not find the hidden record
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	do {
+
+		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+		if ( !value.Compare(HIDDEN_RECORD_TEST_VALUE) )
+			{
+				//Found the record
+				ret = KErrGeneral;
+				break;
+			}
+		//Move on to the next record
+		TRAPD(r, ret= iTheView->GotoNextRecord() );
+		if ( r!=KErrNone )
+			User::Leave( r );
+
+		}while(ret == KErrNone );
+	
+	if ( ret == KErrNotFound )
+		{
+
+		//Search again, but this this time we'll show the hidden records
+		delete iTheView;
+		iTheView = 0;
+
+		iTheDb->ShowHiddenRecords();
+		iTheView=iTheDb->OpenTableLC( TPtrC(DIAL_OUT_ISP) );
+		CleanupStack::Pop();
+
+		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+		TBuf<KCommsDbSvrMaxFieldLength> value;
+
+		do {
+			iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+			if ( !value.Compare(HIDDEN_RECORD_TEST_VALUE) )
+				{
+					//Found the record
+					ret = KErrNone;
+
+					//Change the record not to be hidden for the test 11_03
+					CDBLEAVE( iTheView->UpdateRecord(), KErrNone );
+					CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+					break;
+				}
+			//Move on to the next record
+			TRAPD(r, ret = iTheView->GotoNextRecord() )
+			if ( r!=KErrNone )
+				User::Leave( r );
+
+			}while( ret == KErrNone );
+		}
+
+	return ret;
+	}
+
+TVerdict CCommDbTest011_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 011.02 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 011.03
+/////////////////////
+
+// constructor
+CCommDbTest011_03::CCommDbTest011_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_011_03"));
+	}
+
+// destructor
+CCommDbTest011_03::~CCommDbTest011_03()
+	{
+	}
+
+TVerdict CCommDbTest011_03::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest011_03::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Check if a record from test 11_02 is readable again
+	
+	//Now search through the table looking for this record
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+
+	//This first search through the table should not find the hidden record
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	do {
+
+		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+		if ( !value.Compare(HIDDEN_RECORD_TEST_VALUE) )
+			{
+				//Found the record
+				ret = KErrNone;
+				break;
+			}
+		//Move on to the next record
+		TRAPD(r, ret= iTheView->GotoNextRecord() );
+		if ( r!=KErrNone )
+			User::Leave( r );
+
+		}while(ret == KErrNone );
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest011_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 011.03 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 011.04
+/////////////////////
+
+// constructor
+CCommDbTest011_04::CCommDbTest011_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_011_04"));
+	}
+
+// destructor
+CCommDbTest011_04::~CCommDbTest011_04()
+	{
+	}
+
+TVerdict CCommDbTest011_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 011.04 called "));
+
+	SetTestStepResult(EPass);
+	// Heap test for 011.01
+
+	CCommDbTest011_01* step011_01 = new CCommDbTest011_01;
+	CleanupStack::PushL(step011_01);
+	if ( doTestStepWithHeapFailureL( *step011_01, KErrNotFound) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step011_01);
+
+
+	// Heap test for 011.02
+	CCommDbTest011_02* step011_02 = new CCommDbTest011_02;
+	CleanupStack::PushL(step011_02);
+	if ( doTestStepWithHeapFailureL( *step011_02, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step011_02);
+
+	// Heap test for 011.03
+	CCommDbTest011_03* step011_03 = new CCommDbTest011_03;
+	CleanupStack::PushL(step011_03);
+	if ( doTestStepWithHeapFailureL( *step011_03, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step011_03);
+
+	return TestStepResult();	
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_012_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,505 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 012.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_012_xx.h"
+
+
+
+/////////////////////
+//	Test step 012.001
+/////////////////////
+
+// constructor
+CCommDbTest012_01::CCommDbTest012_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_012_01"));
+	}
+
+// destructor
+CCommDbTest012_01::~CCommDbTest012_01()
+	{
+	}
+
+
+TVerdict CCommDbTest012_01::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest012_01::executeStepL()
+	{
+	TInt ret=KErrNone;
+
+	//This query should select 3 records
+	iTheView = iTheDb->OpenViewLC( TPtrC(DIAL_IN_ISP),_L("select * from DialInISP where Ifname='PPP'") );
+	CleanupStack::Pop();
+
+	//Now check that the records are what we expect
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+
+	//Read the value from the field and compare it to the expected value
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( value.Compare(_L("Record #1")) )
+		{
+		ret = KErrGeneral;
+		}
+
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( value.Compare(_L("Record #2")) )
+		{
+		ret = KErrGeneral;
+		}
+
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( value.Compare(_L("Record #5 (Read Only)")) )
+		{
+		ret = KErrGeneral;
+		}
+
+	CDBLEAVE( ret = iTheView->GotoNextRecord(), KErrNotFound);
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest012_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 012.01 called "));
+
+	
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 012.02
+/////////////////////
+
+// constructor
+CCommDbTest012_02::CCommDbTest012_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_012_02"));
+
+	}
+
+// destructor
+CCommDbTest012_02::~CCommDbTest012_02()
+	{
+	}
+
+TVerdict CCommDbTest012_02::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest012_02::executeStepL()
+	{
+	TInt ret=KErrNone;
+
+	//This query should select 0 records
+	iTheView = iTheDb->OpenViewLC( TPtrC(DIAL_IN_ISP),_L("select * from DialInISP where Ifname='XXX'") );
+	CleanupStack::Pop();
+
+	CDBLEAVE(ret = iTheView->GotoFirstRecord(), KErrNotFound );
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest012_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 012.02 called "));
+
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 012.03
+/////////////////////
+
+// constructor
+CCommDbTest012_03::CCommDbTest012_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_012_03"));
+
+	}
+
+// destructor
+CCommDbTest012_03::~CCommDbTest012_03()
+	{
+	}
+
+
+TVerdict CCommDbTest012_03::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest012_03::executeStepL()
+	{
+	TInt ret=KErrNone;
+
+	//This query should select 1 record
+	iTheView = iTheDb->OpenViewLC( TPtrC(DIAL_IN_ISP),_L("select * from DialInISP where Name='Record #3'") );
+	CleanupStack::Pop();
+
+	//Read the value from the field and compare it to the expected value
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( value.Compare(_L("Record #3")) )
+		{
+		ret = KErrGeneral;
+		}
+
+	//Check that there was only one record
+	CDBLEAVE( ret = iTheView->GotoNextRecord(), KErrNotFound );
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest012_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 012.03 called "));
+
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);	
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 012.04
+/////////////////////
+
+// constructor
+CCommDbTest012_04::CCommDbTest012_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_012_04"));
+	// default to no local objects allocated
+	iLocalObjects = EFalse;
+	}
+
+// destructor
+CCommDbTest012_04::~CCommDbTest012_04()
+	{
+	}
+
+TVerdict CCommDbTest012_04::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest012_04::executeStepL()
+	{
+	TInt ret=KErrNone;
+
+	//This query should select al1 records
+	iTheView = iTheDb->OpenViewLC( TPtrC(DIAL_IN_ISP),_L("select * from DialInISP") );
+	CleanupStack::Pop();
+
+	//For each expected record read the value from the field and compare it to the expected value
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( value.Compare(_L("Record #1")) )
+		{
+		ret = KErrGeneral;
+		}
+
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( value.Compare(_L("Record #2")) )
+		{
+		ret = KErrGeneral;
+		}
+
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( value.Compare(_L("Record #3")) )
+		{
+		ret = KErrGeneral;
+		}
+
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( value.Compare(_L("Record #4")) )
+		{
+		ret = KErrGeneral;
+		}
+
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( value.Compare(_L("Record #5")) )
+		{
+		ret = KErrGeneral;
+		}
+	//Check there no more records
+
+	CDBLEAVE( ret = iTheView->GotoNextRecord(), KErrNotFound );
+		
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest012_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 012.04 called "));
+
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 012.05
+/////////////////////
+
+// constructor
+CCommDbTest012_05::CCommDbTest012_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_012_05"));
+	// default to no local objects allocated
+	iLocalObjects = EFalse;
+	}
+
+// destructor
+CCommDbTest012_05::~CCommDbTest012_05()
+	{
+	}
+
+TVerdict CCommDbTest012_05::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest012_05::myOpenViewL()
+{
+	//This query contains an erroneous query
+//	TRAPD( r, iTheView = iTheDb->OpenViewLC( TPtrC(DIAL_IN_ISP),_L("select * from DialInISP where") ) );
+	 iTheView = iTheDb->OpenViewLC( TPtrC(DIAL_IN_ISP),_L("select * from DialInISP where") ) ;
+
+	
+	return 0;
+}
+
+
+TInt CCommDbTest012_05::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	TRAPD(r, myOpenViewL() );
+
+	if ( r!=KErrNone )
+		ret = r;
+
+	
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest012_05::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 012.05 called "));
+
+	
+	if ( executeStepL() == KErrArgument )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 012.06
+/////////////////////
+
+// constructor
+CCommDbTest012_06::CCommDbTest012_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_012_06"));
+	}
+
+// destructor
+CCommDbTest012_06::~CCommDbTest012_06()
+	{
+	}
+
+TVerdict CCommDbTest012_06::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest012_06::myOpenViewL()
+{
+	//This query contains an erroneous query
+	iTheView = iTheDb->OpenViewLC( TPtrC(DIAL_IN_ISP),_L("") );
+
+	
+	return 0;
+}
+
+
+TInt CCommDbTest012_06::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	TRAPD(r, myOpenViewL() );
+
+	if (r!=KErrNone )
+		ret = r;
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest012_06::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 012.06 called "));
+	
+	if ( executeStepL() == KErrArgument )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 012.07
+/////////////////////
+
+// constructor
+CCommDbTest012_07::CCommDbTest012_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_012_07"));
+	}
+
+// destructor
+CCommDbTest012_07::~CCommDbTest012_07()
+	{
+	}
+
+TVerdict CCommDbTest012_07::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 012.07 called "));
+
+	SetTestStepResult(EPass);
+/*	// Heap test for 012.01
+
+#if 1
+	CCommDbTest012_01* step012_01 = new CCommDbTest012_01;
+	CleanupStack::PushL(step012_01);
+	doTestStepWithHeapFailureL( *step012_01, KErrNotFound);
+	if ( step012_01->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step012_01);
+#endif
+
+	// Heap test for 012.02
+
+	CCommDbTest012_02* step012_02 = new CCommDbTest012_02;
+	CleanupStack::PushL(step012_02);
+	doTestStepWithHeapFailureL( *step012_02, KErrNotFound);
+	if ( step012_02->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step012_02);
+
+*/	// Heap test for 012.03
+
+	CCommDbTest012_03* step012_03 = new CCommDbTest012_03;
+	CleanupStack::PushL(step012_03);
+	doTestStepWithHeapFailureL( *step012_03, KErrNotFound);
+	if ( step012_03->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step012_03);
+
+	// Heap test for 012.04
+
+	CCommDbTest012_04* step012_04 = new CCommDbTest012_04;
+	CleanupStack::PushL(step012_04);
+	doTestStepWithHeapFailureL( *step012_04, KErrNotFound);
+	if( step012_04->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step012_04);
+
+	// Heap test for 012.05
+
+	CCommDbTest012_05* step012_05 = new CCommDbTest012_05;
+	CleanupStack::PushL(step012_05);
+	doTestStepWithHeapFailureL( *step012_05, KErrArgument);
+	if( step012_05->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step012_05);
+
+
+	// Heap test for 012.06
+
+	CCommDbTest012_06* step012_06 = new CCommDbTest012_06;
+	CleanupStack::PushL(step012_06);
+	doTestStepWithHeapFailureL( *step012_06, KErrArgument);
+	if( step012_06->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step012_06);
+
+	return TestStepResult();	
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_013_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,301 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 013.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_013_xx.h"
+
+
+
+/////////////////////
+//	Test step 013.001
+/////////////////////
+
+// constructor
+CCommDbTest013_01::CCommDbTest013_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_013_01"));
+	}
+
+// destructor
+CCommDbTest013_01::~CCommDbTest013_01()
+	{
+	}
+
+
+TVerdict CCommDbTest013_01::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_IN_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest013_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+
+	//Update an existing record
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	
+	//Check the value is what we expect 
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	TEST( !value.Compare(_L("Record #1")) );
+
+	//Update the value in the field
+	TRAPD(r, iTheView->UpdateRecord() );
+	iTheView->WriteTextL( TPtrC(COMMDB_NAME), _L("Updated Record #1") );
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+
+	delete iTheView;
+	iTheView = 0;
+
+	//Open the view again and check for the updated value
+	iTheView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP) );
+	CleanupStack::Pop();
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	
+	if ( !value.Compare(_L("Updated Record #1")) )
+		{
+		//Found the record, even though it is hidden
+		ret = KErrNone;
+		}
+
+	if ( r!= KErrNone )
+		{
+		ret = r;
+		}
+
+
+	if ( iLocalObjects )
+		popAndDestroyDatabaseObjects();
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest013_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 013.01 called "));
+
+	
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 013.02
+/////////////////////
+
+// constructor
+CCommDbTest013_02::CCommDbTest013_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_013_02"));
+	}
+
+// destructor
+CCommDbTest013_02::~CCommDbTest013_02()
+	{
+	}
+
+
+TVerdict CCommDbTest013_02::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest013_02::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	//This view must contain zero records
+	//NB. This test will crash the server
+
+	iTheView = iTheDb->OpenViewLC(TPtrC(DIAL_IN_ISP), _L("Select * from DialInISP where IfNetworks='xxx'") );
+	CleanupStack::Pop();
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNotFound );
+	
+	TRAPD(r, ret = iTheView->UpdateRecord() );
+
+	if ( r!= KErrNone )
+		{
+		ret = r;
+		}
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest013_02::doTestStepL( )
+	{
+	TRAPD(ret, executeStepL());
+	if( ret == KErrNotSupported )
+		SetTestStepResult(EPass);
+	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 013.03
+/////////////////////
+
+// constructor
+CCommDbTest013_03::CCommDbTest013_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_013_03"));
+	}
+
+// destructor
+CCommDbTest013_03::~CCommDbTest013_03()
+	{
+	}
+
+TVerdict CCommDbTest013_03::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_IN_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest013_03::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id;
+
+	//Try to insert a read only record
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+
+	//Insert some text
+	iTheView->WriteTextL( TPtrC(COMMDB_NAME), _L("Example record name") ) ;
+
+	//Must write to these columns as they cannot hold null values
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), _L("PPP") );
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+
+	//Store the record as hidden
+	CDBLEAVE( iTheView->PutRecordChanges(EFalse, ETrue), KErrNone );
+
+	delete iTheView;
+	iTheView = 0;
+
+    iTheView = iTheDb->OpenViewMatchingTextLC(TPtrC(DIAL_IN_ISP), TPtrC(COMMDB_NAME),  _L("Example record name") );
+	CleanupStack::Pop();
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	TRAPD(r, ret = iTheView->UpdateRecord() );
+
+	delete iTheView;
+	iTheView = 0;
+
+
+	if ( r!= KErrNone )
+		{
+		ret = r;
+		}
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest013_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 013.03 called "));
+
+	if ( executeStepL() == KErrAccessDenied )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+
+
+
+	
+/////////////////////
+//	Test step 013.04
+/////////////////////
+
+// constructor
+CCommDbTest013_04::CCommDbTest013_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_013_04"));
+	}
+
+// destructor
+CCommDbTest013_04::~CCommDbTest013_04()
+	{
+	}
+
+TVerdict CCommDbTest013_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 013.04 called "));
+
+	SetTestStepResult(EPass);
+	// Heap test for 013.01
+
+	CCommDbTest013_01* step013_01 = new CCommDbTest013_01;
+	CleanupStack::PushL(step013_01);
+	if ( doTestStepWithHeapFailureL( *step013_01, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step013_01);
+
+	// Heap test for 013.02
+	// SQl interface is deprecated from 9.1
+
+	CCommDbTest013_02* step013_02 = new CCommDbTest013_02;
+	CleanupStack::PushL(step013_02);
+	if ( doTestStepWithHeapFailureL( *step013_02, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step013_02);
+
+	// Heap test for 013.03
+
+	CCommDbTest013_03* step013_03 = new CCommDbTest013_03;
+	CleanupStack::PushL(step013_03);
+	doTestStepWithHeapFailureL( *step013_03, KErrAccessDenied);
+	if ( step013_03->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step013_03);
+
+	return TestStepResult();	
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_014_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,302 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 014.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_014_xx.h"
+
+
+
+/////////////////////
+//	Test step 014.01
+/////////////////////
+
+// constructor
+CCommDbTest014_01::CCommDbTest014_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_014_01"));
+	}
+
+// destructor
+CCommDbTest014_01::~CCommDbTest014_01()
+	{
+	}
+
+TVerdict CCommDbTest014_01::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(MODEM_BEARER));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest014_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id;
+
+	//Create a record and cancel it
+	//NB. This test assumes the Modem table will be empty
+
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+	
+	_LIT(KModem,"US Robotics Sportster");
+	_LIT(KTsy,"HAYES");
+	_LIT8(KModemInitString,"AT&F1");
+	_LIT8(KModemFaxInitString,"AT&d2");
+	//Write some sample data into the table
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KModem);
+	iTheView->WriteTextL(TPtrC(MODEM_NIF_NAME),_L("PPP"));
+	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
+	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
+	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
+	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
+	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
+	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
+	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
+	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
+	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
+	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
+
+	//Now cancel the insert and close the view
+	iTheView->CancelRecordChanges();
+	
+	delete iTheView;
+	iTheView = 0;
+
+	//Open a view and check record was not written into the database
+	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(MODEM_BEARER), TPtrC(COMMDB_NAME), KModem);
+	CleanupStack::Pop();
+
+	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNotFound );
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest014_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 014.01 called "));
+
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 014.02
+/////////////////////
+
+// constructor
+CCommDbTest014_02::CCommDbTest014_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_014_02"));
+	}
+
+// destructor
+CCommDbTest014_02::~CCommDbTest014_02()
+	{
+	}
+
+TVerdict CCommDbTest014_02::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(MODEM_BEARER));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest014_02::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id;
+
+	
+	//Insert a new record, try to update it and cancel the update
+	//NB. This test assumes the Modem table will be empty
+
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+	
+	_LIT(KModem,"US Robotics Sportster");
+	_LIT(KTsy,"HAYES");
+	_LIT8(KModemInitString,"AT&F1");
+	_LIT8(KModemFaxInitString,"AT&d2");
+	//Write some sample data into the table
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KModem);
+	iTheView->WriteTextL(TPtrC(MODEM_NIF_NAME),_L("PPP"));
+	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
+	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
+	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
+	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
+	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
+	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
+	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
+	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
+	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
+	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
+
+	//Insert the record and destroy the view
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+	
+	delete iTheView;
+	iTheView = 0;
+
+	//Open a view and make a change to the record just written
+	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(MODEM_BEARER), TPtrC(COMMDB_NAME), KModem);
+	CleanupStack::Pop();
+
+	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
+	CDBLEAVE( iTheView->UpdateRecord(), KErrNone );
+	_LIT(KModem2,"Another US Robotics Sportster");
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME), KModem2 );
+	
+	//Cancel the changes made and destroy the view
+	iTheView->CancelRecordChanges();
+
+	delete iTheView;
+	iTheView = 0;
+
+	//Open a view to check that the record was not modified
+	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(MODEM_BEARER), TPtrC(COMMDB_NAME), KModem);
+	CleanupStack::Pop();
+
+	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest014_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 014.02 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 014.03
+/////////////////////
+
+// constructor
+CCommDbTest014_03::CCommDbTest014_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_014_03"));
+	}
+
+// destructor
+CCommDbTest014_03::~CCommDbTest014_03()
+	{
+	}
+
+TVerdict CCommDbTest014_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 014.03 called "));
+
+	SetTestStepResult(EPass);
+		// Heap test for 014.01
+
+	CCommDbTest014_01* step014_01 = new CCommDbTest014_01;
+	CleanupStack::PushL(step014_01);
+	doTestStepWithHeapFailureL( *step014_01, KErrNotFound);
+	if ( step014_01->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step014_01);
+
+		// Heap test for 014.02
+
+	CCommDbTest014_02* step014_02 = new CCommDbTest014_02;
+	CleanupStack::PushL(step014_02);
+	doTestStepWithHeapFailureL( *step014_02, KErrNone);
+	if ( step014_02->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step014_02);
+
+	return TestStepResult();	
+
+}
+
+/////////////////////
+//	Test step 014.04
+/////////////////////
+
+// constructor
+CCommDbTest014_04::CCommDbTest014_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_014_04"));
+	}
+
+// destructor
+CCommDbTest014_04::~CCommDbTest014_04()
+	{
+	}
+
+TVerdict CCommDbTest014_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 014_04 called "));
+
+	SetTestStepResult(EPass);
+__UHEAP_MARK;
+ 
+
+    CCommsDatabase* db = CCommsDatabase::NewL( );
+    CleanupStack::PushL( db );
+   
+    CCommsDbTableView* v =
+        db->OpenTableLC( TPtrC(WAP_ACCESS_POINT ) );
+
+    TUint32 dummyUid( 0 );
+
+
+    TInt err = v->InsertRecord( dummyUid );
+    User::LeaveIfError( err );
+    v->CancelRecordChanges();
+
+   
+    CleanupStack::PopAndDestroy( v );
+    CleanupStack::PopAndDestroy( db );
+
+__UHEAP_MARKEND;
+
+	return TestStepResult();	
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_015_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,1339 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 015.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_015_xx.h"
+
+
+
+/////////////////////
+//	Test step 015.01
+/////////////////////
+
+// constructor
+CCommDbTest015_01::CCommDbTest015_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_015_01"));
+	}
+
+// destructor
+CCommDbTest015_01::~CCommDbTest015_01()
+	{
+	}
+
+
+TVerdict CCommDbTest015_01::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest015_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Check the inTransaction flag
+
+	TRAPD(r, iTheDb->BeginTransaction() );
+
+	ret  = !(iTheDb->InTransaction() );
+
+	if ( r != KErrNone )
+		{
+		ret = r;
+		}
+
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest015_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 015.01 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 015.02
+/////////////////////
+
+// constructor
+CCommDbTest015_02::CCommDbTest015_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_015_02"));
+	}
+
+// destructor
+CCommDbTest015_02::~CCommDbTest015_02()
+	{
+	}
+
+TVerdict CCommDbTest015_02::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(MODEM_BEARER));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+	
+
+
+TInt CCommDbTest015_02::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	TUint32 id;
+	TBool beforeValue=EFalse, afterValue=EFalse;
+
+	
+	//Check that the write lock flag is set when the
+	//database is written to.
+	//Take a copy of the flag before we insert a record
+	TRAPD(r, beforeValue = iTheDb->IsDatabaseWriteLockedL() );
+
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+	
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+
+	//Take a copy after the insert
+	afterValue = iTheDb->IsDatabaseWriteLockedL();
+
+	iTheView->CancelRecordChanges();
+
+	//Now get the flag value after the record has been written
+
+	if ( r == KErrNone )
+		{
+		if ( !beforeValue  && afterValue  )
+			ret = KErrNone;
+		}
+		else
+		{	
+			//return the trap value
+			ret = r;
+		}
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest015_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 015.02 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 015.03
+/////////////////////
+
+// constructor
+CCommDbTest015_03::CCommDbTest015_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_015_03"));
+	// default to no local objects allocated
+	}
+
+// destructor
+CCommDbTest015_03::~CCommDbTest015_03()
+	{
+	}
+
+TVerdict CCommDbTest015_03::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(MODEM_BEARER));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest015_03::executeStepL()
+	{
+	TUint32 id;
+
+	//Commit a record and check for correct state of flags
+
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+
+	_LIT(KName,"CCommDbTest015_03");
+	_LIT(KTsy,"HAYES");
+	_LIT8(KModemInitString,"AT&F1");
+	_LIT8(KModemFaxInitString,"AT&d2");
+	//Write some sample data into the table
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KName);
+	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
+	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
+	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
+	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
+	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
+	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
+	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
+	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
+	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
+	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
+
+	CDBLEAVE ( iTheView->PutRecordChanges(), KErrNone );
+	User::LeaveIfError(iTheDb->CommitTransaction());
+
+	delete iTheView;
+	iTheView=NULL;
+
+	//Create a new view that should have the record in it
+	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(MODEM_BEARER), TPtrC(COMMDB_NAME), KName);
+	CleanupStack::Pop();
+
+	User::LeaveIfError(iTheView->GotoFirstRecord());	//Will leave if first record isn't there
+
+	if (! iTheDb->IsDatabaseWriteLockedL() && ! iTheDb->InTransaction() )
+			return KErrNone;
+
+	return KErrGeneral;
+	}
+
+
+
+TVerdict CCommDbTest015_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 015.03 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+
+
+/////////////////////
+//	Test step 015.04
+/////////////////////
+
+// constructor
+CCommDbTest015_04::CCommDbTest015_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_015_04"));
+	// default to no local objects allocated
+	}
+
+// destructor
+CCommDbTest015_04::~CCommDbTest015_04()
+	{
+	}
+
+TVerdict CCommDbTest015_04::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(MODEM_BEARER));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest015_04::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id;
+
+	
+	//Check that we can rollback a transaction
+	//NB Test assumes that the table is empty
+
+
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+
+	_LIT(KName,"CCommDbTest015_04");
+	_LIT(KTsy,"HAYES");
+	_LIT8(KModemInitString,"AT&F1");
+	_LIT8(KModemFaxInitString,"AT&d2");
+	//Write some sample data into the table
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KName);
+	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
+	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
+	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
+	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
+	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
+	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
+	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
+	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
+	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
+	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+
+	//Rollback the record we've just written
+	TRAPD(r, iTheDb->RollbackTransaction() );
+
+	//Get rid of our view
+	delete iTheView;
+	iTheView=0;
+
+	//Create a new view that should have the record in it
+	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(MODEM_BEARER), TPtrC(COMMDB_NAME), KName);
+
+	CleanupStack::Pop();
+
+	ret = iTheView->GotoFirstRecord();
+
+	if ( r == KErrNone )
+		{
+		if ( ret == KErrNotFound )
+			ret = KErrNone;
+		else
+			ret = KErrGeneral;
+		}
+	else
+		{	
+		//Trap occoured, so return that value instead
+		ret = r;
+		}
+
+	
+	return ret;
+	}
+
+TVerdict CCommDbTest015_04::doTestStepPostambleL()
+	{
+	
+	//Get rid of our view
+	if(iTheView)
+		{
+		delete iTheView;
+		}
+	iTheView=0;
+
+	_LIT(KName,"CCommDbTest015_04");
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(MODEM_BEARER), TPtrC(COMMDB_NAME), KName);
+	CleanupStack::Pop();
+
+	if(iTheView->GotoFirstRecord() == KErrNone)
+		{
+		iTheView->DeleteRecord();
+		}
+
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest015_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 015.04 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 015.05
+/////////////////////
+
+// constructor
+CCommDbTest015_05::CCommDbTest015_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_015_05"));
+	}
+
+// destructor
+CCommDbTest015_05::~CCommDbTest015_05()
+	{
+	}
+
+
+TVerdict CCommDbTest015_05::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(MODEM_BEARER));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest015_05::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id;
+
+	//Try to rollback without a prior call to BeginTransaction()
+
+	//
+	// NB. This test will cause the DBMS server to Panic!
+	//
+
+
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+
+	_LIT(KName,"CCommDbTest015_05");
+	_LIT(KTsy,"HAYES");
+	_LIT8(KModemInitString,"AT&F1");
+	_LIT8(KModemFaxInitString,"AT&d2");
+	//Write some sample data into the table
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KName);
+	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
+	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
+	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
+	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
+	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
+	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
+	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
+	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
+	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
+	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
+
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+	//This will cause a panic
+	TRAPD(r, iTheDb->RollbackTransaction() );
+
+	delete iTheView ;
+	iTheView=0;
+
+	//Create a new view that would have the record in it
+	iTheView = iTheDb->OpenViewLC(TPtrC(MODEM_BEARER), _L("Select * from Modem where Name='CCommDbTest015_05'") );
+	CleanupStack::Pop();
+
+
+	ret = iTheView->GotoFirstRecord();
+
+	if ( r == KErrNone )
+		{
+		if ( ret == KErrNotFound  )
+			ret = KErrNone;
+		else
+			ret = KErrGeneral;
+		}
+	else
+		{	
+		//Trap occoured, so return that value instead
+		ret = r;
+		}
+
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest015_05::doTestStepPostambleL()
+	{
+	//Get rid of our view
+	if(iTheView)
+		{
+		delete iTheView;
+		}
+	iTheView=0;
+
+	_LIT(KName,"CCommDbTest015_05");
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(MODEM_BEARER), TPtrC(COMMDB_NAME), KName);
+	CleanupStack::Pop();
+
+	if(iTheView->GotoFirstRecord() == KErrNone)
+		{
+		iTheView->DeleteRecord();
+		}
+
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TVerdict CCommDbTest015_05::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 015.05 called "));
+
+	TRAPD(leaveCode, executeStepL());
+	if (leaveCode != KErrNotSupported) // SQL views no longer supported
+		{
+		SetTestStepResult(EFail);		}
+
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 015.06
+/////////////////////
+
+// constructor
+CCommDbTest015_06::CCommDbTest015_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_015_06"));
+	}
+
+// destructor
+CCommDbTest015_06::~CCommDbTest015_06()
+	{
+	}
+
+TVerdict CCommDbTest015_06::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(MODEM_BEARER));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest015_06::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id;
+
+	//Try to commit without a prior call to BeginTransaction()
+
+	//
+	// NB. This test will cause the DBMS server to Panic!
+	//
+
+
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+
+	_LIT(KName,"CCommDbTest015_06");
+	_LIT(KTsy,"HAYES");
+	_LIT8(KModemInitString,"AT&F1");
+	_LIT8(KModemFaxInitString,"AT&d2");
+	//Write some sample data into the table
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KName);
+	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
+	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
+	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
+	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
+	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
+	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
+	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
+	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
+	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
+	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
+
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+	//This will cause a panic
+	TRAPD(r, iTheDb->CommitTransaction() );
+
+	delete  iTheView ;
+	iTheView=0;
+
+	//Create a new view that would have the record in it
+	iTheView = iTheDb->OpenViewLC(TPtrC(MODEM_BEARER), _L("Select * from Modem where Name='CCommDbTest015_06'") );
+	CleanupStack::Pop();
+
+	ret = iTheView->GotoFirstRecord();
+
+	if ( r == KErrNone )
+		{
+		if ( ret == KErrNotFound  )
+			ret = KErrNone;
+		else
+			ret = KErrGeneral;
+		}
+	else
+		{	
+		//Trap occoured, so return that value instead
+		ret = r;
+		}
+
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest015_06::doTestStepPostambleL()
+	{
+	//Get rid of our view
+	if(iTheView)
+		{
+		delete iTheView;
+		}
+	iTheView=0;
+
+	_LIT(KName,"CCommDbTest015_06");
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(MODEM_BEARER), TPtrC(COMMDB_NAME), KName);
+	CleanupStack::Pop();
+
+	if(iTheView->GotoFirstRecord() == KErrNone)
+		{
+		iTheView->DeleteRecord();
+		}
+
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TVerdict CCommDbTest015_06::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 015.06 called "));
+
+	TRAPD(leaveCode, executeStepL());
+	if (leaveCode != KErrNotSupported) // SQL views no longer supported
+		{
+		SetTestStepResult(EFail);		}
+
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 015.07
+/////////////////////
+
+// constructor
+CCommDbTest015_07::CCommDbTest015_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_015_07"));
+	}
+
+// destructor
+CCommDbTest015_07::~CCommDbTest015_07()
+	{
+	}
+
+
+TVerdict CCommDbTest015_07::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(MODEM_BEARER));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest015_07::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id;
+
+
+	//Close the database while inside a transaction
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+
+	_LIT(KName,"CCommDbTest015_07");
+	_LIT(KTsy,"HAYES");
+	_LIT8(KModemInitString,"AT&F1");
+	_LIT8(KModemFaxInitString,"AT&d2");
+	//Write some sample data into the table
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KName);
+	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
+	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
+	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
+	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
+	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
+	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
+	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
+	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
+	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
+	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
+
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+	
+	delete  iTheView ;
+	iTheView=0;
+
+	//Close the DB
+	delete iTheDb;
+	iTheDb = 0;
+
+	//NB Only get here if we didnt trap, so it must have passed
+	ret = KErrNone;
+
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest015_07::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 015.07 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 015.08
+/////////////////////
+
+// constructor
+CCommDbTest015_08::CCommDbTest015_08()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_015_08"));
+	}
+
+// destructor
+CCommDbTest015_08::~CCommDbTest015_08()
+	{
+	}
+
+
+TVerdict CCommDbTest015_08::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest015_08::tryDatabaseWriteL(void)
+{
+	TInt ret;
+
+	//Open the database
+	CCommsDatabase* theDb;
+	theDb=CCommsDatabase::NewL(EDatabaseTypeIAP);
+	CleanupStack::PushL(theDb);
+
+	//Open a view
+	CCommsDbTableView* theView;
+	theView = theDb->OpenTableLC( TPtrC(DIAL_OUT_ISP) );
+
+	//Try to write
+	TUint32 id;
+	ret = theView->InsertRecord( id );
+
+	CleanupStack::PopAndDestroy(2);
+
+	return ret;
+}
+
+//
+//	This function is executed as a separate thread from Step 015_08.
+//  It will try to write to the database, and should fail, as the database
+//  will be write locked by CCommDbTest015_08::executeStepL()
+//
+TInt CCommDbTest015_08::step015_08Thread ( void * /*ptr*/ )
+	{
+	TInt ret=KErrGeneral;
+
+	// get clean-up stack
+	CTrapCleanup* cleanup=CTrapCleanup::New(); 
+
+	if(!cleanup)
+		return KErrNoMemory;
+	//try to write to the database
+	TRAPD(r, ret = tryDatabaseWriteL() );
+
+	if ( r!=KErrNone )
+		ret = r;
+
+	// done with the clean up stack
+	delete cleanup; 
+
+	
+	return ret;		
+	}
+
+TInt CCommDbTest015_08::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+
+	//Lock the database, then request another thread to attempt a write
+
+	//Start an insert to lock the database
+	TUint32 id;
+	
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+
+	TEST( iTheDb->IsDatabaseWriteLockedL() );
+	
+	//Set up a new thread
+	RThread t;
+
+	TInt res=t.Create(_L("Step015_08Thread"),step015_08Thread, KDefaultStackSize,&User::Heap(),0 );
+
+	if ( res != KErrNone )
+		User::Leave( res );
+
+	// start the thread and request the status
+	TRequestStatus stat;
+	t.Logon(stat);
+	t.Resume();
+	User::WaitForRequest(stat);
+
+	// get the test result
+	ret =  stat.Int();
+
+	TExitType exitVal = t.ExitType();	
+	TEST( exitVal == EExitKill );
+		
+	// done with the test thread
+	t.Close();
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest015_08::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 015.08 called "));
+
+	if ( executeStepL() == KErrLocked )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 015.09
+/////////////////////
+
+// constructor
+CCommDbTest015_09::CCommDbTest015_09()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_015_09"));
+	}
+
+// destructor
+CCommDbTest015_09::~CCommDbTest015_09()
+	{
+	}
+
+TInt CCommDbTest015_09::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+
+	TPtrC tableName(MODEM_BEARER);
+
+	iTheDb=CCommsDatabase::NewL();
+
+
+	TUint32 recordToInsert;
+	TUint32 recordToUpdate;
+	TUint32 recordToDelete;
+	TBuf8<128> fieldValue1, fieldValue2;
+	_LIT8(KModemInitString, "ABCDE");
+
+	////////////////////////////////////////////////////////////////////////////////
+	// rollback transaction test
+
+	// open view, insert record, delete view
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+		{
+		iTheView=iTheDb->OpenTableLC(tableName);
+		CleanupStack::Pop(iTheView);
+
+		CDBLEAVE( iTheView->InsertRecord(recordToInsert), KErrNone );
+		CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+		
+		delete  iTheView ;
+		iTheView=0;
+		}
+	iTheDb->RollbackTransaction();
+
+	// the inserted record must be rolled back
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+		{
+		iTheView=iTheDb->OpenViewMatchingUintLC(tableName, TPtrC(COMMDB_ID), recordToInsert);
+		CleanupStack::Pop(iTheView);
+
+		// there must be no records found
+		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNotFound );
+		
+		delete  iTheView ;
+		iTheView=0;
+		}
+	iTheDb->RollbackTransaction();
+
+	// open view, update record, delete view
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+		{
+		iTheView=iTheDb->OpenTableLC(tableName);
+		CleanupStack::Pop(iTheView);
+
+		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+		iTheView->ReadUintL(TPtrC(COMMDB_ID), recordToUpdate);
+		iTheView->ReadTextL(TPtrC(MODEM_MODEM_INIT_STRING), fieldValue1);
+		CDBLEAVE( iTheView->UpdateRecord(), KErrNone );
+		iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING), KModemInitString);
+		CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+		
+		delete  iTheView ;
+		iTheView=0;
+		}
+	iTheDb->RollbackTransaction();
+
+	// the updated record must be rolled back
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+		{
+		iTheView=iTheDb->OpenViewMatchingUintLC(tableName, TPtrC(COMMDB_ID), recordToUpdate);
+		CleanupStack::Pop(iTheView);
+
+		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+		iTheView->ReadTextL(TPtrC(MODEM_MODEM_INIT_STRING), fieldValue2);
+		
+		if (fieldValue1 != fieldValue2)
+			{
+			User::Leave(KErrGeneral);
+			}
+		
+		delete  iTheView ;
+		iTheView=0;
+		}
+	iTheDb->RollbackTransaction();
+
+	// open view, delete record, delete view
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+		{
+		iTheView=iTheDb->OpenTableLC(tableName);
+		CleanupStack::Pop(iTheView);
+
+		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+		iTheView->ReadUintL(TPtrC(COMMDB_ID), recordToDelete);
+		CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
+		
+		delete  iTheView ;
+		iTheView=0;
+		}
+	iTheDb->RollbackTransaction();
+
+	// the deleted record must be rolled back
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+		{
+		iTheView=iTheDb->OpenViewMatchingUintLC(tableName, TPtrC(COMMDB_ID), recordToDelete);
+		CleanupStack::Pop(iTheView);
+
+		// the record must still be there
+		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+		CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+		
+		delete  iTheView ;
+		iTheView=0;
+		}
+	iTheDb->RollbackTransaction();
+
+
+
+	////////////////////////////////////////////////////////////////////////////////
+	// commit transaction test
+
+	// open view, insert record, delete view
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+		{
+		iTheView=iTheDb->OpenTableLC(tableName);
+		CleanupStack::Pop(iTheView);
+
+		CDBLEAVE( iTheView->InsertRecord(recordToInsert), KErrNone );
+		CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+		
+		delete  iTheView ;
+		iTheView=0;
+		}
+	iTheDb->CommitTransaction();
+
+	// the inserted records must be commited
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+		{
+		iTheView=iTheDb->OpenViewMatchingUintLC(tableName, TPtrC(COMMDB_ID), recordToInsert);
+		CleanupStack::Pop(iTheView);
+
+		// the record must have been inserted
+		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+		CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+		
+		delete  iTheView ;
+		iTheView=0;
+		}
+	iTheDb->RollbackTransaction();
+
+
+	// open view, update record, delete view
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+		{
+		iTheView=iTheDb->OpenTableLC(tableName);
+		CleanupStack::Pop(iTheView);
+
+		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+		iTheView->ReadUintL(TPtrC(COMMDB_ID), recordToUpdate);
+		iTheView->ReadTextL(TPtrC(MODEM_MODEM_INIT_STRING), fieldValue1);
+		CDBLEAVE( iTheView->UpdateRecord(), KErrNone );
+		iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING), KModemInitString);
+		CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+		
+		delete  iTheView ;
+		iTheView=0;
+		}
+	iTheDb->CommitTransaction();
+
+	// the updated record must be rolled back
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+		{
+		iTheView=iTheDb->OpenViewMatchingUintLC(tableName, TPtrC(COMMDB_ID), recordToUpdate);
+		CleanupStack::Pop(iTheView);
+
+		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+		iTheView->ReadTextL(TPtrC(MODEM_MODEM_INIT_STRING), fieldValue2);
+		
+		if (fieldValue2 != KModemInitString)
+			{
+			User::Leave(KErrGeneral);
+			}
+		
+		delete  iTheView ;
+		iTheView=0;
+		}
+	iTheDb->RollbackTransaction();
+
+
+	// open view, delete record, delete view
+	// unfortunately we cannot do heap marking here because of commsdtat notifications
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+		{
+		iTheView=iTheDb->OpenTableLC(tableName);
+		CleanupStack::Pop(iTheView);
+
+		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+		iTheView->ReadUintL(TPtrC(COMMDB_ID), recordToDelete);
+		CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
+		
+		delete  iTheView ;
+		iTheView=0;
+		}
+	iTheDb->CommitTransaction();
+
+	// the deleted records must be commited
+	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+		{
+		iTheView=iTheDb->OpenViewMatchingUintLC(tableName, TPtrC(COMMDB_ID), recordToDelete);
+		CleanupStack::Pop(iTheView);
+
+		// the record must have been deleted
+		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNotFound );
+		
+		delete  iTheView ;
+		iTheView=0;
+		}
+	iTheDb->RollbackTransaction();
+
+	//Close the DB
+	delete iTheDb;
+	iTheDb = 0;
+
+	//NB Only get here if we didnt trap, so it must have passed
+	ret = KErrNone;
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest015_09::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 015.09 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+
+
+/////////////////////
+//	Test step 015.10
+/////////////////////
+
+// constructor
+CCommDbTest015_10::CCommDbTest015_10()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_015_10"));
+	}
+
+// destructor
+CCommDbTest015_10::~CCommDbTest015_10()
+	{
+	}
+
+TVerdict CCommDbTest015_10::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 015.10 called "));
+
+	SetTestStepResult(EPass);	
+	// Have backup of Database in c:\default1.dat
+
+		// Heap test for 015.01
+
+	CCommDbTest015_01* step015_01 = new(ELeave) CCommDbTest015_01;
+	CleanupStack::PushL(step015_01);
+	doTestStepWithHeapFailureL( *step015_01, KErrNone);
+	if ( step015_01->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step015_01);
+
+
+
+	return TestStepResult();	
+
+}
+
+/////////////////////
+//	Test step 015.11
+/////////////////////
+
+// constructor
+CCommDbTest015_11::CCommDbTest015_11()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_015_11"));
+	}
+
+// destructor
+CCommDbTest015_11::~CCommDbTest015_11()
+	{
+	}
+
+TVerdict CCommDbTest015_11::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 015.11 called "));
+
+	SetTestStepResult(EPass);	
+			// Heap test for 015.02
+	CCommDbTest015_02* step015_02 = new CCommDbTest015_02;
+	CleanupStack::PushL(step015_02);
+	doTestStepWithHeapFailureL( *step015_02, KErrNone);
+	if ( step015_02->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step015_02);
+	
+	return TestStepResult();
+	}
+	
+/////////////////////
+//	Test step 015.12
+/////////////////////
+
+// constructor
+CCommDbTest015_12::CCommDbTest015_12()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_015_12"));
+	}
+
+// destructor
+CCommDbTest015_12::~CCommDbTest015_12()
+	{
+	}
+
+TVerdict CCommDbTest015_12::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 015.12 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 015.03
+
+	CCommDbTest015_03* step015_03 = new CCommDbTest015_03;
+	CleanupStack::PushL(step015_03);
+	doTestStepWithHeapFailureL( *step015_03, KErrNone);
+	if ( step015_03->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step015_03);
+	
+	return TestStepResult();
+	}	
+	
+/////////////////////
+//	Test step 015.13
+/////////////////////
+
+// constructor
+CCommDbTest015_13::CCommDbTest015_13()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_015_13"));
+	}
+
+// destructor
+CCommDbTest015_13::~CCommDbTest015_13()
+	{
+	}
+
+TVerdict CCommDbTest015_13::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 015.13 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 015.04
+	copyTestDatabase( EDatabase_1 );
+	CCommDbTest015_04* step015_04 = new CCommDbTest015_04;
+	CleanupStack::PushL(step015_04);
+	doTestStepWithHeapFailureL( *step015_04, KErrNone);
+	if ( step015_04->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step015_04);
+	
+	return TestStepResult();
+	}	
+	
+/////////////////////
+//	Test step 015.14
+/////////////////////
+
+// constructor
+CCommDbTest015_14::CCommDbTest015_14()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_015_14"));
+	}
+
+// destructor
+CCommDbTest015_14::~CCommDbTest015_14()
+	{
+	}
+
+TVerdict CCommDbTest015_14::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 015.14 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 015.07
+
+	CCommDbTest015_07* step015_07 = new CCommDbTest015_07;
+	CleanupStack::PushL(step015_07);
+	doTestStepWithHeapFailureL( *step015_07, KErrNone);
+	if ( step015_07->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step015_07);
+	
+	return TestStepResult();
+	}	
+	
+/////////////////////
+//	Test step 015.15
+/////////////////////
+
+// constructor
+CCommDbTest015_15::CCommDbTest015_15()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_015_15"));
+	}
+
+// destructor
+CCommDbTest015_15::~CCommDbTest015_15()
+	{
+	}
+
+TVerdict CCommDbTest015_15::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 015.15 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 015.08
+
+	CCommDbTest015_08* step015_08 = new CCommDbTest015_08;
+	CleanupStack::PushL(step015_08);
+	doTestStepWithHeapFailureL( *step015_08, KErrLocked);
+	if ( step015_08->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step015_08);
+	
+	return TestStepResult();
+	}	
+
+
+
+/////////////////////
+//	Test step 015.16
+/////////////////////
+
+// constructor
+CCommDbTest015_16::CCommDbTest015_16()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_015_16"));
+	}
+
+// destructor
+CCommDbTest015_16::~CCommDbTest015_16()
+	{
+	}
+
+TVerdict CCommDbTest015_16::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 015.16 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 015.09
+		
+	CCommDbTest015_09* step015_09 = new CCommDbTest015_09;
+	CleanupStack::PushL(step015_09);
+	doTestStepWithHeapFailureL( *step015_09, KErrNone);
+	if ( step015_09->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step015_09);
+	
+	return TestStepResult();
+	}	
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_016_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,579 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 016.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <e32property.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_016_xx.h"
+
+/////////////////////
+//	Test step 016.01
+/////////////////////
+
+// constructor
+CCommDbTest016_01::CCommDbTest016_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_016_01"));
+	}
+
+// destructor
+CCommDbTest016_01::~CCommDbTest016_01()
+	{
+	}
+
+
+TVerdict CCommDbTest016_01::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest016_01::executeStepL()
+	{
+
+	//Request a notification and then cancel it
+
+	TRequestStatus status;
+
+	User::LeaveIfError(iTheDb->RequestNotification( status ));
+	iTheDb->CancelRequestNotification();
+	User::WaitForRequest(status);
+
+
+
+	if (KErrCancel == status.Int())
+		{
+		return KErrNone;
+		}
+	else
+		{
+		return KErrGeneral;
+		}
+	}
+
+
+
+TVerdict CCommDbTest016_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 016.01 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 016.02
+/////////////////////
+
+// constructor
+CCommDbTest016_02::CCommDbTest016_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_016_02"));
+	}
+
+// destructor
+CCommDbTest016_02::~CCommDbTest016_02()
+	{
+	}
+
+TVerdict CCommDbTest016_02::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest016_02::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Generate an ECommit notification
+
+	//Request notifications
+	TRequestStatus event;
+	iTheDb->RequestNotification(event);
+	
+	CDBLEAVE(iTheDb->BeginTransaction(), KErrNone);
+
+	//Insert a record
+	TUint32 id;
+	CDBLEAVE(iTheView->InsertRecord( id ), KErrNone);
+	//Write the record and commit it
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),_L("My Service"));
+	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
+	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
+	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	CDBLEAVE(iTheView->PutRecordChanges(), KErrNone);
+	CDBLEAVE(iTheDb->CommitTransaction(), KErrNone);
+
+	//Now wait for the notification event
+	User::WaitForRequest(event);
+
+	if ( event.Int() == RDbNotifier::ECommit )
+		ret = KErrNone;
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest016_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 016.02 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 016.04
+/////////////////////
+
+// constructor
+CCommDbTest016_04::CCommDbTest016_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_016_04"));
+	}
+
+// destructor
+CCommDbTest016_04::~CCommDbTest016_04()
+	{
+	}
+
+TVerdict CCommDbTest016_04::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest016_04::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Generate an EUnlock notification	
+	
+	TRequestStatus event(KRequestPending);
+	iTheDb->RequestNotification(event);
+	if(event!=KRequestPending)
+		User::LeaveIfError(event.Int());
+	
+	iTheDb->SetGlobalSettingL(TPtrC(REDIAL_ATTEMPTS), 5 );
+	
+	
+	//EUnlock is returned as a result of a read transaction...Calling CommitTransaction without changing any value will also trigger EUnLock
+	TUint32 newvalue = 0;
+	iTheDb->GetGlobalSettingL(TPtrC(REDIAL_ATTEMPTS), newvalue);
+
+	User::WaitForRequest(event);
+	
+	INFO_PRINTF2(_L("Request for notification returned %d"),event.Int());
+	
+	if ( event.Int() == RDbNotifier::EUnlock )
+		ret = KErrNone;
+	
+    //CleanupStack::PopAndDestroy(sched);
+    
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest016_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 016.04 called "));
+
+	
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 016.05
+/////////////////////
+
+// constructor
+CCommDbTest016_05::CCommDbTest016_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_016_05"));
+	// default to no local objects allocated
+	iLocalObjects = EFalse;
+	}
+
+// destructor
+CCommDbTest016_05::~CCommDbTest016_05()
+	{
+	}
+
+
+TVerdict CCommDbTest016_05::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest016_05::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Generate an ERollback notification
+
+
+	TRequestStatus event;
+	iTheDb->RequestNotification(event);
+
+	iTheDb->BeginTransaction();
+	//Insert a record
+	TUint32 id;
+	CDBLEAVE(iTheView->InsertRecord( id ), KErrNone);
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),_L("CCommDbTest016_05 Test record"));
+	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
+	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
+	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	CDBLEAVE(iTheView->PutRecordChanges(), KErrNone);
+	
+	iTheDb->RollbackTransaction();
+
+	//Wait for the notify event
+	User::WaitForRequest(event);
+	
+	if ( event.Int() == RDbNotifier::ERollback )
+		ret = KErrNone;
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest016_05::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 016.05 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 016.07
+/////////////////////
+
+// constructor
+CCommDbTest016_07::CCommDbTest016_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_016_07"));
+	}
+
+// destructor
+CCommDbTest016_07::~CCommDbTest016_07()
+	{
+	}
+
+
+TVerdict CCommDbTest016_07::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest016_07::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Cancel an active notification request
+	
+	TRequestStatus notifyStatus;
+	iTheDb->RequestNotification(notifyStatus);
+
+	iTheDb->BeginTransaction();
+	//Insert a record
+	TUint32 id;
+	CDBLEAVE(iTheView->InsertRecord( id ), KErrNone);
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),_L("CCommDbTest016_05 Test record"));
+	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
+	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
+	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+
+	CDBLEAVE(iTheView->PutRecordChanges(), KErrNone);
+
+	iTheDb->CancelRequestNotification();
+
+	iTheDb->CommitTransaction();
+
+	//Wait for the notify
+	User::WaitForRequest( notifyStatus );
+	
+	if ( notifyStatus.Int() == KErrCancel )
+		{
+		//Notify request has been cancelled
+		ret = KErrNone;
+		}
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest016_07::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 016.07 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 016.08
+/////////////////////
+
+// constructor
+CCommDbTest016_08::CCommDbTest016_08()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_016_08"));
+	}
+
+// destructor
+CCommDbTest016_08::~CCommDbTest016_08()
+	{
+	}
+
+
+TVerdict CCommDbTest016_08::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(MODEM_BEARER));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest016_08::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id;
+
+	//Check that notifications are being sent to the Publish&Subscribe
+	//when the Modem table is modified
+
+ 	//set up the TSY name change event
+ 	RProperty propCdbModemNameChange;
+ 	TRequestStatus rqstatMdmNameChange;
+ 	CDBLEAVE(propCdbModemNameChange.Attach(KUidSystemCategory,KUidCommDbModemTsyNameChange.iUid), KErrNone);
+ 	CleanupClosePushL(propCdbModemNameChange);
+ 	propCdbModemNameChange.Subscribe(rqstatMdmNameChange);
+ 	__ASSERT_ALWAYS(rqstatMdmNameChange == KRequestPending, User::Invariant());
+ 	
+ 	//set up the Modem table change event
+ 	RProperty propCdbModemRecordChange;
+ 	TRequestStatus rqstatMdmRecordChange;
+ 	CDBLEAVE(propCdbModemRecordChange.Attach(KUidSystemCategory,KUidCommDbModemRecordChange.iUid), KErrNone);
+ 	CleanupClosePushL(propCdbModemRecordChange);
+ 	propCdbModemRecordChange.Subscribe(rqstatMdmRecordChange);
+ 	__ASSERT_ALWAYS(rqstatMdmRecordChange == KRequestPending, User::Invariant()); 	
+ 	
+ 	
+
+	//Make sure there is a record in the modem table	
+	CDBLEAVE( iTheView->InsertRecord( id ),  KErrNone );
+
+	_LIT(KName,"CCommDbTest015_03");
+	_LIT(KTsy,"HAYES");
+	_LIT8(KModemInitString,"AT&F1");
+	_LIT8(KModemFaxInitString,"AT&d2");
+	//Write some sample data into the table
+
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KName);
+	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
+	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
+	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
+	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
+	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
+	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
+	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
+	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
+	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
+	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
+
+	CDBLEAVE( iTheView->PutRecordChanges(),  KErrNone );
+
+	delete iTheView;
+	iTheView = 0;
+
+	
+	iTheView = iTheDb->OpenTableLC( TPtrC(MODEM_BEARER));
+	CleanupStack::Pop();
+
+
+	//Now delete the modem record and check for the notifications
+	CDBLEAVE( iTheView->GotoFirstRecord(),  KErrNone );
+	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
+	
+ 	User::WaitForRequest(rqstatMdmNameChange); 
+ 	User::WaitForRequest(rqstatMdmRecordChange); 
+ 	if (rqstatMdmNameChange == KErrNone &&
+ 	  rqstatMdmRecordChange == KErrNone )
+ 		{
+        ret = KErrNone;
+ 		}
+	CleanupStack::PopAndDestroy(); // rqstatMdmRecordChange
+	CleanupStack::PopAndDestroy(); // rqstatMdmNameChange
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest016_08::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 016.08 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 016.09
+/////////////////////
+
+// constructor
+CCommDbTest016_09::CCommDbTest016_09()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_016_09"));
+	}
+
+// destructor
+CCommDbTest016_09::~CCommDbTest016_09()
+	{
+	}
+
+TVerdict CCommDbTest016_09::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 016.09 called "));
+
+	SetTestStepResult(EPass);
+		// Heap test for 016.01
+    //Commented out because it causes a DBMS server crash
+	//CCommDbTest016_01* step016_01 = new(ELeave) CCommDbTest016_01;
+	//CleanupStack::PushL(step016_01);
+	//doTestStepWithHeapFailureL( *step016_01, KErrNone);
+	//if ( step016_01->TestStepResult() == EFail )
+				//SetTestStepResult(EFail);	//CleanupStack::PopAndDestroy(step016_01);
+
+		// Heap test for 016.02
+
+	//Commented out because it causes a DBMS server crash
+	//CCommDbTest016_02* step016_02 = new CCommDbTest016_02;
+	//CleanupStack::PushL(step016_02);
+	//doTestStepWithHeapFailureL( *step016_02, KErrNone);
+	//if ( step016_02->TestStepResult() == EFail )
+				//SetTestStepResult(EFail);	//CleanupStack::PopAndDestroy(step016_02);
+
+
+		// Heap test for 016.04
+    //Commented out because it causes a DBMS server crash
+	//CCommDbTest016_04* step016_04 = new(ELeave) CCommDbTest016_04;
+	//CleanupStack::PushL(step016_04);
+	//doTestStepWithHeapFailureL( *step016_04, KErrNone);
+	//if ( step016_04->TestStepResult() == EFail )
+				//SetTestStepResult(EFail);	//CleanupStack::PopAndDestroy(step016_04);
+
+
+		// Heap test for 016.05
+
+	//Commented out because it causes a DBMS server crash
+	//CCommDbTest016_05* step016_05 = new(ELeave) CCommDbTest016_05;
+	//CleanupStack::PushL(step016_05);
+	//doTestStepWithHeapFailureL( *step016_05, KErrNone);
+	//if ( step016_05->TestStepResult() == EFail )
+				//SetTestStepResult(EFail);	//CleanupStack::PopAndDestroy(step016_05);
+
+		// Heap test for 016.07
+
+	//Commented out because it causes a DBMS server crash
+	//CCommDbTest016_07* step016_07 = new(ELeave) CCommDbTest016_07;
+	//CleanupStack::PushL(step016_07);
+	//doTestStepWithHeapFailureL( *step016_07, KErrGeneral);
+	//if ( step016_07->TestStepResult() == EFail )
+				//SetTestStepResult(EFail);	//CleanupStack::PopAndDestroy(step016_07);
+
+	// Heap test for 016.08
+
+	//Commented out as it causes a 'Hang'
+	//CCommDbTest016_08* step016_08 = new(ELeave) CCommDbTest016_08;
+	//CleanupStack::PushL(step016_08);
+	//doTestStepWithHeapFailureL( *step016_08, KErrNone);
+	//if ( step016_08->TestStepResult() == EFail )
+				//SetTestStepResult(EFail);	//CleanupStack::PopAndDestroy(step016_08);
+
+	// These OOM tests have a bad habit of generating stray signals as they are intended to fail in the middle.
+	// Tidy everything up or scheduletest will set our status to "fail" :-(
+	while (RThread().RequestCount() > 0)
+		User::WaitForAnyRequest();
+
+	return TestStepResult();	
+
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_017_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,728 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 017.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <e32property.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_017_xx.h"
+
+
+ 	#include <commsdattypesv1_1.h>
+	using namespace CommsDat;
+
+
+/////////////////////
+//	Test step 017.01
+/////////////////////
+
+// constructor
+CCommDbTest017_01::CCommDbTest017_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_017_01"));
+	}
+
+// destructor
+CCommDbTest017_01::~CCommDbTest017_01()
+	{
+	}
+
+
+TVerdict CCommDbTest017_01::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+#define TEST_VALUE	42
+
+TInt CCommDbTest017_01::GlobalSettingTestL( const TDesC& aName )
+	{
+	TUint32 newValue = 0;
+	TInt ret = KErrGeneral;
+
+	//Perform a read/write test on the global
+	iTheDb->SetGlobalSettingL( aName, TEST_VALUE );
+	iTheDb->GetGlobalSettingL( aName, newValue );
+	iTheDb->ClearGlobalSettingL( aName );
+
+	//Should leave with KErrNotFound
+	TRAPD(r, iTheDb->GetGlobalSettingL( aName, newValue ) );
+	if ( r!= KErrNotFound )
+		User::Leave(r);
+
+	if ( newValue == TEST_VALUE  )
+	{
+		ret = KErrNone;
+	}
+	return ret;
+
+}
+
+TInt CCommDbTest017_01::GlobalSettingClearL( const TDesC& aName )
+	{
+	TUint32 newValue = 0;
+
+	// Check for Global Setting existing. If exists then clear it
+	TRAPD(ret,iTheDb->GetGlobalSettingL( aName, newValue ));
+	if(ret==KErrNone)
+		{
+		iTheDb->ClearGlobalSettingL( aName );
+		}
+	else if(ret==KErrNotFound)
+		{
+		ret=KErrNone;
+		}
+	return ret;
+	}		
+
+TVerdict CCommDbTest017_01::doTestStepPostambleL()
+	{
+	TInt ret=KErrNone;
+	
+	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(REDIAL_ATTEMPTS) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(SMS_BEARER) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(SMS_RECEIVE_MODE) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(GPRS_ATTACH_MODE) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(ACCEPT_INCOMING_GPRS) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(GPRS_CLASS_C_BEARER) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(CONNECTION_ATTEMPTS) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(MODEM_DATA_FAX) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(MODEM_PHONE_SERVICES_SMS) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(LOCATION_DATA_FAX) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(LOCATION_PHONE_SERVICES_SMS) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(MAXMBUF_HEAP) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(DEFAULT_AGENT) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(DEFAULT_NETWORK) ), KErrNone );
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+	if(ret == KErrNone)
+		{
+         SetTestStepResult(EPass);		return TestStepResult();
+		}
+	else
+		{
+         SetTestStepResult(EFail);		return TestStepResult();
+		}
+	}
+
+TInt CCommDbTest017_01::executeStepL()
+	{
+	TInt ret=KErrNone;
+
+	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(REDIAL_ATTEMPTS) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(SMS_BEARER) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(SMS_RECEIVE_MODE) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(GPRS_ATTACH_MODE) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(ACCEPT_INCOMING_GPRS) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(GPRS_CLASS_C_BEARER) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(CONNECTION_ATTEMPTS) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(MODEM_DATA_FAX) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(MODEM_PHONE_SERVICES_SMS) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(LOCATION_DATA_FAX ) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(LOCATION_PHONE_SERVICES_SMS)	 ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(MAXMBUF_HEAP) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(DEFAULT_AGENT) ), KErrNone );
+	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(DEFAULT_NETWORK) ), KErrNone );
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest017_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 017.01 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 017.02
+/////////////////////
+
+// constructor
+CCommDbTest017_02::CCommDbTest017_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_017_02"));
+	}
+
+// destructor
+CCommDbTest017_02::~CCommDbTest017_02()
+	{
+	}
+
+
+TVerdict CCommDbTest017_02::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(MODEM_BEARER));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+
+TInt CCommDbTest017_02::executeStepL()
+	{
+	TInt ret=KErrNone;
+	TUint32 id;
+
+	//Checks for notifications when deleting global modem settings
+
+	CMDBSession* ptrSession = CMDBSession::NewL(CMDBSession::LatestVersion());
+	ptrSession->PublishProperties();
+	delete ptrSession;
+	ptrSession = NULL;
+
+ 	RProperty propCdbMdmRecordChange;
+    RProperty propCdbMdmDataFaxChange;
+    RProperty propCdbMdmNameChange;
+    RProperty propCdbPhoneSMSChange;
+ 	
+    TRequestStatus rqstatMdmRecordChange;
+    TRequestStatus rqstatMdmDatafaxChange;
+    TRequestStatus rqstatMdmNameChange;
+    TRequestStatus rqstatPhoneSMSChange;
+ 	
+    CDBLEAVE(propCdbMdmRecordChange.Attach(KUidSystemCategory,KUidCommDbModemRecordChange.iUid), KErrNone);
+    CleanupClosePushL(propCdbMdmRecordChange);
+ 	CDBLEAVE(propCdbMdmDataFaxChange.Attach(KUidSystemCategory,KUidCommDbModemDataAndFaxChange.iUid), KErrNone);	
+    CleanupClosePushL(propCdbMdmDataFaxChange);
+ 	CDBLEAVE(propCdbMdmNameChange.Attach(KUidSystemCategory,KUidCommDbModemTsyNameChange.iUid), KErrNone);
+    CleanupClosePushL(propCdbMdmNameChange);
+ 	CDBLEAVE(propCdbPhoneSMSChange.Attach(KUidSystemCategory,KUidCommDbModemPhoneServicesAndSMSChange.iUid), KErrNone);
+    CleanupClosePushL(propCdbPhoneSMSChange);
+  
+
+	//create two modem table entries
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+	
+	_LIT(KModem,"US Robotics Sportster");
+	_LIT(KTsy,"HAYES");
+	_LIT8(KModemInitString,"AT&F1");
+	_LIT8(KModemFaxInitString,"AT&d2");
+	//Write some sample data into the table
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KModem);
+	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
+	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
+	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
+	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
+	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
+	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
+	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
+	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
+	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
+	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+
+	iTheDb->SetGlobalSettingL( TPtrC(MODEM_DATA_FAX), id );
+
+	//Open a new view up
+	delete iTheView;
+	iTheView =0;
+	iTheView = iTheDb->OpenTableLC( TPtrC(MODEM_BEARER) );
+	CleanupStack::Pop();
+	
+	
+	//Request the notifications
+	
+ 	propCdbMdmRecordChange.Subscribe(rqstatMdmRecordChange);
+ 	__ASSERT_ALWAYS(rqstatMdmRecordChange == KRequestPending, User::Invariant());
+ 	propCdbMdmDataFaxChange.Subscribe(rqstatMdmDatafaxChange);
+ 	__ASSERT_ALWAYS(rqstatMdmDatafaxChange == KRequestPending, User::Invariant());
+ 	propCdbMdmNameChange.Subscribe(rqstatMdmNameChange);
+ 	__ASSERT_ALWAYS(rqstatMdmNameChange == KRequestPending, User::Invariant());
+
+	//Delete the modem record and then wait for the notifications
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+ 	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
+
+ 	User::WaitForRequest(rqstatMdmRecordChange); 
+ 	if (rqstatMdmRecordChange != KErrNone) 
+ 		{
+ 		ret = KErrNotFound;
+ 		}
+ 	User::WaitForRequest(rqstatMdmDatafaxChange); 
+ 	if (rqstatMdmDatafaxChange != KErrNone) 
+ 		{
+ 		ret = KErrNotFound;
+ 		}
+ 	User::WaitForRequest(rqstatMdmNameChange); 
+ 	if (rqstatMdmNameChange != KErrNone) 
+ 		{
+ 		ret = KErrNotFound;
+ 		}
+	
+	//Now try the same thing with the MODEM_PHONE_SERVICES_SMS global setting
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+
+	_LIT(KModem2,"Another US Robotics Sportster");
+	//Write some sample data into the table
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KModem2);
+	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
+	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
+	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
+	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
+	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
+	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
+	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
+	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
+	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
+	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+	
+	iTheDb->SetGlobalSettingL(  TPtrC(MODEM_PHONE_SERVICES_SMS), id );
+
+
+	//Open a new view up
+	delete iTheView;
+	iTheView =0;
+	iTheView = iTheDb->OpenTableLC( TPtrC(MODEM_BEARER) );
+	CleanupStack::Pop();
+	
+	//Reset notifications
+ 	propCdbMdmRecordChange.Subscribe(rqstatMdmRecordChange);
+ 	__ASSERT_ALWAYS(rqstatMdmRecordChange == KRequestPending, User::Invariant());
+ 	propCdbMdmNameChange.Subscribe(rqstatMdmNameChange);
+ 	__ASSERT_ALWAYS(rqstatMdmNameChange == KRequestPending, User::Invariant());
+ 	propCdbPhoneSMSChange.Subscribe(rqstatPhoneSMSChange);
+ 	__ASSERT_ALWAYS(rqstatPhoneSMSChange == KRequestPending, User::Invariant());
+
+	//Delete the record and wait for the notifications
+	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
+
+ 	User::WaitForRequest(rqstatMdmRecordChange); 
+ 	if (rqstatMdmRecordChange != KErrNone) 
+ 		{
+ 		ret = rqstatMdmRecordChange.Int();
+ 		}
+ 	User::WaitForRequest(rqstatPhoneSMSChange); 
+ 	if (rqstatPhoneSMSChange != KErrNone) 
+ 		{
+ 		ret = rqstatMdmRecordChange.Int();
+ 		}
+  	User::WaitForRequest(rqstatMdmNameChange); 
+ 	if (rqstatMdmNameChange != KErrNone) 
+ 		{
+ 		ret = rqstatMdmRecordChange.Int();
+ 		}
+ 		
+ 	CleanupStack::PopAndDestroy(); // propCdbPhoneSMSChange
+ 	CleanupStack::PopAndDestroy(); // propCdbMdmNameChange
+ 	CleanupStack::PopAndDestroy(); // propCdbMdmDataFaxChange
+ 	CleanupStack::PopAndDestroy(); // propCdbMdmRecordChange
+ 		
+	
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest017_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 017.02 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 017.03
+/////////////////////
+
+// constructor
+CCommDbTest017_03::CCommDbTest017_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_017_03"));
+	}
+
+// destructor
+CCommDbTest017_03::~CCommDbTest017_03()
+	{
+	}
+
+TVerdict CCommDbTest017_03::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(MODEM_BEARER));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest017_03::executeStepL()
+	{
+	TInt ret=KErrNone;
+	TUint32 id;
+
+	//Checks for notifications when deleting global modem settings
+
+ 	RProperty propCdbMdmRecordChange;
+    RProperty propCdbMdmDataFaxChange;
+    RProperty propCdbMdmNameChange;
+    RProperty propCdbPhoneSMSChange;
+ 	
+    TRequestStatus rqstatMdmRecordChange;
+    TRequestStatus rqstatMdmDatafaxChange;
+    TRequestStatus rqstatMdmNameChange;
+    TRequestStatus rqstatPhoneSMSChange;
+ 	
+    CDBLEAVE(propCdbMdmRecordChange.Attach(KUidSystemCategory, KUidCommDbModemRecordChange.iUid), KErrNone);
+    CleanupClosePushL(propCdbMdmRecordChange);
+ 	CDBLEAVE(propCdbMdmDataFaxChange.Attach(KUidSystemCategory, KUidCommDbModemDataAndFaxChange.iUid), KErrNone);	//this KUid has been deprecated
+    CleanupClosePushL(propCdbMdmDataFaxChange);
+ 	CDBLEAVE(propCdbMdmNameChange.Attach(KUidSystemCategory, KUidCommDbModemTsyNameChange.iUid), KErrNone);
+    CleanupClosePushL(propCdbMdmNameChange);
+ 	CDBLEAVE(propCdbPhoneSMSChange.Attach(KUidSystemCategory, KUidCommDbModemPhoneServicesAndSMSChange.iUid), KErrNone);	//this KUid has been deprecated
+    CleanupClosePushL(propCdbPhoneSMSChange);
+ 
+
+	//create two modem table entries
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+	
+	_LIT(KModem,"US Robotics Sportster");
+	_LIT(KTsy,"HAYES");
+	_LIT8(KModemInitString,"AT&F1");
+	_LIT8(KModemFaxInitString,"AT&d2");
+	//Write some sample data into the table
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KModem);
+	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
+	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
+	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
+	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
+	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
+	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
+	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
+	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
+	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
+	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+
+	//Set both modem gloabls to the same record
+	iTheDb->SetGlobalSettingL( TPtrC(MODEM_DATA_FAX), id );
+	iTheDb->SetGlobalSettingL(  TPtrC(MODEM_PHONE_SERVICES_SMS), id );
+
+	//Open a new view up
+	delete iTheView;
+	iTheView =0;
+	iTheView = iTheDb->OpenTableLC( TPtrC(MODEM_BEARER) );
+	CleanupStack::Pop();
+	
+	
+	//Request the notifications
+ 	propCdbMdmRecordChange.Subscribe(rqstatMdmRecordChange);
+ 	__ASSERT_ALWAYS(rqstatMdmRecordChange == KRequestPending, User::Invariant());
+ 	propCdbMdmDataFaxChange.Subscribe(rqstatMdmDatafaxChange);
+ 	__ASSERT_ALWAYS(rqstatMdmDatafaxChange == KRequestPending, User::Invariant());
+ 	propCdbMdmNameChange.Subscribe(rqstatMdmNameChange);
+ 	__ASSERT_ALWAYS(rqstatMdmNameChange == KRequestPending, User::Invariant());
+ 	propCdbPhoneSMSChange.Subscribe(rqstatPhoneSMSChange);
+ 	__ASSERT_ALWAYS(rqstatPhoneSMSChange == KRequestPending, User::Invariant());
+
+	//Delete the modem record and then wait for the four notifications
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
+
+ 	User::WaitForRequest(rqstatMdmRecordChange); 
+ 	if (rqstatMdmRecordChange != KErrNone)
+ 		{
+ 		ret = KErrNotFound;
+ 		}
+ 	User::WaitForRequest(rqstatMdmDatafaxChange); 
+ 	if (rqstatMdmDatafaxChange != KErrNone) 
+ 		{
+ 		ret = KErrNotFound;
+ 		}
+ 	User::WaitForRequest(rqstatPhoneSMSChange); 
+ 	if (rqstatPhoneSMSChange != KErrNone) 
+ 		{
+ 		ret = KErrNotFound;
+ 		}
+ 		
+ 	User::WaitForRequest(rqstatMdmNameChange); 
+ 	if (rqstatMdmNameChange != KErrNone) 
+ 		{
+ 		ret = KErrNotFound;
+ 		}
+ 		
+ 	CleanupStack::PopAndDestroy(); // propCdbPhoneSMSChange
+ 	CleanupStack::PopAndDestroy(); // propCdbMdmNameChange
+ 	CleanupStack::PopAndDestroy(); // propCdbMdmDataFaxChange
+ 	CleanupStack::PopAndDestroy(); // propCdbMdmRecordChange
+	
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest017_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 017.03 called "));
+	
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 017.04
+/////////////////////
+
+// constructor
+CCommDbTest017_04::CCommDbTest017_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_017_04"));
+	}
+
+// destructor
+CCommDbTest017_04::~CCommDbTest017_04()
+	{
+	}
+
+TVerdict CCommDbTest017_04::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+#define INVALID_GLOBAL_NAME	  _L("Invalid")
+
+TInt CCommDbTest017_04::executeStepL()
+	{
+	TRAPD( r, iTheDb->SetGlobalSettingL( TPtrC(INVALID_GLOBAL_NAME), 0x55 ) );
+	if ( r!=KErrNotSupported )
+		return r;
+
+	TUint32 dummInt;
+	TRAP( r, iTheDb->GetGlobalSettingL( TPtrC(INVALID_GLOBAL_NAME), dummInt ) );
+	return r;
+	}
+
+
+
+TVerdict CCommDbTest017_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 017.04 called "));
+
+	
+	if ( executeStepL() == KErrNotSupported)
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 017.05
+/////////////////////
+
+// constructor
+CCommDbTest017_05::CCommDbTest017_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_017_05"));
+	}
+
+// destructor
+CCommDbTest017_05::~CCommDbTest017_05()
+	{
+	}
+
+TVerdict CCommDbTest017_05::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 017.05 called "));
+
+	SetTestStepResult(EPass);
+	// Have backup of Database in c:\default1.dat
+//	copyDatabaseToDefault (EDatabase_1);
+	
+		// Heap test for 017.01
+		
+//	copyTestDatabase( EDatabase_1 );
+	CCommDbTest017_01* step017_01 = new(ELeave) CCommDbTest017_01;
+	CleanupStack::PushL(step017_01);
+	if ( doTestStepWithHeapFailureL( *step017_01, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step017_01);
+
+		// Heap test for 017.02
+
+//	copyTestDatabase( EDatabase_1 );
+	CCommDbTest017_02* step017_02 = new CCommDbTest017_02;
+	CleanupStack::PushL(step017_02);
+	if ( doTestStepWithHeapFailureL( *step017_02, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step017_02);
+
+		// Heap test for 017.03
+
+//	copyTestDatabase( EDatabase_1 );
+	CCommDbTest017_03* step017_03 = new CCommDbTest017_03;
+	CleanupStack::PushL(step017_03);
+	if ( doTestStepWithHeapFailureL( *step017_03, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step017_03);
+
+		// Heap test for 017.04
+
+//	copyTestDatabase( EDatabase_1 );
+	CCommDbTest017_04* step017_04 = new CCommDbTest017_04;
+	CleanupStack::PushL(step017_04);
+	if ( doTestStepWithHeapFailureL( *step017_04, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step017_04);
+
+
+	return TestStepResult();	
+
+}
+
+/////////////////////
+//	Test step 017.06
+/////////////////////
+
+// constructor
+CCommDbTest017_06::CCommDbTest017_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_017_06"));
+	}
+
+// destructor
+CCommDbTest017_06::~CCommDbTest017_06()
+	{
+	}
+
+TVerdict CCommDbTest017_06::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+#define DEFAULT_TSY	  _L("DEFAULT_TSY")
+
+TInt CCommDbTest017_06::executeStepL()
+	{
+	TRAPD(r, iTheDb->SetGlobalSettingL(TPtrC(BEARER_AVAILABILITY_CHECK_TSY), TPtrC(DEFAULT_TSY)) );
+
+	if (r != KErrNone)
+		return r;
+
+	TBuf<KCommsDbSvrMaxFieldLength> defaultTsy;
+	TRAP(r, iTheDb->GetGlobalSettingL( TPtrC(BEARER_AVAILABILITY_CHECK_TSY), defaultTsy ) );
+
+	if (r != KErrNone)
+		{
+		return r;
+		}
+
+	if (defaultTsy.Compare(TPtrC(DEFAULT_TSY)) != 0)
+		{
+		return KErrArgument;
+		}
+
+	defaultTsy.Zero();
+	TRAP(r, iTheDb->GetDefaultTsyL(defaultTsy));
+
+	if (r != KErrNone)
+		{
+		return r;
+		}
+
+	if (defaultTsy.Compare(TPtrC(DEFAULT_TSY)) != 0)
+		{
+		return KErrArgument;
+		}
+	return KErrNone;
+	}
+
+
+TVerdict CCommDbTest017_06::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 017.06 called "));
+
+	
+	if ( executeStepL() == KErrNone)
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 017.07
+/////////////////////
+
+// constructor
+CCommDbTest017_07::CCommDbTest017_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_017_07"));
+	}
+
+// destructor
+CCommDbTest017_07::~CCommDbTest017_07()
+	{
+	}
+
+TVerdict CCommDbTest017_07::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 017.07 called "));
+
+	SetTestStepResult(EPass);
+		// Heap test for 017.06
+		
+//	copyTestDatabase( EDatabase_1 );
+	CCommDbTest017_06* step017_06 = new(ELeave) CCommDbTest017_06;
+	CleanupStack::PushL(step017_06);
+	if ( doTestStepWithHeapFailureL( *step017_06, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step017_06);
+
+	return TestStepResult();	
+
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_018_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,406 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 018.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_018_xx.h"
+
+
+
+/////////////////////
+//	Test step 018.01
+/////////////////////
+
+// constructor
+CCommDbTest018_01::CCommDbTest018_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_018_01"));
+	}
+
+// destructor
+CCommDbTest018_01::~CCommDbTest018_01()
+	{
+	}
+
+
+TVerdict CCommDbTest018_01::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest018_01::executeStepL()
+	{
+	TInt ret=KErrNone;
+
+	//Verify DeleteRecord() by deleting the records in the Dial out ISP
+	//table and then checking for their lack of existance
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
+
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
+
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
+	//The table will now be empty
+
+	delete iTheView;
+	iTheView = 0;
+	iTheView = iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP ) );
+	CleanupStack::Pop();
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNotFound );
+	
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest018_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 018.01 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 018.02
+/////////////////////
+
+// constructor
+CCommDbTest018_02::CCommDbTest018_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_018_02"));
+	}
+
+// destructor
+CCommDbTest018_02::~CCommDbTest018_02()
+	{
+	}
+
+
+TVerdict CCommDbTest018_02::doTestStepPreambleL()
+	{	
+	copyTestDatabase( EDatabase_1 );
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest018_02::executeStepL()
+	{
+	TInt ret=KErrNone;
+
+	//Try to delete the last record in a view and then 
+	//verify its deletion
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	//The DAIL_OUT_ISP table only has 3 records, so we know
+	//we are at the end.
+
+	//Delete the last record
+	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
+
+	//The table should now only have 2 records
+	
+	delete iTheView;
+	iTheView = 0;
+	iTheView = iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP ) );
+	CleanupStack::Pop();
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound ); //no more records
+	
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest018_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 018.02 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 018.03
+/////////////////////
+
+// constructor
+CCommDbTest018_03::CCommDbTest018_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_018_03"));
+	}
+
+// destructor
+CCommDbTest018_03::~CCommDbTest018_03()
+	{
+	}
+
+
+TVerdict CCommDbTest018_03::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(IAP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest018_03::executeStepL()
+	{
+	TInt ret=KErrNone;
+
+	//Delete record in empty view
+	CDBLEAVE( iTheView->DeleteRecord(), KErrNotFound );	
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest018_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 018.03 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 018.04
+/////////////////////
+
+// constructor
+CCommDbTest018_04::CCommDbTest018_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_018_04"));
+	}
+
+// destructor
+CCommDbTest018_04::~CCommDbTest018_04()
+	{
+	}
+
+
+TVerdict CCommDbTest018_04::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_IN_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest018_04::executeStepL()
+	{
+	TInt ret=KErrNone;
+
+	//Delete a read only record 
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+
+	//Delete the read only record #5
+	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
+
+	//Open a new view and check that we've only 4 records left
+	delete iTheView;
+	iTheView = 0;
+	iTheView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP ) );
+	CleanupStack::Pop();
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound ); //no more records
+	
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest018_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 018.04 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 018.05
+/////////////////////
+
+// constructor
+CCommDbTest018_05::CCommDbTest018_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_018_05"));
+	}
+
+// destructor
+CCommDbTest018_05::~CCommDbTest018_05()
+	{
+	}
+
+TVerdict CCommDbTest018_05::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 018.05 called "));
+
+	SetTestStepResult(EPass);
+		// Heap test for 018.01
+
+	CCommDbTest018_01* step018_01 = new(ELeave) CCommDbTest018_01;
+	CleanupStack::PushL(step018_01);
+	if ( doTestStepWithHeapFailureL( *step018_01, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step018_01);
+
+
+	return TestStepResult();	
+}
+
+
+/////////////////////
+//	Test step 018.06
+/////////////////////
+
+// constructor
+CCommDbTest018_06::CCommDbTest018_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_018_06"));
+	}
+
+// destructor
+CCommDbTest018_06::~CCommDbTest018_06()
+	{
+	}
+
+TVerdict CCommDbTest018_06::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 018.06 called "));
+
+	SetTestStepResult(EPass);	
+			// Heap test for 018.02
+
+	CCommDbTest018_02* step018_02 = new CCommDbTest018_02;
+	CleanupStack::PushL(step018_02);
+	if ( doTestStepWithHeapFailureL( *step018_02, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step018_02);
+	
+	return TestStepResult();		
+	}
+	
+/////////////////////
+//	Test step 018.07
+/////////////////////
+
+// constructor
+CCommDbTest018_07::CCommDbTest018_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_018_07"));
+	}
+
+// destructor
+CCommDbTest018_07::~CCommDbTest018_07()
+	{
+	}
+
+TVerdict CCommDbTest018_07::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 018.07 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 018.03
+
+	CCommDbTest018_03* step018_03 = new CCommDbTest018_03;
+	CleanupStack::PushL(step018_03);
+	if ( doTestStepWithHeapFailureL( *step018_03, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step018_03);
+	
+	return TestStepResult();		
+	}
+	
+/////////////////////
+//	Test step 018.08
+/////////////////////
+
+// constructor
+CCommDbTest018_08::CCommDbTest018_08()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_018_08"));
+	}
+
+// destructor
+CCommDbTest018_08::~CCommDbTest018_08()
+	{
+	}
+
+TVerdict CCommDbTest018_08::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 018.08 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 018.04
+
+	CCommDbTest018_04* step018_04 = new CCommDbTest018_04;
+	CleanupStack::PushL(step018_04);
+	if ( doTestStepWithHeapFailureL( *step018_04, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step018_04);
+	
+	return TestStepResult();		
+	}
+	
+
+//EOF
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_019_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,713 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 019.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_019_xx.h"
+
+
+
+/////////////////////
+//	Test step 019.01
+/////////////////////
+
+// constructor
+CCommDbTest019_01::CCommDbTest019_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_019_01"));
+	}
+
+// destructor
+CCommDbTest019_01::~CCommDbTest019_01()
+	{
+	}
+
+
+TVerdict CCommDbTest019_01::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest019_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Select a view and verify the records in it
+
+	//This should just select 2 records
+	iTheView = iTheDb->OpenViewMatchingUintLC( TPtrC(DIAL_OUT_ISP), TPtrC(ISP_TYPE), EIspTypeInternetAndWAP );
+	CleanupStack::Pop();
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+
+	//Check its the record we expect
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( !value.Compare(_L("Record #1")) )
+		{
+		//There should be no more records in the view
+		CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+		ret = KErrNone;
+		}
+	
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest019_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 019.01 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 019.02
+/////////////////////
+
+// constructor
+CCommDbTest019_02::CCommDbTest019_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_019_02"));
+	}
+
+// destructor
+CCommDbTest019_02::~CCommDbTest019_02()
+	{
+	}
+
+
+TVerdict CCommDbTest019_02::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest019_02::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Select a view and verify the records in it
+
+	//This should just select 2 records
+	iTheView = iTheDb->OpenViewMatchingBoolLC( TPtrC(DIAL_OUT_ISP), TPtrC(ISP_PROMPT_FOR_LOGIN), EFalse );
+	CleanupStack::Pop();
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+
+	//Check its the record we expect
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( !value.Compare(_L("Record #1")) )
+		{
+			// Move onto the second record and check that
+			CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+			iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+			if ( !value.Compare(_L("Record #2")) )
+				{
+				//There should be no more records in the view
+				CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+				ret = KErrNone;
+				}
+		}
+
+	
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest019_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 019.02 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 019.03
+/////////////////////
+
+// constructor
+CCommDbTest019_03::CCommDbTest019_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_019_03"));
+	}
+
+// destructor
+CCommDbTest019_03::~CCommDbTest019_03()
+	{
+	}
+
+
+TVerdict CCommDbTest019_03::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest019_03::executeStepL()
+	{
+	TInt ret=KErrNone;
+	//Select a view and verify the records in it
+
+	//This should just select 2 records
+	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), _L8("Call me back") );
+	CleanupStack::Pop();
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+
+	//Check its the record we expect
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( !value.Compare(_L("Record #1")) )
+		{
+			// Move onto the second record and check that
+			CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+			iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+			if ( !value.Compare(_L("Record #3")) )
+				{
+				//There should be no more records in the view
+				CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+				ret = KErrNone;
+				}
+		}
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest019_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 019.03 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 019.04
+/////////////////////
+
+// constructor
+CCommDbTest019_04::CCommDbTest019_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_019_04"));
+	}
+
+// destructor
+CCommDbTest019_04::~CCommDbTest019_04()
+	{
+	}
+
+
+TVerdict CCommDbTest019_04::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest019_04::executeStepL()
+	{
+	TInt ret=KErrNone;
+	//Select a view and verify the records in it
+
+	//This should just select 2 records
+	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), _L("Call me back") );
+	CleanupStack::Pop();
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+
+	//Check its the record we expect
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( !value.Compare(_L("Record #1")) )
+		{
+			// Move onto the second record and check that
+			CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+			iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+			if ( !value.Compare(_L("Record #3")) )
+				{
+				//There should be no more records in the view
+				CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+				ret = KErrNone;
+				}
+		}
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest019_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 019.04 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 019.05
+/////////////////////
+
+// constructor
+CCommDbTest019_05::CCommDbTest019_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_019_05"));
+	}
+
+// destructor
+CCommDbTest019_05::~CCommDbTest019_05()
+	{
+	}
+
+
+TVerdict CCommDbTest019_05::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest019_05::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	//Select a view on an invalid table
+
+	TRAPD(r, iTheView = iTheDb->OpenViewMatchingTextLC( _L("Invalid"), TPtrC(ISP_IF_CALLBACK_INFO), _L8("Call me back") ) );
+	if ( r== KErrNone )
+		{
+		//The test has failed as the open view did not leave
+		CleanupStack::Pop();
+		}
+		else
+		{
+			//The call did leave
+			ret = r;
+		}
+	
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest019_05::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 019.05 called "));
+
+
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 019.06
+/////////////////////
+
+// constructor
+CCommDbTest019_06::CCommDbTest019_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_019_06"));
+	}
+
+// destructor
+CCommDbTest019_06::~CCommDbTest019_06()
+	{
+	}
+
+
+TVerdict CCommDbTest019_06::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest019_06::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	//Select a view on an invalid table
+
+	TRAPD(r, iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(DIAL_OUT_ISP), _L("Invalid"), _L8("Call me back") ) );
+	if ( r== KErrNone )
+		{
+		//The test has failed as the open view did not leave
+		CleanupStack::Pop();
+		}
+		else
+		{
+			//The call did leave
+			ret = r;
+		}
+	
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest019_06::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 019.06 called "));
+
+
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 019.07
+/////////////////////
+
+// constructor
+CCommDbTest019_07::CCommDbTest019_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_019_07"));
+	}
+
+// destructor
+CCommDbTest019_07::~CCommDbTest019_07()
+	{
+	}
+
+
+TVerdict CCommDbTest019_07::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest019_07::executeStepL()
+	{
+	TInt ret=KErrNone;
+	//Select a view and verify the records in it
+
+	//This should just select 3 records
+	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_NAME), _L8("") );
+	CleanupStack::Pop();
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+
+	//Check its the record we expect
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( !value.Compare(_L("Record #1")) )
+		{
+			// Move onto the second record and check that
+			CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+			iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+			if ( !value.Compare(_L("Record #2")) )
+				{
+				//There should be no more records in the view
+				CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+				iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+				if ( !value.Compare(_L("Record #3")) )
+					{
+					CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+					ret = KErrNone;
+					}
+				}
+		}
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest019_07::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 019.07 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 019.08
+/////////////////////
+
+// constructor
+CCommDbTest019_08::CCommDbTest019_08()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_019_08"));
+	}
+
+// destructor
+CCommDbTest019_08::~CCommDbTest019_08()
+	{
+	}
+
+TVerdict CCommDbTest019_08::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 019.08 called "));
+
+	SetTestStepResult(EPass);
+		// Heap test for 019.01
+
+	CCommDbTest019_01* step019_01 = new(ELeave) CCommDbTest019_01;
+	CleanupStack::PushL(step019_01);
+	if ( doTestStepWithHeapFailureL( *step019_01, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step019_01);
+
+
+	return TestStepResult();	
+
+}
+
+
+/////////////////////
+//	Test step 019.09
+/////////////////////
+
+// constructor
+CCommDbTest019_09::CCommDbTest019_09()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_019_09"));
+	}
+
+// destructor
+CCommDbTest019_09::~CCommDbTest019_09()
+	{
+	}
+
+TVerdict CCommDbTest019_09::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 019.09 called "));
+
+	SetTestStepResult(EPass);	
+			// Heap test for 019.02
+
+	CCommDbTest019_02* step019_02 = new CCommDbTest019_02;
+	CleanupStack::PushL(step019_02);
+	if ( doTestStepWithHeapFailureL( *step019_02, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step019_02);
+	
+	return TestStepResult();
+	
+	}
+	
+/////////////////////
+//	Test step 019.10
+/////////////////////
+
+// constructor
+CCommDbTest019_10::CCommDbTest019_10()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_019_10"));
+	}
+
+// destructor
+CCommDbTest019_10::~CCommDbTest019_10()
+	{
+	}
+
+TVerdict CCommDbTest019_10::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 019.10 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 019.03
+
+	CCommDbTest019_03* step019_03 = new CCommDbTest019_03;
+	CleanupStack::PushL(step019_03);
+	if ( doTestStepWithHeapFailureL( *step019_03, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step019_03);
+	
+	return TestStepResult();
+	
+	}
+	
+/////////////////////
+//	Test step 019.11
+/////////////////////
+
+// constructor
+CCommDbTest019_11::CCommDbTest019_11()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_019_11"));
+	}
+
+// destructor
+CCommDbTest019_11::~CCommDbTest019_11()
+	{
+	}
+
+TVerdict CCommDbTest019_11::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 019.11 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 019.04
+
+	CCommDbTest019_04* step019_04 = new CCommDbTest019_04;
+	CleanupStack::PushL(step019_04);
+	if ( doTestStepWithHeapFailureL( *step019_04, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step019_04);
+	
+	return TestStepResult();
+	
+	}
+
+/////////////////////
+//	Test step 019.12
+/////////////////////
+
+// constructor
+CCommDbTest019_12::CCommDbTest019_12()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_019_12"));
+	}
+
+// destructor
+CCommDbTest019_12::~CCommDbTest019_12()
+	{
+	}
+
+TVerdict CCommDbTest019_12::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 019.12 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 019.05
+
+	CCommDbTest019_05* step019_05 = new CCommDbTest019_05;
+	CleanupStack::PushL(step019_05);
+	if ( doTestStepWithHeapFailureL( *step019_05, KErrNotFound) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step019_05);
+	
+	
+	return TestStepResult();
+	
+	}
+	
+/////////////////////
+//	Test step 019.13
+/////////////////////
+
+// constructor
+CCommDbTest019_13::CCommDbTest019_13()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_019_13"));
+	}
+
+// destructor
+CCommDbTest019_13::~CCommDbTest019_13()
+	{
+	}
+
+TVerdict CCommDbTest019_13::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 019.13 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 019.06
+
+	CCommDbTest019_06* step019_06 = new CCommDbTest019_06;
+	CleanupStack::PushL(step019_06);
+	if ( doTestStepWithHeapFailureL( *step019_06, KErrNotFound) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step019_06);
+	
+	
+	return TestStepResult();
+	
+	}
+	
+/////////////////////
+//	Test step 019.14
+/////////////////////
+
+// constructor
+CCommDbTest019_14::CCommDbTest019_14()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_019_14"));
+	}
+
+// destructor
+CCommDbTest019_14::~CCommDbTest019_14()
+	{
+	}
+
+TVerdict CCommDbTest019_14::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 019.14 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 019.07
+
+	CCommDbTest019_07* step019_07 = new CCommDbTest019_07;
+	CleanupStack::PushL(step019_07);
+	if ( doTestStepWithHeapFailureL( *step019_07, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step019_07);
+	
+	return TestStepResult();
+	
+	}
+
+//EOF
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_020_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,507 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 020.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_020_xx.h"
+
+/////////////////////
+//	Test step 020.01
+/////////////////////
+
+// constructor
+CCommDbTest020_01::CCommDbTest020_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_020_01"));
+	}
+
+// destructor
+CCommDbTest020_01::~CCommDbTest020_01()
+	{
+	}
+
+
+TVerdict CCommDbTest020_01::doTestStepPreambleL()
+	{
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest020_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TBuf<64> buffer;
+
+	_LIT(KAgent,"Agent");
+
+	TRAPD(r1,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent));
+	TRAPD(r2,iTheDb->GetAgentL(TPtrC(DIAL_OUT_ISP),buffer));
+
+	if(r1==KErrNotSupported && r2==KErrNotSupported)
+		{
+		return KErrNotSupported;
+		}
+	
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest020_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 020.01 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 020.02
+/////////////////////
+
+// constructor
+CCommDbTest020_02::CCommDbTest020_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_020_02"));
+	}
+
+// destructor
+CCommDbTest020_02::~CCommDbTest020_02()
+	{
+	}
+
+
+TVerdict CCommDbTest020_02::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest020_02::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TBuf<64> buffer;
+
+	_LIT(KAgent1,"Agent1");
+	_LIT(KAgentExt,"Csd");
+
+	TRAPD(r1,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent1));
+
+	TRAPD(r2,iTheDb->SetAgentExtL(TPtrC(DIAL_OUT_ISP),KAgentExt));
+	TRAPD(r3,iTheDb->GetAgentExtL(TPtrC(DIAL_OUT_ISP),buffer));
+	if(r3 != KErrNone)
+		{
+		return r3;
+		}
+
+	if(r1==KErrNotSupported && r2==KErrNotSupported)
+		{
+		return KErrNotSupported;
+		}
+	
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest020_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 020.02 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 020.03
+/////////////////////
+
+// constructor
+CCommDbTest020_03::CCommDbTest020_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_020_03"));
+	}
+
+// destructor
+CCommDbTest020_03::~CCommDbTest020_03()
+	{
+	}
+
+
+TVerdict CCommDbTest020_03::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest020_03::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Try to set the agent for a non-service table
+	_LIT(KAgent1,"Agent1");
+
+	TRAPD( r, iTheDb->SetAgentL(TPtrC(LOCATION),KAgent1) );
+	if (r==KErrNotSupported )
+		ret = r;
+	
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest020_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 020.03 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 020.04
+/////////////////////
+
+// constructor
+CCommDbTest020_04::CCommDbTest020_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_020_04"));
+	}
+
+// destructor
+CCommDbTest020_04::~CCommDbTest020_04()
+	{
+	}
+
+
+TVerdict CCommDbTest020_04::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest020_04::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+
+	//Try to set the agent extension for a non-service table
+
+	_LIT(KAgentExt,"Csd");
+
+	TRAPD(r, iTheDb->SetAgentExtL(TPtrC(LOCATION), KAgentExt) );
+	if ( r==KErrNotSupported )
+		ret = r;
+	
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest020_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 020.04 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+
+
+
+/////////////////////
+//	Test step 020.05
+/////////////////////
+
+// constructor
+CCommDbTest020_05::CCommDbTest020_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_020_05"));
+	}
+
+// destructor
+CCommDbTest020_05::~CCommDbTest020_05()
+	{
+	}
+
+
+TVerdict CCommDbTest020_05::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest020_05::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Try to open a view on the agent table
+	
+	TRAPD(r, iTheView = iTheDb->OpenTableLC(_L("NonExisting")); CleanupStack::Pop(); );
+
+	if ( r==KErrNotFound )
+		ret = r;
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest020_05::doTestStepL( )
+	{
+
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 020.06
+/////////////////////
+
+// constructor
+CCommDbTest020_06::CCommDbTest020_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_020_06"));
+	}
+
+// destructor
+CCommDbTest020_06::~CCommDbTest020_06()
+	{
+	}
+
+
+TVerdict CCommDbTest020_06::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest020_06::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TBuf<64> buffer;
+
+	//Check that the agent setting can be overridden
+
+	_LIT(KAgent1,"Agent1");
+	_LIT(KAgent2,"Agent2");
+
+	//Set the agent 
+	TRAPD(r1,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent1));
+	//Add a new agent and verify
+	TRAPD(r2,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent2));
+	TRAPD(r3,iTheDb->GetAgentL(TPtrC(DIAL_OUT_ISP),buffer));
+	if (r1==KErrNotSupported && r2==KErrNotSupported && r3==KErrNotSupported)
+		ret = KErrNotSupported;
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest020_06::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 020.06 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 020.07
+/////////////////////
+
+// constructor
+CCommDbTest020_07::CCommDbTest020_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_020_07"));
+	}
+
+// destructor
+CCommDbTest020_07::~CCommDbTest020_07()
+	{
+	}
+
+
+TVerdict CCommDbTest020_07::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest020_07::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TBuf<64> buffer;
+
+	//Check that the agent settings can be deleted
+
+	_LIT(KAgent,"Agent");
+	_LIT(KExtension,"psd");
+
+	//Set the agent 
+	TRAPD(r1,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent));
+	TRAPD(r2,iTheDb->SetAgentExtL(TPtrC(DIAL_OUT_ISP),KExtension));
+
+	//Clear the settings
+	TRAPD(r3,iTheDb->ClearAgentAndExtL( TPtrC(DIAL_OUT_ISP)));
+
+	//Now try to read the settings
+	TRAPD( r4, iTheDb->GetAgentL(TPtrC(DIAL_OUT_ISP),buffer) );
+	TRAPD( r5, iTheDb->GetAgentExtL(TPtrC(DIAL_OUT_ISP),buffer) );
+
+	if(r1==KErrNotSupported && r2==KErrNotSupported && r3==KErrNotSupported
+		&& r4==KErrNotSupported && r5==KErrNotSupported)
+		{
+		ret = KErrNotSupported;
+		}
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest020_07::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 020.07 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 020.08
+/////////////////////
+
+// constructor
+CCommDbTest020_08::CCommDbTest020_08()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_020_08"));
+	}
+
+// destructor
+CCommDbTest020_08::~CCommDbTest020_08()
+	{
+	}
+
+TVerdict CCommDbTest020_08::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 020.08 called "));
+
+	SetTestStepResult(EPass);
+		// Heap test for 020.01
+
+	CCommDbTest020_01* step020_01 = new(ELeave) CCommDbTest020_01;
+	CleanupStack::PushL(step020_01);
+	if ( doTestStepWithHeapFailureL( *step020_01, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step020_01);
+
+
+		// Heap test for 020.02
+
+	CCommDbTest020_02* step020_02 = new CCommDbTest020_02;
+	CleanupStack::PushL(step020_02);
+	if ( doTestStepWithHeapFailureL( *step020_02, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step020_02);
+
+		// Heap test for 020.03
+
+	CCommDbTest020_03* step020_03 = new CCommDbTest020_03;
+	CleanupStack::PushL(step020_03);
+	if ( doTestStepWithHeapFailureL( *step020_03, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step020_03);
+
+
+		// Heap test for 020.04
+
+	CCommDbTest020_04* step020_04 = new CCommDbTest020_04;
+	CleanupStack::PushL(step020_04);
+	if ( doTestStepWithHeapFailureL( *step020_04, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step020_04);
+
+
+		// Heap test for 020.06
+
+	CCommDbTest020_06* step020_06 = new CCommDbTest020_06;
+	CleanupStack::PushL(step020_06);
+	if ( doTestStepWithHeapFailureL( *step020_06, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step020_06);
+
+
+
+		// Heap test for 020.07
+
+	CCommDbTest020_07* step020_07 = new CCommDbTest020_07;
+	CleanupStack::PushL(step020_07);
+	if ( doTestStepWithHeapFailureL( *step020_07, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step020_07);
+
+
+
+
+	return TestStepResult();	
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_021_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,336 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 021.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_021_xx.h"
+
+
+/////////////////////
+//	Test step 021.01
+/////////////////////
+
+// constructor
+CCommDbTest021_01::CCommDbTest021_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_021_01"));
+	}
+
+// destructor
+CCommDbTest021_01::~CCommDbTest021_01()
+	{
+	}
+
+
+TVerdict CCommDbTest021_01::doTestStepPreambleL()
+	{
+	// Have a temp copy of database
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest021_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Sets and verifies the client timeout
+
+	//Set up the agent first
+	_LIT(KAgent1,"Agent1");
+	_LIT(KAgentExt,"Csd");
+	TRAPD(r1,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent1));
+	TRAPD(r2,iTheDb->SetAgentExtL(TPtrC(DIAL_OUT_ISP),KAgentExt));
+
+	TUint timeout = 6;
+	TInt value(0);
+
+	TRAPD(r3,iTheDb->SetAgentClientTimeoutL(TPtrC(DIAL_OUT_ISP),timeout));
+	TRAPD(r4,value = iTheDb->GetAgentClientTimeoutL(TPtrC(DIAL_OUT_ISP)));
+
+	if(r1==KErrNotSupported && r2==KErrNotSupported && r3==KErrNotSupported
+		&& (r4==KErrNotSupported || value==KErrNotSupported))
+		{
+		return KErrNotSupported;
+		}
+	
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest021_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 021.01 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 021.02
+/////////////////////
+
+// constructor
+CCommDbTest021_02::CCommDbTest021_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_021_02"));
+	}
+
+// destructor
+CCommDbTest021_02::~CCommDbTest021_02()
+	{
+	}
+
+
+TVerdict CCommDbTest021_02::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest021_02::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Try to set the timeout for an incorrect table
+
+	//Set up the agent first
+	_LIT(KAgent1,"Agent1");
+	_LIT(KAgentExt,"Csd");
+	TRAPD(r1,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent1));
+	TRAPD(r2,iTheDb->SetAgentExtL(TPtrC(DIAL_OUT_ISP),KAgentExt));
+
+	TUint timeout = 0x100;
+	TRAPD(r3, iTheDb->SetAgentClientTimeoutL(TPtrC(LOCATION), timeout));
+
+	if(r1==KErrNotSupported && r2==KErrNotSupported && r3==KErrNotSupported)
+		{
+		return KErrNotSupported;
+		}
+		
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest021_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 021.02 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 021.03
+/////////////////////
+
+// constructor
+CCommDbTest021_03::CCommDbTest021_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_021_03"));
+	}
+
+// destructor
+CCommDbTest021_03::~CCommDbTest021_03()
+	{
+	}
+
+
+TVerdict CCommDbTest021_03::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest021_03::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Sets and verifies the routet timeout
+
+	//Set up the agent first
+	_LIT(KAgent1,"Agent1");
+	_LIT(KAgentExt,"Csd");
+	TRAPD(r1,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent1));
+	TRAPD(r2,iTheDb->SetAgentExtL(TPtrC(DIAL_OUT_ISP),KAgentExt));
+
+	TUint timeout = 0x100;
+	TInt value(0);
+
+	TRAPD(r3,iTheDb->SetAgentRouteTimeoutL(TPtrC(DIAL_OUT_ISP),timeout));
+	TRAPD(r4,value = iTheDb->GetAgentRouteTimeoutL(TPtrC(DIAL_OUT_ISP)));
+
+	if(r1==KErrNotSupported && r2==KErrNotSupported && r3==KErrNotSupported
+		&& (r4==KErrNotSupported || value==KErrNotSupported))
+		{
+		return KErrNotSupported;
+		}
+	
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest021_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 021.03 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 021.04
+/////////////////////
+
+// constructor
+CCommDbTest021_04::CCommDbTest021_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_021_04"));
+	}
+
+// destructor
+CCommDbTest021_04::~CCommDbTest021_04()
+	{
+	}
+
+
+TVerdict CCommDbTest021_04::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest021_04::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Try to set the timeout for an incorrect table
+
+	//Set up the agent first
+	_LIT(KAgent1,"Agent1");
+	_LIT(KAgentExt,"Csd");
+	TRAPD(r1,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent1));
+	TRAPD(r2,iTheDb->SetAgentExtL(TPtrC(DIAL_OUT_ISP),KAgentExt));
+
+	TUint timeout = 0x100;
+	
+	TRAPD(r3, iTheDb->SetAgentRouteTimeoutL(TPtrC(LOCATION), timeout) );
+
+	if(r1==KErrNotSupported && r2==KErrNotSupported && r3==KErrNotSupported)
+		{
+		return KErrNotSupported;
+		}
+	
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest021_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 021.04 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+
+/////////////////////
+//	Test step 021.05
+/////////////////////
+
+// constructor
+CCommDbTest021_05::CCommDbTest021_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_021_05"));
+	}
+
+// destructor
+CCommDbTest021_05::~CCommDbTest021_05()
+	{
+	}
+
+TVerdict CCommDbTest021_05::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 021.05 called "));
+
+	SetTestStepResult(EPass);
+		// Heap test for 021.01
+
+	CCommDbTest021_01* step021_01 = new(ELeave) CCommDbTest021_01;
+	CleanupStack::PushL(step021_01);
+	if ( doTestStepWithHeapFailureL( *step021_01, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step021_01);
+
+
+		// Heap test for 021.02
+
+	CCommDbTest021_02* step021_02 = new CCommDbTest021_02;
+	CleanupStack::PushL(step021_02);
+	if ( doTestStepWithHeapFailureL( *step021_02, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step021_02);
+
+		// Heap test for 021.03
+
+	CCommDbTest021_03* step021_03 = new CCommDbTest021_03;
+	CleanupStack::PushL(step021_03);
+	if ( doTestStepWithHeapFailureL( *step021_03, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step021_03);
+
+
+		// Heap test for 021.04
+
+	CCommDbTest021_04* step021_04 = new CCommDbTest021_04;
+	CleanupStack::PushL(step021_04);
+	if ( doTestStepWithHeapFailureL( *step021_04, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step021_04);
+
+
+
+	return TestStepResult();	
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_022_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,1498 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 022.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_022_xx.h"
+
+
+/////////////////////
+//	Test step 022.01
+/////////////////////
+
+// constructor
+CCommDbTest022_01::CCommDbTest022_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_01"));
+	}
+
+// destructor
+CCommDbTest022_01::~CCommDbTest022_01()
+	{
+	}
+
+
+TVerdict CCommDbTest022_01::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest022_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Open a view on the IAP table, then check the records returned
+	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerCSD, ECommDbConnectionDirectionOutgoing);
+	CleanupStack::Pop();
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( !value.Compare(_L("Record #1")) )
+		{
+		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
+		if ( !value.Compare(_L("Record #2")) )
+		{
+			//There should be no more records
+			CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+			ret = KErrNone;
+		}
+	}
+	
+	return ret;
+	}
+
+
+TVerdict CCommDbTest022_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.01 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+
+/////////////////////
+//	Test step 022.02
+/////////////////////
+
+// constructor
+CCommDbTest022_02::CCommDbTest022_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_02"));
+	}
+
+// destructor
+CCommDbTest022_02::~CCommDbTest022_02()
+	{
+	}
+
+
+TVerdict CCommDbTest022_02::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest022_02::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Open a view on the IAP table, then check the records returned
+	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerCSD, ECommDbConnectionDirectionIncoming);
+	CleanupStack::Pop();
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( !value.Compare(_L("Record #3")) )
+		{
+		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
+		if ( !value.Compare(_L("Record #4")) )
+			{
+			CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+			iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
+			if ( !value.Compare(_L("Record #6")) )
+				{
+				//There should be no more records
+				CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+				ret = KErrNone;
+				}
+			}
+	}
+	
+	return ret;
+	}
+
+
+TVerdict CCommDbTest022_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.02 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 022.03
+/////////////////////
+
+// constructor
+CCommDbTest022_03::CCommDbTest022_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_03"));
+	}
+
+// destructor
+CCommDbTest022_03::~CCommDbTest022_03()
+	{
+	}
+
+
+TVerdict CCommDbTest022_03::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest022_03::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Open a view on the IAP table, then check the records returned
+	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerWcdma, ECommDbConnectionDirectionOutgoing);
+	CleanupStack::Pop();
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( !value.Compare(_L("Record #5")) )
+		{
+		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
+		if ( !value.Compare(_L("Record #7")) )
+		{
+			//There should be no more records
+			CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+			ret = KErrNone;
+		}
+	}
+	
+	return ret;
+	}
+
+
+TVerdict CCommDbTest022_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.03 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 022.04
+/////////////////////
+
+// constructor
+CCommDbTest022_04::CCommDbTest022_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_04"));
+	}
+
+// destructor
+CCommDbTest022_04::~CCommDbTest022_04()
+	{
+	}
+
+
+TVerdict CCommDbTest022_04::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest022_04::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Open a view on the IAP table, then check the records returned
+	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerCSD, ECommDbConnectionDirectionOutgoing);
+	CleanupStack::Pop();
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( !value.Compare(_L("Record #1")) )
+		{
+		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
+		if ( !value.Compare(_L("Record #2")) )
+		{
+			//There should be no more records
+			CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+			ret = KErrNone;
+		}
+	}
+	
+	return ret;
+	}
+
+
+TVerdict CCommDbTest022_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.04 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+
+/////////////////////
+//	Test step 022.05
+/////////////////////
+
+// constructor
+CCommDbTest022_05::CCommDbTest022_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_05"));
+	}
+
+// destructor
+CCommDbTest022_05::~CCommDbTest022_05()
+	{
+	}
+
+
+TVerdict CCommDbTest022_05::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest022_05::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Open a view on the IAP table, then check the records returned
+	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerWcdma, ECommDbConnectionDirectionIncoming);
+	CleanupStack::Pop();
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( !value.Compare(_L("Record #9")) )
+		{
+		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
+		if ( !value.Compare(_L("Record #10")) )
+		{
+			//There should be no more records
+			CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+			ret = KErrNone;
+		}
+	}
+	
+	return ret;
+	}
+
+
+TVerdict CCommDbTest022_05::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.05 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 022.06
+/////////////////////
+
+// constructor
+CCommDbTest022_06::CCommDbTest022_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_06"));
+	}
+
+// destructor
+CCommDbTest022_06::~CCommDbTest022_06()
+	{
+	}
+
+
+TVerdict CCommDbTest022_06::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest022_06::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Open a view on the IAP table, then check the records returned
+	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerWcdma, ECommDbConnectionDirectionIncoming);
+	CleanupStack::Pop();
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( !value.Compare(_L("Record #9")) )
+		{
+		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
+		if ( !value.Compare(_L("Record #10")) )
+		{
+			//There should be no more records
+			CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+			ret = KErrNone;
+		}
+	}
+	
+	return ret;
+	}
+
+
+TVerdict CCommDbTest022_06::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.06 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 022.07
+/////////////////////
+
+// constructor
+CCommDbTest022_07::CCommDbTest022_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_07"));
+	}
+
+// destructor
+CCommDbTest022_07::~CCommDbTest022_07()
+	{
+	}
+
+
+TVerdict CCommDbTest022_07::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest022_07::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Open a view on the IAP table, then check the records returned
+	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerCSD, ECommDbConnectionDirectionIncoming);
+	CleanupStack::Pop();
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( !value.Compare(_L("Record #3")) )
+		{
+		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
+		if ( !value.Compare(_L("Record #4")) )
+			{
+			CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+			iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
+			if ( !value.Compare(_L("Record #6")) )
+				{
+				//There should be no more records
+				CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+				ret = KErrNone;
+				}
+			}
+	}
+	
+	return ret;
+	}
+
+
+TVerdict CCommDbTest022_07::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.07 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 022.08
+/////////////////////
+
+// constructor
+CCommDbTest022_08::CCommDbTest022_08()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_08"));
+	}
+
+// destructor
+CCommDbTest022_08::~CCommDbTest022_08()
+	{
+	}
+
+
+TVerdict CCommDbTest022_08::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest022_08::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Open a view on the IAP table, then check the records returned
+	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerLAN, ECommDbConnectionDirectionIncoming);
+	CleanupStack::Pop();
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( !value.Compare(_L("Record #11")) )
+		{
+		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
+		if ( !value.Compare(_L("Record #12")) )
+		{
+			//There should be no more records
+			CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+			ret = KErrNone;
+		}
+	}
+	
+	return ret;
+	}
+
+
+TVerdict CCommDbTest022_08::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.08 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 022.09
+/////////////////////
+
+// constructor
+CCommDbTest022_09::CCommDbTest022_09()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_09"));
+	}
+
+// destructor
+CCommDbTest022_09::~CCommDbTest022_09()
+	{
+	}
+
+
+TVerdict CCommDbTest022_09::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest022_09::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Open a view on the IAP table, then check the records returned
+	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerLAN, ECommDbConnectionDirectionOutgoing);
+	CleanupStack::Pop();
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( !value.Compare(_L("Record #11")) )
+		{
+		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
+		if ( !value.Compare(_L("Record #12")) )
+		{
+			//There should be no more records
+			CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+			ret = KErrNone;
+		}
+	}
+	
+	return ret;
+	}
+
+
+TVerdict CCommDbTest022_09::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.09 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 022.10
+/////////////////////
+
+// constructor
+CCommDbTest022_10::CCommDbTest022_10()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_10"));
+	}
+
+// destructor
+CCommDbTest022_10::~CCommDbTest022_10()
+	{
+	}
+
+
+TVerdict CCommDbTest022_10::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest022_10::executeStepL()
+	{
+	TInt ret=KErrNone;
+
+	//Open a view with multiple bearers on the IAP table, then check the records returned
+	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerCSD | KCommDbBearerLAN, ECommDbConnectionDirectionOutgoing);
+	CleanupStack::Pop();
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	TBuf<KCommsDbSvrMaxFieldLength> value;
+	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
+	if( value.Compare(_L("Record #1")) && ret == KErrNone)
+		{
+		ret = KErrGeneral;
+		}
+	else
+		{
+		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
+		}
+
+	if ( value.Compare(_L("Record #2"))  && ret == KErrNone )
+		{
+		ret = KErrGeneral;
+		}
+	else
+		{
+		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
+		}
+
+	if ( value.Compare(_L("Record #11"))  && ret == KErrNone )
+		{
+		ret = KErrGeneral;
+		}
+	else
+		{
+		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
+		}
+		
+	if ( value.Compare(_L("Record #12"))  && ret == KErrNone )
+		{
+		ret = KErrGeneral;
+		}
+	else
+		{
+		CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+		}
+		
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest022_10::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.10 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 022.11
+/////////////////////
+
+// constructor
+CCommDbTest022_11::CCommDbTest022_11()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_11"));
+	}
+
+// destructor
+CCommDbTest022_11::~CCommDbTest022_11()
+	{
+	}
+
+
+TVerdict CCommDbTest022_11::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+#define INVALID_BEARER 0x200
+
+TInt CCommDbTest022_11::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+
+	TRAPD( r, iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( INVALID_BEARER , ECommDbConnectionDirectionOutgoing) );
+	if ( r!=KErrNone )
+		{
+		ret = r;
+		}
+	else
+		{
+		//Shouldnt get here, but just in case ....
+		CleanupStack::Pop();
+		}
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest022_11::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.11 called "));
+
+
+	if ( executeStepL() == KErrArgument )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+
+/////////////////////
+//	Test step 022.12
+/////////////////////
+
+// constructor
+CCommDbTest022_12::CCommDbTest022_12()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_12"));
+	}
+
+// destructor
+CCommDbTest022_12::~CCommDbTest022_12()
+	{
+	}
+
+
+TVerdict CCommDbTest022_12::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+#define INVALID_DIRECTION 0xF
+
+TInt CCommDbTest022_12::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Due to the strong type checking in C++, this test step is not particularly valid
+	TRAPD( r, iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerCSD , (TCommDbConnectionDirection)INVALID_DIRECTION ) );
+	if ( r!=KErrNone )
+		{
+		ret = r;
+		}
+	else
+		{
+		//Shouldnt get here, but just in case ....
+		CleanupStack::Pop();
+		}
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest022_12::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.12 called "));
+
+
+	if ( executeStepL() == KErrArgument )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 022.13
+/////////////////////
+
+// constructor
+CCommDbTest022_13::CCommDbTest022_13()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_13"));
+	}
+
+// destructor
+CCommDbTest022_13::~CCommDbTest022_13()
+	{
+	}
+
+
+TVerdict CCommDbTest022_13::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest022_13::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	
+	//Due to the strong type checking in C++, this test step is not particularly valid
+	TRAPD( r, iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerCSD , (TCommDbConnectionDirection)5 ) );
+	if ( r!=KErrNone )
+		{
+		ret = r;
+		}
+	else
+		{
+		//Shouldnt get here, but just in case ....
+		CleanupStack::Pop();
+		}
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest022_13::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.13 called "));
+
+
+	if ( executeStepL() == KErrArgument )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 022.14
+/////////////////////
+
+// constructor
+CCommDbTest022_14::CCommDbTest022_14()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_14"));
+	}
+
+// destructor
+CCommDbTest022_14::~CCommDbTest022_14()
+	{
+	}
+
+
+TVerdict CCommDbTest022_14::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+#define INVALID_DIRECTION2 0xffffffff
+
+TInt CCommDbTest022_14::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Due to the strong type checking in C++, this test step is not particularly valid
+	TRAPD( r, iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerCSD , (TCommDbConnectionDirection)INVALID_DIRECTION2 ) );
+	if ( r!=KErrNone )
+		{
+		ret = r;
+		}
+	else
+		{
+		//Shouldnt get here, but just in case ....
+		CleanupStack::Pop();
+		}
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest022_14::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.14 called "));
+
+
+	if ( executeStepL() == KErrArgument )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 022.15
+/////////////////////
+
+// constructor
+CCommDbTest022_15::CCommDbTest022_15()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_15"));
+	}
+
+// destructor
+CCommDbTest022_15::~CCommDbTest022_15()
+	{
+	}
+
+
+TVerdict CCommDbTest022_15::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+#define UNSUPPORTED_BEARER 0x30
+
+TInt CCommDbTest022_15::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	// Similar to test 022_11, but with direction incoming...
+
+	TRAPD( r, iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( UNSUPPORTED_BEARER , ECommDbConnectionDirectionIncoming) );
+	if ( r!=KErrNone )
+		{
+		ret = r;
+		}
+	else
+		{
+		//Shouldnt get here, but just in case ....
+		CleanupStack::Pop();
+		}
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest022_15::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.15 called "));
+
+
+	if ( executeStepL() == KErrArgument )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 022.16
+/////////////////////
+
+// constructor
+CCommDbTest022_16::CCommDbTest022_16()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_16"));
+	}
+
+// destructor
+CCommDbTest022_16::~CCommDbTest022_16()
+	{
+	}
+
+TVerdict CCommDbTest022_16::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.16 called "));
+
+	SetTestStepResult(EPass);
+		// Heap test for 022.01
+
+	CCommDbTest022_01* step022_01 = new(ELeave) CCommDbTest022_01;
+	CleanupStack::PushL(step022_01);
+	if ( doTestStepWithHeapFailureL( *step022_01, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step022_01);
+
+
+
+	return TestStepResult();	
+
+}
+
+
+/////////////////////
+//	Test step 022.17
+/////////////////////
+
+// constructor
+CCommDbTest022_17::CCommDbTest022_17()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_17"));
+	}
+
+// destructor
+CCommDbTest022_17::~CCommDbTest022_17()
+	{
+	}
+
+TVerdict CCommDbTest022_17::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.17 called "));
+
+	SetTestStepResult(EPass);	
+			// Heap test for 022.02
+
+	CCommDbTest022_02* step022_02 = new CCommDbTest022_02;
+	CleanupStack::PushL(step022_02);
+	if ( doTestStepWithHeapFailureL( *step022_02, KErrNone) == EFail ) 
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step022_02);
+	
+	return TestStepResult();
+	
+	}
+
+/////////////////////
+//	Test step 022.18
+/////////////////////
+
+// constructor
+CCommDbTest022_18::CCommDbTest022_18()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_18"));
+	}
+
+// destructor
+CCommDbTest022_18::~CCommDbTest022_18()
+	{
+	}
+
+TVerdict CCommDbTest022_18::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.18 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 022.03
+
+	CCommDbTest022_03* step022_03 = new CCommDbTest022_03;
+	CleanupStack::PushL(step022_03);
+	if ( doTestStepWithHeapFailureL( *step022_03, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step022_03);
+	
+	return TestStepResult();
+	
+	}
+
+/////////////////////
+//	Test step 022.19
+/////////////////////
+
+// constructor
+CCommDbTest022_19::CCommDbTest022_19()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_19"));
+	}
+
+// destructor
+CCommDbTest022_19::~CCommDbTest022_19()
+	{
+	}
+
+TVerdict CCommDbTest022_19::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.19 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 022.04
+
+	CCommDbTest022_04* step022_04 = new CCommDbTest022_04;
+	CleanupStack::PushL(step022_04);
+	if ( doTestStepWithHeapFailureL( *step022_04, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step022_04);
+	
+	return TestStepResult();
+	
+	}
+	
+/////////////////////
+//	Test step 022.20
+/////////////////////
+
+// constructor
+CCommDbTest022_20::CCommDbTest022_20()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_20"));
+	}
+
+// destructor
+CCommDbTest022_20::~CCommDbTest022_20()
+	{
+	}
+
+TVerdict CCommDbTest022_20::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.20 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 022.05
+
+	CCommDbTest022_05* step022_05 = new CCommDbTest022_05;
+	CleanupStack::PushL(step022_05);
+	if ( doTestStepWithHeapFailureL( *step022_05, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step022_05);
+	
+	return TestStepResult();
+	
+	}
+	
+/////////////////////
+//	Test step 022.21
+/////////////////////
+
+// constructor
+CCommDbTest022_21::CCommDbTest022_21()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_21"));
+	}
+
+// destructor
+CCommDbTest022_21::~CCommDbTest022_21()
+	{
+	}
+
+TVerdict CCommDbTest022_21::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.21 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 022.06
+
+	CCommDbTest022_06* step022_06 = new CCommDbTest022_06;
+	CleanupStack::PushL(step022_06);
+	if ( doTestStepWithHeapFailureL( *step022_06, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step022_06);
+	
+	return TestStepResult();
+	
+	}
+	
+/////////////////////
+//	Test step 022.22
+/////////////////////
+
+// constructor
+CCommDbTest022_22::CCommDbTest022_22()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_22"));
+	}
+
+// destructor
+CCommDbTest022_22::~CCommDbTest022_22()
+	{
+	}
+
+TVerdict CCommDbTest022_22::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.22 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 022.07
+
+	CCommDbTest022_07* step022_07 = new CCommDbTest022_07;
+	CleanupStack::PushL(step022_07);
+	if ( doTestStepWithHeapFailureL( *step022_07, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step022_07);
+	
+	return TestStepResult();
+	
+	}
+	
+/////////////////////
+//	Test step 022.23
+/////////////////////
+
+// constructor
+CCommDbTest022_23::CCommDbTest022_23()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_23"));
+	}
+
+// destructor
+CCommDbTest022_23::~CCommDbTest022_23()
+	{
+	}
+
+TVerdict CCommDbTest022_23::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.23 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 022.08
+
+	CCommDbTest022_08* step022_08 = new CCommDbTest022_08;
+	CleanupStack::PushL(step022_08);
+	if ( doTestStepWithHeapFailureL( *step022_08, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step022_08);
+	
+	return TestStepResult();
+	
+	}	
+	
+/////////////////////
+//	Test step 022.24
+/////////////////////
+
+// constructor
+CCommDbTest022_24::CCommDbTest022_24()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_24"));
+	}
+
+// destructor
+CCommDbTest022_24::~CCommDbTest022_24()
+	{
+	}
+
+TVerdict CCommDbTest022_24::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.24 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 022.09
+
+	CCommDbTest022_09* step022_09 = new CCommDbTest022_09;
+	CleanupStack::PushL(step022_09);
+	if ( doTestStepWithHeapFailureL( *step022_09, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step022_09);
+	
+	return TestStepResult();
+	
+	}		
+	
+/////////////////////
+//	Test step 022.25
+/////////////////////
+
+// constructor
+CCommDbTest022_25::CCommDbTest022_25()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_25"));
+	}
+
+// destructor
+CCommDbTest022_25::~CCommDbTest022_25()
+	{
+	}
+
+TVerdict CCommDbTest022_25::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.25 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 022.10
+
+	CCommDbTest022_10* step022_10 = new CCommDbTest022_10;
+	CleanupStack::PushL(step022_10);
+	if ( doTestStepWithHeapFailureL( *step022_10, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step022_10);
+	
+	return TestStepResult();
+	
+	}		
+	
+/////////////////////
+//	Test step 022.26
+/////////////////////
+
+// constructor
+CCommDbTest022_26::CCommDbTest022_26()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_26"));
+	}
+
+// destructor
+CCommDbTest022_26::~CCommDbTest022_26()
+	{
+	}
+
+TVerdict CCommDbTest022_26::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.26 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 022.11
+
+	CCommDbTest022_11* step022_11 = new CCommDbTest022_11;
+	CleanupStack::PushL(step022_11);
+	if ( doTestStepWithHeapFailureL( *step022_11, KErrArgument) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step022_11);
+	
+	return TestStepResult();
+	
+	}
+	
+/////////////////////
+//	Test step 022.27
+/////////////////////
+
+// constructor
+CCommDbTest022_27::CCommDbTest022_27()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_27"));
+	}
+
+// destructor
+CCommDbTest022_27::~CCommDbTest022_27()
+	{
+	}
+
+TVerdict CCommDbTest022_27::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.27 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 022.12
+
+	CCommDbTest022_12* step022_12 = new CCommDbTest022_12;
+	CleanupStack::PushL(step022_12);
+	if ( doTestStepWithHeapFailureL( *step022_12, KErrArgument) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step022_12);
+	
+	return TestStepResult();
+	
+	}	
+	
+/////////////////////
+//	Test step 022.28
+/////////////////////
+
+// constructor
+CCommDbTest022_28::CCommDbTest022_28()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_28"));
+	}
+
+// destructor
+CCommDbTest022_28::~CCommDbTest022_28()
+	{
+	}
+
+TVerdict CCommDbTest022_28::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.28 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 022.13
+
+	CCommDbTest022_13* step022_13 = new CCommDbTest022_13;
+	CleanupStack::PushL(step022_13);
+	if ( doTestStepWithHeapFailureL( *step022_13, KErrArgument) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step022_13);
+	
+	return TestStepResult();
+	
+	}		
+	
+/////////////////////
+//	Test step 022.29
+/////////////////////
+
+// constructor
+CCommDbTest022_29::CCommDbTest022_29()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_29"));
+	}
+
+// destructor
+CCommDbTest022_29::~CCommDbTest022_29()
+	{
+	}
+
+TVerdict CCommDbTest022_29::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.29 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 022.14
+
+	CCommDbTest022_14* step022_14 = new CCommDbTest022_14;
+	CleanupStack::PushL(step022_14);
+	if ( doTestStepWithHeapFailureL( *step022_14, KErrArgument) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step022_14);
+	
+	return TestStepResult();
+	
+	}			
+
+
+/////////////////////
+//	Test step 022.30
+/////////////////////
+
+// constructor
+CCommDbTest022_30::CCommDbTest022_30()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_022_30"));
+	}
+
+// destructor
+CCommDbTest022_30::~CCommDbTest022_30()
+	{
+	}
+
+TInt CCommDbTest022_30::executeStepL()
+	{
+	TInt ret = KErrGeneral;
+
+	CCommsDatabase* db = CCommsDatabase::NewL();
+	CleanupStack::PushL(db);
+
+	CCommsDbTableView* view1 = db->OpenTableLC( TPtrC(IAP) );
+	TUint32 a = 0;
+	User::LeaveIfError(view1->InsertRecord(a));
+	// expected commdb currently only has 1 IAP, hence 2 here
+	if (a != 2)
+		{
+		User::Leave(KErrGeneral);
+		}
+	CleanupStack::Pop(view1);
+
+	CCommsDbTableView* view2 = db->OpenIAPTableViewMatchingBearerSetLC(KCommDbBearerWcdma, ECommDbConnectionDirectionOutgoing);
+	a = 0;
+	User::LeaveIfError(view2->InsertRecord(a));
+	if (a != 3)
+		{
+		User::Leave(KErrGeneral);
+		}
+	CleanupStack::Pop(view2);
+
+	CleanupStack::Pop(db);
+
+	ret = KErrNone;
+	return ret;
+	}
+
+
+TVerdict CCommDbTest022_30::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 022.30 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+//EOF
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_023_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,292 @@
+// step_023_XX.cpp
+//
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 023.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_023_xx.h"
+
+
+/////////////////////
+//	Test step 023.01
+/////////////////////
+
+// constructor
+CCommDbTest023_01::CCommDbTest023_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_023_01"));
+	}
+
+// destructor
+CCommDbTest023_01::~CCommDbTest023_01()
+	{
+	}
+
+
+TVerdict CCommDbTest023_01::doTestStepPreambleL()
+	{	
+	// Have a temp copy of database
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest023_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	iTheView = iTheDb->OpenViewOnProxyRecordLC(1, TPtrC(DIAL_OUT_ISP) );
+	CleanupStack::Pop();
+	TUint32 value;
+
+	//Check the view contains the expected records
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone);
+	iTheView->ReadUintL(TPtrC(PROXY_ISP), value);
+
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
+
+	ret = KErrNone;
+	
+	return ret;
+	}
+
+
+TVerdict CCommDbTest023_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 023.01 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 023.02
+/////////////////////
+
+// constructor
+CCommDbTest023_02::CCommDbTest023_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_023_02"));
+	}
+
+// destructor
+CCommDbTest023_02::~CCommDbTest023_02()
+	{
+	}
+
+
+TVerdict CCommDbTest023_02::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest023_02::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	iTheView = iTheDb->OpenViewOnProxyRecordLC(99, TPtrC(DIAL_OUT_ISP) );
+	CleanupStack::Pop();
+
+	//The view should be empty
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNotFound);
+
+	ret = KErrNone;
+	
+	return ret;
+	}
+
+
+TVerdict CCommDbTest023_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 023.02 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 023.03
+/////////////////////
+
+// constructor
+CCommDbTest023_03::CCommDbTest023_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_023_03"));
+	}
+
+// destructor
+CCommDbTest023_03::~CCommDbTest023_03()
+	{
+	}
+
+
+TVerdict CCommDbTest023_03::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+#define INVALID_TABLE	_L("Invalid")
+
+TInt CCommDbTest023_03::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+
+	iTheView = iTheDb->OpenViewOnProxyRecordLC(1, TPtrC(INVALID_TABLE) );
+	CleanupStack::Pop();
+	
+	//It should be an empty view
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNotFound );
+
+	ret = KErrNone;
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest023_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 023.03 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 023.04
+/////////////////////
+
+// constructor
+CCommDbTest023_04::CCommDbTest023_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_023_04"));
+	}
+
+// destructor
+CCommDbTest023_04::~CCommDbTest023_04()
+	{
+	}
+
+TVerdict CCommDbTest023_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 023.04 called "));
+
+	SetTestStepResult(EPass);
+		// Heap test for 023.01
+
+	CCommDbTest023_01* step023_01 = new(ELeave) CCommDbTest023_01;
+	CleanupStack::PushL(step023_01);
+	if ( doTestStepWithHeapFailureL( *step023_01, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step023_01);
+
+
+	return TestStepResult();	
+
+}
+
+
+/////////////////////
+//	Test step 023.05
+/////////////////////
+
+// constructor
+CCommDbTest023_05::CCommDbTest023_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_023_05"));
+	}
+
+// destructor
+CCommDbTest023_05::~CCommDbTest023_05()
+	{
+	}
+
+TVerdict CCommDbTest023_05::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 023.05 called "));
+
+	SetTestStepResult(EPass);	
+			// Heap test for 023.02
+
+	CCommDbTest023_02* step023_02 = new CCommDbTest023_02;
+	CleanupStack::PushL(step023_02);
+	if ( doTestStepWithHeapFailureL( *step023_02, KErrNone) == EFail ) 
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step023_02);
+	
+	return TestStepResult();
+	}
+	
+/////////////////////
+//	Test step 023.06
+/////////////////////
+
+// constructor
+CCommDbTest023_06::CCommDbTest023_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_023_06"));
+	}
+
+// destructor
+CCommDbTest023_06::~CCommDbTest023_06()
+	{
+	}
+
+TVerdict CCommDbTest023_06::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 023.06 called "));
+
+	SetTestStepResult(EPass);	
+		// Heap test for 023.03
+
+	CCommDbTest023_03* step023_03 = new CCommDbTest023_03;
+	CleanupStack::PushL(step023_03);
+	if ( doTestStepWithHeapFailureL( *step023_03, KErrNone) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step023_03);
+	
+	return TestStepResult();
+	}
+
+//EOF
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_024_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,549 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 024.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_024_xx.h"
+
+
+
+/////////////////////
+//	Test step 024.01
+/////////////////////
+
+// constructor
+CCommDbTest024_01::CCommDbTest024_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_024_01"));
+	}
+
+// destructor
+CCommDbTest024_01::~CCommDbTest024_01()
+	{
+	}
+
+
+TVerdict CCommDbTest024_01::doTestStepPreambleL()
+	{	
+	// Have a temp copy of database
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest024_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Now test the settings
+	TUint32 value;
+	TRAPD(r,iTheDb->GetCurrentDialOutSettingL( TPtrC(MODEM_BEARER),value));
+
+	if(r==KErrNotSupported)
+		{
+		return KErrNotSupported;
+		}
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest024_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 024.03 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 024.02
+/////////////////////
+
+// constructor
+CCommDbTest024_02::CCommDbTest024_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_024_02"));
+	}
+
+// destructor
+CCommDbTest024_02::~CCommDbTest024_02()
+	{
+	}
+
+
+TVerdict CCommDbTest024_02::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest024_02::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Now test the settings
+	TUint32 value;
+	TRAPD(r,iTheDb->GetCurrentDialOutSettingL( TPtrC(LOCATION), value ));
+
+	if(r==KErrNotSupported)
+		{
+		return KErrNotSupported;
+		}
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest024_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 024.04 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+
+/////////////////////
+//	Test step 024.03
+/////////////////////
+
+// constructor
+CCommDbTest024_03::CCommDbTest024_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_024_03"));
+	}
+
+// destructor
+CCommDbTest024_03::~CCommDbTest024_03()
+	{
+	}
+
+
+TVerdict CCommDbTest024_03::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest024_03::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Point to an IAP record
+	iTheDb->SetGlobalSettingL( TPtrC(DEFAULT_NETWORK), 0 );
+
+	//Now test the settings
+	TUint32 value;
+	TRAPD(r1,iTheDb->GetCurrentDialOutSettingL( TPtrC(IAP_SERVICE), value ));
+
+	if(r1==KErrNotSupported)
+		{
+		return KErrNotSupported;
+		}
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest024_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 024.03 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 024.04
+/////////////////////
+
+// constructor
+CCommDbTest024_04::CCommDbTest024_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_024_04"));
+	}
+
+// destructor
+CCommDbTest024_04::~CCommDbTest024_04()
+	{
+	}
+
+
+TVerdict CCommDbTest024_04::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest024_04::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Point to an IAP record
+	iTheDb->SetGlobalSettingL( TPtrC(DEFAULT_NETWORK), 0 );
+
+	//Now test the settings
+	TUint32 value;
+	TRAPD(r1,iTheDb->GetCurrentDialOutSettingL( TPtrC(IAP_NETWORK),value));
+
+	if(r1==KErrNotSupported)
+		{
+		return KErrNotSupported;
+		}
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest024_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 024.02 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 024.05
+/////////////////////
+
+// constructor
+CCommDbTest024_05::CCommDbTest024_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_024_05"));
+	}
+
+// destructor
+CCommDbTest024_05::~CCommDbTest024_05()
+	{
+	}
+
+
+TVerdict CCommDbTest024_05::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest024_05::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Now test the settings
+	TUint32 value;
+	TRAPD(r1,iTheDb->GetCurrentDialInSettingL( TPtrC(MODEM_BEARER), value));
+
+	if(r1==KErrNotSupported)
+		{
+		return KErrNotSupported;
+		}
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest024_05::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 024.03 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 024.06
+/////////////////////
+
+// constructor
+CCommDbTest024_06::CCommDbTest024_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_024_06"));
+	}
+
+// destructor
+CCommDbTest024_06::~CCommDbTest024_06()
+	{
+	}
+
+
+TVerdict CCommDbTest024_06::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest024_06::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Now test the settings
+	TUint32 value;
+	TRAPD(r1,iTheDb->GetCurrentDialInSettingL( TPtrC(LOCATION), value));
+
+	if(r1==KErrNotSupported)
+		{
+		return KErrNotSupported;
+		}
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest024_06::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 024.04 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+
+/////////////////////
+//	Test step 024.07
+/////////////////////
+
+// constructor
+CCommDbTest024_07::CCommDbTest024_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_024_07"));
+	}
+
+// destructor
+CCommDbTest024_07::~CCommDbTest024_07()
+	{
+	}
+
+
+TVerdict CCommDbTest024_07::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest024_07::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Point to an IAP record
+	iTheDb->SetGlobalSettingL( TPtrC(DEFAULT_NETWORK), 0 );
+
+	//Now test the settings
+	TUint32 value;
+	TRAPD(r1,iTheDb->GetCurrentDialInSettingL( TPtrC(IAP_SERVICE),value));
+
+	if(r1==KErrNotSupported)
+		{
+		return KErrNotSupported;
+		}
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest024_07::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 024.01 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 024.08
+/////////////////////
+
+// constructor
+CCommDbTest024_08::CCommDbTest024_08()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_024_08"));
+	}
+
+// destructor
+CCommDbTest024_08::~CCommDbTest024_08()
+	{
+	}
+
+
+TVerdict CCommDbTest024_08::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest024_08::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//Point to an IAP record
+	iTheDb->SetGlobalSettingL( TPtrC(DEFAULT_NETWORK), 0 );
+
+	//Now test the settings
+	TUint32 value;
+	TRAPD(r1,iTheDb->GetCurrentDialInSettingL( TPtrC(IAP_SERVICE),value));
+
+	if(r1==KErrNotSupported)
+		{
+		return KErrNotSupported;
+		}
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest024_08::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 024.02 called "));
+
+
+	if ( executeStepL() == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 024.09
+/////////////////////
+
+// constructor
+CCommDbTest024_09::CCommDbTest024_09()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_024_09"));
+	}
+
+// destructor
+CCommDbTest024_09::~CCommDbTest024_09()
+	{
+	}
+
+TVerdict CCommDbTest024_09::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 024.09 called "));
+
+	SetTestStepResult(EPass);
+		// Heap test for 024.01
+
+	CCommDbTest024_01* step024_01 = new(ELeave) CCommDbTest024_01;
+	CleanupStack::PushL(step024_01);
+	if ( doTestStepWithHeapFailureL( *step024_01, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step024_01);
+
+
+		// Heap test for 024.02
+
+	CCommDbTest024_02* step024_02 = new CCommDbTest024_02;
+	CleanupStack::PushL(step024_02);
+	if ( doTestStepWithHeapFailureL( *step024_02, KErrNotSupported) == EFail ) 
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step024_02);
+
+		// Heap test for 024.03
+
+	CCommDbTest024_03* step024_03 = new CCommDbTest024_03;
+	CleanupStack::PushL(step024_03);
+	if ( doTestStepWithHeapFailureL( *step024_03, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step024_03);
+
+
+		// Heap test for 024.04
+
+	CCommDbTest024_04* step024_04 = new CCommDbTest024_04;
+	CleanupStack::PushL(step024_04);
+	if ( doTestStepWithHeapFailureL( *step024_04, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step024_04);
+
+		// Heap test for 024.05
+
+	CCommDbTest024_05* step024_05 = new CCommDbTest024_05;
+	CleanupStack::PushL(step024_05);
+	if ( doTestStepWithHeapFailureL( *step024_05, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step024_05);
+
+		// Heap test for 024.06
+
+	CCommDbTest024_06* step024_06 = new CCommDbTest024_06;
+	CleanupStack::PushL(step024_06);
+	if ( doTestStepWithHeapFailureL( *step024_06, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step024_06);
+
+		// Heap test for 024.07
+
+	CCommDbTest024_07* step024_07 = new CCommDbTest024_07;
+	CleanupStack::PushL(step024_07);
+	if ( doTestStepWithHeapFailureL( *step024_07, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step024_07);
+
+	
+		// Heap test for 024.08
+
+	CCommDbTest024_08* step024_08 = new CCommDbTest024_08;
+	CleanupStack::PushL(step024_08);
+	if ( doTestStepWithHeapFailureL( *step024_08, KErrNotSupported) == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step024_08);
+
+	return TestStepResult();	
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_025_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,92 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 025.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_025_xx.h"
+
+
+CCommDbTest025_01::CCommDbTest025_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_025_01"));
+	}
+
+CCommDbTest025_01::~CCommDbTest025_01()
+	{}
+
+
+TVerdict CCommDbTest025_01::doTestStepL( void )
+	{
+	executeStepL();	//Always returns KErrNone or leaves.
+        SetTestStepResult(EPass);	return TestStepResult();	//So if we got to here we must have passed.
+	}
+
+TInt CCommDbTest025_01::executeStepL()
+	{
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+	return KErrNone;
+	}
+
+TVerdict CCommDbTest025_01::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest025_01::doTestStepPostambleL()
+	{
+	delete iPrefView;
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+// Test 25.02
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest025_02::CCommDbTest025_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_025_02"));
+	}
+
+CCommDbTest025_02::~CCommDbTest025_02()
+	{}
+
+TVerdict CCommDbTest025_02::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 025.02 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest025_01* step025_01 = new(ELeave) CCommDbTest025_01;
+	CleanupStack::PushL(step025_01);
+	doTestStepWithHeapFailureL( *step025_01, KErrNone);
+	CleanupStack::PopAndDestroy(step025_01);
+
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_026_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,742 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 026.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_026_xx.h"
+
+//_LIT(KCommDefault3, "C:\\default3.dat");
+
+CCommDbTest026_01::CCommDbTest026_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_026_01"));
+	}
+
+CCommDbTest026_01::~CCommDbTest026_01()
+	{}
+
+TVerdict CCommDbTest026_01::doTestStepL( void )
+	{
+	executeStepL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest026_01::doTestStepPreambleL()
+	{
+//	copyFileL(KCommDbName, KCommDefault3);
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest026_01::executeStepL()
+	{
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 2;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest026_01::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest026_02::CCommDbTest026_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_026_02"));
+	}
+
+CCommDbTest026_02::~CCommDbTest026_02()
+	{}
+
+TVerdict CCommDbTest026_02::doTestStepL( void )
+	{
+	if (KErrAlreadyExists == executeStepL())
+         SetTestStepResult(EPass);        SetTestStepResult(EFail);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest026_02::doTestStepPreambleL()
+	{
+//	copyFileL(KCommDefault3, KCommDbName);
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	iTheDb->SetGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS),2);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest026_02::executeStepL()
+	{
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 1;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	TRAPD(err, iPrefView->InsertConnectionPreferenceL(pref2, EFalse));
+	
+	return err;
+	}
+	
+TVerdict CCommDbTest026_02::doTestStepPostambleL()
+	{
+	delete iPrefView;
+	iPrefView = NULL;
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest026_03::CCommDbTest026_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_026_03"));
+	}
+
+CCommDbTest026_03::~CCommDbTest026_03()
+	{}
+
+TVerdict CCommDbTest026_03::doTestStepL( void )
+	{
+	if (KErrAlreadyExists == executeStepL())
+         SetTestStepResult(EPass);        SetTestStepResult(EFail);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest026_03::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	iTheDb->SetGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS),2);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest026_03::executeStepL()
+	{
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionIncoming;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 3;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 1;
+	pref2.iDirection = ECommDbConnectionDirectionIncoming;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 4;
+	
+	TRAPD(err, iPrefView->InsertConnectionPreferenceL(pref2, EFalse));
+	
+	return err;
+	}
+	
+TVerdict CCommDbTest026_03::doTestStepPostambleL()
+	{
+	delete iPrefView;
+	iPrefView = NULL;
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest026_04::CCommDbTest026_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_026_04"));
+	}
+
+CCommDbTest026_04::~CCommDbTest026_04()
+	{}
+
+TVerdict CCommDbTest026_04::doTestStepL( void )
+	{
+	if (KErrOverflow == executeStepL())
+         SetTestStepResult(EPass);        SetTestStepResult(EFail);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest026_04::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	iTheDb->SetGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS),2);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest026_04::executeStepL()
+	{
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 85;
+	pref1.iDirection = ECommDbConnectionDirectionIncoming;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 3;
+
+	TRAPD(err, iPrefView->InsertConnectionPreferenceL(pref1, EFalse));
+	
+	return err;
+	}
+	
+TVerdict CCommDbTest026_04::doTestStepPostambleL()
+	{
+	delete iPrefView;
+	iPrefView = NULL;
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest026_05::CCommDbTest026_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_026_05"));
+	}
+
+CCommDbTest026_05::~CCommDbTest026_05()
+	{}
+
+TVerdict CCommDbTest026_05::doTestStepL( void )
+	{
+	if (KErrNotFound == executeStepL())
+         SetTestStepResult(EPass);        SetTestStepResult(EFail);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest026_05::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	iTheDb->SetGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS),2);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest026_05::executeStepL()
+	{
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionIncoming;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 0xffffffff;
+
+	TRAPD(err, iPrefView->InsertConnectionPreferenceL(pref1, EFalse));
+
+	return err;
+	}
+	
+TVerdict CCommDbTest026_05::doTestStepPostambleL()
+	{
+	//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	iTheDb->ClearGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS));
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest026_06::CCommDbTest026_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_026_06"));
+	}
+
+CCommDbTest026_06::~CCommDbTest026_06()
+	{}
+
+TVerdict CCommDbTest026_06::doTestStepL( void )
+	{
+	if (KErrArgument == executeStepL())
+         SetTestStepResult(EPass);        SetTestStepResult(EFail);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest026_06::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	iTheDb->SetGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS),2);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest026_06::executeStepL()
+	{
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionIncoming;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = 0x80000000;
+	pref1.iBearer.iIapId = 3;
+
+	TRAPD(err, iPrefView->InsertConnectionPreferenceL(pref1, EFalse));
+
+	return err;
+	}
+	
+TVerdict CCommDbTest026_06::doTestStepPostambleL()
+	{
+	//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+
+	iTheDb->ClearGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS));
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest026_07::CCommDbTest026_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_026_07"));
+	}
+
+CCommDbTest026_07::~CCommDbTest026_07()
+	{}
+
+TVerdict CCommDbTest026_07::doTestStepL( void )
+	{
+	if (KErrArgument == executeStepL())
+         SetTestStepResult(EPass);        SetTestStepResult(EFail);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest026_07::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	iTheDb->SetGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS),2);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest026_07::executeStepL()
+	{
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPromptIfWrongMode;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	TRAPD(err, iPrefView->InsertConnectionPreferenceL(pref1, EFalse));
+
+	return err;
+	}
+	
+TVerdict CCommDbTest026_07::doTestStepPostambleL()
+	{
+	//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+
+	iTheDb->ClearGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS));
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest026_08::CCommDbTest026_08()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_026_08"));
+	}
+
+CCommDbTest026_08::~CCommDbTest026_08()
+	{}
+
+TVerdict CCommDbTest026_08::doTestStepL( void )
+	{
+	if (KErrArgument == executeStepL())
+         SetTestStepResult(EPass);        SetTestStepResult(EFail);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest026_08::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	iTheDb->SetGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS),2);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest026_08::executeStepL()
+	{
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionIncoming;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 3;
+
+	TRAPD(err, iPrefView->InsertConnectionPreferenceL(pref1, EFalse));
+
+	return err;
+	}
+	
+TVerdict CCommDbTest026_08::doTestStepPostambleL()
+	{
+	//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+
+	iTheDb->ClearGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS));
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest026_09::CCommDbTest026_09()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_026_09"));
+	}
+
+CCommDbTest026_09::~CCommDbTest026_09()
+	{}
+
+TVerdict CCommDbTest026_09::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 026.09 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest026_01* step026_01 = new(ELeave) CCommDbTest026_01;
+	CleanupStack::PushL(step026_01);
+	doTestStepWithHeapFailureL( *step026_01, KErrNone);
+	CleanupStack::PopAndDestroy(step026_01);
+
+
+	return TestStepResult();
+	}
+
+
+CCommDbTest026_10::CCommDbTest026_10()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_026_10"));
+	}
+
+CCommDbTest026_10::~CCommDbTest026_10()
+	{}
+
+TVerdict CCommDbTest026_10::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 026.10 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest026_02* step026_02 = new(ELeave) CCommDbTest026_02;
+	CleanupStack::PushL(step026_02);
+	doTestStepWithHeapFailureL( *step026_02, KErrAlreadyExists);
+	CleanupStack::PopAndDestroy(step026_02);
+	
+	return TestStepResult();
+	}
+	
+	
+CCommDbTest026_11::CCommDbTest026_11()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_026_11"));
+	}
+
+CCommDbTest026_11::~CCommDbTest026_11()
+	{}
+
+TVerdict CCommDbTest026_11::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 026.11 called "));
+
+	SetTestStepResult(EPass);	
+		CCommDbTest026_03* step026_03 = new(ELeave) CCommDbTest026_03;
+	CleanupStack::PushL(step026_03);
+	doTestStepWithHeapFailureL( *step026_03, KErrAlreadyExists);
+	CleanupStack::PopAndDestroy(step026_03);
+	
+	return TestStepResult();
+	}
+	
+CCommDbTest026_12::CCommDbTest026_12()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_026_12"));
+	}
+
+CCommDbTest026_12::~CCommDbTest026_12()
+	{}
+
+TVerdict CCommDbTest026_12::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 026.12 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest026_04* step026_04 = new(ELeave) CCommDbTest026_04;
+	CleanupStack::PushL(step026_04);
+	doTestStepWithHeapFailureL( *step026_04, KErrOverflow);
+	CleanupStack::PopAndDestroy(step026_04);
+	
+	return TestStepResult();
+	}	
+	
+CCommDbTest026_13::CCommDbTest026_13()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_026_13"));
+	}
+
+CCommDbTest026_13::~CCommDbTest026_13()
+	{}
+
+TVerdict CCommDbTest026_13::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 026.13 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest026_05* step026_05 = new(ELeave) CCommDbTest026_05;
+	CleanupStack::PushL(step026_05);
+	doTestStepWithHeapFailureL( *step026_05, KErrNotFound);
+	CleanupStack::PopAndDestroy(step026_05);
+	
+	return TestStepResult();
+	}	
+		
+CCommDbTest026_14::CCommDbTest026_14()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_026_14"));
+	}
+
+CCommDbTest026_14::~CCommDbTest026_14()
+	{}
+
+TVerdict CCommDbTest026_14::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 026.14 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest026_06* step026_06 = new(ELeave) CCommDbTest026_06;
+	CleanupStack::PushL(step026_06);
+	doTestStepWithHeapFailureL( *step026_06, KErrArgument);
+	CleanupStack::PopAndDestroy(step026_06);
+	
+	return TestStepResult();
+	}	
+	
+CCommDbTest026_15::CCommDbTest026_15()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_026_15"));
+	}
+
+CCommDbTest026_15::~CCommDbTest026_15()
+	{}
+
+TVerdict CCommDbTest026_15::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 026.15 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest026_07* step026_07 = new(ELeave) CCommDbTest026_07;
+	CleanupStack::PushL(step026_07);
+	doTestStepWithHeapFailureL( *step026_07, KErrArgument);
+	CleanupStack::PopAndDestroy(step026_07);
+	
+	return TestStepResult();
+	}	
+	
+CCommDbTest026_16::CCommDbTest026_16()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_026_16"));
+	}
+
+CCommDbTest026_16::~CCommDbTest026_16()
+	{}
+
+TVerdict CCommDbTest026_16::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 026.16 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest026_08* step026_08 = new(ELeave) CCommDbTest026_08;
+	CleanupStack::PushL(step026_08);
+	doTestStepWithHeapFailureL( *step026_08, KErrArgument);
+	CleanupStack::PopAndDestroy(step026_08);
+	
+	return TestStepResult();
+	}	
+
+//EOF
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_027_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,95 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 027.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_027_xx.h"
+
+
+CCommDbTest027_01::CCommDbTest027_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_027_01"));
+	}
+
+CCommDbTest027_01::~CCommDbTest027_01()
+	{}
+
+TVerdict CCommDbTest027_01::doTestStepL( void )
+	{
+	executeStepL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest027_01::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest027_01::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref;
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+	iPrefView->ReadConnectionPreferenceL(pref);
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest027_01::doTestStepPostambleL()
+	{
+	delete iPrefView;
+	iPrefView = NULL;
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest027_02::CCommDbTest027_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_027_02"));
+	}
+
+CCommDbTest027_02::~CCommDbTest027_02()
+	{}
+
+TVerdict CCommDbTest027_02::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 027.02 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest027_01* step027_01 = new(ELeave) CCommDbTest027_01;
+	CleanupStack::PushL(step027_01);
+	doTestStepWithHeapFailureL( *step027_01, KErrNone);
+	CleanupStack::PopAndDestroy(step027_01);
+
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_028_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,626 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 028.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_028_xx.h"
+
+CCommDbTest028_01::CCommDbTest028_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_028_01"));
+	}
+
+CCommDbTest028_01::~CCommDbTest028_01()
+	{}
+
+TVerdict CCommDbTest028_01::doTestStepL( void )
+	{
+	if(executeStepL()==KErrNone)
+         SetTestStepResult(EPass);        SetTestStepResult(EFail);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest028_01::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest028_01::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 2;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+	
+	if(!(retrievedPref==pref1))	//Check to see if correct preferance has been fetched
+		return KErrGeneral;
+
+	User::LeaveIfError(iPrefView->GotoNextRecord());
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+
+	if(!(retrievedPref==pref2))	//Check to see if correct preferance has been fetched
+		return KErrGeneral;
+
+	if((iPrefView->GotoNextRecord())!=KErrNotFound)	//Make sure there are no more records.
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest028_01::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest028_02::CCommDbTest028_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_028_02"));
+	}
+
+CCommDbTest028_02::~CCommDbTest028_02()
+	{}
+
+TVerdict CCommDbTest028_02::doTestStepL( void )
+	{
+	if(executeStepL()==KErrNone)
+         SetTestStepResult(EPass);        SetTestStepResult(EFail);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest028_02::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest028_02::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 2;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+	
+	while (iPrefView->GotoNextRecord()!=KErrNotFound)	//Move through to last record
+		{}
+	
+	User::LeaveIfError(iPrefView->GotoPreviousRecord());
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+
+	if(!(retrievedPref==pref2))	//Check to see if correct preferance has been fetched
+		return KErrGeneral;
+
+	User::LeaveIfError(iPrefView->GotoPreviousRecord());
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+
+	if(!(retrievedPref==pref1))	//Check to see if correct preferance has been fetched
+		return KErrGeneral;
+
+	if(iPrefView->GotoPreviousRecord()!=KErrNotFound)	//Check that there are no more records
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest028_02::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest028_03::CCommDbTest028_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_028_03"));
+	}
+
+CCommDbTest028_03::~CCommDbTest028_03()
+	{}
+
+TVerdict CCommDbTest028_03::doTestStepL( void )
+	{
+	if(executeStepL()==KErrNone)
+         SetTestStepResult(EPass);        SetTestStepResult(EFail);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest028_03::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest028_03::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionIncoming;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 3;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 2;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	delete iPrefView;	//Create a new view to look only at outgoing records.
+	iPrefView=NULL;
+	iPrefView=iTheDb->OpenConnectionPrefTableLC(ECommDbConnectionDirectionOutgoing);
+	CleanupStack::Pop(iPrefView);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+		
+	if(!(retrievedPref==pref2))	//First record in this table should be pref2
+		return KErrGeneral;
+
+	if(iPrefView->GotoNextRecord()!=KErrNotFound)	//There should be no more records in this view.
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest028_03::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest028_04::CCommDbTest028_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_028_04"));
+	}
+
+CCommDbTest028_04::~CCommDbTest028_04()
+	{}
+
+TVerdict CCommDbTest028_04::doTestStepL( void )
+	{
+	if(executeStepL()==KErrNone)
+         SetTestStepResult(EPass);        SetTestStepResult(EFail);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest028_04::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest028_04::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionIncoming;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 3;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 2;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	delete iPrefView;	//Create a new view to look only at incoming records.
+	iPrefView=NULL;
+	iPrefView=iTheDb->OpenConnectionPrefTableLC(ECommDbConnectionDirectionIncoming);
+	CleanupStack::Pop(iPrefView);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+		
+	if(!(retrievedPref==pref1))	//First record in this table should be pref1
+		return KErrGeneral;
+
+	if(iPrefView->GotoNextRecord()!=KErrNotFound)	//There should be no more records in this view.
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest028_04::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest028_05::CCommDbTest028_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_028_05"));
+	}
+
+CCommDbTest028_05::~CCommDbTest028_05()
+	{}
+
+TVerdict CCommDbTest028_05::doTestStepL( void )
+	{
+	if(executeStepL()==KErrNone)
+         SetTestStepResult(EPass);        SetTestStepResult(EFail);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest028_05::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest028_05::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 2;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	delete iPrefView;	//Create a new view to look only at incoming records.
+	iPrefView=NULL;
+	iPrefView=iTheDb->OpenConnectionPrefTableLC(ECommDbConnectionDirectionIncoming);
+	CleanupStack::Pop(iPrefView);
+
+	if(iPrefView->GotoPreviousRecord()!=KErrNotFound)	//There should be no records in this table.
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest028_05::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest028_06::CCommDbTest028_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_028_06"));
+	}
+
+CCommDbTest028_06::~CCommDbTest028_06()
+	{}
+
+TVerdict CCommDbTest028_06::doTestStepL( void )
+	{
+	if(executeStepL()==KErrNone)
+         SetTestStepResult(EPass);        SetTestStepResult(EFail);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest028_06::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest028_06::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 2;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	delete iPrefView;	//Create a new view to look only at incoming records.
+	iPrefView=NULL;
+	iPrefView=iTheDb->OpenConnectionPrefTableLC(ECommDbConnectionDirectionIncoming);
+	CleanupStack::Pop(iPrefView);
+
+	if(iPrefView->GotoNextRecord()!=KErrNotFound)	//There should be no records in this table.
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest028_06::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest028_07::CCommDbTest028_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_028_07"));
+	}
+
+CCommDbTest028_07::~CCommDbTest028_07()
+	{}
+
+TVerdict CCommDbTest028_07::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 028.07 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest028_01* step028_01 = new(ELeave) CCommDbTest028_01;
+	CleanupStack::PushL(step028_01);
+	doTestStepWithHeapFailureL( *step028_01, KErrNone);
+	CleanupStack::PopAndDestroy(step028_01);
+
+	CCommDbTest028_02* step028_02 = new(ELeave) CCommDbTest028_02;
+	CleanupStack::PushL(step028_02);
+	doTestStepWithHeapFailureL( *step028_02, KErrNone);
+	CleanupStack::PopAndDestroy(step028_02);
+
+	CCommDbTest028_03* step028_03 = new(ELeave) CCommDbTest028_03;
+	CleanupStack::PushL(step028_03);
+	doTestStepWithHeapFailureL( *step028_03, KErrNone);
+	CleanupStack::PopAndDestroy(step028_03);
+
+	CCommDbTest028_04* step028_04 = new(ELeave) CCommDbTest028_04;
+	CleanupStack::PushL(step028_04);
+	doTestStepWithHeapFailureL( *step028_04, KErrNone);
+	CleanupStack::PopAndDestroy(step028_04);
+
+	CCommDbTest028_05* step028_05 = new(ELeave) CCommDbTest028_05;
+	CleanupStack::PushL(step028_05);
+	doTestStepWithHeapFailureL( *step028_05, KErrNone);
+	CleanupStack::PopAndDestroy(step028_05);
+
+	CCommDbTest028_06* step028_06 = new(ELeave) CCommDbTest028_06;
+	CleanupStack::PushL(step028_06);
+	doTestStepWithHeapFailureL( *step028_06, KErrNone);
+	CleanupStack::PopAndDestroy(step028_06);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_029_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,220 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 029.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_029_xx.h"
+
+
+CCommDbTest029_01::CCommDbTest029_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_029_01"));
+	}
+
+CCommDbTest029_01::~CCommDbTest029_01()
+	{}
+
+TVerdict CCommDbTest029_01::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNotFound)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest029_01::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest029_01::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+
+	iPrefView->DeleteConnectionPreferenceL();
+
+	return iPrefView->GotoFirstRecord();	//There should now be no records in the connection pref table, so this should be KErrNotFound
+	}
+
+TVerdict CCommDbTest029_01::doTestStepPostambleL()
+	{
+	delete iPrefView;
+	iPrefView = NULL;
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest029_02::CCommDbTest029_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_029_02"));
+	}
+
+CCommDbTest029_02::~CCommDbTest029_02()
+	{}
+
+TVerdict CCommDbTest029_02::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrAccessDenied)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest029_02::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest029_02::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 2;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+
+	iPrefView->InsertConnectionPreferenceL(pref2, ETrue);
+
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+
+	TRAPD(err, iPrefView->UpdateDialogPrefL(ECommDbDialogPrefDoNotPrompt));	//Trying to edit a read only entry
+
+	return err;
+	}
+
+TVerdict CCommDbTest029_02::doTestStepPostambleL()
+	{
+	delete iPrefView;
+	iPrefView = NULL;
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest029_03::CCommDbTest029_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_029_03"));
+	}
+
+CCommDbTest029_03::~CCommDbTest029_03()
+	{}
+
+TVerdict CCommDbTest029_03::doTestStepL( void )
+	{
+	if (executeStepL() != KErrNotFound)
+		{
+		SetTestStepResult(EFail);		}
+
+	return TestStepResult();
+	}
+
+TVerdict CCommDbTest029_03::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest029_03::executeStepL()
+	{
+	TRAPD(err, iPrefView->DeleteConnectionPreferenceL());	//This should leave with KErrNotFound
+
+	return err;
+	}
+
+TVerdict CCommDbTest029_03::doTestStepPostambleL()
+	{
+	delete iPrefView;
+	iPrefView = NULL;
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest029_04::CCommDbTest029_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_029_04"));
+	}
+
+CCommDbTest029_04::~CCommDbTest029_04()
+	{}
+
+TVerdict CCommDbTest029_04::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 029.04 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest029_01* step029_01 = new(ELeave) CCommDbTest029_01;
+	CleanupStack::PushL(step029_01);
+	doTestStepWithHeapFailureL( *step029_01, KErrNotFound);
+	CleanupStack::PopAndDestroy(step029_01);
+
+	CCommDbTest029_02* step029_02 = new(ELeave) CCommDbTest029_02;
+	CleanupStack::PushL(step029_02);
+	doTestStepWithHeapFailureL( *step029_02, KErrAccessDenied);
+	CleanupStack::PopAndDestroy(step029_02);
+
+	//Don't bother with step 3, since it's a panic test.
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_030_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,238 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 030.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_030_xx.h"
+
+
+CCommDbTest030_01::CCommDbTest030_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_030_01"));
+	}
+
+CCommDbTest030_01::~CCommDbTest030_01()
+	{}
+
+TVerdict CCommDbTest030_01::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest030_01::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest030_01::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 1;
+	pref2.iDirection = ECommDbConnectionDirectionIncoming;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 3;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+	
+	CCommsDbConnectionPrefTableView::TCommDbIapBearer newBearer;	//Set new bearer to point at other outgoing Iap in commdb
+	newBearer.iBearerSet=KCommDbBearerLAN|KCommDbBearerCSD;
+	newBearer.iIapId=2;
+
+	iPrefView->UpdateBearerL(newBearer);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
+
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+
+	if(	  (retrievedPref.iBearer.iBearerSet!=newBearer.iBearerSet)	//Check that retrieved pref is what we would expect
+		||(retrievedPref.iBearer.iIapId!=newBearer.iIapId)
+		||(retrievedPref.iRanking!=pref1.iRanking)
+		||(retrievedPref.iDirection!=pref1.iDirection)
+		||(retrievedPref.iDialogPref!=pref1.iDialogPref))
+			return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest030_01::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest030_02::CCommDbTest030_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_030_02"));
+	}
+
+CCommDbTest030_02::~CCommDbTest030_02()
+	{}
+
+TVerdict CCommDbTest030_02::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrAccessDenied)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest030_02::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest030_02::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 1;
+	pref2.iDirection = ECommDbConnectionDirectionIncoming;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 3;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, ETrue);
+
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+	
+	CCommsDbConnectionPrefTableView::TCommDbIapBearer newBearer;	//Set new bearer to point at other outgoing Iap in commdb
+	newBearer.iBearerSet=KCommDbBearerLAN|KCommDbBearerCSD;
+	newBearer.iIapId=2;
+
+	TRAPD(err, iPrefView->UpdateBearerL(newBearer));
+	return err;
+	}
+	
+TVerdict CCommDbTest030_02::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest030_03::CCommDbTest030_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_030_03"));
+	}
+
+CCommDbTest030_03::~CCommDbTest030_03()
+	{}
+
+TVerdict CCommDbTest030_03::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 030.03 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest030_01* step030_01 = new(ELeave) CCommDbTest030_01;
+	CleanupStack::PushL(step030_01);
+	doTestStepWithHeapFailureL( *step030_01, KErrNone);
+	CleanupStack::PopAndDestroy(step030_01);
+
+	CCommDbTest030_02* step030_02 = new(ELeave) CCommDbTest030_02;
+	CleanupStack::PushL(step030_02);
+	doTestStepWithHeapFailureL( *step030_02, KErrAccessDenied);
+	CleanupStack::PopAndDestroy(step030_02);
+
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_031_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,419 @@
+//
+// 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:
+//
+//
+// This contains CommDb Unit Test Cases 031.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_031_xx.h"
+
+
+CCommDbTest031_01::CCommDbTest031_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_031_01"));
+	}
+
+CCommDbTest031_01::~CCommDbTest031_01()
+	{}
+
+TVerdict CCommDbTest031_01::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest031_01::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest031_01::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 2;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 2;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 1;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 1;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	delete iPrefView;	//Open a new view in rank order
+	iPrefView=NULL;
+	iPrefView=iTheDb->OpenConnectionPrefTableInRankOrderLC(ECommDbConnectionDirectionOutgoing);
+	CleanupStack::Pop(iPrefView);
+
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+	if(!(retrievedPref==pref2))
+		return KErrGeneral;
+
+	User::LeaveIfError(iPrefView->GotoNextRecord());
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+	if(!(retrievedPref==pref1))
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest031_01::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest031_02::CCommDbTest031_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_031_02"));
+	}
+
+CCommDbTest031_02::~CCommDbTest031_02()
+	{}
+
+TVerdict CCommDbTest031_02::doTestStepL( void )
+	{
+	executeStepL();
+        SetTestStepResult(EPass);	return TestStepResult();	//if we get to here we must have passed.
+	}
+
+TVerdict CCommDbTest031_02::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest031_02::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 2;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 2;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 1;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 1;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	delete iPrefView;	//Open a new view in rank order looking at incoming only
+	iPrefView=NULL;
+	iPrefView=iTheDb->OpenConnectionPrefTableInRankOrderLC(ECommDbConnectionDirectionIncoming);
+	CleanupStack::Pop(iPrefView);
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest031_02::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest031_03::CCommDbTest031_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_031_03"));
+	}
+
+CCommDbTest031_03::~CCommDbTest031_03()
+	{}
+
+TVerdict CCommDbTest031_03::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();	//if we get to here we must have passed.
+	}
+
+TVerdict CCommDbTest031_03::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest031_03::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 2;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 2;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 1;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 1;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	delete iPrefView;	//Open a new view to look at rank 1 outgoing only
+	iPrefView=NULL;
+	iPrefView=iTheDb->OpenConnectionPrefTableViewOnRankLC(ECommDbConnectionDirectionOutgoing, 1);
+	CleanupStack::Pop(iPrefView);
+
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+
+	if(!(retrievedPref==pref2))
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest031_03::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest031_04::CCommDbTest031_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_031_04"));
+	}
+
+CCommDbTest031_04::~CCommDbTest031_04()
+	{}
+
+TVerdict CCommDbTest031_04::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrOverflow)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();	//if we get to here we must have passed.
+	}
+
+TVerdict CCommDbTest031_04::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest031_04::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 2;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 2;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 1;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 1;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	delete iPrefView;	//Open a new view with invalid rank;
+	iPrefView=NULL;
+	TRAPD(err, iPrefView=iTheDb->OpenConnectionPrefTableViewOnRankLC(ECommDbConnectionDirectionOutgoing, 5));
+	if (err==KErrNone)		//This should never happen, but better safe than sorry
+		CleanupStack::Pop(iPrefView);
+
+	return err;
+	}
+	
+TVerdict CCommDbTest031_04::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest031_05::CCommDbTest031_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_031_05"));
+	}
+
+CCommDbTest031_05::~CCommDbTest031_05()
+	{}
+
+TVerdict CCommDbTest031_05::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 031.05 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest031_01* step031_01 = new(ELeave) CCommDbTest031_01;
+	CleanupStack::PushL(step031_01);
+	doTestStepWithHeapFailureL( *step031_01, KErrNone);
+	CleanupStack::PopAndDestroy(step031_01);
+
+	CCommDbTest031_02* step031_02 = new(ELeave) CCommDbTest031_02;
+	CleanupStack::PushL(step031_02);
+	doTestStepWithHeapFailureL( *step031_02, KErrNone);
+	CleanupStack::PopAndDestroy(step031_02);
+
+	CCommDbTest031_03* step031_03 = new(ELeave) CCommDbTest031_03;
+	CleanupStack::PushL(step031_03);
+	doTestStepWithHeapFailureL( *step031_03, KErrNone);
+	CleanupStack::PopAndDestroy(step031_03);
+
+	CCommDbTest031_04* step031_04 = new(ELeave) CCommDbTest031_04;
+	CleanupStack::PushL(step031_04);
+	doTestStepWithHeapFailureL( *step031_04, KErrOverflow);
+	CleanupStack::PopAndDestroy(step031_04);
+	
+
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_032_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,233 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 032.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_032_xx.h"
+
+
+CCommDbTest032_01::CCommDbTest032_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_032_01"));
+	}
+
+CCommDbTest032_01::~CCommDbTest032_01()
+	{}
+
+TVerdict CCommDbTest032_01::doTestStepL( void )
+	{
+	executeStepL();
+        SetTestStepResult(EPass);	return TestStepResult();	//If we've got this far we've passed
+	}
+
+TVerdict CCommDbTest032_01::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest032_01::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+
+	iPrefView->UpdateDialogPrefL(ECommDbDialogPrefDoNotPrompt);
+
+	return KErrNone;
+	}
+
+TVerdict CCommDbTest032_01::doTestStepPostambleL()
+	{
+	delete iPrefView;
+	iPrefView = NULL;
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest032_02::CCommDbTest032_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_032_02"));
+	}
+
+CCommDbTest032_02::~CCommDbTest032_02()
+	{}
+
+TVerdict CCommDbTest032_02::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNotFound)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest032_02::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest032_02::executeStepL()
+	{
+	TRAPD(err, iPrefView->UpdateDialogPrefL(ECommDbDialogPrefDoNotPrompt));
+
+	return err;
+	}
+
+TVerdict CCommDbTest032_02::doTestStepPostambleL()
+	{
+	delete iPrefView;
+	iPrefView = NULL;
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest032_03::CCommDbTest032_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_032_03"));
+	}
+
+CCommDbTest032_03::~CCommDbTest032_03()
+	{}
+
+TVerdict CCommDbTest032_03::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrAccessDenied)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest032_03::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest032_03::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);
+
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+
+	TRAPD(err, iPrefView->UpdateDialogPrefL(ECommDbDialogPrefDoNotPrompt));
+
+	return err;
+	}
+
+TVerdict CCommDbTest032_03::doTestStepPostambleL()
+	{
+	delete iPrefView;
+	iPrefView = NULL;
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest032_04::CCommDbTest032_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_032_04"));
+	}
+
+CCommDbTest032_04::~CCommDbTest032_04()
+	{}
+
+TVerdict CCommDbTest032_04::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 032.04 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest032_01* step032_01 = new(ELeave) CCommDbTest032_01;
+	CleanupStack::PushL(step032_01);
+	doTestStepWithHeapFailureL( *step032_01, KErrNone);
+	CleanupStack::PopAndDestroy(step032_01);
+
+
+	return TestStepResult();
+	}
+
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest032_05::CCommDbTest032_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_032_05"));
+	}
+
+CCommDbTest032_05::~CCommDbTest032_05()
+	{}
+
+TVerdict CCommDbTest032_05::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 032.04 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest032_02* step032_02 = new(ELeave) CCommDbTest032_02;
+	CleanupStack::PushL(step032_02);
+	doTestStepWithHeapFailureL( *step032_02, KErrNotFound);
+	CleanupStack::PopAndDestroy(step032_02);
+
+	CCommDbTest032_03* step032_03 = new(ELeave) CCommDbTest032_03;
+	CleanupStack::PushL(step032_03);
+	doTestStepWithHeapFailureL( *step032_03, KErrAccessDenied);
+	CleanupStack::PopAndDestroy(step032_03);
+
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_033_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,607 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 033.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_033_xx.h"
+
+
+CCommDbTest033_01::CCommDbTest033_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_033_01"));
+	}
+
+CCommDbTest033_01::~CCommDbTest033_01()
+	{}
+
+TVerdict CCommDbTest033_01::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();	//If we've got this far we've passed
+	}
+
+TVerdict CCommDbTest033_01::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest033_01::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 2;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	iPrefView->SwapConnectionPreferencesL(ECommDbConnectionDirectionOutgoing, 1, 2);
+
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+
+	TBool rank1Found=EFalse;
+	if(retrievedPref.iRanking==1)	//should be pref2 with new ranking
+		{
+		rank1Found=ETrue;
+		if(pref2.iBearer.iIapId!=retrievedPref.iBearer.iIapId)
+			return KErrGeneral;		//something has gone wrong with the swap
+		}
+	else if(retrievedPref.iRanking==2)	//should be pref1 with new ranking
+		{
+		if(pref1.iBearer.iIapId!=retrievedPref.iBearer.iIapId)
+			return KErrGeneral;		//something has gone wrong with the swap
+		}
+	else
+		return KErrGeneral;			//We've got a rank other that 1&2 which is wrong.
+
+	User::LeaveIfError(iPrefView->GotoNextRecord());
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+
+	if(retrievedPref.iRanking==1)
+		{
+		if(rank1Found)
+			return KErrGeneral;		//we've found 2 rank 1 records which is wrong.
+		if(pref2.iBearer.iIapId!=retrievedPref.iBearer.iIapId)
+			return KErrGeneral;		//something has gone wrong with the swap
+		}
+	else if (retrievedPref.iRanking==2)
+		{
+		if(!rank1Found)
+			return KErrGeneral;		//we've found 2 rank 2 records which is wrong.
+		if(pref1.iBearer.iIapId!=retrievedPref.iBearer.iIapId)
+			return KErrGeneral;		//something has gone wrong with the swap
+		}
+	else 
+		return KErrGeneral;
+	
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest033_01::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest033_02::CCommDbTest033_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_033_02"));
+	}
+
+CCommDbTest033_02::~CCommDbTest033_02()
+	{}
+
+TVerdict CCommDbTest033_02::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();	//If we've got this far we've passed
+	}
+
+TVerdict CCommDbTest033_02::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest033_02::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 0;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	iPrefView->SwapConnectionPreferencesL(ECommDbConnectionDirectionOutgoing, 1, 0);
+
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+
+	TBool rank1Found=EFalse;
+	if(retrievedPref.iRanking==1)	//should be pref2 with new ranking
+		{
+		rank1Found=ETrue;
+		if(pref2.iBearer.iIapId!=retrievedPref.iBearer.iIapId)
+			return KErrGeneral;		//something has gone wrong with the swap
+		}
+	else if(retrievedPref.iRanking==0)	//should be pref1 with new ranking
+		{
+		if(pref1.iBearer.iIapId!=retrievedPref.iBearer.iIapId)
+			return KErrGeneral;		//something has gone wrong with the swap
+		}
+	else
+		return KErrGeneral;			//We've got a rank other that 1&0 which is wrong.
+
+	User::LeaveIfError(iPrefView->GotoNextRecord());
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+
+	if(retrievedPref.iRanking==1)
+		{
+		if(rank1Found)
+			return KErrGeneral;		//we've found 2 rank 1 records which is wrong.
+		if(pref2.iBearer.iIapId!=retrievedPref.iBearer.iIapId)
+			return KErrGeneral;		//something has gone wrong with the swap
+		}
+	else if (retrievedPref.iRanking==0)
+		{
+		if(!rank1Found)
+			return KErrGeneral;		//we've found 2 rank 0 records which is wrong.
+		if(pref1.iBearer.iIapId!=retrievedPref.iBearer.iIapId)
+			return KErrGeneral;		//something has gone wrong with the swap
+		}
+	else 
+		return KErrGeneral;
+	
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest033_02::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest033_03::CCommDbTest033_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_033_03"));
+	}
+
+CCommDbTest033_03::~CCommDbTest033_03()
+	{}
+
+TVerdict CCommDbTest033_03::doTestStepL( void )
+	{
+	if (executeStepL()!=KErrNotFound)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();	//If we've got this far we've passed
+	}
+
+TVerdict CCommDbTest033_03::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest033_03::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	TRAPD(err, iPrefView->SwapConnectionPreferencesL(ECommDbConnectionDirectionOutgoing, 1, 2));
+
+	return err;
+	}
+	
+TVerdict CCommDbTest033_03::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest033_04::CCommDbTest033_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_033_04"));
+	}
+
+CCommDbTest033_04::~CCommDbTest033_04()
+	{}
+
+TVerdict CCommDbTest033_04::doTestStepL( void )
+	{
+	if (executeStepL()!=KErrAccessDenied)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();	//If we've got this far we've passed
+	}
+
+TVerdict CCommDbTest033_04::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest033_04::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);	//Make this entry read only
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 2;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	TRAPD(err, iPrefView->SwapConnectionPreferencesL(ECommDbConnectionDirectionOutgoing, 1, 2));
+
+	return err;
+	}
+	
+TVerdict CCommDbTest033_04::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest033_05::CCommDbTest033_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_033_05"));
+	}
+
+CCommDbTest033_05::~CCommDbTest033_05()
+	{}
+
+TVerdict CCommDbTest033_05::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 033.05 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest033_01* step033_01 = new(ELeave) CCommDbTest033_01;
+	CleanupStack::PushL(step033_01);
+	doTestStepWithHeapFailureL( *step033_01, KErrNone);
+	CleanupStack::PopAndDestroy(step033_01);
+
+	
+	return TestStepResult();
+	}
+
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest033_06::CCommDbTest033_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_033_06"));
+	}
+
+CCommDbTest033_06::~CCommDbTest033_06()
+	{}
+
+TVerdict CCommDbTest033_06::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 033.06 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest033_02* step033_02 = new(ELeave) CCommDbTest033_02;
+	CleanupStack::PushL(step033_02);
+	doTestStepWithHeapFailureL( *step033_02, KErrNone);
+	CleanupStack::PopAndDestroy(step033_02);
+	
+	return TestStepResult();
+	}
+	
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest033_07::CCommDbTest033_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_033_07"));
+	}
+
+CCommDbTest033_07::~CCommDbTest033_07()
+	{}
+
+TVerdict CCommDbTest033_07::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 033.07 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest033_03* step033_03 = new(ELeave) CCommDbTest033_03;
+	CleanupStack::PushL(step033_03);
+	doTestStepWithHeapFailureL( *step033_03, KErrNotFound);
+	CleanupStack::PopAndDestroy(step033_03);
+
+	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest033_08::CCommDbTest033_08()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_033_08"));
+	}
+
+CCommDbTest033_08::~CCommDbTest033_08()
+	{}
+
+TVerdict CCommDbTest033_08::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 033.08 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest033_04* step033_04 = new(ELeave) CCommDbTest033_04;
+	CleanupStack::PushL(step033_04);
+	doTestStepWithHeapFailureL( *step033_04, KErrAccessDenied);
+	CleanupStack::PopAndDestroy(step033_04);
+		
+	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest033_09::CCommDbTest033_09()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_033_09"));
+	}
+
+TVerdict CCommDbTest033_09::doTestStepL()
+	{
+	if (executeStepL() != KErrNone)
+		{
+         SetTestStepResult(EFail);		return TestStepResult();
+		}
+	
+	return TestStepResult();
+	}
+
+TVerdict CCommDbTest033_09::doTestStepPreambleL()
+	{
+	iTheDb = CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	return TestStepResult();
+	}
+
+TInt CCommDbTest033_09::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 0;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 0;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	TRAPD(leaveCode, iPrefView->SwapConnectionPreferencesL(ECommDbConnectionDirectionOutgoing, 1, 0));
+	if (leaveCode != KErrArgument)
+		{
+		return KErrGeneral;
+		}
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest033_09::doTestStepPostambleL()
+	{
+	//
+	// Get rid of our view
+	//
+	if(iPrefView)
+		{
+		delete iPrefView;
+		iPrefView = NULL;
+		}
+
+	//
+	// Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	//
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+
+	return TestStepResult();
+	}
+
+//EOF
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_034_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,477 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 034.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_034_xx.h"
+
+
+CCommDbTest034_01::CCommDbTest034_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_034_01"));
+	}
+
+CCommDbTest034_01::~CCommDbTest034_01()
+	{}
+
+TVerdict CCommDbTest034_01::doTestStepL( void )
+	{
+	executeStepL();
+        SetTestStepResult(EPass);	return TestStepResult();	//If we've got this far we've passed
+	}
+
+TVerdict CCommDbTest034_01::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest034_01::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+	iPrefView->ChangeConnectionPreferenceRankL(2);
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest034_01::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest034_02::CCommDbTest034_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_034_02"));
+	}
+
+CCommDbTest034_02::~CCommDbTest034_02()
+	{}
+
+TVerdict CCommDbTest034_02::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest034_02::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest034_02::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 2;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+	iPrefView->ChangeConnectionPreferenceRankL(2);
+
+	User::LeaveIfError(iPrefView->GotoNextRecord());
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+
+	if(retrievedPref.iRanking!=0)
+		return KErrGeneral;		//pref2 should have it's ranking displaced to 0 by ChangeConnectionPreferenceRankL
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest034_02::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest034_03::CCommDbTest034_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_034_03"));
+	}
+
+CCommDbTest034_03::~CCommDbTest034_03()
+	{}
+
+TVerdict CCommDbTest034_03::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest034_03::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest034_03::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 2;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
+
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+	TRAPD(err, iPrefView->ChangeConnectionPreferenceRankL(5));
+	if (err!=KErrOverflow)
+		{
+		if(err==KErrNone)		//This is horrible, but need to make sure that if this returns with KErrNone we catch it.
+			err=KErrGeneral;
+		return err;
+		}
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+
+	if(retrievedPref.iRanking!=1)
+		return KErrGeneral;		//pref1 should still have ranking 1
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest034_03::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest034_04::CCommDbTest034_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_034_04"));
+	}
+
+CCommDbTest034_04::~CCommDbTest034_04()
+	{}
+
+TVerdict CCommDbTest034_04::doTestStepL( void )
+	{
+	if (executeStepL() != KErrNotFound)
+		{
+		SetTestStepResult(EFail);		}
+
+	return TestStepResult();
+	}
+
+TVerdict CCommDbTest034_04::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest034_04::executeStepL()
+	{
+	//
+	// Previously (I guess) CommDB would have been able to create two
+	// Conn Pref entries and then the fresh view would not have seen them
+	// and it would panic. Now CommsDAT does see them and returns
+	// KErrNotFound, so now we no longer inserted in this test allowing
+	// the test to actually test the expected scenario.
+	//
+	delete iPrefView;		//Create a fresh view
+	iPrefView=NULL;
+	iPrefView=iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+	TRAPD(err, iPrefView->ChangeConnectionPreferenceRankL(2));
+
+	return err;
+	}
+	
+TVerdict CCommDbTest034_04::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest034_05::CCommDbTest034_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_034_05"));
+	}
+
+CCommDbTest034_05::~CCommDbTest034_05()
+	{}
+
+TVerdict CCommDbTest034_05::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest034_05::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest034_05::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);
+
+	User::LeaveIfError(iPrefView->GotoFirstRecord());
+
+	TRAPD(err, iPrefView->ChangeConnectionPreferenceRankL(2));
+	if(err!=KErrAccessDenied)
+		{
+		if(err==KErrNone)		//Need to do some maping here otherwise if this returns KErrNone the test will pass!!
+			err=KErrGeneral;
+		return err;
+		}
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
+	iPrefView->ReadConnectionPreferenceL(retrievedPref);
+	
+	if(retrievedPref.iRanking!=1)		//The ranking has been changed for a read only entry
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest034_05::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest034_06::CCommDbTest034_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_034_06"));
+	}
+
+CCommDbTest034_06::~CCommDbTest034_06()
+	{}
+
+TVerdict CCommDbTest034_06::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 034.06 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest034_01* step034_01 = new(ELeave) CCommDbTest034_01;
+	CleanupStack::PushL(step034_01);
+	doTestStepWithHeapFailureL( *step034_01, KErrNone);
+	CleanupStack::PopAndDestroy(step034_01);
+
+	CCommDbTest034_02* step034_02 = new(ELeave) CCommDbTest034_02;
+	CleanupStack::PushL(step034_02);
+	doTestStepWithHeapFailureL( *step034_02, KErrNone);
+	CleanupStack::PopAndDestroy(step034_02);
+
+	CCommDbTest034_03* step034_03 = new(ELeave) CCommDbTest034_03;
+	CleanupStack::PushL(step034_03);
+	doTestStepWithHeapFailureL( *step034_03, KErrNone);
+	CleanupStack::PopAndDestroy(step034_03);
+
+	CCommDbTest034_04* step034_04 = new(ELeave) CCommDbTest034_04;
+	CleanupStack::PushL(step034_04);
+	doTestStepWithHeapFailureL( *step034_04, KErrNotFound);
+	CleanupStack::PopAndDestroy(step034_04);
+
+	CCommDbTest034_05* step034_05 = new(ELeave) CCommDbTest034_05;
+	CleanupStack::PushL(step034_05);
+	doTestStepWithHeapFailureL( *step034_05, KErrNone);
+	CleanupStack::PopAndDestroy(step034_05);
+	
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_035_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,179 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 035.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbtemp.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_035_xx.h"
+
+
+CCommDbTest035_01::CCommDbTest035_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_035_01"));
+	}
+
+CCommDbTest035_01::~CCommDbTest035_01()
+	{}
+
+TVerdict CCommDbTest035_01::doTestStepL( void )
+	{
+	executeStepL();
+        SetTestStepResult(EPass);	return TestStepResult();	//If we've got this far we've passed
+	}
+
+TVerdict CCommDbTest035_01::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest035_01::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
+	delete templateRecord;
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest035_01::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest035_02::CCommDbTest035_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_035_02"));
+	}
+
+CCommDbTest035_02::~CCommDbTest035_02()
+	{}
+
+TVerdict CCommDbTest035_02::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNotSupported)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest035_02::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest035_02::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord=NULL;
+	//CCommsDbTemplateRecord::NewL should leave with KErrNotSupported, since IAP table doesn't support templates
+	TRAPD(err, templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(IAP)));
+	delete templateRecord;
+	return err;
+	}
+	
+TVerdict CCommDbTest035_02::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest035_03::CCommDbTest035_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_035_03"));
+	}
+
+CCommDbTest035_03::~CCommDbTest035_03()
+	{}
+
+TVerdict CCommDbTest035_03::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrArgument)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest035_03::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest035_03::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord=NULL;
+	//CCommsDbTemplateRecord::NewL should leave with KErrArgument for invalid name
+	TRAPD(err, templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, _L("Hi there")));
+	delete templateRecord;
+	return err;
+	}
+	
+TVerdict CCommDbTest035_03::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest035_04::CCommDbTest035_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_035_04"));
+	}
+
+CCommDbTest035_04::~CCommDbTest035_04()
+	{}
+
+TVerdict CCommDbTest035_04::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 035.04 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest035_01* step035_01 = new(ELeave) CCommDbTest035_01;
+	CleanupStack::PushL(step035_01);
+	doTestStepWithHeapFailureL( *step035_01, KErrNone);
+	CleanupStack::PopAndDestroy(step035_01);
+
+	CCommDbTest035_02* step035_02 = new(ELeave) CCommDbTest035_02;
+	CleanupStack::PushL(step035_02);
+	doTestStepWithHeapFailureL( *step035_02, KErrNotSupported);
+	CleanupStack::PopAndDestroy(step035_02);
+
+	CCommDbTest035_03* step035_03 = new(ELeave) CCommDbTest035_03;
+	CleanupStack::PushL(step035_03);
+	doTestStepWithHeapFailureL( *step035_03, KErrArgument);
+	CleanupStack::PopAndDestroy(step035_03);
+	
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_036_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,1099 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 036.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbtemp.h>
+#include <etelmm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_036_xx.h"
+
+
+CCommDbTest036_01::CCommDbTest036_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_01"));
+	}
+
+CCommDbTest036_01::~CCommDbTest036_01()
+	{}
+
+TVerdict CCommDbTest036_01::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest036_01::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest036_01::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
+	CleanupStack::PushL(templateRecord);
+	
+	User::LeaveIfError(templateRecord->Modify());
+
+	TBufC8<KCommsDbSvrMaxFieldLength> inputString = _L8("string");
+	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
+	templateRecord->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING), inputString);
+	User::LeaveIfError(templateRecord->StoreModifications());
+
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	//Create a new template record and check the value is the same as the one entered.
+	CCommsDbTemplateRecord* checkRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
+	CleanupStack::PushL(checkRecord);
+	
+	TBuf8<KCommsDbSvrMaxFieldLength> checkString;
+
+	checkRecord->ReadTextL(TPtrC(MODEM_FAX_INIT_STRING), checkString);
+	CleanupStack::PopAndDestroy(checkRecord);
+
+	if(checkString!=inputString)
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest036_01::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_02::CCommDbTest036_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_02"));
+	}
+
+CCommDbTest036_02::~CCommDbTest036_02()
+	{}
+
+TVerdict CCommDbTest036_02::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest036_02::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest036_02::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
+	CleanupStack::PushL(templateRecord);
+	
+	User::LeaveIfError(templateRecord->Modify());
+
+	TBufC8<KCommsDbSvrMaxFieldLength> firstInputString = _L8("string");
+	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
+	templateRecord->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING), firstInputString);
+	User::LeaveIfError(templateRecord->StoreModifications());
+
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	//Create a view on the modem table, over write the template value previosly set and check it sticks
+
+	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(MODEM_BEARER));
+	TUint32 dummyId;
+	//Create a new record, so we can be sure it is the same as the templated one
+	User::LeaveIfError(tableView->InsertRecord(dummyId));
+	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("NewModem"));
+	//Do overwrite of setting
+	TBufC8<KCommsDbSvrMaxFieldLength> overwriteString = _L8("different string");
+	tableView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING), overwriteString);
+	User::LeaveIfError(tableView->PutRecordChanges());
+
+	TBuf8<KCommsDbSvrMaxFieldLength> retrievedString;
+	tableView->ReadTextL(TPtrC(MODEM_FAX_INIT_STRING), retrievedString);
+	CleanupStack::PopAndDestroy(tableView);
+
+	if(retrievedString!=overwriteString)
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest036_02::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_03::CCommDbTest036_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_03"));
+	}
+
+CCommDbTest036_03::~CCommDbTest036_03()
+	{}
+
+TVerdict CCommDbTest036_03::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest036_03::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest036_03::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
+	CleanupStack::PushL(templateRecord);
+	
+	User::LeaveIfError(templateRecord->Modify());
+
+	TBufC<KCommsDbSvrMaxFieldLength> inputString = _L("string");
+	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
+	templateRecord->WriteTextL(TPtrC(MODEM_PORT_NAME), inputString);
+	User::LeaveIfError(templateRecord->StoreModifications());
+
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	//Create a view on the modem table, make a new record and check the value is the one set for the template
+
+	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(MODEM_BEARER));
+	TUint32 dummyId;
+	//Create a new record, so we can be sure it is the same as the templated one
+	User::LeaveIfError(tableView->InsertRecord(dummyId));
+	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("NewModem"));
+	User::LeaveIfError(tableView->PutRecordChanges());
+
+	//Retrieve the string we set for the template
+	TBuf<KCommsDbSvrMaxFieldLength> retrievedString;
+	tableView->ReadTextL(TPtrC(MODEM_PORT_NAME), retrievedString);
+	CleanupStack::PopAndDestroy(tableView);
+
+	if(retrievedString!=inputString)
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest036_03::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_04::CCommDbTest036_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_04"));
+	}
+
+CCommDbTest036_04::~CCommDbTest036_04()
+	{}
+
+TVerdict CCommDbTest036_04::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest036_04::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest036_04::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
+	CleanupStack::PushL(templateRecord);
+	
+	User::LeaveIfError(templateRecord->Modify());
+
+	TBufC<KCommsDbSvrMaxFieldLength> inputString = _L("string");
+	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
+	templateRecord->WriteTextL(TPtrC(MODEM_PORT_NAME), inputString);
+	User::LeaveIfError(templateRecord->StoreModifications());
+
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	//Create a view on the modem table, make a new record and overwrite the value set in the template
+
+	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(MODEM_BEARER));
+	TUint32 dummyId;
+	//Create a new record, so we can be sure it is the same as the templated one
+	User::LeaveIfError(tableView->InsertRecord(dummyId));
+	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("NewModem"));
+	//Do overwrite of setting
+	TBufC<KCommsDbSvrMaxFieldLength> overwriteString = _L("different string");
+	tableView->WriteTextL(TPtrC(MODEM_PORT_NAME), overwriteString);
+	User::LeaveIfError(tableView->PutRecordChanges());
+
+	//Retrieve the string we just set
+	TBuf<KCommsDbSvrMaxFieldLength> retrievedString;
+	tableView->ReadTextL(TPtrC(MODEM_PORT_NAME), retrievedString);
+	CleanupStack::PopAndDestroy(tableView);
+
+	if(retrievedString!=overwriteString)
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest036_04::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_05::CCommDbTest036_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_05"));
+	}
+
+CCommDbTest036_05::~CCommDbTest036_05()
+	{}
+
+TVerdict CCommDbTest036_05::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest036_05::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest036_05::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
+	CleanupStack::PushL(templateRecord);
+	
+	User::LeaveIfError(templateRecord->Modify());
+
+	TBufC<KCommsDbSvrMaxFieldLength> inputString = _L("test string");
+	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("Name"));
+//	templateRecord->WriteTextL(TPtrC(ISP_IF_NAME), _L("SLIP"));
+	templateRecord->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteLongTextL(TPtrC(ISP_LOGIN_SCRIPT), inputString);
+	User::LeaveIfError(templateRecord->StoreModifications());
+
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	//Create a view on the DialInISP table, make a new record and check the value is the one set for the template
+
+	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
+	TUint32 dummyId;
+	//Create a new record, so we can be sure it is the same as the templated one
+	User::LeaveIfError(tableView->InsertRecord(dummyId));
+	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("Test ISP"));
+//	tableView->WriteTextL(TPtrC(ISP_IF_NAME), _L("Test If"));
+	tableView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), EFalse);
+	tableView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), EFalse);
+	tableView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), EFalse);
+	User::LeaveIfError(tableView->PutRecordChanges());
+
+	//Retrieve the string we set for the template
+	HBufC* retrievedString = tableView->ReadLongTextLC(TPtrC(ISP_LOGIN_SCRIPT));
+
+	TInt ret(KErrNone);
+	if(*retrievedString!=inputString)
+		ret= KErrGeneral;
+
+	CleanupStack::PopAndDestroy();	//retrievedString
+	CleanupStack::PopAndDestroy(tableView);
+
+	return ret;
+	}
+	
+TVerdict CCommDbTest036_05::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_06::CCommDbTest036_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_06"));
+	}
+
+CCommDbTest036_06::~CCommDbTest036_06()
+	{}
+
+TVerdict CCommDbTest036_06::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest036_06::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest036_06::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
+	CleanupStack::PushL(templateRecord);
+	
+	User::LeaveIfError(templateRecord->Modify());
+
+	TBufC<KCommsDbSvrMaxFieldLength> inputString = _L("test string");
+	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("Name"));
+//	templateRecord->WriteTextL(TPtrC(ISP_IF_NAME), _L("SLIP"));
+	templateRecord->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteLongTextL(TPtrC(ISP_LOGIN_SCRIPT), inputString);
+	User::LeaveIfError(templateRecord->StoreModifications());
+
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	//Create a view on the DialInISP table, make a new record and change the value we set int he template
+
+	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
+	TUint32 dummyId;
+	//Create a new record, so we can be sure it is the same as the templated one
+	User::LeaveIfError(tableView->InsertRecord(dummyId));
+	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("Test ISP"));
+//	tableView->WriteTextL(TPtrC(ISP_IF_NAME), _L("Test If"));
+	tableView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), EFalse);
+	tableView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), EFalse);
+	tableView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), EFalse);
+	//Overwrite value set above in template
+	TBufC<KCommsDbSvrMaxFieldLength> overwriteString = _L("new string");
+	tableView->WriteLongTextL(TPtrC(ISP_LOGIN_SCRIPT), overwriteString);
+	User::LeaveIfError(tableView->PutRecordChanges());
+
+	//Retrieve the string we just set
+	HBufC* retrievedString = tableView->ReadLongTextLC(TPtrC(ISP_LOGIN_SCRIPT));
+
+	TInt ret(KErrNone);
+	if(*retrievedString!=overwriteString)
+		ret= KErrGeneral;
+
+	CleanupStack::PopAndDestroy();	//retrievedString
+	CleanupStack::PopAndDestroy(tableView);
+
+	return ret;
+	}
+	
+TVerdict CCommDbTest036_06::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_07::CCommDbTest036_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_07"));
+	}
+
+CCommDbTest036_07::~CCommDbTest036_07()
+	{}
+
+TVerdict CCommDbTest036_07::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest036_07::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest036_07::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
+	CleanupStack::PushL(templateRecord);
+	
+	User::LeaveIfError(templateRecord->Modify());
+
+	TBool inputBool = ETrue;
+	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("Name"));
+//	templateRecord->WriteTextL(TPtrC(ISP_IF_NAME), _L("SLIP"));
+	templateRecord->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT), inputBool);	//Set to ETrue, since EFalse is default
+	User::LeaveIfError(templateRecord->StoreModifications());
+
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	//Create a view on the DialInISP table, make a new record and check the value is the one set for the template
+
+	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
+	TUint32 dummyId;
+	//Create a new record, so we can be sure it is the same as the templated one
+	User::LeaveIfError(tableView->InsertRecord(dummyId));
+	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("Test ISP"));
+//	tableView->WriteTextL(TPtrC(ISP_IF_NAME), _L("Test If"));
+	tableView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), EFalse);
+	tableView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), EFalse);
+	tableView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), EFalse);
+	User::LeaveIfError(tableView->PutRecordChanges());
+
+	//Retrieve the bool we set for the template
+	TBool retrievedBool;
+	tableView->ReadBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT), retrievedBool);
+
+	CleanupStack::PopAndDestroy(tableView);
+
+	if(retrievedBool!=inputBool)
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest036_07::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_08::CCommDbTest036_08()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_08"));
+	}
+
+CCommDbTest036_08::~CCommDbTest036_08()
+	{}
+
+TVerdict CCommDbTest036_08::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest036_08::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest036_08::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
+	CleanupStack::PushL(templateRecord);
+	
+	User::LeaveIfError(templateRecord->Modify());
+
+	TBool inputBool = ETrue;
+	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("Name"));
+//	templateRecord->WriteTextL(TPtrC(ISP_IF_NAME), _L("SLIP"));
+	templateRecord->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT), inputBool);	//Set to ETrue, since EFalse is default
+	User::LeaveIfError(templateRecord->StoreModifications());
+
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	//Create a view on the DialInISP table, make a new record and change the value we set in the template
+
+	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
+	TUint32 dummyId;
+	//Create a new record, so we can be sure it is the same as the templated one
+	User::LeaveIfError(tableView->InsertRecord(dummyId));
+	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("Test ISP"));
+//	tableView->WriteTextL(TPtrC(ISP_IF_NAME), _L("Test If"));
+	tableView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), EFalse);
+	tableView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), EFalse);
+	tableView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), EFalse);
+	//Overwrite the value set in the template
+	TBool overwriteBool = EFalse;
+	tableView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT), overwriteBool);
+	User::LeaveIfError(tableView->PutRecordChanges());
+
+	//Retrieve the bool we just set for the record
+	TBool retrievedBool;
+	tableView->ReadBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT), retrievedBool);
+
+	CleanupStack::PopAndDestroy(tableView);
+
+	if(retrievedBool!=overwriteBool)
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest036_08::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_09::CCommDbTest036_09()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_09"));
+	}
+
+CCommDbTest036_09::~CCommDbTest036_09()
+	{}
+
+TVerdict CCommDbTest036_09::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest036_09::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest036_09::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
+	CleanupStack::PushL(templateRecord);
+	User::LeaveIfError(templateRecord->Modify());
+
+	TUint32 inputInt = RMobileCall::KCapsSpeed32000;
+	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("Name"));
+	templateRecord->WriteTextL(TPtrC(ISP_IP_NAME_SERVER1),_L("MyDnsServer"));
+	templateRecord->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteUintL(TPtrC(ISP_BEARER_SPEED), inputInt);
+	User::LeaveIfError(templateRecord->StoreModifications());
+
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	//Create a view on the DialInISP table, make a new record and check the value is the one set for the template
+
+	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
+	TUint32 dummyId;
+	//Create a new record, so we can be sure it is the same as the templated one
+	User::LeaveIfError(tableView->InsertRecord(dummyId));
+	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("Test ISP"));
+	tableView->WriteTextL(TPtrC(ISP_IP_NAME_SERVER1),_L("NotMyDnsServer"));
+	tableView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), EFalse);
+	tableView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), EFalse);
+	tableView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), EFalse);
+	User::LeaveIfError(tableView->PutRecordChanges());
+
+	//Retrieve the TUint32 we set for the template
+	TUint32 retrievedInt;
+	tableView->ReadUintL(TPtrC(ISP_BEARER_SPEED), retrievedInt);
+	// And now check that we retrieve the text from the template
+
+	TBuf16<KCommsDbSvrMaxFieldLength> ifAuthName(_L16("Invalid"));
+	tableView->ReadTextL(TPtrC(ISP_IP_NAME_SERVER1), ifAuthName);
+	if(ifAuthName.Compare(_L16("NotMyDnsServer")))
+		{
+		User::Leave(KErrGeneral);
+		}
+
+	CleanupStack::PopAndDestroy(tableView);
+
+	if(retrievedInt!=inputInt)
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest036_09::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_10::CCommDbTest036_10()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_10"));
+	}
+
+CCommDbTest036_10::~CCommDbTest036_10()
+	{}
+
+TVerdict CCommDbTest036_10::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest036_10::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest036_10::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
+	CleanupStack::PushL(templateRecord);
+	
+	User::LeaveIfError(templateRecord->Modify());
+
+	TUint32 inputInt = RMobileCall::KCapsSpeed32000;
+	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("Name"));
+	templateRecord->WriteTextL(TPtrC(ISP_IP_NAME_SERVER1),_L("MyDnsServer"));
+	templateRecord->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue);
+	templateRecord->WriteUintL(TPtrC(ISP_BEARER_SPEED), inputInt);
+	User::LeaveIfError(templateRecord->StoreModifications());
+
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	//Create a view on the DialInISP table, make a new record and change the value we set in the template
+	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
+	TUint32 dummyId;
+	//Create a new record, so we can be sure it is the same as the templated one
+	User::LeaveIfError(tableView->InsertRecord(dummyId));
+	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("Test ISP"));
+	tableView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), EFalse);
+	tableView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), EFalse);
+	tableView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), EFalse);
+	//Overwrite value we set in the template
+	TUint32 overwriteInt = RMobileCall::KCapsSpeed64000;
+	tableView->WriteUintL(TPtrC(ISP_BEARER_SPEED), overwriteInt);
+	User::LeaveIfError(tableView->PutRecordChanges());
+
+	//Retrieve the TUint32 we just set
+	TUint32 retrievedInt;
+	tableView->ReadUintL(TPtrC(ISP_BEARER_SPEED), retrievedInt);
+
+	TBuf16<KCommsDbSvrMaxFieldLength> ifAuthName(_L16("Invalid"));
+	tableView->ReadTextL(TPtrC(ISP_IP_NAME_SERVER1), ifAuthName);
+	if(ifAuthName.Compare(_L16("MyDnsServer")))
+		{
+		User::Leave(KErrGeneral);
+		}
+
+	CleanupStack::PopAndDestroy(tableView);
+
+	if(retrievedInt!=overwriteInt)
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest036_10::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_11::CCommDbTest036_11()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_11"));
+	}
+
+CCommDbTest036_11::~CCommDbTest036_11()
+	{}
+
+TVerdict CCommDbTest036_11::doTestStepL( void )
+	{
+	executeStepL();
+        SetTestStepResult(EFail);	return TestStepResult();	//Test is supposed to panic, so if we get here we've failed
+	}
+
+TVerdict CCommDbTest036_11::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest036_11::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
+	CleanupStack::PushL(templateRecord);
+	
+	templateRecord->StoreModifications();
+
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	return KErrGeneral;
+	}
+	
+TVerdict CCommDbTest036_11::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_12::CCommDbTest036_12()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_12"));
+	}
+
+CCommDbTest036_12::~CCommDbTest036_12()
+	{}
+
+TVerdict CCommDbTest036_12::doTestStepL( void )
+	{
+	executeStepL();
+        SetTestStepResult(EFail);	return TestStepResult();	//Test should panic, so if we get here something's wrong
+	}
+
+TVerdict CCommDbTest036_12::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest036_12::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
+	CleanupStack::PushL(templateRecord);
+	
+	templateRecord->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT), ETrue);
+
+	CleanupStack::PopAndDestroy(templateRecord);
+	return KErrGeneral;
+	}
+	
+TVerdict CCommDbTest036_12::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_13::CCommDbTest036_13()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_13"));
+	}
+
+CCommDbTest036_13::~CCommDbTest036_13()
+	{}
+
+TVerdict CCommDbTest036_13::doTestStepL( void )
+	{
+	if (executeStepL()!=KErrNotFound)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest036_13::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest036_13::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
+	CleanupStack::PushL(templateRecord);
+
+	User::LeaveIfError(templateRecord->Modify());
+	TRAPD(err, templateRecord->WriteBoolL(_L("Invalid"), ETrue));
+
+	CleanupStack::PopAndDestroy(templateRecord);
+	return err;
+	}
+	
+TVerdict CCommDbTest036_13::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_14::CCommDbTest036_14()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_14"));
+	}
+
+CCommDbTest036_14::~CCommDbTest036_14()
+	{}
+
+TVerdict CCommDbTest036_14::doTestStepL( void )
+	{
+	if (executeStepL()!=KErrNotFound)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest036_14::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest036_14::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
+	CleanupStack::PushL(templateRecord);
+
+	User::LeaveIfError(templateRecord->Modify());
+	TRAPD(err, templateRecord->WriteBoolL(_L(""), ETrue));
+
+	CleanupStack::PopAndDestroy(templateRecord);
+	return err;
+	}
+	
+TVerdict CCommDbTest036_14::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_15::CCommDbTest036_15()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_15"));
+	}
+
+CCommDbTest036_15::~CCommDbTest036_15()
+	{}
+
+TVerdict CCommDbTest036_15::doTestStepL( void )
+	{
+	if (executeStepL()!=KErrNotFound)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest036_15::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest036_15::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
+	CleanupStack::PushL(templateRecord);
+
+	TBool dummyBool;
+	TRAPD(err, templateRecord->ReadBoolL(_L("Invalid"), dummyBool));
+
+	CleanupStack::PopAndDestroy(templateRecord);
+	return err;
+	}
+	
+TVerdict CCommDbTest036_15::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_16::CCommDbTest036_16()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_16"));
+	}
+
+CCommDbTest036_16::~CCommDbTest036_16()
+	{}
+
+TVerdict CCommDbTest036_16::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 036.16 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest036_01* step036_01 = new(ELeave) CCommDbTest036_01;
+	CleanupStack::PushL(step036_01);
+	doTestStepWithHeapFailureL( *step036_01, KErrNone);
+	CleanupStack::PopAndDestroy(step036_01);
+
+	CCommDbTest036_02* step036_02 = new(ELeave) CCommDbTest036_02;
+	CleanupStack::PushL(step036_02);
+	doTestStepWithHeapFailureL( *step036_02, KErrNone);
+	CleanupStack::PopAndDestroy(step036_02);
+
+	CCommDbTest036_03* step036_03 = new(ELeave) CCommDbTest036_03;
+	CleanupStack::PushL(step036_03);
+	doTestStepWithHeapFailureL( *step036_03, KErrNone);
+	CleanupStack::PopAndDestroy(step036_03);
+	
+	CCommDbTest036_04* step036_04 = new(ELeave) CCommDbTest036_04;
+	CleanupStack::PushL(step036_04);
+	doTestStepWithHeapFailureL( *step036_04, KErrNone);
+	CleanupStack::PopAndDestroy(step036_04);
+
+	CCommDbTest036_05* step036_05 = new(ELeave) CCommDbTest036_05;
+	CleanupStack::PushL(step036_05);
+	doTestStepWithHeapFailureL( *step036_05, KErrNone);
+	CleanupStack::PopAndDestroy(step036_05);
+
+	CCommDbTest036_06* step036_06 = new(ELeave) CCommDbTest036_06;
+	CleanupStack::PushL(step036_06);
+	doTestStepWithHeapFailureL( *step036_06, KErrNone);
+	CleanupStack::PopAndDestroy(step036_06);
+
+	CCommDbTest036_07* step036_07 = new(ELeave) CCommDbTest036_07;
+	CleanupStack::PushL(step036_07);
+	doTestStepWithHeapFailureL( *step036_07, KErrNone);
+	CleanupStack::PopAndDestroy(step036_07);
+
+	CCommDbTest036_08* step036_08 = new(ELeave) CCommDbTest036_08;
+	CleanupStack::PushL(step036_08);
+	doTestStepWithHeapFailureL( *step036_08, KErrNone);
+	CleanupStack::PopAndDestroy(step036_08);
+
+	CCommDbTest036_09* step036_09 = new(ELeave) CCommDbTest036_09;
+	CleanupStack::PushL(step036_09);
+	doTestStepWithHeapFailureL( *step036_09, KErrNone);
+	CleanupStack::PopAndDestroy(step036_09);
+
+	CCommDbTest036_10* step036_10 = new(ELeave) CCommDbTest036_10;
+	CleanupStack::PushL(step036_10);
+	doTestStepWithHeapFailureL( *step036_10, KErrNone);
+	CleanupStack::PopAndDestroy(step036_10);
+
+	CCommDbTest036_13* step036_13 = new(ELeave) CCommDbTest036_13;
+	CleanupStack::PushL(step036_13);
+	doTestStepWithHeapFailureL( *step036_13, KErrNotFound);
+	CleanupStack::PopAndDestroy(step036_13);
+
+	CCommDbTest036_14* step036_14 = new(ELeave) CCommDbTest036_14;
+	CleanupStack::PushL(step036_14);
+	doTestStepWithHeapFailureL( *step036_14, KErrNotFound);
+	CleanupStack::PopAndDestroy(step036_14);
+
+	CCommDbTest036_15* step036_15 = new(ELeave) CCommDbTest036_15;
+	CleanupStack::PushL(step036_15);
+	doTestStepWithHeapFailureL( *step036_15, KErrNotFound);
+	CleanupStack::PopAndDestroy(step036_15);
+
+	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_17::CCommDbTest036_17()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_17"));
+	}
+
+CCommDbTest036_17::~CCommDbTest036_17()
+	{}
+
+TVerdict CCommDbTest036_17::doTestStepL( void )
+	{
+
+	SetTestStepResult(EPass);
+	CCommDbTest036_11* step036_11 = new(ELeave) CCommDbTest036_11;
+	CleanupStack::PushL(step036_11);
+	doTestStepWithHeapFailureL( *step036_11, KErrNone);
+	CleanupStack::PopAndDestroy(step036_11);
+
+	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest036_18::CCommDbTest036_18()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_036_18"));
+	}
+
+CCommDbTest036_18::~CCommDbTest036_18()
+	{}
+
+TVerdict CCommDbTest036_18::doTestStepL( void )
+	{
+
+	SetTestStepResult(EPass);
+	CCommDbTest036_12* step036_12 = new(ELeave) CCommDbTest036_12;
+	CleanupStack::PushL(step036_12);
+	doTestStepWithHeapFailureL( *step036_12, KErrNone);
+	CleanupStack::PopAndDestroy(step036_12);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_037_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,160 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 037.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbtemp.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_037_xx.h"
+
+
+CCommDbTest037_01::CCommDbTest037_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_037_01"));
+	}
+
+CCommDbTest037_01::~CCommDbTest037_01()
+	{}
+
+TVerdict CCommDbTest037_01::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest037_01::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest037_01::executeStepL()
+	{
+	//alter something in the template
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
+	CleanupStack::PushL(templateRecord);
+	
+	User::LeaveIfError(templateRecord->Modify());
+	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
+	TBufC8<KCommsDbSvrMaxFieldLength> firstInputString = _L8("first string");
+
+	templateRecord->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING), firstInputString);
+	User::LeaveIfError(templateRecord->StoreModifications());
+	//Now start to overwrite initial change, but don't commit, cancel instead.
+	User::LeaveIfError(templateRecord->Modify());
+
+	TBufC8<KCommsDbSvrMaxFieldLength> secondInputString = _L8("second string");
+	templateRecord->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING), secondInputString);
+	templateRecord->CancelModifications();
+
+	TBuf8<KCommsDbSvrMaxFieldLength> retrievedString;
+	templateRecord->ReadTextL(TPtrC(MODEM_FAX_INIT_STRING), retrievedString);
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	if(retrievedString!=firstInputString)
+		return KErrGeneral;
+	
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest037_01::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////
+
+CCommDbTest037_02::CCommDbTest037_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_037_02"));
+	}
+
+CCommDbTest037_02::~CCommDbTest037_02()
+	{}
+
+TVerdict CCommDbTest037_02::doTestStepL( void )
+	{
+	executeStepL();
+        SetTestStepResult(EPass);	return TestStepResult();	//If we get here we've passed
+	}
+
+TVerdict CCommDbTest037_02::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest037_02::executeStepL()
+	{
+	//alter something in the template
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
+	CleanupStack::PushL(templateRecord);
+
+	templateRecord->CancelModifications();
+	
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest037_02::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest037_03::CCommDbTest037_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_037_03"));
+	}
+
+CCommDbTest037_03::~CCommDbTest037_03()
+	{}
+
+TVerdict CCommDbTest037_03::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 037.03 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest037_01* step037_01 = new(ELeave) CCommDbTest037_01;
+	CleanupStack::PushL(step037_01);
+	doTestStepWithHeapFailureL( *step037_01, KErrNone);
+	CleanupStack::PopAndDestroy(step037_01);
+
+	CCommDbTest037_02* step037_02 = new(ELeave) CCommDbTest037_02;
+	CleanupStack::PushL(step037_02);
+	doTestStepWithHeapFailureL( *step037_02, KErrNone);
+	CleanupStack::PopAndDestroy(step037_02);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_038_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,159 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 038.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbtemp.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_038_xx.h"
+
+
+
+CCommDbTest038_01::CCommDbTest038_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_038_01"));
+	}
+
+CCommDbTest038_01::~CCommDbTest038_01()
+	{}
+
+TVerdict CCommDbTest038_01::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest038_01::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest038_01::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
+	CleanupStack::PushL(templateRecord);
+	User::LeaveIfError(	templateRecord->Modify());
+	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
+	User::LeaveIfError(templateRecord->StoreModifications());
+
+	//delete the template
+	User::LeaveIfError(templateRecord->Delete());
+
+	TInt ret(KErrNone);
+
+	if(templateRecord->TemplateRecordExists())
+		ret = KErrGeneral;
+
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	return ret;
+	}
+	
+TVerdict CCommDbTest038_01::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////
+
+CCommDbTest038_02::CCommDbTest038_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_038_02"));
+	}
+
+CCommDbTest038_02::~CCommDbTest038_02()
+	{}
+
+TVerdict CCommDbTest038_02::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNotFound)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest038_02::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest038_02::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
+	CleanupStack::PushL(templateRecord);
+
+	User::LeaveIfError(	templateRecord->Modify());
+	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
+	User::LeaveIfError(templateRecord->StoreModifications());
+
+	//delete the template
+	User::LeaveIfError(templateRecord->Delete());
+	
+	TInt ret = templateRecord->Delete();
+
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	return ret;
+	}
+	
+TVerdict CCommDbTest038_02::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest038_03::CCommDbTest038_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_038_03"));
+	}
+
+CCommDbTest038_03::~CCommDbTest038_03()
+	{}
+
+TVerdict CCommDbTest038_03::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 038.03 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest038_01* step038_01 = new(ELeave) CCommDbTest038_01;
+	CleanupStack::PushL(step038_01);
+	doTestStepWithHeapFailureL( *step038_01, KErrNone);
+	CleanupStack::PopAndDestroy(step038_01);
+
+	CCommDbTest038_02* step038_02 = new(ELeave) CCommDbTest038_02;
+	CleanupStack::PushL(step038_02);
+	doTestStepWithHeapFailureL( *step038_02, KErrNotFound);
+	CleanupStack::PopAndDestroy(step038_02);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_039_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,106 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 039.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbtemp.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_039_xx.h"
+
+
+CCommDbTest039_01::CCommDbTest039_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_039_01"));
+	}
+
+CCommDbTest039_01::~CCommDbTest039_01()
+	{}
+
+TVerdict CCommDbTest039_01::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest039_01::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest039_01::executeStepL()
+	{
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
+	CleanupStack::PushL(templateRecord);
+	
+	TInt ret(KErrNone);
+	User::LeaveIfError(templateRecord->Modify());
+	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
+	User::LeaveIfError(templateRecord->StoreModifications());
+
+	if(!templateRecord->TemplateRecordExists())
+		ret = KErrGeneral;
+
+	//delete the template
+	User::LeaveIfError(templateRecord->Delete());
+
+	if(templateRecord->TemplateRecordExists())
+		ret = KErrGeneral;
+
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	return ret;
+	}
+	
+TVerdict CCommDbTest039_01::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest039_02::CCommDbTest039_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_039_02"));
+	}
+
+CCommDbTest039_02::~CCommDbTest039_02()
+	{}
+
+TVerdict CCommDbTest039_02::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 039.02 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest039_01* step039_01 = new(ELeave) CCommDbTest039_01;
+	CleanupStack::PushL(step039_01);
+	doTestStepWithHeapFailureL( *step039_01, KErrNone);
+	CleanupStack::PopAndDestroy(step039_01);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_040_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,123 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 040.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_040_xx.h"
+
+
+CCommDbTest040_01::CCommDbTest040_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_040_01"));
+	}
+
+CCommDbTest040_01::~CCommDbTest040_01()
+	{}
+
+TVerdict CCommDbTest040_01::doTestStepL( void )
+	{
+	executeStepL();
+        SetTestStepResult(EPass);	return TestStepResult();	//If we've got this far we've passed
+	}
+
+TVerdict CCommDbTest040_01::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest040_01::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest040_01::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest040_02::CCommDbTest040_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_040_02"));
+	}
+
+CCommDbTest040_02::~CCommDbTest040_02()
+	{}
+
+TVerdict CCommDbTest040_02::doTestStepL( void )
+	{
+	executeStepL();
+        SetTestStepResult(EPass);	return TestStepResult();	//If we've got this far we've passed
+	}
+
+TVerdict CCommDbTest040_02::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest040_02::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListFull);
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest040_02::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest040_03::CCommDbTest040_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_040_03"));
+	}
+
+CCommDbTest040_03::~CCommDbTest040_03()
+	{}
+
+TVerdict CCommDbTest040_03::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 040.03 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest040_01* step040_01 = new(ELeave) CCommDbTest040_01;
+	CleanupStack::PushL(step040_01);
+	doTestStepWithHeapFailureL( *step040_01, KErrNone);
+	CleanupStack::PopAndDestroy(step040_01);
+
+	CCommDbTest040_02* step040_02 = new(ELeave) CCommDbTest040_02;
+	CleanupStack::PushL(step040_02);
+	doTestStepWithHeapFailureL( *step040_02, KErrNone);
+	CleanupStack::PopAndDestroy(step040_02);
+	
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_041_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,1163 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 040.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_041_xx.h"
+
+
+CCommDbTest041_01::CCommDbTest041_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_01"));
+	}
+
+CCommDbTest041_01::~CCommDbTest041_01()
+	{}
+
+TVerdict CCommDbTest041_01::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_01::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_01::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	TUint32 temp = 5000;
+	User::LeaveIfError(iOverSet->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), temp));
+	temp=22;	//Set temp to something different
+	User::LeaveIfError(iOverSet->GetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), temp));
+
+	if(temp!=5000)
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest041_01::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_02::CCommDbTest041_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_02"));
+	}
+
+CCommDbTest041_02::~CCommDbTest041_02()
+	{}
+
+TVerdict CCommDbTest041_02::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_02::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_02::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	TBool temp = ETrue;
+	User::LeaveIfError(iOverSet->SetBoolOverride(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), temp));
+	temp=EFalse;
+	User::LeaveIfError(iOverSet->GetBoolOverride(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), temp));
+
+	if(temp==EFalse)
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest041_02::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_03::CCommDbTest041_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_03"));
+	}
+
+CCommDbTest041_03::~CCommDbTest041_03()
+	{}
+
+TVerdict CCommDbTest041_03::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_03::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_03::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	TBuf8<KCommsDbSvrMaxFieldLength> temp(_L8("Hi There!!"));
+	User::LeaveIfError(iOverSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), temp));
+	temp = _L8("Go Away!!");
+	User::LeaveIfError(iOverSet->GetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), temp));
+
+	if(temp!=_L8("Hi There!!"))
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest041_03::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_04::CCommDbTest041_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_04"));
+	}
+
+CCommDbTest041_04::~CCommDbTest041_04()
+	{}
+
+TVerdict CCommDbTest041_04::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_04::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_04::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	TBuf<KCommsDbSvrMaxFieldLength> temp(_L("Hi There!!"));
+	User::LeaveIfError(iOverSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), temp));
+	temp = _L("Go Away!!");
+	User::LeaveIfError(iOverSet->GetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), temp));
+
+	if(temp!=_L("Hi There!!"))
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest041_04::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_05::CCommDbTest041_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_05"));
+	}
+
+CCommDbTest041_05::~CCommDbTest041_05()
+	{}
+
+TVerdict CCommDbTest041_05::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_05::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_05::executeStepL()
+	{
+	_LIT(KLongString, "SEND \"hello\"\nWAIT 20\n{\n\"hello back\"\n");
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	TBuf<KCommsDbSvrMaxFieldLength> temp(KLongString);	//Lots of stuff, nothing important
+	User::LeaveIfError(iOverSet->SetLongDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), temp));
+	temp = _L("Go Away!!");
+	User::LeaveIfError(iOverSet->GetLongDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), temp));
+
+	if(temp!=KLongString)
+		return KErrGeneral;
+
+	TInt stringLength;
+
+	User::LeaveIfError(iOverSet->GetLongDesOverrideLength(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), stringLength));
+
+	if(stringLength!=TPtrC(KLongString).Length())
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest041_05::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_06::CCommDbTest041_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_06"));
+	}
+
+CCommDbTest041_06::~CCommDbTest041_06()
+	{}
+
+TVerdict CCommDbTest041_06::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_06::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_06::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+
+	TUint32 tempUint = 5000;
+	User::LeaveIfError(iOverSet->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), tempUint));
+	if(!iOverSet->IsOverridden(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), CCommDbOverrideSettings::EIntValue))
+		return KErrGeneral;
+
+	TBool tempBool = ETrue;
+	User::LeaveIfError(iOverSet->SetBoolOverride(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), tempBool));
+	if(!iOverSet->IsOverridden(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), CCommDbOverrideSettings::EBoolValue))
+		return KErrGeneral;
+
+	TBuf8<KCommsDbSvrMaxFieldLength> temp8String(_L8("Hi There!!"));
+	User::LeaveIfError(iOverSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), temp8String));
+	if(!iOverSet->IsOverridden(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), CCommDbOverrideSettings::EDes8Value))
+		return KErrGeneral;
+	
+	TBuf<KCommsDbSvrMaxFieldLength> temp16String(_L("Hi There!!"));
+	User::LeaveIfError(iOverSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), temp16String));
+	if(!iOverSet->IsOverridden(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), CCommDbOverrideSettings::EDes16Value))
+		return KErrGeneral;
+
+	TBuf<KCommsDbSvrMaxFieldLength> tempLongString(_L("SEND \"hello\"\nWAIT 20\n{\n\"hello back\"\n"));	//Lots of stuff, nothing important
+	User::LeaveIfError(iOverSet->SetLongDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), tempLongString));
+	if(!iOverSet->IsOverridden(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), CCommDbOverrideSettings::ELongDesValue))
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+
+TVerdict CCommDbTest041_06::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_07::CCommDbTest041_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_07"));
+	}
+
+CCommDbTest041_07::~CCommDbTest041_07()
+	{}
+
+TVerdict CCommDbTest041_07::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNotFound)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_07::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_07::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+
+	return iOverSet->SetIntOverride(TPtrC(DIAL_OUT_ISP), _L("Where is the Column"), 55);
+	}
+
+TVerdict CCommDbTest041_07::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_08::CCommDbTest041_08()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_08"));
+	}
+
+CCommDbTest041_08::~CCommDbTest041_08()
+	{}
+
+TVerdict CCommDbTest041_08::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNotFound)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_08::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_08::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+
+	return iOverSet->SetIntOverride(_L("WhatTable"), TPtrC(ISP_IWF_TO_MS), 55);
+	}
+
+TVerdict CCommDbTest041_08::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_09::CCommDbTest041_09()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_09"));
+	}
+
+CCommDbTest041_09::~CCommDbTest041_09()
+	{}
+
+TVerdict CCommDbTest041_09::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNotSupported)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_09::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_09::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	TBuf<KCommsDbSvrMaxFieldLength> temp(_L("Hi There!!"));
+	return iOverSet->SetDesOverride(TPtrC(PROXIES), TPtrC(PROXY_SERVICE_TYPE), temp);
+	}
+
+TVerdict CCommDbTest041_09::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_10::CCommDbTest041_10()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_10"));
+	}
+
+CCommDbTest041_10::~CCommDbTest041_10()
+	{}
+
+TVerdict CCommDbTest041_10::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrAlreadyExists)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_10::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_10::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	User::LeaveIfError(iOverSet->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), 5000));
+	return iOverSet->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), 5000);
+	}
+
+TVerdict CCommDbTest041_10::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_11::CCommDbTest041_11()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_11"));
+	}
+
+CCommDbTest041_11::~CCommDbTest041_11()
+	{}
+
+TVerdict CCommDbTest041_11::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNotFound)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_11::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_11::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	TBuf<KCommsDbSvrMaxFieldLength> temp;
+	return iOverSet->GetDesOverride(TPtrC(PROXIES), TPtrC(PROXY_SERVICE_TYPE), temp);
+	}
+
+TVerdict CCommDbTest041_11::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_12::CCommDbTest041_12()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_12"));
+	}
+
+CCommDbTest041_12::~CCommDbTest041_12()
+	{}
+
+TVerdict CCommDbTest041_12::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_12::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_12::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListFull);
+	if (iOverSet->PartialFull() != CCommDbOverrideSettings::EParamListFull)
+		return KErrGeneral;
+
+	delete iOverSet;
+	iOverSet = NULL;
+
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	if (iOverSet->PartialFull() != CCommDbOverrideSettings::EParamListPartial)
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+
+TVerdict CCommDbTest041_12::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_13::CCommDbTest041_13()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_13"));
+	}
+
+CCommDbTest041_13::~CCommDbTest041_13()
+	{}
+
+TVerdict CCommDbTest041_13::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_13::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_13::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	TBuf<KCommsDbSvrMaxFieldLength> temp(_L("There's no place like home"));
+	return iOverSet->SetDesOverride(TPtrC(MODEM_BEARER), TPtrC(MODEM_TSY_NAME), temp);
+	}
+
+TVerdict CCommDbTest041_13::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_14::CCommDbTest041_14()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_14"));
+	}
+
+CCommDbTest041_14::~CCommDbTest041_14()
+	{}
+
+TVerdict CCommDbTest041_14::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNotSupported)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_14::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_14::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	
+	return iOverSet->SetIntOverride(TPtrC(MODEM_BEARER), TPtrC(MODEM_STOP_BITS), 10);
+	}
+
+TVerdict CCommDbTest041_14::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_15::CCommDbTest041_15()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_15"));
+	}
+
+CCommDbTest041_15::~CCommDbTest041_15()
+	{}
+
+TVerdict CCommDbTest041_15::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_15::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_15::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	TBuf<KCommsDbSvrMaxFieldLength> temp(_L("There's no place like home"));
+	if(KErrNone==iOverSet->SetIntOverride(TPtrC(PROXIES), TPtrC(PROXY_ISP), 0))
+		return KErrGeneral;
+	if(KErrNone==iOverSet->SetDesOverride(TPtrC(PROXIES), TPtrC(PROXY_SERVICE_TYPE), temp))
+		return KErrGeneral;
+	if(KErrNone==iOverSet->SetBoolOverride(TPtrC(PROXIES), TPtrC(PROXY_SERVICE_TYPE), ETrue))
+		return KErrGeneral;
+	if(KErrNone==iOverSet->SetLongDesOverride(TPtrC(PROXIES), TPtrC(PROXY_SERVER_NAME), temp))
+		return KErrGeneral;
+	if(KErrNone==iOverSet->SetDesOverride(TPtrC(PROXIES), TPtrC(PROXY_PROTOCOL_NAME), temp))
+		return KErrGeneral;
+	if(KErrNone==iOverSet->SetIntOverride(TPtrC(PROXIES), TPtrC(PROXY_PORT_NUMBER), 22))
+		return KErrGeneral;
+	if(KErrNone==iOverSet->SetLongDesOverride(TPtrC(PROXIES), TPtrC(PROXY_EXCEPTIONS), temp))
+		return KErrGeneral;
+	return KErrNone;
+	}
+
+TVerdict CCommDbTest041_15::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_16::CCommDbTest041_16()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_16"));
+	}
+
+CCommDbTest041_16::~CCommDbTest041_16()
+	{}
+
+TVerdict CCommDbTest041_16::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNotSupported)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_16::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_16::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	TInt err;
+	TBuf<KCommsDbSvrMaxFieldLength> temp(_L("There's no place like home"));
+	if(KErrNotSupported!=(err=iOverSet->SetDesOverride(TPtrC(WAP_ACCESS_POINT), TPtrC(WAP_CURRENT_BEARER), temp)))
+		return err;
+	if(KErrNotSupported!=(err=iOverSet->SetLongDesOverride(TPtrC(WAP_ACCESS_POINT), TPtrC(WAP_START_PAGE), temp)))
+		return err;
+	return KErrNotSupported;
+	}
+
+TVerdict CCommDbTest041_16::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_17::CCommDbTest041_17()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_17"));
+	}
+
+CCommDbTest041_17::~CCommDbTest041_17()
+	{}
+
+TVerdict CCommDbTest041_17::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNotSupported)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest041_17::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest041_17::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	TInt err;
+	TBuf<KCommsDbSvrMaxFieldLength> temp(_L("There's no place like home"));
+	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_USAGE), 1)))
+		return err;
+	if(KErrNotSupported!=(err=iOverSet->SetDesOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_APN), temp)))
+		return err;
+	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_PDP_TYPE), 0)))
+		return err;
+	if(KErrNotSupported!=(err=iOverSet->SetDesOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_PDP_ADDRESS), temp)))
+		return err;
+	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_PRECEDENCE), 1)))
+		return err;
+	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_DELAY), 1)))
+		return err;
+	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_RELIABILITY), 1)))
+		return err;
+	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_PEAK_THROUGHPUT), 1)))
+		return err;
+	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_MEAN_THROUGHPUT), 1)))
+		return err;
+	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_MIN_PRECEDENCE), 1)))
+		return err;
+	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_MIN_DELAY), 1)))
+		return err;
+	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_MIN_RELIABILITY), 1)))
+		return err;
+	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_MIN_PEAK_THROUGHPUT), 1)))
+		return err;
+	if(KErrNotSupported!=(err=iOverSet->SetBoolOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_DATA_COMPRESSION), ETrue)))
+		return err;
+	if(KErrNotSupported!=(err=iOverSet->SetBoolOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_HEADER_COMPRESSION), ETrue)))
+		return err;
+	if(KErrNotSupported!=(err=iOverSet->SetBoolOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_ANONYMOUS_ACCESS), ETrue)))
+		return err;
+
+	return KErrNotSupported;
+	}
+
+TVerdict CCommDbTest041_17::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_18::CCommDbTest041_18()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_18"));
+	}
+
+CCommDbTest041_18::~CCommDbTest041_18()
+	{}
+
+TVerdict CCommDbTest041_18::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.18 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest041_01* step041_01 = new(ELeave) CCommDbTest041_01;
+	CleanupStack::PushL(step041_01);
+	doTestStepWithHeapFailureL( *step041_01, KErrNone);
+	CleanupStack::PopAndDestroy(step041_01);
+
+	return TestStepResult();
+	}
+
+
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_19::CCommDbTest041_19()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_19"));
+	}
+
+CCommDbTest041_19::~CCommDbTest041_19()
+	{}
+
+TVerdict CCommDbTest041_19::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.19 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest041_02* step041_02 = new(ELeave) CCommDbTest041_02;
+	CleanupStack::PushL(step041_02);
+	doTestStepWithHeapFailureL( *step041_02, KErrNone);
+	CleanupStack::PopAndDestroy(step041_02);
+	
+	return TestStepResult();
+	}
+	
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_20::CCommDbTest041_20()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_20"));
+	}
+
+CCommDbTest041_20::~CCommDbTest041_20()
+	{}
+
+TVerdict CCommDbTest041_20::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.20 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest041_03* step041_03 = new(ELeave) CCommDbTest041_03;
+	CleanupStack::PushL(step041_03);
+	doTestStepWithHeapFailureL( *step041_03, KErrNone);
+	CleanupStack::PopAndDestroy(step041_03);
+	
+	return TestStepResult();
+	}
+	
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_21::CCommDbTest041_21()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_21"));
+	}
+
+CCommDbTest041_21::~CCommDbTest041_21()
+	{}
+
+TVerdict CCommDbTest041_21::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.21 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest041_04* step041_04 = new(ELeave) CCommDbTest041_04;
+	CleanupStack::PushL(step041_04);
+	doTestStepWithHeapFailureL( *step041_04, KErrNone);
+	CleanupStack::PopAndDestroy(step041_04);
+	
+	return TestStepResult();
+	}
+	
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_22::CCommDbTest041_22()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_22"));
+	}
+
+CCommDbTest041_22::~CCommDbTest041_22()
+	{}
+
+TVerdict CCommDbTest041_22::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.22 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest041_05* step041_05 = new(ELeave) CCommDbTest041_05;
+	CleanupStack::PushL(step041_05);
+	doTestStepWithHeapFailureL( *step041_05, KErrNone);
+	CleanupStack::PopAndDestroy(step041_05);
+	
+	return TestStepResult();
+	}
+	
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_23::CCommDbTest041_23()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_23"));
+	}
+
+CCommDbTest041_23::~CCommDbTest041_23()
+	{}
+
+TVerdict CCommDbTest041_23::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.23 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest041_06* step041_06 = new(ELeave) CCommDbTest041_06;
+	CleanupStack::PushL(step041_06);
+	doTestStepWithHeapFailureL( *step041_06, KErrNone);
+	CleanupStack::PopAndDestroy(step041_06);
+	
+	return TestStepResult();
+	}
+	
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_24::CCommDbTest041_24()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_24"));
+	}
+
+CCommDbTest041_24::~CCommDbTest041_24()
+	{}
+
+TVerdict CCommDbTest041_24::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.24 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest041_07* step041_07 = new(ELeave) CCommDbTest041_07;
+	CleanupStack::PushL(step041_07);
+	doTestStepWithHeapFailureL( *step041_07, KErrNotFound);
+	CleanupStack::PopAndDestroy(step041_07);
+	
+	return TestStepResult();
+	}
+	
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_25::CCommDbTest041_25()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_25"));
+	}
+
+CCommDbTest041_25::~CCommDbTest041_25()
+	{}
+
+TVerdict CCommDbTest041_25::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.25 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest041_08* step041_08 = new(ELeave) CCommDbTest041_08;
+	CleanupStack::PushL(step041_08);
+	doTestStepWithHeapFailureL( *step041_08, KErrNotFound);
+	CleanupStack::PopAndDestroy(step041_08);
+	
+	return TestStepResult();
+	}
+	
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_26::CCommDbTest041_26()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_26"));
+	}
+
+CCommDbTest041_26::~CCommDbTest041_26()
+	{}
+
+TVerdict CCommDbTest041_26::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.26 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest041_09* step041_09 = new(ELeave) CCommDbTest041_09;
+	CleanupStack::PushL(step041_09);
+	doTestStepWithHeapFailureL( *step041_09, KErrNotSupported);
+	CleanupStack::PopAndDestroy(step041_09);
+	
+	return TestStepResult();
+	}
+	
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_27::CCommDbTest041_27()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_27"));
+	}
+
+CCommDbTest041_27::~CCommDbTest041_27()
+	{}
+
+TVerdict CCommDbTest041_27::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.27 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest041_10* step041_10 = new(ELeave) CCommDbTest041_10;
+	CleanupStack::PushL(step041_10);
+	doTestStepWithHeapFailureL( *step041_10, KErrAlreadyExists);
+	CleanupStack::PopAndDestroy(step041_10);
+	
+	return TestStepResult();
+	}
+	
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_28::CCommDbTest041_28()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_28"));
+	}
+
+CCommDbTest041_28::~CCommDbTest041_28()
+	{}
+
+TVerdict CCommDbTest041_28::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.28 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest041_11* step041_11 = new(ELeave) CCommDbTest041_11;
+	CleanupStack::PushL(step041_11);
+	doTestStepWithHeapFailureL( *step041_11, KErrNotFound);
+	CleanupStack::PopAndDestroy(step041_11);
+	
+	return TestStepResult();
+	}
+	
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_29::CCommDbTest041_29()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_29"));
+	}
+
+CCommDbTest041_29::~CCommDbTest041_29()
+	{}
+
+TVerdict CCommDbTest041_29::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.29 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest041_12* step041_12 = new(ELeave) CCommDbTest041_12;
+	CleanupStack::PushL(step041_12);
+	doTestStepWithHeapFailureL( *step041_12, KErrNone);
+	CleanupStack::PopAndDestroy(step041_12);
+	
+	return TestStepResult();
+	}
+	
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_30::CCommDbTest041_30()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_30"));
+	}
+
+CCommDbTest041_30::~CCommDbTest041_30()
+	{}
+
+TVerdict CCommDbTest041_30::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.30 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest041_13* step041_13 = new(ELeave) CCommDbTest041_13;
+	CleanupStack::PushL(step041_13);
+	doTestStepWithHeapFailureL( *step041_13, KErrNone);
+	CleanupStack::PopAndDestroy(step041_13);
+	
+	return TestStepResult();
+	}
+	
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_31::CCommDbTest041_31()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_31"));
+	}
+
+CCommDbTest041_31::~CCommDbTest041_31()
+	{}
+
+TVerdict CCommDbTest041_31::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.31 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest041_14* step041_14 = new(ELeave) CCommDbTest041_14;
+	CleanupStack::PushL(step041_14);
+	doTestStepWithHeapFailureL( *step041_14, KErrNotSupported);
+	CleanupStack::PopAndDestroy(step041_14);
+	
+	return TestStepResult();
+	}
+	
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_32::CCommDbTest041_32()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_32"));
+	}
+
+CCommDbTest041_32::~CCommDbTest041_32()
+	{}
+
+TVerdict CCommDbTest041_32::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.32 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest041_15* step041_15 = new(ELeave) CCommDbTest041_15;
+	CleanupStack::PushL(step041_15);
+	doTestStepWithHeapFailureL( *step041_15, KErrNone);
+	CleanupStack::PopAndDestroy(step041_15);
+	
+	return TestStepResult();
+	}
+	
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_33::CCommDbTest041_33()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_33"));
+	}
+
+CCommDbTest041_33::~CCommDbTest041_33()
+	{}
+
+TVerdict CCommDbTest041_33::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.33 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest041_16* step041_16 = new(ELeave) CCommDbTest041_16;
+	CleanupStack::PushL(step041_16);
+	doTestStepWithHeapFailureL( *step041_16, KErrNotSupported);
+	CleanupStack::PopAndDestroy(step041_16);
+	
+	return TestStepResult();
+	}
+	
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest041_34::CCommDbTest041_34()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_041_34"));
+	}
+
+CCommDbTest041_34::~CCommDbTest041_34()
+	{}
+
+TVerdict CCommDbTest041_34::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 041.34 called "));
+
+	SetTestStepResult(EPass);	
+	CCommDbTest041_17* step041_17 = new(ELeave) CCommDbTest041_17;
+	CleanupStack::PushL(step041_17);
+	doTestStepWithHeapFailureL( *step041_17, KErrNotSupported);
+	CleanupStack::PopAndDestroy(step041_17);
+	
+	return TestStepResult();
+	}
+
+//EOF
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_042_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,155 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 042.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_042_xx.h"
+
+
+CCommDbTest042_01::CCommDbTest042_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_042_01"));
+	}
+
+CCommDbTest042_01::~CCommDbTest042_01()
+	{}
+
+TVerdict CCommDbTest042_01::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest042_01::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest042_01::executeStepL()
+	{
+	TInt err(KErrNone);
+
+	CCommDbOverrideSettings* overSet1=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(overSet1);
+	TUint32 temp1 = 5000;
+	User::LeaveIfError(overSet1->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), temp1));
+
+	CCommDbOverrideSettings* overSet2=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(overSet2);
+	TUint32 temp2=5000;
+	User::LeaveIfError(overSet2->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_AUTH_RETRIES), temp2));
+
+	if(overSet1->Compare(overSet2))
+		err = KErrGeneral;
+
+	CleanupStack::PopAndDestroy(overSet2);
+	CleanupStack::PopAndDestroy(overSet1);
+	
+	return err;
+	}
+	
+TVerdict CCommDbTest042_01::doTestStepPostambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest042_02::CCommDbTest042_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_042_02"));
+	}
+
+CCommDbTest042_02::~CCommDbTest042_02()
+	{}
+
+TVerdict CCommDbTest042_02::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest042_02::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest042_02::executeStepL()
+	{
+	TInt err(KErrNone);
+
+	CCommDbOverrideSettings* overSet1=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(overSet1);
+	TUint32 temp1 = 5000;
+	User::LeaveIfError(overSet1->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), temp1));
+
+	CCommDbOverrideSettings* overSet2=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(overSet2);
+	TUint32 temp2=5000;
+	User::LeaveIfError(overSet2->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), temp2));
+
+	if(!overSet1->Compare(overSet2))
+		err = KErrGeneral;
+
+	CleanupStack::PopAndDestroy(overSet2);
+	CleanupStack::PopAndDestroy(overSet1);
+	
+	return err;
+	}
+	
+TVerdict CCommDbTest042_02::doTestStepPostambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest042_03::CCommDbTest042_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_042_03"));
+	}
+
+CCommDbTest042_03::~CCommDbTest042_03()
+	{}
+
+TVerdict CCommDbTest042_03::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 042.03 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest042_01* step042_01 = new(ELeave) CCommDbTest042_01;
+	CleanupStack::PushL(step042_01);
+	doTestStepWithHeapFailureL( *step042_01, KErrNone);
+	CleanupStack::PopAndDestroy(step042_01);
+
+	CCommDbTest042_02* step042_02 = new(ELeave) CCommDbTest042_02;
+	CleanupStack::PushL(step042_02);
+	doTestStepWithHeapFailureL( *step042_02, KErrNone);
+	CleanupStack::PopAndDestroy(step042_02);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_043_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,463 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 043.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_043_xx.h"
+
+
+CCommDbTest043_01::CCommDbTest043_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_043_01"));
+	}
+
+CCommDbTest043_01::~CCommDbTest043_01()
+	{}
+
+TVerdict CCommDbTest043_01::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest043_01::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest043_01::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 2;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, ETrue);
+	
+	CCommDbOverrideSettings* overSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(overSet);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref overPref;
+	overPref.iRanking = 1;
+	overPref.iDirection = ECommDbConnectionDirectionOutgoing;
+	overPref.iDialogPref = ECommDbDialogPrefDoNotPrompt;
+	overPref.iBearer.iBearerSet = KCommDbBearerCSD;
+	overPref.iBearer.iIapId = 2;
+
+	User::LeaveIfError(overSet->SetConnectionPreferenceOverride(overPref));
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref overPref2;
+	overPref2.iRanking = 1;
+	overPref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	overPref2.iDialogPref = ECommDbDialogPrefUnknown;
+	overPref2.iBearer.iBearerSet = 0;
+	overPref2.iBearer.iIapId = 0;
+
+	User::LeaveIfError(overSet->GetConnectionPreferenceOverride(overPref2));
+	CleanupStack::PopAndDestroy(overSet);
+
+	if(!(overPref==overPref2))
+		return KErrGeneral;
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest043_01::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////////
+
+CCommDbTest043_02::CCommDbTest043_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_043_02"));
+	}
+
+CCommDbTest043_02::~CCommDbTest043_02()
+	{}
+
+TVerdict CCommDbTest043_02::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrAlreadyExists)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest043_02::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest043_02::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 2;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, ETrue);
+	
+	CCommDbOverrideSettings* overSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(overSet);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref overPref;
+	overPref.iRanking = 1;
+	overPref.iDirection = ECommDbConnectionDirectionOutgoing;
+	overPref.iDialogPref = ECommDbDialogPrefDoNotPrompt;
+	overPref.iBearer.iBearerSet = KCommDbBearerCSD;
+	overPref.iBearer.iIapId = 2;
+
+	User::LeaveIfError(overSet->SetConnectionPreferenceOverride(overPref));
+
+	overPref.iDialogPref = ECommDbDialogPrefPrompt;
+	overPref.iBearer.iBearerSet = KCommDbBearerCSD;
+	overPref.iBearer.iIapId = 2;
+
+	TInt err = overSet->SetConnectionPreferenceOverride(overPref);
+	CleanupStack::PopAndDestroy(overSet);
+
+	return err;
+	}
+	
+TVerdict CCommDbTest043_02::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////////
+
+CCommDbTest043_03::CCommDbTest043_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_043_03"));
+	}
+
+CCommDbTest043_03::~CCommDbTest043_03()
+	{}
+
+TVerdict CCommDbTest043_03::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest043_03::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest043_03::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 2;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, ETrue);
+	
+	CCommDbOverrideSettings* overSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(overSet);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref overPref;
+	overPref.iRanking = 1;
+	overPref.iDirection = ECommDbConnectionDirectionOutgoing;
+	overPref.iDialogPref = ECommDbDialogPrefDoNotPrompt;
+	overPref.iBearer.iBearerSet = KCommDbBearerCSD;
+	overPref.iBearer.iIapId = 2;
+
+	User::LeaveIfError(overSet->SetConnectionPreferenceOverride(overPref));
+
+	overPref.iRanking = 0;
+	overPref.iDirection = ECommDbConnectionDirectionUnknown;
+	overPref.iDialogPref = ECommDbDialogPrefUnknown;
+	overPref.iBearer.iBearerSet = 0;
+	overPref.iBearer.iIapId = 0;
+
+	TInt err = overSet->GetConnectionPreferenceOverride(overPref);
+
+	CleanupStack::PopAndDestroy(overSet);
+
+	if(err==KErrArgument)	//Have to map errors to different ones so we can do heap failure tests
+		return KErrNone;	//Nasty, but not a lot else we can do.
+
+	if(err==KErrNone)
+		return KErrGeneral;
+
+	return err;
+	}
+	
+TVerdict CCommDbTest043_03::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////////
+
+CCommDbTest043_04::CCommDbTest043_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_043_04"));
+	}
+
+CCommDbTest043_04::~CCommDbTest043_04()
+	{}
+
+TVerdict CCommDbTest043_04::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNotFound)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest043_04::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest043_04::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
+	pref1.iRanking = 1;
+	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref1.iDialogPref = ECommDbDialogPrefPrompt;
+	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref1.iBearer.iIapId = 1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
+	pref2.iRanking = 2;
+	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
+	pref2.iDialogPref = ECommDbDialogPrefPrompt;
+	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
+	pref2.iBearer.iIapId = 2;
+	
+	iPrefView->InsertConnectionPreferenceL(pref2, ETrue);
+	
+	CCommDbOverrideSettings* overSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(overSet);
+
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref overPref;
+	overPref.iRanking = 1;
+	overPref.iDirection = ECommDbConnectionDirectionOutgoing;
+	overPref.iDialogPref = ECommDbDialogPrefUnknown;
+	overPref.iBearer.iBearerSet = 0;
+	overPref.iBearer.iIapId = 0;
+
+	TInt err = overSet->GetConnectionPreferenceOverride(overPref);
+
+	CleanupStack::PopAndDestroy(overSet);
+
+	return err;
+	}
+	
+TVerdict CCommDbTest043_04::doTestStepPostambleL()
+	{
+		//Get rid of our view
+	if(iPrefView)
+		{
+		delete iPrefView;
+		}
+	iPrefView=0;
+
+	//Create a new view that should have the record that was added in executeStepL and
+	// may have been left in by a leave condition
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	if(iPrefView->GotoFirstRecord() == KErrNone)
+		{
+		iPrefView->DeleteConnectionPreferenceL();
+		}
+	
+	// Cleanup after test run
+	CTestStepCommDb::doTestStepPostambleL();	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest043_05::CCommDbTest043_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_043_05"));
+	}
+
+CCommDbTest043_05::~CCommDbTest043_05()
+	{}
+
+TVerdict CCommDbTest043_05::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 043.05 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest043_01* step043_01 = new(ELeave) CCommDbTest043_01;
+	CleanupStack::PushL(step043_01);
+	doTestStepWithHeapFailureL( *step043_01, KErrNone);
+	CleanupStack::PopAndDestroy(step043_01);
+
+	CCommDbTest043_02* step043_02 = new(ELeave) CCommDbTest043_02;
+	CleanupStack::PushL(step043_02);
+	doTestStepWithHeapFailureL( *step043_02, KErrAlreadyExists);
+	CleanupStack::PopAndDestroy(step043_02);
+
+	CCommDbTest043_03* step043_03 = new(ELeave) CCommDbTest043_03;
+	CleanupStack::PushL(step043_03);
+	doTestStepWithHeapFailureL( *step043_03, KErrNone);
+	CleanupStack::PopAndDestroy(step043_03);
+
+	CCommDbTest043_04* step043_04 = new(ELeave) CCommDbTest043_04;
+	CleanupStack::PushL(step043_04);
+	doTestStepWithHeapFailureL( *step043_04, KErrNotFound);
+	CleanupStack::PopAndDestroy(step043_04);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_044_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,199 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 044.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbstore.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_044_xx.h"
+
+
+CCommDbTest044_01::CCommDbTest044_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_044_01"));
+	}
+
+CCommDbTest044_01::~CCommDbTest044_01()
+	{}
+
+TVerdict CCommDbTest044_01::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest044_01::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest044_01::executeStepL()
+	{
+	CStoreableOverrideSettings* overSet=CStoreableOverrideSettings::NewL(CStoreableOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(overSet);
+
+	TUint32 tempUint = 5000;
+	User::LeaveIfError(overSet->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), tempUint));
+
+	TBool tempBool = ETrue;
+	User::LeaveIfError(overSet->SetBoolOverride(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), tempBool));
+
+	TBuf8<KCommsDbSvrMaxFieldLength> temp8String(_L8("Hi There!!"));
+	User::LeaveIfError(overSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), temp8String));
+	
+	TBuf<KCommsDbSvrMaxFieldLength> temp16String(_L("Hi There!!"));
+	User::LeaveIfError(overSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), temp16String));
+
+	TBuf<KCommsDbSvrMaxFieldLength> tempLongString(_L("SEND \"hello\"\nWAIT 20\n{\n\"hello back\"\n"));	//Lots of stuff, nothing important
+	User::LeaveIfError(overSet->SetLongDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), tempLongString));
+
+	CleanupStack::PopAndDestroy(overSet);
+
+	return KErrNone;	//We've not left, so we pass
+	}
+	
+TVerdict CCommDbTest044_01::doTestStepPostambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest044_02::CCommDbTest044_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_044_02"));
+	}
+
+CCommDbTest044_02::~CCommDbTest044_02()
+	{}
+
+TVerdict CCommDbTest044_02::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest044_02::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest044_02::executeStepL()
+	{
+	CStoreableOverrideSettings* overSet=CStoreableOverrideSettings::NewL(CStoreableOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(overSet);
+
+	TUint32 setUint = 5000;
+	User::LeaveIfError(overSet->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), setUint));
+
+	TBool setBool = ETrue;
+	User::LeaveIfError(overSet->SetBoolOverride(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), setBool));
+
+	TBuf8<KCommsDbSvrMaxFieldLength> set8String(_L8("Hi There!!"));
+	User::LeaveIfError(overSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), set8String));
+	
+	TBuf<KCommsDbSvrMaxFieldLength> set16String(_L("Hi There!!"));
+	User::LeaveIfError(overSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), set16String));
+
+	TBuf<KCommsDbSvrMaxFieldLength> setLongString(_L("SEND \"hello\"\nWAIT 20\n{\n\"hello back\"\n"));	//Lots of stuff, nothing important
+	User::LeaveIfError(overSet->SetLongDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), setLongString));
+
+	//We've made an override object, now store it...
+
+	CBufFlat* store = overSet->StoreLC();
+	TPtr8 ptrToStore=store->Ptr(0);
+
+	//Now restore into a new CStoreableOverrideSettings object
+	CStoreableOverrideSettings* restoreOverSet=CStoreableOverrideSettings::NewL(CStoreableOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(restoreOverSet);
+
+	HBufC8* restoredBuf=HBufC8::NewLC(ptrToStore.Length());
+	TPtr8 ptrToBuf(restoredBuf->Des());
+	ptrToBuf.Copy(ptrToStore);
+	restoreOverSet->RestoreL(restoredBuf);
+	
+	//Check we've got the same stuff in the restored object as in the original
+	TUint32 restoredUint;
+	TBool restoredBool;
+	TBuf8<KCommsDbSvrMaxFieldLength> restored8String;
+	TBuf<KCommsDbSvrMaxFieldLength> restored16String;
+	TBuf<KCommsDbSvrMaxFieldLength> restoredLongString;
+
+	User::LeaveIfError(restoreOverSet->GetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), restoredUint));
+	User::LeaveIfError(restoreOverSet->GetBoolOverride(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), restoredBool));
+	User::LeaveIfError(restoreOverSet->GetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), restored8String));
+	User::LeaveIfError(restoreOverSet->GetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), restored16String));
+	User::LeaveIfError(restoreOverSet->GetLongDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), restoredLongString));
+
+	CleanupStack::PopAndDestroy(restoredBuf);
+	CleanupStack::PopAndDestroy(restoreOverSet);
+	CleanupStack::PopAndDestroy(store);
+	CleanupStack::PopAndDestroy(overSet);
+
+	//Now do a comparison
+	if(restoredUint!=setUint
+		||restoredBool!=setBool
+		||restored8String!=set8String
+		||restored16String!=set16String
+		||restoredLongString!=setLongString)
+		return KErrGeneral;
+
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest044_02::doTestStepPostambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest044_03::CCommDbTest044_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_044_03"));
+	}
+
+CCommDbTest044_03::~CCommDbTest044_03()
+	{}
+
+TVerdict CCommDbTest044_03::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 044.03 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest044_01* step044_01 = new(ELeave) CCommDbTest044_01;
+	CleanupStack::PushL(step044_01);
+	doTestStepWithHeapFailureL( *step044_01, KErrNone);
+	CleanupStack::PopAndDestroy(step044_01);
+
+	CCommDbTest044_02* step044_02 = new(ELeave) CCommDbTest044_02;
+	CleanupStack::PushL(step044_02);
+	doTestStepWithHeapFailureL( *step044_02, KErrNone);
+	CleanupStack::PopAndDestroy(step044_02);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_045_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,210 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 045.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbstore.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_045_xx.h"
+
+
+CCommDbTest045_01::CCommDbTest045_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_045_01"));
+	}
+
+CCommDbTest045_01::~CCommDbTest045_01()
+	{}
+
+TVerdict CCommDbTest045_01::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest045_01::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest045_01::executeStepL()
+	{
+	CStoreableOverrideSettings* overSet=CStoreableOverrideSettings::NewL(CStoreableOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(overSet);
+
+	TUint32 setUint = 5000;
+	User::LeaveIfError(overSet->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), setUint));
+
+	TBool setBool = ETrue;
+	User::LeaveIfError(overSet->SetBoolOverride(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), setBool));
+
+	TBuf8<KCommsDbSvrMaxFieldLength> set8String(_L8("Hi There!!"));
+	User::LeaveIfError(overSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), set8String));
+	
+	TBuf<KCommsDbSvrMaxFieldLength> set16String(_L("Hi There!!"));
+	User::LeaveIfError(overSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), set16String));
+
+	TBuf<KCommsDbSvrMaxFieldLength> setLongString(_L("SEND \"hello\"\nWAIT 20\n{\n\"hello back\"\n"));	//Lots of stuff, nothing important
+	User::LeaveIfError(overSet->SetLongDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), setLongString));
+
+	HBufC8* storeBuf=HBufC8::NewLC(1024);	//Create a buf on the heap to use as the store
+	TPtr8 storePtr=storeBuf->Des();
+
+	RDesWriteStream writeStream;
+	writeStream.Open(storePtr);
+	writeStream.PushL();
+	
+	overSet->ExternalizeL(writeStream);
+	writeStream.Close();
+	CleanupStack::Pop();	//writeStream
+
+	//Settings have been stored to stream (storeBuf),
+	//now read them into a new settings object and check them
+
+	CStoreableOverrideSettings* restoreOverSet=CStoreableOverrideSettings::NewL(CStoreableOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(restoreOverSet);
+
+	RDesReadStream readStream;
+	readStream.Open(storePtr);
+	readStream.PushL();
+
+	restoreOverSet->InternalizeL(readStream);
+	readStream.Close();
+	CleanupStack::Pop();	//readStream
+
+	//Check we've got the same stuff in the restored object as in the original
+	TUint32 restoredUint;
+	TBool restoredBool;
+	TBuf8<KCommsDbSvrMaxFieldLength> restored8String;
+	TBuf<KCommsDbSvrMaxFieldLength> restored16String;
+	TBuf<KCommsDbSvrMaxFieldLength> restoredLongString;
+
+	User::LeaveIfError(restoreOverSet->GetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), restoredUint));
+	User::LeaveIfError(restoreOverSet->GetBoolOverride(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), restoredBool));
+	User::LeaveIfError(restoreOverSet->GetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), restored8String));
+	User::LeaveIfError(restoreOverSet->GetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), restored16String));
+	User::LeaveIfError(restoreOverSet->GetLongDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), restoredLongString));
+
+	CleanupStack::PopAndDestroy(restoreOverSet);
+	CleanupStack::PopAndDestroy(storeBuf);
+	CleanupStack::PopAndDestroy(overSet);
+
+	//Now do a comparison
+	if(restoredUint!=setUint
+		||restoredBool!=setBool
+		||restored8String!=set8String
+		||restored16String!=set16String
+		||restoredLongString!=setLongString)
+		return KErrGeneral;
+
+
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest045_01::doTestStepPostambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest045_02::CCommDbTest045_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_045_02"));
+	}
+
+CCommDbTest045_02::~CCommDbTest045_02()
+	{}
+
+TVerdict CCommDbTest045_02::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrEof)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest045_02::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest045_02::executeStepL()
+	{
+	HBufC8* storeBuf=HBufC8::NewLC(1024);	//Create a buf on the heap to use as the store
+	TPtr8 storePtr=storeBuf->Des();
+
+	//Try and restore from a blank stream
+
+	CStoreableOverrideSettings* restoreOverSet=CStoreableOverrideSettings::NewL(CStoreableOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(restoreOverSet);
+
+	RDesReadStream readStream;
+	storePtr=storeBuf->Des();
+	readStream.Open(storePtr);
+	readStream.PushL();
+
+	TRAPD(err, restoreOverSet->InternalizeL(readStream));
+	readStream.Close();
+	CleanupStack::Pop();	//readStream
+
+
+	CleanupStack::PopAndDestroy(restoreOverSet);
+	CleanupStack::PopAndDestroy(storeBuf);
+
+	return err;
+	}
+	
+TVerdict CCommDbTest045_02::doTestStepPostambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//////////////////////////////////////////////////////////////////////////
+
+CCommDbTest045_03::CCommDbTest045_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_045_03"));
+	}
+
+CCommDbTest045_03::~CCommDbTest045_03()
+	{}
+
+TVerdict CCommDbTest045_03::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Step 045.03 called "));
+
+	SetTestStepResult(EPass);
+	CCommDbTest045_01* step045_01 = new(ELeave) CCommDbTest045_01;
+	CleanupStack::PushL(step045_01);
+	doTestStepWithHeapFailureL( *step045_01, KErrNone);
+	CleanupStack::PopAndDestroy(step045_01);
+
+	CCommDbTest045_02* step045_02 = new(ELeave) CCommDbTest045_02;
+	CleanupStack::PushL(step045_02);
+	doTestStepWithHeapFailureL( *step045_02, KErrEof);
+	CleanupStack::PopAndDestroy(step045_02);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_046_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,1019 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 046.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbstore.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_046_xx.h"
+#include <e32math.h>
+
+
+const TInt KTest04605Repeats = 20;
+
+/////////////////////
+//	Test step 046.01
+/////////////////////
+
+// constructor
+CCommDbTest046_01::CCommDbTest046_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_046_01"));
+	}
+
+// destructor
+CCommDbTest046_01::~CCommDbTest046_01()
+	{
+	}
+
+
+TVerdict CCommDbTest046_01::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest046_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+
+	//This step checks that record id's are created in the expected manner,
+	//and that the record cursor also behaves as expected ie it moves to
+	//the next record, when the record it points to is deleted.
+
+	iTheView = iTheDb->OpenTableLC( TPtrC(DIAL_OUT_ISP) );
+	CleanupStack::Pop(iTheView);
+	//Insert 4 records checking the id each time
+	TUint32 id;
+
+	CDBLEAVE(iTheView->InsertRecord( id ), KErrNone);
+	if ( id != 1 )
+		User::Leave( ret );
+
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),_L("My Service #1"));
+	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
+	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
+	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+
+	CDBLEAVE(iTheView->InsertRecord( id ), KErrNone);
+	if ( id != 2 )
+		User::Leave( ret );
+
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),_L("My Service #2"));
+	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
+	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
+	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+
+	CDBLEAVE(iTheView->InsertRecord( id ), KErrNone);
+	if ( id !=3 )
+		User::Leave( ret );
+
+
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),_L("My Service #3"));
+	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
+	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
+	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+
+
+	CDBLEAVE(iTheView->InsertRecord( id ), KErrNone);
+	if ( id !=4 )
+		User::Leave( ret );
+
+
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),_L("My Service #4"));
+	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
+	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
+	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+
+
+	//Open a new view and move to the last record
+	delete iTheView;
+	iTheView = 0;
+
+	iTheView = iTheDb->OpenTableLC( TPtrC(DIAL_OUT_ISP) );
+	CleanupStack::Pop(iTheView);
+
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+
+	//Delete the last record
+	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoPreviousRecord(), KErrNone);
+	//Check the cursor is now pointing at the previous record
+
+	TUint32 value;
+	iTheView->ReadUintL( TPtrC(COMMDB_ID), value );
+
+	if ( value != 3 )
+		User::Leave( ret );
+
+	//Goto the first record and delete that
+	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
+	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
+	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
+	//Check the cursor is now pointing at the second record
+	
+	iTheView->ReadUintL( TPtrC(COMMDB_ID), value );
+	if ( value != 2 )
+		User::Leave( ret );
+
+	//Insert a new record and check the id is correct
+	
+	CDBLEAVE(iTheView->InsertRecord( id ), KErrNone);
+	/* 
+	DBMS supports cyclic id allocation..commsdat was forced
+	to do that too..but looks like we do reuse the record ids
+	if the deleted record was the last one. I think we should forget about
+	this slip because 
+		a)Its not a behaviour worth having for us and we got away with it anyway
+		b)None of our client seem to give a damn about this for last few years  
+					
+	if ( id != 5 )
+		User::Leave( ret );*/
+		
+	if ( id != 4 )
+		User::Leave( ret );	
+
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),_L("My Service #5"));
+	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
+	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
+//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
+	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+
+	ret = KErrNone; //Passed if we get this far
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest046_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 046.01 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 046.02
+/////////////////////
+
+// constructor
+CCommDbTest046_02::CCommDbTest046_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_046_02"));
+	}
+
+// destructor
+CCommDbTest046_02::~CCommDbTest046_02()
+	{
+	}
+
+
+TVerdict CCommDbTest046_02::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+void CCommDbTest046_02::insertTestRecordsL( TUint aQuantity )
+	{
+	TUint count;
+	TUint32 id;
+	CCommsDbTableView* dbView;
+
+	dbView  = iTheDb->OpenTableLC( TPtrC(DIAL_OUT_ISP) );
+
+	for( count=0; count < aQuantity; count++ )
+		{
+
+		CDBLEAVE(dbView->InsertRecord( id ), KErrNone);
+		dbView->WriteTextL(TPtrC(COMMDB_NAME),_L("My Service Test Record"));
+		dbView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+		dbView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
+		dbView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
+//		dbView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
+		dbView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
+		dbView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+		dbView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+		dbView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+		CDBLEAVE( dbView->PutRecordChanges(), KErrNone );
+		
+		}
+	
+	CleanupStack::PopAndDestroy(dbView);
+
+	}
+
+void CCommDbTest046_02::deleteLastRecordsL( TUint aQuantity )
+	{
+	TUint count;
+	TInt ret = KErrGeneral;
+	CCommsDbTableView* dbView;
+
+	dbView  = iTheDb->OpenTableLC( TPtrC(DIAL_OUT_ISP) );
+	CDBLEAVE( dbView->GotoFirstRecord(), KErrNone );
+
+	//Move to the end of the view
+	do
+	{
+		ret = dbView->GotoNextRecord();
+	}while ( ret != KErrNotFound );
+	
+	//Need to move the cursor back into the view
+	dbView->GotoPreviousRecord();
+
+	//Now delete the record and move back one
+	for ( count=0; count< aQuantity; count++)
+		{
+		CDBLEAVE( dbView->DeleteRecord(), KErrNone );
+		CDBLEAVE( dbView->GotoPreviousRecord(), KErrNone );
+		}
+
+	CleanupStack::PopAndDestroy(dbView);
+	}
+
+
+TInt CCommDbTest046_02::executeStepL()
+	{
+	TInt ret=KErrGeneral, count;
+
+	// NOTE: count limit reduced from 100 to 5, because commsdat has an id limit
+	// of 128 when inserting records.  After this, you get a KErrOverflow from
+	// CCommsDbTableView::InsertRecord() in insertTestRecordsL(...).
+	for ( count=0; count < 5; count++ )
+		{
+		insertTestRecordsL( 10 );
+
+		//Start a transaction, write 10 records, then rollback
+		CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+		insertTestRecordsL( 10 );
+		iTheDb->RollbackTransaction();
+
+		//Start a transaction, write 10 records, delete them, then rollback
+		CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+		insertTestRecordsL( 10 );
+		deleteLastRecordsL( 10 );
+		iTheDb->RollbackTransaction();
+
+		//Start a transaction, write 10 records and commit them
+		CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
+		insertTestRecordsL( 10 );
+		CDBLEAVE( iTheDb->CommitTransaction(), KErrNone );
+
+		}
+
+	ret = KErrNone;
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest046_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 046.02 called "));
+
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+///////////////////////////////////////////////////////////////////////////
+//Thread1 does the first right, our main thread then does the second.
+//They continue to take it in turns to do writes
+
+CCommDbTest046_03::CCommDbTest046_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_046_03"));
+	}
+
+CCommDbTest046_03::~CCommDbTest046_03()
+	{}
+
+TVerdict CCommDbTest046_03::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest046_03::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest046_03::Thread1Function(TAny* aPtr)
+	{
+	CTrapCleanup* cleanup=CTrapCleanup::New();
+	if (cleanup==NULL)
+		return(KErrNoMemory);
+
+	TRAPD(err, DoThread1TestL(aPtr));
+	if(err != KErrNone)
+		{
+		return err;
+		}
+
+	delete cleanup;
+	return(KErrNone);
+	}
+
+void CCommDbTest046_03::DoThread1TestL(TAny* aPtr)
+	{
+	TThreadInfo* syncInfo = (TThreadInfo*) aPtr;
+	TRequestStatus localStatus(KRequestPending);
+	syncInfo->iThread1Status = &localStatus;
+	
+	CCommsDatabase* cDb = CCommsDatabase::NewL();
+	CleanupStack::PushL(cDb);
+	CCommsDbTableView* modemTable = cDb->OpenTableLC(TPtrC(MODEM_BEARER));
+
+	TUint32 dummyId;
+	modemTable->InsertRecord(dummyId);
+	modemTable->WriteTextL(TPtrC(COMMDB_NAME),_L("Thread1, Entry1"));
+	User::LeaveIfError(modemTable->PutRecordChanges());
+
+	//this thread is the first on to do all its rights
+	CleanupStack::PopAndDestroy(modemTable);
+	CleanupStack::PopAndDestroy(cDb);
+
+	syncInfo->iMainThread.RequestComplete(syncInfo->iMainThreadStatus, KErrNone);
+	}
+
+TInt CCommDbTest046_03::executeStepL()
+	{
+	//First thing is to empty the modem table
+	CCommsDbTableView* modemTable = iTheDb->OpenTableLC(TPtrC(MODEM_BEARER));
+	while(modemTable->GotoFirstRecord()==KErrNone)
+		modemTable->DeleteRecord();
+
+	RThread thread1;
+	TThreadInfo sync1;
+	TRequestStatus status1(KRequestPending);
+	sync1.iMainThreadStatus=&status1;
+	sync1.iMainThread.Duplicate(RThread(),EOwnerProcess);
+	_LIT(KThread1Name,"Thread1");
+	User::LeaveIfError(thread1.Create(KThread1Name,Thread1Function,KDefaultStackSize,NULL,&sync1));
+	CleanupClosePushL(thread1);
+
+	iTheDb->BeginTransaction();
+
+	TUint32 dummyId;
+	modemTable->InsertRecord(dummyId);
+	_LIT(KTestName, "Main, Entry1");
+	modemTable->WriteTextL(TPtrC(COMMDB_NAME), KTestName);
+
+	//OK, lets start the other thread off now.
+
+	TRequestStatus status2(KRequestPending);
+
+	thread1.Logon(status2);
+	thread1.Resume();
+	User::WaitForRequest(status1,status2);
+
+	//OK, one of the status has completed, if it's status1 then that means thread1 didn't panic
+	//which is a bad thing.
+
+	if(status1 != KRequestPending)
+		User::Leave(KErrGeneral);	//Report error by leaving
+
+	if(thread1.ExitType() != EExitPanic)
+		User::Leave(KErrGeneral);	//Thread1 didn't panic, something else has gone wrong.
+	
+	CleanupStack::PopAndDestroy();	//thread1
+	//Lets finish our entry off, and check it's OK.
+	User::LeaveIfError(modemTable->PutRecordChanges());
+	
+	iTheDb->CommitTransaction();
+
+	CleanupStack::PopAndDestroy(modemTable);
+
+	//Lets make a new modem view and check it's only got our entry in.
+	modemTable=NULL;
+	modemTable = iTheDb->OpenTableLC(TPtrC(MODEM_BEARER));
+	User::LeaveIfError(modemTable->GotoFirstRecord());
+
+	TBuf<KCommsDbSvrMaxFieldLength> tempBuf;
+	modemTable->ReadTextL(TPtrC(COMMDB_NAME), tempBuf);
+
+	if(tempBuf!=KTestName)
+		User::Leave(KErrGeneral);
+
+	CleanupStack::PopAndDestroy(modemTable);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+	
+TVerdict CCommDbTest046_03::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////////
+/*
+Note for anyone who looks at this code.
+It's a bit of a mess, but it seems to do the job. Basically thread1 is the thread trying to
+do a write to the database, and our main thread is the one responsible for checking that
+the change hasn't gone in before PutRecordChanges is called by thread1. After thread1 has
+done it's write, we check that the write was sucessfull. This is done by our main thread
+right at the end of CCommDbTest046_04::executeStepL().
+*/
+
+CCommDbTest046_04::CCommDbTest046_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_046_04"));
+	}
+
+CCommDbTest046_04::~CCommDbTest046_04()
+	{}
+
+TVerdict CCommDbTest046_04::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest046_04::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest046_04::Thread1Function(TAny* aPtr)
+	{
+	CTrapCleanup* cleanup=CTrapCleanup::New();
+	if (cleanup==NULL)
+		return(KErrNoMemory);
+
+	TRAPD(err, DoThread1TestL(aPtr));
+
+	delete cleanup;
+	return(err);
+	}
+
+void CCommDbTest046_04::DoThread1TestL(TAny* aPtr)
+	{
+	TThreadInfo* remoteThreadInfo = (TThreadInfo*) aPtr;
+	CCommsDatabase* cDb =CCommsDatabase::NewL();
+	CleanupStack::PushL(cDb);
+
+	CCommsDbTableView* dialInIspView = cDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
+	User::LeaveIfError(dialInIspView->GotoFirstRecord());
+	dialInIspView->UpdateRecord();
+	dialInIspView->WriteLongTextL(TPtrC(ISP_LOGIN_SCRIPT), _L("Changed"));
+
+	remoteThreadInfo->iCaller.RequestComplete(remoteThreadInfo->iStatus1,KErrNone);//We're now ready to kick of the other thread
+
+	User::After(10000000);
+	TInt err = dialInIspView->PutRecordChanges();
+
+	CleanupStack::PopAndDestroy(dialInIspView);
+
+	CleanupStack::PopAndDestroy(cDb);
+	remoteThreadInfo->iCaller.RequestComplete(remoteThreadInfo->iStatus2,err);
+	}
+
+TInt CCommDbTest046_04::executeStepL()
+	{
+	//Set the commdb up so we know what's in the first record of the Dial in ISP before we start.
+	CCommsDbTableView* dialInIspView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
+	User::LeaveIfError(dialInIspView->GotoFirstRecord());
+	dialInIspView->UpdateRecord();
+	dialInIspView->WriteLongTextL(TPtrC(ISP_LOGIN_SCRIPT), _L("Original"));
+	User::LeaveIfError(dialInIspView->PutRecordChanges());
+	CleanupStack::PopAndDestroy(dialInIspView);
+
+	//Start off the first thread, this will run until it has done all but PutRecordChanges is called on the transaction.
+	RThread thread1;
+	TThreadInfo sync1;
+	TRequestStatus status1(KRequestPending);
+	TRequestStatus status2(KRequestPending);
+	sync1.iStatus1=&status1;
+	sync1.iStatus2=&status2;
+	sync1.iCaller.Duplicate(RThread(),EOwnerProcess);
+	_LIT(KThread1Name,"Thread1");
+	TInt err=thread1.Create(KThread1Name,Thread1Function,KDefaultStackSize,NULL,&sync1);
+	CleanupClosePushL(thread1);
+
+	if(err==KErrNone)
+		{
+		thread1.Resume();
+		User::WaitForRequest(status1);
+		}
+	//Thread just kicked off will have run to User::After(10000000); by the time we get to here
+	//We've basically got 10 seconds from here to check that the record hasn't been committed, which sould be plenty long enough. 
+
+	dialInIspView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
+	User::LeaveIfError(dialInIspView->GotoFirstRecord());
+	
+	HBufC* retrievedString = dialInIspView->ReadLongTextLC(TPtrC(ISP_LOGIN_SCRIPT));
+
+	if(*retrievedString!=_L("Original"))
+		User::Leave(KErrGeneral);
+	
+	CleanupStack::PopAndDestroy();	//retrievedString
+	retrievedString=NULL;
+	CleanupStack::PopAndDestroy(dialInIspView);
+
+	User::WaitForRequest(status2);
+	User::LeaveIfError(status2.Int());	//status2.Int() is the value returned when PutRecordChanges is called by thread1.
+
+	//Might as well check that thread1s changes got through....
+	dialInIspView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
+	User::LeaveIfError(dialInIspView->GotoFirstRecord());
+	retrievedString= dialInIspView->ReadLongTextLC(TPtrC(ISP_LOGIN_SCRIPT));
+	err=KErrNone;
+	if(*retrievedString!=_L("Changed"))
+		err= KErrGeneral;
+	CleanupStack::PopAndDestroy();	//retrievedString
+	CleanupStack::PopAndDestroy(dialInIspView);
+	CleanupStack::PopAndDestroy();	//thread1
+	return err;
+	}
+	
+TVerdict CCommDbTest046_04::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///////////////////////////////////////////////////////////////////////////
+
+
+CCommDbTest046_05::CCommDbTest046_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_046_05"));
+	}
+
+CCommDbTest046_05::~CCommDbTest046_05()
+	{}
+
+TVerdict CCommDbTest046_05::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest046_05::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest046_05::Thread1Function(TAny* aPtr)
+	{
+	CTrapCleanup* cleanup=CTrapCleanup::New();
+	if (cleanup==NULL)
+		return(KErrNoMemory);
+
+	TRAPD(err, DoThread1TestL(aPtr));
+
+	delete cleanup;
+	return(err);
+	}
+
+void CCommDbTest046_05::DoThread1TestL(TAny* aPtr)
+	{
+	TInt ret;
+	TInt64 seed;
+	TThreadInfo* remoteThreadInfo = (TThreadInfo*) aPtr;
+
+	CCommsDatabase* cDb = CCommsDatabase::NewL();
+	CleanupStack::PushL(cDb);
+
+	for (TInt count=0; count < KTest04605Repeats; count++ )
+		{
+		PrintDebug(_L("DoThread1TestL() - 1. InsertTestRecords"));
+		InsertTestRecordsL(EFalse, 10 , *cDb);
+
+		
+		// Start a transaction, write 10 records, then rollback
+		RandomDelay(seed);
+		while(ret = cDb->BeginTransaction(), ret!=KErrNone)
+			{
+			PrintDebug(_L("DoThread1TestL() - 2. BeginTransaction failed"));
+			User::After(2000);
+			}
+		PrintDebug(_L("DoThread1TestL() - 2. BeginTransaction"));
+		TRequestStatus status1(KRequestPending);
+		cDb->RequestNotification(status1);
+		PrintDebug(_L("DoThread1TestL() - 3. InsertTestRecords"));
+		while(!InsertTestRecordsL(EFalse, 10 , *cDb))
+			{
+			// Error during record insertion, most likely the other thread beat
+			// us to it, Rollback and try again
+			PrintDebug(_L("DoThread1TestL() - Rolling back Transaction"));
+			cDb->RollbackTransaction();
+			User::WaitForRequest(status1);
+			status1 = KRequestPending;
+			RandomDelay(seed);
+			while(ret = cDb->BeginTransaction(), ret!=KErrNone)
+				{
+				PrintDebug(_L("DoThread1TestL() - Begin Transaction Again failed"));
+				User::After(2000);
+				}
+			PrintDebug(_L("DoThread1TestL() - Begin Transaction Again"));
+			cDb->RequestNotification(status1);
+			}
+		// 10 records inserted successfully, now rollback and wait for CommDb
+		PrintDebug(_L("DoThread1TestL() - 4. Rollback"));
+		cDb->RollbackTransaction();
+		PrintDebug(_L("DoThread1TestL() - 5. WaitForRequest"));
+		User::WaitForRequest(status1);
+
+		
+		
+		//Start a transaction, write 10 records, delete them, then rollback
+		RandomDelay(seed);
+		while(ret = cDb->BeginTransaction(), ret!=KErrNone)
+			{
+			PrintDebug(_L("DoThread1TestL() - 6. BeginTransaction failed"));
+			User::After(2000);
+			}
+		PrintDebug(_L("DoThread1TestL() - 6. BeginTransaction"));
+		TRequestStatus status2(KRequestPending);
+		cDb->RequestNotification(status2);
+		PrintDebug(_L("DoThread1TestL() - 7. InsertTestRecords"));
+		while(!InsertTestRecordsL( EFalse, 10 , *cDb))
+			{
+			// Error during record insertion, most likely the other thread beat
+			// us to it, Rollback and try again
+			PrintDebug(_L("DoThread1TestL() - Rolling back Transaction"));
+			cDb->RollbackTransaction();
+			User::WaitForRequest(status2);
+			status2 = KRequestPending;
+			RandomDelay(seed);
+			while(ret = cDb->BeginTransaction(), ret!=KErrNone)
+				{
+				PrintDebug(_L("DoThread1TestL() - Begin Transaction Again failed"));
+				User::After(2000);
+				}
+			PrintDebug(_L("DoThread1TestL() - Begin Transaction Again"));
+			cDb->RequestNotification(status2);
+			}
+		// 10 records inserted successfully, now delete them, rollback and wait for commdb
+		DeleteLastRecordsL(EFalse, 10, *cDb );
+		PrintDebug(_L("DoThread1TestL() - 8. Rollback"));
+		cDb->RollbackTransaction();
+		PrintDebug(_L("DoThread1TestL() - 9. WaitForRequest"));
+		User::WaitForRequest(status2);
+
+		
+		//Start a transaction, write 10 records and commit them
+		RandomDelay(seed);
+		while(ret = cDb->BeginTransaction(), ret!=KErrNone)
+			{
+			PrintDebug(_L("DoThread1TestL() - 10. BeginTransaction failed"));
+			User::After(2000);
+			}
+		PrintDebug(_L("DoThread1TestL() -10. BeginTransaction"));
+		TRequestStatus status3(KRequestPending);
+		cDb->RequestNotification(status3);
+		PrintDebug(_L("DoThread1TestL() -11. InsertRecords"));
+		while(!InsertTestRecordsL(EFalse, 10 , *cDb))
+			{
+			// Error during record insertion, most likely the other thread beat
+			// us to it, Rollback and try again
+			PrintDebug(_L("DoThread1TestL() - Rolling back Transaction"));
+			cDb->RollbackTransaction();
+			User::WaitForRequest(status3);
+			status3 = KRequestPending;
+			RandomDelay(seed);
+			while(ret = cDb->BeginTransaction(), ret!=KErrNone)
+				{
+				PrintDebug(_L("DoThread1TestL() - Begin Transaction Again failed"));
+				User::After(2000);
+				}
+			PrintDebug(_L("DoThread1TestL() - Begin Transaction Again"));
+			cDb->RequestNotification(status3);
+			}
+		// Commit the 10 records, wait for CommDb
+		PrintDebug(_L("DoThread1TestL() -12. Commit"));
+		User::LeaveIfError(cDb->CommitTransaction());
+		PrintDebug(_L("DoThread1TestL() -13. WaitForRequest"));
+		User::WaitForRequest(status3);
+
+		// Give the other thread a chance
+		PrintDebug(_L("DoThread1TestL() -14. User::After"));
+		RandomDelay(seed);
+		}
+	
+	CleanupStack::PopAndDestroy(cDb);
+	PrintDebug(_L("DoThread1TestL() RequestComplete"));
+	remoteThreadInfo->iCaller.RequestComplete(remoteThreadInfo->iStatus1, KErrNone);
+
+	}
+
+TInt CCommDbTest046_05::executeStepL()
+	{
+	TInt ret;
+	
+	//Start off the first thread, this will run until it has done all but PutRecordChanges is called on the transaction.
+	RThread thread1;
+	TInt64 seed;
+	TThreadInfo sync1;
+	TRequestStatus remoteThreadStatus(KRequestPending);
+	sync1.iStatus1=&remoteThreadStatus;
+	sync1.iCaller.Duplicate(RThread(),EOwnerProcess);
+	_LIT(KThread1Name,"Thread1");
+	User::LeaveIfError(thread1.Create(KThread1Name,Thread1Function,KDefaultStackSize,NULL,&sync1));
+	CleanupClosePushL(thread1);
+
+	thread1.Resume();
+	for (TInt count=0; count < KTest04605Repeats; count++ )
+		{
+		PrintDebug(_L("ExecuteStepL() - 1. InsertTestRecords"));
+		InsertTestRecordsL(ETrue, 10, *iTheDb );
+		
+		//Start a transaction, write 10 records, then rollback
+		RandomDelay(seed);
+		while(ret = iTheDb->BeginTransaction(), ret!=KErrNone)
+			{
+			PrintDebug(_L("ExecuteStepL() - 2. BeginTransaction failed"));
+			User::After(2000);
+			}
+		PrintDebug(_L("ExecuteStepL() - 2. BeginTransaction"));
+		TRequestStatus status1(KRequestPending);
+		iTheDb->RequestNotification(status1);
+		PrintDebug(_L("ExecuteStepL() - 3. InsertTestRecords"));
+		while(!InsertTestRecordsL(ETrue, 10 , *iTheDb))
+			{
+			// Error during record insertion, most likely the other thread beat
+			// us to it, Rollback and try again
+			PrintDebug(_L("ExecuteStepL() - Rolling back Transaction"));
+			iTheDb->RollbackTransaction();
+			User::WaitForRequest(status1);
+			status1 = KRequestPending;
+			RandomDelay(seed);
+			while(ret = iTheDb->BeginTransaction(), ret!=KErrNone)
+				{
+				PrintDebug(_L("ExecuteStepL()  - Begin Transaction Again failed"));
+				User::After(2000);
+				}
+			PrintDebug(_L("ExecuteStepL()   - Begin Transaction Again"));
+			iTheDb->RequestNotification(status1);
+			}
+		// 10 records written, now rollback and wait for commdb
+		PrintDebug(_L("ExecuteStepL() - 4. Rollback"));
+		iTheDb->RollbackTransaction();
+		PrintDebug(_L("ExecuteStepL() - 5. WaitForRequest"));
+		User::WaitForRequest(status1);
+
+
+		
+		//Start a transaction, write 10 records, delete them, then rollback
+		RandomDelay(seed);
+		while(ret = iTheDb->BeginTransaction(), ret!=KErrNone)
+			{
+			PrintDebug(_L("ExecuteStepL() - 6. BeginTransaction failed"));
+			User::After(2000);
+			}
+		PrintDebug(_L("ExecuteStepL() - 6. BeginTransaction"));
+		TRequestStatus status2(KRequestPending);
+		iTheDb->RequestNotification(status2);
+		PrintDebug(_L("ExecuteStepL() - 7. InsertTestRecordsL"));
+		while(!InsertTestRecordsL(ETrue, 10 , *iTheDb))
+			{
+			// Error during record insertion, most likely the other thread beat
+			// us to it, Rollback and try again
+			PrintDebug(_L("ExecuteStepL() - Rolling back Transaction"));
+			iTheDb->RollbackTransaction();
+			User::WaitForRequest(status2);
+			status2 = KRequestPending;
+			RandomDelay(seed);
+			while(ret = iTheDb->BeginTransaction(), ret!=KErrNone)
+				{
+				PrintDebug(_L("ExecuteStepL()  - Begin Transaction Again failed"));
+				User::After(2000);
+				}
+			PrintDebug(_L("ExecuteStepL()   - Begin Transaction Again"));
+			iTheDb->RequestNotification(status2);
+			}
+		// 10 records written successfully, now delete them, rollback and wait for commmdb
+		PrintDebug(_L("ExecuteStepL() - 8. DeleteTestRecordsL"));
+		DeleteLastRecordsL(ETrue, 10, *iTheDb);
+		PrintDebug(_L("ExecuteStepL() - 9. Rollback"));
+		iTheDb->RollbackTransaction();
+		PrintDebug(_L("ExecuteStepL() -10. WaitForRequest"));
+		User::WaitForRequest(status2);
+
+
+		
+		//Start a transaction, write 10 records and commit them
+		RandomDelay(seed);
+		while(ret = iTheDb->BeginTransaction(), ret!=KErrNone)
+			{
+			PrintDebug(_L("ExecuteStepL() - 11. BeginTransaction failed"));
+			User::After(2000);
+			}
+		PrintDebug(_L("ExecuteStepL() -11. BeginTransaction"));
+		TRequestStatus status3(KRequestPending);
+		iTheDb->RequestNotification(status3);
+		PrintDebug(_L("ExecuteStepL() -12. InsertTestRecords"));
+		while(!InsertTestRecordsL( ETrue,10 , *iTheDb))
+			{
+			// Error during record insertion, most likely the other thread beat
+			// us to it, Rollback and try again
+			PrintDebug(_L("ExecuteStepL() - Rolling back Transaction"));
+			iTheDb->RollbackTransaction();
+			User::WaitForRequest(status3);
+			status3 = KRequestPending;
+			RandomDelay(seed);
+			while(ret = iTheDb->BeginTransaction(), ret!=KErrNone)
+				{
+				PrintDebug(_L("ExecuteStepL()  - Begin Transaction Again failed"));
+				User::After(2000);
+				}
+			PrintDebug(_L("ExecuteStepL()   - Begin Transaction Again"));
+			iTheDb->RequestNotification(status3);
+			}
+		PrintDebug(_L("ExecuteStepL() -13. Commit"));
+		User::LeaveIfError(iTheDb->CommitTransaction());
+		PrintDebug(_L("ExecuteStepL() -14. WaitForRequest"));
+		User::WaitForRequest(status3);
+		
+
+		// Give the other thread a chance to do stuff
+		PrintDebug(_L("ExecuteStepL() -15. User::After"));
+		RandomDelay(seed);
+		}
+
+	PrintDebug(_L("ExecuteStepL() - Wait For Remote Thread"));
+	User::WaitForRequest(remoteThreadStatus);
+	CleanupStack::PopAndDestroy();	//thread1
+	PrintDebug(_L("ExecuteStepL() - Exiting"));
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest046_05::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TBool CCommDbTest046_05::InsertTestRecordsL( TBool aCallerIsMainThread, TUint aQuantity, CCommsDatabase& aDb )
+	{
+	TUint32 id;
+	CCommsDbTableView* dbView = aDb.OpenTableLC( TPtrC(DIAL_OUT_ISP) );
+	for(TUint count=0; count < aQuantity; count++ )
+		{
+		while(dbView->InsertRecord( id )!= KErrNone)
+			{
+			if(aCallerIsMainThread)
+				PrintDebug(_L("ExecuteStepL()    Insert Record failed..."));
+			else PrintDebug(_L("DoThread1TestL() Insert Record failed..."));
+			CleanupStack::PopAndDestroy(dbView);
+			return EFalse;
+			}
+		dbView->WriteTextL(TPtrC(COMMDB_NAME),_L("My Service Test Record"));
+		dbView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+		dbView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
+		dbView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
+//		dbView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
+		dbView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
+		dbView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+		dbView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+		dbView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+		User::LeaveIfError(dbView->PutRecordChanges());
+		if(aCallerIsMainThread)
+			PrintDebug(_L("ExecuteStepL()    InsertingRecord..."));
+		else PrintDebug(_L("DoThread1TestL() InsertingRecord..."));
+
+	// Allow the other thread to do things between each record insertion
+	User::After(5000);	
+	}
+
+	CleanupStack::PopAndDestroy(dbView);
+	return ETrue;
+	}
+
+void CCommDbTest046_05::DeleteLastRecordsL( TBool aCallerIsMainThread, TUint aQuantity, CCommsDatabase& aDb)
+	{
+	TUint count;
+	TInt ret = KErrGeneral;
+	CCommsDbTableView* dbView;
+
+	dbView  = aDb.OpenTableLC( TPtrC(DIAL_OUT_ISP) );
+	CDBLEAVE( dbView->GotoFirstRecord(), KErrNone );
+
+	//Move to the end of the view
+	do
+	{
+		ret = dbView->GotoNextRecord();
+	}while ( ret != KErrNotFound );
+	
+	//Need to move the cursor back into the view
+	dbView->GotoPreviousRecord();
+
+	//Now delete the record and move back one
+	for ( count=0; count< aQuantity; count++)
+		{
+		// Allow the other thread to do things between each record deletion
+		User::After(5000);
+		User::LeaveIfError(dbView->DeleteRecord());
+		User::LeaveIfError( dbView->GotoPreviousRecord());
+		if(aCallerIsMainThread)
+			PrintDebug(_L("ExecuteStepL()    Record Deleted..."));
+		else PrintDebug(_L("DoThread1TestL() Record Deleted..."));
+
+		}
+
+	CleanupStack::PopAndDestroy(dbView);
+	}
+
+void CCommDbTest046_05::RandomDelay(TInt64 &aSeed)
+	{
+	// Random delay for between 0-1 seconds
+	// Gives a thread a chance to access the database while the other 
+	// thread is still sleeping
+
+	// If this delay is made excessively large, the test is pointeless, 
+	// the two threads will just take turns to do things with the database
+
+	// If the delay is too short both threads will hammer CommDb simulataneously and 
+	// they will effectively deadlock, neither getting the chance to complete anything
+
+	
+	TInt32 delay;
+	TReal rnd = Math::FRand(aSeed);
+	rnd*=1000000;
+	delay=(TInt32) rnd;
+	User::After(delay);
+	}
+
+void CCommDbTest046_05::PrintDebug(TPtrC )//aString)
+	{
+	// Uncomment this line to see whats going on in the debug trace
+	//RDebug::Print(aString);
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_047_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,488 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 046.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbstore.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_047_xx.h"
+#include <e32math.h>
+
+
+/////////////////////
+//	Test step 0047.001
+/////////////////////
+
+// constructor
+CCommDbTest047_01::CCommDbTest047_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_047_01"));
+	}
+
+// destructor
+CCommDbTest047_01::~CCommDbTest047_01()
+	{
+	}
+
+
+TVerdict CCommDbTest047_01::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TBool CCommDbTest047_01::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial,EDatabaseTypeIAP);
+	return KErrNone;
+	}
+
+TVerdict CCommDbTest047_01::doTestStepL( )
+	{
+	TRAPD(ret,executeStepL());
+	if(ret==KErrNone)
+		{
+         SetTestStepResult(EPass);		return TestStepResult();	//If we've got this far we've passed
+		}
+	else
+		{
+         SetTestStepResult(EFail);		return TestStepResult();
+		}
+	}
+
+TVerdict CCommDbTest047_01::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 0047.02
+/////////////////////
+
+// constructor
+CCommDbTest047_02::CCommDbTest047_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_047_02"));
+	}
+
+// destructor
+CCommDbTest047_02::~CCommDbTest047_02()
+	{
+	}
+
+
+TVerdict CCommDbTest047_02::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TBool CCommDbTest047_02::executeStepL()
+	{
+	CCommsDatabase::NewL(EDatabaseTypeIAP);
+	return KErrNone; 
+	} //lint !e550
+
+TVerdict CCommDbTest047_02::doTestStepL( )
+	{
+	TRAPD(ret,executeStepL());
+	if(ret==KErrNone)
+		{
+         SetTestStepResult(EPass);		return TestStepResult();	//If we've got this far we've passed
+		}
+	else
+		{
+         SetTestStepResult(EFail);		return TestStepResult();
+		}
+	}
+
+TVerdict CCommDbTest047_02::doTestStepPostambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 0047.03
+/////////////////////
+
+// constructor
+CCommDbTest047_03::CCommDbTest047_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_047_03"));
+	}
+
+// destructor
+CCommDbTest047_03::~CCommDbTest047_03()
+	{
+	}
+
+
+TVerdict CCommDbTest047_03::doTestStepPreambleL()
+	{	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TBool CCommDbTest047_03::executeStepL()
+	{
+	CStoreableOverrideSettings::NewL(CStoreableOverrideSettings::EParamListPartial,EDatabaseTypeIAP);
+	return KErrNone;
+	} //lint !e550
+
+TVerdict CCommDbTest047_03::doTestStepL( )
+	{
+	TRAPD(ret,executeStepL());
+	if(ret==KErrNone)
+		{
+         SetTestStepResult(EPass);		return TestStepResult();	//If we've got this far we've passed
+		}
+	else
+		{
+         SetTestStepResult(EFail);		return TestStepResult();
+		}
+	}
+
+TVerdict CCommDbTest047_03::doTestStepPostambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 0047.04
+/////////////////////
+
+// constructor
+CCommDbTest047_04::CCommDbTest047_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_047_04"));
+	}
+
+// destructor
+CCommDbTest047_04::~CCommDbTest047_04()
+	{
+	}
+
+
+TVerdict CCommDbTest047_04::doTestStepPreambleL()
+	{	
+	iTheDb=CCommsDatabase::NewL();
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TBool CCommDbTest047_04::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIspConnectionPref pref1;
+
+	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
+	return KErrNone;
+	}
+
+TVerdict CCommDbTest047_04::doTestStepL( )
+	{
+	TRAPD(ret,executeStepL());
+	if(ret==KErrNotSupported)
+		{
+         SetTestStepResult(EPass);		return TestStepResult();	//If we've got this far we've passed
+		}
+	else
+		{
+         SetTestStepResult(EFail);		return TestStepResult();
+		}
+	}
+
+TVerdict CCommDbTest047_04::doTestStepPostambleL()
+	{
+	delete iPrefView;
+	iPrefView = NULL;
+	delete iTheDb;
+	iTheDb=NULL;
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 0047.05
+/////////////////////
+
+// constructor
+CCommDbTest047_05::CCommDbTest047_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_047_05"));
+	}
+
+// destructor
+CCommDbTest047_05::~CCommDbTest047_05()
+	{
+	}
+
+
+TVerdict CCommDbTest047_05::doTestStepPreambleL()
+	{	
+	iTheDb=CCommsDatabase::NewL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TBool CCommDbTest047_05::executeStepL()
+	{
+	CCommDbOverrideSettings* overSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(overSet);
+
+	CCommsDbConnectionPrefTableView::TCommDbIspConnectionPref tempIspPref;
+
+	User::LeaveIfError(overSet->GetConnectionPreferenceOverride(tempIspPref));
+	CleanupStack::PopAndDestroy(overSet);
+	return KErrNone;
+	}
+
+TVerdict CCommDbTest047_05::doTestStepL( )
+	{
+	TRAPD(ret,executeStepL());
+	if(ret==KErrNotSupported)
+		{
+         SetTestStepResult(EPass);		return TestStepResult();	//If we've got this far we've passed
+		}
+	else
+		{
+         SetTestStepResult(EFail);		return TestStepResult();
+		}
+	}
+
+TVerdict CCommDbTest047_05::doTestStepPostambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 0047.06
+/////////////////////
+CCommDbTest047_06::CCommDbTest047_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_047_06"));
+	}
+
+CCommDbTest047_06::~CCommDbTest047_06()
+	{}
+
+TVerdict CCommDbTest047_06::doTestStepL( void )
+	{
+	TRAPD(ret,executeStepL());
+	if(ret==KErrNotSupported)
+		{
+         SetTestStepResult(EPass);		return TestStepResult();	//If we've got this far we've passed
+		}
+	else
+		{
+         SetTestStepResult(EFail);		return TestStepResult();
+		}
+	}
+
+TVerdict CCommDbTest047_06::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest047_06::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIspConnectionPref pref;
+	iPrefView->ReadConnectionPreferenceL(pref);
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest047_06::doTestStepPostambleL()
+	{
+	delete iPrefView;
+	iPrefView = NULL;
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 0047.07
+/////////////////////
+
+// constructor
+CCommDbTest047_07::CCommDbTest047_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_047_07"));
+	}
+
+// destructor
+CCommDbTest047_07::~CCommDbTest047_07()
+	{
+	}
+
+
+TVerdict CCommDbTest047_07::doTestStepPreambleL()
+	{	
+	iTheDb=CCommsDatabase::NewL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TBool CCommDbTest047_07::executeStepL()
+	{
+	CCommDbOverrideSettings* overSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(overSet);
+
+	CCommsDbConnectionPrefTableView::TCommDbIspConnectionPref tempIspPref;
+
+	User::LeaveIfError(overSet->SetConnectionPreferenceOverride(tempIspPref));
+	CleanupStack::PopAndDestroy(overSet);
+	return KErrNone;
+	}
+
+TVerdict CCommDbTest047_07::doTestStepL( )
+	{
+	TRAPD(ret,executeStepL());
+	if(ret==KErrNotSupported)
+		{
+         SetTestStepResult(EPass);		return TestStepResult();	//If we've got this far we've passed
+		}
+	else
+		{
+         SetTestStepResult(EFail);		return TestStepResult();
+		}
+	}
+
+TVerdict CCommDbTest047_07::doTestStepPostambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 0047.08
+/////////////////////
+CCommDbTest047_08::CCommDbTest047_08()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_047_08"));
+	}
+
+CCommDbTest047_08::~CCommDbTest047_08()
+	{}
+
+TVerdict CCommDbTest047_08::doTestStepL( void )
+	{
+	TRAPD(ret,executeStepL());
+	if(ret==KErrNotSupported)
+		{
+         SetTestStepResult(EPass);		return TestStepResult();	//If we've got this far we've passed
+		}
+	else
+		{
+         SetTestStepResult(EFail);		return TestStepResult();
+		}
+	}
+
+TVerdict CCommDbTest047_08::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+	iPrefView = iTheDb->OpenConnectionPrefTableLC();
+	CleanupStack::Pop();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest047_08::executeStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIspConnectionPref pref;
+	iPrefView->UpdateBearerL(pref.iBearer);
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest047_08::doTestStepPostambleL()
+	{
+	delete iPrefView;
+	iPrefView = NULL;
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 0047.13
+/////////////////////
+
+// constructor
+CCommDbTest047_13::CCommDbTest047_13()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_047_13"));
+	}
+
+// destructor
+CCommDbTest047_13::~CCommDbTest047_13()
+	{
+	}
+
+
+TVerdict CCommDbTest047_13::doTestStepPreambleL()
+	{	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TBool CCommDbTest047_13::executeStepL()
+	{
+	TCommDbOpeningMethod openingMethod(ECommDbCreated);
+	CCommsDatabase::NewL(EDatabaseTypeISP,openingMethod);
+	return KErrNone;
+	} //lint !e550
+
+TVerdict CCommDbTest047_13::doTestStepL( )
+	{
+	TRAPD(ret,executeStepL());
+	if(ret==KErrNone)
+		{
+         SetTestStepResult(EPass);		return TestStepResult();	//If we've got this far we've passed
+		}
+	else
+		{
+         SetTestStepResult(EFail);		return TestStepResult();
+		}
+	}
+
+TVerdict CCommDbTest047_13::doTestStepPostambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_061_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,378 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 061.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbstore.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "etelmm.h"
+#include "Step_061_xx.h"
+#include <e32math.h>
+
+CCommsDbTableView *CCommDbTest061_xx::OpenIspTable(CCommsDatabase* aDb, TInt &aNoOfRows, TInt aExpectedCount)
+{
+	char OK = 1;
+	TInt ErrCode = KErrGeneral;
+
+	CCommsDbTableView *TableView = NULL;
+	
+	TRAP(ErrCode, TableView = aDb->OpenTableLC( TPtrC(DIAL_OUT_ISP) ); CleanupStack::Pop(TableView););
+
+	if(ErrCode != KErrNone)
+		{
+		INFO_PRINTF2(_L("CCommDbTest061_xx::OpenIspTable : aDb->OpenTableLC LEFT with %d"),ErrCode);
+		return(NULL);
+		}
+	   
+	aNoOfRows = 0;
+	char DropOut = 0;
+	while(!DropOut)
+	{
+		if(aNoOfRows == 0)
+			ErrCode = TableView->GotoFirstRecord(); 
+		else
+			ErrCode = TableView->GotoNextRecord(); 
+		DropOut = (ErrCode != KErrNone);
+		if(ErrCode == KErrNone)
+			++aNoOfRows;
+	}
+
+	OK = (ErrCode == KErrNotFound); // should be the last value returned.
+	if(OK)
+		OK = (aNoOfRows == aExpectedCount);
+	if(OK)
+	{
+		INFO_PRINTF1(_L("Found expected number of table entries "));
+		return(TableView);
+	}
+	INFO_PRINTF2(_L("CCommDbTest061_xx::OpenIspTable : function failed with OK = %d"),OK);
+	return(NULL);
+}
+
+/////////////////////
+//	Test step 061.01
+/////////////////////
+
+// constructor
+CCommDbTest061_01::CCommDbTest061_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_061_01"));
+	}
+
+// destructor
+CCommDbTest061_01::~CCommDbTest061_01()
+	{
+	}
+
+
+TVerdict CCommDbTest061_01::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest061_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TInt RowCount;
+
+	// Values tested
+	TInt EnumArray[] = {
+		RMobileCall::EProtocolUnspecified, // first two are different ways of saying unspecified
+		RMobileCall::EProtocolUnspecified,
+		RMobileCall::EProtocolV22bis,
+		RMobileCall::EProtocolV32,
+		RMobileCall::EProtocolV34,
+		RMobileCall::EProtocolV110,
+		RMobileCall::EProtocolV120,
+		RMobileCall::EProtocolX31FlagStuffing,
+		RMobileCall::EProtocolPIAFS,
+		RMobileCall::EProtocolBitTransparent,
+		RMobileCall::EProtocolPstnMultimediaVoiceFallback,
+		RMobileCall::EProtocolPstnMultimedia,
+		RMobileCall::EProtocolIsdnMultimedia
+					};
+
+	iTheView = OpenIspTable(iTheDb, RowCount, (sizeof(EnumArray)/sizeof(TInt)));
+
+	char OK = (iTheView != NULL);
+
+	if(OK)
+	{
+		for(TInt i = 0; (i < RowCount) && OK; ++i)
+		{
+			TUint32 BearerProtocol;
+			if(i == 0)
+				iTheView->GotoFirstRecord(); 
+			else
+				iTheView->GotoNextRecord(); 
+			iTheView->ReadUintL(TPtrC(ISP_BEARER_PROTOCOL), BearerProtocol);
+			OK = (BearerProtocol == (TUint)EnumArray[i]);
+		}
+	}
+
+	ret = (OK ? KErrNone : KErrGeneral);
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest061_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 061.01 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 061.02
+/////////////////////
+
+// constructor
+CCommDbTest061_02::CCommDbTest061_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_061_02"));
+	}
+
+// destructor
+CCommDbTest061_02::~CCommDbTest061_02()
+	{
+	}
+
+
+TVerdict CCommDbTest061_02::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest061_02::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TInt RowCount;
+
+	// Values tested
+	TInt EnumArray[] = {
+		RMobileCall::KCapsDataCircuitAsynchronous,
+		RMobileCall::KCapsDataCircuitAsynchronousRDI,
+		RMobileCall::KCapsDataCircuitSynchronous,
+		RMobileCall::KCapsDataCircuitSynchronousRDI,
+		RMobileCall::KCapsPADAsyncUDI,
+		RMobileCall::KCapsPADAsyncRDI,
+		RMobileCall::KCapsPacketAccessSyncUDI,
+		RMobileCall::KCapsPacketAccessSyncRDI,
+		RMobileCall::KCapsServiceExtended
+					};
+
+	iTheView = OpenIspTable(iTheDb, RowCount, (sizeof(EnumArray)/sizeof(TInt)));
+
+	char OK = (iTheView != NULL);
+
+	if(OK)
+	{
+		for(TInt i = 0; (i < RowCount) && OK; ++i)
+		{
+			TUint32 BearerName;
+			if(i == 0)
+				iTheView->GotoFirstRecord(); 
+			else
+				iTheView->GotoNextRecord(); 
+			iTheView->ReadUintL(TPtrC(ISP_BEARER_NAME), BearerName);
+			OK = (BearerName == (TUint)EnumArray[i]);
+		}
+	}
+
+	ret = (OK ? KErrNone : KErrGeneral);
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest061_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 061.02 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 061.03
+/////////////////////
+
+// constructor
+CCommDbTest061_03::CCommDbTest061_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_061_03"));
+	}
+
+// destructor
+CCommDbTest061_03::~CCommDbTest061_03()
+	{
+	}
+
+
+TVerdict CCommDbTest061_03::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest061_03::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TInt RowCount;
+
+	// Values tested
+	TInt EnumArray[] = {
+		RMobileCall::ESpeedUnspecified,
+		RMobileCall::ESpeedAutobauding,
+		RMobileCall::ESpeed2400,
+		RMobileCall::ESpeed4800,
+		RMobileCall::ESpeed9600,
+		RMobileCall::ESpeed14400,
+		RMobileCall::ESpeed19200,
+		RMobileCall::ESpeed28800,
+		RMobileCall::ESpeed32000,
+		RMobileCall::ESpeed33600,
+		RMobileCall::ESpeed38400,
+		RMobileCall::ESpeed43200,
+		RMobileCall::ESpeed48000,
+		RMobileCall::ESpeed56000,
+		RMobileCall::ESpeed57600,
+		RMobileCall::ESpeed64000
+					};
+
+	iTheView = OpenIspTable(iTheDb, RowCount, (sizeof(EnumArray)/sizeof(TInt)));
+
+	char OK = (iTheView != NULL);
+
+	if(OK)
+	{
+		for(TInt i = 0; (i < RowCount) && OK; ++i)
+		{
+			TUint32 BearerSpeed;
+			if(i == 0)
+				iTheView->GotoFirstRecord(); 
+			else
+				iTheView->GotoNextRecord(); 
+			iTheView->ReadUintL(TPtrC(ISP_BEARER_SPEED), BearerSpeed);
+			OK = (BearerSpeed == (TUint)EnumArray[i]);
+		}
+	}
+
+	ret = (OK ? KErrNone : KErrGeneral);
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest061_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 061.03 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 061.04
+/////////////////////
+
+// constructor
+CCommDbTest061_04::CCommDbTest061_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_061_04"));
+	}
+
+// destructor
+CCommDbTest061_04::~CCommDbTest061_04()
+	{
+	}
+
+
+TVerdict CCommDbTest061_04::doTestStepPreambleL()
+	{	
+	openDbL();
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest061_04::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TInt RowCount;
+
+	// Values tested (see RMobileCall::TMobileCallDataQoS, etelmm.h)
+	TInt EnumArray[] = {
+		RMobileCall::EQoSUnspecified,
+		RMobileCall::EQoSTransparent,
+		RMobileCall::EQoSNonTransparent,
+		RMobileCall::EQosTransparentPreferred,
+		RMobileCall::EQosNonTransparentPreferred
+					};
+
+	iTheView = OpenIspTable(iTheDb, RowCount, (sizeof(EnumArray)/sizeof(TInt)));
+
+	char OK = (iTheView != NULL);
+
+	if(OK)
+	{
+		for(TInt i = 0; (i < RowCount) && OK; ++i)
+		{
+			TUint32 BearerCE;
+			if(i == 0)
+				iTheView->GotoFirstRecord(); 
+			else
+				iTheView->GotoNextRecord(); 
+			iTheView->ReadUintL(TPtrC(ISP_BEARER_CE), BearerCE);
+			OK = (BearerCE == (TUint)EnumArray[i]);
+		}
+	}
+
+	ret = (OK ? KErrNone : KErrGeneral);
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest061_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 061.04 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_062_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,327 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 062.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbtemp.h>
+#include <cdbover.h>
+
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "Step_062_xx.h"
+
+/////////////////////
+//	Test step 062.01
+/////////////////////
+
+// constructor
+CCommDbTest062_01::CCommDbTest062_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_062_01"));
+	}
+
+// destructor
+CCommDbTest062_01::~CCommDbTest062_01()
+	{
+	}
+
+TVerdict CCommDbTest062_01::doTestStepPreambleL()
+	{	
+	openDbAndViewL(_L("Modem"));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest062_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	TUint32 id;
+
+	
+	//Insert a new record, 
+
+	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
+	
+	_LIT(KModem,"US Robotics Sportster");
+	_LIT(KTsy,"HAYES");
+	_LIT8(KModemInitString,"AT&F1");
+	_LIT8(KModemFaxInitString,"AT&d2");
+	//Write some sample data into the table
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KModem);
+	iTheView->WriteTextL(TPtrC(MODEM_NIF_NAME),_L("PPP"));
+	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
+	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
+	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
+	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
+	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
+	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
+	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
+	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
+	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
+	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
+	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
+	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
+
+	//Insert the record and destroy the view
+	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+	
+	delete iTheView;
+	iTheView = 0;
+
+	//Open a view and make a change to the record just written
+	iTheView = iTheDb->OpenViewMatchingTextLC( _L("Modem"), TPtrC(COMMDB_NAME), KModem);
+	CleanupStack::Pop();
+
+	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
+	CDBLEAVE( iTheView->UpdateRecord(), KErrNone );
+	_LIT(KModem2,"Another US Robotics Sportster");
+	iTheView->WriteTextL(TPtrC(COMMDB_NAME), KModem2 );
+	
+	//Cancel the changes made and destroy the view
+	iTheView->CancelRecordChanges();
+
+	delete iTheView;
+	iTheView = 0;
+
+	//Open a view to check that the record was not modified
+	iTheView = iTheDb->OpenViewMatchingTextLC( _L("Modem"), TPtrC(COMMDB_NAME), KModem);
+	CleanupStack::Pop();
+
+	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
+
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest062_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 062.01 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 062.02
+/////////////////////
+
+// constructor
+CCommDbTest062_02::CCommDbTest062_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_062_02"));
+	}
+
+// destructor
+CCommDbTest062_02::~CCommDbTest062_02()
+	{
+	}
+
+TVerdict CCommDbTest062_02::doTestStepPreambleL()
+	{	
+	openDbL();
+//	TInt ret = copyTestDatabase( EDatabase_1 );
+//	if(ret != KErrNone) // can't check this at the moment because copyTestDatabase returns 
+//	   User::Leave(ret);// KErrGeneral when it passes!!
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+
+TInt CCommDbTest062_02::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	CCommsDbTableView* table = NULL;
+
+	// Not much to this - in fact it's the specific case raised in the defect report
+	// INC027976 which describes the BC break due to chenging the name of the Modem table 
+	// to ModemBearer
+	
+	__UHEAP_MARK;
+	table = iTheDb->OpenViewLC(_L("Modem"),_L("select * from Modem where Hidden=0")); 
+	CleanupStack::Pop();
+
+	if(table != NULL)
+	{
+		ret = KErrNone;
+		delete table;
+		table = 0;
+	}
+
+	__UHEAP_MARKEND;
+	return ret;
+	}
+
+
+
+TVerdict CCommDbTest062_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 062.02 called "));
+
+	TRAPD(ret, executeStepL());
+	if( ret == KErrNotSupported )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+
+// Test step 03 is the same as 37_01, except that the literal string 'Modem'
+// is used to verify that template handling is BC.
+
+
+
+CCommDbTest062_03::CCommDbTest062_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_062_03"));
+	}
+
+CCommDbTest062_03::~CCommDbTest062_03()
+	{}
+
+TVerdict CCommDbTest062_03::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest062_03::doTestStepPreambleL()
+	{
+	iTheDb=CCommsDatabase::NewL();
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest062_03::executeStepL()
+	{
+	//alter something in the template
+	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, _L("Modem"));
+	CleanupStack::PushL(templateRecord);
+	
+	User::LeaveIfError(templateRecord->Modify());
+	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
+	TBufC8<KCommsDbSvrMaxFieldLength> firstInputString = _L8("first string");
+
+	templateRecord->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING), firstInputString);
+	User::LeaveIfError(templateRecord->StoreModifications());
+	//Now start to overwrite initial change, but don't commit, cancel instead.
+	User::LeaveIfError(templateRecord->Modify());
+
+	TBufC8<KCommsDbSvrMaxFieldLength> secondInputString = _L8("second string");
+	templateRecord->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING), secondInputString);
+	templateRecord->CancelModifications();
+
+	TBuf8<KCommsDbSvrMaxFieldLength> retrievedString;
+	templateRecord->ReadTextL(TPtrC(MODEM_FAX_INIT_STRING), retrievedString);
+	CleanupStack::PopAndDestroy(templateRecord);
+
+	if(retrievedString!=firstInputString)
+		return KErrGeneral;
+	
+	return KErrNone;
+	}
+	
+TVerdict CCommDbTest062_03::doTestStepPostambleL()
+	{
+	delete iTheDb;
+	iTheDb=NULL;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+// Test steps 04 & 05 are the same as 41_13 & 41_14, except that the literal string
+// 'Modem' is used to access the table to verify that the override handling is BC.
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest062_04::CCommDbTest062_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_062_04"));
+	}
+
+CCommDbTest062_04::~CCommDbTest062_04()
+	{}
+
+TVerdict CCommDbTest062_04::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNone)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest062_04::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest062_04::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	TBuf<KCommsDbSvrMaxFieldLength> temp(_L("There's no place like home"));
+	return iOverSet->SetDesOverride(_L("Modem"), TPtrC(MODEM_TSY_NAME), temp);
+	}
+
+TVerdict CCommDbTest062_04::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+CCommDbTest062_05::CCommDbTest062_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_062_05"));
+	}
+
+CCommDbTest062_05::~CCommDbTest062_05()
+	{}
+
+TVerdict CCommDbTest062_05::doTestStepL( void )
+	{
+	if(executeStepL()!=KErrNotSupported)
+         SetTestStepResult(EFail);        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest062_05::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest062_05::executeStepL()
+	{
+	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	
+	return iOverSet->SetIntOverride(_L("Modem"), TPtrC(MODEM_STOP_BITS), 10);
+	}
+
+TVerdict CCommDbTest062_05::doTestStepPostambleL()
+	{
+	delete iOverSet;
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Step_064_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,190 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 0064.XX
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+
+
+// Test system includes
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+#include "Teststepcommdb.h"
+#include "Step_064_xx.h"
+
+#include <commsdattypeinfov1_1.h>
+#include <commsdattypesv1_1.h>
+#include <commsdat_partner.h>
+
+
+// table name
+_LIT(KCDTypeNameTestTable, "Test");
+
+#define	KCDTypeNameBinaryFieldTest		      _S("BinaryTest")
+
+// record type id
+const TMDBElementId KCDTIdTestRecord         = 0x5F800000;
+// field type ids
+const TMDBElementId KCDTIdTestBinaryField    = 0x00150000;
+
+
+static const SGenericRecordTypeInfo TestGenRecordInfoBinary[] =
+    {
+	MDB_GENERIC_TYPE_INFO(KCDTIdRecordTag,	     	EUint32,    ENoAttrs,   KCDTypeNameRecordTag),
+    MDB_GENERIC_TYPE_INFO(KCDTIdRecordName,	     	EText,	    ENotNull,   KCDTypeNameRecordName),
+	MDB_GENERIC_TYPE_INFO(KCDTIdTestBinaryField,	EDesC8,  	ENoAttrs,   KCDTypeNameBinaryFieldTest),
+    MDB_GENERIC_TYPE_INFO(0, 0, ENoAttrs, KCDNull) 
+    };
+
+
+
+NONSHARABLE_CLASS(CCDTestBinaryRecord) : public CCDRecordBase
+	{
+public :
+
+	// Constructor
+    CCDTestBinaryRecord(TMDBElementId aElementId)
+        : CCDRecordBase(aElementId), 
+          iBinaryField((aElementId & KCDMaskShowRecordType) | KCDTIdTestBinaryField),
+          iRecordTag((aElementId & KCDMaskShowRecordType) | KCDTIdRecordTag),
+          iRecordName((aElementId & KCDMaskShowRecordType) | KCDTIdRecordName)
+        {}
+        
+    const SRecordTypeInfo* GetRecordInfo(){return iRecordInfo;}    
+
+	DATA_VTABLE
+
+public :
+
+	CMDBField<TDesC8>	iBinaryField;
+	CMDBField<TInt>	 	iRecordTag;  
+	CMDBField<TDesC> 	iRecordName;   
+	
+private:
+    
+		static const SRecordTypeInfo iRecordInfo[];	
+	};
+	
+
+	
+	
+const SRecordTypeInfo CCDTestBinaryRecord::iRecordInfo[]=
+  	{
+		{ KCDTIdRecordTag,	        EInt,		ENoAttrs,   KCDTypeNameRecordTag },
+  		{ KCDTIdRecordName,     	EText,		ENotNull,   KCDTypeNameRecordName },
+		{ KCDTIdTestBinaryField,	EDesC8,		ENotNull,   KCDTypeNameBinaryFieldTest },
+  		{ 0, 0, ENoAttrs, KCDNull }
+  	};	
+
+
+START_ATTRIBUTE_TABLE(CCDTestBinaryRecord, KCDTIdTestRecord,  KCDTIdTestRecord )
+	X_REGISTER_ATTRIBUTE(CCDTestBinaryRecord,   iBinaryField, TMDBBin)
+	X_REGISTER_ATTRIBUTE(CCDTestBinaryRecord,   iRecordTag,    TMDBNum )
+	X_REGISTER_ATTRIBUTE(CCDTestBinaryRecord,   iRecordName,   TMDBText )
+END_ATTRIBUTE_TABLE()
+
+
+_LIT8(KTestBinary, "a long binary string,a long binary string,a long binary string,a long binary string,a long binary string,a long binary string,a long binary string,end");
+
+
+
+
+
+/////////////////////
+//	Test step 064.001
+/////////////////////
+
+// constructor
+CCommDbTest064_01::CCommDbTest064_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_064_01"));
+	}
+
+// destructor
+CCommDbTest064_01::~CCommDbTest064_01()
+	{
+	}
+
+
+TInt CCommDbTest064_01::executeStepL()
+	{
+	TInt ret=KErrGeneral;
+	
+	//set up a generic record with a binary field	
+	INFO_PRINTF1(_L("Creating  a user defined table"));
+
+	CMDBSession *cmdbSession = CMDBSession::NewL(KCDVersion1_1);
+
+	CleanupStack::PushL(cmdbSession); 
+
+	CMDBGenericRecord* testRecord = static_cast<CMDBGenericRecord*>(CCDRecordBase::RecordFactoryL(KCDNewTableRequest));
+	CleanupStack::PushL(testRecord); 
+    testRecord->InitializeL(KCDTypeNameTestTable(), TestGenRecordInfoBinary);	
+         
+	testRecord->StoreL(*cmdbSession);
+	CleanupStack::PopAndDestroy(testRecord);	
+	CleanupStack::PopAndDestroy(cmdbSession);
+	
+	
+	//now use commdbshim api to read and write to the binary field
+	CCommsDatabase*		theDb;
+	CCommsDbTableView*	theView;
+	TUint32 recordId;
+
+	//CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
+	theDb = CCommsDatabase::NewL();
+	theView = theDb->OpenTableLC( KCDTypeNameTestTable );
+	CleanupStack::Pop();
+	
+	TBuf8<KMaxLongTextLength> value(KTestBinary);
+	CDBLEAVE(theView->InsertRecord(recordId), KErrNone );
+	theView->WriteTextL(TPtrC(KCDTypeNameBinaryFieldTest), value );
+	CDBLEAVE(theView->PutRecordChanges(), KErrNone );
+	CDBLEAVE(theView->GotoFirstRecord(), KErrNone );
+
+	TBuf8<KMaxLongTextLength> value2;
+	theView->ReadTextL( TPtrC(KCDTypeNameBinaryFieldTest), value2 );
+
+ 	if( value2.Compare( value ) == 0)
+		{
+		ret = KErrNone;
+		}
+
+	delete theView;
+	delete theDb;
+
+	return ret;
+	}
+
+
+TVerdict CCommDbTest064_01::doTestStepL( )
+	{
+	SetTestStepResult(EFail);
+	
+	INFO_PRINTF1(_L("Step 064.01 called "));
+	if ( executeStepL() == KErrNone )
+		{
+		SetTestStepResult(EPass);
+		}
+		
+	return TestStepResult();
+	}
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/TE_commdbServer.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,1021 @@
+//
+// 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:
+//
+//
+//
+// This main DLL entry point for the TE_ConServer.dll
+
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "step_001_01.h"
+#include "step_002_01.h"
+#include "Step_003_xx.h"
+#include "step_004_xx.h"
+#include "step_005_xx.h"
+#include "step_006_xx.h"
+#include "Step_007_xx.h"
+#include "Step_008_xx.h"
+#include "Step_009_xx.h"
+#include "Step_010_xx.h"
+#include "Step_011_xx.h"
+#include "Step_012_xx.h"
+#include "Step_013_xx.h"
+#include "Step_014_xx.h"
+#include "Step_015_xx.h"
+#include "Step_016_xx.h"
+#include "Step_017_xx.h"
+#include "Step_018_xx.h"
+#include "Step_019_xx.h"
+#include "Step_020_xx.h"
+#include "Step_021_xx.h"
+#include "Step_022_xx.h"
+#include "Step_023_xx.h"
+#include "Step_024_xx.h"
+#include "Step_025_xx.h"
+#include "Step_026_xx.h"
+#include "Step_027_xx.h"
+#include "Step_028_xx.h"
+#include "Step_029_xx.h"
+#include "Step_030_xx.h"
+#include "Step_031_xx.h"
+#include "Step_032_xx.h"
+#include "Step_033_xx.h"
+#include "Step_034_xx.h"
+#include "Step_035_xx.h"
+#include "Step_036_xx.h"
+#include "Step_037_xx.h"
+#include "Step_038_xx.h"
+#include "Step_039_xx.h"
+#include "Step_040_xx.h"
+#include "Step_041_xx.h"
+#include "Step_042_xx.h"
+#include "Step_043_xx.h"
+#include "Step_044_xx.h"
+#include "Step_045_xx.h"
+#include "Step_046_xx.h"
+#include "Step_047_xx.h"
+#include "step_051_xx.h"
+#include "step_052_xx.h"
+#include "step_053_xx.h"
+#include "step_054_xx.h"
+#include "step_055_xx.h"
+#include "step_056_xx.h"
+#include "step_057_xx.h"
+#include "step_058_xx.h"
+#include "step_059_xx.h"
+#include "Step_061_xx.h"
+#include "Step_062_xx.h"
+#include "step_063_xx.h"
+#include "Step_064_xx.h"
+#include "CommDbPreCopy.h"
+
+
+EXPORT_C CTE_commdbServer* NewcommdbServer( void ) 
+//
+// NewTestSuitecommdbL is exported at ordinal 1
+// this provides the interface to allow schedule test
+// to create instances of this test suite
+//
+	{
+
+	return new(ELeave) CTE_commdbServer();
+    }
+
+	
+	
+// __EDIT_ME__ - Substitute the name of your test server 
+_LIT(KServerName,"te_commdb");
+// __EDIT_ME__ - Use your own server class name
+CTE_commdbServer* CTE_commdbServer::NewL()
+/**
+ * @return - Instance of the test server
+ * Called inside the MainL() function to create and start the
+ * CTestServer derived server.
+ */
+	{
+	// __EDIT_ME__ new your server class here
+	CTE_commdbServer * server = new (ELeave) CTE_commdbServer();
+	CleanupStack::PushL(server);
+	
+	// Either use a StartL or ConstructL, the latter will permit
+	// Server Logging.
+
+	//server->StartL(KServerName); 
+	server-> ConstructL(KServerName);
+	CleanupStack::Pop(server);
+	return server;
+	}
+
+// EKA2 much simpler
+// Just an E32Main and a MainL()
+LOCAL_C void MainL()
+/**
+ * Much simpler, uses the new Rendezvous() call to sync with the client
+ */
+	{
+	// Leave the hooks in for platform security
+#if (defined __DATA_CAGING__)
+	RProcess().DataCaging(RProcess::EDataCagingOn);
+	RProcess().SecureApi(RProcess::ESecureApiOn);
+#endif
+	CActiveScheduler* sched=NULL;
+	sched=new(ELeave) CActiveScheduler;
+	CActiveScheduler::Install(sched);
+	// __EDIT_ME__ Your server name
+	CTE_commdbServer* server = NULL;
+	// Create the CTestServer derived server
+	// __EDIT_ME__ Your server name
+	TRAPD(err,server = CTE_commdbServer::NewL());
+	if(!err)
+		{
+		// Sync with the client and enter the active scheduler
+		RProcess::Rendezvous(KErrNone);
+		sched->Start();
+		}
+	delete server;
+	delete sched;
+	}
+
+// Only a DLL on emulator for typhoon and earlier
+
+GLDEF_C TInt E32Main()
+/**
+ * @return - Standard Epoc error code on exit
+ */
+	{
+	CTrapCleanup* cleanup = CTrapCleanup::New();
+	if(cleanup == NULL)
+		{
+		return KErrNoMemory;
+		}
+	TRAP_IGNORE(MainL());
+	delete cleanup;
+	return KErrNone;
+    }
+
+// Create a thread in the calling process
+// Emulator typhoon and earlier
+
+// __EDIT_ME__ - Use your own server class name
+CTestStep* CTE_commdbServer::CreateTestStep(const TDesC& aStepName)
+/**
+ * @return - A CTestStep derived instance
+ * Implementation of CTestServer pure virtual
+ */
+	{
+		
+	// Ensure that the properties get created; normally the RootServer does this
+	CommsDat::CMDBSession* ptrCommsdatSession = NULL;
+	TRAPD(result, ptrCommsdatSession = CommsDat::CMDBSession::NewL(CommsDat::CMDBSession::LatestVersion()));
+	if (result == KErrNone)
+		{
+		result = ptrCommsdatSession->PublishProperties();
+		delete ptrCommsdatSession;
+		}
+		
+	CTestStep* testStep = NULL;
+	// __EDIT_ME__ - Create your own test steps here
+	// This server creates just one step but create as many as you want
+	// They are created "just in time" when the worker thread is created
+	
+	
+	if(aStepName.Compare(_L("step_001_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest001_01;
+	else if(aStepName.Compare(_L("step_001_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest001_03;
+	else if(aStepName.Compare(_L("step_001_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest001_04;
+	else if(aStepName.Compare(_L("step_001_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest001_05;
+	else if(aStepName.Compare(_L("step_001_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest001_07;
+	else if(aStepName.Compare(_L("step_001_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest001_08;	
+	else if(aStepName.Compare(_L("step_001_09")) == 0 )
+		testStep = new(ELeave) CCommDbTest001_09;
+	else if(aStepName.Compare(_L("step_001_10")) == 0 )
+		testStep = new(ELeave) CCommDbTest001_10;
+	else if(aStepName.Compare(_L("step_002_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest002_01;
+	else if(aStepName.Compare(_L("step_003_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest003_01;
+	else if(aStepName.Compare(_L("step_003_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest003_02;
+	else if(aStepName.Compare(_L("step_003_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest003_03;
+	else if(aStepName.Compare(_L("step_003_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest003_04;
+	else if(aStepName.Compare(_L("step_003_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest003_05;
+	else if(aStepName.Compare(_L("step_003_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest003_06;
+	else if(aStepName.Compare(_L("step_003_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest003_07;
+	else if(aStepName.Compare(_L("step_003_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest003_08;
+	else if(aStepName.Compare(_L("step_004_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest004_01;
+	else if(aStepName.Compare(_L("step_004_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest004_01;
+	else if(aStepName.Compare(_L("step_004_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest004_02;
+	else if(aStepName.Compare(_L("step_004_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest004_03;	
+	else if(aStepName.Compare(_L("step_004_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest004_04;
+	else if(aStepName.Compare(_L("step_004_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest004_05;
+	else if(aStepName.Compare(_L("step_004_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest004_06;
+	else if(aStepName.Compare(_L("step_005_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest005_01;
+	else if(aStepName.Compare(_L("step_005_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest005_02;
+	else if(aStepName.Compare(_L("step_005_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest005_03;	
+	else if(aStepName.Compare(_L("step_005_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest005_04;
+	else if(aStepName.Compare(_L("step_006_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest006_01;
+	else if(aStepName.Compare(_L("step_006_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest006_02;
+	else if(aStepName.Compare(_L("step_006_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest006_03;	
+	else if(aStepName.Compare(_L("step_006_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest006_04;
+	else if(aStepName.Compare(_L("step_006_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest006_05;
+	else if(aStepName.Compare(_L("step_007_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_01;
+	else if(aStepName.Compare(_L("step_007_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_02;
+	else if(aStepName.Compare(_L("step_007_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_03;	
+	else if(aStepName.Compare(_L("step_007_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_04;
+	else if(aStepName.Compare(_L("step_007_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_05;
+	else if(aStepName.Compare(_L("step_007_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_06;
+	else if(aStepName.Compare(_L("step_007_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_07;
+	else if(aStepName.Compare(_L("step_007_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_08;	
+	else if(aStepName.Compare(_L("step_007_09")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_09;
+	else if(aStepName.Compare(_L("step_007_10")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_10;
+	else if(aStepName.Compare(_L("step_007_11")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_11;
+	else if(aStepName.Compare(_L("step_007_12")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_12;	
+	else if(aStepName.Compare(_L("step_007_14")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_14;
+	else if(aStepName.Compare(_L("step_007_15")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_15;
+	else if(aStepName.Compare(_L("step_007_16")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_16;
+	else if(aStepName.Compare(_L("step_007_17")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_17;
+	else if(aStepName.Compare(_L("step_007_18")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_18;	
+	else if(aStepName.Compare(_L("step_007_19")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_19;
+	else if(aStepName.Compare(_L("step_007_20")) == 0 )
+		testStep = new(ELeave) CCommDbTest007_20;
+	else if(aStepName.Compare(_L("step_008_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest008_01;
+	else if(aStepName.Compare(_L("step_008_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest008_02;
+	else if(aStepName.Compare(_L("step_008_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest008_03;	
+	else if(aStepName.Compare(_L("step_008_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest008_04;
+	else if(aStepName.Compare(_L("step_009_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_01;
+	else if(aStepName.Compare(_L("step_009_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_02;
+	else if(aStepName.Compare(_L("step_009_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_03;	
+	else if(aStepName.Compare(_L("step_009_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_04;
+	else if(aStepName.Compare(_L("step_009_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_05;
+	else if(aStepName.Compare(_L("step_009_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_06;
+	else if(aStepName.Compare(_L("step_009_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_07;
+	else if(aStepName.Compare(_L("step_009_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_08;	
+	else if(aStepName.Compare(_L("step_009_09")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_09;
+	else if(aStepName.Compare(_L("step_009_10")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_10;
+	else if(aStepName.Compare(_L("step_009_11")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_11;
+	else if(aStepName.Compare(_L("step_009_12")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_12;	
+	else if(aStepName.Compare(_L("step_009_13")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_13;
+	else if(aStepName.Compare(_L("step_009_14")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_14;
+	else if(aStepName.Compare(_L("step_009_15")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_15;
+	else if(aStepName.Compare(_L("step_009_16")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_16;
+	else if(aStepName.Compare(_L("step_009_17")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_17;
+	else if(aStepName.Compare(_L("step_009_18")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_18;	
+	else if(aStepName.Compare(_L("step_009_19")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_19;
+	else if(aStepName.Compare(_L("step_009_20")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_20;
+	else if(aStepName.Compare(_L("step_009_21")) == 0 )
+		testStep = new(ELeave) CCommDbTest009_21;
+	else if(aStepName.Compare(_L("step_010_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest010_01;
+	else if(aStepName.Compare(_L("step_010_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest010_02;
+	else if(aStepName.Compare(_L("step_010_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest010_03;	
+	else if(aStepName.Compare(_L("step_010_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest010_04;
+	else if(aStepName.Compare(_L("step_010_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest010_05;
+	else if(aStepName.Compare(_L("step_011_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest011_01;
+	else if(aStepName.Compare(_L("step_011_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest011_02;
+	else if(aStepName.Compare(_L("step_011_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest011_03;	
+	else if(aStepName.Compare(_L("step_011_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest011_04;
+	else if(aStepName.Compare(_L("step_012_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest012_01;
+	else if(aStepName.Compare(_L("step_012_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest012_02;
+	else if(aStepName.Compare(_L("step_012_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest012_03;	
+	else if(aStepName.Compare(_L("step_012_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest012_04;
+	else if(aStepName.Compare(_L("step_012_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest012_05;
+	else if(aStepName.Compare(_L("step_012_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest012_06;
+	else if(aStepName.Compare(_L("step_012_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest012_07;
+	else if(aStepName.Compare(_L("step_013_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest013_01;
+	else if(aStepName.Compare(_L("step_013_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest013_02;
+	else if(aStepName.Compare(_L("step_013_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest013_03;	
+	else if(aStepName.Compare(_L("step_013_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest013_04;
+	else if(aStepName.Compare(_L("step_014_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest014_01;
+	else if(aStepName.Compare(_L("step_014_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest014_02;
+	else if(aStepName.Compare(_L("step_014_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest014_03;	
+	else if(aStepName.Compare(_L("step_014_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest014_04;
+	else if(aStepName.Compare(_L("step_015_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest015_01;
+	else if(aStepName.Compare(_L("step_015_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest015_02;
+	else if(aStepName.Compare(_L("step_015_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest015_03;	
+	else if(aStepName.Compare(_L("step_015_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest015_04;
+	else if(aStepName.Compare(_L("step_015_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest015_05;
+	else if(aStepName.Compare(_L("step_015_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest015_06;
+	else if(aStepName.Compare(_L("step_015_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest015_07;
+	else if(aStepName.Compare(_L("step_015_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest015_08;
+	else if(aStepName.Compare(_L("step_015_09")) == 0 )
+		testStep = new(ELeave) CCommDbTest015_09;
+	else if(aStepName.Compare(_L("step_015_10")) == 0 )
+		testStep = new(ELeave) CCommDbTest015_10;
+	else if(aStepName.Compare(_L("step_015_11")) == 0 )
+		testStep = new(ELeave) CCommDbTest015_11;
+	else if(aStepName.Compare(_L("step_015_12")) == 0 )
+		testStep = new(ELeave) CCommDbTest015_12;
+	else if(aStepName.Compare(_L("step_015_13")) == 0 )
+		testStep = new(ELeave) CCommDbTest015_13;	
+	else if(aStepName.Compare(_L("step_015_14")) == 0 )
+		testStep = new(ELeave) CCommDbTest015_14;
+	else if(aStepName.Compare(_L("step_015_15")) == 0 )
+		testStep = new(ELeave) CCommDbTest015_15;
+	else if(aStepName.Compare(_L("step_015_16")) == 0 )
+		testStep = new(ELeave) CCommDbTest015_16;
+	else if(aStepName.Compare(_L("step_016_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest016_01;
+	else if(aStepName.Compare(_L("step_016_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest016_02;
+	else if(aStepName.Compare(_L("step_016_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest016_04;
+	else if(aStepName.Compare(_L("step_016_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest016_05;
+	else if(aStepName.Compare(_L("step_016_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest016_07;
+	else if(aStepName.Compare(_L("step_016_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest016_08;
+	else if(aStepName.Compare(_L("step_016_09")) == 0 )
+		testStep = new(ELeave) CCommDbTest016_09;
+	else if(aStepName.Compare(_L("step_017_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest017_01;
+	else if(aStepName.Compare(_L("step_017_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest017_02;
+	else if(aStepName.Compare(_L("step_017_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest017_03;	
+	else if(aStepName.Compare(_L("step_017_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest017_04;
+	else if(aStepName.Compare(_L("step_017_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest017_05;
+	else if(aStepName.Compare(_L("step_017_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest017_06;
+	else if(aStepName.Compare(_L("step_017_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest017_07;
+	else if(aStepName.Compare(_L("step_018_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest018_01;
+	else if(aStepName.Compare(_L("step_018_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest018_02;
+	else if(aStepName.Compare(_L("step_018_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest018_03;	
+	else if(aStepName.Compare(_L("step_018_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest018_04;
+	else if(aStepName.Compare(_L("step_018_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest018_05;
+	else if(aStepName.Compare(_L("step_018_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest018_06;
+	else if(aStepName.Compare(_L("step_018_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest018_07;
+	else if(aStepName.Compare(_L("step_018_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest018_08;
+	else if(aStepName.Compare(_L("step_019_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest019_01;
+	else if(aStepName.Compare(_L("step_019_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest019_02;
+	else if(aStepName.Compare(_L("step_019_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest019_03;	
+	else if(aStepName.Compare(_L("step_019_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest019_04;
+	else if(aStepName.Compare(_L("step_019_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest019_05;
+	else if(aStepName.Compare(_L("step_019_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest019_06;
+	else if(aStepName.Compare(_L("step_019_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest019_07;
+	else if(aStepName.Compare(_L("step_019_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest019_08;
+	else if(aStepName.Compare(_L("step_019_09")) == 0 )
+		testStep = new(ELeave) CCommDbTest019_09;
+	else if(aStepName.Compare(_L("step_019_10")) == 0 )
+		testStep = new(ELeave) CCommDbTest019_10;
+	else if(aStepName.Compare(_L("step_019_11")) == 0 )
+		testStep = new(ELeave) CCommDbTest019_11;
+	else if(aStepName.Compare(_L("step_019_12")) == 0 )
+		testStep = new(ELeave) CCommDbTest019_12;
+	else if(aStepName.Compare(_L("step_019_13")) == 0 )
+		testStep = new(ELeave) CCommDbTest019_13;	
+	else if(aStepName.Compare(_L("step_019_14")) == 0 )
+		testStep = new(ELeave) CCommDbTest019_14;
+	else if(aStepName.Compare(_L("step_020_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest020_01;
+	else if(aStepName.Compare(_L("step_020_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest020_02;
+	else if(aStepName.Compare(_L("step_020_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest020_03;	
+	else if(aStepName.Compare(_L("step_020_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest020_04;
+	else if(aStepName.Compare(_L("step_020_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest020_05;
+	else if(aStepName.Compare(_L("step_020_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest020_06;
+	else if(aStepName.Compare(_L("step_020_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest020_07;
+	else if(aStepName.Compare(_L("step_020_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest020_08;
+	else if(aStepName.Compare(_L("step_021_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest021_01;
+	else if(aStepName.Compare(_L("step_021_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest021_02;
+	else if(aStepName.Compare(_L("step_021_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest021_03;	
+	else if(aStepName.Compare(_L("step_021_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest021_04;
+	else if(aStepName.Compare(_L("step_021_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest021_05;
+	else if(aStepName.Compare(_L("step_022_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_01;
+	else if(aStepName.Compare(_L("step_022_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_02;
+	else if(aStepName.Compare(_L("step_022_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_03;	
+	else if(aStepName.Compare(_L("step_022_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_04;
+	else if(aStepName.Compare(_L("step_022_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_05;
+	else if(aStepName.Compare(_L("step_022_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_06;
+	else if(aStepName.Compare(_L("step_022_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_07;
+	else if(aStepName.Compare(_L("step_022_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_08;
+	else if(aStepName.Compare(_L("step_022_09")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_09;
+	else if(aStepName.Compare(_L("step_022_10")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_10;
+	else if(aStepName.Compare(_L("step_022_11")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_11;
+	else if(aStepName.Compare(_L("step_022_12")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_12;
+	else if(aStepName.Compare(_L("step_022_13")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_13;	
+	else if(aStepName.Compare(_L("step_022_14")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_14;
+	else if(aStepName.Compare(_L("step_022_16")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_16;
+	else if(aStepName.Compare(_L("step_022_17")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_17;
+	else if(aStepName.Compare(_L("step_022_18")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_18;
+	else if(aStepName.Compare(_L("step_022_19")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_19;
+	else if(aStepName.Compare(_L("step_022_20")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_20;
+	else if(aStepName.Compare(_L("step_022_21")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_21;
+	else if(aStepName.Compare(_L("step_022_22")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_22;
+	else if(aStepName.Compare(_L("step_022_23")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_23;	
+	else if(aStepName.Compare(_L("step_022_24")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_24;
+	else if(aStepName.Compare(_L("step_022_25")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_25;
+	else if(aStepName.Compare(_L("step_022_26")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_26;
+	else if(aStepName.Compare(_L("step_022_27")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_27;
+	else if(aStepName.Compare(_L("step_022_28")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_28;
+	else if(aStepName.Compare(_L("step_022_29")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_29;
+	else if(aStepName.Compare(_L("step_022_30")) == 0 )
+		testStep = new(ELeave) CCommDbTest022_30;
+	else if(aStepName.Compare(_L("step_023_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest023_01;
+	else if(aStepName.Compare(_L("step_023_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest023_02;
+	else if(aStepName.Compare(_L("step_023_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest023_03;
+	else if(aStepName.Compare(_L("step_023_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest023_04;
+	else if(aStepName.Compare(_L("step_023_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest023_05;
+	else if(aStepName.Compare(_L("step_023_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest023_06;
+	else if(aStepName.Compare(_L("step_024_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest024_01;
+	else if(aStepName.Compare(_L("step_024_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest024_02;
+	else if(aStepName.Compare(_L("step_024_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest024_03;
+	else if(aStepName.Compare(_L("step_024_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest024_04;
+	else if(aStepName.Compare(_L("step_024_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest024_05;
+	else if(aStepName.Compare(_L("step_024_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest024_06;
+	else if(aStepName.Compare(_L("step_024_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest024_07;
+	else if(aStepName.Compare(_L("step_024_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest024_08;
+	else if(aStepName.Compare(_L("step_024_09")) == 0 )
+		testStep = new(ELeave) CCommDbTest024_09;
+	else if(aStepName.Compare(_L("step_025_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest025_01;
+	else if(aStepName.Compare(_L("step_025_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest025_02;
+	else if(aStepName.Compare(_L("step_026_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest026_01;
+	else if(aStepName.Compare(_L("step_026_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest026_02;
+	else if(aStepName.Compare(_L("step_026_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest026_03;
+	else if(aStepName.Compare(_L("step_026_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest026_04;
+	else if(aStepName.Compare(_L("step_026_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest026_05;
+	else if(aStepName.Compare(_L("step_026_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest026_06;
+	else if(aStepName.Compare(_L("step_026_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest026_07;
+	else if(aStepName.Compare(_L("step_026_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest026_08;
+	else if(aStepName.Compare(_L("step_026_09")) == 0 )
+		testStep = new(ELeave) CCommDbTest026_09;
+	else if(aStepName.Compare(_L("step_026_10")) == 0 )
+		testStep = new(ELeave) CCommDbTest026_10;
+	else if(aStepName.Compare(_L("step_026_11")) == 0 )
+		testStep = new(ELeave) CCommDbTest026_11;
+	else if(aStepName.Compare(_L("step_026_12")) == 0 )
+		testStep = new(ELeave) CCommDbTest026_12;
+	else if(aStepName.Compare(_L("step_026_13")) == 0 )
+		testStep = new(ELeave) CCommDbTest026_13;
+	else if(aStepName.Compare(_L("step_026_14")) == 0 )
+		testStep = new(ELeave) CCommDbTest026_14;
+	else if(aStepName.Compare(_L("step_026_15")) == 0 )
+		testStep = new(ELeave) CCommDbTest026_15;
+	else if(aStepName.Compare(_L("step_026_16")) == 0 )
+		testStep = new(ELeave) CCommDbTest026_16;
+	else if(aStepName.Compare(_L("step_027_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest027_01;
+	else if(aStepName.Compare(_L("step_027_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest027_02;
+	else if(aStepName.Compare(_L("step_028_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest028_01;
+	else if(aStepName.Compare(_L("step_028_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest028_02;
+	else if(aStepName.Compare(_L("step_028_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest028_03;
+	else if(aStepName.Compare(_L("step_028_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest028_04;
+	else if(aStepName.Compare(_L("step_028_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest028_05;
+	else if(aStepName.Compare(_L("step_028_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest028_06;
+	else if(aStepName.Compare(_L("step_028_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest028_07;
+	else if(aStepName.Compare(_L("step_029_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest029_01;
+	else if(aStepName.Compare(_L("step_029_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest029_02;
+	else if(aStepName.Compare(_L("step_029_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest029_03;
+	else if(aStepName.Compare(_L("step_029_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest029_04;
+	else if(aStepName.Compare(_L("step_030_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest030_01;
+	else if(aStepName.Compare(_L("step_030_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest030_02;
+	else if(aStepName.Compare(_L("step_030_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest030_03 ;
+	else if(aStepName.Compare(_L("step_031_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest031_01;
+	else if(aStepName.Compare(_L("step_031_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest031_02;
+	else if(aStepName.Compare(_L("step_031_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest031_03;
+	else if(aStepName.Compare(_L("step_031_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest031_04;
+	else if(aStepName.Compare(_L("step_031_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest031_05;
+	else if(aStepName.Compare(_L("step_032_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest032_01;
+	else if(aStepName.Compare(_L("step_032_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest032_02;
+	else if(aStepName.Compare(_L("step_032_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest032_03;
+	else if(aStepName.Compare(_L("step_032_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest032_04;
+	else if(aStepName.Compare(_L("step_032_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest032_05;
+	else if(aStepName.Compare(_L("step_033_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest033_01;
+	else if(aStepName.Compare(_L("step_033_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest033_02;
+	else if(aStepName.Compare(_L("step_033_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest033_03;
+	else if(aStepName.Compare(_L("step_033_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest033_04;
+	else if(aStepName.Compare(_L("step_033_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest033_05;
+	else if(aStepName.Compare(_L("step_033_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest033_06;
+	else if(aStepName.Compare(_L("step_033_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest033_07;
+	else if(aStepName.Compare(_L("step_033_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest033_08;
+	else if(aStepName.Compare(_L("step_033_09")) == 0 )
+		testStep = new(ELeave) CCommDbTest033_09;
+	else if(aStepName.Compare(_L("step_034_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest034_01;
+	else if(aStepName.Compare(_L("step_034_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest034_02;
+	else if(aStepName.Compare(_L("step_034_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest034_03;
+	else if(aStepName.Compare(_L("step_034_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest034_04;
+	else if(aStepName.Compare(_L("step_034_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest034_05;
+	else if(aStepName.Compare(_L("step_034_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest034_06;
+	else if(aStepName.Compare(_L("step_035_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest035_01;
+	else if(aStepName.Compare(_L("step_035_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest035_02;
+	else if(aStepName.Compare(_L("step_035_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest035_03;
+	else if(aStepName.Compare(_L("step_035_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest035_04;
+	else if(aStepName.Compare(_L("step_036_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_01;
+	else if(aStepName.Compare(_L("step_036_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_02;
+	else if(aStepName.Compare(_L("step_036_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_03;
+	else if(aStepName.Compare(_L("step_036_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_04;
+	else if(aStepName.Compare(_L("step_036_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_05;
+	else if(aStepName.Compare(_L("step_036_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_06;
+	else if(aStepName.Compare(_L("step_036_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_07;
+	else if(aStepName.Compare(_L("step_036_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_08;
+	else if(aStepName.Compare(_L("step_036_09")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_09;
+	else if(aStepName.Compare(_L("step_036_10")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_10;
+	else if(aStepName.Compare(_L("step_036_11")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_11;
+	else if(aStepName.Compare(_L("step_036_12")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_12;
+	else if(aStepName.Compare(_L("step_036_13")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_13;
+	else if(aStepName.Compare(_L("step_036_14")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_14;
+	else if(aStepName.Compare(_L("step_036_15")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_15;
+	else if(aStepName.Compare(_L("step_036_16")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_16;
+	else if(aStepName.Compare(_L("step_036_17")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_17;
+	else if(aStepName.Compare(_L("step_036_18")) == 0 )
+		testStep = new(ELeave) CCommDbTest036_18;
+	else if(aStepName.Compare(_L("step_037_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest037_01;
+	else if(aStepName.Compare(_L("step_037_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest037_02;
+	else if(aStepName.Compare(_L("step_037_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest037_03;
+	else if(aStepName.Compare(_L("step_038_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest038_01;
+	else if(aStepName.Compare(_L("step_038_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest038_02;
+	else if(aStepName.Compare(_L("step_038_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest038_03;
+	else if(aStepName.Compare(_L("step_039_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest039_01;
+	else if(aStepName.Compare(_L("step_039_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest039_02;
+	else if(aStepName.Compare(_L("step_040_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest040_01;
+	else if(aStepName.Compare(_L("step_040_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest040_02;
+	else if(aStepName.Compare(_L("step_040_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest040_03;
+	else if(aStepName.Compare(_L("step_041_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_01;
+	else if(aStepName.Compare(_L("step_041_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_02;
+	else if(aStepName.Compare(_L("step_041_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_03;
+	else if(aStepName.Compare(_L("step_041_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_04;
+	else if(aStepName.Compare(_L("step_041_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_05;
+	else if(aStepName.Compare(_L("step_041_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_06;
+	else if(aStepName.Compare(_L("step_041_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_07;
+	else if(aStepName.Compare(_L("step_041_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_08;
+	else if(aStepName.Compare(_L("step_041_09")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_09;
+	else if(aStepName.Compare(_L("step_041_10")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_10;
+	else if(aStepName.Compare(_L("step_041_11")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_11;
+	else if(aStepName.Compare(_L("step_041_12")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_12;
+	else if(aStepName.Compare(_L("step_041_13")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_13;
+	else if(aStepName.Compare(_L("step_041_14")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_14;
+	else if(aStepName.Compare(_L("step_041_15")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_15;
+	else if(aStepName.Compare(_L("step_041_16")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_16;
+	else if(aStepName.Compare(_L("step_041_17")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_17;
+	else if(aStepName.Compare(_L("step_041_18")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_18;
+	else if(aStepName.Compare(_L("step_041_19")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_19;
+	else if(aStepName.Compare(_L("step_041_20")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_20;
+	else if(aStepName.Compare(_L("step_041_21")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_21;
+	else if(aStepName.Compare(_L("step_041_22")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_22;
+	else if(aStepName.Compare(_L("step_041_23")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_23;
+	else if(aStepName.Compare(_L("step_041_24")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_24;
+	else if(aStepName.Compare(_L("step_041_25")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_25;
+	else if(aStepName.Compare(_L("step_041_26")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_26;
+	else if(aStepName.Compare(_L("step_041_27")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_27;
+	else if(aStepName.Compare(_L("step_041_28")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_28;
+	else if(aStepName.Compare(_L("step_041_29")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_29;
+	else if(aStepName.Compare(_L("step_041_30")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_30;
+	else if(aStepName.Compare(_L("step_041_31")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_31;
+	else if(aStepName.Compare(_L("step_041_32")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_32;
+	else if(aStepName.Compare(_L("step_041_33")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_33;
+	else if(aStepName.Compare(_L("step_041_34")) == 0 )
+		testStep = new(ELeave) CCommDbTest041_34;
+	else if(aStepName.Compare(_L("step_042_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest042_01;
+	else if(aStepName.Compare(_L("step_042_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest042_02;
+	else if(aStepName.Compare(_L("step_042_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest042_03;
+	else if(aStepName.Compare(_L("step_043_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest043_01;
+	else if(aStepName.Compare(_L("step_043_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest043_02;
+	else if(aStepName.Compare(_L("step_043_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest043_03;
+	else if(aStepName.Compare(_L("step_043_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest043_04;
+	else if(aStepName.Compare(_L("step_043_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest043_05;
+	else if(aStepName.Compare(_L("step_044_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest044_01;
+	else if(aStepName.Compare(_L("step_044_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest044_02;
+	else if(aStepName.Compare(_L("step_044_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest044_03;
+	else if(aStepName.Compare(_L("step_045_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest045_01;
+	else if(aStepName.Compare(_L("step_045_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest045_02;
+	else if(aStepName.Compare(_L("step_045_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest045_03;
+	else if(aStepName.Compare(_L("step_046_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest046_01;
+	else if(aStepName.Compare(_L("step_046_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest046_02;
+	else if(aStepName.Compare(_L("step_046_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest046_03;
+	else if(aStepName.Compare(_L("step_046_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest046_04;
+	else if(aStepName.Compare(_L("step_046_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest046_05;
+	else if(aStepName.Compare(_L("step_047_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest047_01;
+	else if(aStepName.Compare(_L("step_047_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest047_02;
+	else if(aStepName.Compare(_L("step_047_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest047_03;
+	else if(aStepName.Compare(_L("step_047_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest047_04;
+	else if(aStepName.Compare(_L("step_047_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest047_05;
+	else if(aStepName.Compare(_L("step_047_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest047_06;
+	else if(aStepName.Compare(_L("step_047_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest047_07;
+	else if(aStepName.Compare(_L("step_047_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest047_08;
+	else if(aStepName.Compare(_L("step_047_13")) == 0 )
+		testStep = new(ELeave) CCommDbTest047_13;
+	else if(aStepName.Compare(_L("step_051_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest051_01;
+	else if(aStepName.Compare(_L("step_051_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest051_02;
+	else if(aStepName.Compare(_L("step_052_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest052_01;
+	else if(aStepName.Compare(_L("step_052_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest052_02;
+	else if(aStepName.Compare(_L("step_053_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest053_01;
+	else if(aStepName.Compare(_L("step_053_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest053_02;
+	else if(aStepName.Compare(_L("step_054_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest054_01;
+	else if(aStepName.Compare(_L("step_054_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest054_02;
+	else if(aStepName.Compare(_L("step_055_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest055_01;
+	else if(aStepName.Compare(_L("step_055_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest055_02;
+	else if(aStepName.Compare(_L("step_056_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest056_01;
+	else if(aStepName.Compare(_L("step_056_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest056_02;
+	else if(aStepName.Compare(_L("step_057_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest057_01;
+	else if(aStepName.Compare(_L("step_057_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest057_02;
+	else if(aStepName.Compare(_L("step_058_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest058_01;
+	else if(aStepName.Compare(_L("step_058_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest058_02;
+	else if(aStepName.Compare(_L("step_059_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest059_01;
+	else if(aStepName.Compare(_L("step_060_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest060_01;
+	else if(aStepName.Compare(_L("step_060_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest060_02;
+	else if(aStepName.Compare(_L("step_061_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest061_01;
+	else if(aStepName.Compare(_L("step_061_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest061_02;
+	else if(aStepName.Compare(_L("step_061_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest061_03;
+	else if(aStepName.Compare(_L("step_061_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest061_04;
+	else if(aStepName.Compare(_L("step_062_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest062_01;
+	else if(aStepName.Compare(_L("step_062_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest062_02;
+	else if(aStepName.Compare(_L("step_062_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest062_03;
+	else if(aStepName.Compare(_L("step_062_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest062_04;
+	else if(aStepName.Compare(_L("step_062_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest062_05;
+	else if(aStepName.Compare(_L("step_063_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest063_01;
+	else if(aStepName.Compare(_L("step_063_02")) == 0 )
+		testStep = new(ELeave) CCommDbTest063_02;
+	else if(aStepName.Compare(_L("step_063_03")) == 0 )
+		testStep = new(ELeave) CCommDbTest063_03;
+	else if(aStepName.Compare(_L("step_063_04")) == 0 )
+		testStep = new(ELeave) CCommDbTest063_04;
+	else if(aStepName.Compare(_L("step_063_05")) == 0 )
+		testStep = new(ELeave) CCommDbTest063_05;
+	else if(aStepName.Compare(_L("step_063_06")) == 0 )
+		testStep = new(ELeave) CCommDbTest063_06;
+	else if(aStepName.Compare(_L("step_063_07")) == 0 )
+		testStep = new(ELeave) CCommDbTest063_07;
+	else if(aStepName.Compare(_L("step_063_08")) == 0 )
+		testStep = new(ELeave) CCommDbTest063_08;
+	else if(aStepName.Compare(_L("step_064_01")) == 0 )
+		testStep = new(ELeave) CCommDbTest064_01;
+	else if(aStepName.Compare(_L("PreCopyTest")) == 0 )
+		testStep = new(ELeave) CCommDbPreCopy;
+	
+	return testStep;
+	}
+
+
+
+// make a version string available for test system 
+TPtrC CTE_commdbServer::GetVersion( void )
+	{
+
+#ifdef _DEBUG
+_LIT(KTxtVersion,"1.0 (udeb)");
+#else
+_LIT(KTxtVersion,"1.0");
+#endif
+
+	return KTxtVersion();
+	}
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/Teststepcommdb.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,628 @@
+//
+// 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:
+//
+//
+//
+// This contains CTestCase which is the base class for all the TestCase DLLs
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <f32file.h>
+// Test system includes
+#include "comms-infras/commdb/protection/protectdb.h"
+#include "comms-infras/commdb/protection/protectcpdb.h"
+#include <cdbpreftable.h>
+#include "CDBSTD.H"
+#include "Teststepcommdb.h"
+
+
+// constructor
+CTestStepCommDb::CTestStepCommDb()
+	{
+	iRemoteObjects = EFalse;
+	}
+
+// destructor
+CTestStepCommDb::~CTestStepCommDb()
+	{
+	popAndDestroyDatabaseObjects();
+	}
+
+// file copy
+void CTestStepCommDb::copyFileL(const TDesC& anOld,const TDesC& aNew)
+	{
+	// create a fileserver
+	RFs fileSystem;
+
+	// connect to file server
+	User::LeaveIfError(fileSystem.Connect());
+	CleanupClosePushL(fileSystem);
+
+	// create a file manager
+	CFileMan * fileMan = CFileMan::NewL(fileSystem);
+	CleanupStack::PushL(fileMan);
+
+	// parse the filenames
+	TParse source;
+	User::LeaveIfError(source.Set(anOld, NULL, NULL));
+
+	// parse the filenames
+	TParse target;
+	User::LeaveIfError(target.Set(aNew, NULL, NULL));
+
+	// do the copy
+	User::LeaveIfError(fileMan->Copy(source.FullName(), target.FullName(), CFileMan::EOverWrite));
+
+	// make read/write
+	User::LeaveIfError(fileSystem.SetAtt(source.FullName(),NULL, KEntryAttReadOnly));
+
+	// clean up
+	CleanupStack::PopAndDestroy(fileMan);
+	CleanupStack::PopAndDestroy(&fileSystem);
+	}
+
+void CTestStepCommDb::deleteFileL(const TDesC& aFileName)
+	{
+	// create a fileserver
+	RFs  fileSystem;
+
+	User::LeaveIfError(fileSystem.Connect());
+	CleanupClosePushL(fileSystem);
+
+	INFO_PRINTF1(_L("Set file to read-write in order to delete"));
+
+	// Remove read only flag
+	TInt ret = fileSystem.SetAtt(aFileName, 0, KEntryAttReadOnly);
+	if (ret == KErrNotFound)
+		{
+		// If file already removed then no need to delete it
+		INFO_PRINTF1(_L("File not found"));
+		CleanupStack::PopAndDestroy(&fileSystem);
+		return;
+		}
+	User::LeaveIfError(ret);
+
+	// Delete file
+	User::LeaveIfError(fileSystem.Delete(aFileName));
+	INFO_PRINTF1(_L("deleted file"));
+
+	// clean up
+	CleanupStack::PopAndDestroy(&fileSystem);
+	}
+
+void CTestStepCommDb::DeleteCurrentDatabaseL()
+	{
+	RDbs rDbs;
+
+//	User::LeaveIfError(rDbs.Connect());
+	TInt ret(KErrNone);
+	ret = rDbs.Connect();
+	if(ret!=KErrNone)
+		{
+		INFO_PRINTF2(_L("CTestStepCommDb::DeleteCurrentDatabaseL : rDbs.Connect FAILED with %d"),ret );
+		User::Leave(ret);
+		}
+
+	CleanupClosePushL(rDbs);
+	TName commDb(KCDrive);
+	commDb.Append(KDbBaseName);
+	TUid KCommsDbFileUid = { 0x10004e1d };
+	// May need to make several
+	// attempts if it is transiently locked; report these and if
+	// not successful after a number of attempts report this and abort
+	TInt remainingTries = 5;
+//	TInt ret (KErrNone);
+	while(remainingTries-- > 0)
+		{
+		ret = rDbs.DeleteDatabase(commDb, KCommsDbFileUid);
+		if(ret == KErrNone || ret == KErrPathNotFound || ret == KErrNotFound)
+			{
+			ret = KErrNone;
+			break;
+			}
+		else
+			{
+			INFO_PRINTF4(_L("CTestStepCommDb::DeleteCurrentDatabaseL : rDbs.DeleteDatabase FAILED to delete %S %S with %d"),&KCDrive,&KDbBaseName,ret);
+			}
+		}
+	User::LeaveIfError(ret);
+	CleanupStack::PopAndDestroy(&rDbs);
+	}
+
+void CTestStepCommDb::CopyDatabaseL(const TDesC& aSource)
+	{
+	RFs fs;
+	User::LeaveIfError(fs.Connect());
+	CleanupClosePushL(fs);
+
+	RDbs rDbs;
+	User::LeaveIfError(rDbs.Connect());
+	CleanupClosePushL(rDbs);
+	const TUid KCommsDbFileUid = {0x10004e1d};
+
+	TInt remainingTries = 5;
+	TInt ret (KErrNone);
+	DeleteCurrentDatabaseL();
+	while(remainingTries-- > 0)
+		{
+		ret = rDbs.CopyDatabase(aSource, KDbFileName, KCommsDbFileUid);
+		if(ret == KErrNone || ret == KErrPathNotFound || ret == KErrNotFound)
+			{
+			break;
+			}
+		}
+	User::LeaveIfError(ret);
+	CleanupStack::PopAndDestroy(&rDbs);
+	CleanupStack::PopAndDestroy(&fs);
+	}
+
+
+TInt CTestStepCommDb::copyTestDatabase( TDatabaseNumber aDbNumber )
+	{
+	(void)aDbNumber;
+	return KErrNone;
+	}
+
+TInt CTestStepCommDb::copyDatabaseToDefault( TDatabaseNumber aDbNumber )
+	{
+	(void)aDbNumber;
+	return KErrNone;
+	}
+
+TBool CTestStepCommDb::openDbAndViewL( const TDesC16& aTable )
+	{
+	TBool created = EFalse;
+
+	//Only create Db and view objects if they're not already created
+	if ( ! iTheDb )
+		{
+		iTheDb=CCommsDatabase::NewL();
+		created = ETrue;
+		}
+
+	if ( !iTheView )
+		{
+		iTheView=iTheDb->OpenTableLC( aTable );
+		CleanupStack::Pop(); //no need to put it on the cleanup stack
+		}
+
+	return created;
+	}
+
+TVerdict CTestStepCommDb::doTestStepPostambleL()
+	{
+	if ( iTheView )
+		{
+		delete iTheView;
+		iTheView = 0;
+		}
+
+	if ( iTheDb )
+		{
+		delete iTheDb;
+		iTheDb = 0;
+		}
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+
+void CTestStepCommDb::popAndDestroyDatabaseObjects()
+	{
+		// doTestStepPostambleL();
+	}
+
+TBool CTestStepCommDb::openDbL()
+	{
+
+	TBool created = EFalse;
+
+	if ( !iTheDb )
+		{
+		//Only open the Db if its not already open
+		TRAPD(ret,iTheDb=CCommsDatabase::NewL());
+		if(ret!=KErrNone)
+			{
+			INFO_PRINTF2(_L("CTestStepCommDb::openDbL : CCommsDatabase::NewL LEFT with %d"),ret);
+			User::Leave(ret);
+			}
+		created = ETrue;
+		}
+	return created;
+
+	}
+
+void CTestStepCommDb::setRemoteDatabaseObjects( CCommsDatabase* aDb, CCommsDbTableView* aDbView )
+	{
+		if ( !iTheDb )
+			{
+			//make sure that no-one else has already set the objects
+			iTheDb = aDb;
+			iTheView = aDbView;
+			iRemoteObjects = ETrue;
+			}
+	}
+
+
+void CTestStepCommDb::clearRemoteDatabaseObjects()
+	{
+		if( iRemoteObjects )
+			{
+			//Only clear objects if they were previously set remotly
+			iTheDb = 0;
+			iTheView = 0;
+			}
+	}
+
+TInt CTestStepCommDb::executeStepL()
+	{
+		return KErrGeneral;
+	}
+
+
+TInt CTestStepCommDb::executeStep(CTestStepCommDb& aTestStep)
+	{
+	TInt r,ret= KErrNone;
+
+	TRAP( r, ret = aTestStep.executeStepL() );
+
+	if ( r != KErrNone )
+		ret = r;
+
+	return ret;
+	}
+
+TInt CTestStepCommDb::executeStep( )
+	{
+	TInt ret=0;
+
+	TRAPD( r, ret = executeStepL() );
+
+	if ( r != KErrNone )
+		ret = r;
+
+	return ret;
+	}
+
+//
+//This heap failure member function is used when a test step needs a Database and a View
+//object.
+//
+TInt CTestStepCommDb::doTestStepWithHeapFailureL( CTestStepCommDb& aTestStep, TInt aReturnValue)
+	{
+	TInt ret=0;
+
+	for (TInt i=1; i< KHeapFailure ; i++)
+		{
+		aTestStep.doTestStepPreambleL();
+
+		__UHEAP_FAILNEXT(i);
+
+		ret = aTestStep.executeStep();
+
+		__UHEAP_RESET;
+
+		aTestStep.doTestStepPostambleL();
+
+		if ( ret == KErrNoMemory )
+			{
+			//The heap failure has been trapped correctly
+			continue;
+			}
+		else if ( ret == aReturnValue )
+			{
+			//Test step normal behaviour
+			INFO_PRINTF4(_L("%S PASSED heap failure test, i = %d return code==%d"),
+				&aTestStep.TestStepName(), i, ret );
+
+			break;
+			}
+		else
+			{
+			// test step has not returned the exepected error value ( which was either KErrNoMemory or aReturnValue );
+			INFO_PRINTF5(_L("%S *FAILED* heap failure test, i=%d return code:%d expected:%d"),
+				&aTestStep.TestStepName(), i, ret, aReturnValue );
+			SetTestStepResult(EFail);			break;
+			}
+
+		}
+
+	return KErrNone;
+	}
+
+void CTestStepCommDb::CheckTableIsProtectedL(CCommsDbProtectTableView* aTable)
+	{
+
+	TESTL(iTheDb->BeginTransaction()==KErrNone);
+
+	if(aTable->GotoFirstRecord()==KErrNone)
+		{
+		// Check settings on Record
+		RDbRowSet::TAccess tableAccess = RDbRowSet::EUpdatable;
+		TInt ret = aTable->GetTableAccess(tableAccess);
+		TESTL(ret == KErrNone);
+		TESTL(tableAccess == RDbRowSet::EReadOnly);
+
+		// Test that first record cannot be updated
+		TRAP(ret,UpdateRecordL(aTable,KErrAccessDenied));
+		TESTL(ret == KErrNone);
+
+		// Test that cannot delete first record
+		TRAP(ret,DeleteRecordL(aTable,KErrAccessDenied));
+		TESTL(ret == KErrNone);
+
+		// Test that cannot insert new record
+		TRAP(ret,InsertRecordL(aTable,KErrAccessDenied));
+		TESTL(ret == KErrNone);
+
+		aTable->GotoFirstRecord();
+		}
+	TESTL(iTheDb->CommitTransaction()==KErrNone);
+	}
+
+
+void CTestStepCommDb::CheckTableIsProtectedL(CCommsDbProtectConnectPrefTableView* aTable)
+	{
+
+	TESTL(iTheDb->BeginTransaction()==KErrNone);
+	if(aTable->GotoFirstRecord()==KErrNone)
+		{
+		// Check settings on Record
+		RDbRowSet::TAccess tableAccess = RDbRowSet::EUpdatable;
+		TInt ret = aTable->GetTableAccess(tableAccess);
+		TESTL(ret == KErrNone);
+		TESTL(tableAccess == RDbRowSet::EReadOnly);
+
+		// Test that first record cannot be updated
+		TRAP(ret,UpdateRecordL(aTable,KErrAccessDenied));
+		TESTL(ret == KErrNone);
+
+		// Test that cannot delete first record
+		TRAP(ret,DeleteRecordL(aTable,KErrAccessDenied));
+		TESTL(ret == KErrNone);
+
+		// Test that cannot insert new record
+		TRAP(ret,InsertRecordL(aTable,KErrAccessDenied));
+		TESTL(ret == KErrNone);
+
+		aTable->GotoFirstRecord();
+		}
+	TESTL(iTheDb->CommitTransaction()==KErrNone);
+	}
+
+void CTestStepCommDb::CheckTableIsNotProtectedL(CCommsDbProtectTableView* aTable)
+	{
+	TESTL(iTheDb->BeginTransaction()==KErrNone);
+	if(aTable->GotoFirstRecord()==KErrNone)
+		{
+		// Check settings on Table
+		RDbRowSet::TAccess tableAccess = RDbRowSet::EReadOnly;
+		TInt ret = aTable->GetTableAccess(tableAccess);
+		TESTL(ret == KErrNone);
+		TESTL(tableAccess == RDbRowSet::EUpdatable);
+
+		// Test can update first record
+		TRAP(ret,UpdateRecordL(aTable,KErrNone));
+		TESTL(ret == KErrNone);
+
+		// Test that can delete record
+		TRAP(ret,DeleteRecordL(aTable,KErrNone));
+		TESTL(ret == KErrNone);
+
+		// Test that can insert new record
+		TRAP(ret,InsertRecordL(aTable,KErrNone));
+		TESTL(ret == KErrNone);
+
+		aTable->GotoFirstRecord();
+		}
+	TESTL(iTheDb->CommitTransaction()==KErrNone);
+	}
+
+void CTestStepCommDb::CheckTableIsNotProtectedL(CCommsDbProtectConnectPrefTableView* aTable)
+	{
+	TESTL(iTheDb->BeginTransaction()==KErrNone);
+	if(aTable->GotoFirstRecord()==KErrNone)
+		{
+		// Check settings on Table
+		RDbRowSet::TAccess tableAccess = RDbRowSet::EReadOnly;
+		TInt ret = aTable->GetTableAccess(tableAccess);
+		TESTL(ret == KErrNone);
+		TESTL(tableAccess == RDbRowSet::EUpdatable);
+
+		// Test can update first record
+		TRAP(ret,UpdateRecordL(aTable,KErrNone));
+		TESTL(ret == KErrNone);
+
+		// Test that can delete record
+		TRAP(ret,DeleteRecordL(aTable,KErrNone));
+		TESTL(ret == KErrNone);
+
+		// Test that can insert new record
+		TRAP(ret,InsertRecordL(aTable,KErrNone));
+		TESTL(ret == KErrNone);
+
+		aTable->GotoFirstRecord();
+		}
+	TESTL(iTheDb->CommitTransaction()==KErrNone);
+	}
+
+void CTestStepCommDb::GoToPositionL(CCommsDbProtectTableView* aTable,TInt aPos)
+	{
+	TESTL(aTable->GotoFirstRecord()==KErrNone);
+	for (TInt i = 0; i < aPos; i++)
+		{
+		TESTL(aTable->GotoNextRecord()==KErrNone);
+		}
+	}
+
+void CTestStepCommDb::ProtectRecordL(CCommsDbProtectTableView* aTable, TInt aResult)
+	{
+	TESTL(aTable->ProtectRecord()==aResult);
+	}
+
+void CTestStepCommDb::ProtectRecordL(CCommsDbProtectConnectPrefTableView* aTable, TInt aResult)
+	{
+	TESTL(aTable->ProtectRecord()==aResult);
+	}
+
+void CTestStepCommDb::UnprotectRecordL(CCommsDbProtectTableView* aTable, TInt aResult)
+	{
+	TESTL(aTable->UnprotectRecord()==aResult);
+	}
+
+void CTestStepCommDb::UnprotectRecordL(CCommsDbProtectConnectPrefTableView* aTable, TInt aResult)
+	{
+	TESTL(aTable->UnprotectRecord()==aResult);
+	}
+
+void CTestStepCommDb::UpdateRecordL(CCommsDbProtectTableView* aTable, TInt aResult)
+	{
+
+	TESTL(aTable->UpdateRecord()==aResult);
+	if (aResult == KErrNone)
+		{
+		ModifyRecordL(aTable);
+		TESTL(aTable->PutRecordChanges()==KErrNone);
+		}
+	}
+
+void CTestStepCommDb::UpdateRecordL(CCommsDbProtectConnectPrefTableView* aTable, TInt aExpectedResult)
+	{
+
+	TUint32 Ranking;
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref RecordData;
+
+	TInt ErrVal = ChangeCPRankingL(aTable, Ranking); // Try modifying a field.
+
+	TESTL(ErrVal == aExpectedResult);
+
+	if (ErrVal == KErrNone)
+		{
+		// The change was allowed, so check it actually happened.
+		aTable->ReadConnectionPreferenceL(RecordData);
+		TESTL(Ranking == RecordData.iRanking);
+		}
+	}
+
+void CTestStepCommDb::DeleteRecordL(CCommsDbProtectTableView* aTable, TInt aResult)
+	{
+	TESTL(aTable->DeleteRecord()==aResult);
+	}
+
+void CTestStepCommDb::DeleteRecordL(CCommsDbProtectConnectPrefTableView* aTable, TInt aExpectedResult)
+	{
+	TRAPD(ErrVal, aTable->DeleteConnectionPreferenceL());
+	TESTL(ErrVal == aExpectedResult);
+	}
+
+void CTestStepCommDb::InsertRecordL(CCommsDbProtectTableView* aTable, TInt aExpectedResult)
+	{
+	TUint32 recordId;
+	TInt ret = aTable->InsertRecord(recordId);
+	TESTL(ret==aExpectedResult||ret==KErrAlreadyExists); //for some tables insertion fails
+											  //because they can only have
+											//one record (i.e. DEFAULT_GPRS)
+	if (ret == KErrNone)
+		{
+		PopulateInsertedRecordL(aTable);
+		TESTL(aTable->PutRecordChanges()==KErrNone);
+		}
+	}
+
+void CTestStepCommDb::InsertRecordL(CCommsDbProtectConnectPrefTableView* aTable, TInt aExpectedResult)
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref PrefData1, PrefData2;
+
+	PrefData1.iRanking = 0;
+	PrefData1.iDirection = ECommDbConnectionDirectionOutgoing;
+	PrefData1.iDialogPref = ECommDbDialogPrefWarn;
+	PrefData1.iBearer.iBearerSet = ECommDbBearerCSD;
+	PrefData1.iBearer.iIapId = 1;
+
+	TRAPD(ErrVal, aTable->InsertConnectionPreferenceL(PrefData1));
+	TESTL(ErrVal==aExpectedResult); //for some tables insertion fails
+											  //because they can only have
+											//one record (i.e. DEFAULT_GPRS)
+	if (ErrVal == KErrNone)
+		{
+		aTable->ReadConnectionPreferenceL(PrefData2);
+		TESTL(PrefData1 == PrefData2);
+		}
+	}
+
+
+#define TEST_FCN(_F_)		{TRAPD(ret,_F_); TESTL(ret == KErrNone);}
+
+void CTestStepCommDb::ModifyRecordL(CCommsDbProtectTableView* aTable)
+//
+// Modify some field in current record
+//
+	{
+	TEST_FCN(aTable->WriteTextL(TPtrC(COMMDB_NAME),_L("test")));
+	}
+// Extract the protection state for the current record,
+// and leave if it's not the state expected
+void CTestStepCommDb::CheckRecordAccessL(CCommsDbProtectConnectPrefTableView* aTable, TInt aExpectedAccess)
+	{
+	TInt FoundAccess;
+	// Set the state to one not expected, so it will fail if not explicitly changed
+	if (aExpectedAccess == RDbRowSet::EUpdatable)
+		FoundAccess = RDbRowSet::EReadOnly;
+	else
+		FoundAccess = RDbRowSet::EUpdatable;
+
+	TESTL(aTable->GetRecordAccess(FoundAccess) == KErrNone);
+	TESTL(aExpectedAccess == FoundAccess);
+	}
+void CTestStepCommDb::PopulateInsertedRecordL(CCommsDbProtectTableView* aTable)
+//
+// Populate minimal set of fields in current newly inserted record.
+//
+	{
+	TBuf<50> tableName;
+	aTable->GetTableName(tableName);
+
+	if (tableName == TPtrC(DIAL_OUT_ISP))
+		{
+		TEST_FCN(aTable->WriteTextL(TPtrC(COMMDB_NAME),_L("Inserted Service")));
+		TEST_FCN(aTable->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue));
+		TEST_FCN(aTable->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse));
+		TEST_FCN(aTable->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue));
+		TEST_FCN(aTable->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue));
+		TEST_FCN(aTable->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue));
+		TEST_FCN(aTable->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue));
+		TEST_FCN(aTable->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue));
+		}
+
+	// EXTEND OR MODIFY this function if want to use different table
+	}
+// Just a utility function - for checking the protection of the Connection Preferences
+// table and its records, we just try changing the ranking field of the first one.
+TInt CTestStepCommDb::ChangeCPRankingL(CCommsDbProtectConnectPrefTableView* aTable, TUint32& Ranking)
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref  RecordData;
+
+	aTable->ReadConnectionPreferenceL(RecordData);
+	if(RecordData.iRanking == 1)
+		Ranking = 0;
+	else
+		Ranking = 1;
+	TRAPD(ErrVal, aTable->ChangeConnectionPreferenceRankL(Ranking));
+	return(ErrVal);
+	}
+
+#undef TEST_FCN
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/step_001_01.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,390 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Case 001.01
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "step_001_01.h"
+
+#include <commdb.h>
+
+// constructor
+CCommDbTest001_01::CCommDbTest001_01()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_001_01"));
+}
+
+// destructor
+CCommDbTest001_01::~CCommDbTest001_01()
+{
+}
+
+TVerdict CCommDbTest001_01::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest001_01::executeStepL()
+	{
+	CCommsDatabase* TheDb = NULL;
+	TRAPD( err, TheDb=CCommsDatabase::NewL() );
+	delete TheDb;
+	return err;
+	}
+
+// do Test step 001.01
+TVerdict CCommDbTest001_01::doTestStepL( )
+{
+	TInt res;
+	INFO_PRINTF1(_L("Step 001.01 called "));
+	res = executeStepL();
+	if (res == KErrNone)
+		{
+		SetTestStepResult(EPass);		}
+	else
+		{
+		INFO_PRINTF2(_L("Step 001.01 failed with error: %d"),res);
+		SetTestStepResult(EFail);		}
+
+	return TestStepResult();
+}
+
+// constructor
+CCommDbTest001_03::CCommDbTest001_03()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_001_03"));
+}
+
+// destructor
+CCommDbTest001_03::~CCommDbTest001_03()
+{
+}
+
+TInt CCommDbTest001_03::executeStepL()
+{
+	TInt ret = KErrNone;
+
+	CCommsDatabase* TheDb = NULL;
+	TRAPD( err, TheDb=CCommsDatabase::NewL() );
+	if (err != KErrNone)
+		ret = err;
+
+	delete TheDb;
+	return ret;
+}
+
+// do Test step 001.03
+TVerdict CCommDbTest001_03::doTestStepL( )
+{
+
+	INFO_PRINTF1(_L("Step 001.03 called "));
+
+	if (executeStepL() == KErrNone)
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+}
+
+// constructor
+CCommDbTest001_04::CCommDbTest001_04()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_001_04"));
+}
+
+// destructor
+CCommDbTest001_04::~CCommDbTest001_04()
+{
+}
+
+TVerdict CCommDbTest001_04::doTestStepPreambleL()
+	{
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest001_04::executeStepL()
+{
+	CCommsDatabase* TheDb = NULL;
+	TRAPD( err, TheDb=CCommsDatabase::NewL() );
+
+	delete TheDb;
+
+	return err;
+}
+
+// do Test step 001.04
+TVerdict CCommDbTest001_04::doTestStepL( )
+{
+
+	INFO_PRINTF1(_L("Step 001.04 called "));
+    if (executeStepL() == KErrNone)
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+
+	return TestStepResult();
+}
+
+// constructor
+CCommDbTest001_05::CCommDbTest001_05()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_001_05"));
+}
+
+// destructor
+CCommDbTest001_05::~CCommDbTest001_05()
+{
+}
+
+TVerdict CCommDbTest001_05::doTestStepPreambleL()
+	{
+	// delete database file before running this test
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest001_05::executeStepL()
+{
+	TInt ret = KErrGeneral;
+
+	CCommsDatabase* TheDb;
+	TCommDbOpeningMethod openingMethod;
+	TheDb=CCommsDatabase::NewL(openingMethod);
+
+	if ( openingMethod == ECommDbOpened )
+		ret = KErrNone;
+
+	delete TheDb;
+
+	return ret;
+}
+
+// do Test step 001.05
+TVerdict CCommDbTest001_05::doTestStepL( )
+{
+
+	INFO_PRINTF1(_L("Step 001.05 called "));
+
+	if (executeStepL() == KErrNone)
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+}
+
+// constructor
+CCommDbTest001_07::CCommDbTest001_07()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_001_07"));
+}
+
+// destructor
+CCommDbTest001_07::~CCommDbTest001_07()
+{
+}
+
+TInt CCommDbTest001_07::executeStepL()
+{
+	// make sure database exists before running this test
+	TInt ret = KErrGeneral;
+
+	copyTestDatabase( EDatabase_1 );
+
+	CCommsDatabase* TheDb;
+	TCommDbOpeningMethod openingMethod;
+	TheDb=CCommsDatabase::NewL(openingMethod);
+
+	if ( openingMethod == ECommDbOpened )
+		ret = KErrNone;
+
+	delete TheDb;
+
+	return ret;
+}
+
+// do Test step 001.07
+TVerdict CCommDbTest001_07::doTestStepL( )
+{
+
+	INFO_PRINTF1(_L("Step 001.07 called "));
+
+	if (executeStepL() == KErrNone)
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+}
+
+// constructor
+CCommDbTest001_08::CCommDbTest001_08()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_001_08"));
+}
+
+// destructor
+CCommDbTest001_08::~CCommDbTest001_08()
+{
+}
+
+TInt CCommDbTest001_08::executeStepL()
+{
+	TInt ret = KErrNone;
+
+	CCommsDatabase* TheDb = NULL;
+	TRAPD( err, TheDb=CCommsDatabase::NewL(EFalse) );
+	if (err != KErrNone)
+		ret = err;
+
+	// if we get here, test was successful
+	delete TheDb;
+
+	return ret;
+}
+
+// do Test step 001.08
+TVerdict CCommDbTest001_08::doTestStepL( )
+{
+
+	INFO_PRINTF1(_L("Step 001.08 called "));
+
+	if (executeStepL() == KErrNone)
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+}
+
+// constructor
+CCommDbTest001_09::CCommDbTest001_09()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_001_09"));
+}
+
+// destructor
+CCommDbTest001_09::~CCommDbTest001_09()
+{
+}
+
+TInt CCommDbTest001_09::executeStepL()
+{
+	TInt ret = KErrNone;
+
+	CCommsDatabase* TheDb = NULL;
+	TRAPD( err, TheDb=CCommsDatabase::NewL(ETrue) );
+	if (err != KErrNone)
+		ret = err;
+
+	// if we get here, test was successful
+	delete TheDb;
+
+	return ret;
+}
+
+// do Test step 001.09
+TVerdict CCommDbTest001_09::doTestStepL( )
+{
+
+	INFO_PRINTF1(_L("Step 001.09 called "));
+
+	if (executeStepL() == KErrNone)
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+	return TestStepResult();
+}
+
+// constructor
+CCommDbTest001_10::CCommDbTest001_10()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_001_10"));
+}
+
+// destructor
+CCommDbTest001_10::~CCommDbTest001_10()
+{
+}
+
+// do Test step 001.10
+TVerdict CCommDbTest001_10::doTestStepL( )
+{
+
+	INFO_PRINTF1(_L("Step 001.10 called "));
+
+	SetTestStepResult(EPass);
+	//Heap test for 001.01
+
+	CCommDbTest001_01* step001_01 = new CCommDbTest001_01;
+	CleanupStack::PushL(step001_01);
+	doTestStepWithHeapFailureL( *step001_01, KErrNone);
+	if( step001_01->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step001_01);
+
+	//Heap test for 001.03
+
+	CCommDbTest001_03* step001_03 = new CCommDbTest001_03;
+	CleanupStack::PushL(step001_03);
+	doTestStepWithHeapFailureL( *step001_03, KErrNone);
+	if( step001_03->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step001_03);
+
+	//Heap test for 001.04
+
+	CCommDbTest001_04* step001_04 = new CCommDbTest001_04;
+	CleanupStack::PushL(step001_04);
+	doTestStepWithHeapFailureL( *step001_04, KErrNone);
+	if( step001_04->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step001_04);
+
+	//Heap test for 001.05
+
+	CCommDbTest001_05* step001_05 = new CCommDbTest001_05;
+	CleanupStack::PushL(step001_05);
+	doTestStepWithHeapFailureL( *step001_05, KErrNone);
+	if( step001_05->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step001_05);
+
+	//Heap test for 001.07
+
+	CCommDbTest001_07* step001_07 = new CCommDbTest001_07;
+	CleanupStack::PushL(step001_07);
+	doTestStepWithHeapFailureL( *step001_07, KErrNone);
+	if( step001_07->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step001_07);
+
+	//Heap test for 001.08
+
+	CCommDbTest001_08* step001_08 = new CCommDbTest001_08;
+	CleanupStack::PushL(step001_08);
+	doTestStepWithHeapFailureL( *step001_08, KErrNone);
+	if( step001_08->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step001_08);
+
+	//Heap test for 001.09
+
+	CCommDbTest001_09* step001_09 = new CCommDbTest001_09;
+	CleanupStack::PushL(step001_09);
+	doTestStepWithHeapFailureL( *step001_09, KErrNone);
+	if( step001_09->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step001_09);
+
+	return TestStepResult();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/step_002_01.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,69 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Case 002.01
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "step_002_01.h"
+
+#include <commdb.h>
+
+
+
+// constructor
+CCommDbTest002_01::CCommDbTest002_01()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_002_01"));
+}
+
+// destructor
+CCommDbTest002_01::~CCommDbTest002_01()
+{
+}
+
+// do Test step 002.01
+TVerdict CCommDbTest002_01::doTestStepL( )
+{
+	SetTestStepResult(EFail);
+	INFO_PRINTF1(_L("Step 002.01 called "));
+
+	// delete database file before running this test
+/*#ifdef __SECURE_DATA__
+	DeleteCurrentDatabaseL();
+#else*/
+//#endif
+
+	CCommsDatabase* TheDb;
+	TheDb=CCommsDatabase::NewL();
+	CleanupStack::PushL(TheDb);
+	TVersion DbVersion = TheDb->Version();
+
+	CleanupStack::PopAndDestroy();
+
+	INFO_PRINTF4(_L("Version details: Major %d Minor %d Build %x"), DbVersion.iMajor, DbVersion.iMinor, DbVersion.iBuild);
+	if ( DbVersion.iMinor == 1 && DbVersion.iMajor == 1 && DbVersion.iBuild == 0x1 )
+	{
+		SetTestStepResult(EPass);	}
+
+
+	return TestStepResult();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/step_004_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,296 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 004.01 - 004.04
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "step_004_xx.h"
+
+
+
+
+/////////////////////
+//	Test step 004.001
+/////////////////////
+
+// constructor
+CCommDbTest004_01::CCommDbTest004_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_004_01"));
+	}
+
+// destructor
+CCommDbTest004_01::~CCommDbTest004_01()
+	{
+	}
+
+TVerdict CCommDbTest004_01::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest004_01::executeStepL()
+	{
+	TInt ret = KErrGeneral;
+
+	TBuf<KCommsDbSvrMaxColumnNameLength> tableName;
+
+	// Get the table name and check it matches with the known value
+	iTheView->GetTableName( tableName );
+	if ( tableName.Compare( TPtrC(DIAL_OUT_ISP)) == 0 )
+		ret = KErrNone;
+
+	return ret;
+	}
+
+TVerdict CCommDbTest004_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 004.01 called "));
+
+
+	if ( executeStep()== KErrNone )
+		{
+		SetTestStepResult(EPass);		}
+	else
+		{
+		SetTestStepResult(EFail);		}
+
+
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 004.002
+/////////////////////
+
+// constructor
+CCommDbTest004_02::CCommDbTest004_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_004_02"));
+	}
+
+// destructor
+CCommDbTest004_02::~CCommDbTest004_02( )
+	{
+	}
+
+TVerdict CCommDbTest004_02::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+#define BUFFER_TOO_SMALL	5	//Must be smaller than the length of the DAIL_OUT_ISP table name
+
+TBool CCommDbTest004_02::executeStepL()
+	{
+	TBuf<BUFFER_TOO_SMALL> tableName;
+
+	//NB. This should cause a Panic!
+
+	iTheView->GetTableName( tableName );
+
+	if ( tableName.Compare( TPtrC(DIAL_OUT_ISP)) == 0 )
+		{
+		SetTestStepResult(EPass);		}
+	else
+		{
+		SetTestStepResult(EFail);		}
+
+        SetTestStepResult(EFail);	return TestStepResult();
+	}
+
+
+TVerdict CCommDbTest004_02::doTestStepL( )
+	{
+	if  ( executeStep() )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);
+		
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 004.003
+/////////////////////
+
+// constructor
+CCommDbTest004_03::CCommDbTest004_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_004_03"));
+	}
+
+// destructor
+CCommDbTest004_03::~CCommDbTest004_03()
+	{
+	}
+
+TVerdict CCommDbTest004_03::doTestStepPreambleL()
+	{	
+	copyTestDatabase( EDatabase_1 );
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//NB. If a zero size buffer is used this will cause an ARM compiler error
+#define BUFFER_VERYSMALL	1
+
+TBool CCommDbTest004_03::executeStepL()
+	{
+	
+	TBuf<BUFFER_VERYSMALL> tableName;
+
+	//NB. This should cause a Panic
+	
+	iTheView->GetTableName( tableName );
+
+	if ( tableName.Compare( TPtrC(DIAL_OUT_ISP)) == 0 )
+		{
+		SetTestStepResult(EPass);		}
+	else
+		{
+		SetTestStepResult(EFail);		}
+
+        SetTestStepResult(EFail);	return TestStepResult();
+	}
+
+TVerdict CCommDbTest004_03::doTestStepL( )
+	{
+	
+	if ( executeStep() )
+		{
+		SetTestStepResult(EPass);		}
+	else
+		{
+		SetTestStepResult(EFail);		}
+
+	
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 004.004
+/////////////////////
+
+// constructor
+CCommDbTest004_04::CCommDbTest004_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_004_04"));
+	}
+
+// destructor
+CCommDbTest004_04::~CCommDbTest004_04()
+	{
+	}
+
+
+TVerdict CCommDbTest004_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 004.04 called "));
+	
+	SetTestStepResult(EPass);
+	//Heap test for 004.01
+
+	CCommDbTest004_01* step004_01 = new CCommDbTest004_01;
+	CleanupStack::PushL(step004_01);
+	doTestStepWithHeapFailureL( *step004_01, KErrNone);
+	if( step004_01->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step004_01);
+	
+	return TestStepResult();
+	}
+	
+/////////////////////
+//	Test step 004.005
+/////////////////////
+
+// constructor
+CCommDbTest004_05::CCommDbTest004_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_004_05"));
+	}
+
+// destructor
+CCommDbTest004_05::~CCommDbTest004_05()
+	{
+	}
+
+
+TVerdict CCommDbTest004_05::doTestStepL( )
+	{
+	
+	SetTestStepResult(EPass);	
+	//Heap test for 004.02
+//	    a panic is expected
+	CCommDbTest004_02* step004_02 = new CCommDbTest004_02;
+	CleanupStack::PushL(step004_02);
+	doTestStepWithHeapFailureL( *step004_02, KErrNone);
+	if( step004_02->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step004_02);
+
+	return TestStepResult();
+	}
+
+	
+/////////////////////
+//	Test step 004.006
+/////////////////////
+
+// constructor
+CCommDbTest004_06::CCommDbTest004_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_004_06"));
+	}
+
+// destructor
+CCommDbTest004_06::~CCommDbTest004_06()
+	{
+	}
+
+
+TVerdict CCommDbTest004_06::doTestStepL( )
+	{
+	
+	SetTestStepResult(EPass);	//Heap test for 004.03
+
+	// a panic is expected
+	CCommDbTest004_03* step004_03 = new CCommDbTest004_03;
+	CleanupStack::PushL(step004_03);
+	doTestStepWithHeapFailureL( *step004_03, KErrNone);
+	if( step004_03->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step004_03);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/step_005_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,270 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 005.01 - 005.04
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "step_005_xx.h"
+
+
+
+
+/////////////////////
+//	Test step 005.001
+/////////////////////
+
+// constructor
+CCommDbTest005_01::CCommDbTest005_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_005_01"));
+	}
+
+// destructor
+CCommDbTest005_01::~CCommDbTest005_01()
+	{
+	}
+
+
+TVerdict CCommDbTest005_01::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_IN_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TBool CCommDbTest005_01::executeStepL()
+	{
+	TDbColType colType;
+	TUint32 attrib;
+	TBool ret=EFail;
+
+	//NB this step is design NOT to leave. 
+
+	//Read column type attibutes and check against the known true values
+	iTheView->ReadTypeAttribL( TPtrC(ISP_DESCRIPTION), colType, attrib );
+	if ( colType == EDbColText && attrib == 0 )
+		ret = EPass;
+
+	if ( ret == EPass )
+		{
+			iTheView->ReadTypeAttribL( TPtrC(ISP_LOGIN_SCRIPT), colType, attrib );
+			if ( !(colType == EDbColLongText && attrib == 0) )
+				ret = EFail;
+		}
+
+	if ( ret == EPass )
+		{
+			iTheView->ReadTypeAttribL( TPtrC(ISP_TYPE), colType, attrib );
+			if ( !(colType == EDbColUint32 && attrib == 0) )
+				ret = EFail;
+		}
+
+	if ( ret == EPass )
+		{
+			iTheView->ReadTypeAttribL( TPtrC(ISP_USE_LOGIN_SCRIPT), colType, attrib );
+			if ( !(colType == EDbColBit && attrib == 0) )
+				ret = EFail;
+		}
+
+	return ret;
+	}
+
+TVerdict CCommDbTest005_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 005.01 called "));
+	
+	if ( executeStep() )
+		{
+		SetTestStepResult(EFail);		}
+	else
+		{
+		SetTestStepResult(EPass);		}
+		
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 005.002
+/////////////////////
+
+// constructor
+CCommDbTest005_02::CCommDbTest005_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_005_02"));
+	}
+
+// destructor
+CCommDbTest005_02::~CCommDbTest005_02()
+	{
+	}
+
+TVerdict CCommDbTest005_02::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TBool CCommDbTest005_02::executeStepL()
+	{
+	TDbColType colType;
+	TUint32 attrib;
+	TBool ret=EFail;
+
+
+	//NB. This step is designed not to leave
+
+	//Read attributes for columns, and check against known correct values
+	iTheView->ReadTypeAttribL( TPtrC(COMMDB_ID), colType, attrib );
+
+	if ( colType == EDbColUint32 && attrib == (TDbCol::EAutoIncrement|TDbCol::ENotNull) )
+		ret = EPass;
+
+	if ( ret == EPass )
+		{
+			iTheView->ReadTypeAttribL( TPtrC(COMMDB_NAME), colType, attrib );
+			if ( !(colType == EDbColText && attrib == TDbCol::ENotNull) )
+				ret = EFail;
+		}
+
+	return ret;
+		
+	}
+
+TVerdict CCommDbTest005_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 005.02 called "));
+
+	if ( executeStep() )
+		{
+		SetTestStepResult(EFail);		}
+	else
+		{
+		SetTestStepResult(EPass);		}
+
+	
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 005.003
+/////////////////////
+
+// constructor
+CCommDbTest005_03::CCommDbTest005_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_005_03"));
+}
+
+// destructor
+CCommDbTest005_03::~CCommDbTest005_03()
+	{
+	}
+
+TVerdict CCommDbTest005_03::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest005_03::executeStepL()
+	{
+	TDbColType colType;
+	TUint32 attrib;
+
+	//NB. This test should leave
+	TRAPD(ret, iTheView->ReadTypeAttribL( KInvalidColumnName, colType, attrib ) );
+
+	return ret;
+	}
+
+TVerdict CCommDbTest005_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 005.03 called "));
+
+	SetTestStepResult(EFail);	
+	if ( executeStep() == KErrNotFound )
+		SetTestStepResult(EPass);
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 005.004
+/////////////////////
+
+// constructor
+CCommDbTest005_04::CCommDbTest005_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_005_04"));
+	}
+
+// destructor
+CCommDbTest005_04::~CCommDbTest005_04()
+	{
+	}
+
+
+
+TVerdict CCommDbTest005_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 005.04 called "));
+	
+	SetTestStepResult(EPass);
+	//Heap test for 005.01
+
+	CCommDbTest005_01* step005_01 = new CCommDbTest005_01;
+	CleanupStack::PushL(step005_01);
+	doTestStepWithHeapFailureL( *step005_01, KErrNone);
+	if( step005_01->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step005_01);
+		
+	//Heap test for 005.02
+	
+	CCommDbTest005_02* step005_02 = new CCommDbTest005_02;
+	CleanupStack::PushL(step005_02);
+	doTestStepWithHeapFailureL( *step005_02, KErrNone);
+	if( step005_02->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step005_02);
+
+
+	
+	//Heap test for 005.03
+
+	
+	CCommDbTest005_03* step005_03 = new CCommDbTest005_03;
+	CleanupStack::PushL(step005_03);
+	doTestStepWithHeapFailureL( *step005_03, KErrNotFound);
+	if( step005_03->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step005_03);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/step_006_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,244 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 006.01 - 006.05
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "step_006_xx.h"
+
+
+
+/////////////////////
+//	Test step 006.001
+/////////////////////
+
+// constructor
+CCommDbTest006_01::CCommDbTest006_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_006_01"));
+	}
+
+// destructor
+CCommDbTest006_01::~CCommDbTest006_01()
+	{
+	}
+
+TVerdict CCommDbTest006_01::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest006_01::executeStepL()
+	{
+	TInt ret = iTheView->GotoFirstRecord(); 	
+	return ret;
+	}
+
+TVerdict CCommDbTest006_01::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 006.01 called "));
+
+	if ( executeStepL() == KErrNone )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);	
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 006.002
+/////////////////////
+
+// constructor
+CCommDbTest006_02::CCommDbTest006_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_006_02"));
+	// default to no local objects allocated
+	iLocalObjects = EFalse;
+	}
+
+// destructor
+CCommDbTest006_02::~CCommDbTest006_02()
+	{
+	}
+
+TVerdict CCommDbTest006_02::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(IAP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest006_02::executeStepL()
+	{
+	TInt ret = iTheView->GotoFirstRecord(); 	
+	return ret;
+	}
+
+TVerdict CCommDbTest006_02::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 006.02 called "));
+	
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);	
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 006.003
+/////////////////////
+
+// constructor
+CCommDbTest006_03::CCommDbTest006_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_006_03"));
+	}
+
+// destructor
+CCommDbTest006_03::~CCommDbTest006_03()
+	{
+	}
+
+TVerdict CCommDbTest006_03::doTestStepPreambleL()
+	{
+	openDbAndViewL(TPtrC(DIAL_IN_ISP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+TInt CCommDbTest006_03::executeStepL()
+	{
+	TInt ret = iTheView->GotoFirstRecord(); 	
+	return ret;
+	}
+
+TVerdict CCommDbTest006_03::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 006.03 called "));
+
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);	
+		
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 006.004
+/////////////////////
+
+// constructor
+CCommDbTest006_04::CCommDbTest006_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_006_04"));
+	// default to no local objects allocated
+	iLocalObjects = EFalse;
+	}
+
+// destructor
+CCommDbTest006_04::~CCommDbTest006_04()
+	{
+	}
+
+
+TVerdict CCommDbTest006_04::doTestStepPreambleL()
+	{	
+	openDbAndViewL(TPtrC(IAP));
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+TInt CCommDbTest006_04::executeStepL()
+	{
+	TInt ret = iTheView->GotoFirstRecord(); 	
+	return ret;
+	}
+
+TVerdict CCommDbTest006_04::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 006.04 called "));
+	
+	if ( executeStepL() == KErrNotFound )
+		SetTestStepResult(EPass);	else
+		SetTestStepResult(EFail);	
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 006.005
+/////////////////////
+
+// constructor
+CCommDbTest006_05::CCommDbTest006_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_006_05"));
+	}
+
+// destructor
+CCommDbTest006_05::~CCommDbTest006_05()
+	{
+	}
+
+
+TVerdict CCommDbTest006_05::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step 006.04 called "));
+	
+	SetTestStepResult(EPass);
+	//Heap test for 006.01
+	CCommDbTest006_01* step006_01 = new CCommDbTest006_01;
+	CleanupStack::PushL(step006_01);
+	doTestStepWithHeapFailureL( *step006_01, KErrNone);
+	if( step006_01->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step006_01);
+		
+	//Heap test for 006.02
+	
+	CCommDbTest006_02* step006_02 = new CCommDbTest006_02;
+	CleanupStack::PushL(step006_02);
+	doTestStepWithHeapFailureL( *step006_02, KErrNotFound);
+	if( step006_02->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step006_02);
+
+
+	
+	//Heap test for 006.03
+// it is not possible to copy database files, so this tests couldn't run 
+// with proper conditions(database)
+	//Heap test for 006.04
+	CCommDbTest006_04* step006_04 = new CCommDbTest006_04;
+	CleanupStack::PushL(step006_04);
+	doTestStepWithHeapFailureL( *step006_04, KErrNotFound);
+	if( step006_04->TestStepResult() == EFail )
+		SetTestStepResult(EFail);	CleanupStack::PopAndDestroy(step006_04);
+
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/step_051_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,116 @@
+//
+// 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:
+//
+//
+// 
+
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbstore.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "comms-infras/commdb/protection/protectdb.h"
+#include "comms-infras/commdb/protection/protectcpdb.h"
+
+#include <cdbpreftable.h>
+
+#include "step_051_xx.h"
+
+
+/////////////////////
+//	Test step 051.01
+/////////////////////
+
+CCommDbTest051_01::CCommDbTest051_01()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_051_01"));
+
+}
+
+CCommDbTest051_01::~CCommDbTest051_01()
+{
+	delete iTheDb;
+}
+
+
+TVerdict CCommDbTest051_01::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//protect normal table
+enum TVerdict CCommDbTest051_01::doTestStepL( void )
+	{
+
+	INFO_PRINTF1(_L("Normal Table : Protection.. "));
+	SetTestStepResult(EPass);	CCommsDbProtectTableView* table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
+
+	if(table->GotoFirstRecord()==KErrNone)
+		{
+		TESTL(table->ProtectTable()==KErrNone);
+		SetTestStepResult(EPass);		INFO_PRINTF1(_L("\t\tSUCCESS"));
+		}
+	else
+		{
+		SetTestStepResult(EFail);		INFO_PRINTF1(_L("FAIL"));
+		}
+	CleanupStack::PopAndDestroy(); 
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 051.02
+/////////////////////
+
+CCommDbTest051_02::CCommDbTest051_02()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_051_02"));
+
+}
+
+CCommDbTest051_02::~CCommDbTest051_02()
+{
+	delete iTheDb;
+}
+
+TVerdict CCommDbTest051_02::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//Unprotect Normal Table
+enum TVerdict CCommDbTest051_02::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Normal Table : Unprotection .."));
+	SetTestStepResult(EPass);	CCommsDbProtectTableView* table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
+	if(table->GotoFirstRecord()==KErrNone)
+		{
+		TESTL(table->UnprotectTable()==KErrNone);
+		SetTestStepResult(EPass);		INFO_PRINTF1(_L("\t\tSUCCESS"));
+		}
+	else
+		{
+		SetTestStepResult(EFail);		INFO_PRINTF1(_L("FAIL"));
+		}
+	CleanupStack::PopAndDestroy(); 
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/step_052_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,131 @@
+//
+// 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:
+//
+//
+// 
+ 
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbstore.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+
+#include "comms-infras/commdb/protection/protectdb.h"
+#include "comms-infras/commdb/protection/protectcpdb.h"
+#include <cdbpreftable.h>
+
+#include "step_052_xx.h"
+
+
+/////////////////////
+//	Test step 052.01
+/////////////////////
+
+
+CCommDbTest052_01::CCommDbTest052_01()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_052_01"));
+}
+
+CCommDbTest052_01::~CCommDbTest052_01()
+{
+	delete iTheDb;
+}
+
+TVerdict CCommDbTest052_01::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//Protect normal Record
+enum TVerdict CCommDbTest052_01::doTestStepL( void )
+	{
+
+	INFO_PRINTF1(_L("Normal Record : Protection .."));
+	SetTestStepResult(EPass);
+	// Test using dial out isp table as running t_createdb places several records
+	// in the table as opposed to just one as in some tables
+	CCommsDbProtectTableView* table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
+	TESTL(iTheDb->BeginTransaction()==KErrNone);
+	
+	if(table->GotoFirstRecord()==KErrNone)
+		{
+		// Protect the first record
+		ProtectRecordL(table,KErrNone);
+		SetTestStepResult(EPass);		INFO_PRINTF1(_L("\t\tSUCCESS"));
+		}
+	else
+		{
+		SetTestStepResult(EFail);		INFO_PRINTF1(_L("\t\tFAIL"));
+		}
+
+	TESTL(iTheDb->CommitTransaction()==KErrNone);
+	CleanupStack::PopAndDestroy(); 
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 052.02
+/////////////////////
+
+CCommDbTest052_02::CCommDbTest052_02()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_052_02"));
+}
+
+CCommDbTest052_02::~CCommDbTest052_02()
+{
+	delete iTheDb;
+}
+
+TVerdict CCommDbTest052_02::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+//UnProtect normal Record
+enum TVerdict CCommDbTest052_02::doTestStepL( void )
+	{
+
+	INFO_PRINTF1(_L("Normal Record : Unprotection .."));
+	SetTestStepResult(EPass);
+	CCommsDbProtectTableView* table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
+	TESTL(iTheDb->BeginTransaction()==KErrNone);
+
+	if(table->GotoFirstRecord()==KErrNone)
+		{
+		// UnProtect the first record
+		UnprotectRecordL(table,KErrNone);
+		SetTestStepResult(EPass);		INFO_PRINTF1(_L("\t\tSUCCESS"));
+		}
+	else
+		{
+		SetTestStepResult(EFail);		INFO_PRINTF1(_L("\t\tFAIL"));
+		}
+
+	TESTL(iTheDb->CommitTransaction()==KErrNone);
+	CleanupStack::PopAndDestroy(); //table
+	return TestStepResult();
+
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/step_053_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,120 @@
+//
+// 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:
+//
+//
+// 
+ 
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbstore.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+
+#include "comms-infras/commdb/protection/protectdb.h"
+#include "comms-infras/commdb/protection/protectcpdb.h"
+
+
+#include <cdbpreftable.h>
+
+#include "step_053_xx.h"
+
+/////////////////////
+//	Test step 053.01
+/////////////////////
+
+CCommDbTest053_01::CCommDbTest053_01()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_053_01"));
+}
+
+CCommDbTest053_01::~CCommDbTest053_01()
+{
+	delete iTheDb;
+}
+
+TVerdict CCommDbTest053_01::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//Protect Connection Preference Table
+enum TVerdict CCommDbTest053_01::doTestStepL( void )
+	{
+
+	INFO_PRINTF1(_L("Connection Preference Table : Protection .."));
+	SetTestStepResult(EPass);
+	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
+
+	if(table->GotoFirstRecord()==KErrNone)
+		{
+		TESTL(table->ProtectTable()==0);
+		SetTestStepResult(EPass);		INFO_PRINTF1(_L("\t\tSUCCESS"));
+		}
+	else
+		{
+		SetTestStepResult(EFail);		INFO_PRINTF1(_L("\t\tFAIL"));
+		}
+	CleanupStack::PopAndDestroy(); 
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 053.02
+/////////////////////
+
+CCommDbTest053_02::CCommDbTest053_02()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_053_02"));
+}
+
+CCommDbTest053_02::~CCommDbTest053_02()
+{
+	delete iTheDb;
+}
+
+TVerdict CCommDbTest053_02::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//UnProtect Connection pref Record
+enum TVerdict CCommDbTest053_02::doTestStepL( void )
+	{
+
+	INFO_PRINTF1(_L("Connection Preference Table : Unprotection .."));
+	SetTestStepResult(EPass);
+	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
+
+	if(table->GotoFirstRecord()==KErrNone)
+		{
+		TESTL(table->UnprotectTable()==KErrNone);
+		SetTestStepResult(EPass);		INFO_PRINTF1(_L("\t\tSUCCESS"));
+		}
+	else
+		{
+		SetTestStepResult(EFail);		INFO_PRINTF1(_L("\t\tFAIL"));
+		}
+	CleanupStack::PopAndDestroy(); 
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/step_054_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,127 @@
+//
+// 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:
+//
+//
+// 
+ 
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbstore.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "comms-infras/commdb/protection/protectdb.h"
+#include "comms-infras/commdb/protection/protectcpdb.h"
+
+#include <cdbpreftable.h>
+
+#include "step_054_xx.h"
+
+/////////////////////
+//	Test step 054.01
+/////////////////////
+
+CCommDbTest054_01::CCommDbTest054_01()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_054_01"));
+}
+
+CCommDbTest054_01::~CCommDbTest054_01()
+{
+	delete iTheDb;
+}
+
+TVerdict CCommDbTest054_01::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//Protect Connection Preference Record
+enum TVerdict CCommDbTest054_01::doTestStepL( void )
+	{
+
+	INFO_PRINTF1(_L("Connection Preference Record : Protection .."));
+	SetTestStepResult(EPass);
+	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
+	TESTL(iTheDb->BeginTransaction()==KErrNone);
+	
+	if(table->GotoFirstRecord()==KErrNone)
+		{
+		// Protect the first record
+		ProtectRecordL(table,KErrNone);
+		SetTestStepResult(EPass);		INFO_PRINTF1(_L("\t\tSUCCESS"));
+		}
+	else
+		{
+		SetTestStepResult(EFail);		INFO_PRINTF1(_L("\t\tFAIL"));
+		}
+
+	TESTL(iTheDb->CommitTransaction()==KErrNone);
+
+	CleanupStack::PopAndDestroy(); 
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 054.02
+/////////////////////
+
+CCommDbTest054_02::CCommDbTest054_02()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_054_02"));
+}
+
+CCommDbTest054_02::~CCommDbTest054_02()
+{
+	delete iTheDb;
+}
+
+TVerdict CCommDbTest054_02::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//Protect Connection Preference Record
+enum TVerdict CCommDbTest054_02::doTestStepL( void )
+	{
+
+	INFO_PRINTF1(_L("Connection Preference Record : Unprotection .."));
+	SetTestStepResult(EPass);
+	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
+	TESTL(iTheDb->BeginTransaction()==KErrNone);
+
+	if(table->GotoFirstRecord()==KErrNone)
+		{
+		// UnProtect the first record
+		UnprotectRecordL(table,KErrNone);
+		SetTestStepResult(EPass);		INFO_PRINTF1(_L("\t\tSUCCESS"));
+		}
+	else
+		{
+		SetTestStepResult(EFail);		INFO_PRINTF1(_L("\t\tFAIL"));
+		}
+
+	TESTL(iTheDb->CommitTransaction()==KErrNone);
+
+	CleanupStack::PopAndDestroy(); 
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/step_055_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,127 @@
+//
+// 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:
+//
+//
+// 
+ 
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbstore.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "comms-infras/commdb/protection/protectdb.h"
+#include "comms-infras/commdb/protection/protectcpdb.h"
+
+#include <cdbpreftable.h>
+
+#include "step_055_xx.h"
+
+/////////////////////
+//	Test step 055.01
+/////////////////////
+
+//TestProtectTables
+CCommDbTest055_01::CCommDbTest055_01()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_055_01"));
+}
+
+CCommDbTest055_01::~CCommDbTest055_01()
+{
+	delete iTheDb;
+}
+
+TVerdict CCommDbTest055_01::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+enum TVerdict CCommDbTest055_01::doTestStepL( void )
+	{
+
+	INFO_PRINTF1(_L("Test Normal Table : Protection .."));
+	SetTestStepResult(EPass);
+	CCommsDbProtectTableView* table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
+	CheckTableIsNotProtectedL(table);
+
+	TUint32 recordId;
+	table->ReadUintL(TPtrC(COMMDB_ID),recordId);
+	
+	TESTL(table->ProtectTable()==KErrNone);
+	TUint32 postProtectRecordId;
+	table->ReadUintL(TPtrC(COMMDB_ID),postProtectRecordId);
+	TESTL(postProtectRecordId==recordId);
+	
+	CheckTableIsProtectedL(table);
+	SetTestStepResult(EPass);	INFO_PRINTF1(_L("\t\tSUCCESS"));
+
+	CleanupStack::PopAndDestroy(); 
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 055.02
+/////////////////////
+
+
+//TestUnprotectTables
+CCommDbTest055_02::CCommDbTest055_02()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_055_02"));
+}
+
+CCommDbTest055_02::~CCommDbTest055_02()
+{
+	delete iTheDb;
+}
+
+TVerdict CCommDbTest055_02::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+//Protect Connection Preference Record
+enum TVerdict CCommDbTest055_02::doTestStepL( void )
+	{
+
+	INFO_PRINTF1(_L("Test Normal Table : unprotection .."));
+	SetTestStepResult(EPass);
+	CCommsDbProtectTableView* table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
+	CheckTableIsProtectedL(table);
+
+	TUint32 recordId;
+	table->ReadUintL(TPtrC(COMMDB_ID),recordId);
+	
+	TESTL(table->UnprotectTable()==KErrNone);
+	TUint32 postProtectRecordId;
+	table->ReadUintL(TPtrC(COMMDB_ID),postProtectRecordId);
+	TESTL(postProtectRecordId==recordId);
+	
+	CheckTableIsNotProtectedL(table);
+	
+	SetTestStepResult(EPass);	INFO_PRINTF1(_L("\t\tSUCCESS"));
+
+	CleanupStack::PopAndDestroy(); 
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/step_056_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,177 @@
+//
+// 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:
+//
+//
+// 
+ 
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbstore.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "comms-infras/commdb/protection/protectdb.h"
+#include "comms-infras/commdb/protection/protectcpdb.h"
+
+#include <cdbpreftable.h>
+
+#include "step_056_xx.h"
+
+/////////////////////
+//	Test step 056.01
+/////////////////////
+
+//TestProtectRecords
+CCommDbTest056_01::CCommDbTest056_01()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_056_01"));
+}
+
+CCommDbTest056_01::~CCommDbTest056_01()
+{
+	delete iTheDb;
+}
+
+TVerdict CCommDbTest056_01::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+enum TVerdict CCommDbTest056_01::doTestStepL( void )
+	{
+
+	INFO_PRINTF1(_L("Test Normal Records : Protection .."));
+	SetTestStepResult(EPass);
+	CCommsDbProtectTableView* table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
+	TESTL(iTheDb->BeginTransaction()==KErrNone);
+	
+	TESTL(table->GotoFirstRecord()==KErrNone);
+	
+	// Check record security level is writable
+	TInt recordAccess = 1;
+	TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
+	TESTL(recordAccess == 0);
+
+	// Modify and test the first record
+	TRAPD(ret,UpdateRecordL(table,KErrNone));
+	TESTL(ret == KErrNone);
+	
+	TRAP(ret,ProtectRecordL(table,KErrNone));		
+	TESTL(ret == KErrNone);
+
+		// Test that protection is effective
+	TRAP(ret,UpdateRecordL(table,KErrAccessDenied));
+	TESTL(ret == KErrNone);
+	TRAP(ret,DeleteRecordL(table,KErrAccessDenied));
+	TESTL(ret == KErrNone);
+
+		// Check record security level is read only
+	TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
+	TESTL(recordAccess == 1);
+
+	table->GotoFirstRecord();
+
+	TESTL(iTheDb->CommitTransaction()==KErrNone);
+
+
+	SetTestStepResult(EPass);	INFO_PRINTF1(_L("\t\tSUCCESS"));
+
+	CleanupStack::PopAndDestroy(); 
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 056.02
+/////////////////////
+
+//TestUnprotectRecords
+CCommDbTest056_02::CCommDbTest056_02()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_056_02"));
+}
+
+CCommDbTest056_02::~CCommDbTest056_02()
+{
+	delete iTheDb;
+}
+
+TVerdict CCommDbTest056_02::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+enum TVerdict CCommDbTest056_02::doTestStepL( void )
+	{
+
+	INFO_PRINTF1(_L("Test Normal Records : unprotection .."));
+	SetTestStepResult(EPass);
+	CCommsDbProtectTableView* table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
+	TESTL(iTheDb->BeginTransaction()==KErrNone);
+
+	if(table->GotoFirstRecord()==KErrNone)
+		{
+		// Check record state is read only
+		TInt recordAccess = 0;
+		TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
+		TESTL(recordAccess == 1);
+
+		// Check record cannot be updated
+		TRAPD(ret, UpdateRecordL(table,KErrAccessDenied));
+		TESTL(ret == KErrNone);
+
+		// Unprotect record
+		table->GotoFirstRecord();
+		TRAP(ret,UnprotectRecordL(table,KErrNone));
+		TESTL(ret == KErrNone);
+
+		// Check record state is now writable
+		TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
+		TESTL(recordAccess == 0);
+
+		// Test record can now be updated
+		TRAP(ret,UpdateRecordL(table,KErrNone));
+		TESTL(ret == KErrNone);
+		}
+
+	TESTL(iTheDb->CommitTransaction()==KErrNone);
+	
+	// Do separate transaction to check deletion is 
+	// allowed as want to be able to roll this back
+	TESTL(iTheDb->BeginTransaction()==KErrNone);
+	
+	if(table->GotoFirstRecord()==KErrNone)
+		{
+		// Check can delete record
+		TRAPD(ret,DeleteRecordL(table,KErrNone));
+		TESTL(ret == KErrNone);
+		} 
+	
+	//don't commit as don't want to risk making db empty.
+	iTheDb->RollbackTransaction();
+
+
+	SetTestStepResult(EPass);	INFO_PRINTF1(_L("\t\tSUCCESS"));
+
+	CleanupStack::PopAndDestroy(); 
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/step_057_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,127 @@
+//
+// 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:
+//
+//
+// 
+ 
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbstore.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "comms-infras/commdb/protection/protectdb.h"
+#include "comms-infras/commdb/protection/protectcpdb.h"
+
+#include <cdbpreftable.h>
+
+#include "step_057_xx.h"
+
+/////////////////////
+//	Test step 057.01
+/////////////////////
+
+//TestProtectRecords
+CCommDbTest057_01::CCommDbTest057_01()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_057_01"));
+}
+
+CCommDbTest057_01::~CCommDbTest057_01()
+{
+	delete iTheDb;
+}
+
+TVerdict CCommDbTest057_01::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+enum TVerdict CCommDbTest057_01::doTestStepL( void )
+	{
+
+	INFO_PRINTF1(_L("Test Protect Connection Prefs Table "));
+	SetTestStepResult(EPass);
+    CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref  RecordData1, RecordData2;
+
+	// protect the table and do some checking
+	// database is modified
+	//
+
+	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
+	CheckTableIsNotProtectedL(table);
+
+	table->ReadConnectionPreferenceL(RecordData1);
+
+	TESTL(table->ProtectTable()==KErrNone);
+	
+	CheckTableIsProtectedL(table);
+	table->ReadConnectionPreferenceL(RecordData2);
+	TESTL(RecordData1 == RecordData2);
+
+	SetTestStepResult(EPass);	INFO_PRINTF1(_L("\t\tSUCCESS"));
+
+	CleanupStack::PopAndDestroy(); 
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 057.02
+/////////////////////
+
+//TestUnprotectRecords
+CCommDbTest057_02::CCommDbTest057_02()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_057_02"));
+}
+
+CCommDbTest057_02::~CCommDbTest057_02()
+{
+	delete iTheDb;
+}
+
+TVerdict CCommDbTest057_02::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+enum TVerdict CCommDbTest057_02::doTestStepL( void )
+	{
+
+	INFO_PRINTF1(_L("Test UnProtect Connection Prefs Table .."));
+	SetTestStepResult(EPass);
+	// unprotect the table and do some checking
+	// database is modified
+	//
+	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
+	CheckTableIsProtectedL(table);
+
+	TESTL(table->UnprotectTable()==KErrNone);
+	
+	CheckTableIsNotProtectedL(table);
+	
+	SetTestStepResult(EPass);	INFO_PRINTF1(_L("\t\tSUCCESS"));
+	CleanupStack::PopAndDestroy(); 
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/step_058_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,180 @@
+//
+// 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:
+//
+//
+// 
+ 
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbstore.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "comms-infras/commdb/protection/protectdb.h"
+#include "comms-infras/commdb/protection/protectcpdb.h"
+
+#include <cdbpreftable.h>
+
+#include "step_058_xx.h"
+
+/////////////////////
+//	Test step 058.01
+/////////////////////
+
+//TestProtectRecords
+CCommDbTest058_01::CCommDbTest058_01()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_058_01"));
+}
+
+CCommDbTest058_01::~CCommDbTest058_01()
+{
+	delete iTheDb;
+}
+
+TVerdict CCommDbTest058_01::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+enum TVerdict CCommDbTest058_01::doTestStepL( void )
+	{
+	TUint32 Ranking;
+	INFO_PRINTF1(_L("Test Protect Connection Prefs Records "));
+	SetTestStepResult(EPass);
+	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
+
+	TESTL(iTheDb->BeginTransaction()==KErrNone);
+	
+	TESTL(table->GotoFirstRecord()==KErrNone);
+
+	// Check record security level is writable
+	TInt recordAccess = RDbRowSet::EReadOnly;
+	TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
+	TESTL(recordAccess == RDbRowSet::EUpdatable);
+
+	// Modify and test the first record
+	TESTL(ChangeCPRankingL(table, Ranking) == KErrNone);
+
+	TRAPD(ErrVal,ProtectRecordL(table,KErrNone));		
+	TESTL(ErrVal == KErrNone);
+
+	// Check record security level is read only
+	TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
+	TESTL(recordAccess == RDbRowSet::EReadOnly);
+
+	// Test that protection is effective - i.e we can't change the record
+	ErrVal = ChangeCPRankingL(table, Ranking); // Try modifying a field.
+	TESTL(ErrVal == KErrAccessDenied);
+
+	// Check record security level is still read only
+	TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
+	TESTL(recordAccess == RDbRowSet::EReadOnly);
+
+	table->GotoFirstRecord();
+
+	TESTL(iTheDb->CommitTransaction()==KErrNone);
+
+	SetTestStepResult(EPass);	INFO_PRINTF1(_L("\t\tSUCCESS"));
+
+	CleanupStack::PopAndDestroy(); 
+	return TestStepResult();
+	}
+
+
+/////////////////////
+//	Test step 058.02
+/////////////////////
+
+//TestUnprotectRecords
+
+CCommDbTest058_02::CCommDbTest058_02()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_058_02"));
+}
+
+CCommDbTest058_02::~CCommDbTest058_02()
+{
+	delete iTheDb;
+}
+
+TVerdict CCommDbTest058_02::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+enum TVerdict CCommDbTest058_02::doTestStepL( void )
+	{
+
+	INFO_PRINTF1(_L("Test UnProtect Connection Prefs Records .."));
+	SetTestStepResult(EPass);
+	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
+
+	TESTL(iTheDb->BeginTransaction()==KErrNone);
+
+	if(table->GotoFirstRecord()==KErrNone)
+		{
+		// Check record state is read only
+		TInt recordAccess = RDbRowSet::EUpdatable;
+		TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
+		TESTL(recordAccess == RDbRowSet::EReadOnly);
+
+		// Check record cannot be updated
+		TRAPD(ret, UpdateRecordL(table,KErrAccessDenied));
+		TESTL(ret == KErrNone);
+
+		// Unprotect record
+		table->GotoFirstRecord();
+		TRAP(ret,UnprotectRecordL(table,KErrNone));
+		TESTL(ret == KErrNone);
+
+		// Check record state is now writable
+		TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
+		TESTL(recordAccess == RDbRowSet::EUpdatable);
+
+		// Test record can now be updated
+		TRAP(ret,UpdateRecordL(table,KErrNone));
+		TESTL(ret == KErrNone);
+		}
+
+	TESTL(iTheDb->CommitTransaction()==KErrNone);
+	
+	// Do separate transaction to check deletion is 
+	// allowed as want to be able to roll this back
+	TESTL(iTheDb->BeginTransaction()==KErrNone);
+	
+	if(table->GotoFirstRecord()==KErrNone)
+		{
+		// Check can delete record
+		TRAPD(ret,DeleteRecordL(table,KErrNone));
+		TESTL(ret == KErrNone);
+		} 
+	
+	//don't commit as don't want to risk making db empty.
+	iTheDb->RollbackTransaction();
+
+	SetTestStepResult(EPass);	INFO_PRINTF1(_L("\t\tSUCCESS"));
+	CleanupStack::PopAndDestroy(); 
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/step_059_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,329 @@
+//
+// 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:
+//
+//
+// 
+ 
+// EPOC includes
+#include <e32base.h>
+#include <commdb.h>
+#include <d32comm.h>
+#include <cdbstore.h>
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "comms-infras/commdb/protection/protectdb.h"
+#include "comms-infras/commdb/protection/protectcpdb.h"
+#include <cdbpreftable.h>
+
+#include "step_059_xx.h"
+
+#define ACCESS_TYPE_TABLE		_S("AccessTypeTable")
+#define TABLE_ACC_NAME          _S("TableName")
+#define TABLE_ACC_TYPE          _S("AccessType")
+
+/////////////////////
+//	Test step 059.01
+/////////////////////
+
+//TestProtectRecords
+CCommDbTest059_01::CCommDbTest059_01()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_059_01"));
+}
+
+CCommDbTest059_01::~CCommDbTest059_01()
+{
+	delete iTheDb;
+}
+
+TVerdict CCommDbTest059_01::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+enum TVerdict CCommDbTest059_01::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Combinational test (Only for Conn Pref)"));
+	SetTestStepResult(EPass);
+
+// Try a combination of operations on a table, as follows:
+// 1) protect record
+// 2) attempt update to protected record
+// 3) attempt update to unprotected record
+// 4) attempt delete of unprotected record
+// 5) protect table
+// 6) attempt record insertion
+// 7) attempt protected record deletion & update
+// 8) attempt unprotected record deletion and update
+// 9) unprotect table
+// 10) attempt record insertion
+// 11) attempt record deletion
+// 12) attempt update to protected record
+// 13) attempt update to unprotected record
+// 15) unprotect record
+// 15) attempt update to formerly unprotected record
+// 16) attempt update to unprotected record
+//
+	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
+			
+	TESTL(iTheDb->BeginTransaction()==KErrNone);
+
+	if(table->GotoFirstRecord()==KErrNone)
+		{
+		// Add another record to the table (so there should be 3)
+		InsertRecordL(table,KErrNone);
+
+		TESTL(table->GotoFirstRecord()==KErrNone);
+		TESTL(table->GotoNextRecord()==KErrNone);
+
+		// 1) Protect the second record
+		CheckRecordAccessL(table,RDbRowSet::EUpdatable); 
+		ProtectRecordL(table,KErrNone);
+		CheckRecordAccessL(table,RDbRowSet::EReadOnly); 
+		
+		// 2) Check record cannot be updated
+		UpdateRecordL(table,KErrAccessDenied);
+
+		// Go to the first record (unprotected)
+
+		TESTL(table->GotoFirstRecord()==KErrNone);
+		CheckRecordAccessL(table,RDbRowSet::EUpdatable); 
+
+		// 3) Check it can be updated
+		UpdateRecordL(table,KErrNone);
+
+		// 4) Check it can be deleted
+		DeleteRecordL(table,KErrNone);
+
+		//(which means that the new first record should be protected.....)
+		TESTL(table->GotoFirstRecord()==KErrNone);
+		CheckRecordAccessL(table,RDbRowSet::EReadOnly); 
+
+		// 5) Unprotect the first record which should be protected
+		CheckRecordAccessL(table,RDbRowSet::EReadOnly); 
+		UnprotectRecordL(table,KErrNone);
+		CheckRecordAccessL(table,RDbRowSet::EUpdatable); 
+		
+		// 6) Attempt update to formerly protected record (should succeed)
+		UpdateRecordL(table,KErrNone);
+		
+		// End the transaction, as a protect table is a separate one.
+		TESTL(iTheDb->CommitTransaction()==KErrNone);
+
+		// 7) Protect the table
+		TESTL(table->ProtectTable()==KErrNone);
+
+		TESTL(iTheDb->BeginTransaction()==KErrNone);
+
+		// 8) Check a record can't be inserted
+		InsertRecordL(table,KErrAccessDenied);
+
+		// 9) Check a record can't be deleted or updated
+		DeleteRecordL(table,KErrAccessDenied);
+		UpdateRecordL(table,KErrAccessDenied);
+		
+		// End the transaction, as unprotect table is a separate one.
+		TESTL(iTheDb->CommitTransaction()==KErrNone);
+
+		// 10) Unprotect the table
+		TESTL(table->UnprotectTable()==KErrNone);
+	
+		table->GotoFirstRecord();
+		TESTL(iTheDb->BeginTransaction()==KErrNone);
+		// 11) Check a record can be inserted
+		InsertRecordL(table,KErrNone);
+
+		// 12) Check an unprotected record can be deleted, but a protected one can't
+		// Again, yes it can so don't test this here.
+		DeleteRecordL(table,KErrNone);
+
+		// 13) Check the unprotected record can be updated
+		// Delete a record so there's only one left. Otherwise an update now will
+		// fail validation due to duplicate records.
+		TESTL(table->GotoFirstRecord()==KErrNone);
+		DeleteRecordL(table,KErrNone);
+		TESTL(table->GotoFirstRecord()==KErrNone);
+		UpdateRecordL(table,KErrNone);
+		
+		// 14) Finally check that last record can be deleted
+		TESTL(table->GotoFirstRecord()==KErrNone);
+		DeleteRecordL(table,KErrNone);
+		}
+	TESTL(iTheDb->CommitTransaction()==KErrNone);
+
+	SetTestStepResult(EPass);	INFO_PRINTF1(_L("\t\tSUCCESS"));
+
+	CleanupStack::PopAndDestroy(); 
+	return TestStepResult();
+	}
+
+
+
+/////////////////////
+//	Test step 060.01
+/////////////////////
+
+///Panic Test
+CCommDbTest060_01::CCommDbTest060_01()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_060_01"));
+
+}
+
+CCommDbTest060_01::~CCommDbTest060_01()
+	{
+	delete iTheDb;
+	}
+
+TVerdict CCommDbTest060_01::doTestStepPreambleL()
+	{	
+	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+enum TVerdict CCommDbTest060_01::doTestStepL( void )
+	{
+	SetTestStepResult(EFail);
+	//turn-off JIT debugging...
+//	User::SetJustInTime(EFalse);
+
+	// Use the same table as step_055_01
+	CCommsDbProtectTableView* table = NULL;
+	table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
+
+	CheckTableIsNotProtectedL(table);
+
+	// Protection uses transaction, transaction within transaction is not allowed
+	// this test ensures that the ProtectTable code handles this correctly
+	if (table->GotoFirstRecord() == KErrNone)
+		{
+	    if (iTheDb->BeginTransaction() == KErrNone)
+			{
+			// Set protection from within a transaction
+			TESTL(table->ProtectTable()==KErrNone);
+	
+			CheckTableIsProtectedL(table);
+			SetTestStepResult(EPass);			INFO_PRINTF1(_L("\t\tSUCCESS"));
+				
+			iTheDb->RollbackTransaction();
+			}
+		}
+	CleanupStack::PopAndDestroy(table);
+	
+	return TestStepResult();
+	}
+
+///////////////////////////////////////////
+//	Test step 060.02
+//This test case is for testing the fix for 
+//DEF035522: CommDb protection is easily circumvented using public APIs
+////////////////////////////////////////////
+
+///Panic Test
+CCommDbTest060_02::CCommDbTest060_02()
+{
+	// store the name of this test case
+	SetTestStepName(_L("step_060_02"));
+
+}
+
+CCommDbTest060_02::~CCommDbTest060_02()
+{
+
+}
+
+enum TVerdict CCommDbTest060_02::doTestStepL( void )
+	{
+
+	SetTestStepResult(EPass);	CCommsDatabase* db = CCommsDatabase::NewL();
+	CleanupStack::PushL(db);
+	//Protect ISP the table
+	INFO_PRINTF1(_L("Protect ISP table"));
+	TRAPD(protect, ProtectISPTableL(db));
+	if( protect != KErrNone)
+		{
+		INFO_PRINTF1(_L("Failed to protect ISP table"));
+         SetTestStepResult(EFail);		return TestStepResult();
+		}
+	//try to remove the protection using public APIs
+	INFO_PRINTF1(_L("Try to remove the protection using public APIs"));
+	TRAPD(unprotect, RemoveProtectionL(db));
+	//Should return KErrNotFound
+	if (unprotect != KErrNotFound)
+		{
+		INFO_PRINTF1(_L("Protection settings broken using public APIs"));
+         SetTestStepResult(EFail);		return TestStepResult();
+		}
+	INFO_PRINTF1(_L("Table is well protected!! "));
+	CleanupStack::PopAndDestroy(db);
+	return TestStepResult();
+	}
+
+void CCommDbTest060_02::ProtectISPTableL(CCommsDatabase* aDb)
+//
+//  Protect the DialOutISP table using the hidden APIs
+//
+	{
+
+	CCommsDbProtectTableView* view = (CCommsDbProtectTableView*) aDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
+    if(view->GotoFirstRecord() == KErrNone)
+		{
+		User::LeaveIfError(view->ProtectTable());
+		}
+
+	CleanupStack::PopAndDestroy(view);
+	}
+
+
+void CCommDbTest060_02::RemoveProtectionL(CCommsDatabase* aDb)
+//
+//  Use the public CommDb APIs to modify the AccessTypeTable
+//
+	{
+	
+	aDb->ShowHiddenRecords();
+	//should fail here as its trying to open ACCESS_TYPE_TABLE
+	//leaves with KErrNotFound
+	CCommsDbTableView* view = aDb->OpenTableLC(TPtrC(ACCESS_TYPE_TABLE));
+	
+	//Shouldn't get here..
+	INFO_PRINTF1(_L("Contents of Access Type table:"));
+	while (view->GotoNextRecord() == KErrNone)
+		{
+		// display the current access settings
+		TBuf<KCommsDbSvrMaxFieldLength> name;
+		view->ReadTextL(TPtrC(TABLE_ACC_NAME), name);
+
+		TUint32 accessType;
+		view->ReadUintL(TPtrC(TABLE_ACC_TYPE), accessType);
+
+		RDebug::Print(_L("Table: '%S'\tAccess type: %d"), &name, accessType);
+
+		// now set the access type to 'updateable'
+		view->UpdateRecord();
+		view->WriteUintL(TPtrC(TABLE_ACC_TYPE), (TUint32)RDbRowSet::EUpdatable);
+		view->PutRecordChanges();
+
+		// display the new access settings
+		view->ReadUintL(TPtrC(TABLE_ACC_TYPE), accessType);
+		INFO_PRINTF3(_L("Table: '%S'\tNew access type: %d"), &name, accessType);
+		}
+
+	CleanupStack::PopAndDestroy(view);
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/src/step_063_xx.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,427 @@
+//
+// 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:
+//
+//
+//
+// This contains CommDb Unit Test Cases 063.XX
+
+// EPOC includes
+#include <commdb.h>
+#include <d32dbms.h>
+#include <badesca.h>
+#include <cdbstore.h>
+
+#include "comms-infras/commdb/protection/protectdb.h"
+#include "comms-infras/commdb/protection/protectcpdb.h"
+
+// Test system includes
+#include "Teststepcommdb.h"
+#include "step_063_xx.h"
+
+/////////////////////
+//	Test step 063.01
+/////////////////////
+
+// constructor
+CCommDbTest063_01::CCommDbTest063_01()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_063_01"));
+	}
+
+// destructor
+CCommDbTest063_01::~CCommDbTest063_01()
+	{}
+	
+enum TVerdict CCommDbTest063_01::doTestStepL( void )
+	{
+	SetTestStepResult(EPass);
+	iTheProtectedDb = CCommsDatabaseProtect::NewL();
+
+	if(iTheProtectedDb->ProtectTable(TPtrC(DIAL_OUT_ISP))!=KErrNone)
+			SetTestStepResult(EFail);
+	RDbRowSet::TAccess rowSet = RDbRowSet::EUpdatable;
+	TRAPD(ret, rowSet = iTheProtectedDb->GetTableAccessL(TPtrC(DIAL_OUT_ISP)));
+
+	if (ret != KErrNone || rowSet != RDbRowSet::EReadOnly)
+		{
+		SetTestStepResult(EFail);		}
+
+	delete iTheProtectedDb;
+	iTheProtectedDb=NULL;
+
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 063.02
+/////////////////////
+
+// constructor
+CCommDbTest063_02::CCommDbTest063_02()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_063_02"));
+	}
+
+// destructor
+CCommDbTest063_02::~CCommDbTest063_02()
+	{}
+	
+enum TVerdict CCommDbTest063_02::doTestStepL( void )
+	{
+	SetTestStepResult(EPass);
+	iTheProtectedDb = CCommsDatabaseProtect::NewL();
+
+	if(iTheProtectedDb->UnProtectTable(TPtrC(DIAL_OUT_ISP))!=KErrNone)
+		{
+		SetTestStepResult(EFail);		}
+
+	RDbRowSet::TAccess rowSet = RDbRowSet::EReadOnly;
+	TRAPD(ret, rowSet = iTheProtectedDb->GetTableAccessL(TPtrC(DIAL_OUT_ISP)));
+
+	if (ret != KErrNone || rowSet != RDbRowSet::EUpdatable)
+		{
+		SetTestStepResult(EFail);		}
+
+	delete iTheProtectedDb;
+	iTheProtectedDb=NULL;
+
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 063.03
+/////////////////////
+
+// constructor
+CCommDbTest063_03::CCommDbTest063_03()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_063_03"));
+	}
+
+// destructor
+CCommDbTest063_03::~CCommDbTest063_03()
+	{}
+	
+enum TVerdict CCommDbTest063_03::doTestStepL( void )
+	{
+	SetTestStepResult(EPass);
+	iTheProtectedDb = CCommsDatabaseProtect::NewL();
+
+	//Construct table list
+	CPtrCArray* tableArray;
+	tableArray = new (ELeave) CPtrCArray(2);
+	CleanupStack::PushL(tableArray);
+
+	TRAPD(ret, tableArray->InsertL(0,DIAL_OUT_ISP));
+	if (ret != KErrNone)
+		{
+		SetTestStepResult(EFail);		CleanupStack::PopAndDestroy(tableArray);
+		delete iTheProtectedDb;
+		iTheProtectedDb=NULL;
+		return TestStepResult();
+		}
+
+	TRAP(ret, tableArray->InsertL(1,DIAL_IN_ISP));
+	if (ret != KErrNone)
+		{
+		SetTestStepResult(EFail);		CleanupStack::PopAndDestroy(tableArray);
+		delete iTheProtectedDb;
+		iTheProtectedDb=NULL;
+		return TestStepResult();
+		}
+	
+	if(iTheProtectedDb->ProtectTables(*tableArray) != KErrNone)
+		{
+		SetTestStepResult(EFail);		CleanupStack::PopAndDestroy(tableArray);
+		delete iTheProtectedDb;
+		iTheProtectedDb=NULL;
+		return TestStepResult();
+		}
+
+	RDbRowSet::TAccess rowSet = RDbRowSet::EUpdatable;
+	TRAP(ret, rowSet = iTheProtectedDb->GetTableAccessL(TPtrC(DIAL_IN_ISP)));
+
+	if (ret != KErrNone || rowSet != RDbRowSet::EReadOnly)
+		{
+		SetTestStepResult(EFail);		}
+
+	CleanupStack::PopAndDestroy(tableArray);
+
+	delete iTheProtectedDb;
+	iTheProtectedDb=NULL;
+
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 063.04
+/////////////////////
+
+// constructor
+CCommDbTest063_04::CCommDbTest063_04()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_063_04"));
+	}
+
+// destructor
+CCommDbTest063_04::~CCommDbTest063_04()
+	{}
+	
+enum TVerdict CCommDbTest063_04::doTestStepL( void )
+	{
+	SetTestStepResult(EPass);
+	iTheProtectedDb = CCommsDatabaseProtect::NewL();
+
+	//Construct table list
+	CPtrCArray* tableArray;
+	tableArray = new (ELeave) CPtrCArray(2);
+	CleanupStack::PushL(tableArray);
+
+	TRAPD(ret, tableArray->InsertL(0,DIAL_OUT_ISP));
+	if (ret != KErrNone)
+		{
+		SetTestStepResult(EFail);		CleanupStack::PopAndDestroy(tableArray);
+		delete iTheProtectedDb;
+		iTheProtectedDb=NULL;
+		return TestStepResult();
+		}
+
+	TRAP(ret, tableArray->InsertL(1,DIAL_IN_ISP));
+	if (ret != KErrNone)
+		{
+		SetTestStepResult(EFail);		CleanupStack::PopAndDestroy(tableArray);
+		delete iTheProtectedDb;
+		iTheProtectedDb=NULL;
+		return TestStepResult();
+		}
+
+	if(iTheProtectedDb->UnprotectTables(*tableArray) != KErrNone)
+		{
+		SetTestStepResult(EFail);		CleanupStack::PopAndDestroy(tableArray);
+		delete iTheProtectedDb;
+		iTheProtectedDb=NULL;
+		return TestStepResult();
+		}
+
+	RDbRowSet::TAccess rowSet = RDbRowSet::EReadOnly;
+	TRAP(ret, rowSet = iTheProtectedDb->GetTableAccessL(TPtrC(DIAL_IN_ISP)));
+
+	if (ret != KErrNone || rowSet != RDbRowSet::EUpdatable)
+		{
+		SetTestStepResult(EFail);		}
+
+	CleanupStack::PopAndDestroy(tableArray);
+
+	delete iTheProtectedDb;
+	iTheProtectedDb=NULL;
+
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 063.05
+/////////////////////
+
+// constructor
+CCommDbTest063_05::CCommDbTest063_05()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_063_05"));
+	}
+
+// destructor
+CCommDbTest063_05::~CCommDbTest063_05()
+	{
+	}
+	
+enum TVerdict CCommDbTest063_05::doTestStepL( void )
+	{	
+	SetTestStepResult(EPass);	TBool val=0;
+	iTheProtectedDb = CCommsDatabaseProtect::NewL(val);
+	if(iTheProtectedDb->ProtectTable(TPtrC(DIAL_OUT_ISP)) != KErrNone)
+		{
+		SetTestStepResult(EFail);		}
+	RDbRowSet::TAccess rowSet = RDbRowSet::EUpdatable;
+	TRAPD(ret, rowSet = iTheProtectedDb->GetTableAccessL(TPtrC(DIAL_OUT_ISP)));
+	if (ret != KErrNone || rowSet != RDbRowSet::EReadOnly)
+		{
+		SetTestStepResult(EFail);		}
+	delete iTheProtectedDb;
+	iTheProtectedDb=NULL;
+    return TestStepResult();
+	}
+		
+	/////////////////////
+//	Test step 063.06
+/////////////////////
+
+// constructor
+CCommDbTest063_06::CCommDbTest063_06()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_063_06"));
+	}
+
+// destructor
+CCommDbTest063_06::~CCommDbTest063_06()
+	{
+	}
+	
+enum TVerdict CCommDbTest063_06::doTestStepL( void )
+	{
+	SetTestStepResult(EPass);    TBool val=0;
+	iTheProtectedDb = CCommsDatabaseProtect::NewL(val);
+	if(iTheProtectedDb->UnProtectTable(TPtrC(DIAL_OUT_ISP)) != KErrNone)
+		{
+		SetTestStepResult(EFail);		}
+	RDbRowSet::TAccess rowSet = RDbRowSet::EReadOnly;
+	TRAPD(ret, rowSet = iTheProtectedDb->GetTableAccessL(TPtrC(DIAL_OUT_ISP)));
+	if (ret != KErrNone || rowSet != RDbRowSet::EUpdatable)
+		{
+		SetTestStepResult(EFail);		}
+	delete iTheProtectedDb;
+	iTheProtectedDb=NULL;
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 063.07
+/////////////////////
+
+// constructor
+CCommDbTest063_07::CCommDbTest063_07()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_063_07"));
+	}
+
+// destructor
+CCommDbTest063_07::~CCommDbTest063_07()
+	{
+	}
+	
+enum TVerdict CCommDbTest063_07::doTestStepL( void )
+	{
+	SetTestStepResult(EPass);	TBool val=0;
+	iTheProtectedDb = CCommsDatabaseProtect::NewL(val);
+	//Construct table list
+	CPtrCArray* tableArray = new (ELeave) CPtrCArray(2);
+	CleanupStack::PushL(tableArray);
+	TRAPD(ret, tableArray->InsertL(0,DIAL_OUT_ISP));
+	if (ret != KErrNone)
+		{
+		SetTestStepResult(EFail);		CleanupStack::PopAndDestroy(tableArray);
+		delete iTheProtectedDb;
+		iTheProtectedDb=NULL;
+		return TestStepResult();
+		}
+	TRAP(ret, tableArray->InsertL(1,DIAL_IN_ISP));
+	if (ret != KErrNone)
+		{
+		SetTestStepResult(EFail);		CleanupStack::PopAndDestroy(tableArray);
+		delete iTheProtectedDb;
+		iTheProtectedDb=NULL;
+		return TestStepResult();
+		}	
+	if(iTheProtectedDb->ProtectTables(*tableArray) != KErrNone)
+		{
+		SetTestStepResult(EFail);		CleanupStack::PopAndDestroy(tableArray);
+		delete iTheProtectedDb;
+		iTheProtectedDb=NULL;
+		return TestStepResult();
+		}
+	RDbRowSet::TAccess rowSet = RDbRowSet::EUpdatable;
+	TRAP(ret, rowSet = iTheProtectedDb->GetTableAccessL(TPtrC(DIAL_IN_ISP)));
+	if (ret != KErrNone || rowSet != RDbRowSet::EReadOnly)
+		{
+		SetTestStepResult(EFail);		}
+	CleanupStack::PopAndDestroy(tableArray);
+	delete iTheProtectedDb;
+	iTheProtectedDb=NULL;
+	return TestStepResult();
+	}
+
+/////////////////////
+//	Test step 063.08
+/////////////////////
+
+// constructor
+CCommDbTest063_08::CCommDbTest063_08()
+	{
+	// store the name of this test case
+	SetTestStepName(_L("step_063_08"));
+	}
+
+// destructor
+CCommDbTest063_08::~CCommDbTest063_08()
+	{
+	}
+	
+enum TVerdict CCommDbTest063_08::doTestStepL( void )
+	{
+	SetTestStepResult(EPass);	TBool val=0;
+	iTheProtectedDb = CCommsDatabaseProtect::NewL(val);
+	//Construct table list
+	CPtrCArray* tableArray = new (ELeave) CPtrCArray(2);
+	CleanupStack::PushL(tableArray);
+	TRAPD(ret, tableArray->InsertL(0,DIAL_OUT_ISP));
+	if (ret != KErrNone)
+		{
+		SetTestStepResult(EFail);		CleanupStack::PopAndDestroy(tableArray);
+		delete iTheProtectedDb;
+		iTheProtectedDb=NULL;
+		return TestStepResult();
+		}
+	TRAP(ret, tableArray->InsertL(1,DIAL_IN_ISP));
+	if (ret != KErrNone)
+		{
+		SetTestStepResult(EFail);		CleanupStack::PopAndDestroy(tableArray);
+		delete iTheProtectedDb;
+		iTheProtectedDb=NULL;
+		return TestStepResult();
+		}
+	if(iTheProtectedDb->UnprotectTables(*tableArray) != KErrNone)
+		{
+		SetTestStepResult(EFail);		CleanupStack::PopAndDestroy(tableArray);
+		delete iTheProtectedDb;
+		iTheProtectedDb=NULL;
+		return TestStepResult();
+		}
+	RDbRowSet::TAccess rowSet = RDbRowSet::EReadOnly;
+	TRAP(ret, rowSet = iTheProtectedDb->GetTableAccessL(TPtrC(DIAL_IN_ISP)));
+	if (ret != KErrNone || rowSet != RDbRowSet::EUpdatable)
+		{
+		SetTestStepResult(EFail);		}
+	CleanupStack::PopAndDestroy(tableArray);
+	delete iTheProtectedDb;
+	iTheProtectedDb=NULL;
+	return TestStepResult();
+	}
+	
+
+
+
+	
+	
+	
+	
+	
+	
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/bwins/TE_cdmacommdbsettingsSVRU.DEF	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,2 @@
+EXPORTS
+	?NewServer@@YAHXZ @ 1 NONAME ; int __cdecl NewServer(void)
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/config/te_cdmacommdbsettings.cfg	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,360 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommDB Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## Network
+## 
+[Network]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Intranet
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=mRouter
+	FIELD_COUNT=1
+END_ADD
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+
+############################################################
+## LANBearer
+## 
+[LANBearer]
+
+############################################################
+##VirtualBearer
+## 
+[VirtualBearer]
+
+############################################################
+##VpnService
+## 
+
+############################################################
+## Location
+## 
+[Location]
+############################################################
+## Location
+## 
+[Location]
+ADD_TEMPLATE
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=8
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Office
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	DialOutCode=9,
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=10
+END_ADD
+
+############################################################
+## Chargecard
+## 
+[Chargecard]
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_SECTION
+	WAPAccessPoint=1
+	RedialAttempts=3
+	#SmsBearer=1
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ConnectionAttempts=2
+	ModemForDataAndFax=2
+	ModemForPhoneServicesAndSMS=2
+	LocationForDataAndFax=2
+	LocationForPhoneServicesAndSMS=2
+	DefaultNetwork=1
+	BearerAvailabilityCheckTSY=mm
+	CDMAOperationCapability=4
+	CDMASimpleIpMaxNumNai=5
+	CDMASimpleIpMaxNaiLength=72
+	CDMASimpleIpMaxSsLength=100
+	CDMASimpleIpAuthSupported=3
+	CDMAMobileIpMaxNumNai=5
+	CDMAMobileIpMaxNAILength=72
+	CDMAMobileIpMaxMnAaaSsLength=100
+	CDMAMobileIpMnAaaAuthAlgorithm=1
+	CDMAMobileIpMaxMnHaSsLength=100
+	CDMAMobileIpMnHaAuthAlgorithm=1
+	FIELD_COUNT=24
+END_ADD
+
+
+############################################################
+## DialOutISP
+## 
+[DialOutISP]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=NT RAS
+	Description=Test
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=TRUE
+	LoginScript=CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfServerMode=TRUE
+	IfAuthName=RasUser
+	IfAuthPass=pass
+	AuthRetries=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	Ip6DNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=TRUE
+	FIELD_COUNT=21
+END_ADD
+
+############################################################
+## DialInISP
+## 
+[DialInISP]
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+
+############################################################
+## IncomingGPRS
+## 
+[IncomingGPRS]
+
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+
+
+############################################################
+## CDMA2000PacketServiceTable
+## 
+[CDMA2000PacketServiceTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Mobile IP
+	IwfName=Test2000
+	ServiceOption=HIGHSPEEDCDMA2000DATA
+	PdpType=IPV4
+	ReqFwdPriority=PRIORITY04
+	ReqRevPriority=PRIORITY04
+	ReqFwdBitrate=32KBPS
+	ReqRevBitrate=32KBPS
+	ReqFwdLoss=LOSS1
+	ReqRevLoss=LOSS1
+	ReqFwdMaxdelay=40MS
+	ReqRevMaxdelay=40MS
+	MinFwdBitrate=32KBPS
+	MinRevBitrate=32KBPS
+	AccptFwdLoss=LOSS2
+	AccptRevLoss=LOSS2
+	AccptFwdMaxdelay=120MS
+	AccptRevMaxdelay=120MS
+	EnableSWComp=TRUE
+	EnableIPHeaderComp=TRUE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfExternIpConfigAlwaysRejectAuth=FALSE
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	IfAuthPass=pass
+	AuthRetries=1
+	IpNetMask=1.1.1.1
+	IpGateway=1.1.1.1
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	Ip6DNSAddrFromServer=TRUE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	ApType=2
+	QosWarningTimeout=1000000
+	RlpMode=TRANSPARENT
+ 	CDMAMobileIPTimeout=10000000
+	CDMANaiType=1
+	CDMASimpleIpAuthAlgorithm=3
+	CDMASimpleIpPapSsHandle=11
+	CDMASimpleIpChapSsHandle=12
+	CDMAMobileIpTBit=0
+	CDMAMobileIpHomeAddress=1.2.3.4
+	CDMAMobileIpPrimaryHomeAgent=1.2.3.4
+	CDMAMobileIpSecondaryHomeAgent=1.2.3.4
+	CDMAMobileIpMnAaaAuthAlgorithm=1
+	CDMAMobileIpMnAaaSpiIndicator=TRUE
+	CDMAMobileIpMnAaaSpi=1
+	CDMAMobileIpMnAaaSsData=MnAaSsDataLongerThan128Bits
+	CDMAMobileIpMnHaAuthAlgorithm=1
+	CDMAMobileIpMnHaSpiIndicator=TRUE
+	CDMAMobileIpMnHaSpi=1
+	CDMAMobileIpMnHaSsData=MnHaSsDataLongerThan128Bits
+	CDMAFchMux=1
+	CDMASchMux=2
+	FIELD_COUNT=56
+END_ADD
+
+
+############################################################
+## DefaultCDMA2000SettingsTable
+## 
+[DefaultCDMA2000SettingsTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Default
+	Usage=1
+	IwfName=Test2000
+	ServiceOption=HIGHSPEEDCDMA2000DATA
+	PdpType=IPV4
+	PdpAddress=1.2.3.4
+	ReqFwdPriority=PRIORITY04
+	ReqRevPriority=PRIORITY04
+	ReqFwdBitrate=32KBPS
+	ReqRevBitrate=32KBPS
+	ReqFwdLoss=LOSS1
+	ReqRevLoss=LOSS1
+	ReqFwdMaxdelay=40MS
+	ReqRevMaxdelay=40MS
+	MinFwdBitrate=32KBPS
+	MinRevBitrate=32KBPS
+	AccptFwdLoss=LOSS2
+	AccptRevLoss=LOSS2
+	AccptFwdMaxdelay=120MS
+	AccptRevMaxdelay=120MS
+	EnableIPHeaderComp=TRUE
+	AnonymousAccess=FALSE
+	CDMAMobileIp=TRUE
+	HomeAgentAddress=1.2.3.4
+	CDMAMobileIPTimeout=100
+	CDMAOperationMode=1
+	CDMAMobileIpMaxNumRetry=2
+	CDMAMobileIpFirstRetryTimeout=10000000
+	CDMAMobileIpReregThreshold=11
+	CDMAFchMux=1
+	CDMASchMux=2
+	FIELD_COUNT=31
+END_ADD
+
+
+############################################################
+## LANService
+## 
+[LANService]
+
+
+############################################################
+## IAP
+## 
+[IAP]
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+
+############################################################
+## BTDeviceTable
+## 
+[BTDeviceTable]
+
+############################################################
+## BTSecurityTable
+## 
+[BTSecurityTable]
+
+############################################################
+## BTDefaultTable
+## 
+[BTDefaultTable]
+
+############################################################
+## Proxies
+## 
+[Proxies]
+
+
+
+############################################################
+## AgentLookup
+## 
+[AgentLookup]
+
+############################################################
+## WAPAccessPoint
+## 
+[WAPAccessPoint]
+ADD_TEMPLATE
+	Name=Default Dial In ISP
+	CurrentBearer=WAPIPBearer
+	FIELD_COUNT=2
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Dummy WAP Settings
+	CurrentBearer=WAPIPBearer
+	StartPage=www.wapstart.com
+	FIELD_COUNT=3
+END_ADD
+
+############################################################
+## WAPIPBearer
+## 
+[WAPIPBearer]
+
+
+############################################################
+## WAPSMSBearer
+## 
+[WAPSMSBearer]
+
+
+############################################################
+## SecureSocketTable
+## 
+[SecureSocketTable]
+
+
+############################################################
+## BTPersistTable
+## 
+[BTPersistTable]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/config/te_cdmacommdbsettings.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,25 @@
+[ServerInit]
+DoStartServerFirst = false
+MicrosecsToServerConn = 0
+MicrosecsToClientConn = 0
+
+ClientIAPID = 3
+ClientIPAddress = 192.168.99.1
+ClientPPPMaxFailureCount = 100
+ClientPPPMaxRestartCount = 100
+ClientPPPRestartPeriod   = 10
+ClientPPPLRDPeriod       = 15
+	
+ServerIAPID=4
+ServerIPAddress = 192.168.99.2
+ServerPPPMaxFailureCount  = 100
+ServerPPPMaxRestartCount  = 100
+ServerPPPRestartPeriod    = 10
+ServerPPPLRDPeriod        = 15
+
+
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/config/te_cdmacommdbsettings.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+//
+// 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:
+//
+//
+-->
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+    <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+    <Network operation="add">
+        <Name>mRouter</Name>
+    </Network>
+</NetworkTable>
+
+<IAPTable>
+</IAPTable>
+
+<ModemBearerTable>
+</ModemBearerTable>
+
+<LANBearerTable>
+</LANBearerTable>
+
+<LANServiceTable>
+</LANServiceTable>
+
+<DialInISPTable>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="add">
+        <Name>NT RAS</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>TRUE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Ip6DNSAddrFromServer>TRUE</Ip6DNSAddrFromServer>
+        <Description>Test</Description>
+        <Type>INTERNETONLY</Type>
+        <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND &quot;CLIENT&quot;+&lt;0x0d&gt;\nWAIT 3\n{\n&quot;SERVER&quot; OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfServerMode>TRUE</IfServerMode>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>TRUE</EnableSWComp>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+    <CDMA2000PacketService operation="add">
+        <Name>Mobile IP</Name>
+        <IwfName>Test2000</IwfName>
+        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
+        <PdpType>IPV4</PdpType>
+        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
+        <ReqRevPriority>PRIORITY04</ReqRevPriority>
+        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
+        <ReqRevBitrate>32KBPS</ReqRevBitrate>
+        <ReqFwdLoss>LOSS1</ReqFwdLoss>
+        <ReqRevLoss>LOSS1</ReqRevLoss>
+        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
+        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
+        <MinFwdBitrate>32KBPS</MinFwdBitrate>
+        <MinRevBitrate>32KBPS</MinRevBitrate>
+        <AccptFwdLoss>LOSS2</AccptFwdLoss>
+        <AccptRevLoss>LOSS2</AccptRevLoss>
+        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
+        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfExternIpConfigAlwaysRejectAuth>TRUE</IfExternIpConfigAlwaysRejectAuth>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <AuthRetries>1</AuthRetries>
+        <IpNetMask>1.1.1.1</IpNetMask>
+        <IpGateway>1.1.1.1</IpGateway>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <ApType>2</ApType>
+        <QosWarningTimeout>1000000</QosWarningTimeout>
+        <Ip6DNSAddrFromServer>TRUE</Ip6DNSAddrFromServer>
+        <RlpMode>TRANSPARENT</RlpMode>
+        <CDMANaiType>1</CDMANaiType>
+        <CDMASimpleIpAuthAlgorithm>3</CDMASimpleIpAuthAlgorithm>
+        <CDMASimpleIpPapSsHandle>11</CDMASimpleIpPapSsHandle>
+        <CDMASimpleIpChapSsHandle>12</CDMASimpleIpChapSsHandle>
+        <CDMAMobileIpTBit>0</CDMAMobileIpTBit>
+        <CDMAMobileIpHomeAddress>1.2.3.4</CDMAMobileIpHomeAddress>
+        <CDMAMobileIpPrimaryHomeAgent>1.2.3.4</CDMAMobileIpPrimaryHomeAgent>
+        <CDMAMobileIpSecondaryHomeAgent>1.2.3.4</CDMAMobileIpSecondaryHomeAgent>
+        <CDMAMobileIpMnAaaAuthAlgorithm>1</CDMAMobileIpMnAaaAuthAlgorithm>
+        <CDMAMobileIpMnAaaSpiIndicator>TRUE</CDMAMobileIpMnAaaSpiIndicator>
+        <CDMAMobileIpMnAaaSpi>1</CDMAMobileIpMnAaaSpi>
+        <CDMAMobileIpMnAaaSsData>MnAaaSsHandleLongerThan128Bits</CDMAMobileIpMnAaaSsData>
+        <CDMAMobileIpMnHaAuthAlgorithm>1</CDMAMobileIpMnHaAuthAlgorithm>
+        <CDMAMobileIpMnHaSpiIndicator>TRUE</CDMAMobileIpMnHaSpiIndicator>
+        <CDMAMobileIpMnHaSpi>1</CDMAMobileIpMnHaSpi>
+        <CDMAMobileIpMnHaSsData>MnHaSsHandleLongerThan128Bits</CDMAMobileIpMnHaSsData>
+        <CDMAFchMux>1</CDMAFchMux>
+        <CDMASchMux>2</CDMASchMux>
+    </CDMA2000PacketService>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+	 <DefaultCDMA2000 operation="add">
+	 	<Name>Default</Name>
+	 	<Usage>1</Usage>
+		<IwfName>Test2000</IwfName>
+		<ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
+		<PdpType>IPV4</PdpType>
+		<PdpAddress>1.2.3.4</PdpAddress>
+		<ReqFwdPriority>PRIORITY04</ReqFwdPriority>
+		<ReqRevPriority>PRIORITY04</ReqRevPriority>
+		<ReqFwdBitrate>32KBPS</ReqFwdBitrate>
+		<ReqRevBitrate>32KBPS</ReqRevBitrate>
+		<ReqFwdLoss>LOSS1</ReqFwdLoss>
+		<ReqRevLoss>LOSS1</ReqRevLoss>
+		<ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
+		<ReqRevMaxdelay>40MS</ReqRevMaxdelay>
+		<MinFwdBitrate>32KBPS</MinFwdBitrate>
+		<MinRevBitrate>32KBPS</MinRevBitrate>
+		<AccptFwdLoss>LOSS2</AccptFwdLoss>
+		<AccptRevLoss>LOSS2</AccptRevLoss>
+		<AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
+		<AccptRevMaxdelay>120MS</AccptRevMaxdelay>
+		<EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
+		<AnonymousAccess>FALSE</AnonymousAccess>
+		<HomeAgentAddress>1.2.3.4</HomeAgentAddress>
+		<CDMAOperationMode>1</CDMAOperationMode>
+		<CDMAMobileIPTimeout>100</CDMAMobileIPTimeout>
+		<CDMAMobileIpMaxNumRetry>2</CDMAMobileIpMaxNumRetry>
+		<CDMAMobileIpFirstRetryTimeout>10000000</CDMAMobileIpFirstRetryTimeout>
+		<CDMAMobileIpReregThreshold>11</CDMAMobileIpReregThreshold>
+        <CDMAFchMux>1</CDMAFchMux>
+        <CDMASchMux>2</CDMASchMux>
+	 </DefaultCDMA2000>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+    <Chargecard operation="add">
+        <Name>ChargecardTable1</Name>
+    </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <WAPAccess>WAPAccessPoint.Default Dial In ISP</WAPAccess>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsReceiveMode>2</SmsReceiveMode>
+        <GPRSAttachMode>1</GPRSAttachMode>
+        <AcceptIncomingGprs>1</AcceptIncomingGprs>
+        <ConnectionAttempts>2</ConnectionAttempts>
+        <ModemForDataAndFax>2</ModemForDataAndFax>
+        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
+        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
+        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
+        <GPRSClassCBearer>GSM</GPRSClassCBearer>
+        <DefaultNetwork>Network.Intranet</DefaultNetwork>
+        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
+        <CDMAOperationCapability>4</CDMAOperationCapability>
+        <CDMASimpleIpMaxNumNai>5</CDMASimpleIpMaxNumNai>
+        <CDMASimpleIpMaxNaiLength>72</CDMASimpleIpMaxNaiLength>
+        <CDMASimpleIpMaxSsLength>100</CDMASimpleIpMaxSsLength>
+        <CDMASimpleIpAuthSupported>3</CDMASimpleIpAuthSupported>
+        <CDMAMobileIpMaxNumNai>5</CDMAMobileIpMaxNumNai>
+        <CDMAMobileIpMaxNAILength>72</CDMAMobileIpMaxNAILength>
+        <CDMAMobileIpMaxMnAaaSsLength>100</CDMAMobileIpMaxMnAaaSsLength>
+        <CDMAMobileIpMnAaaAuthAlgorithm>1</CDMAMobileIpMnAaaAuthAlgorithm>
+        <CDMAMobileIpMaxMnHaSsLength>100</CDMAMobileIpMaxMnHaSsLength>
+        <CDMAMobileIpMnHaAuthAlgorithm>1</CDMAMobileIpMnHaAuthAlgorithm>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+</DefaultGPRSTable>
+
+<ProxyTable>
+</ProxyTable>
+
+<LocationTable>
+    <Location operation="template">
+        <Name>Default Location</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+        <DialOutCode>9,</DialOutCode>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+    <WAPAccessPoint operation="template">
+        <Name>Default Dial In ISP</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+    </WAPAccessPoint>
+    <WAPAccessPoint operation="add">
+        <Name>Dummy WAP Settings</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+        <StartPage>www.wapstart.com</StartPage>
+    </WAPAccessPoint>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/group/bld.inf	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,54 @@
+// BLD.INF
+// Component description file 
+//
+//
+// 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:
+//
+//
+
+
+PRJ_TESTEXPORTS
+
+// for winscw
+../scripts/te_cdmacommdbsettings.script     /epoc32/release/winscw/udeb/z/testdata/scripts/te_cdmacommdbsettings.script
+../config/te_cdmacommdbsettings.cfg         /epoc32/release/winscw/udeb/z/testdata/configs/te_cdmacommdbsettings.cfg 
+../config/te_cdmacommdbsettings.xml	    /epoc32/release/winscw/udeb/z/testdata/configs/te_cdmacommdbsettings.xml
+
+// for winscw (urel)
+../scripts/te_cdmacommdbsettings.script     /epoc32/release/winscw/urel/z/testdata/scripts/te_cdmacommdbsettings.script
+../config/te_cdmacommdbsettings.cfg         /epoc32/release/winscw/urel/z/testdata/configs/te_cdmacommdbsettings.cfg 
+../config/te_cdmacommdbsettings.xml	    /epoc32/release/winscw/urel/z/testdata/configs/te_cdmacommdbsettings.xml
+
+
+
+
+// for wins
+../scripts/te_cdmacommdbsettings.script     /epoc32/release/wins/udeb/z/testdata/scripts/te_cdmacommdbsettings.script
+../config/te_cdmacommdbsettings.cfg         /epoc32/release/wins/udeb/z/testdata/configs/te_cdmacommdbsettings.cfg 
+../config/te_cdmacommdbsettings.xml	    /epoc32/release/wins/udeb/z/testdata/configs/te_cdmacommdbsettings.xml	
+
+// for wins (urel)
+../scripts/te_cdmacommdbsettings.script     /epoc32/release/wins/urel/z/testdata/scripts/te_cdmacommdbsettings.script
+../config/te_cdmacommdbsettings.cfg         /epoc32/release/wins/urel/z/testdata/configs/te_cdmacommdbsettings.cfg 
+../config/te_cdmacommdbsettings.xml	    /epoc32/release/wins/urel/z/testdata/configs/te_cdmacommdbsettings.xml	
+
+
+
+// ROM
+../group/te_cdmacommdbsettings.iby 	/epoc32/rom/include/te_cdmacommdbsettings.iby 
+
+PRJ_TESTMMPFILES
+
+te_cdmacommdbsettings.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/group/te_cdmacommdbsettings.iby	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,16 @@
+#ifndef __TE_CDMACOMMDBSETTINGS_IBY__
+#define __TE_CDMACOMMDBSETTINGS_IBY__
+
+#include <testexecute.iby>
+
+file=ABI_DIR\DEBUG_DIR\te_cdmacommdbsettingssvr.exe		System\bin\te_cdmacommdbsettingssvr.exe
+
+data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\te_cdmacommdbsettings.cfg  testdata\configs\te_cdmacommdbsettings.cfg
+data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\te_cdmacommdbsettings.xml 	testdata\configs\te_cdmacommdbsettings.xml
+
+data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\te_cdmacommdbsettings.script   testdata\scripts\te_cdmacommdbsettings.script
+
+#endif
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/group/te_cdmacommdbsettings.mmp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,45 @@
+// te_cdmacommdbsettings.mmp
+//
+// 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:
+//
+//
+// Using relative paths for sourcepath and user includes
+
+TARGET      te_cdmacommdbsettingssvr.exe
+TARGETTYPE  exe
+UID             0x1000007A 0x102014E6
+VENDORID 0x70000001
+
+
+
+SOURCEPATH  ../src
+SOURCE	    ../src/te_cdmacommdbsettingssvr.cpp
+SOURCE	    ../src/Cdma2000settingsstep.cpp	
+
+		
+
+USERINCLUDE    ../inc
+SYSTEMINCLUDE  /epoc32/include
+SYSTEMINCLUDE  /epoc32/include/test
+
+LIBRARY		testexecutelogclient.lib
+LIBRARY		testexecuteutils.lib
+LIBRARY     	euser.lib
+LIBRARY         commdb.lib
+
+CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/inc/Cdma2000settingsstep.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,69 @@
+//
+//
+// 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:
+//
+//
+//
+
+/**
+ @file
+ @internalComponent
+ 
+ Interface for CDMA2000 CommDB settings test.
+ */
+ 
+#ifndef __CDMA2000SETTINGSSTEP_H__
+#define __CDMA2000SETTINGSSTEP_H__
+
+#include "te_cdmacommdbsettingssvr.h"
+
+#include <testexecutestepbase.h>
+#include <commdb.h>
+
+namespace te_Cdma2000CommDbSettings
+	{
+/**
+ Defines CDMA2000 CommDB settings test.
+ 
+ @internalComponent
+ @test
+ */
+class CCdma2000SettingsTestStep: public CTestStep
+	{
+public:
+	CCdma2000SettingsTestStep();
+	~CCdma2000SettingsTestStep();
+	TVerdict doTestStepL();
+	
+private:
+	void CloseCommDbTable();
+	void OpenCommDbTableL(const TPtrC& aTableName);
+	TBool CheckTableTBool(const TPtrC aCommDbTableCols[]);
+	TBool CheckTableTUint32(const TPtrC aCommDbTableCols[]);
+	TBool CheckTableText(const TPtrC aCommDbTableCols[]);
+	void DoTestSequenceL();	
+	
+	/** CommDB  */
+	CCommsDatabase*		iCommDb;
+	
+	/** A view on CommDB used to access columns */
+	CCommsDbTableView*	iCommDbView;	
+	};
+	
+_LIT(KCdma2000SettingsStep, "CCdma2000SettingsStep");	
+	}
+
+
+#endif // __CDMA2000SETTINGSSTEP_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/inc/te_cdmacommdbsettingssvr.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,51 @@
+//
+//
+// 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:
+//
+//
+//
+
+/**
+ @file 
+ @internalComponent
+ 
+ 
+ Standard TestExecute server header:
+ */
+
+
+#ifndef __TE_Cdma2000settingsSVR_H__
+#define __TE_Cdma2000settingsSVR_H__
+
+#include <testexecuteserverbase.h>
+
+/**
+TestSuite server
+
+@internalComponent
+@test
+*/
+class CTe_Cdma2000CommdbSettingsSvr : public CTestServer
+	{
+public:
+	static CTe_Cdma2000CommdbSettingsSvr* NewL();
+	virtual CTestStep* CreateTestStep(const TDesC& aStepName);
+	RFs& Fs(){return iFs;};
+
+private:
+	RFs iFs;
+	};
+	
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/scripts/te_cdmacommdbsettings.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,76 @@
+//
+//
+// 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:
+//
+//
+//
+
+
+//! @file 
+//! @internalComponent
+//! @brief Tests CDMA2000 CommDB settings.
+//!
+//! This test runs using the TestExecute framework using the following test list entry:
+//!  TESTEXECUTE,logs\\testexecute\\te_cdmacommdbsettingssvr.htm
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+PRINT Running CDMA2000 CommDB settings tests.
+LOAD_SUITE te_cdmacommdbsettingssvr 
+
+
+
+PRINT Configuring CommDB with CDMA2000 Settings using CFG file format...
+CED -i z:\testdata\configs\te_cdmacommdbsettings.cfg
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+
+
+START_TESTCASE					COMINF-commdb-0601
+//! @SYMTestCaseID				COMINF-commdb-0601
+//! @SYMTestCaseDesc 			Verifies that CDMA2000 CommDB settings are accessible
+//! @SYMFssID					CDMA/Networking/Netinfra/COMMDB
+//! @SYMFssID					CDMA/Networking/Settings/NAI/STOR
+//! @SYMTestStatus 				Implemented
+//! @SYMTestPriority			Critical
+//! @SYMTestActions 			See SGL.GT0161.307 CDMA2000 CommDB Settings Test Specification document
+//! @SYMTestExpectedResults 	See SGL.GT0161.307 CDMA2000 CommDB Settings Test Specification document
+RUN_TEST_STEP 20 te_cdmacommdbsettingssvr CCdma2000SettingsStep  
+END_TESTCASE					COMINF-commdb-0601
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+PRINT Configuring CommDB with CDMA2000 Settings using XML file format...
+CED -i z:\testdata\configs\te_cdmacommdbsettings.xml
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+
+START_TESTCASE					COMINF-commdb-0602
+//! @SYMTestCaseID				COMINF-commdb-0602
+//! @SYMTestCaseDesc 			Verifies that CDMA2000 CommDB settings are accessible
+//! @SYMFssID					CDMA/Networking/Netinfra/COMMDB
+//! @SYMFssID					CDMA/Networking/Settings/NAI/STOR
+//! @SYMTestStatus 				Implemented
+//! @SYMTestPriority			Critical
+//! @SYMTestActions 			See SGL.GT0161.307 CDMA2000 CommDB Settings Test Specification document
+//! @SYMTestExpectedResults 	See SGL.GT0161.307 CDMA2000 CommDB Settings Test Specification document
+RUN_TEST_STEP 20 te_cdmacommdbsettingssvr CCdma2000SettingsStep 
+END_TESTCASE					COMINF-commdb-0602
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/src/Cdma2000settingsstep.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,513 @@
+//
+//
+// 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:
+//
+//
+//
+
+/**
+ @file 
+ @internalComponent 
+ 
+ CommDB CDMA2000 Settings test implementation
+ */
+
+#include "Cdma2000settingsstep.h"
+#include <testexecutelog.h>
+
+#include <e32std.h>
+#include <e32base.h>
+
+using namespace te_Cdma2000CommDbSettings;
+
+namespace
+	{
+	// "End of table" marker.
+	_LIT(KNoMoreEntriesLit, "NO_MORE_ENTRIES");
+	const TPtrC KNoMoreEntries(KNoMoreEntriesLit);
+	
+	
+	//
+	// CDMA2000 CommDB column constants:
+	//
+	// These constants are defined in cdbcols.h and are used 
+	// to access CDMA related settings via CommDB. Some constants in the 
+	// are aliased to the generic SERVICE_xxx constants, e.g
+	//
+	// #define CDMA_ENABLE_IP_HEADER_COMP  SERVICE_ENABLE_IP_HEADER_COMP
+	//
+	// The tables below may contain entries for both the SERVICE_xxx constant
+	// and the corresponding CDMA_xxx constant. The purpose of this duplication is 
+	// to verify that the particular field is accessible via both the SERVICE and the CDMA 
+	// constant. The SERVICE_xxx constants are typically used by the sytem (e.g. PPP) to access 
+	// settings common to all the service tables. The specific CDMA_xxx constants may be used by CDMA 
+	// specific code to manipulate CDMA tables only.
+		
+	// GlobalSettings table: TUint32 values.
+	const TPtrC KCdmaGlobalSettingsTableTUint32[] =
+		{		
+		CDMA_OP_CAPABILITY,
+		CDMA_SIMIP_MAX_NUM_NAI,
+		CDMA_SIMIP_MAX_NAI_LENGTH,
+		CDMA_SIMIP_MAX_SS_LENGTH,
+		CDMA_SIMIP_AUTH_SUPPORTED,
+		CDMA_MIP_MAX_NUM_NAI,
+		CDMA_MIP_MAX_NAI_LENGTH,
+		CDMA_MIP_MAX_MN_AAA_SS_LENGTH,
+		CDMA_MIP_MN_AAA_AUTH_ALGORITHM,
+		CDMA_MIP_MAX_MN_HA_SS_LENGTH,
+		CDMA_MIP_MN_HA_AUTH_ALGORITHM,
+		KNoMoreEntries
+		};
+	
+	// DefaultCDMA2000SettingsTable: TBool values.
+	const TPtrC KDefaultCdma2000SettingsTableTBool[] = 
+		{
+		DEFAULT_CDMA_ENABLE_IP_HEADER_COMP, // #defined as SERVICE_ENABLE_IP_HEADER_COMP
+		SERVICE_ENABLE_IP_HEADER_COMP,
+		KNoMoreEntries	
+		};
+		
+	// DefaultCDMA2000SettingsTable: TUint32 values.
+	const TPtrC KDefaultCdma2000SettingsTableTUint32[] = 
+		{
+		CDMA_OP_MODE, 
+		CDMA_MIP_MAX_NUM_RETRY, 
+		CDMA_MIP_FIRST_RETRY_TIMEOUT,
+		CDMA_MIP_REREG_THRESHOLD,
+		DEFAULT_CDMA_FCH_MUX,
+		DEFAULT_CDMA_SCH_MUX,
+		KNoMoreEntries	
+		};
+		
+	// CDMA2000PacketServiceTable: TUint32 values.
+	const TPtrC KCdma2000PacketServiceTableTUint32[] =
+		{		
+		CDMA_NAI_TYPE,
+		CDMA_SIMIP_AUTH_ALGORITHM,
+		CDMA_SIMIP_PAP_SS_HANDLE,
+		CDMA_SIMIP_CHAP_SS_HANDLE,			
+		CDMA_MIP_T_BIT,			
+		CDMA_MIP_MN_AAA_AUTH_ALGORITHM,
+		CDMA_MIP_MN_AAA_SPI,
+		CDMA_MIP_MN_HA_AUTH_ALGORITHM,
+		CDMA_MIP_MN_HA_SPI,
+		CDMA_FCH_MUX,
+		CDMA_SCH_MUX,
+		KNoMoreEntries
+		};
+	
+	// CDMA2000PacketServiceTable: TBool values.
+	const TPtrC KCdma2000PacketServiceTableTBool[] = 
+		{
+		SERVICE_IF_EXTERN_IP_CONFIG_ALWAYS_REJECT_AUTH,
+		CDMA_IF_EXTERN_IP_CONFIG_ALWAYS_REJECT_AUTH, // #defined as SERVICE_IF_EXTERN_IP_CONFIG_ALWAYS_REJECT_AUTH
+		CDMA_MIP_MN_AAA_SPI_INDICATOR,
+		CDMA_MIP_MN_HA_SPI_INDICATOR,
+		CDMA_ENABLE_IP_HEADER_COMP, // #defined as SERVICE_ENABLE_IP_HEADER_COMP
+		SERVICE_ENABLE_IP_HEADER_COMP,
+		SERVICE_ENABLE_SW_COMP,
+		KNoMoreEntries
+		};
+	
+	// CDMA2000PacketServiceTable: Text values.	
+	const TPtrC KCdma2000PacketServiceTableText[] = 
+		{
+		CDMA_MIP_HOME_ADDRESS,
+		CDMA_MIP_PRIMARY_HOME_AGENT,
+		CDMA_MIP_SECONDARY_HOME_AGENT,
+		CDMA_MIP_MN_AAA_SS_DATA,
+		CDMA_MIP_MN_HA_SS_DATA,
+		KNoMoreEntries
+		};
+			
+	// DialOutIsp table: TBool values.
+	const TPtrC KDialOutIspTableTBool[] =
+		{
+		ISP_IF_SERVER_MODE,
+		KNoMoreEntries
+		};
+	
+	
+	//----------------------------------------------------------------
+	// Test for named constants:
+	// If the following constants are absent, this code will not compile.	
+	const TUint KCdmaEnumValues[] =
+		{
+		//-------------------------------------------------
+		// Global Settings
+				
+		// CDMA_OP_CAPABILITY values
+		ECommDbCdmaOpCapabilitySimpleIp,
+		ECommDbCdmaOpCapabilityMobileIp,
+		ECommDbCdmaOpCapabilityFallback,
+		
+		// CDMA_SIMIP_AUTH_SUPPORTED values
+		ECommDbCdmaSimpIpCapabilityChap,
+		ECommDbCdmaSimpIpCapabilityPap,
+		
+		// CDMA_MIP_MN_AAA_AUTH_ALGORITHM 
+		// CDMA_MIP_MN_HA_AUTH_ALGORITHM values
+		ECommDbCdmaMIpMd5,
+
+		
+		//---------------------------------------------------
+		// DEFAULT_CDMA2000_SETTINGS_TABLE 
+				
+		//CDMA_OP_MODE
+		ECommDbCdmaOpSimpleIp,
+		ECommDbCdmaOpFallback,
+		ECommDbCdmaOpMobileIp,	
+		
+		//----------------------------------------------------
+		// CDMA2000_PACKET_SERVICE_TABLE
+					
+		//  CDMA_OP_MODE values
+		ECommDbCdmaOpSimpleIp,
+		ECommDbCdmaOpFallback,
+		ECommDbCdmaOpMobileIp,	
+		
+		// CDMA_NAI_TYPE values
+		ECommDbCdmaNaiSimpleIp,
+		ECommDbCdmaNaiMobileIp,
+		
+		// CDMA_SIMIP_AUTH_ALGORITHM
+		ECommDbCdmaSimpIpAuthNone,
+		ECommDbCdmaSimpIpAuthChap,
+		ECommDbCdmaSimpIpAuthPap,
+		ECommDbCdmaSimpIpAuthFallback,
+		
+		// CDMA_MIP_MN_AAA_AUTH_ALGORITHM
+	    // CDMA_MIP_MN_HA_AUTH_ALGORITHM values
+		ECommDbCdmaMIpAuthNone,
+		ECommDbCdmaMIpAuthMd5	
+		};	
+	//-------------------------------------------------------------------	
+	} // module namespace
+
+
+/**
+Verifies that the specified TBool columns can be read from CommDB.
+
+@param aCommDbTableCols CommDB columns to be read
+@return ETrue if all the columns could be read, EFalse otherwise
+*/
+TBool CCdma2000SettingsTestStep::CheckTableTBool(const TPtrC aCommDbTableCols[])
+	{
+	TBool isCheckOk = ETrue;
+	__UHEAP_MARK;	
+	
+	// Attempt to read all the columns.
+		
+	for (TInt curCol = 0; KNoMoreEntries != aCommDbTableCols[curCol]; curCol++)
+		{
+		TBool value = EFalse; 
+		TRAPD(err, iCommDbView->ReadBoolL(aCommDbTableCols[curCol], value));						
+	
+		switch(err)
+			{
+			case KErrNone: // Column exists and is not null: OK
+			INFO_PRINTF3(_L("OK: Column [%S], value. [%d]"), &aCommDbTableCols[curCol], value);
+			break;
+			
+			case KErrNotFound: // Column does not exist: Error
+				INFO_PRINTF3(_L("ERROR.  Column [%S] does not exist. Error code [%d]: KErrNotFound"), &aCommDbTableCols[curCol], err);
+				isCheckOk = EFalse;
+				break;
+			
+			case KErrUnknown: // Column exists, but is null: Error
+				INFO_PRINTF3(_L("ERROR.  Column [%S] does exists but is null: Error code [%d]: KErrUnknown."), &aCommDbTableCols[curCol], err);
+				isCheckOk = EFalse;
+				break;
+			
+			default: // Some other error.
+				INFO_PRINTF3(_L("ERROR.  Error code [%d] when reading column [%S]."), err, &aCommDbTableCols[curCol]);
+				isCheckOk = EFalse;
+			};	
+		}	
+	
+	__UHEAP_MARKEND;
+	return isCheckOk;
+	}
+
+
+/**
+Verifies that the specified TUint32 columns can be read from CommDB.
+
+@param aCommDbTableCols CommDB columns to be read
+@return ETrue if all the columns could be read, EFalse otherwise
+*/
+TBool CCdma2000SettingsTestStep::CheckTableTUint32(const TPtrC aCommDbTableCols[])
+	{
+	TBool isCheckOk = ETrue;
+	__UHEAP_MARK;
+	
+	// Attempt to read all the columns.
+	
+	for(TInt curCol = 0; KNoMoreEntries != aCommDbTableCols[curCol]; curCol++)
+		{
+		TUint32 value = 0; 
+		TInt err = KErrNone;
+		if(aCommDbTableCols == KCdmaGlobalSettingsTableTUint32)
+			{
+			TRAP(err, iCommDb->GetGlobalSettingL(aCommDbTableCols[curCol], value));
+			}			
+		else
+			{
+			TRAP(err, iCommDbView->ReadUintL(aCommDbTableCols[curCol], value));
+			}			
+	
+		switch(err)
+			{
+			case KErrNone: // Column exists and is not null: OK
+			INFO_PRINTF3(_L("OK: Column [%S], value. [%d]"), &aCommDbTableCols[curCol], value);
+			break;
+			
+			case KErrNotFound: // Column does not exist: Error
+				INFO_PRINTF3(_L("ERROR.  Column [%S] does not exist. Error code [%d]: KErrNotFound"), &aCommDbTableCols[curCol], err);
+				isCheckOk = EFalse;
+				break;
+			
+			case KErrUnknown: // Column exists, but is null: Error
+				INFO_PRINTF3(_L("ERROR.  Column [%S] does exists but is null Error code [%d]: KErrUnknown."), &aCommDbTableCols[curCol], err);
+				isCheckOk = EFalse;
+				break;
+			
+			default: // Some other error.
+				INFO_PRINTF3(_L("ERROR.  Error code [%d] when reading column [%S]."), err, &aCommDbTableCols[curCol]);
+				isCheckOk = EFalse;
+			};	
+		}	
+	
+	__UHEAP_MARKEND;
+	return isCheckOk;
+	}	
+	
+/**
+Verifies that the specified TText columns can be read from CommDB.
+
+@param aCommDbTableCols CommDB columns to be read
+@return ETrue if all the columns could be read, EFalse otherwise
+*/	
+TBool CCdma2000SettingsTestStep::CheckTableText(const TPtrC aCommDbTableCols[])
+	{
+	TBool isCheckOk = ETrue;
+	__UHEAP_MARK;
+	
+	// Attempt to read all the columns.
+	
+	for(TInt curCol = 0; KNoMoreEntries != aCommDbTableCols[curCol]; curCol++)
+		{
+		TBuf<KCommsDbSvrMaxColumnNameLength> value; 
+		TRAPD(err, iCommDbView->ReadTextL(aCommDbTableCols[curCol], value));
+		
+		switch(err)
+			{
+			case KErrNone: // Column exists and is not null: OK				
+				INFO_PRINTF3(_L("OK: Column [%S], value. [%S]"), &aCommDbTableCols[curCol],  &value);	
+				break;
+			
+			case KErrNotFound: // Column does not exist: Error
+				INFO_PRINTF3(_L("ERROR.  Column [%S] does not exist. Error code [%d]: KErrNotFound"), &aCommDbTableCols[curCol], err);
+				isCheckOk = EFalse;
+				break;
+			
+			case KErrUnknown: // Column exists, but is null: Error
+				INFO_PRINTF3(_L("ERROR.  Column [%S] does exists but is null Error code [%d]: KErrUnknown."), &aCommDbTableCols[curCol], err);
+				isCheckOk = EFalse;
+				break;
+			
+			default: // Some other error.
+				INFO_PRINTF3(_L("ERROR.  Error code [%d] when reading column [%S]."), err, &aCommDbTableCols[curCol]);
+				isCheckOk = EFalse;
+			}	
+		}
+	
+	__UHEAP_MARKEND;
+	return isCheckOk;
+	}
+
+
+/**
+ C++ Constructor
+ 
+ @post Test name is setup. 
+ */	
+CCdma2000SettingsTestStep::CCdma2000SettingsTestStep():
+	iCommDb(NULL),
+	iCommDbView(NULL)	
+	{
+	SetTestStepName(KCdma2000SettingsStep);		
+	}
+
+/** C++ Destructor */	
+CCdma2000SettingsTestStep::~CCdma2000SettingsTestStep()
+	{
+	if(iCommDbView) delete iCommDbView; // Lint generates warning if CloseCommDbTable() is used here.
+	if(iCommDb)     delete iCommDb;
+	}
+	
+/** Closes CommDB table opened previously with a call to OpenCommDbTableL */
+void CCdma2000SettingsTestStep::CloseCommDbTable()
+	{
+	if(iCommDbView)
+		{
+		delete iCommDbView;
+		iCommDbView = NULL;
+		}
+	}
+
+/**
+Opens a view on the first record of a CommDB table.
+
+@param aTableName the table to open.
+@leave if CommDB access methods leave. 
+*/
+void CCdma2000SettingsTestStep::OpenCommDbTableL(const TPtrC& aTableName)
+	{
+	ASSERT(!iCommDbView);
+	
+	const TUint32 KRecordId = 1;
+	iCommDbView = iCommDb->OpenViewMatchingUintLC(aTableName, TPtrC(COMMDB_ID), KRecordId);
+	// Take iCommDbView off the cleanup stack so it is never deleted without
+	// setting the pointer to NULL, but rather with a call to
+	// CloseCommDbTable() or in the destructor.
+	CleanupStack::Pop(iCommDbView);
+	
+	TInt err = iCommDbView->GotoFirstRecord(); 
+	if (KErrNone != err)
+		{
+		INFO_PRINTF4(_L("Table[%S]:  Record[%d] does not exist. Error[%d]"), &aTableName, KRecordId, err);				
+		User::Leave(err);		
+		}
+	INFO_PRINTF1(_L(""));
+	INFO_PRINTF3(_L("Opened Table[%S].  Record[%d]. ========================== "), &aTableName, KRecordId);	
+	}
+
+
+/**
+Carries out the actual test sequence for CDMA2000 CommDB Settings. 
+
+@leave if CommDB access methods leave. 
+*/
+void CCdma2000SettingsTestStep::DoTestSequenceL()
+	{
+	__UHEAP_MARK;
+
+	//
+	// Create CommDB
+	//
+	ASSERT(!iCommDb);
+	iCommDb = CCommsDatabase::NewL();
+	// Don't put iCommDb onto cleanup stack so it is never deleted without
+	// setting the pointer to NULL, but rather below or in the destructor.
+	iCommDb->ShowHiddenRecords();
+	
+	//
+	// Carry out the testing	
+	//
+	
+	// DefaultCDMA2000SettingsTable	
+	OpenCommDbTableL(TPtrC(DEFAULT_CDMA2000_SETTINGS_TABLE));	
+	if(CheckTableTUint32(KDefaultCdma2000SettingsTableTUint32) &&
+	   CheckTableTBool(KDefaultCdma2000SettingsTableTBool))
+		{
+		INFO_PRINTF1(_L("===>OK: DefaultCDMA2000Settings table"));
+		}
+	else
+		{
+		INFO_PRINTF1(_L("===>ERROR: accessing DefaultCDMA2000Settings table."));
+		SetTestStepResult(EFail);
+		}
+	CloseCommDbTable();
+	
+	// CDMA2000PacketServiceTable	
+	OpenCommDbTableL(TPtrC(CDMA2000_PACKET_SERVICE_TABLE));
+	if(CheckTableTUint32(KCdma2000PacketServiceTableTUint32) && // TUint32 columns
+	   CheckTableTBool(KCdma2000PacketServiceTableTBool)     && // TBool columns     
+	   CheckTableText(KCdma2000PacketServiceTableText))         // Text columns
+		{
+		INFO_PRINTF1(_L("===>OK: CDMA2000PacketServiceTable table"));
+		}
+	else
+		{
+		INFO_PRINTF1(_L("===>ERROR: accessing CDMA2000PacketServiceTable table."));
+		SetTestStepResult(EFail);
+		}
+	CloseCommDbTable();	
+	
+	// DialOutIsp
+	OpenCommDbTableL(TPtrC(DIAL_OUT_ISP));
+	if(CheckTableTBool(KDialOutIspTableTBool))
+		{
+		INFO_PRINTF1(_L("===>OK: DialOutIsp table"));
+		}
+	else
+		{
+		INFO_PRINTF1(_L("===>ERROR: accessing DialOutIsp table."));
+		SetTestStepResult(EFail);
+		}	
+	CloseCommDbTable();		
+	
+	// Global Settings
+	INFO_PRINTF1(_L(""));
+	INFO_PRINTF1(_L("Reading Global Settings ================================"));				
+	if(CheckTableTUint32(KCdmaGlobalSettingsTableTUint32))
+		{
+		INFO_PRINTF1(_L("===>OK: GlobalSettings table"));
+		}
+	else
+		{
+		INFO_PRINTF1(_L("===>ERROR: accessing GlobalSettings table."));
+		SetTestStepResult(EFail);
+		}
+	
+
+	//
+	// Close CommDB
+	//
+	delete iCommDb;
+	iCommDb = NULL;
+	
+	__UHEAP_MARKEND;
+	}
+
+/**
+ Verifies that all CDMA2000 settings can be accessed.
+ 
+ @return result of the test: EPass if all settings can be accessed.
+ */
+TVerdict CCdma2000SettingsTestStep::doTestStepL()
+	{
+	//---------------------------------------------------------------------
+	// Reference KCdmaEnumValues[] to supress ARM5 compiler warning regarding unreferenced variable
+	// This has no consequences for the test.
+	INFO_PRINTF2(_L("Referencing KCdmaEnumValues: element 0=[%d]"), KCdmaEnumValues[0]);
+	//---------------------------------------------------------------------
+	
+	
+	
+	SetTestStepResult(EPass);
+	
+	TRAPD(testErr, DoTestSequenceL());
+	if(KErrNone != testErr)
+		{
+		SetTestStepResult(ETestSuiteError);
+		INFO_PRINTF2(_L("ERROR: internal test suite error [%d]."), testErr);
+		}	
+			
+	return TestStepResult();		
+	}
+	
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_cdma2000Settings/src/te_cdmacommdbsettingssvr.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,123 @@
+//
+//
+// 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:
+//
+//
+//
+
+/**
+ @file 
+ @internalComponent
+ 
+ Implementation of CTeCdma2000settingsServer class
+ 
+ for (WINS && !EKA2) versions will be xxxServer.Dll and require a thread to be started
+ in the process of the client. The client initialises the server by calling the
+ one and only ordinal.
+ */
+
+
+
+#include "Cdma2000settingsstep.h"
+#include "te_cdmacommdbsettingssvr.h"
+
+using namespace te_Cdma2000CommDbSettings;
+
+_LIT(KServerName,"te_cdmacommdbsettingssvr");
+
+CTe_Cdma2000CommdbSettingsSvr* CTe_Cdma2000CommdbSettingsSvr::NewL()
+/**
+ * @return - Instance of the test server
+ * Called inside the MainL() function to create and start the
+ * CTestServer derived server.
+ */
+	{
+	CTe_Cdma2000CommdbSettingsSvr * server = new (ELeave)CTe_Cdma2000CommdbSettingsSvr;
+	CleanupStack::PushL(server);
+	
+	// Either use a StartL or ConstructL, the latter will permit
+	// Server Logging.
+
+	//server->StartL(KServerName); 
+	server-> ConstructL(KServerName);
+	CleanupStack::Pop(server);
+	return server;
+	}
+
+// EKA2 much simpler
+// Just an E32Main and a MainL()
+LOCAL_C void MainL()
+/**
+ * Much simpler, uses the new Rendezvous() call to sync with the client
+ */
+	{
+	// Leave the hooks in for platform security
+#if (defined __DATA_CAGING__)
+	RProcess().DataCaging(RProcess::EDataCagingOn);
+	RProcess().SecureApi(RProcess::ESecureApiOn);
+#endif
+	CActiveScheduler* sched=NULL;
+	sched=new(ELeave) CActiveScheduler;
+	CActiveScheduler::Install(sched);
+	CTe_Cdma2000CommdbSettingsSvr* server = NULL;
+	// Create the CTestServer derived server
+	TRAPD(err,server = CTe_Cdma2000CommdbSettingsSvr::NewL());
+	if(!err)
+		{
+		// Sync with the client and enter the active scheduler
+		RProcess::Rendezvous(KErrNone);
+		sched->Start();
+		}
+	delete server;
+	delete sched;
+	}
+
+// Only a DLL on emulator for typhoon and earlier
+
+GLDEF_C TInt E32Main()
+/**
+ * @return - Standard Epoc error code on exit
+ */
+	{
+	CTrapCleanup* cleanup = CTrapCleanup::New();
+	if(cleanup == NULL)
+		{
+		return KErrNoMemory;
+		}
+	TRAP_IGNORE(MainL());
+	delete cleanup;
+	return KErrNone;
+    }
+
+// Create a thread in the calling process
+// Emulator typhoon and earlier
+
+CTestStep* CTe_Cdma2000CommdbSettingsSvr::CreateTestStep(const TDesC& aStepName)
+/**
+ * @return - A CTestStep derived instance
+ * Implementation of CTestServer pure virtual
+ */
+	{	
+	CTestStep* testStep = NULL;
+	
+	if(aStepName == KCdma2000SettingsStep)  
+		{
+		testStep = new CCdma2000SettingsTestStep;
+		}
+
+	
+	return testStep;
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_connpref/group/te_connpref.mmp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,25 @@
+TARGET                  te_connpref.exe
+TARGETTYPE              EXE
+
+#if defined(WINS)
+deffile		  ../../../BWINS/TE_CONNPREF.DEF
+#endif
+
+SOURCEPATH              ../src
+SOURCE                  TE_ConnPrefServer.cpp 	
+SOURCE                  TE_ConnPrefHelperSteps.cpp
+SOURCE                  TE_ConnPrefSteps.cpp	
+SOURCE                  TE_ConnPrefStep.cpp
+
+USERINCLUDE             ../inc
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY                 euser.lib
+LIBRARY                 esock.lib
+LIBRARY                 commdb.lib
+LIBRARY			TestExecuteUtils.lib
+
+CAPABILITY ALL -Tcb
+
+VENDORID 0x70000001
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_connpref/inc/TE_ConnPrefHelperSteps.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,41 @@
+//
+// 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:
+//
+//
+
+/**
+ * @file TE_ConnPrefHelperSteps.h
+ *
+ * This is the header file with the declartions of the RConnection test step classes that basically 
+ * aren't proper tests at all - thet are just helper functions encapsulated as test steps so that they
+ * can be called from the scripts.
+ *
+ */
+
+#if (!defined __TE_CONNPREFHELPERSTEPS_H__)
+#define __TE_CONNPREFHELPERSTEPS_H__
+
+#include "TE_ConnPrefStep.h"
+
+class CTE_ConnPrefForceCCoverWrite: public CTE_ConnPrefStep
+{
+public:
+	CTE_ConnPrefForceCCoverWrite(TPtrC aName);
+	virtual ~CTE_ConnPrefForceCCoverWrite();
+
+	virtual enum TVerdict doTestStepL(void);
+};
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_connpref/inc/TE_ConnPrefServer.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,51 @@
+//
+// 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:
+//
+//
+
+/**
+ * @file TE_ConnPrefServer.h
+ *
+ * Header for TE_ConnPrefSuite class. This is the container
+ * class for all the RConnection multihoming test steps
+ *
+ */
+#if (!defined __TE_ConnPrefSUITE_H__)
+#define __TE_ConnPrefSUITE_H__
+
+#include <test/TestExecuteServerBase.h>
+#include <e32std.h>
+
+#define MAX_NAME_LENGTH		10			///< Maximum length of connection name
+
+class CTS_ConnPrefStep;
+
+class CTE_ConnPrefServer : public CTestServer
+	{
+public:
+	static CTE_ConnPrefServer* NewL();
+	virtual CTestStep* CreateTestStep(const TDesC& aStepName);
+	
+	
+	// this should be a pure virtual so every test ddl
+	// has to provide a version but for now defaults to ?.?
+	virtual TPtrC GetVersion( void );
+		
+	};
+
+	
+void CommInitL(TBool);
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_connpref/inc/TE_ConnPrefStep.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,72 @@
+//
+// 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:
+//
+//
+
+/** 
+ * @file TS_ConnPrefStep.cpp.h
+ *
+ * This defines the CTE_ConnPrefStep class which is the base class for all 
+ * the ConnPrefStep test step classes
+ *
+ */
+ 
+#if (!defined __TS_CONNPREFSTEP_H__)
+#define __TS_CONNPREFSTEP_H__
+
+#include <e32std.h>
+#include <cdbstore.h>
+
+#include "TE_ConnPrefServer.h"
+
+// Connection Configuration Lits
+_LIT(KNameDefault, "default");
+
+// Test step names
+_LIT(KConstructAndVersion,  "ConstructAndVersion"); 
+_LIT(KSetAndGetConnPrefs,  "SetAndGetConnPrefs"); 
+_LIT(KComparePrefs,  "ComparePrefs");  
+_LIT(KAssignAndCopyConstruct ,  "AssignAndCopyConstruct"); 
+_LIT(KExtensionIdAndCast ,  "ExtensionIdAndCast"); 
+_LIT(KMultiConnPref ,  "MultiConnPref");
+_LIT(KMultiConnPrefVersion,  "MultiConnPrefVersion");
+_LIT(KMultiConnectionAttempts,  "MultiConnectionAttempts");
+
+//Error string.
+_LIT(KEGeneric, "Test left!"); 
+			
+
+class CTE_ConnPrefServer;
+
+/* CTE_ConnPrefStep class declaration
+ * Provides the base class for all ConnPref test steps
+ *
+ */
+class CTE_ConnPrefStep : public CTestStep
+	{
+public:
+	CTE_ConnPrefStep();
+	virtual ~CTE_ConnPrefStep();
+	enum TVerdict Test(TInt aResult);
+
+	void ExpLogExtra(const TText8* aFile, TInt aLine, TInt aSeverity,
+		TRefByValue<const TDesC> aFmt,...);
+	
+	
+	CTE_ConnPrefServer* iOwnerSuite;	///< Pointer to suite which owns this test step
+	
+	};
+
+#endif /* __TS_CONNPREFSTEP_H__ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_connpref/inc/TE_ConnPrefSteps.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,137 @@
+//
+// 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:
+//
+//
+
+/** 
+ * @file TE_RConnectionStep.h
+ *
+ * This defines the TE_RConnectionStep class which is the base class for all 
+ * the RConnection multihoming test step classes
+ *
+ */
+ 
+#if (!defined __TE_CONNPREFSTEPS_H__)
+#define __TE_CONNPREFSTEPS_H__
+
+#include <e32std.h>
+#include <cdbstore.h>
+#include "es_sock.h"
+#include "in_sock.h"
+#include <es_enum.h>
+#include <commdbconnpref.h>
+
+#include "TE_ConnPrefServer.h"
+#include "TE_ConnPrefStep.h"
+
+//
+class CTE_ConstructAndVersion : public CTE_ConnPrefStep
+{
+public:
+	CTE_ConstructAndVersion();
+	virtual ~CTE_ConstructAndVersion();
+	virtual enum TVerdict doTestStepL();
+};
+
+//
+class CTE_SetAndGetConnPrefs : public CTE_ConnPrefStep
+{
+public:
+	CTE_SetAndGetConnPrefs();
+	virtual ~CTE_SetAndGetConnPrefs();
+	virtual enum TVerdict doTestStepL();
+};
+
+//
+class CTE_ComparePrefs : public CTE_ConnPrefStep
+{
+public:
+	CTE_ComparePrefs();
+	virtual ~CTE_ComparePrefs();
+	virtual enum TVerdict doTestStepL();
+};
+
+//
+class CTE_AssignAndCopyConstruct : public CTE_ConnPrefStep
+{
+public:
+	CTE_AssignAndCopyConstruct();
+	virtual ~CTE_AssignAndCopyConstruct();
+	virtual enum TVerdict doTestStepL();
+};
+
+// 
+class CTE_ExtensionIdAndCast : public CTE_ConnPrefStep
+{
+public:
+	CTE_ExtensionIdAndCast();
+	virtual ~CTE_ExtensionIdAndCast();
+	virtual enum TVerdict doTestStepL();
+};
+
+//  
+class CTE_MultiConnPref : public CTE_ConnPrefStep
+{
+public:
+	CTE_MultiConnPref();
+	virtual ~CTE_MultiConnPref();
+	virtual enum TVerdict doTestStepL();
+};
+
+
+///////////////////////////////////////
+//	Test step CTE_MultiConnPrefVersion
+///////////////////////////////////////
+
+NONSHARABLE_CLASS(CTE_MultiConnPrefVersion) : public CTE_ConnPrefStep
+{
+public:
+	CTE_MultiConnPrefVersion();
+	virtual ~CTE_MultiConnPrefVersion();
+	virtual enum TVerdict doTestStepL();
+	CCommsDbTableView*	iTheView;
+	CCommsDatabase*		iTheDb;
+
+};
+
+////////////////////////////////////////////
+//	Test step CTE_MultiConnectionAttempts
+////////////////////////////////////////////
+
+NONSHARABLE_CLASS(CTE_MultiConnectionAttempts): public CTE_ConnPrefStep
+{
+public:
+	CTE_MultiConnectionAttempts();
+	virtual ~CTE_MultiConnectionAttempts();
+	virtual enum TVerdict doTestStepL();
+};
+
+
+#endif /* __TS_CONNPREFSTEPS_H__ */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_connpref/src/TE_ConnPrefHelperSteps.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,52 @@
+//
+// 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:
+//
+//
+
+/**
+ * 
+ * Contains the implementation of the helper steps (initialisation and waiting
+ * for esock to die)
+ *
+ */
+
+#include "TE_ConnPrefHelperSteps.h"
+////////////////////////////////////////////////////////////////////////////////
+
+#include <e32base.h>
+#include <e32std.h>
+////////////////////////////////////////////////////////////////////////////////
+
+CTE_ConnPrefForceCCoverWrite::CTE_ConnPrefForceCCoverWrite(TPtrC aName) : CTE_ConnPrefStep()
+{
+	SetTestStepName(aName);
+}
+
+CTE_ConnPrefForceCCoverWrite::~CTE_ConnPrefForceCCoverWrite()
+{
+}
+
+enum TVerdict CTE_ConnPrefForceCCoverWrite::doTestStepL(void)
+/*
+ * It appears that CCover only writes to its data file every now and again, so force it here 
+ * to write its data just before we shutdown and lose anything that has changed
+ */
+{
+	#ifdef CCOVER
+		cov_write();
+	#endif
+
+	return TestStepResult();
+} // TS_ConnPrefHelperSteps
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_connpref/src/TE_ConnPrefServer.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,167 @@
+//
+// 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:
+//
+//
+
+// TE_ConnPrefServer.cpp
+//
+//
+// This main DLL entry point for the TE_ConServer.dll
+
+
+#include "TE_ConnPrefStep.h"
+#include "TE_ConnPrefHelperSteps.h"
+#include "TE_ConnPrefSteps.h"
+
+
+EXPORT_C CTE_ConnPrefServer* NewConnPrefServer( void ) 
+//
+// NewTestSuiteConnPrefL is exported at ordinal 1
+// this provides the interface to allow schedule test
+// to create instances of this test suite
+//
+	{
+
+	return new(ELeave) CTE_ConnPrefServer();
+    }
+
+	
+	
+// __EDIT_ME__ - Substitute the name of your test server 
+_LIT(KServerName,"te_connpref");
+// __EDIT_ME__ - Use your own server class name
+CTE_ConnPrefServer* CTE_ConnPrefServer::NewL()
+/**
+ * @return - Instance of the test server
+ * Called inside the MainL() function to create and start the
+ * CTestServer derived server.
+ */
+	{
+	// __EDIT_ME__ new your server class here
+	CTE_ConnPrefServer * server = new (ELeave) CTE_ConnPrefServer();
+	CleanupStack::PushL(server);
+	
+	// Either use a StartL or ConstructL, the latter will permit
+	// Server Logging.
+
+	//server->StartL(KServerName); 
+	server-> ConstructL(KServerName);
+	CleanupStack::Pop(server);
+	return server;
+	}
+
+// EKA2 much simpler
+// Just an E32Main and a MainL()
+LOCAL_C void MainL()
+/**
+ * Much simpler, uses the new Rendezvous() call to sync with the client
+ */
+	{
+	// Leave the hooks in for platform security
+#if (defined __DATA_CAGING__)
+	RProcess().DataCaging(RProcess::EDataCagingOn);
+	RProcess().SecureApi(RProcess::ESecureApiOn);
+#endif
+	CActiveScheduler* sched=NULL;
+	sched=new(ELeave) CActiveScheduler;
+	CActiveScheduler::Install(sched);
+	// __EDIT_ME__ Your server name
+	CTE_ConnPrefServer* server = NULL;
+	// Create the CTestServer derived server
+	// __EDIT_ME__ Your server name
+	TRAPD(err,server = CTE_ConnPrefServer::NewL());
+	if(!err)
+		{
+		// Sync with the client and enter the active scheduler
+		RProcess::Rendezvous(KErrNone);
+		sched->Start();
+		}
+	delete server;
+	delete sched;
+	}
+
+// Only a DLL on emulator for typhoon and earlier
+
+GLDEF_C TInt E32Main()
+/**
+ * @return - Standard Epoc error code on exit
+ */
+	{
+	CTrapCleanup* cleanup = CTrapCleanup::New();
+	if(cleanup == NULL)
+		{
+		return KErrNoMemory;
+		}
+	TRAP_IGNORE(MainL());
+	delete cleanup;
+	return KErrNone;
+    }
+
+// Create a thread in the calling process
+// Emulator typhoon and earlier
+
+// __EDIT_ME__ - Use your own server class name
+CTestStep* CTE_ConnPrefServer::CreateTestStep(const TDesC& aStepName)
+/**
+ * @return - A CTestStep derived instance
+ * Implementation of CTestServer pure virtual
+ */
+	{
+	
+	CTestStep* testStep = NULL;
+	// __EDIT_ME__ - Create your own test steps here
+	// This server creates just one step but create as many as you want
+	// They are created "just in time" when the worker thread is created
+	
+	
+	if(aStepName.Compare(_L("ForceCCoverWrite")) == 0 )
+		testStep = new(ELeave) CTE_ConnPrefForceCCoverWrite(_L("ForceCCoverWrite"));
+	else if(aStepName.Compare(_L("ConstructAndVersion")) == 0 )
+		testStep = new(ELeave) CTE_ConstructAndVersion();
+	else if(aStepName.Compare(_L("SetAndGetConnPrefs")) == 0 )
+		testStep = new(ELeave) CTE_SetAndGetConnPrefs();
+	else if(aStepName.Compare(_L("AssignAndCopyConstruct")) == 0 )
+		testStep = new(ELeave) CTE_AssignAndCopyConstruct();
+	else if(aStepName.Compare(_L("ComparePrefs")) == 0 )
+		testStep = new(ELeave) CTE_ComparePrefs();
+	else if(aStepName.Compare(_L("ExtensionIdAndCast")) == 0 )
+		testStep = new(ELeave) CTE_ExtensionIdAndCast();
+	else if(aStepName.Compare(_L("MultiConnPref")) == 0 )
+		testStep = new(ELeave) CTE_MultiConnPref();
+	else if(aStepName.Compare(_L("MultiConnPrefVersion")) == 0 )
+		testStep = new(ELeave) CTE_MultiConnPrefVersion();
+	else if(aStepName.Compare(_L("MultiConnectionAttempts")) == 0 )
+		testStep = new(ELeave) CTE_MultiConnectionAttempts();
+
+	
+	return testStep;
+	}
+
+
+
+// make a version string available for test system 
+TPtrC CTE_ConnPrefServer::GetVersion( void )
+	{
+
+#ifdef _DEBUG
+_LIT(KTxtVersion,"1.0 (udeb)");
+#else
+_LIT(KTxtVersion,"1.0");
+#endif
+
+	return KTxtVersion();
+	}
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_connpref/src/TE_ConnPrefStep.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,68 @@
+//
+// 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:
+//
+//
+
+/**
+ * @file TE_ConnPrefStep.cpp
+ *
+ * This contains CTE_ConnPrefStep class which is
+ * the base class for all the ConnPref test steps
+ *
+ */
+#include "TE_ConnPrefStep.h"
+
+
+// Constructor
+CTE_ConnPrefStep::CTE_ConnPrefStep() 
+	{			
+	}
+
+// Destructor
+CTE_ConnPrefStep::~CTE_ConnPrefStep()
+	{ 
+	}	
+
+void CTE_ConnPrefStep::ExpLogExtra(const TText8* aFile, TInt aLine, TInt aSeverity,
+		TRefByValue<const TDesC> aFmt,...)
+	{
+	//VA_LIST aList;
+	//VA_START( aList, aFmt );
+
+
+	// Log to the suite's logger
+	INFO_PRINTF5(_L("File: %S, line: %d, severity: %d, message: $S"), 
+		aFile, aLine, aSeverity, aFmt);
+
+	//VA_END( aList ); 
+
+	}
+
+enum TVerdict CTE_ConnPrefStep::Test(TInt aResult)
+	{	
+	if (!aResult)
+		{
+			INFO_PRINTF1(KEGeneric);
+         	SetTestStepResult(EFail);
+
+			return TestStepResult();
+		}
+        SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_connpref/src/TE_ConnPrefSteps.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,378 @@
+//
+// 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:
+//
+//
+
+// TE_ConnPrefSteps.cpp
+//
+//
+
+#include <commdbconnpref.h>
+#include <e32test.h>
+
+#include "TE_ConnPrefSteps.h"
+
+CTE_ConstructAndVersion::CTE_ConstructAndVersion()
+	{
+	SetTestStepName(KConstructAndVersion);
+	}
+
+CTE_ConstructAndVersion::~CTE_ConstructAndVersion()
+	{	
+	}
+
+enum TVerdict CTE_ConstructAndVersion::doTestStepL()
+	{
+
+	TCommDbConnPref connPref;
+
+	Test(connPref.ExtensionId() == TConnPref::EConnPrefCommDb);		
+	TVersion ver = connPref.Version();
+	Test(ver.iMajor == TCommDbConnPref::KMajorVersionNumber);		
+	Test(ver.iMinor == TCommDbConnPref::KMinorVersionNumber);		
+	Test(ver.iBuild == TCommDbConnPref::KBuildVersionNumber);
+	Test(connPref.BearerSet() == KCommDbBearerUnknown);		
+	Test(connPref.DialogPreference() == ECommDbDialogPrefUnknown);		
+	Test(connPref.Direction() == ECommDbConnectionDirectionUnknown);
+	Test(connPref.IapId() == 0);		
+	Test(connPref.NetId() == 0);
+	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+CTE_SetAndGetConnPrefs::CTE_SetAndGetConnPrefs()
+	{
+	SetTestStepName(KSetAndGetConnPrefs); 
+	}
+
+CTE_SetAndGetConnPrefs::~CTE_SetAndGetConnPrefs()
+	{	
+	}
+
+enum TVerdict CTE_SetAndGetConnPrefs::doTestStepL()
+	{
+
+	TCommDbConnPref connPref;
+
+	connPref.SetBearerSet((KCommDbBearerWcdma | KCommDbBearerLAN));
+	Test(connPref.BearerSet() == (KCommDbBearerWcdma | KCommDbBearerLAN));
+
+	connPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
+	Test(connPref.DialogPreference() == ECommDbDialogPrefDoNotPrompt);
+
+	connPref.SetDirection(ECommDbConnectionDirectionOutgoing);
+	Test(connPref.Direction() == ECommDbConnectionDirectionOutgoing);
+
+	connPref.SetIapId(123);
+	Test(connPref.IapId() == 123);
+
+	connPref.SetNetId(456);
+	Test(connPref.NetId() == 456);
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+CTE_ComparePrefs::CTE_ComparePrefs()
+	{
+	SetTestStepName(KComparePrefs); 
+	}
+
+CTE_ComparePrefs::~CTE_ComparePrefs()
+	{	
+	}
+
+enum TVerdict CTE_ComparePrefs::doTestStepL()
+	{
+	
+	TCommDbConnPref connPref1;
+	connPref1.SetBearerSet((KCommDbBearerWcdma | KCommDbBearerLAN));
+	connPref1.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
+	connPref1.SetDirection(ECommDbConnectionDirectionOutgoing);
+	connPref1.SetIapId(123);
+	connPref1.SetNetId(456);
+
+	TCommDbConnPref connPref2;
+	connPref2.SetBearerSet((KCommDbBearerWcdma | KCommDbBearerLAN));
+	connPref2.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
+	connPref2.SetDirection(ECommDbConnectionDirectionOutgoing);
+	connPref2.SetIapId(123);
+	connPref2.SetNetId(456);
+
+	TCommDbConnPref connPref3;
+	connPref3.SetBearerSet(KCommDbBearerCSD);
+	connPref3.SetDialogPreference(ECommDbDialogPrefWarn);
+	connPref3.SetDirection(ECommDbConnectionDirectionIncoming);
+	connPref3.SetIapId(987);
+	connPref3.SetNetId(654);
+
+	TCommDbConnPref connPref4;
+	connPref4.SetBearerSet(KCommDbBearerCSD);
+	connPref4.SetDirection(ECommDbConnectionDirectionIncoming);
+	connPref4.SetNetId(654);	
+
+	Test(connPref2.Compare(connPref1) == 0);
+	Test(connPref2 == connPref1);
+
+	Test(connPref1.Compare(connPref2) == 0);
+	Test(connPref1 == connPref2);
+
+	Test(connPref1.Compare(connPref1) == 0);
+	Test(connPref1 == connPref1);
+
+	Test(connPref3.Compare(connPref1) != 0);
+	Test(connPref3 != connPref1);
+
+	Test(connPref1.Compare(connPref3) != 0);
+	Test(connPref1 != connPref3);
+
+	Test(connPref4 == connPref3);
+	Test(connPref3 == connPref4);
+
+	Test(connPref4 != connPref2);
+	Test(connPref2 != connPref4);
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+CTE_AssignAndCopyConstruct::CTE_AssignAndCopyConstruct()
+	{
+	SetTestStepName(KAssignAndCopyConstruct); 
+	}
+
+CTE_AssignAndCopyConstruct::~CTE_AssignAndCopyConstruct()
+	{	
+	}
+
+enum TVerdict CTE_AssignAndCopyConstruct::doTestStepL()
+	{
+
+	TCommDbConnPref connPref1;
+	connPref1.SetBearerSet((KCommDbBearerWcdma | KCommDbBearerLAN));
+	connPref1.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
+	connPref1.SetDirection(ECommDbConnectionDirectionOutgoing);
+	connPref1.SetIapId(123);
+	connPref1.SetNetId(456);
+
+	TCommDbConnPref connPref2(connPref1);
+	Test(connPref2.Compare(connPref1) == 0);
+	Test(connPref1.Compare(connPref2) == 0);
+
+	TCommDbConnPref connPref3 = connPref1;
+	Test(connPref3.Compare(connPref1) == 0);
+	Test(connPref1.Compare(connPref3) == 0);
+
+	TCommDbConnPref connPref4;
+	connPref4 = connPref1;
+	Test(connPref4.Compare(connPref1) == 0);
+	Test(connPref1.Compare(connPref4) == 0);
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+CTE_ExtensionIdAndCast::CTE_ExtensionIdAndCast()
+	{
+	SetTestStepName(KExtensionIdAndCast); 
+	}
+
+CTE_ExtensionIdAndCast::~CTE_ExtensionIdAndCast()
+	{	
+	}
+
+enum TVerdict CTE_ExtensionIdAndCast::doTestStepL()
+	{
+
+	TCommDbConnPref commdbPref1;
+	commdbPref1.SetBearerSet((KCommDbBearerWcdma | KCommDbBearerLAN));
+	commdbPref1.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
+	commdbPref1.SetDirection(ECommDbConnectionDirectionOutgoing);
+	commdbPref1.SetIapId(123);
+	commdbPref1.SetNetId(456);
+
+	TConnPref basePref(commdbPref1);
+	Test(basePref.ExtensionId() == TConnPref::EConnPrefCommDb);
+
+	TCommDbConnPref commdbPref2 = TCommDbConnPref::Cast(basePref);
+	Test(commdbPref2 == commdbPref1);
+	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+
+CTE_MultiConnPref::CTE_MultiConnPref()
+	{
+	SetTestStepName(KMultiConnPref); 
+	}
+
+CTE_MultiConnPref::~CTE_MultiConnPref()
+	{	
+	}
+
+enum TVerdict CTE_MultiConnPref::doTestStepL()
+	{
+
+	TCommDbConnPref connPref1;
+	connPref1.SetBearerSet((KCommDbBearerWcdma | KCommDbBearerLAN));
+	connPref1.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
+	connPref1.SetDirection(ECommDbConnectionDirectionOutgoing);
+	connPref1.SetIapId(123);
+	connPref1.SetNetId(456);
+
+	TCommDbConnPref connPref2;
+	connPref2.SetBearerSet(KCommDbBearerCSD);
+	connPref2.SetDialogPreference(ECommDbDialogPrefWarn);
+	connPref2.SetDirection(ECommDbConnectionDirectionIncoming);
+	connPref2.SetIapId(987);
+	connPref2.SetNetId(654);
+
+	TCommDbMultiConnPref multiPref;
+	TInt err(KErrNone);
+
+	err = multiPref.SetPreference(0, connPref1);
+	Test(err == KErrArgument);
+	
+	err = multiPref.SetPreference(1, connPref1);
+	Test(err == KErrNone);
+
+	err = multiPref.SetPreference(2, connPref2);
+	Test(err == KErrNone);
+
+	err = multiPref.SetPreference(3, connPref2);
+	Test(err == KErrArgument);
+
+	TCommDbConnPref connPref3;
+
+	err = multiPref.GetPreference(0, connPref3);
+	Test(err == KErrArgument);
+
+	err = multiPref.GetPreference(1, connPref3);
+	Test(err == KErrNone);
+	Test(connPref3 == connPref1);
+
+	err = multiPref.GetPreference(2, connPref3);
+	Test(err == KErrNone);
+	Test(connPref3 == connPref2);
+
+	err = multiPref.GetPreference(3, connPref3);
+	Test(err == KErrArgument);
+
+	TConnPref basePref(multiPref);
+	Test(basePref.ExtensionId() == TConnPref::EConnPrefCommDbMulti);
+
+	TCommDbMultiConnPref multiPref2;	
+	TCommDbConnPref connPref4;
+	err = multiPref2.GetPreference(1, connPref4);
+	Test(err == KErrNone);
+	Test(connPref4 == connPref1);
+
+	TCommDbConnPref connPref5;
+	err = multiPref2.GetPreference(2, connPref5);
+	Test(err == KErrNone);
+	Test(connPref5 == connPref2);
+
+	Test(multiPref.ConnectionAttempts()==TCommDbMultiConnPref::KMaxMultiConnPrefCount);
+
+	multiPref.SetConnectionAttempts(0);
+	Test(multiPref.ConnectionAttempts()==TCommDbMultiConnPref::KMaxMultiConnPrefCount);
+
+	multiPref.SetConnectionAttempts(1);
+	Test(multiPref.ConnectionAttempts()==1);
+
+	multiPref.SetConnectionAttempts(2);
+	Test(multiPref.ConnectionAttempts()==2);
+
+	multiPref.SetConnectionAttempts(TCommDbMultiConnPref::KMaxMultiConnPrefCount+1);
+	Test(multiPref.ConnectionAttempts()==TCommDbMultiConnPref::KMaxMultiConnPrefCount);
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+////////////////////////////////////////
+//	Test step CTE_MultiConnPrefVersion
+/////////////////////////////////////////
+
+// constructor
+CTE_MultiConnPrefVersion::CTE_MultiConnPrefVersion()
+	{
+	// store the name of this test case
+	SetTestStepName(KMultiConnPrefVersion);
+	}
+
+// destructor
+CTE_MultiConnPrefVersion::~CTE_MultiConnPrefVersion()
+	{
+	}
+
+// do Test step CTE_MultiConnPrefVersion
+TVerdict CTE_MultiConnPrefVersion::doTestStepL()
+	{
+	INFO_PRINTF1(_L("CTE_MultiConnPrefVersion called "));
+	SetTestStepResult(EFail);    TCommDbMultiConnPref pref;	
+	TVersion dbVersion = pref.Version();
+	INFO_PRINTF4(_L("TCommDbMultiConnPref::Version -> Major=%d, Minor=%d, Build=%d"), TCommDbConnPref::KMajorVersionNumber, TCommDbConnPref::KMinorVersionNumber, TCommDbConnPref::KBuildVersionNumber);	
+	//Test for the expected return value
+	if ( dbVersion.iMinor == TCommDbConnPref::KMinorVersionNumber && 
+         dbVersion.iMajor == TCommDbConnPref::KMajorVersionNumber && 
+         dbVersion.iBuild == TCommDbConnPref::KBuildVersionNumber )
+		{
+		SetTestStepResult(EPass);
+		}
+    return TestStepResult();
+	}
+	
+
+///////////////////////////////////////////
+//	Test step CTE_MultiConnectionAttempts
+////////////////////////////////////////////
+
+// constructor
+CTE_MultiConnectionAttempts::CTE_MultiConnectionAttempts()
+	{
+	// store the name of this test case
+	SetTestStepName(KMultiConnectionAttempts);
+	}
+
+// destructor
+CTE_MultiConnectionAttempts::~CTE_MultiConnectionAttempts()
+	{
+	}	
+	
+// do Test step CTE_MultiConnectionAttempts
+TVerdict CTE_MultiConnectionAttempts::doTestStepL( )
+	{
+	INFO_PRINTF1(_L("Step CTE_MultiConnectionAttempts called "));
+	SetTestStepResult(EFail);
+	TCommDbMultiConnPref prefPtr;	
+	TInt numAttempts = prefPtr.ConnectionAttempts();
+	INFO_PRINTF3(_L("Expected NumAttempts:= %d, Actual NumAttempts:=%d"), TCommDbMultiConnPref::KMaxMultiConnPrefCount,numAttempts);
+	if(numAttempts != TCommDbMultiConnPref::KMaxMultiConnPrefCount )
+		{
+		return TestStepResult();
+		}
+	numAttempts	 = 3 ;
+	prefPtr.SetConnectionAttempts(numAttempts);
+	TInt attempsCheck = prefPtr.ConnectionAttempts();
+	INFO_PRINTF3(_L("Expected NumAttempts:= %d, Actual NumAttempts:=%d"), TCommDbMultiConnPref::KMaxMultiConnPrefCount,attempsCheck);
+	INFO_PRINTF1(_L("This test fails because  no. of attempts is > 2"));
+	if(numAttempts == attempsCheck )
+		{
+		SetTestStepResult(EFail);
+		}
+	return TestStepResult();
+	}
+	
+	
+	
+	
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_encrpt/group/te_encrpt.mmp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,23 @@
+TARGET                  te_encrpt.exe
+TARGETTYPE              EXE
+
+#if defined(WINS)
+deffile		  ../../../BWINS/TE_ENCRPT.DEF
+#endif
+
+SOURCEPATH              ../src
+SOURCE                  TE_EncrptServer.cpp 	
+SOURCE                  TE_EncrptStep.cpp
+SOURCE                  TE_EncrptSteps.cpp
+
+USERINCLUDE             ../inc
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY                 euser.lib
+LIBRARY                 commdb.lib
+LIBRARY			TestExecuteUtils.lib
+
+CAPABILITY ALL -Tcb
+
+VENDORID 0x70000001
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_encrpt/inc/TE_EncrptServer.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,50 @@
+//
+// 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:
+//
+//
+
+/**
+ * @file TE_EncrptServer.h
+ *
+ * Header for TE_EncrptSuite class. This is the container
+ * class for all the CommDb ConnPrefSuite test steps
+ *
+ */
+#if (!defined __TE_EncrptSUITE_H__)
+#define __TE_EncrptSUITE_H__
+
+#include <test/TestExecuteServerBase.h>
+#include <e32std.h>
+
+#define MAX_NAME_LENGTH		10			///< Maximum length of connection name
+
+class CTE_EncrptStep;
+
+class CTE_EncrptServer : public CTestServer
+	{
+public:
+	static CTE_EncrptServer* NewL();
+	virtual CTestStep* CreateTestStep(const TDesC& aStepName);
+	
+	
+	// this should be a pure virtual so every test ddl
+	// has to provide a version but for now defaults to ?.?
+	virtual TPtrC GetVersion( void );
+		
+	};
+
+void CommInitL(TBool);
+	
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_encrpt/inc/TE_EncrptStep.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,80 @@
+//
+// 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:
+//
+//
+
+/** 
+ * @file TE_EncrptStep.cpp.h
+ *
+ * This defines the CTE_EncrptStep class which is the base class for all 
+ * the EncrptStep test step classes
+ *
+ */
+ 
+#if (!defined __TE_ENCRPTSTEP_H__)
+#define __TE_ENCRPTSTEP_H__
+
+#include <e32std.h>
+#include <e32svr.h>
+#include <cdbstore.h>
+
+#include "TE_EncrptServer.h"
+
+// Connection Configuration Lits
+_LIT(KNameDefault, "default");
+
+// Test step names
+_LIT(KCreateEntries,  "CreateEntries"); 
+_LIT(KCheckPasswords ,  "CheckPasswords");
+_LIT(KDeleteEntries  ,  "DeleteEntries");
+
+//Error strings
+_LIT(KEGeneric, "Test left!");
+
+class TGlobalDbIds;			
+class CTS_EncrptServer;
+
+/* CTS_ConnPrefStep class declaration
+ * Provides the base class for all ConnPref test steps
+ *
+ */
+class CTE_EncrptStep : public CTestStep
+	{
+public:
+	CTE_EncrptStep();
+	virtual ~CTE_EncrptStep();
+	enum TVerdict Test(TInt aResult);
+
+	void ExpLogExtra(const TText8* aFile, TInt aLine, TInt aSeverity,
+		TRefByValue<const TDesC> aFmt,...);
+
+	TGlobalDbIds* Get();
+	void Set(TGlobalDbIds* aGlobals);
+
+	//TGlobalDbIds* iGlobals;
+	
+	CTE_EncrptServer* iOwnerSuite;	///< Pointer to suite which owns this test step
+	
+	};
+
+
+class TGlobalDbIds
+{ 
+public:
+	TUint32 id1;
+	TUint32 id2;
+};
+
+#endif /* __TE_ENCRPTSTEP_H__ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_encrpt/inc/TE_EncrptSteps.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,63 @@
+//
+// 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:
+//
+//
+
+/** 
+ * This defines the TS_RConnectionStep class which is the base class for all 
+ * the RConnection multihoming test step classes
+ *
+ */
+ 
+#if (!defined __TE_ENCRPTSTEPS_H__)
+#define __TE_ENCRPTSTEPS_H__
+
+#include <e32std.h>
+#include <cdbstore.h>
+#include "es_sock.h"
+#include "in_sock.h"
+#include <es_enum.h>
+#include <commdbconnpref.h>
+
+#include "TE_EncrptStep.h"
+
+
+class CTE_CreateEntries : public CTE_EncrptStep
+{
+public:
+	CTE_CreateEntries();
+	virtual ~CTE_CreateEntries();
+	virtual enum TVerdict doTestStepL();
+};
+
+class CTE_CheckPasswords: public CTE_EncrptStep
+{
+public:
+	CTE_CheckPasswords();
+	virtual ~CTE_CheckPasswords();
+	virtual enum TVerdict doTestStepL();
+};
+
+class CTE_DeleteEntries: public CTE_EncrptStep
+{
+public:
+	CTE_DeleteEntries();
+	virtual ~CTE_DeleteEntries();
+	virtual enum TVerdict doTestStepL();
+};
+
+
+
+#endif /* __TE_ENCRPTSTEPS_H__ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_encrpt/src/TE_EncrptServer.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,157 @@
+//
+// 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:
+//
+//
+
+// TE_EncrptServer.cpp
+//
+//
+// This main DLL entry point for the TE_ConServer.dll
+
+
+#include "TE_EncrptStep.h"
+#include "TE_EncrptSteps.h"
+
+
+EXPORT_C CTE_EncrptServer* NewEncrptServer( void ) 
+//
+// NewTestSuiteEncrptL is exported at ordinal 1
+// this provides the interface to allow schedule test
+// to create instances of this test suite
+//
+	{
+	CTE_EncrptServer* ts = 0;
+	TRAPD(err,ts = new (ELeave) CTE_EncrptServer);
+	if (err == KErrNone)
+		return ts;
+	return 0;
+    }
+
+	
+	
+// __EDIT_ME__ - Substitute the name of your test server 
+_LIT(KServerName,"te_Encrpt");
+// __EDIT_ME__ - Use your own server class name
+CTE_EncrptServer* CTE_EncrptServer::NewL()
+/**
+ * @return - Instance of the test server
+ * Called inside the MainL() function to create and start the
+ * CTestServer derived server.
+ */
+	{
+	// __EDIT_ME__ new your server class here
+	CTE_EncrptServer * server = new (ELeave) CTE_EncrptServer();
+	CleanupStack::PushL(server);
+	
+	// Either use a StartL or ConstructL, the latter will permit
+	// Server Logging.
+
+	//server->StartL(KServerName); 
+	server-> ConstructL(KServerName);
+	CleanupStack::Pop(server);
+	return server;
+	}
+
+// EKA2 much simpler
+// Just an E32Main and a MainL()
+LOCAL_C void MainL()
+/**
+ * Much simpler, uses the new Rendezvous() call to sync with the client
+ */
+	{
+	// Leave the hooks in for platform security
+#if (defined __DATA_CAGING__)
+	RProcess().DataCaging(RProcess::EDataCagingOn);
+	RProcess().SecureApi(RProcess::ESecureApiOn);
+#endif
+	CActiveScheduler* sched=NULL;
+	sched=new(ELeave) CActiveScheduler;
+	CActiveScheduler::Install(sched);
+	// __EDIT_ME__ Your server name
+	CTE_EncrptServer* server = NULL;
+	// Create the CTestServer derived server
+	// __EDIT_ME__ Your server name
+	TRAPD(err,server = CTE_EncrptServer::NewL());
+	if(!err)
+		{
+		// Sync with the client and enter the active scheduler
+		RProcess::Rendezvous(KErrNone);
+		sched->Start();
+		}
+	delete server;
+	delete sched;
+	}
+
+// Only a DLL on emulator for typhoon and earlier
+
+GLDEF_C TInt E32Main()
+/**
+ * @return - Standard Epoc error code on exit
+ */
+	{
+	CTrapCleanup* cleanup = CTrapCleanup::New();
+	if(cleanup == NULL)
+		{
+		return KErrNoMemory;
+		}
+	TRAP_IGNORE(MainL());
+	delete cleanup;
+	return KErrNone;
+    }
+
+// Create a thread in the calling process
+// Emulator typhoon and earlier
+
+// __EDIT_ME__ - Use your own server class name
+CTestStep* CTE_EncrptServer::CreateTestStep(const TDesC& aStepName)
+/**
+ * @return - A CTestStep derived instance
+ * Implementation of CTestServer pure virtual
+ */
+	{
+		
+	CTestStep* testStep = NULL;
+	// __EDIT_ME__ - Create your own test steps here
+	// This server creates just one step but create as many as you want
+	// They are created "just in time" when the worker thread is created
+	
+	
+	if(aStepName.Compare(_L("CreateEntries")) == 0 )
+		testStep = new(ELeave) CTE_CreateEntries();
+	else if(aStepName.Compare(_L("CheckPasswords")) == 0 )
+		testStep = new(ELeave) CTE_CheckPasswords();
+	else if(aStepName.Compare(_L("DeleteEntries")) == 0 )
+		testStep = new(ELeave) CTE_DeleteEntries();
+	
+	
+	return testStep;
+	}
+
+
+
+// make a version string available for test system 
+TPtrC CTE_EncrptServer::GetVersion( void )
+	{
+
+#ifdef _DEBUG
+_LIT(KTxtVersion,"1.0 (udeb)");
+#else
+_LIT(KTxtVersion,"1.0");
+#endif
+
+	return KTxtVersion();
+	}
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_encrpt/src/TE_EncrptStep.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,70 @@
+//
+// 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:
+//
+//
+
+/**
+ * @file TE_EncrptStep.cpp
+ *
+ * This contains CTE_EncrptStep class which is
+ * the base class for all the Encrpt test steps
+ *
+ */
+#include "TE_EncrptStep.h"
+
+CTE_EncrptStep::CTE_EncrptStep()
+	{	
+	}
+
+CTE_EncrptStep::~CTE_EncrptStep()
+	{ 
+	}	
+
+void CTE_EncrptStep::ExpLogExtra(const TText8* aFile, TInt aLine, TInt aSeverity,
+		TRefByValue<const TDesC> aFmt,...)
+	{
+
+	// Log to the suite's logger
+	INFO_PRINTF5(_L("File: %S, line: %d, severity: %d, message: $S"), 
+		aFile, aLine, aSeverity, aFmt);
+
+	}
+
+enum TVerdict CTE_EncrptStep::Test(TInt aResult)
+	{	
+		
+	if (!aResult)
+		{
+			INFO_PRINTF1(KEGeneric);
+         	SetTestStepResult(EFail);
+
+			return TestStepResult();
+		}
+        SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
+
+
+void CTE_EncrptStep::Set(TGlobalDbIds* aGlobals)
+	{ UserSvr::DllSetTls(67338721,aGlobals); }
+
+TGlobalDbIds* CTE_EncrptStep::Get()
+	{ TGlobalDbIds * d=(TGlobalDbIds*)UserSvr::DllTls(67338721); return d; }
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_encrpt/src/TE_EncrptSteps.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,304 @@
+//
+// 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:
+//
+//
+//
+
+// Test code for encryption in Database
+
+#include <e32test.h>
+#include <f32file.h>
+#include <d32comm.h>
+#include <cdbcols.h>
+#include <commdb.h>
+#include <cdblen.h>
+
+#include "TE_EncrptSteps.h"
+
+
+#define pass1	_L("PASS")
+#define pass2	_L("1234567890")
+#define pass3	_L("abcdefghijklmnopqrstuvwxyz")
+#define pass4	_L("!\xa3$%^&*()_+-=?><,.@~:;'#|")
+
+
+CTE_CreateEntries::CTE_CreateEntries()
+	{
+	SetTestStepName(KCreateEntries);
+	}
+
+CTE_CreateEntries::~CTE_CreateEntries()
+	{	
+	}
+
+enum TVerdict CTE_CreateEntries::doTestStepL()
+	{
+	
+	TUint32 id1 = 0;  
+	TUint32 id2 = 0; 
+		
+	INFO_PRINTF1(_L("Testing encryption"));
+
+    CCommsDatabase* db=CCommsDatabase::NewL(EDatabaseTypeIAP);
+	CleanupStack::PushL(db);
+	User::LeaveIfError(db->BeginTransaction());
+	
+	CCommsDbTableView* table=db->OpenTableLC(TPtrC(DIAL_OUT_ISP));
+	Test(table->InsertRecord(id1)==KErrNone);
+	table->WriteTextL(TPtrC(COMMDB_NAME),_L("Test 1"));
+	table->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	table->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
+	table->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
+	table->WriteTextL(TPtrC(ISP_LOGIN_NAME),_L("AnnW"));
+	table->WriteTextL(TPtrC(ISP_LOGIN_PASS),pass1);
+	table->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
+	table->WriteTextL(TPtrC(ISP_IF_AUTH_NAME),_L("RasUser"));
+	table->WriteTextL(TPtrC(ISP_IF_AUTH_PASS),pass2);
+	table->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	table->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	table->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	Test(table->PutRecordChanges()==KErrNone);
+
+	Test(table->InsertRecord(id2)==KErrNone);
+	table->WriteTextL(TPtrC(COMMDB_NAME),_L("Test 2"));
+	table->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	table->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
+	table->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
+	table->WriteTextL(TPtrC(ISP_LOGIN_NAME),_L("AnnW"));
+	table->WriteTextL(TPtrC(ISP_LOGIN_PASS),pass3);
+	table->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
+	table->WriteTextL(TPtrC(ISP_IF_AUTH_NAME),_L("RasUser"));
+	table->WriteTextL(TPtrC(ISP_IF_AUTH_PASS),pass4);
+	table->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	table->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	table->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	Test(table->PutRecordChanges()==KErrNone);
+
+	Test(db->CommitTransaction()==KErrNone);
+	CleanupStack::PopAndDestroy(2);
+
+	db = CCommsDatabase::NewL(EDatabaseTypeIAP);
+		CleanupStack::PushL(db);
+	
+	table = db->OpenViewMatchingUintLC(TPtrC(DIAL_OUT_ISP), TPtrC(COMMDB_ID), id1);
+
+	if (table->GotoFirstRecord() == KErrNone)
+		table->DeleteRecord();
+
+	CleanupStack::PopAndDestroy(table);
+	table = NULL;
+	table = db->OpenViewMatchingUintLC(TPtrC(DIAL_OUT_ISP), TPtrC(COMMDB_ID), id2);
+
+	if (table->GotoFirstRecord() == KErrNone)
+		table->DeleteRecord();
+
+	CleanupStack::PopAndDestroy(2);
+
+	INFO_PRINTF1(_L("IAP Entries Added Successfully"));
+
+    SetTestStepResult(EPass);	
+    
+    return TestStepResult();
+	}
+
+
+CTE_CheckPasswords::CTE_CheckPasswords()
+	{
+	SetTestStepName(KCheckPasswords);
+	}
+
+CTE_CheckPasswords::~CTE_CheckPasswords()
+	{	
+	}
+
+enum TVerdict CTE_CheckPasswords::doTestStepL()
+	{
+
+	INFO_PRINTF1(_L("Checking passwords"));
+
+	TUint32 id1 = 0;  
+	TUint32 id2 = 0;
+
+	CCommsDatabase* db=CCommsDatabase::NewL(EDatabaseTypeIAP);
+	CleanupStack::PushL(db);
+	User::LeaveIfError(db->BeginTransaction());
+	
+	CCommsDbTableView* table=db->OpenTableLC(TPtrC(DIAL_OUT_ISP));
+	Test(table->InsertRecord(id1)==KErrNone);
+	table->WriteTextL(TPtrC(COMMDB_NAME),_L("Test 1"));
+	table->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	table->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
+	table->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
+	table->WriteTextL(TPtrC(ISP_LOGIN_NAME),_L("AnnW"));
+	table->WriteTextL(TPtrC(ISP_LOGIN_PASS),pass1);
+	table->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
+	table->WriteTextL(TPtrC(ISP_IF_AUTH_NAME),_L("RasUser"));
+	table->WriteTextL(TPtrC(ISP_IF_AUTH_PASS),pass2);
+	table->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	table->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	table->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	Test(table->PutRecordChanges()==KErrNone);
+
+	Test(table->InsertRecord(id2)==KErrNone);
+	table->WriteTextL(TPtrC(COMMDB_NAME),_L("Test 2"));
+	table->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	table->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
+	table->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
+	table->WriteTextL(TPtrC(ISP_LOGIN_NAME),_L("AnnW"));
+	table->WriteTextL(TPtrC(ISP_LOGIN_PASS),pass3);
+	table->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
+	table->WriteTextL(TPtrC(ISP_IF_AUTH_NAME),_L("RasUser"));
+	table->WriteTextL(TPtrC(ISP_IF_AUTH_PASS),pass4);
+	table->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	table->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	table->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	Test(table->PutRecordChanges()==KErrNone);
+
+	Test(db->CommitTransaction()==KErrNone);
+	CleanupStack::PopAndDestroy(2);
+
+	db=CCommsDatabase::NewL(EDatabaseTypeIAP);
+	CleanupStack::PushL(db);
+	
+	table=db->OpenViewMatchingUintLC(TPtrC(DIAL_OUT_ISP), TPtrC(COMMDB_ID), id1);
+
+	TBuf<KCommsDbSvrMaxFieldLength> password;
+	Test(table->GotoFirstRecord()==KErrNone);
+	table->ReadTextL(TPtrC(ISP_LOGIN_PASS),password);
+	Test(password==pass1);
+	table->ReadTextL(TPtrC(ISP_IF_AUTH_PASS),password);
+	Test(password==pass2);
+
+	CleanupStack::PopAndDestroy(table);
+	table = NULL;
+	table = db->OpenViewMatchingUintLC(TPtrC(DIAL_OUT_ISP), TPtrC(COMMDB_ID), id2);
+
+	Test(table->GotoFirstRecord()== KErrNone);
+	table->ReadTextL(TPtrC(ISP_LOGIN_PASS),password);
+	Test(password==pass3);
+	table->ReadTextL(TPtrC(ISP_IF_AUTH_PASS),password);
+	Test(password==pass4);
+	
+	CleanupStack::PopAndDestroy(2);
+
+	db = CCommsDatabase::NewL(EDatabaseTypeIAP);
+	CleanupStack::PushL(db);
+	
+	table = db->OpenViewMatchingUintLC(TPtrC(DIAL_OUT_ISP), TPtrC(COMMDB_ID), id1);
+
+	if (table->GotoFirstRecord() == KErrNone)
+		table->DeleteRecord();
+
+	CleanupStack::PopAndDestroy(table);
+	table = NULL;
+	table = db->OpenViewMatchingUintLC(TPtrC(DIAL_OUT_ISP), TPtrC(COMMDB_ID), id2);
+
+	if (table->GotoFirstRecord() == KErrNone)
+		table->DeleteRecord();
+
+	CleanupStack::PopAndDestroy(2);
+
+    SetTestStepResult(EPass);	
+     
+    return TestStepResult();
+	}
+
+
+CTE_DeleteEntries::CTE_DeleteEntries()
+	{
+	SetTestStepName(KDeleteEntries);
+	}
+
+CTE_DeleteEntries::~CTE_DeleteEntries()
+	{	
+	}
+
+enum TVerdict CTE_DeleteEntries::doTestStepL()
+	{
+
+	INFO_PRINTF1(_L("Delete the IAP entries."));
+
+	TUint32 id1 = 0;  
+	TUint32 id2 = 0;
+
+	CCommsDatabase* db=CCommsDatabase::NewL(EDatabaseTypeIAP);
+	CleanupStack::PushL(db);
+	User::LeaveIfError(db->BeginTransaction());
+	
+	CCommsDbTableView* table=db->OpenTableLC(TPtrC(DIAL_OUT_ISP));
+	Test(table->InsertRecord(id1)==KErrNone);
+	table->WriteTextL(TPtrC(COMMDB_NAME),_L("Test 1"));
+	table->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	table->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
+	table->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
+	table->WriteTextL(TPtrC(ISP_LOGIN_NAME),_L("AnnW"));
+	table->WriteTextL(TPtrC(ISP_LOGIN_PASS),pass1);
+	table->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
+	table->WriteTextL(TPtrC(ISP_IF_AUTH_NAME),_L("RasUser"));
+	table->WriteTextL(TPtrC(ISP_IF_AUTH_PASS),pass2);
+	table->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	table->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	table->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	Test(table->PutRecordChanges()==KErrNone);
+
+	Test(table->InsertRecord(id2)==KErrNone);
+	table->WriteTextL(TPtrC(COMMDB_NAME),_L("Test 2"));
+	table->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
+	table->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
+	table->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
+	table->WriteTextL(TPtrC(ISP_LOGIN_NAME),_L("AnnW"));
+	table->WriteTextL(TPtrC(ISP_LOGIN_PASS),pass3);
+	table->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
+	table->WriteTextL(TPtrC(ISP_IF_AUTH_NAME),_L("RasUser"));
+	table->WriteTextL(TPtrC(ISP_IF_AUTH_PASS),pass4);
+	table->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
+	table->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
+	table->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
+	Test(table->PutRecordChanges()==KErrNone);
+
+	Test(db->CommitTransaction()==KErrNone);
+	CleanupStack::PopAndDestroy(2);
+
+    db = CCommsDatabase::NewL(EDatabaseTypeIAP);
+	CleanupStack::PushL(db);
+	
+	table = db->OpenViewMatchingUintLC(TPtrC(DIAL_OUT_ISP), TPtrC(COMMDB_ID), id1);
+
+	if (table->GotoFirstRecord() == KErrNone)
+		table->DeleteRecord();
+
+	CleanupStack::PopAndDestroy(table);
+	table = NULL;
+	table = db->OpenViewMatchingUintLC(TPtrC(DIAL_OUT_ISP), TPtrC(COMMDB_ID), id2);
+
+	if (table->GotoFirstRecord() == KErrNone)
+		table->DeleteRecord();
+
+	CleanupStack::PopAndDestroy(2);
+
+	INFO_PRINTF1(_L("IAP Entries Deleted Successfully"));
+
+    SetTestStepResult(EPass);	
+    
+    return TestStepResult();
+	}
+
+
+
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_usecases/group/te_usecases.mmp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,23 @@
+TARGET                  te_usecases.exe
+TARGETTYPE              EXE
+
+#if defined(WINS)
+deffile		  ../../../BWINS/TE_USECASES.DEF
+#endif
+
+SOURCEPATH              ../src
+SOURCE                  TE_UseCasesServer.cpp 	
+SOURCE                  TE_UseCasesStep.cpp
+SOURCE                  TE_UseCasesSteps.cpp
+
+USERINCLUDE             ../inc
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY                 euser.lib
+LIBRARY                 commdb.lib
+LIBRARY			TestExecuteUtils.lib
+
+CAPABILITY ALL -Tcb
+
+VENDORID 0x70000001
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_usecases/inc/TE_UseCasesServer.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,48 @@
+//
+// 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:
+//
+//
+
+/**
+ * @file TE_UseCasesServer.h
+ *
+ * Header for TE_UseCasesSuite class. This is the container
+ * class for all the CommDb ConnPrefSuite test steps
+ *
+ */
+#if (!defined __TE_UseCasesSUITE_H__)
+#define __TE_UseCasesSUITE_H__
+
+#include <test/TestExecuteServerBase.h>
+#include <e32std.h>
+
+#define MAX_NAME_LENGTH		10			///< Maximum length of connection name
+
+class CTS_UseCasesStep;
+
+class CTE_UseCasesServer : public CTestServer
+	{
+public:
+	static CTE_UseCasesServer* NewL();
+	virtual CTestStep* CreateTestStep(const TDesC& aStepName);
+	
+	
+	// this should be a pure virtual so every test ddl
+	// has to provide a version but for now defaults to ?.?
+	virtual TPtrC GetVersion( void );
+		
+	};
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_usecases/inc/TE_UseCasesStep.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,82 @@
+//
+// 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:
+//
+//
+
+/** 
+ * @file TE_EncrptStep.cpp.h
+ *
+ * This defines the CTS_EncrptStep class which is the base class for all 
+ * the EncrptStep test step classes
+ *
+ */
+ 
+#if (!defined __TE_USECASESSTEP_H__)
+#define __TE_USECASESSTEP_H__
+
+#include <e32std.h>
+#include <e32svr.h>
+#include <cdbstore.h>
+
+#include "TE_UseCasesServer.h"
+
+// Connection Configuration Lits
+_LIT(KNameDefault, "default");
+
+// Test step names
+_LIT(KCreatingDatabaseAndView,  "CreatingDatabaseAndView"); 
+_LIT(KUsecaseReading,  "UsecaseReading");  
+_LIT(KUsecaseWriting,  "UsecaseWriting"); 
+_LIT(KUsecaseOverridingATableEntry  ,  "UsecaseOverridingATableEntry"); 
+_LIT(KUsecaseOverridingThePreferenceTable  ,  "UsecaseOverridingThePreferenceTable"); 
+_LIT(KUsecaseUsingATemplate  ,  "UsecaseUsingATemplate"); 
+
+//Error strings
+_LIT(KEGeneric, "Test left!");
+
+class TGlobalData;
+class CTE_UseCasesSuite;
+
+/* CTE_ConnPrefStep class declaration
+ * Provides the base class for all ConnPref test steps
+ *
+ */
+class CTE_UseCasesStep : public CTestStep
+	{
+public:
+	CTE_UseCasesStep();
+	virtual ~CTE_UseCasesStep();
+	enum TVerdict Test(TInt aResult);
+
+	void ExpLogExtra(const TText8* aFile, TInt aLine, TInt aSeverity,
+		TRefByValue<const TDesC> aFmt,...);
+	
+	//TGlobalData* iGlobals;
+	
+	TGlobalData* Get();
+	void Set(TGlobalData * aGlobals);
+
+	CTE_UseCasesSuite* iOwnerSuite;	///< Pointer to suite which owns this test step
+	
+	};
+
+class TGlobalData
+{
+public:
+	CCommsDbTableView* iView;
+	CCommsDatabase* iDb;
+};
+
+#endif /* __TE_USECASESSTEP_H__ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_usecases/inc/TE_UseCasesSteps.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,93 @@
+//
+// 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:
+//
+//
+
+/** 
+ * @file TE_RConnectionStep.h
+ *
+ * This defines the TE_RConnectionStep class which is the base class for all 
+ * the RConnection multihoming test step classes
+ *
+ */
+ 
+#if (!defined __TE_USECASESSTEPS_H__)
+#define __TE_USECASESSTEPS_H__
+
+#include <e32std.h>
+#include <cdbstore.h>
+#include "es_sock.h"
+#include "in_sock.h"
+#include <es_enum.h>
+#include <commdbconnpref.h>
+
+#include "TE_UseCasesStep.h"
+
+
+class CTE_CreatingDatabaseAndView : public CTE_UseCasesStep
+{
+public:
+	CTE_CreatingDatabaseAndView();
+	virtual ~CTE_CreatingDatabaseAndView();
+	virtual enum TVerdict doTestStepL();
+};  
+
+
+class CTE_UsecaseReading: public CTE_UseCasesStep
+{
+public:
+	CTE_UsecaseReading();
+	virtual ~CTE_UsecaseReading();
+	virtual enum TVerdict doTestStepL();
+};  
+
+
+class CTE_UsecaseWriting: public CTE_UseCasesStep
+{
+public:
+	CTE_UsecaseWriting();
+	virtual ~CTE_UsecaseWriting();
+	virtual enum TVerdict doTestStepL();
+};  
+
+
+class CTE_UsecaseOverridingATableEntry: public CTE_UseCasesStep
+{
+public:
+	CTE_UsecaseOverridingATableEntry();
+	virtual ~CTE_UsecaseOverridingATableEntry();
+	virtual enum TVerdict doTestStepL();
+};  
+
+
+class CTE_UsecaseOverridingThePreferenceTable: public CTE_UseCasesStep
+{
+public:
+	CTE_UsecaseOverridingThePreferenceTable();
+	virtual ~CTE_UsecaseOverridingThePreferenceTable();
+	virtual enum TVerdict doTestStepL();
+};   
+
+
+class CTE_UsecaseUsingATemplate: public CTE_UseCasesStep
+{
+public:
+	CTE_UsecaseUsingATemplate();
+	virtual ~CTE_UsecaseUsingATemplate();
+	virtual enum TVerdict doTestStepL();
+};   
+
+
+#endif /* __TE_USECASESSTEPS_H__ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_usecases/src/TE_UseCasesServer.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,164 @@
+//
+// 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:
+//
+//
+
+// TE_UseCasesServer.cpp
+//
+//
+// This main DLL entry point for the TE_ConServer.dll
+
+
+#include "TE_UseCasesStep.h"
+#include "TE_UseCasesSteps.h"
+
+
+EXPORT_C CTE_UseCasesServer* NewUseCasesServer( void ) 
+//
+// NewTestSuiteUseCasesL is exported at ordinal 1
+// this provides the interface to allow schedule test
+// to create instances of this test suite
+//
+	{
+	CTE_UseCasesServer* ts = 0;
+	TRAPD(err,ts = new (ELeave) CTE_UseCasesServer);
+	if (err == KErrNone)
+		return ts;
+	return 0;
+    }
+
+	
+	
+// __EDIT_ME__ - Substitute the name of your test server 
+_LIT(KServerName,"te_usecases");
+// __EDIT_ME__ - Use your own server class name
+CTE_UseCasesServer* CTE_UseCasesServer::NewL()
+/**
+ * @return - Instance of the test server
+ * Called inside the MainL() function to create and start the
+ * CTestServer derived server.
+ */
+	{
+	// __EDIT_ME__ new your server class here
+	CTE_UseCasesServer * server = new (ELeave) CTE_UseCasesServer();
+	CleanupStack::PushL(server);
+	
+	// Either use a StartL or ConstructL, the latter will permit
+	// Server Logging.
+
+	//server->StartL(KServerName); 
+	server-> ConstructL(KServerName);
+	CleanupStack::Pop(server);
+	return server;
+	}
+
+// EKA2 much simpler
+// Just an E32Main and a MainL()
+LOCAL_C void MainL()
+/**
+ * Much simpler, uses the new Rendezvous() call to sync with the client
+ */
+	{
+	// Leave the hooks in for platform security
+#if (defined __DATA_CAGING__)
+	RProcess().DataCaging(RProcess::EDataCagingOn);
+	RProcess().SecureApi(RProcess::ESecureApiOn);
+#endif
+	CActiveScheduler* sched=NULL;
+	sched=new(ELeave) CActiveScheduler;
+	CActiveScheduler::Install(sched);
+	// __EDIT_ME__ Your server name
+	CTE_UseCasesServer* server = NULL;
+	// Create the CTestServer derived server
+	// __EDIT_ME__ Your server name
+	TRAPD(err,server = CTE_UseCasesServer::NewL());
+	if(!err)
+		{
+		// Sync with the client and enter the active scheduler
+		RProcess::Rendezvous(KErrNone);
+		sched->Start();
+		}
+	delete server;
+	delete sched;
+	}
+
+// Only a DLL on emulator for typhoon and earlier
+
+GLDEF_C TInt E32Main()
+/**
+ * @return - Standard Epoc error code on exit
+ */
+	{
+	CTrapCleanup* cleanup = CTrapCleanup::New();
+	if(cleanup == NULL)
+		{
+		return KErrNoMemory;
+		}
+	TRAP_IGNORE(MainL());
+	delete cleanup;
+	return KErrNone;
+    }
+
+// Create a thread in the calling process
+// Emulator typhoon and earlier
+
+// __EDIT_ME__ - Use your own server class name
+CTestStep* CTE_UseCasesServer::CreateTestStep(const TDesC& aStepName)
+/**
+ * @return - A CTestStep derived instance
+ * Implementation of CTestServer pure virtual
+ */
+	{
+		
+	CTestStep* testStep = NULL;
+	// __EDIT_ME__ - Create your own test steps here
+	// This server creates just one step but create as many as you want
+	// They are created "just in time" when the worker thread is created
+	
+	
+	if(aStepName.Compare(_L("CreatingDatabaseAndView")) == 0 )
+		testStep = new(ELeave) CTE_CreatingDatabaseAndView();
+	else if(aStepName.Compare(_L("UsecaseReading")) == 0 )
+		testStep = new(ELeave) CTE_UsecaseReading();
+	else if(aStepName.Compare(_L("UsecaseWriting")) == 0 )
+		testStep = new(ELeave) CTE_UsecaseWriting();
+	else if(aStepName.Compare(_L("UsecaseOverridingATableEntry")) == 0 )
+		testStep = new(ELeave) CTE_UsecaseOverridingATableEntry();
+	else if(aStepName.Compare(_L("UsecaseOverridingThePreferenceTable")) == 0 )
+		testStep = new(ELeave) CTE_UsecaseOverridingThePreferenceTable();
+	else if(aStepName.Compare(_L("UsecaseUsingATemplate")) == 0 )
+		testStep = new(ELeave) CTE_UsecaseUsingATemplate();
+
+
+	
+	return testStep;
+	}
+
+
+
+// make a version string available for test system 
+TPtrC CTE_UseCasesServer::GetVersion( void )
+	{
+
+#ifdef _DEBUG
+_LIT(KTxtVersion,"1.0 (udeb)");
+#else
+_LIT(KTxtVersion,"1.0");
+#endif
+
+	return KTxtVersion();
+	}
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_usecases/src/TE_UseCasesStep.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,61 @@
+//
+// 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:
+//
+//
+
+/**
+ * This contains CTE_UseCasesStep class which is
+ * the base class for all the Encrpt test steps
+ *
+ */
+#include "TE_UseCasesStep.h"
+
+
+CTE_UseCasesStep::CTE_UseCasesStep() 
+	{			
+	}
+
+CTE_UseCasesStep::~CTE_UseCasesStep()
+	{ 
+	}	
+
+enum TVerdict CTE_UseCasesStep::Test(TInt aResult)
+	{	
+	if (!aResult)
+		{
+		INFO_PRINTF1(KEGeneric);
+        SetTestStepResult(EFail);
+
+		return TestStepResult();		
+		}
+    SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
+
+void CTE_UseCasesStep::Set(TGlobalData * aGlobals)
+	{ 
+	UserSvr::DllSetTls(67338722,aGlobals);
+	}
+
+TGlobalData* CTE_UseCasesStep::Get()
+	{ 
+	TGlobalData * d=(TGlobalData *)UserSvr::DllTls(67338722); 
+	return d; 
+	}
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/TE_commdb/te_usecases/src/TE_UseCasesSteps.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,243 @@
+//
+// 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:
+//
+//
+
+// TE_UseCasesSteps.CPP
+//
+//
+
+// Use cases as in the commdb design overview
+
+#include <e32test.h>
+#include <f32file.h>
+#include <commdb.h>
+#include <cdbover.h>
+#include <cdbtemp.h>
+
+#include "TE_UseCasesSteps.h"
+
+///
+CTE_CreatingDatabaseAndView::CTE_CreatingDatabaseAndView()
+	{
+	SetTestStepName(KCreatingDatabaseAndView);
+	}
+
+CTE_CreatingDatabaseAndView::~CTE_CreatingDatabaseAndView()
+	{	
+	}
+
+enum TVerdict CTE_CreatingDatabaseAndView::doTestStepL()
+	{
+		
+	CCommsDbTableView* view;
+	CCommsDatabase* db = CCommsDatabase::NewL();
+	const TPtrC kTable1(DIAL_OUT_ISP);
+	const TPtrC kColumn1(ISP_TYPE);
+	view = db->OpenViewMatchingUintLC(kTable1, kColumn1, EIspTypeInternetOnly);
+	CleanupStack::Pop(view);
+
+	delete view; 
+	delete db;		
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///
+CTE_UsecaseReading::CTE_UsecaseReading()
+	{
+	SetTestStepName(KUsecaseReading);
+	}
+
+CTE_UsecaseReading::~CTE_UsecaseReading()
+	{	
+	}
+
+enum TVerdict CTE_UsecaseReading::doTestStepL()
+	{
+
+	CCommsDbTableView* view;
+	CCommsDatabase* db = CCommsDatabase::NewL();
+	const TPtrC kTable1(DIAL_OUT_ISP);
+	const TPtrC kColumn1(ISP_TYPE);
+	view = db->OpenViewMatchingUintLC(kTable1, kColumn1, EIspTypeInternetOnly);
+	CleanupStack::Pop(view);	
+		
+	const TPtrC kColumn(ISP_DESCRIPTION);
+
+	TBuf<KCommsDbSvrMaxFieldLength> description;
+
+	view->GotoFirstRecord();
+	view->ReadTextL(kColumn, description);
+
+	delete view; 
+	delete db;
+	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///
+CTE_UsecaseWriting::CTE_UsecaseWriting()
+	{
+	SetTestStepName(KUsecaseWriting);
+	}
+
+CTE_UsecaseWriting::~CTE_UsecaseWriting()
+	{	
+	}
+
+enum TVerdict CTE_UsecaseWriting::doTestStepL()
+	{
+	
+	CCommsDbTableView* view;
+	CCommsDatabase* db = CCommsDatabase::NewL();
+	const TPtrC kTable1(DIAL_OUT_ISP);
+	const TPtrC kColumn1(ISP_TYPE);
+	view = db->OpenViewMatchingUintLC(kTable1, kColumn1, EIspTypeInternetOnly);
+	CleanupStack::Pop(view);    
+	
+	const TPtrC kColumn(ISP_DESCRIPTION);
+	const TPtrC kDescription(_L("A new description put in by t_usecases"));
+
+	TInt ret = view->GotoNextRecord();
+	if(ret == KErrNone)
+		{
+		ret = view->UpdateRecord();
+		if(ret == KErrNone)
+			{
+			view->WriteTextL(kColumn, kDescription);
+			view->PutRecordChanges();
+			}
+		}
+
+	delete view; 
+	delete db;
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///
+CTE_UsecaseOverridingATableEntry::CTE_UsecaseOverridingATableEntry()
+	{
+	SetTestStepName(KUsecaseOverridingATableEntry);
+	}
+
+CTE_UsecaseOverridingATableEntry::~CTE_UsecaseOverridingATableEntry()
+	{	
+	}
+
+enum TVerdict CTE_UsecaseOverridingATableEntry::doTestStepL()
+	{
+	const TPtrC kTable(DIAL_OUT_ISP);
+	const TPtrC kColumn(ISP_DESCRIPTION);
+	const TPtrC kOverride(_L("An overriden description"));
+	TBuf<KCommsDbSvrMaxFieldLength> overridenValue;
+
+	CCommDbOverrideSettings *override;
+	override = CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(override);
+
+	override->SetDesOverride(kTable, kColumn, kOverride);
+
+	if (override->GetDesOverride(kTable, kColumn, overridenValue) != KErrNone)
+		{
+		User::Leave(__LINE__);
+		}
+	if (overridenValue != kOverride)
+		{
+		User::Leave(__LINE__);
+		}
+
+	CleanupStack::PopAndDestroy(override);
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///
+CTE_UsecaseOverridingThePreferenceTable::CTE_UsecaseOverridingThePreferenceTable()
+	{
+	SetTestStepName(KUsecaseOverridingThePreferenceTable);
+	}
+
+CTE_UsecaseOverridingThePreferenceTable::~CTE_UsecaseOverridingThePreferenceTable()
+	{	
+	}
+
+enum TVerdict CTE_UsecaseOverridingThePreferenceTable::doTestStepL()
+	{
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref overrideSettings;
+	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref overridenValue;
+
+	CCommDbOverrideSettings* override;
+	override = CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
+	CleanupStack::PushL(override);
+
+	overrideSettings.iDialogPref = ECommDbDialogPrefPrompt;
+	overrideSettings.iRanking = 1;
+	overrideSettings.iDirection = ECommDbConnectionDirectionOutgoing;
+	override->SetConnectionPreferenceOverride(overrideSettings);
+
+	overridenValue.iRanking = 1;
+	override->GetConnectionPreferenceOverride(overridenValue);
+
+	if (!(overrideSettings == overridenValue))
+		{
+		User::Leave(__LINE__);
+		}
+
+	CleanupStack::PopAndDestroy(override);
+
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
+
+///
+CTE_UsecaseUsingATemplate::CTE_UsecaseUsingATemplate()
+	{
+	SetTestStepName(KUsecaseUsingATemplate);
+	}
+
+CTE_UsecaseUsingATemplate::~CTE_UsecaseUsingATemplate()
+	{	
+	}
+
+enum TVerdict CTE_UsecaseUsingATemplate::doTestStepL()
+	{
+
+	CCommsDbTableView* view;
+	CCommsDatabase* db = CCommsDatabase::NewL();
+	const TPtrC kTable1(DIAL_OUT_ISP);
+	const TPtrC kColumn1(ISP_TYPE);
+	view = db->OpenViewMatchingUintLC(kTable1, kColumn1, EIspTypeInternetOnly);
+	CleanupStack::Pop(view);   
+	
+	const TPtrC kTable(DIAL_OUT_ISP);
+	const TPtrC kColumn(ISP_DESCRIPTION);
+	const TPtrC kDescription(_L("A default description put in by t_usecases"));
+
+	CCommsDbTemplateRecord* temp;
+	temp = CCommsDbTemplateRecord::NewL(db, kTable);
+	CleanupStack::PushL(temp);
+
+	temp->Modify();
+	temp->WriteTextL(kColumn, kDescription);
+	temp->StoreModifications();
+	
+	CleanupStack::PopAndDestroy(temp);
+	 
+	delete view; 
+	delete db;
+	
+        SetTestStepResult(EPass);	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/bwins/TE_COMMDBu.def	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+; NEW:
+	?NewcommdbServer@@YAPAVCTE_commdbServer@@XZ @ 1 NONAME ; class CTE_commdbServer * __cdecl NewcommdbServer(void)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/bwins/TE_CONNPREFU.DEF	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?NewConnPrefServer@@YAPAVCCTE_ConnPrefServer@@XZ @ 1 NONAME ; class CTE_ConnPrefServer * __cdecl NewConnPrefServer(void)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/bwins/TE_ENCRPTU.DEF	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,2 @@
+EXPORTS
+	?NewEncrptServer@@YAPAVCTE_EncrptServer@@XZ @ 1 NONAME ; class CTE_EncrptServer * __cdecl NewEncrptServer(void)
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/bwins/TE_USECASESU.DEF	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?NewUseCasesServer@@YAPAVCTE_UseCasesServer@@XZ @ 1 NONAME ; class CTE_UseCasesServer * __cdecl NewUseCasesServer(void)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/group/ABLD.BAT	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,15 @@
+@ECHO OFF
+
+REM Bldmake-generated batch file - ABLD.BAT
+REM ** DO NOT EDIT **
+
+perl -S ABLD.PL "\code\commsfw\commsconfig\commsdatabaseshim\group\\" %1 %2 %3 %4 %5 %6 %7 %8 %9
+if errorlevel==1 goto CheckPerl
+goto End
+
+:CheckPerl
+perl -v >NUL
+if errorlevel==1 echo Is Perl, version 5.003_07 or later, installed?
+goto End
+
+:End
--- a/commsconfig/commsdatabaseshim/group/BLD.INF	Thu Sep 02 21:44:45 2010 +0300
+++ b/commsconfig/commsdatabaseshim/group/BLD.INF	Fri Sep 17 08:36:26 2010 +0300
@@ -29,177 +29,105 @@
 
 PRJ_TESTEXPORTS
 
-../ts_commdb/scripts/default5.dat		/epoc32/release/winscw/udeb/z/private/100012a5/dbs_10004e1d_corrupt.dat
-../ts_commdb/scripts/default5.dat		/epoc32/release/winscw/urel/z/private/100012a5/dbs_10004e1d_corrupt.dat
-../ts_commdb/scripts/default5.dat		/epoc32/data/z/private/100012a5/dbs_10004e1d_corrupt.dat
-
-../group/tcommdb.iby     		/epoc32/rom/include/tcommdb.iby
-
-// As these test scripts, cdb_urel.script, are used 2 times during our ONB, in order to ensure the uniqueness of the scripts names
-// we need to export them with 2 different names.
+../te_commdb/scripts/default5.dat		/epoc32/release/winscw/udeb/z/private/100012a5/dbs_10004e1d_corrupt.dat
+../te_commdb/scripts/default5.dat		/epoc32/release/winscw/udeb/z/private/100012a5/dbs_10004e1d_corrupt.dat
+../te_commdb/scripts/default5.dat		/epoc32/release/winscw/urel/z/private/100012a5/dbs_10004e1d_corrupt.dat
 
-../ts_commdb/scripts/cdb_urel.script	/epoc32/release/wins/udeb/z/testdata/scripts/cdb_urel.script
-../ts_commdb/scripts/cdb_urel.script	/epoc32/release/wins/udeb/z/testdata/scripts/cdb_urel1.script
-../ts_commdb/scripts/Default1.xml	/epoc32/release/wins/udeb/z/testdata/configs/default1.xml
-../ts_commdb/scripts/default3.xml	/epoc32/release/wins/udeb/z/testdata/configs/default3.xml
-../ts_commdb/scripts/default5.dat	/epoc32/release/wins/udeb/z/testdata/configs/default5.dat
-../ts_commdb/scripts/Default7.xml	/epoc32/release/wins/udeb/z/testdata/configs/default7.xml
-../ts_commdb/scripts/Default.xml	/epoc32/release/wins/udeb/z/testdata/configs/default.xml
-../ts_commdb/scripts/Corrupt.xml	/epoc32/release/wins/udeb/z/testdata/configs/corrupt.xml
-../ts_commdb/scripts/020.xml 		/epoc32/release/wins/udeb/z/testdata/configs/020.xml
-../ts_commdb/scripts/021.xml 		/epoc32/release/wins/udeb/z/testdata/configs/021.xml
-../ts_commdb/scripts/022.xml 		/epoc32/release/wins/udeb/z/testdata/configs/022.xml
-../ts_commdb/scripts/022_30.xml 		/epoc32/release/wins/udeb/z/testdata/configs/022_30.xml
-../ts_commdb/scripts/023.xml 		/epoc32/release/wins/udeb/z/testdata/configs/023.xml
-../ts_commdb/scripts/024.xml 		/epoc32/release/wins/udeb/z/testdata/configs/024.xml
-../ts_commdb/scripts/061_01.xml 		/epoc32/release/wins/udeb/z/testdata/configs/061_01.xml
-../ts_commdb/scripts/061_02.xml 		/epoc32/release/wins/udeb/z/testdata/configs/061_02.xml
-../ts_commdb/scripts/061_03.xml 		/epoc32/release/wins/udeb/z/testdata/configs/061_03.xml
-../ts_commdb/scripts/061_04.xml 		/epoc32/release/wins/udeb/z/testdata/configs/061_04.xml
-../ts_commdb/scripts/064_01.cfg 		/epoc32/release/wins/udeb/z/testdata/configs/064_01.cfg
+../group/te_tcommdb.iby     		/epoc32/rom/include/te_tcommdb.iby
 
-../ts_commdb/scripts/cdb_urel.script	/epoc32/release/wins/urel/z/testdata/scripts/cdb_urel.script
-../ts_commdb/scripts/cdb_urel.script	/epoc32/release/wins/urel/z/testdata/scripts/cdb_urel1.script
-../ts_commdb/scripts/Default1.xml	/epoc32/release/wins/urel/z/testdata/configs/default1.xml
-../ts_commdb/scripts/default3.xml	/epoc32/release/wins/urel/z/testdata/configs/default3.xml
-../ts_commdb/scripts/default5.dat	/epoc32/release/wins/urel/z/testdata/configs/default5.dat
-../ts_commdb/scripts/Default7.xml	/epoc32/release/wins/urel/z/testdata/configs/default7.xml
-../ts_commdb/scripts/Default.xml	/epoc32/release/wins/urel/z/testdata/configs/default.xml
-../ts_commdb/scripts/Corrupt.xml	/epoc32/release/wins/urel/z/testdata/configs/corrupt.xml
-../ts_commdb/scripts/020.xml 		/epoc32/release/wins/urel/z/testdata/configs/020.xml
-../ts_commdb/scripts/021.xml 		/epoc32/release/wins/urel/z/testdata/configs/021.xml
-../ts_commdb/scripts/022.xml 		/epoc32/release/wins/urel/z/testdata/configs/022.xml
-../ts_commdb/scripts/022_30.xml 		/epoc32/release/wins/urel/z/testdata/configs/022_30.xml
-../ts_commdb/scripts/023.xml 		/epoc32/release/wins/urel/z/testdata/configs/023.xml
-../ts_commdb/scripts/024.xml 		/epoc32/release/wins/urel/z/testdata/configs/024.xml
-../ts_commdb/scripts/061_01.xml 		/epoc32/release/wins/urel/z/testdata/configs/061_01.xml
-../ts_commdb/scripts/061_02.xml 		/epoc32/release/wins/urel/z/testdata/configs/061_02.xml
-../ts_commdb/scripts/061_03.xml 		/epoc32/release/wins/urel/z/testdata/configs/061_03.xml
-../ts_commdb/scripts/061_04.xml 		/epoc32/release/wins/urel/z/testdata/configs/061_04.xml
-../ts_commdb/scripts/064_01.cfg 		/epoc32/release/wins/urel/z/testdata/configs/064_01.cfg
+../te_commdb/scripts/te_cdb_urel.script						/epoc32/release/winscw/udeb/z/testdata/scripts/te_cdb_urel.script
+../te_commdb/scripts/Default1.xml							/epoc32/release/winscw/udeb/z/testdata/configs/default1.xml
+../te_commdb/scripts/default3.xml							/epoc32/release/winscw/udeb/z/testdata/configs/default3.xml
+../te_commdb/scripts/default5.dat							/epoc32/release/winscw/udeb/z/testdata/configs/default5.dat
+../te_commdb/scripts/Default7.xml							/epoc32/release/winscw/udeb/z/testdata/configs/default7.xml
+../te_commdb/scripts/Default.xml							/epoc32/release/winscw/udeb/z/testdata/configs/default.xml
+../te_commdb/scripts/Corrupt.xml							/epoc32/release/winscw/udeb/z/testdata/configs/corrupt.xml
+../te_commdb/scripts/020.xml 								/epoc32/release/winscw/udeb/z/testdata/configs/020.xml
+../te_commdb/scripts/021.xml 								/epoc32/release/winscw/udeb/z/testdata/configs/021.xml
+../te_commdb/scripts/022.xml 								/epoc32/release/winscw/udeb/z/testdata/configs/022.xml
+../te_commdb/scripts/022_30.xml 							/epoc32/release/winscw/udeb/z/testdata/configs/022_30.xml
+../te_commdb/scripts/023.xml 								/epoc32/release/winscw/udeb/z/testdata/configs/023.xml
+../te_commdb/scripts/024.xml 								/epoc32/release/winscw/udeb/z/testdata/configs/024.xml
+../te_commdb/scripts/061_01.xml 							/epoc32/release/winscw/udeb/z/testdata/configs/061_01.xml
+../te_commdb/scripts/061_02.xml 							/epoc32/release/winscw/udeb/z/testdata/configs/061_02.xml
+../te_commdb/scripts/061_03.xml 							/epoc32/release/winscw/udeb/z/testdata/configs/061_03.xml
+../te_commdb/scripts/061_04.xml 							/epoc32/release/winscw/udeb/z/testdata/configs/061_04.xml
+../te_commdb/scripts/064_01.cfg 							/epoc32/release/winscw/udeb/z/testdata/configs/064_01.cfg
 
-../ts_commdb/scripts/cdb_urel.script	/epoc32/release/winscw/udeb/z/testdata/scripts/cdb_urel.script
-../ts_commdb/scripts/cdb_urel.script	/epoc32/release/winscw/udeb/z/testdata/scripts/cdb_urel1.script
-../ts_commdb/scripts/Default1.xml	/epoc32/release/winscw/udeb/z/testdata/configs/default1.xml
-../ts_commdb/scripts/default3.xml	/epoc32/release/winscw/udeb/z/testdata/configs/default3.xml
-../ts_commdb/scripts/default5.dat	/epoc32/release/winscw/udeb/z/testdata/configs/default5.dat
-../ts_commdb/scripts/Default7.xml	/epoc32/release/winscw/udeb/z/testdata/configs/default7.xml
-../ts_commdb/scripts/Default.xml	/epoc32/release/winscw/udeb/z/testdata/configs/default.xml
-../ts_commdb/scripts/Corrupt.xml	/epoc32/release/winscw/udeb/z/testdata/configs/corrupt.xml
-../ts_commdb/scripts/020.xml 		/epoc32/release/winscw/udeb/z/testdata/configs/020.xml
-../ts_commdb/scripts/021.xml 		/epoc32/release/winscw/udeb/z/testdata/configs/021.xml
-../ts_commdb/scripts/022.xml 		/epoc32/release/winscw/udeb/z/testdata/configs/022.xml
-../ts_commdb/scripts/022_30.xml 		/epoc32/release/winscw/udeb/z/testdata/configs/022_30.xml
-../ts_commdb/scripts/023.xml 		/epoc32/release/winscw/udeb/z/testdata/configs/023.xml
-../ts_commdb/scripts/024.xml 		/epoc32/release/winscw/udeb/z/testdata/configs/024.xml
-../ts_commdb/scripts/061_01.xml 		/epoc32/release/winscw/udeb/z/testdata/configs/061_01.xml
-../ts_commdb/scripts/061_02.xml 		/epoc32/release/winscw/udeb/z/testdata/configs/061_02.xml
-../ts_commdb/scripts/061_03.xml 		/epoc32/release/winscw/udeb/z/testdata/configs/061_03.xml
-../ts_commdb/scripts/061_04.xml 		/epoc32/release/winscw/udeb/z/testdata/configs/061_04.xml
-../ts_commdb/scripts/064_01.cfg 		/epoc32/release/winscw/udeb/z/testdata/configs/064_01.cfg
-
-../ts_commdb/scripts/cdb_urel.script	/epoc32/release/winscw/urel/z/testdata/scripts/cdb_urel.script
-../ts_commdb/scripts/cdb_urel.script	/epoc32/release/winscw/urel/z/testdata/scripts/cdb_urel1.script
-../ts_commdb/scripts/Default1.xml	/epoc32/release/winscw/urel/z/testdata/configs/default1.xml
-../ts_commdb/scripts/default3.xml	/epoc32/release/winscw/urel/z/testdata/configs/default3.xml
-../ts_commdb/scripts/default5.dat	/epoc32/release/winscw/urel/z/testdata/configs/default5.dat
-../ts_commdb/scripts/Default7.xml	/epoc32/release/winscw/urel/z/testdata/configs/default7.xml
-../ts_commdb/scripts/Default.xml	/epoc32/release/winscw/urel/z/testdata/configs/default.xml
-../ts_commdb/scripts/Corrupt.xml	/epoc32/release/winscw/urel/z/testdata/configs/corrupt.xml
-../ts_commdb/scripts/020.xml 		/epoc32/release/winscw/urel/z/testdata/configs/020.xml
-../ts_commdb/scripts/021.xml 		/epoc32/release/winscw/urel/z/testdata/configs/021.xml
-../ts_commdb/scripts/022.xml 		/epoc32/release/winscw/urel/z/testdata/configs/022.xml
-../ts_commdb/scripts/022_30.xml 		/epoc32/release/winscw/urel/z/testdata/configs/022_30.xml
-../ts_commdb/scripts/023.xml 		/epoc32/release/winscw/urel/z/testdata/configs/023.xml
-../ts_commdb/scripts/024.xml 		/epoc32/release/winscw/urel/z/testdata/configs/024.xml
-../ts_commdb/scripts/061_01.xml 		/epoc32/release/winscw/urel/z/testdata/configs/061_01.xml
-../ts_commdb/scripts/061_02.xml 		/epoc32/release/winscw/urel/z/testdata/configs/061_02.xml
-../ts_commdb/scripts/061_03.xml 		/epoc32/release/winscw/urel/z/testdata/configs/061_03.xml
-../ts_commdb/scripts/061_04.xml 		/epoc32/release/winscw/urel/z/testdata/configs/061_04.xml
-../ts_commdb/scripts/064_01.cfg 		/epoc32/release/winscw/urel/z/testdata/configs/064_01.cfg
-
+../te_commdb/scripts/te_cdb_urel.script						/epoc32/release/winscw/urel/z/testdata/scripts/te_cdb_urel.script
+../te_commdb/scripts/Default1.xml							/epoc32/release/winscw/urel/z/testdata/configs/default1.xml
+../te_commdb/scripts/default3.xml							/epoc32/release/winscw/urel/z/testdata/configs/default3.xml
+../te_commdb/scripts/default5.dat							/epoc32/release/winscw/urel/z/testdata/configs/default5.dat
+../te_commdb/scripts/Default7.xml							/epoc32/release/winscw/urel/z/testdata/configs/default7.xml
+../te_commdb/scripts/Default.xml							/epoc32/release/winscw/urel/z/testdata/configs/default.xml
+../te_commdb/scripts/Corrupt.xml							/epoc32/release/winscw/urel/z/testdata/configs/corrupt.xml
+../te_commdb/scripts/020.xml 								/epoc32/release/winscw/urel/z/testdata/configs/020.xml
+../te_commdb/scripts/021.xml 								/epoc32/release/winscw/urel/z/testdata/configs/021.xml
+../te_commdb/scripts/022.xml 								/epoc32/release/winscw/urel/z/testdata/configs/022.xml
+../te_commdb/scripts/022_30.xml 							/epoc32/release/winscw/urel/z/testdata/configs/022_30.xml
+../te_commdb/scripts/023.xml 								/epoc32/release/winscw/urel/z/testdata/configs/023.xml
+../te_commdb/scripts/024.xml 								/epoc32/release/winscw/urel/z/testdata/configs/024.xml
+../te_commdb/scripts/061_01.xml 							/epoc32/release/winscw/urel/z/testdata/configs/061_01.xml
+../te_commdb/scripts/061_02.xml 							/epoc32/release/winscw/urel/z/testdata/configs/061_02.xml
+../te_commdb/scripts/061_03.xml 							/epoc32/release/winscw/urel/z/testdata/configs/061_03.xml
+../te_commdb/scripts/061_04.xml 							/epoc32/release/winscw/urel/z/testdata/configs/061_04.xml
+../te_commdb/scripts/064_01.cfg 							/epoc32/release/winscw/urel/z/testdata/configs/064_01.cfg
 
 //Protection tests
-../ts_commdb/scripts/ProtectTable-Normal.script 		/epoc32/release/wins/urel/z/testdata/scripts/protecttable-normal.script
-../ts_commdb/scripts/ProtectRecord-Normal.script 		/epoc32/release/wins/urel/z/testdata/scripts/protectrecord-normal.script
-../ts_commdb/scripts/ProtectTable-ConnPref.script 		/epoc32/release/wins/urel/z/testdata/scripts/protecttable-connpref.script
-../ts_commdb/scripts/ProtectRecord-ConnPref.script 		/epoc32/release/wins/urel/z/testdata/scripts/protectrecord-connpref.script
-../ts_commdb/scripts/TestProtectTable-Normal.script 		/epoc32/release/wins/urel/z/testdata/scripts/testprotecttable-normal.script
-../ts_commdb/scripts/TestProtectRecord-Normal.script 		/epoc32/release/wins/urel/z/testdata/scripts/testprotectrecord-normal.script
-../ts_commdb/scripts/TestProtectTable-ConnPref.script 		/epoc32/release/wins/urel/z/testdata/scripts/testprotecttable-connpref.script
-../ts_commdb/scripts/TestProtectRecord-ConnPref.script 		/epoc32/release/wins/urel/z/testdata/scripts/testprotectrecord-connpref.script
-../ts_commdb/scripts/Test_Both_Types.script 			/epoc32/release/wins/urel/z/testdata/scripts/test_both_types.script
-../ts_commdb/scripts/CombinationalTest.script 			/epoc32/release/wins/urel/z/testdata/scripts/combinationaltest.script
-../ts_commdb/scripts/PanicTest.script 				/epoc32/release/wins/urel/z/testdata/scripts/panictest.script
-../ts_commdb/scripts/protect.xml 				/epoc32/release/wins/urel/z/testdata/configs/protect.xml
-
-../ts_commdb/scripts/ProtectTable-Normal.script 		/epoc32/release/wins/udeb/z/testdata/scripts/protecttable-normal.script
-../ts_commdb/scripts/ProtectRecord-Normal.script 		/epoc32/release/wins/udeb/z/testdata/scripts/protectrecord-normal.script
-../ts_commdb/scripts/ProtectTable-ConnPref.script 		/epoc32/release/wins/udeb/z/testdata/scripts/protecttable-connpref.script
-../ts_commdb/scripts/ProtectRecord-ConnPref.script 		/epoc32/release/wins/udeb/z/testdata/scripts/protectrecord-connpref.script
-../ts_commdb/scripts/TestProtectTable-Normal.script 		/epoc32/release/wins/udeb/z/testdata/scripts/testprotecttable-normal.script
-../ts_commdb/scripts/TestProtectRecord-Normal.script 		/epoc32/release/wins/udeb/z/testdata/scripts/testprotectrecord-normal.script
-../ts_commdb/scripts/TestProtectTable-ConnPref.script 		/epoc32/release/wins/udeb/z/testdata/scripts/testprotecttable-connpref.script
-../ts_commdb/scripts/TestProtectRecord-ConnPref.script 		/epoc32/release/wins/udeb/z/testdata/scripts/testprotectrecord-connpref.script
-../ts_commdb/scripts/Test_Both_Types.script 			/epoc32/release/wins/udeb/z/testdata/scripts/test_both_types.script
-../ts_commdb/scripts/CombinationalTest.script 			/epoc32/release/wins/udeb/z/testdata/scripts/combinationaltest.script
-../ts_commdb/scripts/PanicTest.script 				/epoc32/release/wins/udeb/z/testdata/scripts/panictest.script
-../ts_commdb/scripts/protect.xml 				/epoc32/release/wins/udeb/z/testdata/configs/protect.xml
+../te_commdb/scripts/ProtectTable-Normal.script 			/epoc32/release/winscw/udeb/z/testdata/scripts/protecttable-normal.script
+../te_commdb/scripts/ProtectRecord-Normal.script 			/epoc32/release/winscw/udeb/z/testdata/scripts/protectrecord-normal.script
+../te_commdb/scripts/ProtectTable-ConnPref.script 			/epoc32/release/winscw/udeb/z/testdata/scripts/protecttable-connpref.script
+../te_commdb/scripts/ProtectRecord-ConnPref.script 			/epoc32/release/winscw/udeb/z/testdata/scripts/protectrecord-connpref.script
+../te_commdb/scripts/TestProtectTable-Normal.script 		/epoc32/release/winscw/udeb/z/testdata/scripts/testprotecttable-normal.script
+../te_commdb/scripts/TestProtectRecord-Normal.script 		/epoc32/release/winscw/udeb/z/testdata/scripts/testprotectrecord-normal.script
+../te_commdb/scripts/TestProtectTable-ConnPref.script 		/epoc32/release/winscw/udeb/z/testdata/scripts/testprotecttable-connpref.script
+../te_commdb/scripts/TestProtectRecord-ConnPref.script 		/epoc32/release/winscw/udeb/z/testdata/scripts/testprotectrecord-connpref.script
+../te_commdb/scripts/Test_Both_Types.script 				/epoc32/release/winscw/udeb/z/testdata/scripts/test_both_types.script
+../te_commdb/scripts/CombinationalTest.script 				/epoc32/release/winscw/udeb/z/testdata/scripts/combinationaltest.script
+../te_commdb/scripts/PanicTest.script 						/epoc32/release/winscw/udeb/z/testdata/scripts/panictest.script
+../te_commdb/scripts/te_connpref.script 					/epoc32/release/winscw/udeb/z/testdata/scripts/te_connpref.script
+../te_commdb/scripts/te_encrpt.script 						/epoc32/release/winscw/udeb/z/testdata/scripts/te_encrpt.script
+../te_commdb/scripts/te_usecases.script						/epoc32/release/winscw/udeb/z/testdata/scripts/te_usecases.script
+../te_commdb/scripts/protect.xml 							/epoc32/release/winscw/udeb/z/testdata/configs/protect.xml
 
-../ts_commdb/scripts/ProtectTable-Normal.script 		/epoc32/release/winscw/urel/z/testdata/scripts/protecttable-normal.script
-../ts_commdb/scripts/ProtectRecord-Normal.script 		/epoc32/release/winscw/urel/z/testdata/scripts/protectrecord-normal.script
-../ts_commdb/scripts/ProtectTable-ConnPref.script 		/epoc32/release/winscw/urel/z/testdata/scripts/protecttable-connpref.script
-../ts_commdb/scripts/ProtectRecord-ConnPref.script 		/epoc32/release/winscw/urel/z/testdata/scripts/protectrecord-connpref.script
-../ts_commdb/scripts/TestProtectTable-Normal.script 		/epoc32/release/winscw/urel/z/testdata/scripts/testprotecttable-normal.script
-../ts_commdb/scripts/TestProtectRecord-Normal.script 		/epoc32/release/winscw/urel/z/testdata/scripts/testprotectrecord-normal.script
-../ts_commdb/scripts/TestProtectTable-ConnPref.script 		/epoc32/release/winscw/urel/z/testdata/scripts/testprotecttable-connpref.script
-../ts_commdb/scripts/TestProtectRecord-ConnPref.script 		/epoc32/release/winscw/urel/z/testdata/scripts/testprotectrecord-connpref.script
-../ts_commdb/scripts/Test_Both_Types.script 			/epoc32/release/winscw/urel/z/testdata/scripts/test_both_types.script
-../ts_commdb/scripts/CombinationalTest.script 			/epoc32/release/winscw/urel/z/testdata/scripts/combinationaltest.script
-../ts_commdb/scripts/PanicTest.script 				/epoc32/release/winscw/urel/z/testdata/scripts/panictest.script
-../ts_commdb/scripts/protect.xml 				/epoc32/release/winscw/urel/z/testdata/configs/protect.xml
-
-../ts_commdb/scripts/ProtectTable-Normal.script 		/epoc32/release/winscw/udeb/z/testdata/scripts/protecttable-normal.script
-../ts_commdb/scripts/ProtectRecord-Normal.script 		/epoc32/release/winscw/udeb/z/testdata/scripts/protectrecord-normal.script
-../ts_commdb/scripts/ProtectTable-ConnPref.script 		/epoc32/release/winscw/udeb/z/testdata/scripts/protecttable-connpref.script
-../ts_commdb/scripts/ProtectRecord-ConnPref.script 		/epoc32/release/winscw/udeb/z/testdata/scripts/protectrecord-connpref.script
-../ts_commdb/scripts/TestProtectTable-Normal.script 		/epoc32/release/winscw/udeb/z/testdata/scripts/testprotecttable-normal.script
-../ts_commdb/scripts/TestProtectRecord-Normal.script 		/epoc32/release/winscw/udeb/z/testdata/scripts/testprotectrecord-normal.script
-../ts_commdb/scripts/TestProtectTable-ConnPref.script 		/epoc32/release/winscw/udeb/z/testdata/scripts/testprotecttable-connpref.script
-../ts_commdb/scripts/TestProtectRecord-ConnPref.script 		/epoc32/release/winscw/udeb/z/testdata/scripts/testprotectrecord-connpref.script
-../ts_commdb/scripts/Test_Both_Types.script 			/epoc32/release/winscw/udeb/z/testdata/scripts/test_both_types.script
-../ts_commdb/scripts/CombinationalTest.script 			/epoc32/release/winscw/udeb/z/testdata/scripts/combinationaltest.script
-../ts_commdb/scripts/PanicTest.script 				/epoc32/release/winscw/udeb/z/testdata/scripts/panictest.script
-../ts_commdb/scripts/protect.xml 				/epoc32/release/winscw/udeb/z/testdata/configs/protect.xml
+../te_commdb/scripts/ProtectTable-Normal.script 			/epoc32/release/winscw/urel/z/testdata/scripts/protecttable-normal.script
+../te_commdb/scripts/ProtectRecord-Normal.script 			/epoc32/release/winscw/urel/z/testdata/scripts/protectrecord-normal.script
+../te_commdb/scripts/ProtectTable-ConnPref.script 			/epoc32/release/winscw/urel/z/testdata/scripts/protecttable-connpref.script
+../te_commdb/scripts/ProtectRecord-ConnPref.script 			/epoc32/release/winscw/urel/z/testdata/scripts/protectrecord-connpref.script
+../te_commdb/scripts/TestProtectTable-Normal.script 		/epoc32/release/winscw/urel/z/testdata/scripts/testprotecttable-normal.script
+../te_commdb/scripts/TestProtectRecord-Normal.script 		/epoc32/release/winscw/urel/z/testdata/scripts/testprotectrecord-normal.script
+../te_commdb/scripts/TestProtectTable-ConnPref.script 		/epoc32/release/winscw/urel/z/testdata/scripts/testprotecttable-connpref.script
+../te_commdb/scripts/TestProtectRecord-ConnPref.script 		/epoc32/release/winscw/urel/z/testdata/scripts/testprotectrecord-connpref.script
+../te_commdb/scripts/Test_Both_Types.script 				/epoc32/release/winscw/urel/z/testdata/scripts/test_both_types.script
+../te_commdb/scripts/CombinationalTest.script 				/epoc32/release/winscw/urel/z/testdata/scripts/combinationaltest.script
+../te_commdb/scripts/PanicTest.script 						/epoc32/release/winscw/urel/z/testdata/scripts/panictest.script
+../te_commdb/scripts/te_connpref.script 					/epoc32/release/winscw/urel/z/testdata/scripts/te_connpref.script
+../te_commdb/scripts/te_encrpt.script 						/epoc32/release/winscw/urel/z/testdata/scripts/te_encrpt.script
+../te_commdb/scripts/te_usecases.script						/epoc32/release/winscw/urel/z/testdata/scripts/te_usecases.script
+../te_commdb/scripts/protect.xml 							/epoc32/release/winscw/urel/z/testdata/configs/protect.xml
 
 // Different test script files for CommsDat and non-CommsDat tests
-../ts_commdb/scripts/Cdb_udeb.script	/epoc32/release/wins/udeb/z/testdata/scripts/cdb_udeb.script
-../ts_commdb/scripts/Cdb_udeb.script	/epoc32/release/wins/urel/z/testdata/scripts/cdb_udeb.script
-../ts_commdb/scripts/Cdb_udeb.script	/epoc32/release/winscw/udeb/z/testdata/scripts/cdb_udeb.script
-../ts_commdb/scripts/Cdb_udeb.script	/epoc32/release/winscw/urel/z/testdata/scripts/cdb_udeb.script
+../te_commdb/scripts/te_cdb_udeb.script						/epoc32/release/winscw/udeb/z/testdata/scripts/te_cdb_udeb.script
 
-// As these test scripts, cdb_udeb.script, are used 2 times during our ONB, in order to ensure the uniqueness of the scripts names
-// we need to export them with 2 different names.
+../te_commdb/scripts/te_cdb_udeb.script						/epoc32/release/winscw/urel/z/testdata/scripts/te_cdb_udeb.script
+
+../te_commdb/scripts/Test_All_Protection.script 			/epoc32/release/winscw/udeb/z/testdata/scripts/test_all_protection.script
 
-../ts_commdb/scripts/Cdb_udeb.script	/epoc32/release/wins/udeb/z/testdata/scripts/cdb_udeb1.script
-../ts_commdb/scripts/Cdb_udeb.script	/epoc32/release/wins/urel/z/testdata/scripts/cdb_udeb1.script
-../ts_commdb/scripts/Cdb_udeb.script	/epoc32/release/winscw/udeb/z/testdata/scripts/cdb_udeb1.script
-../ts_commdb/scripts/Cdb_udeb.script	/epoc32/release/winscw/urel/z/testdata/scripts/cdb_udeb1.script
+../te_commdb/scripts/Test_All_Protection.script 			/epoc32/release/winscw/urel/z/testdata/scripts/test_all_protection.script
 
-../ts_commdb/scripts/Test_All_Protection.script 		/epoc32/release/wins/urel/z/testdata/scripts/test_all_protection.script
-../ts_commdb/scripts/Test_All_Protection.script 		/epoc32/release/wins/udeb/z/testdata/scripts/test_all_protection.script
-../ts_commdb/scripts/Test_All_Protection.script 		/epoc32/release/winscw/urel/z/testdata/scripts/test_all_protection.script
-../ts_commdb/scripts/Test_All_Protection.script 		/epoc32/release/winscw/udeb/z/testdata/scripts/test_all_protection.script
+//Exports for the ReadOnly test suites - for winscw
+../te_commdb/scripts/te_cdb_udeb.script						/epoc32/release/winscw/udeb/z/testdata/scripts/te_cdb_udeb_rohid_ced.script
+
+../te_commdb/scripts/te_cdb_udeb.script						/epoc32/release/winscw/urel/z/testdata/scripts/te_cdb_udeb_rohid_ced.script
 
 PRJ_MMPFILES
 
 
 PRJ_TESTMMPFILES
 
-
-../ts_commdb/Ts_commdb.mmp
-../ts_commdb/ts_connpref.mmp
-../ts_commdb/ts_encrpt.mmp
-../ts_commdb/ts_usecases.mmp
+../TE_commdb/group/TE_commdb.mmp
+../TE_commdb/TE_connpref/group/TE_connpref.mmp
+../TE_commdb/TE_encrpt/group/TE_encrpt.mmp
+../TE_commdb/TE_usecases/group/TE_usecases.mmp
 
 
--- a/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp	Thu Sep 02 21:44:45 2010 +0300
+++ b/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp	Fri Sep 17 08:36:26 2010 +0300
@@ -10,4 +10,4 @@
 ipr T \sf\os\commsfw\commsconfig\commsdatabaseshim\Documentation
 ipr T \sf\os\commsfw\commsconfig\commsdatabaseshim\bwins
 ipr T \sf\os\commsfw\commsconfig\commsdatabaseshim\eabi
-ipr T \sf\os\commsfw\commsconfig\commsdatabaseshim\ts_commdb
+ipr T \sf\os\commsfw\commsconfig\commsdatabaseshim\te_commdb
--- a/commsconfig/commsdatabaseshim/group/tcommdb.iby	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#ifndef __TCOMMDB_IBY__
-#define __TCOMMDB_IBY__
-
-#include <commdb.iby>
-#include <integrationtest.iby>
-#include <ts_esockutil.iby>
-#include <Xml.iby>
-#include <stdlib.iby>
-
-REM Commdb Tests
-file=ABI_DIR\DEBUG_DIR\ts_commdb.dll						System\Libs\ts_commdb.dll
-
-REM This macro, CI_TEST_ROM_4, is defined in our ONB build script: buildspecifications.pm.
-#ifdef CI_TEST_ROM_4
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\scripts\cdb_udeb1.script	TestData\scripts\cdb_udeb1.script
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\scripts\cdb_urel1.script	TestData\scripts\cdb_urel1.script
-#else
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\scripts\cdb_udeb.script	TestData\scripts\cdb_udeb.script
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\scripts\cdb_urel.script	TestData\scripts\cdb_urel.script
-#endif
-
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\Default1.xml	TestData\configs\Default1.xml
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\Default3.xml	TestData\configs\Default3.xml
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\Default5.dat	TestData\configs\Default5.dat
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\Default7.xml	TestData\configs\Default7.xml
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\Default.xml	TestData\configs\Default.xml
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\Corrupt.xml	TestData\configs\Corrupt.xml
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\020.xml	TestData\configs\020.xml
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\021.xml	TestData\configs\021.xml
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\022.xml	TestData\configs\022.xml
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\022_30.xml	TestData\configs\022_30.xml
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\023.xml	TestData\configs\023.xml
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\024.xml	TestData\configs\024.xml
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\061_01.xml	TestData\configs\061_01.xml
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\061_02.xml	TestData\configs\061_02.xml
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\061_03.xml	TestData\configs\061_03.xml
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\061_04.xml	TestData\configs\061_04.xml
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\064_01.cfg	TestData\configs\064_01.cfg
-
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\scripts\ProtectTable-Normal.script		TestData\scripts\ProtectTable-Normal.script
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\scripts\ProtectTable-ConnPref.script		TestData\scripts\ProtectTable-ConnPref.script
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\scripts\ProtectRecord-Normal.script		TestData\scripts\ProtectRecord-Normal.script
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\scripts\ProtectRecord-ConnPref.script		TestData\scripts\ProtectRecord-ConnPref.script
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\scripts\TestProtectTable-ConnPref.script	TestData\scripts\TestProtectTable-ConnPref.script
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\scripts\TestProtectTable-Normal.script	TestData\scripts\TestProtectTable-Normal.script
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\scripts\TestProtectRecord-ConnPref.script	TestData\scripts\TestProtectRecord-ConnPref.script
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\scripts\TestProtectRecord-Normal.script	TestData\scripts\TestProtectRecord-Normal.script
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\scripts\CombinationalTest.script			TestData\scripts\CombinationalTest.script
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\scripts\PanicTest.script					TestData\scripts\PanicTest.script
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\scripts\Test_Both_Types.script			TestData\scripts\Test_Both_Types.script
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\scripts\Test_All_Protection.script		TestData\scripts\Test_All_Protection.script
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\protect.xml						TestData\configs\protect.xml
-data=EPOCROOT##epoc32\release\wins\udeb\z\TestData\configs\Default5.dat		 		private\100012a5\dbs[10004e1d]Corrupt.dat
-
-
-
-
-REM ScheduleTest dlls
-file=ABI_DIR\DEBUG_DIR\ts_usecases.dll              System\Libs\ts_usecases.dll
-file=ABI_DIR\DEBUG_DIR\ts_encrpt.dll				System\Libs\ts_encrpt.dll
-file=ABI_DIR\DEBUG_DIR\ts_connpref.dll				System\Libs\ts_connpref.dll
-
-
-REM CommDB tools with Hidden / ReadOnly support.
-file=ABI_DIR\DEBUG_DIR\_ROHID_ced.exe               System\Libs\_ROHID_ced.exe
-file=ABI_DIR\DEBUG_DIR\_ROHID_ceddump.exe           System\Programs\_ROHID_ceddump.exe
-
-#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsconfig/commsdatabaseshim/group/te_tcommdb.iby	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,64 @@
+#ifndef __TCOMMDB_IBY__
+#define __TCOMMDB_IBY__
+
+#include <commdb.iby>
+#include <integrationtest.iby>
+#include <te_esockutil.iby>
+#include <Xml.iby>
+#include <stdlib.iby>
+
+REM Commdb Tests
+file=ABI_DIR\DEBUG_DIR\te_commdb.exe						System\Libs\te_commdb.exe
+
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\te_cdb_udeb.script	TestData\scripts\te_cdb_udeb.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\te_cdb_urel.script	TestData\scripts\te_cdb_urel.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\Default1.xml	TestData\configs\Default1.xml
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\Default3.xml	TestData\configs\Default3.xml
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\Default5.dat	TestData\configs\Default5.dat
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\Default7.xml	TestData\configs\Default7.xml
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\Default.xml	TestData\configs\Default.xml
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\Corrupt.xml	TestData\configs\Corrupt.xml
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\020.xml	TestData\configs\020.xml
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\021.xml	TestData\configs\021.xml
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\022.xml	TestData\configs\022.xml
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\022_30.xml    TestData\configs\022_30.xml
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\023.xml	TestData\configs\023.xml
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\024.xml	TestData\configs\024.xml
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\061_01.xml	TestData\configs\061_01.xml
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\061_02.xml	TestData\configs\061_02.xml
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\061_03.xml	TestData\configs\061_03.xml
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\061_04.xml	TestData\configs\061_04.xml
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\064_01.cfg	TestData\configs\064_01.cfg
+
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\ProtectTable-Normal.script		TestData\scripts\ProtectTable-Normal.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\ProtectTable-ConnPref.script		TestData\scripts\ProtectTable-ConnPref.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\ProtectRecord-Normal.script		TestData\scripts\ProtectRecord-Normal.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\ProtectRecord-ConnPref.script		TestData\scripts\ProtectRecord-ConnPref.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\TestProtectTable-ConnPref.script	TestData\scripts\TestProtectTable-ConnPref.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\TestProtectTable-Normal.script	TestData\scripts\TestProtectTable-Normal.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\TestProtectRecord-ConnPref.script	TestData\scripts\TestProtectRecord-ConnPref.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\TestProtectRecord-Normal.script	TestData\scripts\TestProtectRecord-Normal.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\CombinationalTest.script			TestData\scripts\CombinationalTest.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\PanicTest.script					TestData\scripts\PanicTest.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\te_connpref.script					TestData\scripts\te_connpref.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\te_encrpt.script					TestData\scripts\te_encrpt.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\te_usecases.script					TestData\scripts\te_usecases.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\Test_Both_Types.script			TestData\scripts\Test_Both_Types.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\Test_All_Protection.script		TestData\scripts\Test_All_Protection.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\protect.xml						TestData\configs\protect.xml
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\Default5.dat		 		private\100012a5\dbs[10004e1d]Corrupt.dat
+
+
+
+
+REM ScheduleTest dlls
+file=ABI_DIR\DEBUG_DIR\te_usecases.exe              System\Libs\te_usecases.exe
+file=ABI_DIR\DEBUG_DIR\te_encrpt.exe				System\Libs\te_encrpt.exe
+file=ABI_DIR\DEBUG_DIR\te_connpref.exe				System\Libs\te_connpref.exe
+
+
+REM CommDB tools with Hidden / ReadOnly support.
+file=ABI_DIR\DEBUG_DIR\_ROHID_ced.exe               System\Libs\_ROHID_ced.exe
+file=ABI_DIR\DEBUG_DIR\_ROHID_ceddump.exe           System\Programs\_ROHID_ceddump.exe
+
+#endif
--- a/commsconfig/commsdatabaseshim/ts_commdb/CommDbPreCopy.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-// Copyright (c) 2004-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:
-// This contains copying cdbv3.dat to one temp dat file
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "CommDbPreCopy.h"
-
-//
-//
-// Test Pre Copy
-/* This New Class is added to move copyfile command from script file
-   This test does a copy operation 	
-*/
-CCommDbPreCopy::CCommDbPreCopy()
-	{
-	// store the name of this test case
-	iTestStepName = _L("PreCopyTest");
-	}
-
-CCommDbPreCopy::~CCommDbPreCopy()
-	{
-	}
-
-// Copy Test Main Code
-enum TVerdict CCommDbPreCopy::doTestStepL( void )
-	{
-	copyFileL(KCommDbName, KTempDb3);
-	return EPass;
-	}
-
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/CommDbPreCopy.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/**
-* Copyright (c) 2004-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:
-* This Copies cdbv3.dat to one temp dat file
-* 
-*
-*/
-
-
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef __CCOMMDB_PRECOPY_H
-#define __CCOMMDB_PRECOPY_H
-
-_LIT(KTempDb3, "c:\\system\\data\\default3.dat");
-
-///////////////////////////////////////////////
-// Test Copy Test
-NONSHARABLE_CLASS (CCommDbPreCopy) : public CTestStepCommDb
-{
-public:
-	CCommDbPreCopy();
-	virtual ~CCommDbPreCopy();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-};
-
-#endif // __CCOMMDB_PRECOPY_H
--- a/commsconfig/commsdatabaseshim/ts_commdb/Db_1_create.MMP	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* 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:
-*
-*/
-
-TARGET        DB_1.EXE
-TARGETTYPE    EXE
-
-
-SOURCEPATH		..\ts_commdb		
-SOURCE			DB_1_CREATE.CPP
-
-USERINCLUDE   ..\ts_commdb
-
-
-SYSTEMINCLUDE \EPOC32\INCLUDE
-
-LIBRARY       EUSER.LIB EFSRV.LIB COMMDB.LIB 
-
-CAPABILITY ALL -Tcb
-
-VENDORID 0x70000001
--- a/commsconfig/commsdatabaseshim/ts_commdb/Db_1_create.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,274 +0,0 @@
-// Copyright (c) 1997-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:
-// DBAPP.CPP
-// Create a communications database 
-// 
-//
-
-#include <e32test.h>
-#include <f32file.h>
-#include <commdb.h>
-#include <cdblen.h>
-#include <cdbpreftable.h>
-#include <faxdefn.h>
-#include <d32comm.h>
-#include <cdbtemp.h>
-
-
-_LIT(KEditorMess,"Database Editor");
-LOCAL_C RTest test(KEditorMess);
-LOCAL_C CCommsDatabase* theDb;
-
-
-//
-// The Dial Out ISP table will have 3 records, plus
-// two extra records that are read only
-//
-
-
-LOCAL_C CreateDialInISPTable()
-{
-	TUint32 id;
-
-	CCommsDbTableView* theView;
-
-	theView = theDb->OpenTableLC(TPtrC(DIAL_IN_ISP) );
-
-	//
-	//	Record #1
-	//
-	theView->InsertRecord( id );
-	theView->WriteTextL( TPtrC(COMMDB_NAME), _L("Record #1") ) ;
-	//Just write the columns that can't be null
-	theView->WriteTextL( TPtrC(ISP_IF_NAME), _L("PPP") ) ;
-	theView->WriteBoolL( TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue ) ;
-	theView->WriteBoolL( TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue ) ;
-	theView->WriteBoolL( TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue ) ;
-
-	theView->PutRecordChanges();
-
-	//
-	//	Record #2
-	//
-	theView->InsertRecord( id );
-	theView->WriteTextL( TPtrC(COMMDB_NAME), _L("Record #2") ) ;
-	//Just write the columns that can't be null
-	theView->WriteTextL( TPtrC(ISP_IF_NAME), _L("PPP") ) ;
-	theView->WriteBoolL( TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue ) ;
-	theView->WriteBoolL( TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue ) ;
-	theView->WriteBoolL( TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue ) ;
-	theView->PutRecordChanges();
-
-
-	//
-	//	Record #3
-	//
-	theView->InsertRecord( id );
-	theView->WriteTextL( TPtrC(COMMDB_NAME), _L("Record #3") ) ;
-	//Just write the columns that can't be null
-	theView->WriteTextL( TPtrC(ISP_IF_NAME), _L("SLIP") ) ;
-	theView->WriteBoolL( TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue ) ;
-	theView->WriteBoolL( TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue ) ;
-	theView->WriteBoolL( TPtrC(ISP6_IP_ADDR_FROM_SERVER), ETrue ) ;
-	theView->WriteBoolL( TPtrC(ISP6_IP_DNS_ADDR_FROM_SERVER), ETrue ) ;
-	theView->PutRecordChanges();
-
-	//
-	//	Record #4 ( Read Only )
-	//
-	theView->InsertRecord( id );
-	theView->WriteTextL( TPtrC(COMMDB_NAME), _L("Record #4 (Read Only)") ) ;
-	//Just write the columns that can't be null
-	theView->WriteTextL( TPtrC(ISP_IF_NAME), _L("SLIP") ) ;
-	theView->WriteBoolL( TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue ) ;
-	theView->WriteBoolL( TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue ) ;
-	theView->WriteBoolL( TPtrC(ISP6_IP_ADDR_FROM_SERVER), ETrue ) ;
-	theView->WriteBoolL( TPtrC(ISP6_IP_DNS_ADDR_FROM_SERVER), ETrue ) ;
-	theView->PutRecordChanges(EFalse, ETrue);
-
-	//
-	//	Record #5 ( Read Only )
-	//
-	theView->InsertRecord( id );
-	theView->WriteTextL( TPtrC(COMMDB_NAME), _L("Record #5 (Read Only)") ) ;
-	//Just write the columns that can't be null
-	theView->WriteTextL( TPtrC(ISP_IF_NAME), _L("PPP") ) ;
-	theView->WriteBoolL( TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue ) ;
-	theView->WriteBoolL( TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue ) ;
-	theView->WriteBoolL( TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue ) ;
-	theView->PutRecordChanges(EFalse, ETrue);
-
-	CleanupStack::PopAndDestroy( theView );
-}
-
-
-
-//
-// The Dial Out ISP table will have 3 records
-//
-
-LOCAL_C CreateDialOutISPTable()
-{
-	TUint32 id;
-
-	CCommsDbTableView* theView;
-
-	theView = theDb->OpenTableLC(TPtrC(DIAL_OUT_ISP) );
-
-	//
-	// Record #1
-	//
-	theView->InsertRecord( id );
-
-	theView->WriteTextL( TPtrC(COMMDB_NAME), _L("Record #1") ) ;
-	theView->WriteTextL( TPtrC(ISP_DESCRIPTION), _L("Isp #1") );
-	theView->WriteUintL( TPtrC(ISP_TYPE),EIspTypeWAPOnly);
-	theView->WriteBoolL( TPtrC(ISP_DISPLAY_PCT), ETrue);
-
-	//Must write to these columns as they cannot hold null values
-	theView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	theView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
-	theView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
-	theView->WriteTextL(TPtrC(ISP_IF_NAME), _L("PPP") );
-	theView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
-	theView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	theView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	theView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	theView->WriteTextL(TPtrC(ISP_IF_CALLBACK_INFO), _L8("Call me back") );
-	theView->PutRecordChanges();
-
-
-	//
-	// Record #2
-	//
-	theView->InsertRecord( id );
-
-	theView->WriteTextL( TPtrC(COMMDB_NAME), _L("Record #2") ) ;
-	theView->WriteUintL( TPtrC(ISP_TYPE),EIspTypeInternetAndWAP);
-
-	//Must write to these columns as they cannot hold null values
-	theView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	theView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
-	theView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
-	theView->WriteTextL(TPtrC(ISP_IF_NAME), _L("PPP") );
-	theView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
-	theView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	theView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	theView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	theView->WriteTextL(TPtrC(ISP_IF_CALLBACK_INFO), _L8("Call me back tomorrow") );
-	
-	theView->PutRecordChanges();
-	
-	//
-	// Record #3
-	//
-	theView->InsertRecord( id );
-
-	theView->WriteTextL( TPtrC(COMMDB_NAME), _L("Record #3") ) ;
-	theView->WriteUintL( TPtrC(ISP_TYPE),EIspTypeInternetAndWAP);
-
-	//Must write to these columns as they cannot hold null values
-	theView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	theView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
-	theView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
-	theView->WriteTextL(TPtrC(ISP_IF_NAME), _L("PPP") );
-	theView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
-	theView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	theView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	theView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	theView->WriteTextL(TPtrC(ISP_IF_CALLBACK_INFO), _L8("Call me back") );
-
-	theView->PutRecordChanges();
-
-	CleanupStack::PopAndDestroy( theView );
-
-}
-
-
-LOCAL_C void MainL() 
-    {
-	RFs fs;
-	test(fs.Connect()==KErrNone);
-	
-	TUint dummy;
-	
-	test.Printf(_L("Creating CommDb Unit test database  #1") );
-	
-	_LIT(KSvDbFileName,"C:\\private\\100012a5\\DBS[10004e1d]CDBV3.DAT");
-
-	if(fs.Att(KSvDbFileName,dummy)==KErrNone)
-		{
-		_LIT(KDbaseMess,"\nExisting Database File detected\n - Overwrite? [y/n]\n\n");
-		test.Printf(KDbaseMess);
-		TKeyCode key;
-		key=test.Getch();
-		if((key=='y')||(key=='Y'))
-			{
-			// Instantiate Database Server
-			RDbs rDbs;
-			User::LeaveIfError(rDbs.Connect());
-			CleanupClosePushL(rDbs);
-			_LIT(KCommDb,"c:cdbv3.dat"); 
-			const TUid KCommsDbFileUid = {0x10004e1d};
-			test(rDbs.DeleteDatabase(KCommDb, KCommsDbFileUid)==KErrNone);
-			CleanupStack::PopAndDestroy(&rDbs);
-			}
-		else
-			User::Leave(KErrNone);
-		}
-	fs.Close();
-
-	//Create a blank database
-	theDb=CCommsDatabase::NewL(EFalse);
-	CleanupStack::PushL(theDb);
-	test(theDb->BeginTransaction()==KErrNone);
-
-
-	CreateDialOutISPTable();
-	CreateDialInISPTable();
-
-
-	theDb->CommitTransaction();
-	CleanupStack::PopAndDestroy();
-	}
-
-GLDEF_C TInt E32Main()
-    {
-	__UHEAP_MARK;
-
-	CTrapCleanup* cleanup=CTrapCleanup::New();
-	
-	test.Title();
-	TRAPD(error,MainL());
-
-	if (error)
-		{
-		_LIT(KFailMess,"DbApp failed with error = %d");
-		test.Printf(KFailMess, error);
-		_LIT(KAnyKeyMess," [Press any key]");
-		test.Printf(KAnyKeyMess);
-		test.Getch();
-		}
-	else
-		{
-		_LIT(KCompleteMess,"DbApp Complete OK");
-		test.Printf(KCompleteMess);
-		}
-	_LIT(KPanicMess,"DbApp");
-	__ASSERT_ALWAYS(!error,test.Panic(KPanicMess,error));
-	test.Close();
-	delete cleanup;
-	__UHEAP_MARKEND;
-	return KErrNone;
-    }
--- a/commsconfig/commsdatabaseshim/ts_commdb/Db_7_create.MMP	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* 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:
-*
-*/
-
-TARGET        DB_7.EXE
-TARGETTYPE    EXE
-
-
-SOURCEPATH		..\ts_commdb		
-SOURCE			DB_7_CREATE.CPP
-
-USERINCLUDE   ..\ts_commdb
-
-
-SYSTEMINCLUDE \EPOC32\INCLUDE
-
-LIBRARY       EUSER.LIB EFSRV.LIB COMMDB.LIB 
-
-CAPABILITY ALL -Tcb
-
-VENDORID 0x70000001
--- a/commsconfig/commsdatabaseshim/ts_commdb/Db_7_create.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-// Copyright (c) 1997-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:
-// DBAPP.CPP
-// Create a totaly empty database
-// 
-//
-
-#include <e32test.h>
-#include <f32file.h>
-#include <commdb.h>
-#include <cdblen.h>
-#include <cdbpreftable.h>
-#include <faxdefn.h>
-#include <d32comm.h>
-#include <cdbtemp.h>
-
-
-_LIT(KEditorMess,"Database Editor");
-LOCAL_C RTest test(KEditorMess);
-LOCAL_C CCommsDatabase* theDb;
-
-
-
-LOCAL_C void MainL() 
-    {
-	RFs fs;
-	test(fs.Connect()==KErrNone);
-	
-	TUint dummy;
-	
-	test.Printf(_L("Creating CommDb Unit test database  #7") );
-
-	_LIT(KSvDbFileName,"C:\\private\\100012a5\\DBS[10004e1d]CDBV3.DAT");
-	if(fs.Att(KSvDbFileName,dummy)==KErrNone)
-		{
-		_LIT(KDbaseMess,"\nExisting Database File detected\n - Overwrite? [y/n]\n\n");
-		test.Printf(KDbaseMess);
-		TKeyCode key;
-		key=test.Getch();
-		if((key=='y')||(key=='Y'))
-			{
-			// Instantiate Database Server
-			RDbs rDbs;
-			User::LeaveIfError(rDbs.Connect());
-			CleanupClosePushL(rDbs);
-			_LIT(KCommDb,"c:cdbv3.dat"); 
-			const TUid KCommsDbFileUid = {0x10004e1d};
-			test(rDbs.DeleteDatabase(KCommDb, KCommsDbFileUid)==KErrNone);
-			CleanupStack::PopAndDestroy(&rDbs);
-			}
-		else
-			User::Leave(KErrNone);
-		}
-	fs.Close();
-
-	//Create a blank database
-	theDb=CCommsDatabase::NewL(EFalse);
-	//and close it
-	delete theDb;
-
-	}
-
-GLDEF_C TInt E32Main()
-    {
-	__UHEAP_MARK;
-
-	CTrapCleanup* cleanup=CTrapCleanup::New();
-	
-	test.Title();
-	TRAPD(error,MainL());
-
-	if (error)
-		{
-		_LIT(KFailMess,"DbApp failed with error = %d");
-		test.Printf(KFailMess, error);
-		_LIT(KAnyKeyMess," [Press any key]");
-		test.Printf(KAnyKeyMess);
-		test.Getch();
-		}
-	else
-		{
-		_LIT(KCompleteMess,"DbApp Complete OK");
-		test.Printf(KCompleteMess);
-		}
-	_LIT(KPanicMess,"DbApp");
-	__ASSERT_ALWAYS(!error,test.Panic(KPanicMess,error));
-	test.Close();
-	delete cleanup;
-	__UHEAP_MARKEND;
-	return KErrNone;
-    }
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_003_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,565 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 003.01 - 003.07
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_003_xx.h"
-
-
-
-
-//
-//	Test step 003.001
-//
-
-// constructor
-CCommDbTest003_01::CCommDbTest003_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_003_01");
-	}
-
-// destructor
-CCommDbTest003_01::~CCommDbTest003_01()
- 	{
-	}
-
-
-TVerdict CCommDbTest003_01::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest003_01::myOpenTableL()
-	{
-	
-	// Because OpenTableLC puts an object on the cleanup stack, 
-	// we cant use TRAP() on it as this causes a Panic during the 
-	// UnTrap cleanup, so we write our own leaving wrapper function.
-	iTheView=iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
-	CleanupStack::Pop();
-
-	//if this test does not trap, it can only ever return KErrNone
-	return KErrNone;
-
-	}
-
-TInt CCommDbTest003_01::executeStepL()
-	{	
-	TInt ret=KErrNone;
-
-	TRAPD(r,  ret = myOpenTableL() );
-	
-	if ( r==KErrNone )
-		{
-		//if there were no traps, return the value call to the api
-		r=ret;
-		}
-
-	return r;
-	}
-
-	
-TVerdict CCommDbTest003_01::doTestStepL( )
-	{
-	
-	Log(_L("Step 003.01 called "));
-
-	if ( executeStepL() == KErrNone  )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-	
-	
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 003.002
-//
-
-// constructor
-CCommDbTest003_02::CCommDbTest003_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_003_02");
-	}
-
-// destructor
-CCommDbTest003_02::~CCommDbTest003_02()
-	{
-	}
-
-
-TVerdict CCommDbTest003_02::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-#define INVALID_TABLE_NAME	_S("Inval")
-
-
-TInt CCommDbTest003_02::myOpenTableL()
-	{
-	
-	// Because OpenTableLC puts an object on the cleanup stack, 
-	// we cant use TRAP() on it as this causes a Panic during the 
-	// UnTrap cleanup, so we write our own leaving wrapper function.
-	iTheView=iTheDb->OpenTableLC(TPtrC(INVALID_TABLE_NAME));
-	CleanupStack::Pop();
-
-	//This test should trap, if it gets here then something has gone wrong 
-	return KErrGeneral;
-
-	}
-
-
-TInt CCommDbTest003_02::executeStepL()
-	{	
-	TInt ret=KErrNone;
-
-	TRAPD(r,  ret = myOpenTableL() );
-	
-	if ( r==KErrNone )
-		{
-		//if there were no traps, return the value call to the api
-		r=ret;
-		}
-
-	return r;
-	}
-
-
-
-TVerdict CCommDbTest003_02::doTestStepL( )
-	{
-	Log(_L("Step 003.02 called "));
-	
-
-	//Test for the expected return value
-	if ( executeStepL() == KErrNotFound  )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 003.003
-//
-
-// constructor
-CCommDbTest003_03::CCommDbTest003_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_003_03");
-	}
-
-// destructor
-CCommDbTest003_03::~CCommDbTest003_03()
-	{
-	}
-
-
-TVerdict CCommDbTest003_03::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-#define ZERO_LENGTH_TABLE_NAME	_S("")
-
-TInt CCommDbTest003_03::myOpenTableL()
-	{
-	
-	// Because OpenTableLC puts an object on the cleanup stack, 
-	// we cant use TRAP() on it as this causes a Panic during the 
-	// UnTrap cleanup, so we write our own leaving wrapper function.
-
-	iTheView = iTheDb->OpenTableLC(TPtrC(ZERO_LENGTH_TABLE_NAME));
-	CleanupStack::Pop();
-
-	//This test should trap, if we get here something has gone wrong
-	return KErrGeneral; 
-	}
-
-
-TInt CCommDbTest003_03::executeStepL()
-	{
-	TInt ret=KErrNone;
-
-	TRAPD(r,  ret = myOpenTableL() );
-	
-	if ( r==KErrNone )
-		{
-		//if there were no traps, return the value call to the api
-		r=ret;
-		}
-
-	return r;
-	}
-
-
-TVerdict CCommDbTest003_03::doTestStepL( )
-	{
-	Log(_L("Step 003.03 called "));
-	
-
-	//Test for the expected return value
-	if ( executeStepL() == KErrArgument )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 003.04
-//
-
-// constructor
-CCommDbTest003_04::CCommDbTest003_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_003_04");
-	}
-
-// destructor
-CCommDbTest003_04::~CCommDbTest003_04()
-	{
-	}
-
-TVerdict CCommDbTest003_04::doTestStepPreambleL()
-	{
-	openDbL();
-	return EPass;
-	}
-
-#define LONG_TABLE_NAME	_S("aVeryVeryLongTableNameThatIsLongerThanFiftyCharacters")
-
-
-TInt CCommDbTest003_04::myOpenTableL()
-	{
-	
-	// Because OpenTableLC puts an object on the cleanup stack, 
-	// we cant use TRAP() on it as this causes a Panic during the 
-	// UnTrap cleanup, so we write our own leaving wrapper function.
-	iTheView=iTheDb->OpenTableLC(TPtrC(LONG_TABLE_NAME));
-	CleanupStack::Pop();
-
-	//This test will cause a PANIC, so we will never get here
-	return KErrGeneral;
-	}
-
-
-TInt CCommDbTest003_04::executeStepL()
-	{
-	TInt ret=KErrNone;
-
-	TRAPD(r, myOpenTableL() );
-	
-	if ( r==KErrNone )
-		{
-		//if there were no traps, return the value call to the api
-		r=ret;
-		}
-
-	return r;
-}
-
-
-TVerdict CCommDbTest003_04::doTestStepL( )
-	{
-
-	User::SetJustInTime(EFalse);
-
-	if ( executeStepL() == KErrArgument )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-	
-	return iTestStepResult;
-	}
-//
-//	Test step 003.05
-//
-
-// constructor
-CCommDbTest003_05::CCommDbTest003_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_003_05");
-	}
-
-// destructor
-CCommDbTest003_05::~CCommDbTest003_05()
-	{
-	}
-
-
-TVerdict CCommDbTest003_05::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-//The CONNECTION_PREFERENCES table isn't really a public table,
-//but someone still could try to open it.
-#define CONNECTION_PREFERENCES		_S("ConnectionPreferences")
-
-TInt CCommDbTest003_05::myOpenTableL()
-	{
-	
-	// Because OpenTableLC puts an object on the cleanup stack, 
-	// we cant use TRAP() on it as this causes a Panic during the 
-	// UnTrap cleanup, so we write our own leaving wrapper function.
-	iTheView=iTheDb->OpenTableLC(TPtrC( CONNECTION_PREFERENCES ));
-	CleanupStack::Pop();
-
-	//This test should leave, so we will never reach here
-	return KErrGeneral;
-	}
-
-TInt CCommDbTest003_05::executeStepL()
-{
-	TInt ret=KErrNone;
-
-	TRAPD(r,  ret = myOpenTableL() );
-	
-	if ( r==KErrNone )
-		{
-		//if there were no traps, return the value call to the api
-		r=ret;
-		}
-
-	return r;
-}
-	
-
-
-TVerdict CCommDbTest003_05::doTestStepL( )
-	{
-	Log(_L("Step 003.05 called "));
-	
-
-	if ( executeStepL() == KErrAccessDenied )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-	
-	return iTestStepResult;
-	}
-
-//
-//	Test step 003.006
-//
-
-// constructor
-CCommDbTest003_06::CCommDbTest003_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_003_06");
-	}
-
-// destructor
-CCommDbTest003_06::~CCommDbTest003_06()
-	{
-	}
-
-
-TVerdict CCommDbTest003_06::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-#define GLOBAL_SETTINGS				_S("GlobalSettings")
-
-TInt CCommDbTest003_06::myOpenTableL()
-	{
-	
-	// Because OpenTableLC puts an object on the cleanup stack, 
-	// we cant use TRAP() on it as this causes a Panic during the 
-	// UnTrap cleanup, so we write our own leaving wrapper function.
-	iTheView=iTheDb->OpenTableLC(TPtrC( GLOBAL_SETTINGS ));
-	CleanupStack::Pop();
-
-	//This test should leave, so we will never reach here
-	return KErrGeneral;
-	}
-
-TInt CCommDbTest003_06::executeStepL()
-{
-	TInt ret=KErrNone;
-
-
-	TRAPD(r,  ret = myOpenTableL() );
-	
-	if ( r==KErrNone )
-		{
-		//if there were no traps, return the value call to the api
-		r=ret;
-		}
-
-	return r;
-}
-	
-
-TVerdict CCommDbTest003_06::doTestStepL( )
-	{
-	Log(_L("Step 003.06 called "));
-	
-
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-	
-	return iTestStepResult;
-	}
-
-//
-//	Test step 003.07
-//
-
-// constructor
-CCommDbTest003_07::CCommDbTest003_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_003_07");
-	}
-
-// destructor
-CCommDbTest003_07::~CCommDbTest003_07()
-	{
-	}
-
-TVerdict CCommDbTest003_07::doTestStepL( )
-	{
-	Log(_L("Step 003.07 called "));
-
-	iTestStepResult = EPass;
-
-	//Heap test for 003.01
-
-	CCommDbTest003_01* step003_01 = new CCommDbTest003_01;
-	CleanupStack::PushL(step003_01);
-	step003_01->iSuite = iSuite;				
-	doTestStepWithHeapFailureL( *step003_01, KErrNone);
-	if( step003_01->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step003_01);
-		
-
-	//Heap test for 003.02
-
-	CCommDbTest003_02* step003_02 = new CCommDbTest003_02;
-	CleanupStack::PushL(step003_02);
-	step003_02->iSuite = iSuite;				
-	doTestStepWithHeapFailureL( *step003_02, KErrNotFound);
-	if( step003_02->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step003_02);
-		
-
-	//Heap test for 003.03
-
-	CCommDbTest003_03* step003_03 = new CCommDbTest003_03;
-	CleanupStack::PushL(step003_03);
-	step003_03->iSuite = iSuite;			
-	doTestStepWithHeapFailureL( *step003_03, KErrArgument);
-	if( step003_03->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step003_03);
-
-	//Heap test for 003.04 - see test step 3.08
-	
-	//Heap test for 003.05
-
-	CCommDbTest003_05* step003_05 = new CCommDbTest003_05;
-	CleanupStack::PushL(step003_05);
-	step003_05->iSuite = iSuite;			
-	doTestStepWithHeapFailureL( *step003_05, KErrAccessDenied);
-	if( step003_05->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step003_05);
-		
-
-	//Heap test for 003.06
-
-	CCommDbTest003_06* step003_06 = new CCommDbTest003_06;
-	CleanupStack::PushL(step003_06);
-	step003_06->iSuite = iSuite;			
-	doTestStepWithHeapFailureL( *step003_06, KErrNotFound);
-	if( step003_06->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step003_06);
-		
-
-	return iTestStepResult;
-	}
-	
-//
-//	Test step 003.08
-//
-
-// constructor
-CCommDbTest003_08::CCommDbTest003_08()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_003_08");
-	}
-
-// destructor
-CCommDbTest003_08::~CCommDbTest003_08()
-	{
-	}
-
-TVerdict CCommDbTest003_08::doTestStepL( )
-	{
-
-	iTestStepResult = EPass;
-
-	//Heap test for 003.04 - a panic test
-	
-	CCommDbTest003_04* step003_04 = new CCommDbTest003_04;
-	CleanupStack::PushL(step003_04);
-	step003_04->iSuite = iSuite;			
-	if ( doTestStepWithHeapFailureL( *step003_04, KErrNotFound) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step003_04); 
-
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_003_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-// Copyright (c) 2001-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:
-// step_003_01.cpp
-// This is the header file for CommDb test 003.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_003_XX_H__)
-#define __STEP_003_XX_H__
-
-
-//
-//	Test step 003.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest003_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest003_01();
-	~CCommDbTest003_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TInt myOpenTableL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-
-};
-
-//
-//	Test step 003.02
-//
-class CCommsDatabase;
-
-NONSHARABLE_CLASS(CCommDbTest003_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest003_02();
-	~CCommDbTest003_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-	TInt myOpenTableL();
-
-
-};
-
-//
-//	Test step 003.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest003_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest003_03();
-	~CCommDbTest003_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-	TInt myOpenTableL();
-
-
-};
-
-//
-//	Test step 003.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest003_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest003_04();
-	~CCommDbTest003_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TVerdict doTestStepPreambleL();
-	TInt executeStepL();
-
-private:
-	TInt myOpenTableL();
-
-
-};
-
-//
-//	Test step 003.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest003_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest003_05();
-	~CCommDbTest003_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-	TInt myOpenTableL();
-	TBool iLocalObjects; //Flag set when objects of this class have created iTheDb and iTheView
-
-};
-
-//
-//	Test step 003.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest003_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest003_06();
-	~CCommDbTest003_06();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-	TInt myOpenTableL();
-	TBool iLocalObjects; //Flag set when objects of this class have created iTheDb and iTheView
-
-};
-
-//
-//	Test step 003.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest003_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest003_07();
-	~CCommDbTest003_07();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-	TBool iLocalObjects; //Flag set when objects of this class have created iTheDb and iTheView
-
-};
-
-//
-//	Test step 003.08
-//
-
-NONSHARABLE_CLASS(CCommDbTest003_08) : public CTestStepCommDb
-{
-public:
-	CCommDbTest003_08();
-	~CCommDbTest003_08();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-	TBool iLocalObjects; //Flag set when objects of this class have created iTheDb and iTheView
-
-};
-
-
-#endif //(__STEP_003_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_007_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1239 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 007.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_007_xx.h"
-
-//#ifndef SYMBIAN_COMMS_REPOSITORY
-//	_LIT(KTempDb3, "c:\\system\\data\\default3.dat");
-//#endif
-
-//
-//	Test step 007.001
-//
-
-// constructor
-CCommDbTest007_01::CCommDbTest007_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_01");
-	}
-
-// destructor
-CCommDbTest007_01::~CCommDbTest007_01()
-	{
-	}
-
-
-TVerdict CCommDbTest007_01::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-#define EXPECTED_FIELD_VALUE _L8("Call me back")
-
-TInt CCommDbTest007_01::executeStepL()
-	{
-	TInt ret = EFail;
-
-
-	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
-	//Read the value from the field and compare it to the expected value
-	TBuf8<KCommsDbSvrMaxFieldLength> value;
-
-	iTheView->ReadTextL( TPtrC(ISP_IF_CALLBACK_INFO), value );
-
-	if( !value.Compare( TPtrC8(EXPECTED_FIELD_VALUE) ) )
-		{
-		ret = EPass;
-		}
-
-	return ret;
-	}
-
-TVerdict CCommDbTest007_01::doTestStepL( )
-	{
-	Log(_L("Step 007.01 called "));
-
-	iTestStepResult = EFail;
-
-
-	if ( executeStepL() == EPass )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 007.002
-//
-
-// constructor
-CCommDbTest007_02::CCommDbTest007_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_02");
-	}
-
-// destructor
-CCommDbTest007_02::~CCommDbTest007_02()
-	{
-	}
-
-
-TVerdict CCommDbTest007_02::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-#define EXPECTED_ISP_DESCRIPTION _S("Description")
-
-TInt CCommDbTest007_02::executeStepL()
-	{
-	TInt32 ret = EFail;
-
-
-	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
-	//Read the value from the field and compare it to the expected value
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(ISP_DESCRIPTION), value );
-
-	if( !value.Compare( TPtrC(EXPECTED_ISP_DESCRIPTION) ) )
-		{
-		ret = EPass;
-		}
-
-	return ret;
-	}
-
-TVerdict CCommDbTest007_02::doTestStepL( )
-	{
-	Log(_L("Step 007.02 called "));
-	iTestStepResult = EFail;
-
-	if ( executeStepL() == EPass  )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 007.003
-//
-
-// constructor
-CCommDbTest007_03::CCommDbTest007_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_03");
-	}
-
-// destructor
-CCommDbTest007_03::~CCommDbTest007_03()
-	{
-	}
-
-TVerdict CCommDbTest007_03::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-#define EXPECTED_ISP_LOGIN_SCRIPT _S("wobble")
-
-TInt CCommDbTest007_03::executeStepL()
-	{
-	TInt32 ret = EFail;
-
-	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
-
-	//Read the value from the LongText field and compare it to the expected value
-	HBufC* value = iTheView->ReadLongTextLC( TPtrC(ISP_LOGIN_SCRIPT) );
-
-	if ( value )
-		{
-		if( !value->Compare( TPtrC(EXPECTED_ISP_LOGIN_SCRIPT) ) )
-			{
-			ret = EPass;
-			}
-		CleanupStack::PopAndDestroy();
-		}
-
-
-	return ret;
-	}
-
-TVerdict CCommDbTest007_03::doTestStepL( )
-	{
-	Log(_L("Step 007.03 called "));
-
-	if ( executeStepL() == EPass  )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 007.004
-//
-
-// constructor
-CCommDbTest007_04::CCommDbTest007_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_04");
-	}
-
-// destructor
-CCommDbTest007_04::~CCommDbTest007_04()
-	{
-	}
-
-TVerdict CCommDbTest007_04::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-#define EXPECTED_ISP_TYPE  2
-
-TInt CCommDbTest007_04::executeStepL()
-	{
-	TBool ret = EFail;
-
-
-	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone);
-	//Read the value from the Uint field and compare it to the expected value
-	TUint32 value;
-	iTheView->ReadUintL( TPtrC(ISP_TYPE), value );
-
-	if( value == EXPECTED_ISP_TYPE )
-		{
-		ret = EPass;
-		}
-
-	return ret;
-}
-
-TVerdict CCommDbTest007_04::doTestStepL( )
-	{
-	Log(_L("Step 007.04 called "));
-
-
-	if ( executeStepL() == EPass  )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 007.005
-//
-
-// constructor
-CCommDbTest007_05::CCommDbTest007_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_05");
-	// default to no local objects allocated
-	iLocalObjects = EFalse;
-	}
-
-// destructor
-CCommDbTest007_05::~CCommDbTest007_05()
-	{
-	}
-
-TVerdict CCommDbTest007_05::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-TInt CCommDbTest007_05::executeStepL()
-	{
-	TBool ret = EFail;
-
-	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone);
-	//Read the value from the Uint field and compare it to the expected value
-	TBool expectedValue;
-	iTheView->ReadBoolL( TPtrC(ISP_DISPLAY_PCT), expectedValue );
-
-	if( expectedValue )
-		{
-		iTestStepResult = EPass;
-		}
-
-	return ret;
-	}
-
-TVerdict CCommDbTest007_05::doTestStepL( )
-	{
-	Log(_L("Step 007.05 called "));
-
-	if ( executeStepL() == EPass  )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 007.006
-//
-
-// constructor
-CCommDbTest007_06::CCommDbTest007_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_06");
-	}
-
-// destructor
-CCommDbTest007_06::~CCommDbTest007_06()
-	{
-	}
-
-TVerdict CCommDbTest007_06::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-#define EXPECTED_COLUMN_LENGTH	10		//Expected length of ISP_IP_ADDR column
-
-TInt CCommDbTest007_06::executeStepL()
-	{
-	TBool ret = EFail;
-
-	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
-
-	//Read the length of a column
-	TInt value;
-	iTheView->ReadColumnLengthL( TPtrC(ISP_IP_ADDR), value );
-
-	if( value == EXPECTED_COLUMN_LENGTH )
-		iTestStepResult = EPass;
-
-	return ret;
-	}
-
-TVerdict CCommDbTest007_06::doTestStepL( )
-	{
-	Log(_L("Step 007.06 called "));
-
-	if ( executeStepL() == EPass  )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 007.007
-//
-
-// constructor
-CCommDbTest007_07::CCommDbTest007_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_07");
-	}
-
-// destructor
-CCommDbTest007_07::~CCommDbTest007_07()
-	{
-	}
-
-
-
-TVerdict CCommDbTest007_07::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-TInt CCommDbTest007_07::executeStepL()
-	{
-	TInt ret = KErrGeneral;
-
-	ret = iTheView->GotoFirstRecord();
-	if ( ret == KErrNotFound )
-		return ret;
-
-	//Try to read a column value from the empty view
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(ISP_DESCRIPTION), value );
-	return ret;
-	}
-
-TVerdict CCommDbTest007_07::doTestStepL( )
-	{
-	Log(_L("Step 007.07 called "));
-
-	//NB. create a view on an empty table
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 007.08
-//
-
-// constructor
-CCommDbTest007_08::CCommDbTest007_08()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_08");
-	// default to no local objects allocated
-	iLocalObjects = EFalse;
-	}
-
-// destructor
-CCommDbTest007_08::~CCommDbTest007_08()
-	{
-	}
-
-
-
-TVerdict CCommDbTest007_08::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-TInt CCommDbTest007_08::executeStepL()
-	{
-	TBool ret = EFail;
-
-	ret = iTheView->GotoFirstRecord();
-	if ( ret == KErrNotFound )
-		return EPass;
-
-	//Read the length of a column
-	TInt value;
-	iTheView->ReadColumnLengthL( TPtrC(ISP_IF_PARAMS), value );
-	if ( value == 0 )
-		ret = EPass;
-
-	return ret;
-	}
-
-TVerdict CCommDbTest007_08::doTestStepL( )
-	{
-	Log(_L("Step 007.08 called "));
-
-	//NB. create a view on an empty table
-
-	if ( executeStepL() == EPass )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 007.09
-//
-
-// constructor
-CCommDbTest007_09::CCommDbTest007_09()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_09");
-	}
-
-// destructor
-CCommDbTest007_09::~CCommDbTest007_09()
-	{
-	}
-
-
-TVerdict CCommDbTest007_09::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-TInt CCommDbTest007_09::executeStepL()
-	{
-	TInt ret = KErrGeneral;
-
-	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone )
-
-	//Try to read from an invalid column
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	TRAPD(r, iTheView->ReadTextL( KInvalidColumnName, value ) );
-
-	ret = r;
-
-	return ret;
-	}
-
-TVerdict CCommDbTest007_09::doTestStepL( )
-	{
-	Log(_L("Step 007.09 called "));
-
-	//NB. create a view on an empty table
-
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 007.10
-//
-
-// constructor
-CCommDbTest007_10::CCommDbTest007_10()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_10");
-	}
-
-// destructor
-CCommDbTest007_10::~CCommDbTest007_10()
-	{
-	}
-
-
-TVerdict CCommDbTest007_10::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest007_10::executeStepL()
-	{
-	TInt ret = KErrGeneral;
-
-	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
-
-	//Try to read length of an invalid column
-	TInt value;
-	TRAPD(r,iTheView->ReadColumnLengthL( KInvalidColumnName, value ));
-	ret = r;
-
-	return ret;
-	}
-
-TVerdict CCommDbTest007_10::doTestStepL( )
-	{
-	Log(_L("Step 007.10 called "));
-
-	//NB. create a view on an empty table
-
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 007.11
-//
-
-// constructor
-CCommDbTest007_11::CCommDbTest007_11()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_11");
-	}
-
-// destructor
-CCommDbTest007_11::~CCommDbTest007_11()
-	{
-	}
-
-
-TVerdict CCommDbTest007_11::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-TInt CCommDbTest007_11::executeStepL()
-	{
-	TInt ret = KErrGeneral;
-
-	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone);
-
-	//Read a column that will have a NULL value
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	TRAPD( r, iTheView->ReadTextL( TPtrC( ISP_DESCRIPTION ), value ) );
-	if ( r==KErrNone && value.Size() == 0 )
-		{
-			//test passed
-			ret = KErrNone;
-		}
-	else if ( r != KErrNone )
-		{
-		//return the leave reason
-		ret = r;
-		}
-
-
-	return ret;
-	}
-
-TVerdict CCommDbTest007_11::doTestStepL( )
-	{
-	Log(_L("Step 007.11 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 007.12
-//
-
-// constructor
-CCommDbTest007_12::CCommDbTest007_12()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_12");
-	}
-
-// destructor
-CCommDbTest007_12::~CCommDbTest007_12()
-	{
-	}
-
-
-TVerdict CCommDbTest007_12::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest007_12::executeStepL()
-	{
-	TInt ret = KErrGeneral;
-
-	CDBLEAVE( ret =  iTheView->GotoFirstRecord(), KErrNone )
-
-	//Try to read length of column containing a NULL value
-	TInt value = -1;
-	TRAPD(r, iTheView->ReadColumnLengthL( TPtrC(ISP_DESCRIPTION), value ) );
-	if ( r==KErrNone && value == 0 )
-		{
-			//test passed
-			ret = KErrNone;
-		}
-	else if ( r != KErrNone )
-		{
-		//return the leave reason
-		ret = r;
-		}
-
-	return ret;
-	}
-
-TVerdict CCommDbTest007_12::doTestStepL( )
-	{
-	Log(_L("Step 007.12 called "));
-
-	//NB. create a view on an empty table
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-
-
-//
-//	Test step 007.13
-//
-/*
-//Removed since this test will not compile on Code warrior due to having an array of zero length
-// constructor
-CCommDbTest007_13::CCommDbTest007_13()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_13");
-	}
-
-// destructor
-CCommDbTest007_13::~CCommDbTest007_13()
-	{
-	}
-
-
-TVerdict CCommDbTest007_13::doTestStepPreambleL()
-	{
-	copyTestDatabase( EDatabase_1 );
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-TInt CCommDbTest007_13::executeStepL()
-	{
-	TInt ret = KErrGeneral;
-
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-
-	//Read a column and pass a zero length buffer
-
-	//This next line causes a warning
-	TBuf<0> value;
-
-
-	TRAPD( r, iTheView->ReadTextL( TPtrC( ISP_DESCRIPTION ), value ) );
-	if ( r==KErrNone  )
-		{
-			//test passed
-			ret = KErrNone;
-		}
-	else if ( r != KErrNone )
-		{
-		//return the leave reason
-		ret = r;
-		}
-
-	return ret;
-	}
-
-TVerdict CCommDbTest007_13::doTestStepL( )
-	{
-	Log(_L("Step 007.13 called."));
-
-	//NB. create a view on an empty table
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-*/
-
-
-//
-//	Test step 007.14
-//
-
-// constructor
-CCommDbTest007_14::CCommDbTest007_14()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_14");
-	}
-
-// destructor
-CCommDbTest007_14::~CCommDbTest007_14()
-	{
-	}
-
-
-TVerdict CCommDbTest007_14::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-TInt CCommDbTest007_14::executeStepL()
-	{
-	TInt ret = KErrGeneral;
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-
-	//Read a column and pass a small length buffer
-
-	TBuf<5> value;
-
-	TRAPD( r, iTheView->ReadTextL( TPtrC( ISP_DESCRIPTION ), value ) );
-	if ( r==KErrNone  )
-		{
-			//test passed
-			ret = KErrNone;
-		}
-	else if ( r != KErrNone )
-		{
-		//return the leave reason
-		ret = r;
-		}
-
-	return ret;
-	}
-
-TVerdict CCommDbTest007_14::doTestStepL( )
-	{
-	//NB. create a view on an empty table
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 007.15
-//
-
-// constructor
-CCommDbTest007_15::CCommDbTest007_15()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_15");
-	}
-
-// destructor
-CCommDbTest007_15::~CCommDbTest007_15()
-	{
-	}
-
-
-TVerdict CCommDbTest007_15::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-#define ISP_DESCRIPTION_VALUE	_S("Isp #1")
-
-TInt CCommDbTest007_15::executeStepL()
-	{
-	TInt ret = KErrGeneral;
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-
-	//Read a read only column
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	TRAPD( r, iTheView->ReadTextL( TPtrC( ISP_DESCRIPTION ), value ) );
-	if ( r==KErrNone && value.Compare(TPtrC(ISP_DESCRIPTION_VALUE) ) == 0 )
-		{
-			//test passed
-			ret = KErrNone;
-		}
-	else if ( r != KErrNone )
-		{
-		//return the leave reason
-		ret = r;
-		}
-
-	return ret;
-	}
-
-TVerdict CCommDbTest007_15::doTestStepL( )
-	{
-	Log(_L("Step 007.15 called"));
-
-	//NB. create a view on an empty table
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 007.16
-// Check different paths in ReadTextL
-//
-
-// constructor
-CCommDbTest007_16::CCommDbTest007_16()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_16");
-	}
-
-// destructor
-CCommDbTest007_16::~CCommDbTest007_16()
-	{
-	}
-
-
-TVerdict CCommDbTest007_16::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(OUTGOING_GPRS));
-	return EPass;
-	}
-
-
-#define SHORT_APN_VALUE	_S("Test")
-
-// this is KCommsDbSvrRealMaxFieldLength chars long (=255)
-#define LONG_APN_VALUE	_S("TheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDog123")
-
-TInt CCommDbTest007_16::executeStepL()
-	{
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-
-	// Read a short APN value
-	TBuf<KCommsDbSvrRealMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC( GPRS_APN ), value );
-
-	if (value.Compare(TPtrC(SHORT_APN_VALUE) ) != 0 )
-		{
-		User::Leave(KErrGeneral);
-		}
-
-	// check that the long desc test is valid - ie KCommsDbSvrRealMaxFieldLength
-	// hasn't changed since we wrote this
-	TPtrC longDesc(LONG_APN_VALUE);
-	if (longDesc.Length() != KCommsDbSvrRealMaxFieldLength)
-		{
-		User::Leave(KErrGeneral);
-		}
-
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	iTheView->ReadTextL( TPtrC( GPRS_APN ), value );
-
-	if (value.Compare(TPtrC(LONG_APN_VALUE) ) != 0 )
-		{
-		User::Leave(KErrGeneral);
-		}
-
-	return KErrNone;
-	}
-
-TVerdict CCommDbTest007_16::doTestStepL( )
-	{
-	Log(_L("Step 007.16 called"));
-
-	//NB. create a view on an empty table
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 007.17
-// Check different paths in ReadTextL
-//
-
-// constructor
-CCommDbTest007_17::CCommDbTest007_17()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_17");
-	}
-
-// destructor
-CCommDbTest007_17::~CCommDbTest007_17()
-	{
-	}
-
-TVerdict CCommDbTest007_17::doTestStepL()
-	{
-	Log(_L("Step 007.17 called"));
-
-	iTestStepResult = EPass;
-
-	//Heap test for 007.01 - uses default1.xml 
-	CCommDbTest007_01* step007_01 = new CCommDbTest007_01;
-	CleanupStack::PushL(step007_01);
-	step007_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step007_01, KErrNone );
-	if ( step007_01->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step007_01);
-
-	//Heap test for 007.02 - uses default1.xml 
-	CCommDbTest007_02* step007_02 = new CCommDbTest007_02;
-	CleanupStack::PushL(step007_02);
-	step007_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step007_02, KErrNone );
-	if ( step007_02->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step007_02);
-
-	//Heap test for 007.03 - uses default1.xml 
-	CCommDbTest007_03* step007_03 = new CCommDbTest007_03;
-	CleanupStack::PushL(step007_03);
-	step007_03->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step007_03, KErrNone );
-	if ( step007_03->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step007_03);
-
-	//Heap test for 007.04 - uses default1.xml 
-	CCommDbTest007_04* step007_04 = new CCommDbTest007_04;
-	CleanupStack::PushL(step007_04);
-	step007_04->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step007_04, KErrNone );
-	if ( step007_04->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step007_04);
-
-	//Heap test for 007.05 - uses default1.xml 
-	CCommDbTest007_05* step007_05 = new CCommDbTest007_05;
-	CleanupStack::PushL(step007_05);
-	step007_05->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step007_05, KErrNone );
-	if ( step007_05->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step007_05);
-
-	//Heap test for 007.06 - uses default1.xml 
-	CCommDbTest007_06* step007_06 = new CCommDbTest007_06;
-	CleanupStack::PushL(step007_06);
-	step007_06->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step007_06, KErrNone );
-	if ( step007_06->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step007_06);
-
-	//Heap test for 007.07 - uses default7.xml 
-	//Heap test for 007.08 - uses default7.xml 
-
-	//Heap test for 007.09 - uses default1.xml 
-	CCommDbTest007_09* step007_09 = new CCommDbTest007_09;
-	CleanupStack::PushL(step007_09);
-	step007_09->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step007_09, KErrNotFound );
-	if ( step007_09->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step007_09);
-
-	//Heap test for 007.10 - uses default1.xml 
-	CCommDbTest007_10* step007_10 = new CCommDbTest007_10;
-	CleanupStack::PushL(step007_10);
-	step007_10->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step007_10, KErrNotFound );
-	if ( step007_10->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step007_10);
-
-	//Heap test for 007.11 - uses default1.xml 
-	CCommDbTest007_11* step007_11 = new CCommDbTest007_11;
-	CleanupStack::PushL(step007_11);
-	step007_11->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step007_11, KErrNone );
-	if ( step007_11->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step007_11);
-
-	//Heap test for 007.12 - uses default1.xml 
-	CCommDbTest007_12* step007_12 = new CCommDbTest007_12;
-	CleanupStack::PushL(step007_12);
-	step007_12->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step007_12, KErrNone );
-	if ( step007_12->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step007_12);
-
-	//Heap test for 007.14 - uses default1.xml - panic test see 7.20
-
-	//Heap test for 007.15 - uses default1.xml 
-	CCommDbTest007_15* step007_15 = new CCommDbTest007_15;
-	CleanupStack::PushL(step007_15);
-	step007_15->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step007_15, KErrNone );
-	if ( step007_15->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step007_15);
-	
-	return iTestStepResult;
-	}
-
-//
-//	Test step 007.18
-// Check different paths in ReadTextL
-//
-
-// constructor
-CCommDbTest007_18::CCommDbTest007_18()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_18");
-	}
-
-// destructor
-CCommDbTest007_18::~CCommDbTest007_18()
-	{
-	}
-
-TVerdict CCommDbTest007_18::doTestStepL()
-	{
-	Log(_L("Step 007.18 called"));
-
-	iTestStepResult = EPass;
-
-	//Heap test for 007.07 - uses default7.xml 
-	copyTestDatabase( EDatabase_7 );
-	CCommDbTest007_07* step007_07 = new CCommDbTest007_07;
-	CleanupStack::PushL(step007_07);
-	step007_07->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step007_07, KErrNotFound );
-	if ( step007_07->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step007_07);
-
-
-	//Heap test for 007.08 - uses default7.xml
-	CCommDbTest007_08* step007_08 = new CCommDbTest007_08;
-	CleanupStack::PushL(step007_08);
-	step007_08->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step007_08, KErrNone );
-	if ( step007_08->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step007_08);
-
-	return iTestStepResult;
-	}
-	
-//
-//	Test step 007.19
-// Check different paths in ReadTextL
-//
-
-// constructor
-CCommDbTest007_19::CCommDbTest007_19()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_19");
-	}
-
-// destructor
-CCommDbTest007_19::~CCommDbTest007_19()
-	{
-	}
-
-TVerdict CCommDbTest007_19::doTestStepL()
-	{
-	Log(_L("Step 007.19 called"));
-
-	iTestStepResult = EPass;
-
-	//Heap test for 007.16 - uses default3.xml
-	CCommDbTest007_16* step007_16 = new CCommDbTest007_16;
-	CleanupStack::PushL(step007_16);
-	step007_16->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step007_16, KErrNone );
-	if ( step007_16->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step007_16);
-
-	return iTestStepResult;
-	}
-	
-//
-//	Test step 007.20
-// Check different paths in ReadTextL
-//
-
-// constructor
-CCommDbTest007_20::CCommDbTest007_20()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_007_20");
-	}
-
-// destructor
-CCommDbTest007_20::~CCommDbTest007_20()
-	{
-	}
-
-TVerdict CCommDbTest007_20::doTestStepL()
-	{
-
-	iTestStepResult = EPass;
-
-	//Heap test for 007.14 - uses default1.xml
-	CCommDbTest007_14* step007_14 = new CCommDbTest007_14;
-	CleanupStack::PushL(step007_14);
-	step007_14->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step007_14, KErrNone );
-	if ( step007_14->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step007_14);
-
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_007_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,369 +0,0 @@
-// Copyright (c) 2001-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:
-// step_007_01.cpp
-// This is the header file for CommDb test 007.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_007_XX_H__)
-#define __STEP_007_XX_H__
-
-
-//
-//	Test step 007.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_01();
-	~CCommDbTest007_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 007.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_02();
-	~CCommDbTest007_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 007.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_03();
-	~CCommDbTest007_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-//
-//	Test step 007.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_04();
-	~CCommDbTest007_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 007.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_05();
-	~CCommDbTest007_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-//
-//	Test step 007.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_06();
-	~CCommDbTest007_06();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-//
-//	Test step 007.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_07();
-	~CCommDbTest007_07();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-//
-//	Test step 007.08
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_08) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_08();
-	~CCommDbTest007_08();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-//
-//	Test step 007.09
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_09) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_09();
-	~CCommDbTest007_09();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-//
-//	Test step 007.10
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_10) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_10();
-	~CCommDbTest007_10();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-//
-//	Test step 007.11
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_11) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_11();
-	~CCommDbTest007_11();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-//
-//	Test step 007.12
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_12) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_12();
-	~CCommDbTest007_12();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-//
-//	Test step 007.13
-//
-/*
-//Removed since this test will not compile on Code warrior due to having an array of zero length
-
-NONSHARABLE_CLASS(CCommDbTest007_13) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_13();
-	~CCommDbTest007_13();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-*/
-
-//
-//	Test step 007.14
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_14) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_14();
-	~CCommDbTest007_14();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-//
-//	Test step 007.15
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_15) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_15();
-	~CCommDbTest007_15();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 007.16
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_16) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_16();
-	~CCommDbTest007_16();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 007.17
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_17) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_17();
-	~CCommDbTest007_17();
-
-	virtual enum TVerdict doTestStepL( void );
-	
-private:
-
-};
-
-//
-//	Test step 007.18
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_18) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_18();
-	~CCommDbTest007_18();
-
-	virtual enum TVerdict doTestStepL( void );
-	
-private:
-
-};
-
-//
-//	Test step 007.19
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_19) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_19();
-	~CCommDbTest007_19();
-
-	virtual enum TVerdict doTestStepL( void );
-	
-private:
-
-};
-
-//
-//	Test step 007.20
-//
-
-NONSHARABLE_CLASS(CCommDbTest007_20) : public CTestStepCommDb
-{
-public:
-	CCommDbTest007_20();
-	~CCommDbTest007_20();
-
-	virtual enum TVerdict doTestStepL( void );
-	
-private:
-
-};
-
-#endif //(__STEP_007_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_008_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,215 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 008.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_008_xx.h"
-
-
-
-//
-//	Test step 008.001
-//
-
-// constructor
-CCommDbTest008_01::CCommDbTest008_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_008_01");
-
-	}
-
-// destructor
-CCommDbTest008_01::~CCommDbTest008_01()
-	{
-	}
-
-TVerdict CCommDbTest008_01::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest008_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id=0;
-
-	//Try to insert a record
-	TRAPD(r, ret = iTheView->InsertRecord( id ) );
-
-	//if we leave, return the leave value
-	if ( r!= KErrNone )
-		{
-		ret = r;
-		}
-		
-	return ret;
-	}
-
-
-TVerdict CCommDbTest008_01::doTestStepL( )
-	{
-	Log(_L("Step 008.01 called "));
-
-	
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-
-
-//
-//	Test step 008.02
-//
-
-// constructor
-CCommDbTest008_02::CCommDbTest008_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_008_02");
-	}
-
-// destructor
-CCommDbTest008_02::~CCommDbTest008_02()
-	{
-	}
-
-TVerdict CCommDbTest008_02::doTestStepL( )
-	{
-	Log(_L("Step 008.02 called "));
-
-	iTestStepResult = EPass;
-
-	// Heap test for 008.01
-
-	CCommDbTest008_01* step008_01 = new(ELeave) CCommDbTest008_01;
-	CleanupStack::PushL(step008_01);
-	step008_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step008_01, KErrNone);
-	if ( step008_01->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step008_01);
-
-	return iTestStepResult;
-
-	}
-
-//
-//	Test step 008.003
-//
-
-// constructor
-CCommDbTest008_03::CCommDbTest008_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_008_03");
-
-	}
-
-// destructor
-CCommDbTest008_03::~CCommDbTest008_03()
-	{
-	}
-
-TVerdict CCommDbTest008_03::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest008_03::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id=0;
-
-	//Position at record to copy
-	ret=iTheView->GotoFirstRecord();
-	if(ret != KErrNone)
-		{return ret;}
-
-	//Try to insert a copy of the first record
-	ret = iTheView->InsertCopyRecord(id);
-
-	return ret;
-	}
-
-TVerdict CCommDbTest008_03::doTestStepL( )
-	{
-	Log(_L("Step 008.03 called "));
-
-	
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 008.04
-//
-
-// constructor
-CCommDbTest008_04::CCommDbTest008_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_008_04");
-	}
-
-// destructor
-CCommDbTest008_04::~CCommDbTest008_04()
-	{
-	}
-
-TVerdict CCommDbTest008_04::doTestStepL( )
-	{
-	Log(_L("Step 008.04 called "));
-
-	iTestStepResult = EPass;
-
-	// Heap test for 008.01
-
-	CCommDbTest008_03* step008_03 = new(ELeave) CCommDbTest008_03;
-	CleanupStack::PushL(step008_03);
-	step008_03->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step008_03, KErrNone);
-	if ( step008_03->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step008_03);
-
-	return iTestStepResult;
-
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_008_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-// Copyright (c) 2001-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:
-// step_008_01.cpp
-// This is the header file for CommDb test 008.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_008_XX_H__)
-#define __STEP_008_XX_H__
-
-
-//
-//	Test step 008.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest008_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest008_01();
-	~CCommDbTest008_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 008.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest008_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest008_02();
-	~CCommDbTest008_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	
-private:
-
-};
-
-//
-//	Test step 008.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest008_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest008_03();
-	~CCommDbTest008_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 008.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest008_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest008_04();
-	~CCommDbTest008_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	
-private:
-
-};
-
-#endif //(__STEP_008_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_009_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1181 +0,0 @@
-// Copyright (c) 2006-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:
-// This contains CommDb Unit Test Cases 009.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_009_xx.h"
-
-
-
-//
-//	Test step 009.001
-//
-
-// constructor
-CCommDbTest009_01::CCommDbTest009_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_01");
-	}
-
-// destructor
-CCommDbTest009_01::~CCommDbTest009_01()
-	{
-	}
-
-
-TVerdict CCommDbTest009_01::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-#define ISP_INIT_STRING_TEST_VALUE	_L8("Test Value")
-#define COMMDB_NAME_TEST_VALUE	_L("Test record")
-//#define ISP_IF_NAME_TEST_VALUE	_L("Test record")
-
-
-TInt CCommDbTest009_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id;
-
-	//NB. The table MUST be empty for this test to work!
-
-	//Try to insert a record
-	
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-
-	//Insert some text
-	iTheView->WriteTextL( TPtrC(ISP_INIT_STRING), ISP_INIT_STRING_TEST_VALUE );
-
-	//Must write to these columns as they cannot hold null values
-	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), ISP_IF_NAME_TEST_VALUE );
-	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),COMMDB_NAME_TEST_VALUE);
-
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-
-
-	//Read the value from the field and compare it to the value we've just written
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-
-	TBuf8<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(ISP_INIT_STRING), value );
- 	if( !value.Compare( ISP_INIT_STRING_TEST_VALUE ) )
-		{
-		ret = KErrNone;
-		}
-
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest009_01::doTestStepL( )
-	{
-	Log(_L("Step 009.01 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-		
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 009.002
-//
-
-// constructor
-CCommDbTest009_02::CCommDbTest009_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_02");
-	}
-
-// destructor
-CCommDbTest009_02::~CCommDbTest009_02()
-	{
-	}
-
-
-TVerdict CCommDbTest009_02::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-#define ISP_DESCRIPTION_TEST_VALUE	_L16("ISP description test value")
-
-TInt CCommDbTest009_02::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id;
-
-	//NB. The table MUST be empty for this test to work!
-
-	//Try to insert a record
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-
-	//Insert some text
-	iTheView->WriteTextL( TPtrC(ISP_DESCRIPTION), ISP_DESCRIPTION_TEST_VALUE );
-
-	//Must write to these columns as they cannot hold null values
-	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), ISP_IF_NAME_TEST_VALUE );
-	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),COMMDB_NAME_TEST_VALUE);
-
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone);
-	
-	//Read the value from the field and compare it to the value we've just written
-	CDBLEAVE( iTheView->GotoFirstRecord(),  KErrNone ) ;
-
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(ISP_DESCRIPTION), value );
-	if( !value.Compare( ISP_DESCRIPTION_TEST_VALUE ) )
-		{
-		ret = KErrNone;
-		}
-	
-	return ret;
-	}
-
-
-TVerdict CCommDbTest009_02::doTestStepL( )
-	{
-	Log(_L("Step 009.02 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-	
-	return iTestStepResult;
-	}
-
-
-
-
-//
-//	Test step 009.003
-//
-
-// constructor
-CCommDbTest009_03::CCommDbTest009_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_03");
-	}
-
-// destructor
-CCommDbTest009_03::~CCommDbTest009_03()
-	{
-	}
-
-
-TVerdict CCommDbTest009_03::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-#define ISP_BEARER_TYPE_TEST_VALUE		0x1
-
-TInt CCommDbTest009_03::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id;
-
-	//NB. The table MUST be empty for this test to work!
-
-	//Try to insert a record
-	CDBLEAVE( iTheView->InsertRecord( id ),  KErrNone );
-
-	//Insert a value
-	iTheView->WriteUintL( TPtrC(ISP_BEARER_TYPE), ISP_BEARER_TYPE_TEST_VALUE );
-
-	//Must write to these columns as they cannot hold null values
-	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), ISP_IF_NAME_TEST_VALUE );
-	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),COMMDB_NAME_TEST_VALUE);
-
-	CDBLEAVE( iTheView->PutRecordChanges(),  KErrNone );
-
-	//Read the value from the field and compare it to the value we've just written
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-
-	TUint32 value;
-	iTheView->ReadUintL( TPtrC(ISP_BEARER_TYPE), value );
-	if( value == ISP_BEARER_TYPE_TEST_VALUE )
-		{
-		ret = KErrNone;
-		}
-		
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest009_03::doTestStepL( )
-	{
-	Log(_L("Step 009.03 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-
-
-
-
-
-//
-//	Test step 009.004
-//
-
-// constructor
-CCommDbTest009_04::CCommDbTest009_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_04");
-	}
-
-// destructor
-CCommDbTest009_04::~CCommDbTest009_04()
-	{
-	}
-
-
-TVerdict CCommDbTest009_04::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-#define ISP_ENABLE_SW_COMP_TEST_VALUE	ETrue
-
-TInt CCommDbTest009_04::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id;
-
-	//NB. The table MUST be empty for this test to work!
-
-	//Try to insert a record
-	CDBLEAVE( iTheView->InsertRecord( id ),  KErrNone );
-		
-	//Insert a value
-	iTheView->WriteBoolL( TPtrC(ISP_ENABLE_SW_COMP), ISP_ENABLE_SW_COMP_TEST_VALUE );
-
-	//Must write to these columns as they cannot hold null values
-	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), ISP_IF_NAME_TEST_VALUE );
-	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),COMMDB_NAME_TEST_VALUE);
-
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-	
-	//Read the value from the field and compare it to the value we've just written
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	
-	TBool value;
-	iTheView->ReadBoolL( TPtrC(ISP_ENABLE_SW_COMP), value );
-	if( value )
-		{
-		ret = KErrNone;
-		}
-
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest009_04::doTestStepL( )
-	{
-	Log(_L("Step 009.04 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-
-
-
-//
-//	Test step 009.005
-//
-
-// constructor
-CCommDbTest009_05::CCommDbTest009_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_05");
-	}
-
-// destructor
-CCommDbTest009_05::~CCommDbTest009_05()
-	{
-	}
-
-TVerdict CCommDbTest009_05::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-#define ISP_LOGIN_SCRIPT_TEST_VALUE	 _L("This is a test string that will be used in the test. It must be longer than 50 characters")
-
-TInt CCommDbTest009_05::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id;
-
-	//NB. The table MUST be empty for this test to work!
-
-	//Try to insert a record
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-
-	//Insert a value
-	iTheView->WriteLongTextL( TPtrC(ISP_LOGIN_SCRIPT), TPtrC(ISP_LOGIN_SCRIPT_TEST_VALUE) );
-
-	//Must write to these columns as they cannot hold null values
-	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), ISP_IF_NAME_TEST_VALUE );
-	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),COMMDB_NAME_TEST_VALUE);
-
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-
-
-	//Read the value from the field and compare it to the value we've just written
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	
-	HBufC* value = iTheView->ReadLongTextLC( TPtrC(ISP_LOGIN_SCRIPT) );
-
-	if ( value )
-		{
-		if( !value->Compare( ISP_LOGIN_SCRIPT_TEST_VALUE) )
-			{
-			ret = KErrNone;
-			}
-		CleanupStack::PopAndDestroy();
-		}
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest009_05::doTestStepL( )
-	{
-	Log(_L("Step 009.05 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-		
-	return iTestStepResult;
-	}
-
-
-
-
-
-//
-//	Test step 009.06
-//
-
-// constructor
-CCommDbTest009_06::CCommDbTest009_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_06");
-	}
-
-// destructor
-CCommDbTest009_06::~CCommDbTest009_06()
-	{
-	}
-
-
-TVerdict CCommDbTest009_06::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-#define TEST_DATA		_L("Test data")
-
-
-TInt CCommDbTest009_06::executeStepL()
-	{
-	TInt ret=KErrNone;
-	TUint32 id;
-
-	//NB. The table MUST be empty for this test to work!
-
-	//NB. This test will cause a PANIC
-
-	//Try to insert a record
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-
-	//Insert a value in an invalid column
-	iTheView->WriteTextL( KInvalidColumnName, TPtrC(TEST_DATA) );
-
-	// We should never get here because we should have hit a panic
-	// If the Panic doesnt happen, we'll cause a leave
-
-	User::Leave( KErrGeneral );
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest009_06::doTestStepL( )
-	{
-
-	//This test step needs to trap a Panic
-
-	TRAPD( r, executeStepL() );
-
-	if ( r == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-		
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 009.07
-//
-
-// constructor
-CCommDbTest009_07::CCommDbTest009_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_07");
-	}
-
-// destructor
-CCommDbTest009_07::~CCommDbTest009_07()
-	{
-	}
-
-
-TVerdict CCommDbTest009_07::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest009_07::executeStepL()
-	{
-	TInt ret=KErrNone;
-
-	//NB. This test will cause a PANIC
-
-	//Try to insert a record without a call to InsertRecord()
-	
-	//Insert a value in column
-	iTheView->WriteBoolL( TPtrC(ISP_ENABLE_SW_COMP), ETrue );
-
-	// We should never get here because we should have hit a panic
-	// If the Panic doesnt happen, we'll cause a leave
-
-	User::Leave( KErrGeneral );
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest009_07::doTestStepL( )
-	{
-	//This test step needs to trap a Panic
-
-	TRAPD( r, executeStepL() );
-
-	if ( r == KErrNone )
-		iTestStepResult = EFail;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-
-
-
-
-
-//
-//	Test step 009.08
-//
-
-// constructor
-CCommDbTest009_08::CCommDbTest009_08()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_08");
-
-	}
-
-// destructor
-CCommDbTest009_08::~CCommDbTest009_08()
-	{
-	}
-
-
-TVerdict CCommDbTest009_08::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest009_08::executeStepL()
-	{
-	TInt ret=KErrNone;
-
-	//NB. This test will cause a PANIC
-	//Try to PutRecordChanges() without a call to InsertRecord()
-
-	//Insert a value
-	iTheView->WriteUintL( TPtrC(ISP_ENABLE_SW_COMP), ISP_ENABLE_SW_COMP_TEST_VALUE );
-
-	//Must write to these columns as they cannot hold null values
-	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), ISP_IF_NAME_TEST_VALUE );
-	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),COMMDB_NAME_TEST_VALUE);
-
-	iTheView->PutRecordChanges();
-
-	// We should never get here because we should have hit a panic
-	// If the Panic doesnt happen, we'll cause a leave
-
-	User::Leave( KErrGeneral );
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest009_08::doTestStepL( )
-	{
-	//This test step needs to trap a Panic
-
-	if ( executeStepL() ==  KErrNone )
-		iTestStepResult = EFail;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 009.09
-//
-
-// constructor
-CCommDbTest009_09::CCommDbTest009_09()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_09");
-	}
-
-// destructor
-CCommDbTest009_09::~CCommDbTest009_09()
-	{
-	}
-
-
-TVerdict CCommDbTest009_09::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-
-
-TInt CCommDbTest009_09::executeStepL()
-	{
-	return KErrInUse;
-	}
-
-
-TVerdict CCommDbTest009_09::doTestStepL( )
-	{
-	Log(_L("Step 009.09 called"));
-			
-	//This test step needs to trap a Panic
-
-	if ( executeStepL() == KErrInUse )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-	return iTestStepResult;
-	}
-
-//
-//	Test step 009.10
-//
-
-// constructor
-CCommDbTest009_10::CCommDbTest009_10()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_10");
-	}
-
-// destructor
-CCommDbTest009_10::~CCommDbTest009_10()
-	{
-	}
-
-
-TVerdict CCommDbTest009_10::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-#define ISP_INIT_STRING_LONG_VALUE	_L8("aVeryVeryLongColumnValueThatIsLongerThanFiftyCharacters")
-
-
-TInt CCommDbTest009_10::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id;
-
-	//Try to insert a record
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-
-	//Write a long string
-	TRAP(ret, iTheView->WriteTextL( TPtrC(ISP_INIT_STRING), ISP_INIT_STRING_LONG_VALUE ) );
-	
-	return ret;
-	}
-
-
-TVerdict CCommDbTest009_10::doTestStepL( )
-	{
-	Log(_L("Step 009.10 called"));
-
-		if (  executeStepL() == KErrOverflow )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-
-//
-//	Test step 009.11
-//
-
-// constructor
-CCommDbTest009_11::CCommDbTest009_11()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_11");
-	}
-
-// destructor
-CCommDbTest009_11::~CCommDbTest009_11()
-	{
-	}
-
-TVerdict CCommDbTest009_11::doTestStepL( )
-	{
-	Log(_L("Step 009.11 called "));
-
-	iTestStepResult = EPass;
-
-	// Have backup of Database in c:\default7.dat
-	// Heap test for 009.01
-
-	CCommDbTest009_01* step009_01 = new(ELeave) CCommDbTest009_01;
-	CleanupStack::PushL(step009_01);
-	step009_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step009_01, KErrNone);
-	if ( step009_01->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step009_01);
-
-
-	return iTestStepResult;
-
-	}
-
-
-// constructor
-CCommDbTest009_12::CCommDbTest009_12()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_12");
-	}
-
-// destructor
-CCommDbTest009_12::~CCommDbTest009_12()
-	{
-	}
-
-TVerdict CCommDbTest009_12::doTestStepL( )
-	{
-		// store the name of this test case
-	iTestStepName = _L("step_009_12");
-	iTestStepResult = EPass;
-	
-	CCommDbTest009_02* step009_02 = new(ELeave) CCommDbTest009_02;
-	CleanupStack::PushL(step009_02);
-	step009_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step009_02, KErrNone);
-	if ( step009_02->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step009_02);
-
-	return iTestStepResult;
-	}
-	
-// constructor
-CCommDbTest009_13::CCommDbTest009_13()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_13");
-	}
-
-// destructor
-CCommDbTest009_13::~CCommDbTest009_13()
-	{
-	}
-
-TVerdict CCommDbTest009_13::doTestStepL( )
-	{
-		// store the name of this test case
-	iTestStepName = _L("step_009_13");
-	iTestStepResult = EPass;
-	
-		// Heap test for 009.03
-	CCommDbTest009_03* step009_03 = new(ELeave) CCommDbTest009_03;
-	CleanupStack::PushL(step009_03);
-	step009_03->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step009_03, KErrNone);
-	if ( step009_03->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step009_03);
-	
-	return iTestStepResult;
-	}
-	
-// constructor
-CCommDbTest009_14::CCommDbTest009_14()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_14");
-	}
-
-// destructor
-CCommDbTest009_14::~CCommDbTest009_14()
-	{
-	}
-
-TVerdict CCommDbTest009_14::doTestStepL( )
-	{
-		// store the name of this test case
-	iTestStepName = _L("step_009_14");
-	iTestStepResult = EPass;
-	
-		// Heap test for 009.04
-	CCommDbTest009_04* step009_04 = new(ELeave) CCommDbTest009_04;
-	CleanupStack::PushL(step009_04);
-	step009_04->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step009_04, KErrNone);
-	if ( step009_04->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step009_04);
-
-	return iTestStepResult;
-	}
-	
-// constructor
-CCommDbTest009_15::CCommDbTest009_15()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_15");
-	}
-
-// destructor
-CCommDbTest009_15::~CCommDbTest009_15()
-	{
-	}
-
-TVerdict CCommDbTest009_15::doTestStepL( )
-	{
-		// store the name of this test case
-	iTestStepName = _L("step_009_15");
-	iTestStepResult = EPass;
-	
-		// Heap test for 009.05
-	CCommDbTest009_05* step009_05 = new(ELeave) CCommDbTest009_05;
-	CleanupStack::PushL(step009_05);
-	step009_05->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step009_05, KErrNone);
-	if ( step009_05->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step009_05);
-	
-			// Heap test for 009.06
-	CCommDbTest009_06* step009_06 = new(ELeave) CCommDbTest009_06;
-	CleanupStack::PushL(step009_06);
-	step009_06->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step009_06, KErrNotFound);
-	if ( step009_06->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step009_06);
-
-	return iTestStepResult;
-	}
-	
-// constructor
-CCommDbTest009_16::CCommDbTest009_16()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_16");
-	}
-
-// destructor
-CCommDbTest009_16::~CCommDbTest009_16()
-	{
-	}
-
-TVerdict CCommDbTest009_16::doTestStepL( )
-	{
-		// store the name of this test case
-	iTestStepName = _L("step_009_16");
-	iTestStepResult = EPass;
-	
-		// Heap test for 009.09
-	CCommDbTest009_09* step009_09 = new(ELeave) CCommDbTest009_09;
-	CleanupStack::PushL(step009_09);
-	step009_09->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step009_09, KErrInUse);
-	if ( step009_09->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step009_09);
-
-		// Heap test for 009.10
-	CCommDbTest009_10* step009_10 = new(ELeave) CCommDbTest009_10;
-	CleanupStack::PushL(step009_10);
-	step009_10->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step009_10, KErrOverflow);
-	if ( step009_10->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step009_10);
-
-	return iTestStepResult;
-	}
-	
-
-// constructor
-CCommDbTest009_17::CCommDbTest009_17()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_009_17");
-}
-
-// destructor
-CCommDbTest009_17::~CCommDbTest009_17()
-{
-}
-
-TVerdict CCommDbTest009_17::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-TInt CCommDbTest009_17::executeStepL()
-{
-	TBuf<50> buff;
-
-	TInt ret(0);
-
-	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
-
-	iTheView->UpdateRecord();
-	
-	iTheView->SetNullL( TPtrC(ISP_IF_CALLBACK_INFO ));
-	
-	User::LeaveIfError(iTheView->PutRecordChanges());
-		
-	iTheView->ReadTextL(TPtrC(ISP_IF_CALLBACK_INFO ), buff);
-
-	if(buff.Length() == 0)
-		{
-		ret = KErrNone;
-		}
-	else
-		{
-		ret	= KErrGeneral;
-		}
-
-	return ret;
-}
-
-// do Test step 009.17
-TVerdict CCommDbTest009_17::doTestStepL( )
-{
-
-	Log(_L("Step 009.17 called "));
-    if (executeStepL() == KErrNone)
-	iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-}
-
-//
-//	Test step 009.18
-//
-
-// constructor
-CCommDbTest009_18::CCommDbTest009_18()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_18");
-	}
-
-// destructor
-CCommDbTest009_18::~CCommDbTest009_18()
-	{
-	}
-
-TVerdict CCommDbTest009_18::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-TInt CCommDbTest009_18::executeStepL()
-	{
-	TBuf<KCommsDbSvrMaxColumnNameLength> tableName;
-	iTestStepResult = EFail;
-	iTheView->GetTableName( tableName ); 
-	if ( tableName.Compare( TPtrC(DIAL_OUT_ISP)) != KErrNone )
-		{	
-		iTestStepResult = EFail;	
-		}
-	else
-		{
-		iTestStepResult = EPass;
-		} 
-	return iTestStepResult;
-	}
-
-// do Test step 009.18
-TVerdict CCommDbTest009_18::doTestStepL( )
-	{
-	iTestStepResult = EFail;
-	Log(_L("Step 009.18 called "));
-	if (executeStepL() != KErrNone)
-		{
-		iTestStepResult = EFail;	
-		}
-	else
-		{
-		iTestStepResult = EPass;
-		}
-	return iTestStepResult;
-	}
-
-//
-//	Test step 009.19
-//
-
-// constructor
-CCommDbTest009_19::CCommDbTest009_19()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_19");
-	}
-
-// destructor
-CCommDbTest009_19::~CCommDbTest009_19()
-	{
-	}
-
-TVerdict CCommDbTest009_19::doTestStepL( )
-	{
-	Log(_L("Step 009.19 called "));
-
-	iTestStepResult = EPass;
-
-		// Heap test for 009.17
-		
-	CCommDbTest009_17* step009_17 = new(ELeave) CCommDbTest009_17;
-	CleanupStack::PushL(step009_17);
-	step009_17->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step009_17, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step009_17);
-
-	return iTestStepResult;	
-
-	}
-
-//
-//	Test step 009.20
-//
-
-// constructor
-CCommDbTest009_20::CCommDbTest009_20()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_20");
-	}
-
-// destructor
-CCommDbTest009_20::~CCommDbTest009_20()
-	{
-	}
-
-TVerdict CCommDbTest009_20::doTestStepL( )
-	{
-
-	iTestStepResult = EPass;
-
-		// Heap test for 009.07
-		
-	CCommDbTest009_07* step009_07 = new(ELeave) CCommDbTest009_07;
-	CleanupStack::PushL(step009_07);
-	step009_07->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step009_07, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step009_07);
-
-	return iTestStepResult;	
-
-	}
-
-//
-//	Test step 009.21
-//
-
-// constructor
-CCommDbTest009_21::CCommDbTest009_21()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_009_21");
-	}
-
-// destructor
-CCommDbTest009_21::~CCommDbTest009_21()
-	{
-	}
-
-TVerdict CCommDbTest009_21::doTestStepL( )
-	{
-
-	iTestStepResult = EPass;
-
-		// Heap test for 009.08
-		
-	CCommDbTest009_08* step009_08 = new(ELeave) CCommDbTest009_08;
-	CleanupStack::PushL(step009_08);
-	step009_08->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step009_08, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step009_08);
-
-	return iTestStepResult;	
-
-	}
-
-//EOF
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_009_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,401 +0,0 @@
-// Copyright (c) 2006-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:
-// step_009_01.cpp
-// This is the header file for CommDb test 009.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_009_XX_H__)
-#define __STEP_009_XX_H__
-
-
-//
-//	Test step 009.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_01();
-	~CCommDbTest009_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TInt heapFailureTest();
-	TVerdict doTestStepPreambleL();
-
-
-private:
-
-};
-
-
-//
-//	Test step 009.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_02();
-	~CCommDbTest009_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 009.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_03();
-	~CCommDbTest009_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 009.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_04();
-	~CCommDbTest009_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 009.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_05();
-	~CCommDbTest009_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 009.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_06();
-	~CCommDbTest009_06();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 009.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_07();
-	~CCommDbTest009_07();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 009.08
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_08) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_08();
-	~CCommDbTest009_08();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 009.09
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_09) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_09();
-	~CCommDbTest009_09();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 009.10
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_10) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_10();
-	~CCommDbTest009_10();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-//
-//	Test step 009.11
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_11) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_11();
-	~CCommDbTest009_11();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-//commsdat specific
-
-//
-//	Test step 009.12
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_12) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_12();
-	~CCommDbTest009_12();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-//
-//	Test step 009.13
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_13) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_13();
-	~CCommDbTest009_13();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-//
-//	Test step 009.14
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_14) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_14();
-	~CCommDbTest009_14();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-//
-//	Test step 009.15
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_15) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_15();
-	~CCommDbTest009_15();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-//
-//	Test step 009.16
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_16) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_16();
-	~CCommDbTest009_16();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-//
-//	Test step 009.17
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_17) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_17();
-	~CCommDbTest009_17();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 009.18
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_18) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_18();
-	~CCommDbTest009_18();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 009.19
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_19) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_19();
-	~CCommDbTest009_19();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 009.20
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_20) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_20();
-	~CCommDbTest009_20();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 009.21
-//
-
-NONSHARABLE_CLASS(CCommDbTest009_21) : public CTestStepCommDb
-{
-public:
-	CCommDbTest009_21();
-	~CCommDbTest009_21();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-#endif //(__STEP_009_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_010_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,336 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 010.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_010_xx.h"
-
-
-
-//
-//	Test step 010.001
-//
-
-// constructor
-CCommDbTest010_01::CCommDbTest010_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_010_01");
-	}
-
-// destructor
-CCommDbTest010_01::~CCommDbTest010_01()
-	{
-	}
-
-TVerdict CCommDbTest010_01::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest010_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-
-	//This test must be executed on a populated table
-	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
-
-
-	//Move through the records in the table until the last record is reached
-	while( ret == KErrNone )
-		{
-		TRAPD(r, ret = iTheView->GotoNextRecord() );
-		if ( r!= KErrNone )
-			User::Leave(r);
-		}
-
-
-	
-	return ret;
-	}
-
-
-TVerdict CCommDbTest010_01::doTestStepL( )
-	{
-	Log(_L("Step 010.01 called "));
-
-
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-
-
-//
-//	Test step 010.02
-//
-
-// constructor
-CCommDbTest010_02::CCommDbTest010_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_010_02");
-	}
-
-// destructor
-CCommDbTest010_02::~CCommDbTest010_02()
-	{
-	}
-
-TVerdict CCommDbTest010_02::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-TInt CCommDbTest010_02::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Move through the records in the table from the last to the first
-
-	CDBLEAVE ( ret = iTheView->GotoFirstRecord(), KErrNone);
-
-	while( ret == KErrNone )
-		{
-		TRAPD(r, ret = iTheView->GotoNextRecord() );
-		if ( r!= KErrNone )
-			User::Leave(r);
-		}
-	//We should be at the end of the records in this table,
-	//and ret == KErrNotFound
-
-	CDBLEAVE( ret, KErrNotFound  );
-
-	//Now move back to the first record 
-	CDBLEAVE ( ret = iTheView->GotoPreviousRecord(), KErrNone);
-
-	while( ret == KErrNone )
-		{
-		TRAPD(r, ret = iTheView->GotoPreviousRecord() );
-		if ( r!=KErrNone )
-			User::Leave(r);
-		}
-
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest010_02::doTestStepL( )
-	{
-	Log(_L("Step 010.02 called "));
-
-	
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 010.03
-//
-
-// constructor
-CCommDbTest010_03::CCommDbTest010_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_010_03");
-	}
-
-// destructor
-CCommDbTest010_03::~CCommDbTest010_03()
-	{
-	}
-
-TVerdict CCommDbTest010_03::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest010_03::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//The view must contain zero records
-
-	TRAPD(r, ret = iTheView->GotoFirstRecord() );
-	if( r!=KErrNone )
-		ret =r;
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest010_03::doTestStepL( )
-	{
-	Log(_L("Step 010.03 called "));
-
-	
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 010.04
-//
-
-// constructor
-CCommDbTest010_04::CCommDbTest010_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_010_04");
-	}
-
-// destructor
-CCommDbTest010_04::~CCommDbTest010_04()
-	{
-	}
-
-
-TVerdict CCommDbTest010_04::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-TInt CCommDbTest010_04::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//The view must contain zero records
-
-	TRAPD( r, ret = iTheView->GotoNextRecord() );
-
-	if ( r!= KErrNone )
-		ret = r;
-
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest010_04::doTestStepL( )
-	{
-	Log(_L("Step 010.04 called "));
-
-	
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 010.05
-//
-
-// constructor
-CCommDbTest010_05::CCommDbTest010_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_010_05");
-	}
-
-// destructor
-CCommDbTest010_05::~CCommDbTest010_05()
-	{
-	}
-
-
-TVerdict CCommDbTest010_05::doTestStepL( )
-	{
-	Log(_L("Step 010.05 called "));
-
-	iTestStepResult = EPass;
-
-	// Heap test for 010.01
-
-	CCommDbTest010_01* step010_01 = new CCommDbTest010_01;
-	CleanupStack::PushL(step010_01);
-	step010_01->iSuite = iSuite;				
-	if ( doTestStepWithHeapFailureL( *step010_01, KErrNotFound) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step010_01);
-
-	//Heap test for 010.02
-
-	CCommDbTest010_02* step010_02 = new CCommDbTest010_02;
-	CleanupStack::PushL(step010_02);
-	step010_02->iSuite = iSuite;				
-	if ( doTestStepWithHeapFailureL( *step010_02, KErrNotFound) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step010_02);
-
-	//Heap test for 010.03
-
-	CCommDbTest010_03* step010_03 = new CCommDbTest010_03;
-	CleanupStack::PushL(step010_03);
-	step010_03->iSuite = iSuite;				
-	if ( doTestStepWithHeapFailureL( *step010_03, KErrNotFound) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step010_03);
-
-	//Heap test for 010.04
-
-	CCommDbTest010_04* step010_04 = new CCommDbTest010_04;
-	CleanupStack::PushL(step010_04);
-	step010_04->iSuite = iSuite;				
-	if ( doTestStepWithHeapFailureL( *step010_04, KErrNotFound) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step010_04);
-
-
-
-	return iTestStepResult;	
-}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_010_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-// Copyright (c) 2001-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:
-// step_010_01.cpp
-// This is the header file for CommDb test 010.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_010_XX_H__)
-#define __STEP_010_XX_H__
-
-
-//
-//	Test step 010.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest010_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest010_01();
-	~CCommDbTest010_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-
-private:
-
-};
-
-//
-//	Test step 010.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest010_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest010_02();
-	~CCommDbTest010_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 010.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest010_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest010_03();
-	~CCommDbTest010_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 010.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest010_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest010_04();
-	~CCommDbTest010_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 010.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest010_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest010_05();
-	~CCommDbTest010_05();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-#endif //(__STEP_010_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_011_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,364 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 011.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_011_xx.h"
-
-
-
-//
-//	Test step 011.001
-//
-
-// constructor
-CCommDbTest011_01::CCommDbTest011_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_011_01");
-	}
-
-// destructor
-CCommDbTest011_01::~CCommDbTest011_01()
-	{
-	}
-
-
-TVerdict CCommDbTest011_01::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-#define HIDDEN_RECORD_TEST_VALUE	_L("This is a hidden record")
-
-TInt CCommDbTest011_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id;
-
-	//Create a hidden record in the database
-	//NB. This step will panic if the bale used is empty, so use a
-	//populated table to simplify things.
-	
-	//Try to insert a record
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-
-	//Insert some text
-	iTheView->WriteTextL( TPtrC(COMMDB_NAME), HIDDEN_RECORD_TEST_VALUE ) ;
-
-	//Must write to these columns as they cannot hold null values
-	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), _L("PPP") );
-	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-
-	//Store the record as hidden
-	CDBLEAVE( iTheView->PutRecordChanges(ETrue), KErrNone );
-
-	//Now search through the table looking for this record
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	do {
-
-		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-		if ( !value.Compare(HIDDEN_RECORD_TEST_VALUE) )
-			{
-				//Found the record, even though it is hidden
-				ret = KErrGeneral;
-				break;
-			}
-		//Move on to the next record
-		TRAPD(r, ret = iTheView->GotoNextRecord() );
-		if( r!= KErrNone )
-			User::Leave( r );
-		} while (ret == KErrNone ) ;
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest011_01::doTestStepL( )
-	{
-	Log(_L("Step 011.01 called "));
-
-		
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
- //
- //	Test step 011.02
- //
- 
- // constructor
-CCommDbTest011_02::CCommDbTest011_02()
- 	{
- 	// store the name of this test case
-	iTestStepName = _L("step_011_02");
- 	}
- 
- // destructor
-CCommDbTest011_02::~CCommDbTest011_02()
- 	{
- 	}
- 
-TVerdict CCommDbTest011_02::doTestStepPreambleL()
- 	{	
- 	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
- 	return EPass;
- 	}
- 
- 
-TInt CCommDbTest011_02::executeStepL()
- 	{
- 	TInt ret=KErrGeneral;
- 	TUint32 id;
-
-	//Create a hidden record in the database, try to find it,
-	//make a call to ShowHiddenRecords the try to find the record again
-	
-	//Try to insert a test record
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-
-	//Insert some text
-	iTheView->WriteTextL( TPtrC(COMMDB_NAME), HIDDEN_RECORD_TEST_VALUE );
-
-	//Must write to these columns as they cannot hold null values
-	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), _L("PPP") );
-	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),EFalse);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-
-	//Store the record as hidden
-	CDBLEAVE( iTheView->PutRecordChanges(ETrue), KErrNone );
-
-	//Now search through the table looking for this record
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-
-	//This first search through the table should not find the hidden record
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	do {
-
-		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-		if ( !value.Compare(HIDDEN_RECORD_TEST_VALUE) )
-			{
-				//Found the record
-				ret = KErrGeneral;
-				break;
-			}
-		//Move on to the next record
-		TRAPD(r, ret= iTheView->GotoNextRecord() );
-		if ( r!=KErrNone )
-			User::Leave( r );
-
-		}while(ret == KErrNone );
-	
-	if ( ret == KErrNotFound )
-		{
-
-		//Search again, but this this time we'll show the hidden records
-		delete iTheView;
-		iTheView = 0;
-
-		iTheDb->ShowHiddenRecords();
-		iTheView=iTheDb->OpenTableLC( TPtrC(DIAL_OUT_ISP) );
-		CleanupStack::Pop();
-
-		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-		TBuf<KCommsDbSvrMaxFieldLength> value;
-
-		do {
-			iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-			if ( !value.Compare(HIDDEN_RECORD_TEST_VALUE) )
-				{
-					//Found the record
-					ret = KErrNone;
-
-					//Change the record not to be hidden for the test 11_03
-					CDBLEAVE( iTheView->UpdateRecord(), KErrNone );
-					CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-					break;
-				}
-			//Move on to the next record
-			TRAPD(r, ret = iTheView->GotoNextRecord() )
-			if ( r!=KErrNone )
-				User::Leave( r );
-
-			}while( ret == KErrNone );
-		}
-
-	return ret;
-	}
-
-TVerdict CCommDbTest011_02::doTestStepL( )
-	{
-	Log(_L("Step 011.02 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 011.03
-//
-
-// constructor
-CCommDbTest011_03::CCommDbTest011_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_011_03");
-	}
-
-// destructor
-CCommDbTest011_03::~CCommDbTest011_03()
-	{
-	}
-
-TVerdict CCommDbTest011_03::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest011_03::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Check if a record from test 11_02 is readable again
-	
-	//Now search through the table looking for this record
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-
-	//This first search through the table should not find the hidden record
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	do {
-
-		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-		if ( !value.Compare(HIDDEN_RECORD_TEST_VALUE) )
-			{
-				//Found the record
-				ret = KErrNone;
-				break;
-			}
-		//Move on to the next record
-		TRAPD(r, ret= iTheView->GotoNextRecord() );
-		if ( r!=KErrNone )
-			User::Leave( r );
-
-		}while(ret == KErrNone );
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest011_03::doTestStepL( )
-	{
-	Log(_L("Step 011.03 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 011.04
-//
-
-// constructor
-CCommDbTest011_04::CCommDbTest011_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_011_04");
-	}
-
-// destructor
-CCommDbTest011_04::~CCommDbTest011_04()
-	{
-	}
-
-TVerdict CCommDbTest011_04::doTestStepL( )
-	{
-	Log(_L("Step 011.04 called "));
-
-	iTestStepResult = EPass;
-
-	// Heap test for 011.01
-
-	CCommDbTest011_01* step011_01 = new CCommDbTest011_01;
-	CleanupStack::PushL(step011_01);
-	step011_01->iSuite = iSuite;				
-	if ( doTestStepWithHeapFailureL( *step011_01, KErrNotFound) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step011_01);
-
-
-	// Heap test for 011.02
-	CCommDbTest011_02* step011_02 = new CCommDbTest011_02;
-	CleanupStack::PushL(step011_02);
-	step011_02->iSuite = iSuite;				
-	if ( doTestStepWithHeapFailureL( *step011_02, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step011_02);
-
-	// Heap test for 011.03
-	CCommDbTest011_03* step011_03 = new CCommDbTest011_03;
-	CleanupStack::PushL(step011_03);
-	step011_03->iSuite = iSuite;				
-	if ( doTestStepWithHeapFailureL( *step011_03, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step011_03);
-
-	return iTestStepResult;	
-
-}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_011_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-// Copyright (c) 2001-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:
-// step_011_01.h
-// This is the header file for CommDb test 011.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_011_XX_H__)
-#define __STEP_011_XX_H__
-
-
-//
-//	Test step 011.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest011_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest011_01();
-	~CCommDbTest011_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 011.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest011_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest011_02();
-	~CCommDbTest011_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 011.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest011_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest011_03();
-	~CCommDbTest011_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 011.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest011_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest011_04();
-	~CCommDbTest011_04();
-
-	enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-#endif //(__STEP_011_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_012_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,531 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 012.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_012_xx.h"
-
-
-
-//
-//	Test step 012.001
-//
-
-// constructor
-CCommDbTest012_01::CCommDbTest012_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_012_01");
-	}
-
-// destructor
-CCommDbTest012_01::~CCommDbTest012_01()
-	{
-	}
-
-
-TVerdict CCommDbTest012_01::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-TInt CCommDbTest012_01::executeStepL()
-	{
-	TInt ret=KErrNone;
-
-	//This query should select 3 records
-	iTheView = iTheDb->OpenViewLC( TPtrC(DIAL_IN_ISP),_L("select * from DialInISP where Ifname='PPP'") );
-	CleanupStack::Pop();
-
-	//Now check that the records are what we expect
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-
-	//Read the value from the field and compare it to the expected value
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( value.Compare(_L("Record #1")) )
-		{
-		ret = KErrGeneral;
-		}
-
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( value.Compare(_L("Record #2")) )
-		{
-		ret = KErrGeneral;
-		}
-
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( value.Compare(_L("Record #5 (Read Only)")) )
-		{
-		ret = KErrGeneral;
-		}
-
-	CDBLEAVE( ret = iTheView->GotoNextRecord(), KErrNotFound);
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest012_01::doTestStepL( )
-	{
-	Log(_L("Step 012.01 called "));
-
-	
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 012.02
-//
-
-// constructor
-CCommDbTest012_02::CCommDbTest012_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_012_02");
-
-	}
-
-// destructor
-CCommDbTest012_02::~CCommDbTest012_02()
-	{
-	}
-
-TVerdict CCommDbTest012_02::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-TInt CCommDbTest012_02::executeStepL()
-	{
-	TInt ret=KErrNone;
-
-	//This query should select 0 records
-	iTheView = iTheDb->OpenViewLC( TPtrC(DIAL_IN_ISP),_L("select * from DialInISP where Ifname='XXX'") );
-	CleanupStack::Pop();
-
-	CDBLEAVE(ret = iTheView->GotoFirstRecord(), KErrNotFound );
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest012_02::doTestStepL( )
-	{
-	Log(_L("Step 012.02 called "));
-
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 012.03
-//
-
-// constructor
-CCommDbTest012_03::CCommDbTest012_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_012_03");
-
-	}
-
-// destructor
-CCommDbTest012_03::~CCommDbTest012_03()
-	{
-	}
-
-
-TVerdict CCommDbTest012_03::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest012_03::executeStepL()
-	{
-	TInt ret=KErrNone;
-
-	//This query should select 1 record
-	iTheView = iTheDb->OpenViewLC( TPtrC(DIAL_IN_ISP),_L("select * from DialInISP where Name='Record #3'") );
-	CleanupStack::Pop();
-
-	//Read the value from the field and compare it to the expected value
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( value.Compare(_L("Record #3")) )
-		{
-		ret = KErrGeneral;
-		}
-
-	//Check that there was only one record
-	CDBLEAVE( ret = iTheView->GotoNextRecord(), KErrNotFound );
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest012_03::doTestStepL( )
-	{
-	Log(_L("Step 012.03 called "));
-
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-	
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 012.04
-//
-
-// constructor
-CCommDbTest012_04::CCommDbTest012_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_012_04");
-	// default to no local objects allocated
-	iLocalObjects = EFalse;
-	}
-
-// destructor
-CCommDbTest012_04::~CCommDbTest012_04()
-	{
-	}
-
-TVerdict CCommDbTest012_04::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-TInt CCommDbTest012_04::executeStepL()
-	{
-	TInt ret=KErrNone;
-
-	//This query should select al1 records
-	iTheView = iTheDb->OpenViewLC( TPtrC(DIAL_IN_ISP),_L("select * from DialInISP") );
-	CleanupStack::Pop();
-
-	//For each expected record read the value from the field and compare it to the expected value
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( value.Compare(_L("Record #1")) )
-		{
-		ret = KErrGeneral;
-		}
-
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( value.Compare(_L("Record #2")) )
-		{
-		ret = KErrGeneral;
-		}
-
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( value.Compare(_L("Record #3")) )
-		{
-		ret = KErrGeneral;
-		}
-
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( value.Compare(_L("Record #4")) )
-		{
-		ret = KErrGeneral;
-		}
-
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( value.Compare(_L("Record #5")) )
-		{
-		ret = KErrGeneral;
-		}
-	//Check there no more records
-
-	CDBLEAVE( ret = iTheView->GotoNextRecord(), KErrNotFound );
-		
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest012_04::doTestStepL( )
-	{
-	Log(_L("Step 012.04 called "));
-
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 012.05
-//
-
-// constructor
-CCommDbTest012_05::CCommDbTest012_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_012_05");
-	// default to no local objects allocated
-	iLocalObjects = EFalse;
-	}
-
-// destructor
-CCommDbTest012_05::~CCommDbTest012_05()
-	{
-	}
-
-TVerdict CCommDbTest012_05::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest012_05::myOpenViewL()
-{
-	//This query contains an erroneous query
-//	TRAPD( r, iTheView = iTheDb->OpenViewLC( TPtrC(DIAL_IN_ISP),_L("select * from DialInISP where") ) );
-	 iTheView = iTheDb->OpenViewLC( TPtrC(DIAL_IN_ISP),_L("select * from DialInISP where") ) ;
-
-	
-	return 0;
-}
-
-
-TInt CCommDbTest012_05::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	TRAPD(r, myOpenViewL() );
-
-	if ( r!=KErrNone )
-		ret = r;
-
-	
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest012_05::doTestStepL( )
-	{
-	Log(_L("Step 012.05 called "));
-
-	
-	if ( executeStepL() == KErrArgument )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 012.06
-//
-
-// constructor
-CCommDbTest012_06::CCommDbTest012_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_012_06");
-	}
-
-// destructor
-CCommDbTest012_06::~CCommDbTest012_06()
-	{
-	}
-
-TVerdict CCommDbTest012_06::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest012_06::myOpenViewL()
-{
-	//This query contains an erroneous query
-	iTheView = iTheDb->OpenViewLC( TPtrC(DIAL_IN_ISP),_L("") );
-
-	
-	return 0;
-}
-
-
-TInt CCommDbTest012_06::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	TRAPD(r, myOpenViewL() );
-
-	if (r!=KErrNone )
-		ret = r;
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest012_06::doTestStepL( )
-	{
-	Log(_L("Step 012.06 called "));
-	
-	if ( executeStepL() == KErrArgument )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 012.07
-//
-
-// constructor
-CCommDbTest012_07::CCommDbTest012_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_012_07");
-	}
-
-// destructor
-CCommDbTest012_07::~CCommDbTest012_07()
-	{
-	}
-
-TVerdict CCommDbTest012_07::doTestStepL( )
-	{
-	Log(_L("Step 012.07 called "));
-
-	iTestStepResult = EPass;
-
-/*	// Heap test for 012.01
-
-#if 1
-	CCommDbTest012_01* step012_01 = new CCommDbTest012_01;
-	CleanupStack::PushL(step012_01);
-	step012_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step012_01, KErrNotFound);
-	if ( step012_01->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step012_01);
-#endif
-
-	// Heap test for 012.02
-
-	CCommDbTest012_02* step012_02 = new CCommDbTest012_02;
-	CleanupStack::PushL(step012_02);
-	step012_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step012_02, KErrNotFound);
-	if ( step012_02->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step012_02);
-
-*/	// Heap test for 012.03
-
-	CCommDbTest012_03* step012_03 = new CCommDbTest012_03;
-	CleanupStack::PushL(step012_03);
-	step012_03->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step012_03, KErrNotFound);
-	if ( step012_03->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step012_03);
-
-	// Heap test for 012.04
-
-	CCommDbTest012_04* step012_04 = new CCommDbTest012_04;
-	CleanupStack::PushL(step012_04);
-	step012_04->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step012_04, KErrNotFound);
-	if( step012_04->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step012_04);
-
-	// Heap test for 012.05
-
-	CCommDbTest012_05* step012_05 = new CCommDbTest012_05;
-	CleanupStack::PushL(step012_05);
-	step012_05->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step012_05, KErrArgument);
-	if( step012_05->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step012_05);
-
-
-	// Heap test for 012.06
-
-	CCommDbTest012_06* step012_06 = new CCommDbTest012_06;
-	CleanupStack::PushL(step012_06);
-	step012_06->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step012_06, KErrArgument);
-	if( step012_06->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step012_06);
-
-	return iTestStepResult;	
-
-}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_012_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-// Copyright (c) 2001-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:
-// step_012_01.h
-// This is the header file for CommDb test 012.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_012_XX_H__)
-#define __STEP_012_XX_H__
-
-
-//
-//	Test step 012.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest012_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest012_01();
-	~CCommDbTest012_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-
-private:
-
-};
-
-//
-//	Test step 012.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest012_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest012_02();
-	~CCommDbTest012_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 012.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest012_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest012_03();
-	~CCommDbTest012_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 012.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest012_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest012_04();
-	~CCommDbTest012_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 012.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest012_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest012_05();
-	~CCommDbTest012_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TInt myOpenViewL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 012.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest012_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest012_06();
-	~CCommDbTest012_06();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TInt myOpenViewL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 012.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest012_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest012_07();
-	~CCommDbTest012_07();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-#endif //(__STEP_012_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_013_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,314 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 013.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_013_xx.h"
-
-
-
-//
-//	Test step 013.001
-//
-
-// constructor
-CCommDbTest013_01::CCommDbTest013_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_013_01");
-	}
-
-// destructor
-CCommDbTest013_01::~CCommDbTest013_01()
-	{
-	}
-
-
-TVerdict CCommDbTest013_01::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_IN_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest013_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-
-	//Update an existing record
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	
-	//Check the value is what we expect 
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	TEST( !value.Compare(_L("Record #1")) );
-
-	//Update the value in the field
-	TRAPD(r, iTheView->UpdateRecord() );
-	iTheView->WriteTextL( TPtrC(COMMDB_NAME), _L("Updated Record #1") );
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-
-	delete iTheView;
-	iTheView = 0;
-
-	//Open the view again and check for the updated value
-	iTheView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP) );
-	CleanupStack::Pop();
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	
-	if ( !value.Compare(_L("Updated Record #1")) )
-		{
-		//Found the record, even though it is hidden
-		ret = KErrNone;
-		}
-
-	if ( r!= KErrNone )
-		{
-		ret = r;
-		}
-
-
-	if ( iLocalObjects )
-		popAndDestroyDatabaseObjects();
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest013_01::doTestStepL( )
-	{
-	Log(_L("Step 013.01 called "));
-
-	
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 013.02
-//
-
-// constructor
-CCommDbTest013_02::CCommDbTest013_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_013_02");
-	}
-
-// destructor
-CCommDbTest013_02::~CCommDbTest013_02()
-	{
-	}
-
-
-TVerdict CCommDbTest013_02::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest013_02::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	//This view must contain zero records
-	//NB. This test will crash the server
-
-	iTheView = iTheDb->OpenViewLC(TPtrC(DIAL_IN_ISP), _L("Select * from DialInISP where IfNetworks='xxx'") );
-	CleanupStack::Pop();
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNotFound );
-	
-	TRAPD(r, ret = iTheView->UpdateRecord() );
-
-	if ( r!= KErrNone )
-		{
-		ret = r;
-		}
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest013_02::doTestStepL( )
-	{
-	TRAPD(ret, executeStepL());
-	if( ret == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 013.03
-//
-
-// constructor
-CCommDbTest013_03::CCommDbTest013_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_013_03");
-	}
-
-// destructor
-CCommDbTest013_03::~CCommDbTest013_03()
-	{
-	}
-
-TVerdict CCommDbTest013_03::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_IN_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest013_03::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id;
-
-	//Try to insert a read only record
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-
-	//Insert some text
-	iTheView->WriteTextL( TPtrC(COMMDB_NAME), _L("Example record name") ) ;
-
-	//Must write to these columns as they cannot hold null values
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME), _L("PPP") );
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-
-	//Store the record as hidden
-	CDBLEAVE( iTheView->PutRecordChanges(EFalse, ETrue), KErrNone );
-
-	delete iTheView;
-	iTheView = 0;
-
-    iTheView = iTheDb->OpenViewMatchingTextLC(TPtrC(DIAL_IN_ISP), TPtrC(COMMDB_NAME),  _L("Example record name") );
-	CleanupStack::Pop();
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	TRAPD(r, ret = iTheView->UpdateRecord() );
-
-	delete iTheView;
-	iTheView = 0;
-
-
-	if ( r!= KErrNone )
-		{
-		ret = r;
-		}
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest013_03::doTestStepL( )
-	{
-	Log(_L("Step 013.03 called "));
-
-	if ( executeStepL() == KErrAccessDenied )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-
-
-
-	
-//
-//	Test step 013.04
-//
-
-// constructor
-CCommDbTest013_04::CCommDbTest013_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_013_04");
-	}
-
-// destructor
-CCommDbTest013_04::~CCommDbTest013_04()
-	{
-	}
-
-TVerdict CCommDbTest013_04::doTestStepL( )
-	{
-	Log(_L("Step 013.04 called "));
-
-	iTestStepResult = EPass;
-
-	// Heap test for 013.01
-
-	CCommDbTest013_01* step013_01 = new CCommDbTest013_01;
-	CleanupStack::PushL(step013_01);
-	step013_01->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step013_01, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step013_01);
-
-	// Heap test for 013.02
-	// SQl interface is deprecated from 9.1
-
-	CCommDbTest013_02* step013_02 = new CCommDbTest013_02;
-	CleanupStack::PushL(step013_02);
-	step013_02->iSuite = iSuite;				
-	if ( doTestStepWithHeapFailureL( *step013_02, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step013_02);
-
-	// Heap test for 013.03
-
-	CCommDbTest013_03* step013_03 = new CCommDbTest013_03;
-	CleanupStack::PushL(step013_03);
-	step013_03->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step013_03, KErrAccessDenied);
-	if ( step013_03->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step013_03);
-
-	return iTestStepResult;	
-
-}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_013_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-// Copyright (c) 2001-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:
-// step_013_01.h
-// This is the header file for CommDb test 013.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_013_XX_H__)
-#define __STEP_013_XX_H__
-
-
-//
-//	Test step 013.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest013_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest013_01();
-	~CCommDbTest013_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 013.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest013_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest013_02();
-	~CCommDbTest013_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 013.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest013_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest013_03();
-	~CCommDbTest013_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 013.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest013_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest013_04();
-	~CCommDbTest013_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	
-private:
-
-};
-
-
-#endif //(__STEP_013_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_014_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,313 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 014.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_014_xx.h"
-
-
-
-//
-//	Test step 014.01
-//
-
-// constructor
-CCommDbTest014_01::CCommDbTest014_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_014_01");
-	}
-
-// destructor
-CCommDbTest014_01::~CCommDbTest014_01()
-	{
-	}
-
-TVerdict CCommDbTest014_01::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(MODEM_BEARER));
-	return EPass;
-	}
-
-
-TInt CCommDbTest014_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id;
-
-	//Create a record and cancel it
-	//NB. This test assumes the Modem table will be empty
-
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-	
-	_LIT(KModem,"US Robotics Sportster");
-	_LIT(KTsy,"HAYES");
-	_LIT8(KModemInitString,"AT&F1");
-	_LIT8(KModemFaxInitString,"AT&d2");
-	//Write some sample data into the table
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KModem);
-	iTheView->WriteTextL(TPtrC(MODEM_NIF_NAME),_L("PPP"));
-	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
-	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
-	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
-	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
-	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
-	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
-	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
-	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
-	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
-	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
-
-	//Now cancel the insert and close the view
-	iTheView->CancelRecordChanges();
-	
-	delete iTheView;
-	iTheView = 0;
-
-	//Open a view and check record was not written into the database
-	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(MODEM_BEARER), TPtrC(COMMDB_NAME), KModem);
-	CleanupStack::Pop();
-
-	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNotFound );
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest014_01::doTestStepL( )
-	{
-	Log(_L("Step 014.01 called "));
-
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 014.02
-//
-
-// constructor
-CCommDbTest014_02::CCommDbTest014_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_014_02");
-	}
-
-// destructor
-CCommDbTest014_02::~CCommDbTest014_02()
-	{
-	}
-
-TVerdict CCommDbTest014_02::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(MODEM_BEARER));
-	return EPass;
-	}
-
-
-TInt CCommDbTest014_02::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id;
-
-	
-	//Insert a new record, try to update it and cancel the update
-	//NB. This test assumes the Modem table will be empty
-
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-	
-	_LIT(KModem,"US Robotics Sportster");
-	_LIT(KTsy,"HAYES");
-	_LIT8(KModemInitString,"AT&F1");
-	_LIT8(KModemFaxInitString,"AT&d2");
-	//Write some sample data into the table
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KModem);
-	iTheView->WriteTextL(TPtrC(MODEM_NIF_NAME),_L("PPP"));
-	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
-	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
-	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
-	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
-	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
-	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
-	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
-	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
-	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
-	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
-
-	//Insert the record and destroy the view
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-	
-	delete iTheView;
-	iTheView = 0;
-
-	//Open a view and make a change to the record just written
-	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(MODEM_BEARER), TPtrC(COMMDB_NAME), KModem);
-	CleanupStack::Pop();
-
-	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
-	CDBLEAVE( iTheView->UpdateRecord(), KErrNone );
-	_LIT(KModem2,"Another US Robotics Sportster");
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME), KModem2 );
-	
-	//Cancel the changes made and destroy the view
-	iTheView->CancelRecordChanges();
-
-	delete iTheView;
-	iTheView = 0;
-
-	//Open a view to check that the record was not modified
-	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(MODEM_BEARER), TPtrC(COMMDB_NAME), KModem);
-	CleanupStack::Pop();
-
-	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest014_02::doTestStepL( )
-	{
-	Log(_L("Step 014.02 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 014.03
-//
-
-// constructor
-CCommDbTest014_03::CCommDbTest014_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_014_03");
-	}
-
-// destructor
-CCommDbTest014_03::~CCommDbTest014_03()
-	{
-	}
-
-TVerdict CCommDbTest014_03::doTestStepL( )
-	{
-	Log(_L("Step 014.03 called "));
-
-	iTestStepResult = EPass;
-
-		// Heap test for 014.01
-
-	CCommDbTest014_01* step014_01 = new CCommDbTest014_01;
-	CleanupStack::PushL(step014_01);
-	step014_01->iSuite = iSuite;				
-	doTestStepWithHeapFailureL( *step014_01, KErrNotFound);
-	if ( step014_01->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step014_01);
-
-		// Heap test for 014.02
-
-	CCommDbTest014_02* step014_02 = new CCommDbTest014_02;
-	CleanupStack::PushL(step014_02);
-	step014_02->iSuite = iSuite;				
-	doTestStepWithHeapFailureL( *step014_02, KErrNone);
-	if ( step014_02->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step014_02);
-
-	return iTestStepResult;	
-
-}
-
-//
-//	Test step 014.04
-//
-
-// constructor
-CCommDbTest014_04::CCommDbTest014_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_014_04");
-	}
-
-// destructor
-CCommDbTest014_04::~CCommDbTest014_04()
-	{
-	}
-
-TVerdict CCommDbTest014_04::doTestStepL( )
-	{
-	Log(_L("Step 014_04 called "));
-
-	iTestStepResult = EPass;
-
-__UHEAP_MARK;
- 
-
-    CCommsDatabase* db = CCommsDatabase::NewL( );
-    CleanupStack::PushL( db );
-   
-    CCommsDbTableView* v =
-        db->OpenTableLC( TPtrC(WAP_ACCESS_POINT ) );
-
-    TUint32 dummyUid( 0 );
-
-
-    TInt err = v->InsertRecord( dummyUid );
-    User::LeaveIfError( err );
-    v->CancelRecordChanges();
-
-   
-    CleanupStack::PopAndDestroy( v );
-    CleanupStack::PopAndDestroy( db );
-
-__UHEAP_MARKEND;
-
-	return iTestStepResult;	
-
-}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_014_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-// Copyright (c) 2001-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:
-// step_014_01.h
-// This is the header file for CommDb test 014.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_014_XX_H__)
-#define __STEP_014_XX_H__
-
-
-//
-//	Test step 014.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest014_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest014_01();
-	~CCommDbTest014_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 014.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest014_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest014_02();
-	~CCommDbTest014_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 014.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest014_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest014_03();
-	~CCommDbTest014_03();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-//
-//	Test step 014.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest014_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest014_04();
-	~CCommDbTest014_04();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-#endif //(__STEP_014_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_015_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1376 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 015.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_015_xx.h"
-
-
-
-//
-//	Test step 015.01
-//
-
-// constructor
-CCommDbTest015_01::CCommDbTest015_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_015_01");
-	}
-
-// destructor
-CCommDbTest015_01::~CCommDbTest015_01()
-	{
-	}
-
-
-TVerdict CCommDbTest015_01::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-TInt CCommDbTest015_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Check the inTransaction flag
-
-	TRAPD(r, iTheDb->BeginTransaction() );
-
-	ret  = !(iTheDb->InTransaction() );
-
-	if ( r != KErrNone )
-		{
-		ret = r;
-		}
-
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest015_01::doTestStepL( )
-	{
-	Log(_L("Step 015.01 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 015.02
-//
-
-// constructor
-CCommDbTest015_02::CCommDbTest015_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_015_02");
-	}
-
-// destructor
-CCommDbTest015_02::~CCommDbTest015_02()
-	{
-	}
-
-TVerdict CCommDbTest015_02::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(MODEM_BEARER));
-	return EPass;
-	}
-	
-
-
-TInt CCommDbTest015_02::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	TUint32 id;
-	TBool beforeValue=EFalse, afterValue=EFalse;
-
-	
-	//Check that the write lock flag is set when the
-	//database is written to.
-	//Take a copy of the flag before we insert a record
-	TRAPD(r, beforeValue = iTheDb->IsDatabaseWriteLockedL() );
-
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-	
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-
-	//Take a copy after the insert
-	afterValue = iTheDb->IsDatabaseWriteLockedL();
-
-	iTheView->CancelRecordChanges();
-
-	//Now get the flag value after the record has been written
-
-	if ( r == KErrNone )
-		{
-		if ( !beforeValue  && afterValue  )
-			ret = KErrNone;
-		}
-		else
-		{	
-			//return the trap value
-			ret = r;
-		}
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest015_02::doTestStepL( )
-	{
-	Log(_L("Step 015.02 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 015.03
-//
-
-// constructor
-CCommDbTest015_03::CCommDbTest015_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_015_03");
-	// default to no local objects allocated
-	}
-
-// destructor
-CCommDbTest015_03::~CCommDbTest015_03()
-	{
-	}
-
-TVerdict CCommDbTest015_03::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(MODEM_BEARER));
-	return EPass;
-	}
-
-
-TInt CCommDbTest015_03::executeStepL()
-	{
-	TUint32 id;
-
-	//Commit a record and check for correct state of flags
-
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-
-	_LIT(KName,"CCommDbTest015_03");
-	_LIT(KTsy,"HAYES");
-	_LIT8(KModemInitString,"AT&F1");
-	_LIT8(KModemFaxInitString,"AT&d2");
-	//Write some sample data into the table
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KName);
-	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
-	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
-	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
-	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
-	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
-	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
-	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
-	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
-	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
-	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
-
-	CDBLEAVE ( iTheView->PutRecordChanges(), KErrNone );
-	User::LeaveIfError(iTheDb->CommitTransaction());
-
-	delete iTheView;
-	iTheView=NULL;
-
-	//Create a new view that should have the record in it
-	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(MODEM_BEARER), TPtrC(COMMDB_NAME), KName);
-	CleanupStack::Pop();
-
-	User::LeaveIfError(iTheView->GotoFirstRecord());	//Will leave if first record isn't there
-
-	if (! iTheDb->IsDatabaseWriteLockedL() && ! iTheDb->InTransaction() )
-			return KErrNone;
-
-	return KErrGeneral;
-	}
-
-
-
-TVerdict CCommDbTest015_03::doTestStepL( )
-	{
-	Log(_L("Step 015.03 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-
-
-//
-//	Test step 015.04
-//
-
-// constructor
-CCommDbTest015_04::CCommDbTest015_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_015_04");
-	// default to no local objects allocated
-	}
-
-// destructor
-CCommDbTest015_04::~CCommDbTest015_04()
-	{
-	}
-
-TVerdict CCommDbTest015_04::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(MODEM_BEARER));
-	return EPass;
-	}
-
-
-TInt CCommDbTest015_04::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id;
-
-	
-	//Check that we can rollback a transaction
-	//NB Test assumes that the table is empty
-
-
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-
-	_LIT(KName,"CCommDbTest015_04");
-	_LIT(KTsy,"HAYES");
-	_LIT8(KModemInitString,"AT&F1");
-	_LIT8(KModemFaxInitString,"AT&d2");
-	//Write some sample data into the table
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KName);
-	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
-	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
-	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
-	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
-	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
-	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
-	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
-	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
-	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
-	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-
-	//Rollback the record we've just written
-	TRAPD(r, iTheDb->RollbackTransaction() );
-
-	//Get rid of our view
-	delete iTheView;
-	iTheView=0;
-
-	//Create a new view that should have the record in it
-	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(MODEM_BEARER), TPtrC(COMMDB_NAME), KName);
-
-	CleanupStack::Pop();
-
-	ret = iTheView->GotoFirstRecord();
-
-	if ( r == KErrNone )
-		{
-		if ( ret == KErrNotFound )
-			ret = KErrNone;
-		else
-			ret = KErrGeneral;
-		}
-	else
-		{	
-		//Trap occoured, so return that value instead
-		ret = r;
-		}
-
-	
-	return ret;
-	}
-
-TVerdict CCommDbTest015_04::doTestStepPostambleL()
-	{
-	
-	//Get rid of our view
-	if(iTheView)
-		{
-		delete iTheView;
-		}
-	iTheView=0;
-
-	_LIT(KName,"CCommDbTest015_04");
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(MODEM_BEARER), TPtrC(COMMDB_NAME), KName);
-	CleanupStack::Pop();
-
-	if(iTheView->GotoFirstRecord() == KErrNone)
-		{
-		iTheView->DeleteRecord();
-		}
-
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-TVerdict CCommDbTest015_04::doTestStepL( )
-	{
-	Log(_L("Step 015.04 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 015.05
-//
-
-// constructor
-CCommDbTest015_05::CCommDbTest015_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_015_05");
-	}
-
-// destructor
-CCommDbTest015_05::~CCommDbTest015_05()
-	{
-	}
-
-
-TVerdict CCommDbTest015_05::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(MODEM_BEARER));
-	return EPass;
-	}
-
-
-TInt CCommDbTest015_05::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id;
-
-	//Try to rollback without a prior call to BeginTransaction()
-
-	//
-	// NB. This test will cause the DBMS server to Panic!
-	//
-
-
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-
-	_LIT(KName,"CCommDbTest015_05");
-	_LIT(KTsy,"HAYES");
-	_LIT8(KModemInitString,"AT&F1");
-	_LIT8(KModemFaxInitString,"AT&d2");
-	//Write some sample data into the table
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KName);
-	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
-	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
-	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
-	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
-	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
-	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
-	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
-	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
-	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
-	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
-
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-
-	TRAPD(r, iTheDb->RollbackTransaction() );
-
-	delete iTheView ;
-	iTheView=0;
-
-	//Create a new view that would have the record in it
-	iTheView = iTheDb->OpenViewLC(TPtrC(MODEM_BEARER), _L("Select * from Modem where Name='CCommDbTest015_05'") );
-	CleanupStack::Pop();
-
-
-	ret = iTheView->GotoFirstRecord();
-
-	if ( r == KErrNone )
-		{
-		if ( ret == KErrNotFound  )
-			ret = KErrNone;
-		else
-			ret = KErrGeneral;
-		}
-	else
-		{	
-		//Trap occoured, so return that value instead
-		ret = r;
-		}
-
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest015_05::doTestStepPostambleL()
-	{
-	//Get rid of our view
-	if(iTheView)
-		{
-		delete iTheView;
-		}
-	iTheView=0;
-
-	_LIT(KName,"CCommDbTest015_05");
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(MODEM_BEARER), TPtrC(COMMDB_NAME), KName);
-	CleanupStack::Pop();
-
-	if(iTheView->GotoFirstRecord() == KErrNone)
-		{
-		iTheView->DeleteRecord();
-		}
-
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-
-TVerdict CCommDbTest015_05::doTestStepL( )
-	{
-	//Log(_L("Step 015.05 called "));
-
-	TRAPD(leaveCode, executeStepL());
-	if (leaveCode != KErrNotSupported) // SQL views no longer supported
-		{
-		iTestStepResult = EFail;
-		}
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 015.06
-//
-
-// constructor
-CCommDbTest015_06::CCommDbTest015_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_015_06");
-	}
-
-// destructor
-CCommDbTest015_06::~CCommDbTest015_06()
-	{
-	}
-
-TVerdict CCommDbTest015_06::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(MODEM_BEARER));
-	return EPass;
-	}
-
-
-TInt CCommDbTest015_06::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id;
-
-	//Try to commit without a prior call to BeginTransaction()
-
-	//
-	// NB. This test will cause the DBMS server to Panic!
-	//
-
-
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-
-	_LIT(KName,"CCommDbTest015_06");
-	_LIT(KTsy,"HAYES");
-	_LIT8(KModemInitString,"AT&F1");
-	_LIT8(KModemFaxInitString,"AT&d2");
-	//Write some sample data into the table
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KName);
-	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
-	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
-	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
-	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
-	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
-	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
-	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
-	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
-	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
-	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
-
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-	//This will cause a panic
-	TRAPD(r, iTheDb->CommitTransaction() );
-
-	delete  iTheView ;
-	iTheView=0;
-
-	//Create a new view that would have the record in it
-	iTheView = iTheDb->OpenViewLC(TPtrC(MODEM_BEARER), _L("Select * from Modem where Name='CCommDbTest015_06'") );
-	CleanupStack::Pop();
-
-	ret = iTheView->GotoFirstRecord();
-
-	if ( r == KErrNone )
-		{
-		if ( ret == KErrNotFound  )
-			ret = KErrNone;
-		else
-			ret = KErrGeneral;
-		}
-	else
-		{	
-		//Trap occoured, so return that value instead
-		ret = r;
-		}
-
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest015_06::doTestStepPostambleL()
-	{
-	//Get rid of our view
-	if(iTheView)
-		{
-		delete iTheView;
-		}
-	iTheView=0;
-
-	_LIT(KName,"CCommDbTest015_06");
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(MODEM_BEARER), TPtrC(COMMDB_NAME), KName);
-	CleanupStack::Pop();
-
-	if(iTheView->GotoFirstRecord() == KErrNone)
-		{
-		iTheView->DeleteRecord();
-		}
-
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-
-TVerdict CCommDbTest015_06::doTestStepL( )
-	{
-	//Log(_L("Step 015.06 called "));
-
-	TRAPD(leaveCode, executeStepL());
-	if (leaveCode != KErrNotSupported) // SQL views no longer supported
-		{
-		iTestStepResult = EFail;
-		}
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 015.07
-//
-
-// constructor
-CCommDbTest015_07::CCommDbTest015_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_015_07");
-	}
-
-// destructor
-CCommDbTest015_07::~CCommDbTest015_07()
-	{
-	}
-
-
-TVerdict CCommDbTest015_07::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(MODEM_BEARER));
-	return EPass;
-	}
-
-
-TInt CCommDbTest015_07::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id;
-
-
-	//Close the database while inside a transaction
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-
-	_LIT(KName,"CCommDbTest015_07");
-	_LIT(KTsy,"HAYES");
-	_LIT8(KModemInitString,"AT&F1");
-	_LIT8(KModemFaxInitString,"AT&d2");
-	//Write some sample data into the table
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KName);
-	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
-	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
-	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
-	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
-	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
-	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
-	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
-	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
-	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
-	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
-
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-	
-	delete  iTheView ;
-	iTheView=0;
-
-	//Close the DB
-	delete iTheDb;
-	iTheDb = 0;
-
-	//NB Only get here if we didnt trap, so it must have passed
-	ret = KErrNone;
-
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest015_07::doTestStepL( )
-	{
-	Log(_L("Step 015.07 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 015.08
-//
-
-// constructor
-CCommDbTest015_08::CCommDbTest015_08()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_015_08");
-	}
-
-// destructor
-CCommDbTest015_08::~CCommDbTest015_08()
-	{
-	}
-
-
-TVerdict CCommDbTest015_08::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest015_08::tryDatabaseWriteL(void)
-{
-	TInt ret;
-
-	//Open the database
-	CCommsDatabase* theDb;
-	theDb=CCommsDatabase::NewL(EDatabaseTypeIAP);
-	CleanupStack::PushL(theDb);
-
-	//Open a view
-	CCommsDbTableView* theView;
-	theView = theDb->OpenTableLC( TPtrC(DIAL_OUT_ISP) );
-
-	//Try to write
-	TUint32 id;
-	ret = theView->InsertRecord( id );
-
-	CleanupStack::PopAndDestroy(2);
-
-	return ret;
-}
-
-//
-//	This function is executed as a separate thread from Step 015_08.
-//  It will try to write to the database, and should fail, as the database
-//  will be write locked by CCommDbTest015_08::executeStepL()
-//
-TInt CCommDbTest015_08::step015_08Thread ( void * /*ptr*/ )
-	{
-	TInt ret=KErrGeneral;
-
-	// get clean-up stack
-	CTrapCleanup* cleanup=CTrapCleanup::New(); 
-
-	if(!cleanup)
-		return KErrNoMemory;
-	//try to write to the database
-	TRAPD(r, ret = tryDatabaseWriteL() );
-
-	if ( r!=KErrNone )
-		ret = r;
-
-	// done with the clean up stack
-	delete cleanup; 
-
-	
-	return ret;		
-	}
-
-TInt CCommDbTest015_08::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-
-	//Lock the database, then request another thread to attempt a write
-
-	//Start an insert to lock the database
-	TUint32 id;
-	
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-
-	TEST( iTheDb->IsDatabaseWriteLockedL() );
-	
-	//Set up a new thread
-	RThread t;
-
-	TInt res=t.Create(_L("Step015_08Thread"),step015_08Thread, KDefaultStackSize,&User::Heap(),0 );
-
-	if ( res != KErrNone )
-		User::Leave( res );
-
-	// start the thread and request the status
-	TRequestStatus stat;
-	t.Logon(stat);
-	t.Resume();
-	User::WaitForRequest(stat);
-
-	// get the test result
-	ret =  stat.Int();
-
-	TExitType exitVal = t.ExitType();	
-	TEST( exitVal == EExitKill );
-		
-	// done with the test thread
-	t.Close();
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest015_08::doTestStepL( )
-	{
-	Log(_L("Step 015.08 called "));
-
-	if ( executeStepL() == KErrLocked )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 015.09
-//
-
-// constructor
-CCommDbTest015_09::CCommDbTest015_09()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_015_09");
-	}
-
-// destructor
-CCommDbTest015_09::~CCommDbTest015_09()
-	{
-	}
-
-TInt CCommDbTest015_09::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-
-	TPtrC tableName(MODEM_BEARER);
-
-	iTheDb=CCommsDatabase::NewL();
-
-
-	TUint32 recordToInsert;
-	TUint32 recordToUpdate;
-	TUint32 recordToDelete;
-	TBuf8<128> fieldValue1, fieldValue2;
-	_LIT8(KModemInitString, "ABCDE");
-
-	//
-	// rollback transaction test
-
-	// open view, insert record, delete view
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-		{
-		iTheView=iTheDb->OpenTableLC(tableName);
-		CleanupStack::Pop(iTheView);
-
-		CDBLEAVE( iTheView->InsertRecord(recordToInsert), KErrNone );
-		CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-		
-		delete  iTheView ;
-		iTheView=0;
-		}
-	iTheDb->RollbackTransaction();
-
-	// the inserted record must be rolled back
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-		{
-		iTheView=iTheDb->OpenViewMatchingUintLC(tableName, TPtrC(COMMDB_ID), recordToInsert);
-		CleanupStack::Pop(iTheView);
-
-		// there must be no records found
-		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNotFound );
-		
-		delete  iTheView ;
-		iTheView=0;
-		}
-	iTheDb->RollbackTransaction();
-
-	// open view, update record, delete view
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-		{
-		iTheView=iTheDb->OpenTableLC(tableName);
-		CleanupStack::Pop(iTheView);
-
-		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-		iTheView->ReadUintL(TPtrC(COMMDB_ID), recordToUpdate);
-		iTheView->ReadTextL(TPtrC(MODEM_MODEM_INIT_STRING), fieldValue1);
-		CDBLEAVE( iTheView->UpdateRecord(), KErrNone );
-		iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING), KModemInitString);
-		CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-		
-		delete  iTheView ;
-		iTheView=0;
-		}
-	iTheDb->RollbackTransaction();
-
-	// the updated record must be rolled back
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-		{
-		iTheView=iTheDb->OpenViewMatchingUintLC(tableName, TPtrC(COMMDB_ID), recordToUpdate);
-		CleanupStack::Pop(iTheView);
-
-		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-		iTheView->ReadTextL(TPtrC(MODEM_MODEM_INIT_STRING), fieldValue2);
-		
-		if (fieldValue1 != fieldValue2)
-			{
-			User::Leave(KErrGeneral);
-			}
-		
-		delete  iTheView ;
-		iTheView=0;
-		}
-	iTheDb->RollbackTransaction();
-
-	// open view, delete record, delete view
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-		{
-		iTheView=iTheDb->OpenTableLC(tableName);
-		CleanupStack::Pop(iTheView);
-
-		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-		iTheView->ReadUintL(TPtrC(COMMDB_ID), recordToDelete);
-		CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
-		
-		delete  iTheView ;
-		iTheView=0;
-		}
-	iTheDb->RollbackTransaction();
-
-	// the deleted record must be rolled back
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-		{
-		iTheView=iTheDb->OpenViewMatchingUintLC(tableName, TPtrC(COMMDB_ID), recordToDelete);
-		CleanupStack::Pop(iTheView);
-
-		// the record must still be there
-		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-		CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-		
-		delete  iTheView ;
-		iTheView=0;
-		}
-	iTheDb->RollbackTransaction();
-
-
-
-	//
-	// commit transaction test
-
-	// open view, insert record, delete view
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-		{
-		iTheView=iTheDb->OpenTableLC(tableName);
-		CleanupStack::Pop(iTheView);
-
-		CDBLEAVE( iTheView->InsertRecord(recordToInsert), KErrNone );
-		CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-		
-		delete  iTheView ;
-		iTheView=0;
-		}
-	iTheDb->CommitTransaction();
-
-	// the inserted records must be commited
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-		{
-		iTheView=iTheDb->OpenViewMatchingUintLC(tableName, TPtrC(COMMDB_ID), recordToInsert);
-		CleanupStack::Pop(iTheView);
-
-		// the record must have been inserted
-		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-		CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-		
-		delete  iTheView ;
-		iTheView=0;
-		}
-	iTheDb->RollbackTransaction();
-
-
-	// open view, update record, delete view
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-		{
-		iTheView=iTheDb->OpenTableLC(tableName);
-		CleanupStack::Pop(iTheView);
-
-		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-		iTheView->ReadUintL(TPtrC(COMMDB_ID), recordToUpdate);
-		iTheView->ReadTextL(TPtrC(MODEM_MODEM_INIT_STRING), fieldValue1);
-		CDBLEAVE( iTheView->UpdateRecord(), KErrNone );
-		iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING), KModemInitString);
-		CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-		
-		delete  iTheView ;
-		iTheView=0;
-		}
-	iTheDb->CommitTransaction();
-
-	// the updated record must be rolled back
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-		{
-		iTheView=iTheDb->OpenViewMatchingUintLC(tableName, TPtrC(COMMDB_ID), recordToUpdate);
-		CleanupStack::Pop(iTheView);
-
-		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-		iTheView->ReadTextL(TPtrC(MODEM_MODEM_INIT_STRING), fieldValue2);
-		
-		if (fieldValue2 != KModemInitString)
-			{
-			User::Leave(KErrGeneral);
-			}
-		
-		delete  iTheView ;
-		iTheView=0;
-		}
-	iTheDb->RollbackTransaction();
-
-
-	// open view, delete record, delete view
-	// unfortunately we cannot do heap marking here because of commsdtat notifications
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-		{
-		iTheView=iTheDb->OpenTableLC(tableName);
-		CleanupStack::Pop(iTheView);
-
-		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-		iTheView->ReadUintL(TPtrC(COMMDB_ID), recordToDelete);
-		CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
-		
-		delete  iTheView ;
-		iTheView=0;
-		}
-	iTheDb->CommitTransaction();
-
-	// the deleted records must be commited
-	CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-		{
-		iTheView=iTheDb->OpenViewMatchingUintLC(tableName, TPtrC(COMMDB_ID), recordToDelete);
-		CleanupStack::Pop(iTheView);
-
-		// the record must have been deleted
-		CDBLEAVE( iTheView->GotoFirstRecord(), KErrNotFound );
-		
-		delete  iTheView ;
-		iTheView=0;
-		}
-	iTheDb->RollbackTransaction();
-
-	//Close the DB
-	delete iTheDb;
-	iTheDb = 0;
-
-	//NB Only get here if we didnt trap, so it must have passed
-	ret = KErrNone;
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest015_09::doTestStepL( )
-	{
-	Log(_L("Step 015.09 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-
-
-//
-//	Test step 015.10
-//
-
-// constructor
-CCommDbTest015_10::CCommDbTest015_10()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_015_10");
-	}
-
-// destructor
-CCommDbTest015_10::~CCommDbTest015_10()
-	{
-	}
-
-TVerdict CCommDbTest015_10::doTestStepL( )
-	{
-	Log(_L("Step 015.10 called "));
-
-	iTestStepResult = EPass;
-	
-	// Have backup of Database in c:\default1.dat
-
-		// Heap test for 015.01
-
-	CCommDbTest015_01* step015_01 = new(ELeave) CCommDbTest015_01;
-	CleanupStack::PushL(step015_01);
-	step015_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step015_01, KErrNone);
-	if ( step015_01->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step015_01);
-
-
-
-	return iTestStepResult;	
-
-}
-
-//
-//	Test step 015.11
-//
-
-// constructor
-CCommDbTest015_11::CCommDbTest015_11()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_015_11");
-	}
-
-// destructor
-CCommDbTest015_11::~CCommDbTest015_11()
-	{
-	}
-
-TVerdict CCommDbTest015_11::doTestStepL( )
-	{
-	Log(_L("Step 015.11 called "));
-
-	iTestStepResult = EPass;
-	
-			// Heap test for 015.02
-	CCommDbTest015_02* step015_02 = new CCommDbTest015_02;
-	CleanupStack::PushL(step015_02);
-	step015_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step015_02, KErrNone);
-	if ( step015_02->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step015_02);
-	
-	return iTestStepResult;
-	}
-	
-//
-//	Test step 015.12
-//
-
-// constructor
-CCommDbTest015_12::CCommDbTest015_12()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_015_12");
-	}
-
-// destructor
-CCommDbTest015_12::~CCommDbTest015_12()
-	{
-	}
-
-TVerdict CCommDbTest015_12::doTestStepL( )
-	{
-	Log(_L("Step 015.12 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 015.03
-
-	CCommDbTest015_03* step015_03 = new CCommDbTest015_03;
-	CleanupStack::PushL(step015_03);
-	doTestStepWithHeapFailureL( *step015_03, KErrNone);
-	if ( step015_03->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step015_03);
-	
-	return iTestStepResult;
-	}	
-	
-//
-//	Test step 015.13
-//
-
-// constructor
-CCommDbTest015_13::CCommDbTest015_13()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_015_13");
-	}
-
-// destructor
-CCommDbTest015_13::~CCommDbTest015_13()
-	{
-	}
-
-TVerdict CCommDbTest015_13::doTestStepL( )
-	{
-	Log(_L("Step 015.13 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 015.04
-	copyTestDatabase( EDatabase_1 );
-	CCommDbTest015_04* step015_04 = new CCommDbTest015_04;
-	CleanupStack::PushL(step015_04);
-	step015_04->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step015_04, KErrNone);
-	if ( step015_04->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step015_04);
-	
-	return iTestStepResult;
-	}	
-	
-//
-//	Test step 015.14
-//
-
-// constructor
-CCommDbTest015_14::CCommDbTest015_14()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_015_14");
-	}
-
-// destructor
-CCommDbTest015_14::~CCommDbTest015_14()
-	{
-	}
-
-TVerdict CCommDbTest015_14::doTestStepL( )
-	{
-	Log(_L("Step 015.14 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 015.07
-
-	CCommDbTest015_07* step015_07 = new CCommDbTest015_07;
-	CleanupStack::PushL(step015_07);
-	step015_07->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step015_07, KErrNone);
-	if ( step015_07->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step015_07);
-	
-	return iTestStepResult;
-	}	
-	
-//
-//	Test step 015.15
-//
-
-// constructor
-CCommDbTest015_15::CCommDbTest015_15()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_015_15");
-	}
-
-// destructor
-CCommDbTest015_15::~CCommDbTest015_15()
-	{
-	}
-
-TVerdict CCommDbTest015_15::doTestStepL( )
-	{
-	Log(_L("Step 015.15 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 015.08
-
-	CCommDbTest015_08* step015_08 = new CCommDbTest015_08;
-	CleanupStack::PushL(step015_08);
-	step015_08->iSuite = iSuite;				
-	doTestStepWithHeapFailureL( *step015_08, KErrLocked);
-	if ( step015_08->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step015_08);
-	
-	return iTestStepResult;
-	}	
-
-
-
-//
-//	Test step 015.16
-//
-
-// constructor
-CCommDbTest015_16::CCommDbTest015_16()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_015_16");
-	}
-
-// destructor
-CCommDbTest015_16::~CCommDbTest015_16()
-	{
-	}
-
-TVerdict CCommDbTest015_16::doTestStepL( )
-	{
-	Log(_L("Step 015.16 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 015.09
-		
-	CCommDbTest015_09* step015_09 = new CCommDbTest015_09;
-	CleanupStack::PushL(step015_09);
-	step015_09->iSuite = iSuite;				
-	doTestStepWithHeapFailureL( *step015_09, KErrNone);
-	if ( step015_09->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step015_09);
-	
-	return iTestStepResult;
-	}	
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_015_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,315 +0,0 @@
-// Copyright (c) 2001-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:
-// step_015_01.h
-// This is the header file for CommDb test 015.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_015_XX_H__)
-#define __STEP_015_XX_H__
-
-
-//
-//	Test step 015.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest015_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest015_01();
-	~CCommDbTest015_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-private:
-
-};
-
-
-//
-//	Test step 015.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest015_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest015_02();
-	~CCommDbTest015_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-
-private:
-
-};
-
-//
-//	Test step 015.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest015_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest015_03();
-	~CCommDbTest015_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-
-private:
-
-};
-
-//
-//	Test step 015.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest015_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest015_04();
-	~CCommDbTest015_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepPostambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 015.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest015_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest015_05();
-	~CCommDbTest015_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepPostambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 015.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest015_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest015_06();
-	~CCommDbTest015_06();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepPostambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 015.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest015_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest015_07();
-	~CCommDbTest015_07();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 015.08
-//
-
-NONSHARABLE_CLASS(CCommDbTest015_08) : public CTestStepCommDb
-{
-public:
-	CCommDbTest015_08();
-	~CCommDbTest015_08();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	
-private:
-	//These members are run as a separate thread
-	static	TInt step015_08Thread ( TAny * ptr );
-	static	TInt tryDatabaseWriteL(void);
-};
-
-//
-//	Test step 015.09
-//
-
-NONSHARABLE_CLASS(CCommDbTest015_09) : public CTestStepCommDb
-{
-public:
-	CCommDbTest015_09();
-	~CCommDbTest015_09();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-
-private:
-
-};
-
-//
-//	Test step 015.10
-//
-
-NONSHARABLE_CLASS(CCommDbTest015_10) : public CTestStepCommDb
-{
-public:
-	CCommDbTest015_10();
-	~CCommDbTest015_10();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-//
-//	Test step 015.11
-//
-
-NONSHARABLE_CLASS(CCommDbTest015_11) : public CTestStepCommDb
-{
-public:
-	CCommDbTest015_11();
-	~CCommDbTest015_11();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-//
-//	Test step 015.12
-//
-
-NONSHARABLE_CLASS(CCommDbTest015_12) : public CTestStepCommDb
-{
-public:
-	CCommDbTest015_12();
-	~CCommDbTest015_12();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-//
-//	Test step 015.13
-//
-
-NONSHARABLE_CLASS(CCommDbTest015_13) : public CTestStepCommDb
-{
-public:
-	CCommDbTest015_13();
-	~CCommDbTest015_13();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-//
-//	Test step 015.14
-//
-
-NONSHARABLE_CLASS(CCommDbTest015_14) : public CTestStepCommDb
-{
-public:
-	CCommDbTest015_14();
-	~CCommDbTest015_14();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-//
-//	Test step 015.15
-//
-
-NONSHARABLE_CLASS(CCommDbTest015_15) : public CTestStepCommDb
-{
-public:
-	CCommDbTest015_15();
-	~CCommDbTest015_15();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-//
-//	Test step 015.16
-//
-
-NONSHARABLE_CLASS(CCommDbTest015_16) : public CTestStepCommDb
-{
-public:
-	CCommDbTest015_16();
-	~CCommDbTest015_16();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-
-#endif //(__STEP_015_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_016_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,605 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 016.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <e32property.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_016_xx.h"
-
-//
-//	Test step 016.01
-//
-
-// constructor
-CCommDbTest016_01::CCommDbTest016_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_016_01");
-	}
-
-// destructor
-CCommDbTest016_01::~CCommDbTest016_01()
-	{
-	}
-
-
-TVerdict CCommDbTest016_01::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest016_01::executeStepL()
-	{
-
-	//Request a notification and then cancel it
-
-	TRequestStatus status;
-
-	User::LeaveIfError(iTheDb->RequestNotification( status ));
-	iTheDb->CancelRequestNotification();
-	User::WaitForRequest(status);
-
-
-
-	if (KErrCancel == status.Int())
-		{
-		return KErrNone;
-		}
-	else
-		{
-		return KErrGeneral;
-		}
-	}
-
-
-
-TVerdict CCommDbTest016_01::doTestStepL( )
-	{
-	Log(_L("Step 016.01 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 016.02
-//
-
-// constructor
-CCommDbTest016_02::CCommDbTest016_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_016_02");
-	}
-
-// destructor
-CCommDbTest016_02::~CCommDbTest016_02()
-	{
-	}
-
-TVerdict CCommDbTest016_02::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest016_02::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Generate an ECommit notification
-
-	//Request notifications
-	TRequestStatus event;
-	iTheDb->RequestNotification(event);
-	
-	CDBLEAVE(iTheDb->BeginTransaction(), KErrNone);
-
-	//Insert a record
-	TUint32 id;
-	CDBLEAVE(iTheView->InsertRecord( id ), KErrNone);
-	//Write the record and commit it
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),_L("My Service"));
-	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
-	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
-	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	CDBLEAVE(iTheView->PutRecordChanges(), KErrNone);
-	CDBLEAVE(iTheDb->CommitTransaction(), KErrNone);
-
-	//Now wait for the notification event
-	User::WaitForRequest(event);
-
-	if ( event.Int() == RDbNotifier::ECommit )
-		ret = KErrNone;
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest016_02::doTestStepL( )
-	{
-	Log(_L("Step 016.02 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 016.04
-//
-
-// constructor
-CCommDbTest016_04::CCommDbTest016_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_016_04");
-	}
-
-// destructor
-CCommDbTest016_04::~CCommDbTest016_04()
-	{
-	}
-
-TVerdict CCommDbTest016_04::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest016_04::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Generate an EUnlock notification	
-	
-	TRequestStatus event(KRequestPending);
-	iTheDb->RequestNotification(event);
-	if(event!=KRequestPending)
-		User::LeaveIfError(event.Int());
-	
-	iTheDb->SetGlobalSettingL(TPtrC(REDIAL_ATTEMPTS), 5 );
-	
-	
-	//EUnlock is returned as a result of a read transaction...Calling CommitTransaction without changing any value will also trigger EUnLock
-	TUint32 newvalue = 0;
-	iTheDb->GetGlobalSettingL(TPtrC(REDIAL_ATTEMPTS), newvalue);
-
-	User::WaitForRequest(event);
-	
-	Log(_L("Request for notification returned %d"),event.Int());
-	
-	if ( event.Int() == RDbNotifier::EUnlock )
-		ret = KErrNone;
-	
-    //CleanupStack::PopAndDestroy(sched);
-    
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest016_04::doTestStepL( )
-	{
-	Log(_L("Step 016.04 called "));
-
-	
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 016.05
-//
-
-// constructor
-CCommDbTest016_05::CCommDbTest016_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_016_05");
-	// default to no local objects allocated
-	iLocalObjects = EFalse;
-	}
-
-// destructor
-CCommDbTest016_05::~CCommDbTest016_05()
-	{
-	}
-
-
-TVerdict CCommDbTest016_05::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-TInt CCommDbTest016_05::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Generate an ERollback notification
-
-
-	TRequestStatus event;
-	iTheDb->RequestNotification(event);
-
-	iTheDb->BeginTransaction();
-	//Insert a record
-	TUint32 id;
-	CDBLEAVE(iTheView->InsertRecord( id ), KErrNone);
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),_L("CCommDbTest016_05 Test record"));
-	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
-	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
-	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	CDBLEAVE(iTheView->PutRecordChanges(), KErrNone);
-	
-	iTheDb->RollbackTransaction();
-
-	//Wait for the notify event
-	User::WaitForRequest(event);
-	
-	if ( event.Int() == RDbNotifier::ERollback )
-		ret = KErrNone;
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest016_05::doTestStepL( )
-	{
-	Log(_L("Step 016.05 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 016.07
-//
-
-// constructor
-CCommDbTest016_07::CCommDbTest016_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_016_07");
-	}
-
-// destructor
-CCommDbTest016_07::~CCommDbTest016_07()
-	{
-	}
-
-
-TVerdict CCommDbTest016_07::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-TInt CCommDbTest016_07::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Cancel an active notification request
-	
-	TRequestStatus notifyStatus;
-	iTheDb->RequestNotification(notifyStatus);
-
-	iTheDb->BeginTransaction();
-	//Insert a record
-	TUint32 id;
-	CDBLEAVE(iTheView->InsertRecord( id ), KErrNone);
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),_L("CCommDbTest016_05 Test record"));
-	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
-	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
-	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-
-	CDBLEAVE(iTheView->PutRecordChanges(), KErrNone);
-
-	iTheDb->CancelRequestNotification();
-
-	iTheDb->CommitTransaction();
-
-	//Wait for the notify
-	User::WaitForRequest( notifyStatus );
-	
-	if ( notifyStatus.Int() == KErrCancel )
-		{
-		//Notify request has been cancelled
-		ret = KErrNone;
-		}
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest016_07::doTestStepL( )
-	{
-	Log(_L("Step 016.07 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 016.08
-//
-
-// constructor
-CCommDbTest016_08::CCommDbTest016_08()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_016_08");
-	}
-
-// destructor
-CCommDbTest016_08::~CCommDbTest016_08()
-	{
-	}
-
-
-TVerdict CCommDbTest016_08::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(MODEM_BEARER));
-	return EPass;
-	}
-
-TInt CCommDbTest016_08::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id;
-
-	//Check that notifications are being sent to the Publish&Subscribe
-	//when the Modem table is modified
-
- 	//set up the TSY name change event
- 	RProperty propCdbModemNameChange;
- 	TRequestStatus rqstatMdmNameChange;
- 	CDBLEAVE(propCdbModemNameChange.Attach(KUidSystemCategory,KUidCommDbModemTsyNameChange.iUid), KErrNone);
- 	CleanupClosePushL(propCdbModemNameChange);
- 	propCdbModemNameChange.Subscribe(rqstatMdmNameChange);
- 	__ASSERT_ALWAYS(rqstatMdmNameChange == KRequestPending, User::Invariant());
- 	
- 	//set up the Modem table change event
- 	RProperty propCdbModemRecordChange;
- 	TRequestStatus rqstatMdmRecordChange;
- 	CDBLEAVE(propCdbModemRecordChange.Attach(KUidSystemCategory,KUidCommDbModemRecordChange.iUid), KErrNone);
- 	CleanupClosePushL(propCdbModemRecordChange);
- 	propCdbModemRecordChange.Subscribe(rqstatMdmRecordChange);
- 	__ASSERT_ALWAYS(rqstatMdmRecordChange == KRequestPending, User::Invariant()); 	
- 	
- 	
-
-	//Make sure there is a record in the modem table	
-	CDBLEAVE( iTheView->InsertRecord( id ),  KErrNone );
-
-	_LIT(KName,"CCommDbTest015_03");
-	_LIT(KTsy,"HAYES");
-	_LIT8(KModemInitString,"AT&F1");
-	_LIT8(KModemFaxInitString,"AT&d2");
-	//Write some sample data into the table
-
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KName);
-	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
-	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
-	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
-	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
-	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
-	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
-	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
-	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
-	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
-	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
-
-	CDBLEAVE( iTheView->PutRecordChanges(),  KErrNone );
-
-	delete iTheView;
-	iTheView = 0;
-
-	
-	iTheView = iTheDb->OpenTableLC( TPtrC(MODEM_BEARER));
-	CleanupStack::Pop();
-
-
-	//Now delete the modem record and check for the notifications
-	CDBLEAVE( iTheView->GotoFirstRecord(),  KErrNone );
-	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
-	
- 	User::WaitForRequest(rqstatMdmNameChange); 
- 	User::WaitForRequest(rqstatMdmRecordChange); 
- 	if (rqstatMdmNameChange == KErrNone &&
- 	  rqstatMdmRecordChange == KErrNone )
- 		{
-        ret = KErrNone;
- 		}
-	CleanupStack::PopAndDestroy(); // rqstatMdmRecordChange
-	CleanupStack::PopAndDestroy(); // rqstatMdmNameChange
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest016_08::doTestStepL( )
-	{
-	Log(_L("Step 016.08 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 016.09
-//
-
-// constructor
-CCommDbTest016_09::CCommDbTest016_09()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_016_09");
-	}
-
-// destructor
-CCommDbTest016_09::~CCommDbTest016_09()
-	{
-	}
-
-TVerdict CCommDbTest016_09::doTestStepL( )
-	{
-	Log(_L("Step 016.09 called "));
-
-	iTestStepResult = EPass;
-
-		// Heap test for 016.01
-    //Commented out because it causes a DBMS server crash
-	//CCommDbTest016_01* step016_01 = new(ELeave) CCommDbTest016_01;
-	//CleanupStack::PushL(step016_01);
-	//step016_01->iSuite = iSuite;
-	//doTestStepWithHeapFailureL( *step016_01, KErrNone);
-	//if ( step016_01->iTestStepResult == EFail )
-	//	iTestStepResult = EFail;
-	//CleanupStack::PopAndDestroy(step016_01);
-
-		// Heap test for 016.02
-
-	//Commented out because it causes a DBMS server crash
-	//CCommDbTest016_02* step016_02 = new CCommDbTest016_02;
-	//CleanupStack::PushL(step016_02);
-	//step016_02->iSuite = iSuite;
-	//doTestStepWithHeapFailureL( *step016_02, KErrNone);
-	//if ( step016_02->iTestStepResult == EFail )
-	//	iTestStepResult = EFail;
-	//CleanupStack::PopAndDestroy(step016_02);
-
-
-		// Heap test for 016.04
-    //Commented out because it causes a DBMS server crash
-	//CCommDbTest016_04* step016_04 = new(ELeave) CCommDbTest016_04;
-	//CleanupStack::PushL(step016_04);
-	//step016_04->iSuite = iSuite;
-	//doTestStepWithHeapFailureL( *step016_04, KErrNone);
-	//if ( step016_04->iTestStepResult == EFail )
-	//	iTestStepResult = EFail;
-	//CleanupStack::PopAndDestroy(step016_04);
-
-
-		// Heap test for 016.05
-
-	//Commented out because it causes a DBMS server crash
-	//CCommDbTest016_05* step016_05 = new(ELeave) CCommDbTest016_05;
-	//CleanupStack::PushL(step016_05);
-	//step016_05->iSuite = iSuite;
-	//doTestStepWithHeapFailureL( *step016_05, KErrNone);
-	//if ( step016_05->iTestStepResult == EFail )
-	//	iTestStepResult = EFail;
-	//CleanupStack::PopAndDestroy(step016_05);
-
-		// Heap test for 016.07
-
-	//Commented out because it causes a DBMS server crash
-	//CCommDbTest016_07* step016_07 = new(ELeave) CCommDbTest016_07;
-	//CleanupStack::PushL(step016_07);
-	//step016_07->iSuite = iSuite;
-	//doTestStepWithHeapFailureL( *step016_07, KErrGeneral);
-	//if ( step016_07->iTestStepResult == EFail )
-	//	iTestStepResult = EFail;
-	//CleanupStack::PopAndDestroy(step016_07);
-
-	// Heap test for 016.08
-
-	//Commented out as it causes a 'Hang'
-	//CCommDbTest016_08* step016_08 = new(ELeave) CCommDbTest016_08;
-	//CleanupStack::PushL(step016_08);
-	//step016_08->iSuite = iSuite;
-	//doTestStepWithHeapFailureL( *step016_08, KErrNone);
-	//if ( step016_08->iTestStepResult == EFail )
-	//	iTestStepResult = EFail;
-	//CleanupStack::PopAndDestroy(step016_08);
-
-	// These OOM tests have a bad habit of generating stray signals as they are intended to fail in the middle.
-	// Tidy everything up or scheduletest will set our status to "fail" :-(
-	while (RThread().RequestCount() > 0)
-		User::WaitForAnyRequest();
-
-	return iTestStepResult;	
-
-}
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_016_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-// Copyright (c) 2001-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:
-// step_016_01.h
-// This is the header file for CommDb test 016.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_016_XX_H__)
-#define __STEP_016_XX_H__
-
-
-//
-//	Test step 016.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest016_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest016_01();
-	~CCommDbTest016_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 016.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest016_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest016_02();
-	~CCommDbTest016_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-//
-//	Test step 016.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest016_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest016_04();
-	~CCommDbTest016_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 016.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest016_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest016_05();
-	~CCommDbTest016_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-//
-//	Test step 016.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest016_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest016_07();
-	~CCommDbTest016_07();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 016.08
-//
-
-NONSHARABLE_CLASS(CCommDbTest016_08) : public CTestStepCommDb
-{
-public:
-	CCommDbTest016_08();
-	~CCommDbTest016_08();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 016.09
-//
-
-NONSHARABLE_CLASS(CCommDbTest016_09) : public CTestStepCommDb
-{
-public:
-	CCommDbTest016_09();
-	~CCommDbTest016_09();
-
-	virtual enum TVerdict doTestStepL( void );
-
-
-private:
-
-};
-
-#endif //(__STEP_016_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_017_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,754 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 017.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <e32property.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_017_xx.h"
-
-
- 	#include <commsdattypesv1_1.h>
-	using namespace CommsDat;
-
-
-//
-//	Test step 017.01
-//
-
-// constructor
-CCommDbTest017_01::CCommDbTest017_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_017_01");
-	}
-
-// destructor
-CCommDbTest017_01::~CCommDbTest017_01()
-	{
-	}
-
-
-TVerdict CCommDbTest017_01::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-// Have changed this value as 0xDEADBEEF is not valid input for all tested fields
-// linked records can only have either valid table/record data or integer < KCDMaxRecords
-#define TEST_VALUE	42 //0xDEADBEEF
-//#define TEST_VALUE	0xDEADBEEF
-
-TInt CCommDbTest017_01::GlobalSettingTestL( const TDesC& aName )
-	{
-	TUint32 newValue = 0;
-	TInt ret = KErrGeneral;
-
-	//Perform a read/write test on the global
-	iTheDb->SetGlobalSettingL( aName, TEST_VALUE );
-	iTheDb->GetGlobalSettingL( aName, newValue );
-	iTheDb->ClearGlobalSettingL( aName );
-
-	//Should leave with KErrNotFound
-	TRAPD(r, iTheDb->GetGlobalSettingL( aName, newValue ) );
-	if ( r!= KErrNotFound )
-		User::Leave(r);
-
-	if ( newValue == TEST_VALUE  )
-	{
-		ret = KErrNone;
-	}
-	return ret;
-
-}
-
-TInt CCommDbTest017_01::GlobalSettingClearL( const TDesC& aName )
-	{
-	TUint32 newValue = 0;
-
-	// Check for Global Setting existing. If exists then clear it
-	TRAPD(ret,iTheDb->GetGlobalSettingL( aName, newValue ));
-	if(ret==KErrNone)
-		{
-		iTheDb->ClearGlobalSettingL( aName );
-		}
-	else if(ret==KErrNotFound)
-		{
-		ret=KErrNone;
-		}
-	return ret;
-	}		
-
-TVerdict CCommDbTest017_01::doTestStepPostambleL()
-	{
-	TInt ret=KErrNone;
-	
-	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(REDIAL_ATTEMPTS) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(SMS_BEARER) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(SMS_RECEIVE_MODE) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(GPRS_ATTACH_MODE) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(ACCEPT_INCOMING_GPRS) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(GPRS_CLASS_C_BEARER) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(CONNECTION_ATTEMPTS) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(MODEM_DATA_FAX) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(MODEM_PHONE_SERVICES_SMS) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(LOCATION_DATA_FAX) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(LOCATION_PHONE_SERVICES_SMS) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(MAXMBUF_HEAP) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(DEFAULT_AGENT) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingClearL(  TPtrC(DEFAULT_NETWORK) ), KErrNone );
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	if(ret == KErrNone)
-		{
-		return EPass;
-		}
-	else
-		{
-		return EFail;
-		}
-	}
-
-TInt CCommDbTest017_01::executeStepL()
-	{
-	TInt ret=KErrNone;
-
-	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(REDIAL_ATTEMPTS) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(SMS_BEARER) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(SMS_RECEIVE_MODE) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(GPRS_ATTACH_MODE) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(ACCEPT_INCOMING_GPRS) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(GPRS_CLASS_C_BEARER) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(CONNECTION_ATTEMPTS) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(MODEM_DATA_FAX) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(MODEM_PHONE_SERVICES_SMS) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(LOCATION_DATA_FAX ) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(LOCATION_PHONE_SERVICES_SMS)	 ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(MAXMBUF_HEAP) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(DEFAULT_AGENT) ), KErrNone );
-	CDBLEAVE( ret = GlobalSettingTestL( TPtrC(DEFAULT_NETWORK) ), KErrNone );
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest017_01::doTestStepL( )
-	{
-	Log(_L("Step 017.01 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 017.02
-//
-
-// constructor
-CCommDbTest017_02::CCommDbTest017_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_017_02");
-	}
-
-// destructor
-CCommDbTest017_02::~CCommDbTest017_02()
-	{
-	}
-
-
-TVerdict CCommDbTest017_02::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(MODEM_BEARER));
-	return EPass;
-	}
-
-
-
-TInt CCommDbTest017_02::executeStepL()
-	{
-	TInt ret=KErrNone;
-	TUint32 id;
-
-	//Checks for notifications when deleting global modem settings
-	CMDBSession* ptrSession = CMDBSession::NewL(KCDVersion1_1);
-
-	ptrSession->PublishProperties();
-	delete ptrSession;
-	ptrSession = NULL;
-
- 	RProperty propCdbMdmRecordChange;
-    RProperty propCdbMdmDataFaxChange;
-    RProperty propCdbMdmNameChange;
-    RProperty propCdbPhoneSMSChange;
- 	
-    TRequestStatus rqstatMdmRecordChange;
-    TRequestStatus rqstatMdmDatafaxChange;
-    TRequestStatus rqstatMdmNameChange;
-    TRequestStatus rqstatPhoneSMSChange;
- 	
-    CDBLEAVE(propCdbMdmRecordChange.Attach(KUidSystemCategory,KUidCommDbModemRecordChange.iUid), KErrNone);
-    CleanupClosePushL(propCdbMdmRecordChange);
- 	CDBLEAVE(propCdbMdmDataFaxChange.Attach(KUidSystemCategory,KUidCommDbModemDataAndFaxChange.iUid), KErrNone);	
-    CleanupClosePushL(propCdbMdmDataFaxChange);
- 	CDBLEAVE(propCdbMdmNameChange.Attach(KUidSystemCategory,KUidCommDbModemTsyNameChange.iUid), KErrNone);
-    CleanupClosePushL(propCdbMdmNameChange);
- 	CDBLEAVE(propCdbPhoneSMSChange.Attach(KUidSystemCategory,KUidCommDbModemPhoneServicesAndSMSChange.iUid), KErrNone);
-    CleanupClosePushL(propCdbPhoneSMSChange);
-  
-
-	//create two modem table entries
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-	
-	_LIT(KModem,"US Robotics Sportster");
-	_LIT(KTsy,"HAYES");
-	_LIT8(KModemInitString,"AT&F1");
-	_LIT8(KModemFaxInitString,"AT&d2");
-	//Write some sample data into the table
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KModem);
-	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
-	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
-	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
-	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
-	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
-	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
-	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
-	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
-	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
-	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-
-	iTheDb->SetGlobalSettingL( TPtrC(MODEM_DATA_FAX), id );
-
-	//Open a new view up
-	delete iTheView;
-	iTheView =0;
-	iTheView = iTheDb->OpenTableLC( TPtrC(MODEM_BEARER) );
-	CleanupStack::Pop();
-	
-	
-	//Request the notifications
-	
- 	propCdbMdmRecordChange.Subscribe(rqstatMdmRecordChange);
- 	__ASSERT_ALWAYS(rqstatMdmRecordChange == KRequestPending, User::Invariant());
- 	propCdbMdmDataFaxChange.Subscribe(rqstatMdmDatafaxChange);
- 	__ASSERT_ALWAYS(rqstatMdmDatafaxChange == KRequestPending, User::Invariant());
- 	propCdbMdmNameChange.Subscribe(rqstatMdmNameChange);
- 	__ASSERT_ALWAYS(rqstatMdmNameChange == KRequestPending, User::Invariant());
-
-	//Delete the modem record and then wait for the notifications
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
- 	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
-
- 	User::WaitForRequest(rqstatMdmRecordChange); 
- 	if (rqstatMdmRecordChange != KErrNone) 
- 		{
- 		ret = KErrNotFound;
- 		}
- 	User::WaitForRequest(rqstatMdmDatafaxChange); 
- 	if (rqstatMdmDatafaxChange != KErrNone) 
- 		{
- 		ret = KErrNotFound;
- 		}
- 	User::WaitForRequest(rqstatMdmNameChange); 
- 	if (rqstatMdmNameChange != KErrNone) 
- 		{
- 		ret = KErrNotFound;
- 		}
-	
-	//Now try the same thing with the MODEM_PHONE_SERVICES_SMS global setting
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-
-	_LIT(KModem2,"Another US Robotics Sportster");
-	//Write some sample data into the table
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KModem2);
-	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
-	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
-	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
-	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
-	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
-	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
-	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
-	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
-	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
-	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-	
-	iTheDb->SetGlobalSettingL(  TPtrC(MODEM_PHONE_SERVICES_SMS), id );
-
-
-	//Open a new view up
-	delete iTheView;
-	iTheView =0;
-	iTheView = iTheDb->OpenTableLC( TPtrC(MODEM_BEARER) );
-	CleanupStack::Pop();
-	
-	//Reset notifications
- 	propCdbMdmRecordChange.Subscribe(rqstatMdmRecordChange);
- 	__ASSERT_ALWAYS(rqstatMdmRecordChange == KRequestPending, User::Invariant());
- 	propCdbMdmNameChange.Subscribe(rqstatMdmNameChange);
- 	__ASSERT_ALWAYS(rqstatMdmNameChange == KRequestPending, User::Invariant());
- 	propCdbPhoneSMSChange.Subscribe(rqstatPhoneSMSChange);
- 	__ASSERT_ALWAYS(rqstatPhoneSMSChange == KRequestPending, User::Invariant());
-
-	//Delete the record and wait for the notifications
-	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
-
- 	User::WaitForRequest(rqstatMdmRecordChange); 
- 	if (rqstatMdmRecordChange != KErrNone) 
- 		{
- 		ret = rqstatMdmRecordChange.Int();
- 		}
- 	User::WaitForRequest(rqstatPhoneSMSChange); 
- 	if (rqstatPhoneSMSChange != KErrNone) 
- 		{
- 		ret = rqstatMdmRecordChange.Int();
- 		}
-  	User::WaitForRequest(rqstatMdmNameChange); 
- 	if (rqstatMdmNameChange != KErrNone) 
- 		{
- 		ret = rqstatMdmRecordChange.Int();
- 		}
- 		
- 	CleanupStack::PopAndDestroy(); // propCdbPhoneSMSChange
- 	CleanupStack::PopAndDestroy(); // propCdbMdmNameChange
- 	CleanupStack::PopAndDestroy(); // propCdbMdmDataFaxChange
- 	CleanupStack::PopAndDestroy(); // propCdbMdmRecordChange
- 		
-	
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest017_02::doTestStepL( )
-	{
-	Log(_L("Step 017.02 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 017.03
-//
-
-// constructor
-CCommDbTest017_03::CCommDbTest017_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_017_03");
-	}
-
-// destructor
-CCommDbTest017_03::~CCommDbTest017_03()
-	{
-	}
-
-TVerdict CCommDbTest017_03::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(MODEM_BEARER));
-	return EPass;
-	}
-
-
-TInt CCommDbTest017_03::executeStepL()
-	{
-	TInt ret=KErrNone;
-	TUint32 id;
-
-	//Checks for notifications when deleting global modem settings
-
- 	RProperty propCdbMdmRecordChange;
-    RProperty propCdbMdmDataFaxChange;
-    RProperty propCdbMdmNameChange;
-    RProperty propCdbPhoneSMSChange;
- 	
-    TRequestStatus rqstatMdmRecordChange;
-    TRequestStatus rqstatMdmDatafaxChange;
-    TRequestStatus rqstatMdmNameChange;
-    TRequestStatus rqstatPhoneSMSChange;
- 	
-    CDBLEAVE(propCdbMdmRecordChange.Attach(KUidSystemCategory, KUidCommDbModemRecordChange.iUid), KErrNone);
-    CleanupClosePushL(propCdbMdmRecordChange);
- 	CDBLEAVE(propCdbMdmDataFaxChange.Attach(KUidSystemCategory, KUidCommDbModemDataAndFaxChange.iUid), KErrNone);	//this KUid has been deprecated
-    CleanupClosePushL(propCdbMdmDataFaxChange);
- 	CDBLEAVE(propCdbMdmNameChange.Attach(KUidSystemCategory, KUidCommDbModemTsyNameChange.iUid), KErrNone);
-    CleanupClosePushL(propCdbMdmNameChange);
- 	CDBLEAVE(propCdbPhoneSMSChange.Attach(KUidSystemCategory, KUidCommDbModemPhoneServicesAndSMSChange.iUid), KErrNone);	//this KUid has been deprecated
-    CleanupClosePushL(propCdbPhoneSMSChange);
- 
-
-	//create two modem table entries
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-	
-	_LIT(KModem,"US Robotics Sportster");
-	_LIT(KTsy,"HAYES");
-	_LIT8(KModemInitString,"AT&F1");
-	_LIT8(KModemFaxInitString,"AT&d2");
-	//Write some sample data into the table
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KModem);
-	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
-	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
-	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
-	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
-	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
-	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
-	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
-	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
-	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
-	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-
-	//Set both modem gloabls to the same record
-	iTheDb->SetGlobalSettingL( TPtrC(MODEM_DATA_FAX), id );
-	iTheDb->SetGlobalSettingL(  TPtrC(MODEM_PHONE_SERVICES_SMS), id );
-
-	//Open a new view up
-	delete iTheView;
-	iTheView =0;
-	iTheView = iTheDb->OpenTableLC( TPtrC(MODEM_BEARER) );
-	CleanupStack::Pop();
-	
-	
-	//Request the notifications
- 	propCdbMdmRecordChange.Subscribe(rqstatMdmRecordChange);
- 	__ASSERT_ALWAYS(rqstatMdmRecordChange == KRequestPending, User::Invariant());
- 	propCdbMdmDataFaxChange.Subscribe(rqstatMdmDatafaxChange);
- 	__ASSERT_ALWAYS(rqstatMdmDatafaxChange == KRequestPending, User::Invariant());
- 	propCdbMdmNameChange.Subscribe(rqstatMdmNameChange);
- 	__ASSERT_ALWAYS(rqstatMdmNameChange == KRequestPending, User::Invariant());
- 	propCdbPhoneSMSChange.Subscribe(rqstatPhoneSMSChange);
- 	__ASSERT_ALWAYS(rqstatPhoneSMSChange == KRequestPending, User::Invariant());
-
-	//Delete the modem record and then wait for the four notifications
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
-
- 	User::WaitForRequest(rqstatMdmRecordChange); 
- 	if (rqstatMdmRecordChange != KErrNone)
- 		{
- 		ret = KErrNotFound;
- 		}
- 	User::WaitForRequest(rqstatMdmDatafaxChange); 
- 	if (rqstatMdmDatafaxChange != KErrNone) 
- 		{
- 		ret = KErrNotFound;
- 		}
- 	User::WaitForRequest(rqstatPhoneSMSChange); 
- 	if (rqstatPhoneSMSChange != KErrNone) 
- 		{
- 		ret = KErrNotFound;
- 		}
- 		
- 	User::WaitForRequest(rqstatMdmNameChange); 
- 	if (rqstatMdmNameChange != KErrNone) 
- 		{
- 		ret = KErrNotFound;
- 		}
- 		
- 	CleanupStack::PopAndDestroy(); // propCdbPhoneSMSChange
- 	CleanupStack::PopAndDestroy(); // propCdbMdmNameChange
- 	CleanupStack::PopAndDestroy(); // propCdbMdmDataFaxChange
- 	CleanupStack::PopAndDestroy(); // propCdbMdmRecordChange
-	
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest017_03::doTestStepL( )
-	{
-	Log(_L("Step 017.03 called "));
-	
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 017.04
-//
-
-// constructor
-CCommDbTest017_04::CCommDbTest017_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_017_04");
-	}
-
-// destructor
-CCommDbTest017_04::~CCommDbTest017_04()
-	{
-	}
-
-TVerdict CCommDbTest017_04::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-#define INVALID_GLOBAL_NAME	  _L("Invalid")
-
-TInt CCommDbTest017_04::executeStepL()
-	{
-	TRAPD( r, iTheDb->SetGlobalSettingL( TPtrC(INVALID_GLOBAL_NAME), 0x55 ) );
-	if ( r!=KErrNotSupported )
-		return r;
-
-	TUint32 dummInt;
-	TRAP( r, iTheDb->GetGlobalSettingL( TPtrC(INVALID_GLOBAL_NAME), dummInt ) );
-	return r;
-	}
-
-
-
-TVerdict CCommDbTest017_04::doTestStepL( )
-	{
-	Log(_L("Step 017.04 called "));
-
-	
-	if ( executeStepL() == KErrNotSupported)
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 017.05
-//
-
-// constructor
-CCommDbTest017_05::CCommDbTest017_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_017_05");
-	}
-
-// destructor
-CCommDbTest017_05::~CCommDbTest017_05()
-	{
-	}
-
-TVerdict CCommDbTest017_05::doTestStepL( )
-	{
-	Log(_L("Step 017.05 called "));
-
-	iTestStepResult = EPass;
-
-	// Have backup of Database in c:\default1.dat
-//	copyDatabaseToDefault (EDatabase_1);
-	
-		// Heap test for 017.01
-		
-//	copyTestDatabase( EDatabase_1 );
-	CCommDbTest017_01* step017_01 = new(ELeave) CCommDbTest017_01;
-	CleanupStack::PushL(step017_01);
-	step017_01->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step017_01, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step017_01);
-
-		// Heap test for 017.02
-
-//	copyTestDatabase( EDatabase_1 );
-	CCommDbTest017_02* step017_02 = new CCommDbTest017_02;
-	CleanupStack::PushL(step017_02);
-	step017_02->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step017_02, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step017_02);
-
-		// Heap test for 017.03
-
-//	copyTestDatabase( EDatabase_1 );
-	CCommDbTest017_03* step017_03 = new CCommDbTest017_03;
-	CleanupStack::PushL(step017_03);
-	step017_03->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step017_03, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step017_03);
-
-		// Heap test for 017.04
-
-//	copyTestDatabase( EDatabase_1 );
-	CCommDbTest017_04* step017_04 = new CCommDbTest017_04;
-	CleanupStack::PushL(step017_04);
-	step017_04->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step017_04, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step017_04);
-
-
-	return iTestStepResult;	
-
-}
-
-//
-//	Test step 017.06
-//
-
-// constructor
-CCommDbTest017_06::CCommDbTest017_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_017_06");
-	}
-
-// destructor
-CCommDbTest017_06::~CCommDbTest017_06()
-	{
-	}
-
-TVerdict CCommDbTest017_06::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-#define DEFAULT_TSY	  _L("DEFAULT_TSY")
-
-TInt CCommDbTest017_06::executeStepL()
-	{
-	TRAPD(r, iTheDb->SetGlobalSettingL(TPtrC(BEARER_AVAILABILITY_CHECK_TSY), TPtrC(DEFAULT_TSY)) );
-
-	if (r != KErrNone)
-		return r;
-
-	TBuf<KCommsDbSvrMaxFieldLength> defaultTsy;
-	TRAP(r, iTheDb->GetGlobalSettingL( TPtrC(BEARER_AVAILABILITY_CHECK_TSY), defaultTsy ) );
-
-	if (r != KErrNone)
-		{
-		return r;
-		}
-
-	if (defaultTsy.Compare(TPtrC(DEFAULT_TSY)) != 0)
-		{
-		return KErrArgument;
-		}
-
-	defaultTsy.Zero();
-	TRAP(r, iTheDb->GetDefaultTsyL(defaultTsy));
-
-	if (r != KErrNone)
-		{
-		return r;
-		}
-
-	if (defaultTsy.Compare(TPtrC(DEFAULT_TSY)) != 0)
-		{
-		return KErrArgument;
-		}
-	return KErrNone;
-	}
-
-
-TVerdict CCommDbTest017_06::doTestStepL( )
-	{
-	Log(_L("Step 017.06 called "));
-
-	
-	if ( executeStepL() == KErrNone)
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 017.07
-//
-
-// constructor
-CCommDbTest017_07::CCommDbTest017_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_017_07");
-	}
-
-// destructor
-CCommDbTest017_07::~CCommDbTest017_07()
-	{
-	}
-
-TVerdict CCommDbTest017_07::doTestStepL( )
-	{
-	Log(_L("Step 017.07 called "));
-
-	iTestStepResult = EPass;
-
-		// Heap test for 017.06
-		
-//	copyTestDatabase( EDatabase_1 );
-	CCommDbTest017_06* step017_06 = new(ELeave) CCommDbTest017_06;
-	CleanupStack::PushL(step017_06);
-	step017_06->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step017_06, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step017_06);
-
-	return iTestStepResult;	
-
-}
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_017_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-// Copyright (c) 2001-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:
-// step_017_01.h
-// This is the header file for CommDb test 017.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_017_XX_H__)
-#define __STEP_017_XX_H__
-
-
-//
-//	Test step 017.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest017_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest017_01();
-	~CCommDbTest017_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepPostambleL();
-	TInt GlobalSettingTestL( const TDesC& aName );
-	TInt GlobalSettingClearL( const TDesC& aName );
-
-private:
-
-};
-
-
-//
-//	Test step 017.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest017_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest017_02();
-	~CCommDbTest017_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-//
-//	Test step 017.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest017_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest017_03();
-	~CCommDbTest017_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-//
-//	Test step 017.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest017_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest017_04();
-	~CCommDbTest017_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 017.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest017_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest017_05();
-	~CCommDbTest017_05();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 017.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest017_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest017_06();
-	~CCommDbTest017_06();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 017.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest017_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest017_07();
-	~CCommDbTest017_07();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-
-#endif //(__STEP_017_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_018_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,427 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 018.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_018_xx.h"
-
-
-
-//
-//	Test step 018.01
-//
-
-// constructor
-CCommDbTest018_01::CCommDbTest018_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_018_01");
-	}
-
-// destructor
-CCommDbTest018_01::~CCommDbTest018_01()
-	{
-	}
-
-
-TVerdict CCommDbTest018_01::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest018_01::executeStepL()
-	{
-	TInt ret=KErrNone;
-
-	//Verify DeleteRecord() by deleting the records in the Dial out ISP
-	//table and then checking for their lack of existance
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
-
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
-
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
-	//The table will now be empty
-
-	delete iTheView;
-	iTheView = 0;
-	iTheView = iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP ) );
-	CleanupStack::Pop();
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNotFound );
-	
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest018_01::doTestStepL( )
-	{
-	Log(_L("Step 018.01 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 018.02
-//
-
-// constructor
-CCommDbTest018_02::CCommDbTest018_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_018_02");
-	}
-
-// destructor
-CCommDbTest018_02::~CCommDbTest018_02()
-	{
-	}
-
-
-TVerdict CCommDbTest018_02::doTestStepPreambleL()
-	{	
-	copyTestDatabase( EDatabase_1 );
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest018_02::executeStepL()
-	{
-	TInt ret=KErrNone;
-
-	//Try to delete the last record in a view and then 
-	//verify its deletion
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	//The DAIL_OUT_ISP table only has 3 records, so we know
-	//we are at the end.
-
-	//Delete the last record
-	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
-
-	//The table should now only have 2 records
-	
-	delete iTheView;
-	iTheView = 0;
-	iTheView = iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP ) );
-	CleanupStack::Pop();
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound ); //no more records
-	
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest018_02::doTestStepL( )
-	{
-	Log(_L("Step 018.02 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 018.03
-//
-
-// constructor
-CCommDbTest018_03::CCommDbTest018_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_018_03");
-	}
-
-// destructor
-CCommDbTest018_03::~CCommDbTest018_03()
-	{
-	}
-
-
-TVerdict CCommDbTest018_03::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(IAP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest018_03::executeStepL()
-	{
-	TInt ret=KErrNone;
-
-	//Delete record in empty view
-	CDBLEAVE( iTheView->DeleteRecord(), KErrNotFound );	
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest018_03::doTestStepL( )
-	{
-	Log(_L("Step 018.03 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 018.04
-//
-
-// constructor
-CCommDbTest018_04::CCommDbTest018_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_018_04");
-	}
-
-// destructor
-CCommDbTest018_04::~CCommDbTest018_04()
-	{
-	}
-
-
-TVerdict CCommDbTest018_04::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_IN_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest018_04::executeStepL()
-	{
-	TInt ret=KErrNone;
-
-	//Delete a read only record 
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-
-	//Delete the read only record #5
-	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
-
-	//Open a new view and check that we've only 4 records left
-	delete iTheView;
-	iTheView = 0;
-	iTheView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP ) );
-	CleanupStack::Pop();
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound ); //no more records
-	
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest018_04::doTestStepL( )
-	{
-	Log(_L("Step 018.04 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 018.05
-//
-
-// constructor
-CCommDbTest018_05::CCommDbTest018_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_018_05");
-	}
-
-// destructor
-CCommDbTest018_05::~CCommDbTest018_05()
-	{
-	}
-
-TVerdict CCommDbTest018_05::doTestStepL( )
-	{
-	Log(_L("Step 018.05 called "));
-
-	iTestStepResult = EPass;
-
-		// Heap test for 018.01
-
-	CCommDbTest018_01* step018_01 = new(ELeave) CCommDbTest018_01;
-	CleanupStack::PushL(step018_01);
-	step018_01->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step018_01, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step018_01);
-
-
-	return iTestStepResult;	
-}
-
-
-//
-//	Test step 018.06
-//
-
-// constructor
-CCommDbTest018_06::CCommDbTest018_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_018_06");
-	}
-
-// destructor
-CCommDbTest018_06::~CCommDbTest018_06()
-	{
-	}
-
-TVerdict CCommDbTest018_06::doTestStepL( )
-	{
-	Log(_L("Step 018.06 called "));
-
-	iTestStepResult = EPass;
-	
-			// Heap test for 018.02
-
-	CCommDbTest018_02* step018_02 = new CCommDbTest018_02;
-	CleanupStack::PushL(step018_02);
-	step018_02->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step018_02, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step018_02);
-	
-	return iTestStepResult;		
-	}
-	
-//
-//	Test step 018.07
-//
-
-// constructor
-CCommDbTest018_07::CCommDbTest018_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_018_07");
-	}
-
-// destructor
-CCommDbTest018_07::~CCommDbTest018_07()
-	{
-	}
-
-TVerdict CCommDbTest018_07::doTestStepL( )
-	{
-	Log(_L("Step 018.07 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 018.03
-
-	CCommDbTest018_03* step018_03 = new CCommDbTest018_03;
-	CleanupStack::PushL(step018_03);
-	step018_03->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step018_03, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step018_03);
-	
-	return iTestStepResult;		
-	}
-	
-//
-//	Test step 018.08
-//
-
-// constructor
-CCommDbTest018_08::CCommDbTest018_08()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_018_08");
-	}
-
-// destructor
-CCommDbTest018_08::~CCommDbTest018_08()
-	{
-	}
-
-TVerdict CCommDbTest018_08::doTestStepL( )
-	{
-	Log(_L("Step 018.08 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 018.04
-
-	CCommDbTest018_04* step018_04 = new CCommDbTest018_04;
-	CleanupStack::PushL(step018_04);
-	step018_04->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step018_04, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step018_04);
-	
-	return iTestStepResult;		
-	}
-	
-
-//EOF
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_018_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-// Copyright (c) 2001-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:
-// step_018_01.h
-// This is the header file for CommDb test 018.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_018_XX_H__)
-#define __STEP_018_XX_H__
-
-
-//
-//	Test step 018.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest018_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest018_01();
-	~CCommDbTest018_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 018.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest018_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest018_02();
-	~CCommDbTest018_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-//
-//	Test step 018.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest018_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest018_03();
-	~CCommDbTest018_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-//
-//	Test step 018.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest018_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest018_04();
-	~CCommDbTest018_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 018.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest018_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest018_05();
-	~CCommDbTest018_05();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-
-//
-//	Test step 018.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest018_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest018_06();
-	~CCommDbTest018_06();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 018.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest018_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest018_07();
-	~CCommDbTest018_07();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 018.08
-//
-
-NONSHARABLE_CLASS(CCommDbTest018_08) : public CTestStepCommDb
-{
-public:
-	CCommDbTest018_08();
-	~CCommDbTest018_08();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-
-
-#endif //(__STEP_018_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_019_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,749 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 019.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_019_xx.h"
-
-
-
-//
-//	Test step 019.01
-//
-
-// constructor
-CCommDbTest019_01::CCommDbTest019_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_019_01");
-	}
-
-// destructor
-CCommDbTest019_01::~CCommDbTest019_01()
-	{
-	}
-
-
-TVerdict CCommDbTest019_01::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-TInt CCommDbTest019_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Select a view and verify the records in it
-
-	//This should just select 2 records
-	iTheView = iTheDb->OpenViewMatchingUintLC( TPtrC(DIAL_OUT_ISP), TPtrC(ISP_TYPE), EIspTypeInternetAndWAP );
-	CleanupStack::Pop();
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-
-	//Check its the record we expect
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( !value.Compare(_L("Record #1")) )
-		{
-		//There should be no more records in the view
-		CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-		ret = KErrNone;
-		}
-	
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest019_01::doTestStepL( )
-	{
-	Log(_L("Step 019.01 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 019.02
-//
-
-// constructor
-CCommDbTest019_02::CCommDbTest019_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_019_02");
-	}
-
-// destructor
-CCommDbTest019_02::~CCommDbTest019_02()
-	{
-	}
-
-
-TVerdict CCommDbTest019_02::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-TInt CCommDbTest019_02::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Select a view and verify the records in it
-
-	//This should just select 2 records
-	iTheView = iTheDb->OpenViewMatchingBoolLC( TPtrC(DIAL_OUT_ISP), TPtrC(ISP_PROMPT_FOR_LOGIN), EFalse );
-	CleanupStack::Pop();
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-
-	//Check its the record we expect
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( !value.Compare(_L("Record #1")) )
-		{
-			// Move onto the second record and check that
-			CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-			iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-			if ( !value.Compare(_L("Record #2")) )
-				{
-				//There should be no more records in the view
-				CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-				ret = KErrNone;
-				}
-		}
-
-	
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest019_02::doTestStepL( )
-	{
-	Log(_L("Step 019.02 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 019.03
-//
-
-// constructor
-CCommDbTest019_03::CCommDbTest019_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_019_03");
-	}
-
-// destructor
-CCommDbTest019_03::~CCommDbTest019_03()
-	{
-	}
-
-
-TVerdict CCommDbTest019_03::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-TInt CCommDbTest019_03::executeStepL()
-	{
-	TInt ret=KErrNone;
-	//Select a view and verify the records in it
-
-	//This should just select 2 records
-	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), _L8("Call me back") );
-	CleanupStack::Pop();
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-
-	//Check its the record we expect
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( !value.Compare(_L("Record #1")) )
-		{
-			// Move onto the second record and check that
-			CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-			iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-			if ( !value.Compare(_L("Record #3")) )
-				{
-				//There should be no more records in the view
-				CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-				ret = KErrNone;
-				}
-		}
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest019_03::doTestStepL( )
-	{
-	Log(_L("Step 019.03 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 019.04
-//
-
-// constructor
-CCommDbTest019_04::CCommDbTest019_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_019_04");
-	}
-
-// destructor
-CCommDbTest019_04::~CCommDbTest019_04()
-	{
-	}
-
-
-TVerdict CCommDbTest019_04::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-TInt CCommDbTest019_04::executeStepL()
-	{
-	TInt ret=KErrNone;
-	//Select a view and verify the records in it
-
-	//This should just select 2 records
-	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), _L("Call me back") );
-	CleanupStack::Pop();
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-
-	//Check its the record we expect
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( !value.Compare(_L("Record #1")) )
-		{
-			// Move onto the second record and check that
-			CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-			iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-			if ( !value.Compare(_L("Record #3")) )
-				{
-				//There should be no more records in the view
-				CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-				ret = KErrNone;
-				}
-		}
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest019_04::doTestStepL( )
-	{
-	Log(_L("Step 019.04 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 019.05
-//
-
-// constructor
-CCommDbTest019_05::CCommDbTest019_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_019_05");
-	}
-
-// destructor
-CCommDbTest019_05::~CCommDbTest019_05()
-	{
-	}
-
-
-TVerdict CCommDbTest019_05::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-TInt CCommDbTest019_05::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	//Select a view on an invalid table
-
-	TRAPD(r, iTheView = iTheDb->OpenViewMatchingTextLC( _L("Invalid"), TPtrC(ISP_IF_CALLBACK_INFO), _L8("Call me back") ) );
-	if ( r== KErrNone )
-		{
-		//The test has failed as the open view did not leave
-		CleanupStack::Pop();
-		}
-		else
-		{
-			//The call did leave
-			ret = r;
-		}
-	
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest019_05::doTestStepL( )
-	{
-	Log(_L("Step 019.05 called "));
-
-
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 019.06
-//
-
-// constructor
-CCommDbTest019_06::CCommDbTest019_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_019_06");
-	}
-
-// destructor
-CCommDbTest019_06::~CCommDbTest019_06()
-	{
-	}
-
-
-TVerdict CCommDbTest019_06::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-TInt CCommDbTest019_06::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	//Select a view on an invalid table
-
-	TRAPD(r, iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(DIAL_OUT_ISP), _L("Invalid"), _L8("Call me back") ) );
-	if ( r== KErrNone )
-		{
-		//The test has failed as the open view did not leave
-		CleanupStack::Pop();
-		}
-		else
-		{
-			//The call did leave
-			ret = r;
-		}
-	
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest019_06::doTestStepL( )
-	{
-	Log(_L("Step 019.06 called "));
-
-
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 019.07
-//
-
-// constructor
-CCommDbTest019_07::CCommDbTest019_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_019_07");
-	}
-
-// destructor
-CCommDbTest019_07::~CCommDbTest019_07()
-	{
-	}
-
-
-TVerdict CCommDbTest019_07::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-TInt CCommDbTest019_07::executeStepL()
-	{
-	TInt ret=KErrNone;
-	//Select a view and verify the records in it
-
-	//This should just select 3 records
-	iTheView = iTheDb->OpenViewMatchingTextLC( TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_NAME), _L8("") );
-	CleanupStack::Pop();
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-
-	//Check its the record we expect
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( !value.Compare(_L("Record #1")) )
-		{
-			// Move onto the second record and check that
-			CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-			iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-			if ( !value.Compare(_L("Record #2")) )
-				{
-				//There should be no more records in the view
-				CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-				iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-				if ( !value.Compare(_L("Record #3")) )
-					{
-					CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-					ret = KErrNone;
-					}
-				}
-		}
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest019_07::doTestStepL( )
-	{
-	Log(_L("Step 019.07 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 019.08
-//
-
-// constructor
-CCommDbTest019_08::CCommDbTest019_08()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_019_08");
-	}
-
-// destructor
-CCommDbTest019_08::~CCommDbTest019_08()
-	{
-	}
-
-TVerdict CCommDbTest019_08::doTestStepL( )
-	{
-	Log(_L("Step 019.08 called "));
-
-	iTestStepResult = EPass;
-
-		// Heap test for 019.01
-
-	CCommDbTest019_01* step019_01 = new(ELeave) CCommDbTest019_01;
-	CleanupStack::PushL(step019_01);
-	step019_01->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step019_01, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step019_01);
-
-
-	return iTestStepResult;	
-
-}
-
-
-//
-//	Test step 019.09
-//
-
-// constructor
-CCommDbTest019_09::CCommDbTest019_09()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_019_09");
-	}
-
-// destructor
-CCommDbTest019_09::~CCommDbTest019_09()
-	{
-	}
-
-TVerdict CCommDbTest019_09::doTestStepL( )
-	{
-	Log(_L("Step 019.09 called "));
-
-	iTestStepResult = EPass;
-	
-			// Heap test for 019.02
-
-	CCommDbTest019_02* step019_02 = new CCommDbTest019_02;
-	CleanupStack::PushL(step019_02);
-	step019_02->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step019_02, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step019_02);
-	
-	return iTestStepResult;
-	
-	}
-	
-//
-//	Test step 019.10
-//
-
-// constructor
-CCommDbTest019_10::CCommDbTest019_10()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_019_10");
-	}
-
-// destructor
-CCommDbTest019_10::~CCommDbTest019_10()
-	{
-	}
-
-TVerdict CCommDbTest019_10::doTestStepL( )
-	{
-	Log(_L("Step 019.10 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 019.03
-
-	CCommDbTest019_03* step019_03 = new CCommDbTest019_03;
-	CleanupStack::PushL(step019_03);
-	step019_03->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step019_03, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step019_03);
-	
-	return iTestStepResult;
-	
-	}
-	
-//
-//	Test step 019.11
-//
-
-// constructor
-CCommDbTest019_11::CCommDbTest019_11()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_019_11");
-	}
-
-// destructor
-CCommDbTest019_11::~CCommDbTest019_11()
-	{
-	}
-
-TVerdict CCommDbTest019_11::doTestStepL( )
-	{
-	Log(_L("Step 019.11 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 019.04
-
-	CCommDbTest019_04* step019_04 = new CCommDbTest019_04;
-	CleanupStack::PushL(step019_04);
-	step019_04->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step019_04, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step019_04);
-	
-	return iTestStepResult;
-	
-	}
-
-//
-//	Test step 019.12
-//
-
-// constructor
-CCommDbTest019_12::CCommDbTest019_12()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_019_12");
-	}
-
-// destructor
-CCommDbTest019_12::~CCommDbTest019_12()
-	{
-	}
-
-TVerdict CCommDbTest019_12::doTestStepL( )
-	{
-	Log(_L("Step 019.12 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 019.05
-
-	CCommDbTest019_05* step019_05 = new CCommDbTest019_05;
-	CleanupStack::PushL(step019_05);
-	step019_05->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step019_05, KErrNotFound) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step019_05);
-	
-	
-	return iTestStepResult;
-	
-	}
-	
-//
-//	Test step 019.13
-//
-
-// constructor
-CCommDbTest019_13::CCommDbTest019_13()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_019_13");
-	}
-
-// destructor
-CCommDbTest019_13::~CCommDbTest019_13()
-	{
-	}
-
-TVerdict CCommDbTest019_13::doTestStepL( )
-	{
-	Log(_L("Step 019.13 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 019.06
-
-	CCommDbTest019_06* step019_06 = new CCommDbTest019_06;
-	CleanupStack::PushL(step019_06);
-	step019_06->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step019_06, KErrNotFound) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step019_06);
-	
-	
-	return iTestStepResult;
-	
-	}
-	
-//
-//	Test step 019.14
-//
-
-// constructor
-CCommDbTest019_14::CCommDbTest019_14()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_019_14");
-	}
-
-// destructor
-CCommDbTest019_14::~CCommDbTest019_14()
-	{
-	}
-
-TVerdict CCommDbTest019_14::doTestStepL( )
-	{
-	Log(_L("Step 019.14 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 019.07
-
-	CCommDbTest019_07* step019_07 = new CCommDbTest019_07;
-	CleanupStack::PushL(step019_07);
-	step019_07->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step019_07, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step019_07);
-	
-	return iTestStepResult;
-	
-	}
-
-//EOF
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_019_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,271 +0,0 @@
-// Copyright (c) 2001-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:
-// step_019_01.h
-// This is the header file for CommDb test 019.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_019_XX_H__)
-#define __STEP_019_XX_H__
-
-
-//
-//	Test step 019.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest019_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest019_01();
-	~CCommDbTest019_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 019.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest019_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest019_02();
-	~CCommDbTest019_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-
-//
-//	Test step 019.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest019_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest019_03();
-	~CCommDbTest019_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 019.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest019_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest019_04();
-	~CCommDbTest019_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 019.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest019_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest019_05();
-	~CCommDbTest019_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 019.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest019_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest019_06();
-	~CCommDbTest019_06();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 019.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest019_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest019_07();
-	~CCommDbTest019_07();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 019.08
-//
-
-NONSHARABLE_CLASS(CCommDbTest019_08) : public CTestStepCommDb
-{
-public:
-	CCommDbTest019_08();
-	~CCommDbTest019_08();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-
-//
-//	Test step 019.09
-//
-
-NONSHARABLE_CLASS(CCommDbTest019_09) : public CTestStepCommDb
-{
-public:
-	CCommDbTest019_09();
-	~CCommDbTest019_09();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 019.10
-//
-
-NONSHARABLE_CLASS(CCommDbTest019_10) : public CTestStepCommDb
-{
-public:
-	CCommDbTest019_10();
-	~CCommDbTest019_10();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-//
-//	Test step 019.11
-//
-
-NONSHARABLE_CLASS(CCommDbTest019_11) : public CTestStepCommDb
-{
-public:
-	CCommDbTest019_11();
-	~CCommDbTest019_11();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 019.12
-//
-
-NONSHARABLE_CLASS(CCommDbTest019_12) : public CTestStepCommDb
-{
-public:
-	CCommDbTest019_12();
-	~CCommDbTest019_12();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 019.13
-//
-
-NONSHARABLE_CLASS(CCommDbTest019_13) : public CTestStepCommDb
-{
-public:
-	CCommDbTest019_13();
-	~CCommDbTest019_13();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 019.14
-//
-
-NONSHARABLE_CLASS(CCommDbTest019_14) : public CTestStepCommDb
-{
-public:
-	CCommDbTest019_14();
-	~CCommDbTest019_14();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-
-#endif //(__STEP_019_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_020_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,535 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 020.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_020_xx.h"
-
-//
-//	Test step 020.01
-//
-
-// constructor
-CCommDbTest020_01::CCommDbTest020_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_020_01");
-	}
-
-// destructor
-CCommDbTest020_01::~CCommDbTest020_01()
-	{
-	}
-
-
-TVerdict CCommDbTest020_01::doTestStepPreambleL()
-	{
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest020_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TBuf<64> buffer;
-
-	_LIT(KAgent,"Agent");
-
-	TRAPD(r1,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent));
-	TRAPD(r2,iTheDb->GetAgentL(TPtrC(DIAL_OUT_ISP),buffer));
-
-	if(r1==KErrNotSupported && r2==KErrNotSupported)
-		{
-		return KErrNotSupported;
-		}
-	
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest020_01::doTestStepL( )
-	{
-	Log(_L("Step 020.01 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 020.02
-//
-
-// constructor
-CCommDbTest020_02::CCommDbTest020_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_020_02");
-	}
-
-// destructor
-CCommDbTest020_02::~CCommDbTest020_02()
-	{
-	}
-
-
-TVerdict CCommDbTest020_02::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-TInt CCommDbTest020_02::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TBuf<64> buffer;
-
-	_LIT(KAgent1,"Agent1");
-	_LIT(KAgentExt,"Csd");
-
-	TRAPD(r1,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent1));
-
-	TRAPD(r2,iTheDb->SetAgentExtL(TPtrC(DIAL_OUT_ISP),KAgentExt));
-	TRAPD(r3,iTheDb->GetAgentExtL(TPtrC(DIAL_OUT_ISP),buffer));
-	if(r3 != KErrNone)
-		{
-		return r3;
-		}
-
-	if(r1==KErrNotSupported && r2==KErrNotSupported)
-		{
-		return KErrNotSupported;
-		}
-	
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest020_02::doTestStepL( )
-	{
-	Log(_L("Step 020.02 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 020.03
-//
-
-// constructor
-CCommDbTest020_03::CCommDbTest020_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_020_03");
-	}
-
-// destructor
-CCommDbTest020_03::~CCommDbTest020_03()
-	{
-	}
-
-
-TVerdict CCommDbTest020_03::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-TInt CCommDbTest020_03::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Try to set the agent for a non-service table
-	_LIT(KAgent1,"Agent1");
-
-	TRAPD( r, iTheDb->SetAgentL(TPtrC(LOCATION),KAgent1) );
-	if (r==KErrNotSupported )
-		ret = r;
-	
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest020_03::doTestStepL( )
-	{
-	Log(_L("Step 020.03 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 020.04
-//
-
-// constructor
-CCommDbTest020_04::CCommDbTest020_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_020_04");
-	}
-
-// destructor
-CCommDbTest020_04::~CCommDbTest020_04()
-	{
-	}
-
-
-TVerdict CCommDbTest020_04::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-TInt CCommDbTest020_04::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-
-	//Try to set the agent extension for a non-service table
-
-	_LIT(KAgentExt,"Csd");
-
-	TRAPD(r, iTheDb->SetAgentExtL(TPtrC(LOCATION), KAgentExt) );
-	if ( r==KErrNotSupported )
-		ret = r;
-	
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest020_04::doTestStepL( )
-	{
-	Log(_L("Step 020.04 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-
-
-
-//
-//	Test step 020.05
-//
-
-// constructor
-CCommDbTest020_05::CCommDbTest020_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_020_05");
-	}
-
-// destructor
-CCommDbTest020_05::~CCommDbTest020_05()
-	{
-	}
-
-
-TVerdict CCommDbTest020_05::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-TInt CCommDbTest020_05::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Try to open a view on the agent table
-	
-	TRAPD(r, iTheView = iTheDb->OpenTableLC(_L("NonExisting")); CleanupStack::Pop(); );
-
-	if ( r==KErrNotFound )
-		ret = r;
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest020_05::doTestStepL( )
-	{
-
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 020.06
-//
-
-// constructor
-CCommDbTest020_06::CCommDbTest020_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_020_06");
-	}
-
-// destructor
-CCommDbTest020_06::~CCommDbTest020_06()
-	{
-	}
-
-
-TVerdict CCommDbTest020_06::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest020_06::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TBuf<64> buffer;
-
-	//Check that the agent setting can be overridden
-
-	_LIT(KAgent1,"Agent1");
-	_LIT(KAgent2,"Agent2");
-
-	//Set the agent 
-	TRAPD(r1,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent1));
-	//Add a new agent and verify
-	TRAPD(r2,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent2));
-	TRAPD(r3,iTheDb->GetAgentL(TPtrC(DIAL_OUT_ISP),buffer));
-	if (r1==KErrNotSupported && r2==KErrNotSupported && r3==KErrNotSupported)
-		ret = KErrNotSupported;
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest020_06::doTestStepL( )
-	{
-	Log(_L("Step 020.06 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 020.07
-//
-
-// constructor
-CCommDbTest020_07::CCommDbTest020_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_020_07");
-	}
-
-// destructor
-CCommDbTest020_07::~CCommDbTest020_07()
-	{
-	}
-
-
-TVerdict CCommDbTest020_07::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest020_07::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TBuf<64> buffer;
-
-	//Check that the agent settings can be deleted
-
-	_LIT(KAgent,"Agent");
-	_LIT(KExtension,"psd");
-
-	//Set the agent 
-	TRAPD(r1,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent));
-	TRAPD(r2,iTheDb->SetAgentExtL(TPtrC(DIAL_OUT_ISP),KExtension));
-
-	//Clear the settings
-	TRAPD(r3,iTheDb->ClearAgentAndExtL( TPtrC(DIAL_OUT_ISP)));
-
-	//Now try to read the settings
-	TRAPD( r4, iTheDb->GetAgentL(TPtrC(DIAL_OUT_ISP),buffer) );
-	TRAPD( r5, iTheDb->GetAgentExtL(TPtrC(DIAL_OUT_ISP),buffer) );
-
-	if(r1==KErrNotSupported && r2==KErrNotSupported && r3==KErrNotSupported
-		&& r4==KErrNotSupported && r5==KErrNotSupported)
-		{
-		ret = KErrNotSupported;
-		}
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest020_07::doTestStepL( )
-	{
-	Log(_L("Step 020.07 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 020.08
-//
-
-// constructor
-CCommDbTest020_08::CCommDbTest020_08()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_020_08");
-	}
-
-// destructor
-CCommDbTest020_08::~CCommDbTest020_08()
-	{
-	}
-
-TVerdict CCommDbTest020_08::doTestStepL( )
-	{
-	Log(_L("Step 020.08 called "));
-
-	iTestStepResult = EPass;
-
-		// Heap test for 020.01
-
-	CCommDbTest020_01* step020_01 = new(ELeave) CCommDbTest020_01;
-	CleanupStack::PushL(step020_01);
-	step020_01->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step020_01, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step020_01);
-
-
-		// Heap test for 020.02
-
-	CCommDbTest020_02* step020_02 = new CCommDbTest020_02;
-	CleanupStack::PushL(step020_02);
-	step020_02->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step020_02, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step020_02);
-
-		// Heap test for 020.03
-
-	CCommDbTest020_03* step020_03 = new CCommDbTest020_03;
-	CleanupStack::PushL(step020_03);
-	step020_03->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step020_03, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step020_03);
-
-
-		// Heap test for 020.04
-
-	CCommDbTest020_04* step020_04 = new CCommDbTest020_04;
-	CleanupStack::PushL(step020_04);
-	step020_04->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step020_04, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step020_04);
-
-
-		// Heap test for 020.06
-
-	CCommDbTest020_06* step020_06 = new CCommDbTest020_06;
-	CleanupStack::PushL(step020_06);
-	step020_06->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step020_06, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step020_06);
-
-
-
-		// Heap test for 020.07
-
-	CCommDbTest020_07* step020_07 = new CCommDbTest020_07;
-	CleanupStack::PushL(step020_07);
-	step020_07->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step020_07, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step020_07);
-
-
-
-
-	return iTestStepResult;	
-
-}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_020_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +0,0 @@
-// Copyright (c) 2001-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:
-// step_020_01.h
-// This is the header file for CommDb test 020.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_020_XX_H__)
-#define __STEP_020_XX_H__
-
-
-//
-//	Test step 020.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest020_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest020_01();
-	~CCommDbTest020_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 020.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest020_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest020_02();
-	~CCommDbTest020_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-
-//
-//	Test step 020.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest020_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest020_03();
-	~CCommDbTest020_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 020.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest020_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest020_04();
-	~CCommDbTest020_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 020.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest020_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest020_05();
-	~CCommDbTest020_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 020.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest020_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest020_06();
-	~CCommDbTest020_06();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 020.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest020_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest020_07();
-	~CCommDbTest020_07();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-//
-//	Test step 020.08
-//
-
-NONSHARABLE_CLASS(CCommDbTest020_08) : public CTestStepCommDb
-{
-public:
-	CCommDbTest020_08();
-	~CCommDbTest020_08();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-
-#endif //(__STEP_020_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_021_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,354 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 021.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_021_xx.h"
-
-
-//
-//	Test step 021.01
-//
-
-// constructor
-CCommDbTest021_01::CCommDbTest021_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_021_01");
-	}
-
-// destructor
-CCommDbTest021_01::~CCommDbTest021_01()
-	{
-	}
-
-
-TVerdict CCommDbTest021_01::doTestStepPreambleL()
-	{
-	// Have a temp copy of database
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest021_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Sets and verifies the client timeout
-
-	//Set up the agent first
-	_LIT(KAgent1,"Agent1");
-	_LIT(KAgentExt,"Csd");
-	TRAPD(r1,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent1));
-	TRAPD(r2,iTheDb->SetAgentExtL(TPtrC(DIAL_OUT_ISP),KAgentExt));
-
-	TUint timeout = 6;
-	TInt value(0);
-
-	TRAPD(r3,iTheDb->SetAgentClientTimeoutL(TPtrC(DIAL_OUT_ISP),timeout));
-	TRAPD(r4,value = iTheDb->GetAgentClientTimeoutL(TPtrC(DIAL_OUT_ISP)));
-
-	if(r1==KErrNotSupported && r2==KErrNotSupported && r3==KErrNotSupported
-		&& (r4==KErrNotSupported || value==KErrNotSupported))
-		{
-		return KErrNotSupported;
-		}
-	
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest021_01::doTestStepL( )
-	{
-	Log(_L("Step 021.01 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 021.02
-//
-
-// constructor
-CCommDbTest021_02::CCommDbTest021_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_021_02");
-	}
-
-// destructor
-CCommDbTest021_02::~CCommDbTest021_02()
-	{
-	}
-
-
-TVerdict CCommDbTest021_02::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest021_02::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Try to set the timeout for an incorrect table
-
-	//Set up the agent first
-	_LIT(KAgent1,"Agent1");
-	_LIT(KAgentExt,"Csd");
-	TRAPD(r1,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent1));
-	TRAPD(r2,iTheDb->SetAgentExtL(TPtrC(DIAL_OUT_ISP),KAgentExt));
-
-	TUint timeout = 0x100;
-	TRAPD(r3, iTheDb->SetAgentClientTimeoutL(TPtrC(LOCATION), timeout));
-
-	if(r1==KErrNotSupported && r2==KErrNotSupported && r3==KErrNotSupported)
-		{
-		return KErrNotSupported;
-		}
-		
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest021_02::doTestStepL( )
-	{
-	Log(_L("Step 021.02 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 021.03
-//
-
-// constructor
-CCommDbTest021_03::CCommDbTest021_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_021_03");
-	}
-
-// destructor
-CCommDbTest021_03::~CCommDbTest021_03()
-	{
-	}
-
-
-TVerdict CCommDbTest021_03::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest021_03::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Sets and verifies the routet timeout
-
-	//Set up the agent first
-	_LIT(KAgent1,"Agent1");
-	_LIT(KAgentExt,"Csd");
-	TRAPD(r1,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent1));
-	TRAPD(r2,iTheDb->SetAgentExtL(TPtrC(DIAL_OUT_ISP),KAgentExt));
-
-	TUint timeout = 0x100;
-	TInt value(0);
-
-	TRAPD(r3,iTheDb->SetAgentRouteTimeoutL(TPtrC(DIAL_OUT_ISP),timeout));
-	TRAPD(r4,value = iTheDb->GetAgentRouteTimeoutL(TPtrC(DIAL_OUT_ISP)));
-
-	if(r1==KErrNotSupported && r2==KErrNotSupported && r3==KErrNotSupported
-		&& (r4==KErrNotSupported || value==KErrNotSupported))
-		{
-		return KErrNotSupported;
-		}
-	
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest021_03::doTestStepL( )
-	{
-	Log(_L("Step 021.03 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 021.04
-//
-
-// constructor
-CCommDbTest021_04::CCommDbTest021_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_021_04");
-	}
-
-// destructor
-CCommDbTest021_04::~CCommDbTest021_04()
-	{
-	}
-
-
-TVerdict CCommDbTest021_04::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest021_04::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Try to set the timeout for an incorrect table
-
-	//Set up the agent first
-	_LIT(KAgent1,"Agent1");
-	_LIT(KAgentExt,"Csd");
-	TRAPD(r1,iTheDb->SetAgentL(TPtrC(DIAL_OUT_ISP),KAgent1));
-	TRAPD(r2,iTheDb->SetAgentExtL(TPtrC(DIAL_OUT_ISP),KAgentExt));
-
-	TUint timeout = 0x100;
-	
-	TRAPD(r3, iTheDb->SetAgentRouteTimeoutL(TPtrC(LOCATION), timeout) );
-
-	if(r1==KErrNotSupported && r2==KErrNotSupported && r3==KErrNotSupported)
-		{
-		return KErrNotSupported;
-		}
-	
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest021_04::doTestStepL( )
-	{
-	Log(_L("Step 021.04 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-
-//
-//	Test step 021.05
-//
-
-// constructor
-CCommDbTest021_05::CCommDbTest021_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_021_05");
-	}
-
-// destructor
-CCommDbTest021_05::~CCommDbTest021_05()
-	{
-	}
-
-TVerdict CCommDbTest021_05::doTestStepL( )
-	{
-	Log(_L("Step 021.05 called "));
-
-	iTestStepResult = EPass;
-
-		// Heap test for 021.01
-
-	CCommDbTest021_01* step021_01 = new(ELeave) CCommDbTest021_01;
-	CleanupStack::PushL(step021_01);
-	step021_01->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step021_01, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step021_01);
-
-
-		// Heap test for 021.02
-
-	CCommDbTest021_02* step021_02 = new CCommDbTest021_02;
-	CleanupStack::PushL(step021_02);
-	step021_02->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step021_02, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step021_02);
-
-		// Heap test for 021.03
-
-	CCommDbTest021_03* step021_03 = new CCommDbTest021_03;
-	CleanupStack::PushL(step021_03);
-	step021_03->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step021_03, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step021_03);
-
-
-		// Heap test for 021.04
-
-	CCommDbTest021_04* step021_04 = new CCommDbTest021_04;
-	CleanupStack::PushL(step021_04);
-	step021_04->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step021_04, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step021_04);
-
-
-
-	return iTestStepResult;	
-
-}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_021_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-// Copyright (c) 2001-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:
-// step_021_01.h
-// This is the header file for CommDb test 021.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_021_XX_H__)
-#define __STEP_021_XX_H__
-
-
-//
-//	Test step 021.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest021_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest021_01();
-	~CCommDbTest021_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 021.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest021_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest021_02();
-	~CCommDbTest021_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-
-//
-//	Test step 021.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest021_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest021_03();
-	~CCommDbTest021_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 021.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest021_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest021_04();
-	~CCommDbTest021_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 021.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest021_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest021_05();
-	~CCommDbTest021_05();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-
-#endif //(__STEP_021_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_022_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1573 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 022.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_022_xx.h"
-
-
-//
-//	Test step 022.01
-//
-
-// constructor
-CCommDbTest022_01::CCommDbTest022_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_01");
-	}
-
-// destructor
-CCommDbTest022_01::~CCommDbTest022_01()
-	{
-	}
-
-
-TVerdict CCommDbTest022_01::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest022_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Open a view on the IAP table, then check the records returned
-	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerCSD, ECommDbConnectionDirectionOutgoing);
-	CleanupStack::Pop();
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( !value.Compare(_L("Record #1")) )
-		{
-		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
-		if ( !value.Compare(_L("Record #2")) )
-		{
-			//There should be no more records
-			CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-			ret = KErrNone;
-		}
-	}
-	
-	return ret;
-	}
-
-
-TVerdict CCommDbTest022_01::doTestStepL( )
-	{
-	Log(_L("Step 022.01 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-
-//
-//	Test step 022.02
-//
-
-// constructor
-CCommDbTest022_02::CCommDbTest022_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_02");
-	}
-
-// destructor
-CCommDbTest022_02::~CCommDbTest022_02()
-	{
-	}
-
-
-TVerdict CCommDbTest022_02::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest022_02::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Open a view on the IAP table, then check the records returned
-	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerCSD, ECommDbConnectionDirectionIncoming);
-	CleanupStack::Pop();
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( !value.Compare(_L("Record #3")) )
-		{
-		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
-		if ( !value.Compare(_L("Record #4")) )
-			{
-			CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-			iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
-			if ( !value.Compare(_L("Record #6")) )
-				{
-				//There should be no more records
-				CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-				ret = KErrNone;
-				}
-			}
-	}
-	
-	return ret;
-	}
-
-
-TVerdict CCommDbTest022_02::doTestStepL( )
-	{
-	Log(_L("Step 022.02 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 022.03
-//
-
-// constructor
-CCommDbTest022_03::CCommDbTest022_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_03");
-	}
-
-// destructor
-CCommDbTest022_03::~CCommDbTest022_03()
-	{
-	}
-
-
-TVerdict CCommDbTest022_03::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest022_03::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Open a view on the IAP table, then check the records returned
-	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerWcdma, ECommDbConnectionDirectionOutgoing);
-	CleanupStack::Pop();
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( !value.Compare(_L("Record #5")) )
-		{
-		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
-		if ( !value.Compare(_L("Record #7")) )
-		{
-			//There should be no more records
-			CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-			ret = KErrNone;
-		}
-	}
-	
-	return ret;
-	}
-
-
-TVerdict CCommDbTest022_03::doTestStepL( )
-	{
-	Log(_L("Step 022.03 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 022.04
-//
-
-// constructor
-CCommDbTest022_04::CCommDbTest022_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_04");
-	}
-
-// destructor
-CCommDbTest022_04::~CCommDbTest022_04()
-	{
-	}
-
-
-TVerdict CCommDbTest022_04::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest022_04::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Open a view on the IAP table, then check the records returned
-	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerCSD, ECommDbConnectionDirectionOutgoing);
-	CleanupStack::Pop();
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( !value.Compare(_L("Record #1")) )
-		{
-		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
-		if ( !value.Compare(_L("Record #2")) )
-		{
-			//There should be no more records
-			CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-			ret = KErrNone;
-		}
-	}
-	
-	return ret;
-	}
-
-
-TVerdict CCommDbTest022_04::doTestStepL( )
-	{
-	Log(_L("Step 022.04 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-
-//
-//	Test step 022.05
-//
-
-// constructor
-CCommDbTest022_05::CCommDbTest022_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_05");
-	}
-
-// destructor
-CCommDbTest022_05::~CCommDbTest022_05()
-	{
-	}
-
-
-TVerdict CCommDbTest022_05::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest022_05::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Open a view on the IAP table, then check the records returned
-	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerWcdma, ECommDbConnectionDirectionIncoming);
-	CleanupStack::Pop();
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( !value.Compare(_L("Record #9")) )
-		{
-		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
-		if ( !value.Compare(_L("Record #10")) )
-		{
-			//There should be no more records
-			CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-			ret = KErrNone;
-		}
-	}
-	
-	return ret;
-	}
-
-
-TVerdict CCommDbTest022_05::doTestStepL( )
-	{
-	Log(_L("Step 022.05 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 022.06
-//
-
-// constructor
-CCommDbTest022_06::CCommDbTest022_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_06");
-	}
-
-// destructor
-CCommDbTest022_06::~CCommDbTest022_06()
-	{
-	}
-
-
-TVerdict CCommDbTest022_06::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest022_06::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Open a view on the IAP table, then check the records returned
-	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerWcdma, ECommDbConnectionDirectionIncoming);
-	CleanupStack::Pop();
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( !value.Compare(_L("Record #9")) )
-		{
-		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
-		if ( !value.Compare(_L("Record #10")) )
-		{
-			//There should be no more records
-			CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-			ret = KErrNone;
-		}
-	}
-	
-	return ret;
-	}
-
-
-TVerdict CCommDbTest022_06::doTestStepL( )
-	{
-	Log(_L("Step 022.06 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 022.07
-//
-
-// constructor
-CCommDbTest022_07::CCommDbTest022_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_07");
-	}
-
-// destructor
-CCommDbTest022_07::~CCommDbTest022_07()
-	{
-	}
-
-
-TVerdict CCommDbTest022_07::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest022_07::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Open a view on the IAP table, then check the records returned
-	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerCSD, ECommDbConnectionDirectionIncoming);
-	CleanupStack::Pop();
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( !value.Compare(_L("Record #3")) )
-		{
-		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
-		if ( !value.Compare(_L("Record #4")) )
-			{
-			CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-			iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
-			if ( !value.Compare(_L("Record #6")) )
-				{
-				//There should be no more records
-				CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-				ret = KErrNone;
-				}
-			}
-	}
-	
-	return ret;
-	}
-
-
-TVerdict CCommDbTest022_07::doTestStepL( )
-	{
-	Log(_L("Step 022.07 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 022.08
-//
-
-// constructor
-CCommDbTest022_08::CCommDbTest022_08()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_08");
-	}
-
-// destructor
-CCommDbTest022_08::~CCommDbTest022_08()
-	{
-	}
-
-
-TVerdict CCommDbTest022_08::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest022_08::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Open a view on the IAP table, then check the records returned
-	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerLAN, ECommDbConnectionDirectionIncoming);
-	CleanupStack::Pop();
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( !value.Compare(_L("Record #11")) )
-		{
-		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
-		if ( !value.Compare(_L("Record #12")) )
-		{
-			//There should be no more records
-			CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-			ret = KErrNone;
-		}
-	}
-	
-	return ret;
-	}
-
-
-TVerdict CCommDbTest022_08::doTestStepL( )
-	{
-	Log(_L("Step 022.08 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 022.09
-//
-
-// constructor
-CCommDbTest022_09::CCommDbTest022_09()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_09");
-	}
-
-// destructor
-CCommDbTest022_09::~CCommDbTest022_09()
-	{
-	}
-
-
-TVerdict CCommDbTest022_09::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest022_09::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Open a view on the IAP table, then check the records returned
-	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerLAN, ECommDbConnectionDirectionOutgoing);
-	CleanupStack::Pop();
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( !value.Compare(_L("Record #11")) )
-		{
-		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
-		if ( !value.Compare(_L("Record #12")) )
-		{
-			//There should be no more records
-			CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-			ret = KErrNone;
-		}
-	}
-	
-	return ret;
-	}
-
-
-TVerdict CCommDbTest022_09::doTestStepL( )
-	{
-	Log(_L("Step 022.09 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 022.10
-//
-
-// constructor
-CCommDbTest022_10::CCommDbTest022_10()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_10");
-	}
-
-// destructor
-CCommDbTest022_10::~CCommDbTest022_10()
-	{
-	}
-
-
-TVerdict CCommDbTest022_10::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest022_10::executeStepL()
-	{
-	TInt ret=KErrNone;
-
-	//Open a view with multiple bearers on the IAP table, then check the records returned
-	iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerCSD | KCommDbBearerLAN, ECommDbConnectionDirectionOutgoing);
-	CleanupStack::Pop();
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	TBuf<KCommsDbSvrMaxFieldLength> value;
-	iTheView->ReadTextL( TPtrC(COMMDB_NAME), value );
-	if( value.Compare(_L("Record #1")) && ret == KErrNone)
-		{
-		ret = KErrGeneral;
-		}
-	else
-		{
-		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
-		}
-
-	if ( value.Compare(_L("Record #2"))  && ret == KErrNone )
-		{
-		ret = KErrGeneral;
-		}
-	else
-		{
-		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
-		}
-
-	if ( value.Compare(_L("Record #11"))  && ret == KErrNone )
-		{
-		ret = KErrGeneral;
-		}
-	else
-		{
-		CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-		iTheView->ReadTextL( TPtrC(COMMDB_NAME), value);
-		}
-		
-	if ( value.Compare(_L("Record #12"))  && ret == KErrNone )
-		{
-		ret = KErrGeneral;
-		}
-	else
-		{
-		CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-		}
-		
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest022_10::doTestStepL( )
-	{
-	Log(_L("Step 022.10 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 022.11
-//
-
-// constructor
-CCommDbTest022_11::CCommDbTest022_11()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_11");
-	}
-
-// destructor
-CCommDbTest022_11::~CCommDbTest022_11()
-	{
-	}
-
-
-TVerdict CCommDbTest022_11::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-#define INVALID_BEARER 0x200
-
-TInt CCommDbTest022_11::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-
-	TRAPD( r, iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( INVALID_BEARER , ECommDbConnectionDirectionOutgoing) );
-	if ( r!=KErrNone )
-		{
-		ret = r;
-		}
-	else
-		{
-		//Shouldnt get here, but just in case ....
-		CleanupStack::Pop();
-		}
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest022_11::doTestStepL( )
-	{
-	Log(_L("Step 022.11 called "));
-
-
-	if ( executeStepL() == KErrArgument )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-
-//
-//	Test step 022.12
-//
-
-// constructor
-CCommDbTest022_12::CCommDbTest022_12()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_12");
-	}
-
-// destructor
-CCommDbTest022_12::~CCommDbTest022_12()
-	{
-	}
-
-
-TVerdict CCommDbTest022_12::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-#define INVALID_DIRECTION 0xF
-
-TInt CCommDbTest022_12::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Due to the strong type checking in C++, this test step is not particularly valid
-	TRAPD( r, iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerCSD , (TCommDbConnectionDirection)INVALID_DIRECTION ) );
-	if ( r!=KErrNone )
-		{
-		ret = r;
-		}
-	else
-		{
-		//Shouldnt get here, but just in case ....
-		CleanupStack::Pop();
-		}
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest022_12::doTestStepL( )
-	{
-	Log(_L("Step 022.12 called "));
-
-
-	if ( executeStepL() == KErrArgument )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 022.13
-//
-
-// constructor
-CCommDbTest022_13::CCommDbTest022_13()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_13");
-	}
-
-// destructor
-CCommDbTest022_13::~CCommDbTest022_13()
-	{
-	}
-
-
-TVerdict CCommDbTest022_13::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-TInt CCommDbTest022_13::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	
-	//Due to the strong type checking in C++, this test step is not particularly valid
-	TRAPD( r, iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerCSD , (TCommDbConnectionDirection)5 ) );
-	if ( r!=KErrNone )
-		{
-		ret = r;
-		}
-	else
-		{
-		//Shouldnt get here, but just in case ....
-		CleanupStack::Pop();
-		}
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest022_13::doTestStepL( )
-	{
-	Log(_L("Step 022.13 called "));
-
-
-	if ( executeStepL() == KErrArgument )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 022.14
-//
-
-// constructor
-CCommDbTest022_14::CCommDbTest022_14()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_14");
-	}
-
-// destructor
-CCommDbTest022_14::~CCommDbTest022_14()
-	{
-	}
-
-
-TVerdict CCommDbTest022_14::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-#define INVALID_DIRECTION2 0xffffffff
-
-TInt CCommDbTest022_14::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Due to the strong type checking in C++, this test step is not particularly valid
-	TRAPD( r, iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( KCommDbBearerCSD , (TCommDbConnectionDirection)INVALID_DIRECTION2 ) );
-	if ( r!=KErrNone )
-		{
-		ret = r;
-		}
-	else
-		{
-		//Shouldnt get here, but just in case ....
-		CleanupStack::Pop();
-		}
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest022_14::doTestStepL( )
-	{
-	Log(_L("Step 022.14 called "));
-
-
-	if ( executeStepL() == KErrArgument )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 022.15
-//
-
-// constructor
-CCommDbTest022_15::CCommDbTest022_15()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_15");
-	}
-
-// destructor
-CCommDbTest022_15::~CCommDbTest022_15()
-	{
-	}
-
-
-TVerdict CCommDbTest022_15::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-#define UNSUPPORTED_BEARER 0x30
-
-TInt CCommDbTest022_15::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	// Similar to test 022_11, but with direction incoming...
-
-	TRAPD( r, iTheView = iTheDb->OpenIAPTableViewMatchingBearerSetLC( UNSUPPORTED_BEARER , ECommDbConnectionDirectionIncoming) );
-	if ( r!=KErrNone )
-		{
-		ret = r;
-		}
-	else
-		{
-		//Shouldnt get here, but just in case ....
-		CleanupStack::Pop();
-		}
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest022_15::doTestStepL( )
-	{
-	Log(_L("Step 022.15 called "));
-
-
-	if ( executeStepL() == KErrArgument )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 022.16
-//
-
-// constructor
-CCommDbTest022_16::CCommDbTest022_16()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_16");
-	}
-
-// destructor
-CCommDbTest022_16::~CCommDbTest022_16()
-	{
-	}
-
-TVerdict CCommDbTest022_16::doTestStepL( )
-	{
-	Log(_L("Step 022.16 called "));
-
-	iTestStepResult = EPass;
-
-		// Heap test for 022.01
-
-	CCommDbTest022_01* step022_01 = new(ELeave) CCommDbTest022_01;
-	CleanupStack::PushL(step022_01);
-	step022_01->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step022_01, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step022_01);
-
-
-
-	return iTestStepResult;	
-
-}
-
-
-//
-//	Test step 022.17
-//
-
-// constructor
-CCommDbTest022_17::CCommDbTest022_17()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_17");
-	}
-
-// destructor
-CCommDbTest022_17::~CCommDbTest022_17()
-	{
-	}
-
-TVerdict CCommDbTest022_17::doTestStepL( )
-	{
-	Log(_L("Step 022.17 called "));
-
-	iTestStepResult = EPass;
-	
-			// Heap test for 022.02
-
-	CCommDbTest022_02* step022_02 = new CCommDbTest022_02;
-	CleanupStack::PushL(step022_02);
-	step022_02->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step022_02, KErrNone) == EFail ) 
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step022_02);
-	
-	return iTestStepResult;
-	
-	}
-
-//
-//	Test step 022.18
-//
-
-// constructor
-CCommDbTest022_18::CCommDbTest022_18()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_18");
-	}
-
-// destructor
-CCommDbTest022_18::~CCommDbTest022_18()
-	{
-	}
-
-TVerdict CCommDbTest022_18::doTestStepL( )
-	{
-	Log(_L("Step 022.18 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 022.03
-
-	CCommDbTest022_03* step022_03 = new CCommDbTest022_03;
-	CleanupStack::PushL(step022_03);
-	step022_03->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step022_03, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step022_03);
-	
-	return iTestStepResult;
-	
-	}
-
-//
-//	Test step 022.19
-//
-
-// constructor
-CCommDbTest022_19::CCommDbTest022_19()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_19");
-	}
-
-// destructor
-CCommDbTest022_19::~CCommDbTest022_19()
-	{
-	}
-
-TVerdict CCommDbTest022_19::doTestStepL( )
-	{
-	Log(_L("Step 022.19 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 022.04
-
-	CCommDbTest022_04* step022_04 = new CCommDbTest022_04;
-	CleanupStack::PushL(step022_04);
-	step022_04->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step022_04, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step022_04);
-	
-	return iTestStepResult;
-	
-	}
-	
-//
-//	Test step 022.20
-//
-
-// constructor
-CCommDbTest022_20::CCommDbTest022_20()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_20");
-	}
-
-// destructor
-CCommDbTest022_20::~CCommDbTest022_20()
-	{
-	}
-
-TVerdict CCommDbTest022_20::doTestStepL( )
-	{
-	Log(_L("Step 022.20 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 022.05
-
-	CCommDbTest022_05* step022_05 = new CCommDbTest022_05;
-	CleanupStack::PushL(step022_05);
-	step022_05->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step022_05, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step022_05);
-	
-	return iTestStepResult;
-	
-	}
-	
-//
-//	Test step 022.21
-//
-
-// constructor
-CCommDbTest022_21::CCommDbTest022_21()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_21");
-	}
-
-// destructor
-CCommDbTest022_21::~CCommDbTest022_21()
-	{
-	}
-
-TVerdict CCommDbTest022_21::doTestStepL( )
-	{
-	Log(_L("Step 022.21 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 022.06
-
-	CCommDbTest022_06* step022_06 = new CCommDbTest022_06;
-	CleanupStack::PushL(step022_06);
-	step022_06->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step022_06, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step022_06);
-	
-	return iTestStepResult;
-	
-	}
-	
-//
-//	Test step 022.22
-//
-
-// constructor
-CCommDbTest022_22::CCommDbTest022_22()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_22");
-	}
-
-// destructor
-CCommDbTest022_22::~CCommDbTest022_22()
-	{
-	}
-
-TVerdict CCommDbTest022_22::doTestStepL( )
-	{
-	Log(_L("Step 022.22 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 022.07
-
-	CCommDbTest022_07* step022_07 = new CCommDbTest022_07;
-	CleanupStack::PushL(step022_07);
-	step022_07->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step022_07, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step022_07);
-	
-	return iTestStepResult;
-	
-	}
-	
-//
-//	Test step 022.23
-//
-
-// constructor
-CCommDbTest022_23::CCommDbTest022_23()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_23");
-	}
-
-// destructor
-CCommDbTest022_23::~CCommDbTest022_23()
-	{
-	}
-
-TVerdict CCommDbTest022_23::doTestStepL( )
-	{
-	Log(_L("Step 022.23 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 022.08
-
-	CCommDbTest022_08* step022_08 = new CCommDbTest022_08;
-	CleanupStack::PushL(step022_08);
-	step022_08->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step022_08, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step022_08);
-	
-	return iTestStepResult;
-	
-	}	
-	
-//
-//	Test step 022.24
-//
-
-// constructor
-CCommDbTest022_24::CCommDbTest022_24()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_24");
-	}
-
-// destructor
-CCommDbTest022_24::~CCommDbTest022_24()
-	{
-	}
-
-TVerdict CCommDbTest022_24::doTestStepL( )
-	{
-	Log(_L("Step 022.24 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 022.09
-
-	CCommDbTest022_09* step022_09 = new CCommDbTest022_09;
-	CleanupStack::PushL(step022_09);
-	step022_09->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step022_09, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step022_09);
-	
-	return iTestStepResult;
-	
-	}		
-	
-//
-//	Test step 022.25
-//
-
-// constructor
-CCommDbTest022_25::CCommDbTest022_25()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_25");
-	}
-
-// destructor
-CCommDbTest022_25::~CCommDbTest022_25()
-	{
-	}
-
-TVerdict CCommDbTest022_25::doTestStepL( )
-	{
-	Log(_L("Step 022.25 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 022.10
-
-	CCommDbTest022_10* step022_10 = new CCommDbTest022_10;
-	CleanupStack::PushL(step022_10);
-	step022_10->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step022_10, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step022_10);
-	
-	return iTestStepResult;
-	
-	}		
-	
-//
-//	Test step 022.26
-//
-
-// constructor
-CCommDbTest022_26::CCommDbTest022_26()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_26");
-	}
-
-// destructor
-CCommDbTest022_26::~CCommDbTest022_26()
-	{
-	}
-
-TVerdict CCommDbTest022_26::doTestStepL( )
-	{
-	Log(_L("Step 022.26 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 022.11
-
-	CCommDbTest022_11* step022_11 = new CCommDbTest022_11;
-	CleanupStack::PushL(step022_11);
-	step022_11->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step022_11, KErrArgument) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step022_11);
-	
-	return iTestStepResult;
-	
-	}
-	
-//
-//	Test step 022.27
-//
-
-// constructor
-CCommDbTest022_27::CCommDbTest022_27()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_27");
-	}
-
-// destructor
-CCommDbTest022_27::~CCommDbTest022_27()
-	{
-	}
-
-TVerdict CCommDbTest022_27::doTestStepL( )
-	{
-	Log(_L("Step 022.27 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 022.12
-
-	CCommDbTest022_12* step022_12 = new CCommDbTest022_12;
-	CleanupStack::PushL(step022_12);
-	step022_12->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step022_12, KErrArgument) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step022_12);
-	
-	return iTestStepResult;
-	
-	}	
-	
-//
-//	Test step 022.28
-//
-
-// constructor
-CCommDbTest022_28::CCommDbTest022_28()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_28");
-	}
-
-// destructor
-CCommDbTest022_28::~CCommDbTest022_28()
-	{
-	}
-
-TVerdict CCommDbTest022_28::doTestStepL( )
-	{
-	Log(_L("Step 022.28 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 022.13
-
-	CCommDbTest022_13* step022_13 = new CCommDbTest022_13;
-	CleanupStack::PushL(step022_13);
-	step022_13->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step022_13, KErrArgument) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step022_13);
-	
-	return iTestStepResult;
-	
-	}		
-	
-//
-//	Test step 022.29
-//
-
-// constructor
-CCommDbTest022_29::CCommDbTest022_29()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_29");
-	}
-
-// destructor
-CCommDbTest022_29::~CCommDbTest022_29()
-	{
-	}
-
-TVerdict CCommDbTest022_29::doTestStepL( )
-	{
-	Log(_L("Step 022.29 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 022.14
-
-	CCommDbTest022_14* step022_14 = new CCommDbTest022_14;
-	CleanupStack::PushL(step022_14);
-	step022_14->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step022_14, KErrArgument) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step022_14);
-	
-	return iTestStepResult;
-	
-	}			
-
-
-//
-//	Test step 022.30
-//
-
-// constructor
-CCommDbTest022_30::CCommDbTest022_30()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_022_30");
-	}
-
-// destructor
-CCommDbTest022_30::~CCommDbTest022_30()
-	{
-	}
-
-TInt CCommDbTest022_30::executeStepL()
-	{
-	TInt ret = KErrGeneral;
-
-	CCommsDatabase* db = CCommsDatabase::NewL();
-	CleanupStack::PushL(db);
-
-	CCommsDbTableView* view1 = db->OpenTableLC( TPtrC(IAP) );
-	TUint32 a = 0;
-	User::LeaveIfError(view1->InsertRecord(a));
-	// expected commdb currently only has 1 IAP, hence 2 here
-	if (a != 2)
-		{
-		User::Leave(KErrGeneral);
-		}
-	CleanupStack::Pop(view1);
-
-	CCommsDbTableView* view2 = db->OpenIAPTableViewMatchingBearerSetLC(KCommDbBearerWcdma, ECommDbConnectionDirectionOutgoing);
-	a = 0;
-	User::LeaveIfError(view2->InsertRecord(a));
-	if (a != 3)
-		{
-		User::Leave(KErrGeneral);
-		}
-	CleanupStack::Pop(view2);
-
-	CleanupStack::Pop(db);
-
-	ret = KErrNone;
-	return ret;
-	}
-
-
-TVerdict CCommDbTest022_30::doTestStepL( )
-	{
-	Log(_L("Step 022.30 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-//EOF
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_022_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,556 +0,0 @@
-// Copyright (c) 2001-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:
-// step_022_01.h
-// This is the header file for CommDb test 022.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_022_XX_H__)
-#define __STEP_022_XX_H__
-
-
-//
-//	Test step 022.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_01();
-	~CCommDbTest022_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 022.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_02();
-	~CCommDbTest022_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-
-//
-//	Test step 022.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_03();
-	~CCommDbTest022_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 022.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_04();
-	~CCommDbTest022_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-
-//
-//	Test step 022.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_05();
-	~CCommDbTest022_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 022.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_06();
-	~CCommDbTest022_06();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 022.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_07();
-	~CCommDbTest022_07();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-//
-//	Test step 022.08
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_08) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_08();
-	~CCommDbTest022_08();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 022.09
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_09) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_09();
-	~CCommDbTest022_09();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 022.10
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_10) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_10();
-	~CCommDbTest022_10();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 022.11
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_11) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_11();
-	~CCommDbTest022_11();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 022.12
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_12) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_12();
-	~CCommDbTest022_12();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 022.13
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_13) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_13();
-	~CCommDbTest022_13();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 022.14
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_14) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_14();
-	~CCommDbTest022_14();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 022.15
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_15) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_15();
-	~CCommDbTest022_15();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 022.16
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_16) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_16();
-	~CCommDbTest022_16();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-
-//
-//	Test step 022.17
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_17) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_17();
-	~CCommDbTest022_17();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 022.18
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_18) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_18();
-	~CCommDbTest022_18();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 022.19
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_19) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_19();
-	~CCommDbTest022_19();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 022.20
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_20) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_20();
-	~CCommDbTest022_20();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 022.21
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_21) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_21();
-	~CCommDbTest022_21();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 022.22
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_22) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_22();
-	~CCommDbTest022_22();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 022.23
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_23) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_23();
-	~CCommDbTest022_23();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 022.24
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_24) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_24();
-	~CCommDbTest022_24();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 022.25
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_25) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_25();
-	~CCommDbTest022_25();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 022.26
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_26) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_26();
-	~CCommDbTest022_26();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 022.27
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_27) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_27();
-	~CCommDbTest022_27();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 022.28
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_28) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_28();
-	~CCommDbTest022_28();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 022.29
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_29) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_29();
-	~CCommDbTest022_29();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 022.30
-//
-
-NONSHARABLE_CLASS(CCommDbTest022_30) : public CTestStepCommDb
-{
-public:
-	CCommDbTest022_30();
-	~CCommDbTest022_30();
-
-	TInt executeStepL();
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-#endif //(__STEP_022_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_023_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,306 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 023.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_023_xx.h"
-
-
-//
-//	Test step 023.01
-//
-
-// constructor
-CCommDbTest023_01::CCommDbTest023_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_023_01");
-	}
-
-// destructor
-CCommDbTest023_01::~CCommDbTest023_01()
-	{
-	}
-
-
-TVerdict CCommDbTest023_01::doTestStepPreambleL()
-	{	
-	// Have a temp copy of database
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest023_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	iTheView = iTheDb->OpenViewOnProxyRecordLC(1, TPtrC(DIAL_OUT_ISP) );
-	CleanupStack::Pop();
-	TUint32 value;
-
-	//Check the view contains the expected records
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone);
-	iTheView->ReadUintL(TPtrC(PROXY_ISP), value);
-
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNotFound );
-
-	ret = KErrNone;
-	
-	return ret;
-	}
-
-
-TVerdict CCommDbTest023_01::doTestStepL( )
-	{
-	Log(_L("Step 023.01 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 023.02
-//
-
-// constructor
-CCommDbTest023_02::CCommDbTest023_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_023_02");
-	}
-
-// destructor
-CCommDbTest023_02::~CCommDbTest023_02()
-	{
-	}
-
-
-TVerdict CCommDbTest023_02::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest023_02::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	iTheView = iTheDb->OpenViewOnProxyRecordLC(99, TPtrC(DIAL_OUT_ISP) );
-	CleanupStack::Pop();
-
-	//The view should be empty
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNotFound);
-
-	ret = KErrNone;
-	
-	return ret;
-	}
-
-
-TVerdict CCommDbTest023_02::doTestStepL( )
-	{
-	Log(_L("Step 023.02 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 023.03
-//
-
-// constructor
-CCommDbTest023_03::CCommDbTest023_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_023_03");
-	}
-
-// destructor
-CCommDbTest023_03::~CCommDbTest023_03()
-	{
-	}
-
-
-TVerdict CCommDbTest023_03::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-
-#define INVALID_TABLE	_L("Invalid")
-
-TInt CCommDbTest023_03::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-
-	iTheView = iTheDb->OpenViewOnProxyRecordLC(1, TPtrC(INVALID_TABLE) );
-	CleanupStack::Pop();
-	
-	//It should be an empty view
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNotFound );
-
-	ret = KErrNone;
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest023_03::doTestStepL( )
-	{
-	Log(_L("Step 023.03 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 023.04
-//
-
-// constructor
-CCommDbTest023_04::CCommDbTest023_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_023_04");
-	}
-
-// destructor
-CCommDbTest023_04::~CCommDbTest023_04()
-	{
-	}
-
-TVerdict CCommDbTest023_04::doTestStepL( )
-	{
-	Log(_L("Step 023.04 called "));
-
-	iTestStepResult = EPass;
-
-		// Heap test for 023.01
-
-	CCommDbTest023_01* step023_01 = new(ELeave) CCommDbTest023_01;
-	CleanupStack::PushL(step023_01);
-	step023_01->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step023_01, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step023_01);
-
-
-	return iTestStepResult;	
-
-}
-
-
-//
-//	Test step 023.05
-//
-
-// constructor
-CCommDbTest023_05::CCommDbTest023_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_023_05");
-	}
-
-// destructor
-CCommDbTest023_05::~CCommDbTest023_05()
-	{
-	}
-
-TVerdict CCommDbTest023_05::doTestStepL( )
-	{
-	Log(_L("Step 023.05 called "));
-
-	iTestStepResult = EPass;
-	
-			// Heap test for 023.02
-
-	CCommDbTest023_02* step023_02 = new CCommDbTest023_02;
-	CleanupStack::PushL(step023_02);
-	step023_02->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step023_02, KErrNone) == EFail ) 
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step023_02);
-	
-	return iTestStepResult;
-	}
-	
-//
-//	Test step 023.06
-//
-
-// constructor
-CCommDbTest023_06::CCommDbTest023_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_023_06");
-	}
-
-// destructor
-CCommDbTest023_06::~CCommDbTest023_06()
-	{
-	}
-
-TVerdict CCommDbTest023_06::doTestStepL( )
-	{
-	Log(_L("Step 023.06 called "));
-
-	iTestStepResult = EPass;
-	
-		// Heap test for 023.03
-
-	CCommDbTest023_03* step023_03 = new CCommDbTest023_03;
-	CleanupStack::PushL(step023_03);
-	step023_03->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step023_03, KErrNone) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step023_03);
-	
-	return iTestStepResult;
-	}
-
-//EOF
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_023_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-// Copyright (c) 2001-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:
-// step_023_01.h
-// This is the header file for CommDb test 023.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_023_XX_H__)
-#define __STEP_023_XX_H__
-
-
-//
-//	Test step 023.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest023_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest023_01();
-	~CCommDbTest023_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 023.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest023_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest023_02();
-	~CCommDbTest023_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-//
-//	Test step 023.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest023_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest023_03();
-	~CCommDbTest023_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-
-//
-//	Test step 023.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest023_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest023_04();
-	~CCommDbTest023_04();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-
-//
-//	Test step 023.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest023_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest023_05();
-	~CCommDbTest023_05();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-//
-//	Test step 023.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest023_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest023_06();
-	~CCommDbTest023_06();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-
-#endif //(__STEP_023_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_024_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,583 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 024.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_024_xx.h"
-
-
-
-//
-//	Test step 024.01
-//
-
-// constructor
-CCommDbTest024_01::CCommDbTest024_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_024_01");
-	}
-
-// destructor
-CCommDbTest024_01::~CCommDbTest024_01()
-	{
-	}
-
-
-TVerdict CCommDbTest024_01::doTestStepPreambleL()
-	{	
-	// Have a temp copy of database
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest024_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Now test the settings
-	TUint32 value;
-	TRAPD(r,iTheDb->GetCurrentDialOutSettingL( TPtrC(MODEM_BEARER),value));
-
-	if(r==KErrNotSupported)
-		{
-		return KErrNotSupported;
-		}
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest024_01::doTestStepL( )
-	{
-	Log(_L("Step 024.03 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 024.02
-//
-
-// constructor
-CCommDbTest024_02::CCommDbTest024_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_024_02");
-	}
-
-// destructor
-CCommDbTest024_02::~CCommDbTest024_02()
-	{
-	}
-
-
-TVerdict CCommDbTest024_02::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest024_02::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Now test the settings
-	TUint32 value;
-	TRAPD(r,iTheDb->GetCurrentDialOutSettingL( TPtrC(LOCATION), value ));
-
-	if(r==KErrNotSupported)
-		{
-		return KErrNotSupported;
-		}
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest024_02::doTestStepL( )
-	{
-	Log(_L("Step 024.04 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-
-//
-//	Test step 024.03
-//
-
-// constructor
-CCommDbTest024_03::CCommDbTest024_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_024_03");
-	}
-
-// destructor
-CCommDbTest024_03::~CCommDbTest024_03()
-	{
-	}
-
-
-TVerdict CCommDbTest024_03::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest024_03::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Point to an IAP record
-	iTheDb->SetGlobalSettingL( TPtrC(DEFAULT_NETWORK), 0 );
-
-	//Now test the settings
-	TUint32 value;
-	TRAPD(r1,iTheDb->GetCurrentDialOutSettingL( TPtrC(IAP_SERVICE), value ));
-
-	if(r1==KErrNotSupported)
-		{
-		return KErrNotSupported;
-		}
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest024_03::doTestStepL( )
-	{
-	Log(_L("Step 024.03 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 024.04
-//
-
-// constructor
-CCommDbTest024_04::CCommDbTest024_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_024_04");
-	}
-
-// destructor
-CCommDbTest024_04::~CCommDbTest024_04()
-	{
-	}
-
-
-TVerdict CCommDbTest024_04::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest024_04::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Point to an IAP record
-	iTheDb->SetGlobalSettingL( TPtrC(DEFAULT_NETWORK), 0 );
-
-	//Now test the settings
-	TUint32 value;
-	TRAPD(r1,iTheDb->GetCurrentDialOutSettingL( TPtrC(IAP_NETWORK),value));
-
-	if(r1==KErrNotSupported)
-		{
-		return KErrNotSupported;
-		}
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest024_04::doTestStepL( )
-	{
-	Log(_L("Step 024.02 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 024.05
-//
-
-// constructor
-CCommDbTest024_05::CCommDbTest024_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_024_05");
-	}
-
-// destructor
-CCommDbTest024_05::~CCommDbTest024_05()
-	{
-	}
-
-
-TVerdict CCommDbTest024_05::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest024_05::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Now test the settings
-	TUint32 value;
-	TRAPD(r1,iTheDb->GetCurrentDialInSettingL( TPtrC(MODEM_BEARER), value));
-
-	if(r1==KErrNotSupported)
-		{
-		return KErrNotSupported;
-		}
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest024_05::doTestStepL( )
-	{
-	Log(_L("Step 024.03 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 024.06
-//
-
-// constructor
-CCommDbTest024_06::CCommDbTest024_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_024_06");
-	}
-
-// destructor
-CCommDbTest024_06::~CCommDbTest024_06()
-	{
-	}
-
-
-TVerdict CCommDbTest024_06::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest024_06::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Now test the settings
-	TUint32 value;
-	TRAPD(r1,iTheDb->GetCurrentDialInSettingL( TPtrC(LOCATION), value));
-
-	if(r1==KErrNotSupported)
-		{
-		return KErrNotSupported;
-		}
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest024_06::doTestStepL( )
-	{
-	Log(_L("Step 024.04 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-
-//
-//	Test step 024.07
-//
-
-// constructor
-CCommDbTest024_07::CCommDbTest024_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_024_07");
-	}
-
-// destructor
-CCommDbTest024_07::~CCommDbTest024_07()
-	{
-	}
-
-
-TVerdict CCommDbTest024_07::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest024_07::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Point to an IAP record
-	iTheDb->SetGlobalSettingL( TPtrC(DEFAULT_NETWORK), 0 );
-
-	//Now test the settings
-	TUint32 value;
-	TRAPD(r1,iTheDb->GetCurrentDialInSettingL( TPtrC(IAP_SERVICE),value));
-
-	if(r1==KErrNotSupported)
-		{
-		return KErrNotSupported;
-		}
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest024_07::doTestStepL( )
-	{
-	Log(_L("Step 024.01 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 024.08
-//
-
-// constructor
-CCommDbTest024_08::CCommDbTest024_08()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_024_08");
-	}
-
-// destructor
-CCommDbTest024_08::~CCommDbTest024_08()
-	{
-	}
-
-
-TVerdict CCommDbTest024_08::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest024_08::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//Point to an IAP record
-	iTheDb->SetGlobalSettingL( TPtrC(DEFAULT_NETWORK), 0 );
-
-	//Now test the settings
-	TUint32 value;
-	TRAPD(r1,iTheDb->GetCurrentDialInSettingL( TPtrC(IAP_SERVICE),value));
-
-	if(r1==KErrNotSupported)
-		{
-		return KErrNotSupported;
-		}
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest024_08::doTestStepL( )
-	{
-	Log(_L("Step 024.02 called "));
-
-
-	if ( executeStepL() == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 024.09
-//
-
-// constructor
-CCommDbTest024_09::CCommDbTest024_09()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_024_09");
-	}
-
-// destructor
-CCommDbTest024_09::~CCommDbTest024_09()
-	{
-	}
-
-TVerdict CCommDbTest024_09::doTestStepL( )
-	{
-	Log(_L("Step 024.09 called "));
-
-	iTestStepResult = EPass;
-
-		// Heap test for 024.01
-
-	CCommDbTest024_01* step024_01 = new(ELeave) CCommDbTest024_01;
-	CleanupStack::PushL(step024_01);
-	step024_01->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step024_01, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step024_01);
-
-
-		// Heap test for 024.02
-
-	CCommDbTest024_02* step024_02 = new CCommDbTest024_02;
-	CleanupStack::PushL(step024_02);
-	step024_02->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step024_02, KErrNotSupported) == EFail ) 
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step024_02);
-
-		// Heap test for 024.03
-
-	CCommDbTest024_03* step024_03 = new CCommDbTest024_03;
-	CleanupStack::PushL(step024_03);
-	step024_03->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step024_03, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step024_03);
-
-
-		// Heap test for 024.04
-
-	CCommDbTest024_04* step024_04 = new CCommDbTest024_04;
-	CleanupStack::PushL(step024_04);
-	step024_04->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step024_04, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step024_04);
-
-		// Heap test for 024.05
-
-	CCommDbTest024_05* step024_05 = new CCommDbTest024_05;
-	CleanupStack::PushL(step024_05);
-	step024_05->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step024_05, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step024_05);
-
-		// Heap test for 024.06
-
-	CCommDbTest024_06* step024_06 = new CCommDbTest024_06;
-	CleanupStack::PushL(step024_06);
-	step024_06->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step024_06, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step024_06);
-
-		// Heap test for 024.07
-
-	CCommDbTest024_07* step024_07 = new CCommDbTest024_07;
-	CleanupStack::PushL(step024_07);
-	step024_07->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step024_07, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step024_07);
-
-	
-		// Heap test for 024.08
-
-	CCommDbTest024_08* step024_08 = new CCommDbTest024_08;
-	CleanupStack::PushL(step024_08);
-	step024_08->iSuite = iSuite;
-	if ( doTestStepWithHeapFailureL( *step024_08, KErrNotSupported) == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step024_08);
-
-	return iTestStepResult;	
-
-}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_024_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-// Copyright (c) 2001-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:
-// step_024_01.h
-// This is the header file for CommDb test 024.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_024_XX_H__)
-#define __STEP_024_XX_H__
-
-
-//
-//	Test step 024.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest024_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest024_01();
-	~CCommDbTest024_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 024.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest024_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest024_02();
-	~CCommDbTest024_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-//
-//	Test step 024.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest024_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest024_03();
-	~CCommDbTest024_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-
-
-//
-//	Test step 024.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest024_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest024_04();
-	~CCommDbTest024_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 024.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest024_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest024_05();
-	~CCommDbTest024_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 024.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest024_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest024_06();
-	~CCommDbTest024_06();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 024.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest024_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest024_07();
-	~CCommDbTest024_07();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 024.08
-//
-
-NONSHARABLE_CLASS(CCommDbTest024_08) : public CTestStepCommDb
-{
-public:
-	CCommDbTest024_08();
-	~CCommDbTest024_08();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 024.09
-//
-
-NONSHARABLE_CLASS(CCommDbTest024_09) : public CTestStepCommDb
-{
-public:
-	CCommDbTest024_09();
-	~CCommDbTest024_09();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-
-#endif //(__STEP_024_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_025_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 025.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_025_xx.h"
-
-
-CCommDbTest025_01::CCommDbTest025_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_025_01");
-	}
-
-CCommDbTest025_01::~CCommDbTest025_01()
-	{}
-
-
-TVerdict CCommDbTest025_01::doTestStepL( void )
-	{
-	executeStepL();	//Always returns KErrNone or leaves.
-	return EPass;	//So if we got to here we must have passed.
-	}
-
-TInt CCommDbTest025_01::executeStepL()
-	{
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-	return KErrNone;
-	}
-
-TVerdict CCommDbTest025_01::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-	return EPass;
-	}
-
-TVerdict CCommDbTest025_01::doTestStepPostambleL()
-	{
-	delete iPrefView;
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-// Test 25.02
-//
-
-CCommDbTest025_02::CCommDbTest025_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_025_02");
-	}
-
-CCommDbTest025_02::~CCommDbTest025_02()
-	{}
-
-TVerdict CCommDbTest025_02::doTestStepL( void )
-	{
-	Log(_L("Step 025.02 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest025_01* step025_01 = new(ELeave) CCommDbTest025_01;
-	CleanupStack::PushL(step025_01);
-	step025_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step025_01, KErrNone);
-	CleanupStack::PopAndDestroy(step025_01);
-
-	return iTestStepResult;
-	}
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_025_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 025.XX group of scenarios 
-// 
-//
-
-#include<cdbpreftable.h>
-
-#if (!defined __STEP_025_XX_H__)
-#define __STEP_025_XX_H__
-
-
-//
-//	Test step 025.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest025_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest025_01();
-	~CCommDbTest025_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-
-//
-//	Test step 025.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest025_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest025_02();
-	~CCommDbTest025_02();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_025_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_026_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,766 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 026.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_026_xx.h"
-
-//_LIT(KCommDefault3, "C:\\default3.dat");
-
-CCommDbTest026_01::CCommDbTest026_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_026_01");
-	}
-
-CCommDbTest026_01::~CCommDbTest026_01()
-	{}
-
-TVerdict CCommDbTest026_01::doTestStepL( void )
-	{
-	executeStepL();
-	return EPass;
-	}
-
-TVerdict CCommDbTest026_01::doTestStepPreambleL()
-	{
-//	copyFileL(KCommDbName, KCommDefault3);
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-
-	return EPass;
-	}
-
-TInt CCommDbTest026_01::executeStepL()
-	{
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 2;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest026_01::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest026_02::CCommDbTest026_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_026_02");
-	}
-
-CCommDbTest026_02::~CCommDbTest026_02()
-	{}
-
-TVerdict CCommDbTest026_02::doTestStepL( void )
-	{
-	if (KErrAlreadyExists == executeStepL())
-		return EPass;
-	return EFail;
-	}
-
-TVerdict CCommDbTest026_02::doTestStepPreambleL()
-	{
-//	copyFileL(KCommDefault3, KCommDbName);
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	iTheDb->SetGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS),2);
-	return EPass;
-	}
-
-TInt CCommDbTest026_02::executeStepL()
-	{
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 1;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	TRAPD(err, iPrefView->InsertConnectionPreferenceL(pref2, EFalse));
-	
-	return err;
-	}
-	
-TVerdict CCommDbTest026_02::doTestStepPostambleL()
-	{
-	delete iPrefView;
-	iPrefView = NULL;
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest026_03::CCommDbTest026_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_026_03");
-	}
-
-CCommDbTest026_03::~CCommDbTest026_03()
-	{}
-
-TVerdict CCommDbTest026_03::doTestStepL( void )
-	{
-	if (KErrAlreadyExists == executeStepL())
-		return EPass;
-	return EFail;
-	}
-
-TVerdict CCommDbTest026_03::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	iTheDb->SetGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS),2);
-	return EPass;
-	}
-
-TInt CCommDbTest026_03::executeStepL()
-	{
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionIncoming;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 3;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 1;
-	pref2.iDirection = ECommDbConnectionDirectionIncoming;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 4;
-	
-	TRAPD(err, iPrefView->InsertConnectionPreferenceL(pref2, EFalse));
-	
-	return err;
-	}
-	
-TVerdict CCommDbTest026_03::doTestStepPostambleL()
-	{
-	delete iPrefView;
-	iPrefView = NULL;
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest026_04::CCommDbTest026_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_026_04");
-	}
-
-CCommDbTest026_04::~CCommDbTest026_04()
-	{}
-
-TVerdict CCommDbTest026_04::doTestStepL( void )
-	{
-	if (KErrOverflow == executeStepL())
-		return EPass;
-	return EFail;
-	}
-
-TVerdict CCommDbTest026_04::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	iTheDb->SetGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS),2);
-	return EPass;
-	}
-
-TInt CCommDbTest026_04::executeStepL()
-	{
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 85;
-	pref1.iDirection = ECommDbConnectionDirectionIncoming;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 3;
-
-	TRAPD(err, iPrefView->InsertConnectionPreferenceL(pref1, EFalse));
-	
-	return err;
-	}
-	
-TVerdict CCommDbTest026_04::doTestStepPostambleL()
-	{
-	delete iPrefView;
-	iPrefView = NULL;
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest026_05::CCommDbTest026_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_026_05");
-	}
-
-CCommDbTest026_05::~CCommDbTest026_05()
-	{}
-
-TVerdict CCommDbTest026_05::doTestStepL( void )
-	{
-	if (KErrNotFound == executeStepL())
-		return EPass;
-	return EFail;
-	}
-
-TVerdict CCommDbTest026_05::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	iTheDb->SetGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS),2);
-	return EPass;
-	}
-
-TInt CCommDbTest026_05::executeStepL()
-	{
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionIncoming;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 0xffffffff;
-
-	TRAPD(err, iPrefView->InsertConnectionPreferenceL(pref1, EFalse));
-
-	return err;
-	}
-	
-TVerdict CCommDbTest026_05::doTestStepPostambleL()
-	{
-	//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	iTheDb->ClearGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS));
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest026_06::CCommDbTest026_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_026_06");
-	}
-
-CCommDbTest026_06::~CCommDbTest026_06()
-	{}
-
-TVerdict CCommDbTest026_06::doTestStepL( void )
-	{
-	if (KErrArgument == executeStepL())
-		return EPass;
-	return EFail;
-	}
-
-TVerdict CCommDbTest026_06::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	iTheDb->SetGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS),2);
-	return EPass;
-	}
-
-TInt CCommDbTest026_06::executeStepL()
-	{
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionIncoming;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = 0x80000000;
-	pref1.iBearer.iIapId = 3;
-
-	TRAPD(err, iPrefView->InsertConnectionPreferenceL(pref1, EFalse));
-
-	return err;
-	}
-	
-TVerdict CCommDbTest026_06::doTestStepPostambleL()
-	{
-	//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-
-	iTheDb->ClearGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS));
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest026_07::CCommDbTest026_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_026_07");
-	}
-
-CCommDbTest026_07::~CCommDbTest026_07()
-	{}
-
-TVerdict CCommDbTest026_07::doTestStepL( void )
-	{
-	if (KErrArgument == executeStepL())
-		return EPass;
-	return EFail;
-	}
-
-TVerdict CCommDbTest026_07::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	iTheDb->SetGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS),2);
-	return EPass;
-	}
-
-TInt CCommDbTest026_07::executeStepL()
-	{
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPromptIfWrongMode;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	TRAPD(err, iPrefView->InsertConnectionPreferenceL(pref1, EFalse));
-
-	return err;
-	}
-	
-TVerdict CCommDbTest026_07::doTestStepPostambleL()
-	{
-	//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-
-	iTheDb->ClearGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS));
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest026_08::CCommDbTest026_08()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_026_08");
-	}
-
-CCommDbTest026_08::~CCommDbTest026_08()
-	{}
-
-TVerdict CCommDbTest026_08::doTestStepL( void )
-	{
-	if (KErrArgument == executeStepL())
-		return EPass;
-	return EFail;
-	}
-
-TVerdict CCommDbTest026_08::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	iTheDb->SetGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS),2);
-	return EPass;
-	}
-
-TInt CCommDbTest026_08::executeStepL()
-	{
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionIncoming;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	TRAPD(err, iPrefView->InsertConnectionPreferenceL(pref1, EFalse));
-
-	return err;
-	}
-	
-TVerdict CCommDbTest026_08::doTestStepPostambleL()
-	{
-	//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-
-	iTheDb->ClearGlobalSettingL(TPtrC(CONNECTION_ATTEMPTS));
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest026_09::CCommDbTest026_09()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_026_09");
-	}
-
-CCommDbTest026_09::~CCommDbTest026_09()
-	{}
-
-TVerdict CCommDbTest026_09::doTestStepL( void )
-	{
-	Log(_L("Step 026.09 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest026_01* step026_01 = new(ELeave) CCommDbTest026_01;
-	CleanupStack::PushL(step026_01);
-	step026_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step026_01, KErrNone);
-	CleanupStack::PopAndDestroy(step026_01);
-
-
-	return iTestStepResult;
-	}
-
-
-CCommDbTest026_10::CCommDbTest026_10()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_026_10");
-	}
-
-CCommDbTest026_10::~CCommDbTest026_10()
-	{}
-
-TVerdict CCommDbTest026_10::doTestStepL( void )
-	{
-	Log(_L("Step 026.10 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest026_02* step026_02 = new(ELeave) CCommDbTest026_02;
-	CleanupStack::PushL(step026_02);
-	step026_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step026_02, KErrAlreadyExists);
-	CleanupStack::PopAndDestroy(step026_02);
-	
-	return iTestStepResult;
-	}
-	
-	
-CCommDbTest026_11::CCommDbTest026_11()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_026_11");
-	}
-
-CCommDbTest026_11::~CCommDbTest026_11()
-	{}
-
-TVerdict CCommDbTest026_11::doTestStepL( void )
-	{
-	Log(_L("Step 026.11 called "));
-
-	iTestStepResult = EPass;
-	
-		CCommDbTest026_03* step026_03 = new(ELeave) CCommDbTest026_03;
-	CleanupStack::PushL(step026_03);
-	step026_03->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step026_03, KErrAlreadyExists);
-	CleanupStack::PopAndDestroy(step026_03);
-	
-	return iTestStepResult;
-	}
-	
-CCommDbTest026_12::CCommDbTest026_12()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_026_12");
-	}
-
-CCommDbTest026_12::~CCommDbTest026_12()
-	{}
-
-TVerdict CCommDbTest026_12::doTestStepL( void )
-	{
-	Log(_L("Step 026.12 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest026_04* step026_04 = new(ELeave) CCommDbTest026_04;
-	CleanupStack::PushL(step026_04);
-	step026_04->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step026_04, KErrOverflow);
-	CleanupStack::PopAndDestroy(step026_04);
-	
-	return iTestStepResult;
-	}	
-	
-CCommDbTest026_13::CCommDbTest026_13()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_026_13");
-	}
-
-CCommDbTest026_13::~CCommDbTest026_13()
-	{}
-
-TVerdict CCommDbTest026_13::doTestStepL( void )
-	{
-	Log(_L("Step 026.13 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest026_05* step026_05 = new(ELeave) CCommDbTest026_05;
-	CleanupStack::PushL(step026_05);
-	step026_05->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step026_05, KErrNotFound);
-	CleanupStack::PopAndDestroy(step026_05);
-	
-	return iTestStepResult;
-	}	
-		
-CCommDbTest026_14::CCommDbTest026_14()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_026_14");
-	}
-
-CCommDbTest026_14::~CCommDbTest026_14()
-	{}
-
-TVerdict CCommDbTest026_14::doTestStepL( void )
-	{
-	Log(_L("Step 026.14 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest026_06* step026_06 = new(ELeave) CCommDbTest026_06;
-	CleanupStack::PushL(step026_06);
-	step026_06->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step026_06, KErrArgument);
-	CleanupStack::PopAndDestroy(step026_06);
-	
-	return iTestStepResult;
-	}	
-	
-CCommDbTest026_15::CCommDbTest026_15()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_026_15");
-	}
-
-CCommDbTest026_15::~CCommDbTest026_15()
-	{}
-
-TVerdict CCommDbTest026_15::doTestStepL( void )
-	{
-	Log(_L("Step 026.15 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest026_07* step026_07 = new(ELeave) CCommDbTest026_07;
-	CleanupStack::PushL(step026_07);
-	step026_07->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step026_07, KErrArgument);
-	CleanupStack::PopAndDestroy(step026_07);
-	
-	return iTestStepResult;
-	}	
-	
-CCommDbTest026_16::CCommDbTest026_16()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_026_16");
-	}
-
-CCommDbTest026_16::~CCommDbTest026_16()
-	{}
-
-TVerdict CCommDbTest026_16::doTestStepL( void )
-	{
-	Log(_L("Step 026.16 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest026_08* step026_08 = new(ELeave) CCommDbTest026_08;
-	CleanupStack::PushL(step026_08);
-	step026_08->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step026_08, KErrArgument);
-	CleanupStack::PopAndDestroy(step026_08);
-	
-	return iTestStepResult;
-	}	
-
-//EOF
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_026_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,307 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 026.XX group of scenarios 
-// 
-//
-
-#include<cdbpreftable.h>
-
-#if (!defined __STEP_026_XX_H__)
-#define __STEP_026_XX_H__
-
-
-//
-//	Test step 026.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest026_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest026_01();
-	~CCommDbTest026_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-
-//
-//	Test step 026.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest026_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest026_02();
-	~CCommDbTest026_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 026.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest026_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest026_03();
-	~CCommDbTest026_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 026.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest026_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest026_04();
-	~CCommDbTest026_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 026.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest026_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest026_05();
-	~CCommDbTest026_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 026.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest026_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest026_06();
-	~CCommDbTest026_06();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 026.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest026_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest026_07();
-	~CCommDbTest026_07();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 026.08
-//
-
-NONSHARABLE_CLASS(CCommDbTest026_08) : public CTestStepCommDb
-{
-public:
-	CCommDbTest026_08();
-	~CCommDbTest026_08();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 026.09
-//
-
-NONSHARABLE_CLASS(CCommDbTest026_09) : public CTestStepCommDb
-{
-public:
-	CCommDbTest026_09();
-	~CCommDbTest026_09();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-
-//
-//	Test step 026.10
-//
-
-NONSHARABLE_CLASS(CCommDbTest026_10) : public CTestStepCommDb
-{
-public:
-	CCommDbTest026_10();
-	~CCommDbTest026_10();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 026.10
-//
-
-NONSHARABLE_CLASS(CCommDbTest026_11) : public CTestStepCommDb
-{
-public:
-	CCommDbTest026_11();
-	~CCommDbTest026_11();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 026.12
-//
-
-NONSHARABLE_CLASS(CCommDbTest026_12) : public CTestStepCommDb
-{
-public:
-	CCommDbTest026_12();
-	~CCommDbTest026_12();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 026.13
-//
-
-NONSHARABLE_CLASS(CCommDbTest026_13) : public CTestStepCommDb
-{
-public:
-	CCommDbTest026_13();
-	~CCommDbTest026_13();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 026.14
-//
-
-NONSHARABLE_CLASS(CCommDbTest026_14) : public CTestStepCommDb
-{
-public:
-	CCommDbTest026_14();
-	~CCommDbTest026_14();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 026.10
-//
-
-NONSHARABLE_CLASS(CCommDbTest026_15) : public CTestStepCommDb
-{
-public:
-	CCommDbTest026_15();
-	~CCommDbTest026_15();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 026.10
-//
-
-NONSHARABLE_CLASS(CCommDbTest026_16) : public CTestStepCommDb
-{
-public:
-	CCommDbTest026_16();
-	~CCommDbTest026_16();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-
-#endif //__STEP_026_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_027_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 027.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_027_xx.h"
-
-
-CCommDbTest027_01::CCommDbTest027_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_027_01");
-	}
-
-CCommDbTest027_01::~CCommDbTest027_01()
-	{}
-
-TVerdict CCommDbTest027_01::doTestStepL( void )
-	{
-	executeStepL();
-	return EPass;
-	}
-
-TVerdict CCommDbTest027_01::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest027_01::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref;
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-	iPrefView->ReadConnectionPreferenceL(pref);
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest027_01::doTestStepPostambleL()
-	{
-	delete iPrefView;
-	iPrefView = NULL;
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest027_02::CCommDbTest027_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_027_02");
-	}
-
-CCommDbTest027_02::~CCommDbTest027_02()
-	{}
-
-TVerdict CCommDbTest027_02::doTestStepL( void )
-	{
-	Log(_L("Step 027.02 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest027_01* step027_01 = new(ELeave) CCommDbTest027_01;
-	CleanupStack::PushL(step027_01);
-	step027_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step027_01, KErrNone);
-	CleanupStack::PopAndDestroy(step027_01);
-
-	return iTestStepResult;
-	}
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_027_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 027.XX group of scenarios 
-// 
-//
-
-#include<cdbpreftable.h>
-
-#if (!defined __STEP_027_XX_H__)
-#define __STEP_027_XX_H__
-
-
-//
-//	Test step 027.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest027_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest027_01();
-	~CCommDbTest027_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-
-//
-//	Test step 027.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest027_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest027_02();
-	~CCommDbTest027_02();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_027_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_028_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,640 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 028.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_028_xx.h"
-
-CCommDbTest028_01::CCommDbTest028_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_028_01");
-	}
-
-CCommDbTest028_01::~CCommDbTest028_01()
-	{}
-
-TVerdict CCommDbTest028_01::doTestStepL( void )
-	{
-	if(executeStepL()==KErrNone)
-		return EPass;
-	return EFail;
-	}
-
-TVerdict CCommDbTest028_01::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest028_01::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 2;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-	
-	if(!(retrievedPref==pref1))	//Check to see if correct preferance has been fetched
-		return KErrGeneral;
-
-	User::LeaveIfError(iPrefView->GotoNextRecord());
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-
-	if(!(retrievedPref==pref2))	//Check to see if correct preferance has been fetched
-		return KErrGeneral;
-
-	if((iPrefView->GotoNextRecord())!=KErrNotFound)	//Make sure there are no more records.
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest028_01::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest028_02::CCommDbTest028_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_028_02");
-	}
-
-CCommDbTest028_02::~CCommDbTest028_02()
-	{}
-
-TVerdict CCommDbTest028_02::doTestStepL( void )
-	{
-	if(executeStepL()==KErrNone)
-		return EPass;
-	return EFail;
-	}
-
-TVerdict CCommDbTest028_02::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest028_02::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 2;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-	
-	while (iPrefView->GotoNextRecord()!=KErrNotFound)	//Move through to last record
-		{}
-	
-	User::LeaveIfError(iPrefView->GotoPreviousRecord());
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-
-	if(!(retrievedPref==pref2))	//Check to see if correct preferance has been fetched
-		return KErrGeneral;
-
-	User::LeaveIfError(iPrefView->GotoPreviousRecord());
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-
-	if(!(retrievedPref==pref1))	//Check to see if correct preferance has been fetched
-		return KErrGeneral;
-
-	if(iPrefView->GotoPreviousRecord()!=KErrNotFound)	//Check that there are no more records
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest028_02::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest028_03::CCommDbTest028_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_028_03");
-	}
-
-CCommDbTest028_03::~CCommDbTest028_03()
-	{}
-
-TVerdict CCommDbTest028_03::doTestStepL( void )
-	{
-	if(executeStepL()==KErrNone)
-		return EPass;
-	return EFail;
-	}
-
-TVerdict CCommDbTest028_03::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest028_03::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionIncoming;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 3;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 2;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	delete iPrefView;	//Create a new view to look only at outgoing records.
-	iPrefView=NULL;
-	iPrefView=iTheDb->OpenConnectionPrefTableLC(ECommDbConnectionDirectionOutgoing);
-	CleanupStack::Pop(iPrefView);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-		
-	if(!(retrievedPref==pref2))	//First record in this table should be pref2
-		return KErrGeneral;
-
-	if(iPrefView->GotoNextRecord()!=KErrNotFound)	//There should be no more records in this view.
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest028_03::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest028_04::CCommDbTest028_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_028_04");
-	}
-
-CCommDbTest028_04::~CCommDbTest028_04()
-	{}
-
-TVerdict CCommDbTest028_04::doTestStepL( void )
-	{
-	if(executeStepL()==KErrNone)
-		return EPass;
-	return EFail;
-	}
-
-TVerdict CCommDbTest028_04::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest028_04::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionIncoming;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 3;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 2;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	delete iPrefView;	//Create a new view to look only at incoming records.
-	iPrefView=NULL;
-	iPrefView=iTheDb->OpenConnectionPrefTableLC(ECommDbConnectionDirectionIncoming);
-	CleanupStack::Pop(iPrefView);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-		
-	if(!(retrievedPref==pref1))	//First record in this table should be pref1
-		return KErrGeneral;
-
-	if(iPrefView->GotoNextRecord()!=KErrNotFound)	//There should be no more records in this view.
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest028_04::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest028_05::CCommDbTest028_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_028_05");
-	}
-
-CCommDbTest028_05::~CCommDbTest028_05()
-	{}
-
-TVerdict CCommDbTest028_05::doTestStepL( void )
-	{
-	if(executeStepL()==KErrNone)
-		return EPass;
-	return EFail;
-	}
-
-TVerdict CCommDbTest028_05::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest028_05::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 2;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	delete iPrefView;	//Create a new view to look only at incoming records.
-	iPrefView=NULL;
-	iPrefView=iTheDb->OpenConnectionPrefTableLC(ECommDbConnectionDirectionIncoming);
-	CleanupStack::Pop(iPrefView);
-
-	if(iPrefView->GotoPreviousRecord()!=KErrNotFound)	//There should be no records in this table.
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest028_05::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest028_06::CCommDbTest028_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_028_06");
-	}
-
-CCommDbTest028_06::~CCommDbTest028_06()
-	{}
-
-TVerdict CCommDbTest028_06::doTestStepL( void )
-	{
-	if(executeStepL()==KErrNone)
-		return EPass;
-	return EFail;
-	}
-
-TVerdict CCommDbTest028_06::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest028_06::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 2;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	delete iPrefView;	//Create a new view to look only at incoming records.
-	iPrefView=NULL;
-	iPrefView=iTheDb->OpenConnectionPrefTableLC(ECommDbConnectionDirectionIncoming);
-	CleanupStack::Pop(iPrefView);
-
-	if(iPrefView->GotoNextRecord()!=KErrNotFound)	//There should be no records in this table.
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest028_06::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest028_07::CCommDbTest028_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_028_07");
-	}
-
-CCommDbTest028_07::~CCommDbTest028_07()
-	{}
-
-TVerdict CCommDbTest028_07::doTestStepL( void )
-	{
-	Log(_L("Step 028.07 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest028_01* step028_01 = new(ELeave) CCommDbTest028_01;
-	CleanupStack::PushL(step028_01);
-	step028_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step028_01, KErrNone);
-	CleanupStack::PopAndDestroy(step028_01);
-
-	CCommDbTest028_02* step028_02 = new(ELeave) CCommDbTest028_02;
-	CleanupStack::PushL(step028_02);
-	step028_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step028_02, KErrNone);
-	CleanupStack::PopAndDestroy(step028_02);
-
-	CCommDbTest028_03* step028_03 = new(ELeave) CCommDbTest028_03;
-	CleanupStack::PushL(step028_03);
-	step028_03->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step028_03, KErrNone);
-	CleanupStack::PopAndDestroy(step028_03);
-
-	CCommDbTest028_04* step028_04 = new(ELeave) CCommDbTest028_04;
-	CleanupStack::PushL(step028_04);
-	step028_04->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step028_04, KErrNone);
-	CleanupStack::PopAndDestroy(step028_04);
-
-	CCommDbTest028_05* step028_05 = new(ELeave) CCommDbTest028_05;
-	CleanupStack::PushL(step028_05);
-	step028_05->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step028_05, KErrNone);
-	CleanupStack::PopAndDestroy(step028_05);
-
-	CCommDbTest028_06* step028_06 = new(ELeave) CCommDbTest028_06;
-	CleanupStack::PushL(step028_06);
-	step028_06->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step028_06, KErrNone);
-	CleanupStack::PopAndDestroy(step028_06);
-
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_028_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,151 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 028.XX group of scenarios 
-// 
-//
-
-#include<cdbpreftable.h>
-
-#if (!defined __STEP_028_XX_H__)
-#define __STEP_028_XX_H__
-
-
-//
-//	Test step 028.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest028_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest028_01();
-	~CCommDbTest028_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 028.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest028_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest028_02();
-	~CCommDbTest028_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 028.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest028_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest028_03();
-	~CCommDbTest028_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 028.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest028_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest028_04();
-	~CCommDbTest028_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 028.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest028_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest028_05();
-	~CCommDbTest028_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 028.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest028_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest028_06();
-	~CCommDbTest028_06();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 028.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest028_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest028_07();
-	~CCommDbTest028_07();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_028_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_029_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,227 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 029.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_029_xx.h"
-
-
-CCommDbTest029_01::CCommDbTest029_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_029_01");
-	}
-
-CCommDbTest029_01::~CCommDbTest029_01()
-	{}
-
-TVerdict CCommDbTest029_01::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNotFound)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest029_01::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest029_01::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-
-	iPrefView->DeleteConnectionPreferenceL();
-
-	return iPrefView->GotoFirstRecord();	//There should now be no records in the connection pref table, so this should be KErrNotFound
-	}
-
-TVerdict CCommDbTest029_01::doTestStepPostambleL()
-	{
-	delete iPrefView;
-	iPrefView = NULL;
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest029_02::CCommDbTest029_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_029_02");
-	}
-
-CCommDbTest029_02::~CCommDbTest029_02()
-	{}
-
-TVerdict CCommDbTest029_02::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrAccessDenied)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest029_02::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest029_02::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 2;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-
-	iPrefView->InsertConnectionPreferenceL(pref2, ETrue);
-
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-
-	TRAPD(err, iPrefView->UpdateDialogPrefL(ECommDbDialogPrefDoNotPrompt));	//Trying to edit a read only entry
-
-	return err;
-	}
-
-TVerdict CCommDbTest029_02::doTestStepPostambleL()
-	{
-	delete iPrefView;
-	iPrefView = NULL;
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest029_03::CCommDbTest029_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_029_03");
-	}
-
-CCommDbTest029_03::~CCommDbTest029_03()
-	{}
-
-TVerdict CCommDbTest029_03::doTestStepL( void )
-	{
-	if (executeStepL() != KErrNotFound)
-		{
-		iTestStepResult = EFail;
-		}
-
-	return iTestStepResult;
-	}
-
-TVerdict CCommDbTest029_03::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest029_03::executeStepL()
-	{
-	TRAPD(err, iPrefView->DeleteConnectionPreferenceL());	//This should leave with KErrNotFound
-
-	return err;
-	}
-
-TVerdict CCommDbTest029_03::doTestStepPostambleL()
-	{
-	delete iPrefView;
-	iPrefView = NULL;
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest029_04::CCommDbTest029_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_029_04");
-	}
-
-CCommDbTest029_04::~CCommDbTest029_04()
-	{}
-
-TVerdict CCommDbTest029_04::doTestStepL( void )
-	{
-	Log(_L("Step 029.04 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest029_01* step029_01 = new(ELeave) CCommDbTest029_01;
-	CleanupStack::PushL(step029_01);
-	step029_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step029_01, KErrNotFound);
-	CleanupStack::PopAndDestroy(step029_01);
-
-	CCommDbTest029_02* step029_02 = new(ELeave) CCommDbTest029_02;
-	CleanupStack::PushL(step029_02);
-	step029_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step029_02, KErrAccessDenied);
-	CleanupStack::PopAndDestroy(step029_02);
-
-	//Don't bother with step 3, since it's a panic test.
-
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_029_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 029.XX group of scenarios 
-// 
-//
-
-#include<cdbpreftable.h>
-
-#if (!defined __STEP_029_XX_H__)
-#define __STEP_029_XX_H__
-
-
-//
-//	Test step 029.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest029_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest029_01();
-	~CCommDbTest029_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 029.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest029_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest029_02();
-	~CCommDbTest029_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 029.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest029_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest029_03();
-	~CCommDbTest029_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 029.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest029_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest029_04();
-	~CCommDbTest029_04();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_029_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_030_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,244 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 030.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_030_xx.h"
-
-
-CCommDbTest030_01::CCommDbTest030_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_030_01");
-	}
-
-CCommDbTest030_01::~CCommDbTest030_01()
-	{}
-
-TVerdict CCommDbTest030_01::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest030_01::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest030_01::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 1;
-	pref2.iDirection = ECommDbConnectionDirectionIncoming;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 3;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-	
-	CCommsDbConnectionPrefTableView::TCommDbIapBearer newBearer;	//Set new bearer to point at other outgoing Iap in commdb
-	newBearer.iBearerSet=KCommDbBearerLAN|KCommDbBearerCSD;
-	newBearer.iIapId=2;
-
-	iPrefView->UpdateBearerL(newBearer);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
-
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-
-	if(	  (retrievedPref.iBearer.iBearerSet!=newBearer.iBearerSet)	//Check that retrieved pref is what we would expect
-		||(retrievedPref.iBearer.iIapId!=newBearer.iIapId)
-		||(retrievedPref.iRanking!=pref1.iRanking)
-		||(retrievedPref.iDirection!=pref1.iDirection)
-		||(retrievedPref.iDialogPref!=pref1.iDialogPref))
-			return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest030_01::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest030_02::CCommDbTest030_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_030_02");
-	}
-
-CCommDbTest030_02::~CCommDbTest030_02()
-	{}
-
-TVerdict CCommDbTest030_02::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrAccessDenied)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest030_02::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest030_02::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 1;
-	pref2.iDirection = ECommDbConnectionDirectionIncoming;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 3;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, ETrue);
-
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-	
-	CCommsDbConnectionPrefTableView::TCommDbIapBearer newBearer;	//Set new bearer to point at other outgoing Iap in commdb
-	newBearer.iBearerSet=KCommDbBearerLAN|KCommDbBearerCSD;
-	newBearer.iIapId=2;
-
-	TRAPD(err, iPrefView->UpdateBearerL(newBearer));
-	return err;
-	}
-	
-TVerdict CCommDbTest030_02::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest030_03::CCommDbTest030_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_030_03");
-	}
-
-CCommDbTest030_03::~CCommDbTest030_03()
-	{}
-
-TVerdict CCommDbTest030_03::doTestStepL( void )
-	{
-	Log(_L("Step 030.03 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest030_01* step030_01 = new(ELeave) CCommDbTest030_01;
-	CleanupStack::PushL(step030_01);
-	step030_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step030_01, KErrNone);
-	CleanupStack::PopAndDestroy(step030_01);
-
-	CCommDbTest030_02* step030_02 = new(ELeave) CCommDbTest030_02;
-	CleanupStack::PushL(step030_02);
-	step030_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step030_02, KErrAccessDenied);
-	CleanupStack::PopAndDestroy(step030_02);
-
-	return iTestStepResult;
-	}
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_030_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 030.XX group of scenarios 
-// 
-//
-
-#include<cdbpreftable.h>
-
-#if (!defined __STEP_030_XX_H__)
-#define __STEP_030_XX_H__
-
-
-//
-//	Test step 030.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest030_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest030_01();
-	~CCommDbTest030_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 030.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest030_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest030_02();
-	~CCommDbTest030_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 030.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest030_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest030_03();
-	~CCommDbTest030_03();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_030_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_031_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,429 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 031.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_031_xx.h"
-
-
-CCommDbTest031_01::CCommDbTest031_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_031_01");
-	}
-
-CCommDbTest031_01::~CCommDbTest031_01()
-	{}
-
-TVerdict CCommDbTest031_01::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest031_01::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest031_01::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 2;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 2;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 1;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 1;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	delete iPrefView;	//Open a new view in rank order
-	iPrefView=NULL;
-	iPrefView=iTheDb->OpenConnectionPrefTableInRankOrderLC(ECommDbConnectionDirectionOutgoing);
-	CleanupStack::Pop(iPrefView);
-
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-	if(!(retrievedPref==pref2))
-		return KErrGeneral;
-
-	User::LeaveIfError(iPrefView->GotoNextRecord());
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-	if(!(retrievedPref==pref1))
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest031_01::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest031_02::CCommDbTest031_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_031_02");
-	}
-
-CCommDbTest031_02::~CCommDbTest031_02()
-	{}
-
-TVerdict CCommDbTest031_02::doTestStepL( void )
-	{
-	executeStepL();
-	return EPass;	//if we get to here we must have passed.
-	}
-
-TVerdict CCommDbTest031_02::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest031_02::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 2;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 2;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 1;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 1;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	delete iPrefView;	//Open a new view in rank order looking at incoming only
-	iPrefView=NULL;
-	iPrefView=iTheDb->OpenConnectionPrefTableInRankOrderLC(ECommDbConnectionDirectionIncoming);
-	CleanupStack::Pop(iPrefView);
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest031_02::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest031_03::CCommDbTest031_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_031_03");
-	}
-
-CCommDbTest031_03::~CCommDbTest031_03()
-	{}
-
-TVerdict CCommDbTest031_03::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;	//if we get to here we must have passed.
-	}
-
-TVerdict CCommDbTest031_03::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest031_03::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 2;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 2;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 1;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 1;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	delete iPrefView;	//Open a new view to look at rank 1 outgoing only
-	iPrefView=NULL;
-	iPrefView=iTheDb->OpenConnectionPrefTableViewOnRankLC(ECommDbConnectionDirectionOutgoing, 1);
-	CleanupStack::Pop(iPrefView);
-
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-
-	if(!(retrievedPref==pref2))
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest031_03::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest031_04::CCommDbTest031_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_031_04");
-	}
-
-CCommDbTest031_04::~CCommDbTest031_04()
-	{}
-
-TVerdict CCommDbTest031_04::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrOverflow)
-		return EFail;
-	return EPass;	//if we get to here we must have passed.
-	}
-
-TVerdict CCommDbTest031_04::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest031_04::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 2;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 2;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 1;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 1;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	delete iPrefView;	//Open a new view with invalid rank;
-	iPrefView=NULL;
-	TRAPD(err, iPrefView=iTheDb->OpenConnectionPrefTableViewOnRankLC(ECommDbConnectionDirectionOutgoing, 5));
-	if (err==KErrNone)		//This should never happen, but better safe than sorry
-		CleanupStack::Pop(iPrefView);
-
-	return err;
-	}
-	
-TVerdict CCommDbTest031_04::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest031_05::CCommDbTest031_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_031_05");
-	}
-
-CCommDbTest031_05::~CCommDbTest031_05()
-	{}
-
-TVerdict CCommDbTest031_05::doTestStepL( void )
-	{
-	Log(_L("Step 031.05 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest031_01* step031_01 = new(ELeave) CCommDbTest031_01;
-	CleanupStack::PushL(step031_01);
-	step031_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step031_01, KErrNone);
-	CleanupStack::PopAndDestroy(step031_01);
-
-	CCommDbTest031_02* step031_02 = new(ELeave) CCommDbTest031_02;
-	CleanupStack::PushL(step031_02);
-	step031_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step031_02, KErrNone);
-	CleanupStack::PopAndDestroy(step031_02);
-
-	CCommDbTest031_03* step031_03 = new(ELeave) CCommDbTest031_03;
-	CleanupStack::PushL(step031_03);
-	step031_03->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step031_03, KErrNone);
-	CleanupStack::PopAndDestroy(step031_03);
-
-	CCommDbTest031_04* step031_04 = new(ELeave) CCommDbTest031_04;
-	CleanupStack::PushL(step031_04);
-	step031_04->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step031_04, KErrOverflow);
-	CleanupStack::PopAndDestroy(step031_04);
-	
-
-	return iTestStepResult;
-	}
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_031_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 031.XX group of scenarios 
-// 
-//
-
-#include<cdbpreftable.h>
-
-#if (!defined __STEP_031_XX_H__)
-#define __STEP_031_XX_H__
-
-
-//
-//	Test step 031.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest031_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest031_01();
-	~CCommDbTest031_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 031.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest031_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest031_02();
-	~CCommDbTest031_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 031.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest031_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest031_03();
-	~CCommDbTest031_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 031.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest031_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest031_04();
-	~CCommDbTest031_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 031.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest031_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest031_05();
-	~CCommDbTest031_05();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_031_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_032_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,241 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 032.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_032_xx.h"
-
-
-CCommDbTest032_01::CCommDbTest032_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_032_01");
-	}
-
-CCommDbTest032_01::~CCommDbTest032_01()
-	{}
-
-TVerdict CCommDbTest032_01::doTestStepL( void )
-	{
-	executeStepL();
-	return EPass;	//If we've got this far we've passed
-	}
-
-TVerdict CCommDbTest032_01::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest032_01::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-
-	iPrefView->UpdateDialogPrefL(ECommDbDialogPrefDoNotPrompt);
-
-	return KErrNone;
-	}
-
-TVerdict CCommDbTest032_01::doTestStepPostambleL()
-	{
-	delete iPrefView;
-	iPrefView = NULL;
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest032_02::CCommDbTest032_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_032_02");
-	}
-
-CCommDbTest032_02::~CCommDbTest032_02()
-	{}
-
-TVerdict CCommDbTest032_02::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNotFound)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest032_02::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest032_02::executeStepL()
-	{
-	TRAPD(err, iPrefView->UpdateDialogPrefL(ECommDbDialogPrefDoNotPrompt));
-
-	return err;
-	}
-
-TVerdict CCommDbTest032_02::doTestStepPostambleL()
-	{
-	delete iPrefView;
-	iPrefView = NULL;
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest032_03::CCommDbTest032_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_032_03");
-	}
-
-CCommDbTest032_03::~CCommDbTest032_03()
-	{}
-
-TVerdict CCommDbTest032_03::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrAccessDenied)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest032_03::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest032_03::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);
-
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-
-	TRAPD(err, iPrefView->UpdateDialogPrefL(ECommDbDialogPrefDoNotPrompt));
-
-	return err;
-	}
-
-TVerdict CCommDbTest032_03::doTestStepPostambleL()
-	{
-	delete iPrefView;
-	iPrefView = NULL;
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest032_04::CCommDbTest032_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_032_04");
-	}
-
-CCommDbTest032_04::~CCommDbTest032_04()
-	{}
-
-TVerdict CCommDbTest032_04::doTestStepL( void )
-	{
-	Log(_L("Step 032.04 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest032_01* step032_01 = new(ELeave) CCommDbTest032_01;
-	CleanupStack::PushL(step032_01);
-	step032_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step032_01, KErrNone);
-	CleanupStack::PopAndDestroy(step032_01);
-
-
-	return iTestStepResult;
-	}
-
-
-//
-
-CCommDbTest032_05::CCommDbTest032_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_032_05");
-	}
-
-CCommDbTest032_05::~CCommDbTest032_05()
-	{}
-
-TVerdict CCommDbTest032_05::doTestStepL( void )
-	{
-	Log(_L("Step 032.04 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest032_02* step032_02 = new(ELeave) CCommDbTest032_02;
-	CleanupStack::PushL(step032_02);
-	step032_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step032_02, KErrNotFound);
-	CleanupStack::PopAndDestroy(step032_02);
-
-	CCommDbTest032_03* step032_03 = new(ELeave) CCommDbTest032_03;
-	CleanupStack::PushL(step032_03);
-	step032_03->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step032_03, KErrAccessDenied);
-	CleanupStack::PopAndDestroy(step032_03);
-
-	return iTestStepResult;
-	}
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_032_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 032.XX group of scenarios 
-// 
-//
-
-#include<cdbpreftable.h>
-
-#if (!defined __STEP_032_XX_H__)
-#define __STEP_032_XX_H__
-
-
-//
-//	Test step 032.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest032_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest032_01();
-	~CCommDbTest032_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 032.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest032_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest032_02();
-	~CCommDbTest032_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 032.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest032_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest032_03();
-	~CCommDbTest032_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 032.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest032_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest032_04();
-	~CCommDbTest032_04();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-
-//
-//	Test step 032.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest032_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest032_05();
-	~CCommDbTest032_05();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-
-#endif //__STEP_032_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_033_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,620 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 033.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_033_xx.h"
-
-
-CCommDbTest033_01::CCommDbTest033_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_033_01");
-	}
-
-CCommDbTest033_01::~CCommDbTest033_01()
-	{}
-
-TVerdict CCommDbTest033_01::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;	//If we've got this far we've passed
-	}
-
-TVerdict CCommDbTest033_01::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest033_01::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 2;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	iPrefView->SwapConnectionPreferencesL(ECommDbConnectionDirectionOutgoing, 1, 2);
-
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-
-	TBool rank1Found=EFalse;
-	if(retrievedPref.iRanking==1)	//should be pref2 with new ranking
-		{
-		rank1Found=ETrue;
-		if(pref2.iBearer.iIapId!=retrievedPref.iBearer.iIapId)
-			return KErrGeneral;		//something has gone wrong with the swap
-		}
-	else if(retrievedPref.iRanking==2)	//should be pref1 with new ranking
-		{
-		if(pref1.iBearer.iIapId!=retrievedPref.iBearer.iIapId)
-			return KErrGeneral;		//something has gone wrong with the swap
-		}
-	else
-		return KErrGeneral;			//We've got a rank other that 1&2 which is wrong.
-
-	User::LeaveIfError(iPrefView->GotoNextRecord());
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-
-	if(retrievedPref.iRanking==1)
-		{
-		if(rank1Found)
-			return KErrGeneral;		//we've found 2 rank 1 records which is wrong.
-		if(pref2.iBearer.iIapId!=retrievedPref.iBearer.iIapId)
-			return KErrGeneral;		//something has gone wrong with the swap
-		}
-	else if (retrievedPref.iRanking==2)
-		{
-		if(!rank1Found)
-			return KErrGeneral;		//we've found 2 rank 2 records which is wrong.
-		if(pref1.iBearer.iIapId!=retrievedPref.iBearer.iIapId)
-			return KErrGeneral;		//something has gone wrong with the swap
-		}
-	else 
-		return KErrGeneral;
-	
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest033_01::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest033_02::CCommDbTest033_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_033_02");
-	}
-
-CCommDbTest033_02::~CCommDbTest033_02()
-	{}
-
-TVerdict CCommDbTest033_02::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;	//If we've got this far we've passed
-	}
-
-TVerdict CCommDbTest033_02::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest033_02::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 0;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	iPrefView->SwapConnectionPreferencesL(ECommDbConnectionDirectionOutgoing, 1, 0);
-
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-
-	TBool rank1Found=EFalse;
-	if(retrievedPref.iRanking==1)	//should be pref2 with new ranking
-		{
-		rank1Found=ETrue;
-		if(pref2.iBearer.iIapId!=retrievedPref.iBearer.iIapId)
-			return KErrGeneral;		//something has gone wrong with the swap
-		}
-	else if(retrievedPref.iRanking==0)	//should be pref1 with new ranking
-		{
-		if(pref1.iBearer.iIapId!=retrievedPref.iBearer.iIapId)
-			return KErrGeneral;		//something has gone wrong with the swap
-		}
-	else
-		return KErrGeneral;			//We've got a rank other that 1&0 which is wrong.
-
-	User::LeaveIfError(iPrefView->GotoNextRecord());
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-
-	if(retrievedPref.iRanking==1)
-		{
-		if(rank1Found)
-			return KErrGeneral;		//we've found 2 rank 1 records which is wrong.
-		if(pref2.iBearer.iIapId!=retrievedPref.iBearer.iIapId)
-			return KErrGeneral;		//something has gone wrong with the swap
-		}
-	else if (retrievedPref.iRanking==0)
-		{
-		if(!rank1Found)
-			return KErrGeneral;		//we've found 2 rank 0 records which is wrong.
-		if(pref1.iBearer.iIapId!=retrievedPref.iBearer.iIapId)
-			return KErrGeneral;		//something has gone wrong with the swap
-		}
-	else 
-		return KErrGeneral;
-	
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest033_02::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest033_03::CCommDbTest033_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_033_03");
-	}
-
-CCommDbTest033_03::~CCommDbTest033_03()
-	{}
-
-TVerdict CCommDbTest033_03::doTestStepL( void )
-	{
-	if (executeStepL()!=KErrNotFound)
-		return EFail;
-	return EPass;	//If we've got this far we've passed
-	}
-
-TVerdict CCommDbTest033_03::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest033_03::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	TRAPD(err, iPrefView->SwapConnectionPreferencesL(ECommDbConnectionDirectionOutgoing, 1, 2));
-
-	return err;
-	}
-	
-TVerdict CCommDbTest033_03::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest033_04::CCommDbTest033_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_033_04");
-	}
-
-CCommDbTest033_04::~CCommDbTest033_04()
-	{}
-
-TVerdict CCommDbTest033_04::doTestStepL( void )
-	{
-	if (executeStepL()!=KErrAccessDenied)
-		return EFail;
-	return EPass;	//If we've got this far we've passed
-	}
-
-TVerdict CCommDbTest033_04::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest033_04::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);	//Make this entry read only
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 2;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	TRAPD(err, iPrefView->SwapConnectionPreferencesL(ECommDbConnectionDirectionOutgoing, 1, 2));
-
-	return err;
-	}
-	
-TVerdict CCommDbTest033_04::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest033_05::CCommDbTest033_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_033_05");
-	}
-
-CCommDbTest033_05::~CCommDbTest033_05()
-	{}
-
-TVerdict CCommDbTest033_05::doTestStepL( void )
-	{
-	Log(_L("Step 033.05 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest033_01* step033_01 = new(ELeave) CCommDbTest033_01;
-	CleanupStack::PushL(step033_01);
-	step033_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step033_01, KErrNone);
-	CleanupStack::PopAndDestroy(step033_01);
-
-	
-	return iTestStepResult;
-	}
-
-
-//
-
-CCommDbTest033_06::CCommDbTest033_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_033_06");
-	}
-
-CCommDbTest033_06::~CCommDbTest033_06()
-	{}
-
-TVerdict CCommDbTest033_06::doTestStepL( void )
-	{
-	Log(_L("Step 033.06 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest033_02* step033_02 = new(ELeave) CCommDbTest033_02;
-	CleanupStack::PushL(step033_02);
-	step033_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step033_02, KErrNone);
-	CleanupStack::PopAndDestroy(step033_02);
-	
-	return iTestStepResult;
-	}
-	
-//
-
-CCommDbTest033_07::CCommDbTest033_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_033_07");
-	}
-
-CCommDbTest033_07::~CCommDbTest033_07()
-	{}
-
-TVerdict CCommDbTest033_07::doTestStepL( void )
-	{
-	Log(_L("Step 033.07 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest033_03* step033_03 = new(ELeave) CCommDbTest033_03;
-	CleanupStack::PushL(step033_03);
-	step033_03->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step033_03, KErrNotFound);
-	CleanupStack::PopAndDestroy(step033_03);
-
-	return iTestStepResult;
-	}
-
-//
-
-CCommDbTest033_08::CCommDbTest033_08()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_033_08");
-	}
-
-CCommDbTest033_08::~CCommDbTest033_08()
-	{}
-
-TVerdict CCommDbTest033_08::doTestStepL( void )
-	{
-	Log(_L("Step 033.08 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest033_04* step033_04 = new(ELeave) CCommDbTest033_04;
-	CleanupStack::PushL(step033_04);
-	step033_04->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step033_04, KErrAccessDenied);
-	CleanupStack::PopAndDestroy(step033_04);
-		
-	return iTestStepResult;
-	}
-
-//
-
-CCommDbTest033_09::CCommDbTest033_09()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_033_09");
-	}
-
-TVerdict CCommDbTest033_09::doTestStepL()
-	{
-	if (executeStepL() != KErrNone)
-		{
-		return EFail;
-		}
-	
-	return iTestStepResult;
-	}
-
-TVerdict CCommDbTest033_09::doTestStepPreambleL()
-	{
-	iTheDb = CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return iTestStepResult;
-	}
-
-TInt CCommDbTest033_09::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 0;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 0;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	TRAPD(leaveCode, iPrefView->SwapConnectionPreferencesL(ECommDbConnectionDirectionOutgoing, 1, 0));
-	if (leaveCode != KErrArgument)
-		{
-		return KErrGeneral;
-		}
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest033_09::doTestStepPostambleL()
-	{
-	//
-	// Get rid of our view
-	//
-	if(iPrefView)
-		{
-		delete iPrefView;
-		iPrefView = NULL;
-		}
-
-	//
-	// Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	//
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-
-	return iTestStepResult;
-	}
-
-//EOF
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_033_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 033.XX group of scenarios 
-// 
-//
-
-#include<cdbpreftable.h>
-
-#if (!defined __STEP_033_XX_H__)
-#define __STEP_033_XX_H__
-
-
-//
-//	Test step 033.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest033_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest033_01();
-	~CCommDbTest033_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 033.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest033_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest033_02();
-	~CCommDbTest033_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 033.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest033_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest033_03();
-	~CCommDbTest033_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 033.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest033_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest033_04();
-	~CCommDbTest033_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 033.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest033_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest033_05();
-	~CCommDbTest033_05();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-
-//
-//	Test step 033.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest033_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest033_06();
-	~CCommDbTest033_06();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 033.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest033_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest033_07();
-	~CCommDbTest033_07();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 033.08
-//
-
-NONSHARABLE_CLASS(CCommDbTest033_08) : public CTestStepCommDb
-{
-public:
-	CCommDbTest033_08();
-	~CCommDbTest033_08();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 033.09
-//
-
-NONSHARABLE_CLASS(CCommDbTest033_09) : public CTestStepCommDb
-{
-public:
-	CCommDbTest033_09();
-
-	virtual enum TVerdict doTestStepL();
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-
-#endif //__STEP_033_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_034_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,488 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 034.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_034_xx.h"
-
-
-CCommDbTest034_01::CCommDbTest034_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_034_01");
-	}
-
-CCommDbTest034_01::~CCommDbTest034_01()
-	{}
-
-TVerdict CCommDbTest034_01::doTestStepL( void )
-	{
-	executeStepL();
-	return EPass;	//If we've got this far we've passed
-	}
-
-TVerdict CCommDbTest034_01::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest034_01::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-	iPrefView->ChangeConnectionPreferenceRankL(2);
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest034_01::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest034_02::CCommDbTest034_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_034_02");
-	}
-
-CCommDbTest034_02::~CCommDbTest034_02()
-	{}
-
-TVerdict CCommDbTest034_02::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest034_02::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest034_02::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 2;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-	iPrefView->ChangeConnectionPreferenceRankL(2);
-
-	User::LeaveIfError(iPrefView->GotoNextRecord());
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-
-	if(retrievedPref.iRanking!=0)
-		return KErrGeneral;		//pref2 should have it's ranking displaced to 0 by ChangeConnectionPreferenceRankL
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest034_02::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest034_03::CCommDbTest034_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_034_03");
-	}
-
-CCommDbTest034_03::~CCommDbTest034_03()
-	{}
-
-TVerdict CCommDbTest034_03::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest034_03::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest034_03::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 2;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, EFalse);
-
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-	TRAPD(err, iPrefView->ChangeConnectionPreferenceRankL(5));
-	if (err!=KErrOverflow)
-		{
-		if(err==KErrNone)		//This is horrible, but need to make sure that if this returns with KErrNone we catch it.
-			err=KErrGeneral;
-		return err;
-		}
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-
-	if(retrievedPref.iRanking!=1)
-		return KErrGeneral;		//pref1 should still have ranking 1
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest034_03::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest034_04::CCommDbTest034_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_034_04");
-	}
-
-CCommDbTest034_04::~CCommDbTest034_04()
-	{}
-
-TVerdict CCommDbTest034_04::doTestStepL( void )
-	{
-	if (executeStepL() != KErrNotFound)
-		{
-		iTestStepResult = EFail;
-		}
-
-	return iTestStepResult;
-	}
-
-TVerdict CCommDbTest034_04::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest034_04::executeStepL()
-	{
-	//
-	// Previously (I guess) CommDB would have been able to create two
-	// Conn Pref entries and then the fresh view would not have seen them
-	// and it would panic. Now CommsDAT does see them and returns
-	// KErrNotFound, so now we no longer inserted in this test allowing
-	// the test to actually test the expected scenario.
-	//
-	delete iPrefView;		//Create a fresh view
-	iPrefView=NULL;
-	iPrefView=iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-	TRAPD(err, iPrefView->ChangeConnectionPreferenceRankL(2));
-
-	return err;
-	}
-	
-TVerdict CCommDbTest034_04::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest034_05::CCommDbTest034_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_034_05");
-	}
-
-CCommDbTest034_05::~CCommDbTest034_05()
-	{}
-
-TVerdict CCommDbTest034_05::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest034_05::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest034_05::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);
-
-	User::LeaveIfError(iPrefView->GotoFirstRecord());
-
-	TRAPD(err, iPrefView->ChangeConnectionPreferenceRankL(2));
-	if(err!=KErrAccessDenied)
-		{
-		if(err==KErrNone)		//Need to do some maping here otherwise if this returns KErrNone the test will pass!!
-			err=KErrGeneral;
-		return err;
-		}
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref retrievedPref;
-	iPrefView->ReadConnectionPreferenceL(retrievedPref);
-	
-	if(retrievedPref.iRanking!=1)		//The ranking has been changed for a read only entry
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest034_05::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest034_06::CCommDbTest034_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_034_06");
-	}
-
-CCommDbTest034_06::~CCommDbTest034_06()
-	{}
-
-TVerdict CCommDbTest034_06::doTestStepL( void )
-	{
-	Log(_L("Step 034.06 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest034_01* step034_01 = new(ELeave) CCommDbTest034_01;
-	CleanupStack::PushL(step034_01);
-	step034_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step034_01, KErrNone);
-	CleanupStack::PopAndDestroy(step034_01);
-
-	CCommDbTest034_02* step034_02 = new(ELeave) CCommDbTest034_02;
-	CleanupStack::PushL(step034_02);
-	step034_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step034_02, KErrNone);
-	CleanupStack::PopAndDestroy(step034_02);
-
-	CCommDbTest034_03* step034_03 = new(ELeave) CCommDbTest034_03;
-	CleanupStack::PushL(step034_03);
-	step034_03->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step034_03, KErrNone);
-	CleanupStack::PopAndDestroy(step034_03);
-
-	CCommDbTest034_04* step034_04 = new(ELeave) CCommDbTest034_04;
-	CleanupStack::PushL(step034_04);
-	step034_04->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step034_04, KErrNotFound);
-	CleanupStack::PopAndDestroy(step034_04);
-
-	CCommDbTest034_05* step034_05 = new(ELeave) CCommDbTest034_05;
-	CleanupStack::PushL(step034_05);
-	step034_05->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step034_05, KErrNone);
-	CleanupStack::PopAndDestroy(step034_05);
-	
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_034_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 034.XX group of scenarios 
-// 
-//
-
-#include<cdbpreftable.h>
-
-#if (!defined __STEP_034_XX_H__)
-#define __STEP_034_XX_H__
-
-
-//
-//	Test step 034.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest034_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest034_01();
-	~CCommDbTest034_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 034.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest034_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest034_02();
-	~CCommDbTest034_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 034.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest034_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest034_03();
-	~CCommDbTest034_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 034.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest034_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest034_04();
-	~CCommDbTest034_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 034.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest034_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest034_05();
-	~CCommDbTest034_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 034.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest034_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest034_06();
-	~CCommDbTest034_06();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_034_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_035_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,186 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 035.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbtemp.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_035_xx.h"
-
-
-CCommDbTest035_01::CCommDbTest035_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_035_01");
-	}
-
-CCommDbTest035_01::~CCommDbTest035_01()
-	{}
-
-TVerdict CCommDbTest035_01::doTestStepL( void )
-	{
-	executeStepL();
-	return EPass;	//If we've got this far we've passed
-	}
-
-TVerdict CCommDbTest035_01::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest035_01::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
-	delete templateRecord;
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest035_01::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest035_02::CCommDbTest035_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_035_02");
-	}
-
-CCommDbTest035_02::~CCommDbTest035_02()
-	{}
-
-TVerdict CCommDbTest035_02::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNotSupported)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest035_02::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest035_02::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord=NULL;
-	//CCommsDbTemplateRecord::NewL should leave with KErrNotSupported, since IAP table doesn't support templates
-	TRAPD(err, templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(IAP)));
-	delete templateRecord;
-	return err;
-	}
-	
-TVerdict CCommDbTest035_02::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest035_03::CCommDbTest035_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_035_03");
-	}
-
-CCommDbTest035_03::~CCommDbTest035_03()
-	{}
-
-TVerdict CCommDbTest035_03::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrArgument)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest035_03::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest035_03::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord=NULL;
-	//CCommsDbTemplateRecord::NewL should leave with KErrArgument for invalid name
-	TRAPD(err, templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, _L("Hi there")));
-	delete templateRecord;
-	return err;
-	}
-	
-TVerdict CCommDbTest035_03::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest035_04::CCommDbTest035_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_035_04");
-	}
-
-CCommDbTest035_04::~CCommDbTest035_04()
-	{}
-
-TVerdict CCommDbTest035_04::doTestStepL( void )
-	{
-	Log(_L("Step 035.04 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest035_01* step035_01 = new(ELeave) CCommDbTest035_01;
-	CleanupStack::PushL(step035_01);
-	step035_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step035_01, KErrNone);
-	CleanupStack::PopAndDestroy(step035_01);
-
-	CCommDbTest035_02* step035_02 = new(ELeave) CCommDbTest035_02;
-	CleanupStack::PushL(step035_02);
-	step035_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step035_02, KErrNotSupported);
-	CleanupStack::PopAndDestroy(step035_02);
-
-	CCommDbTest035_03* step035_03 = new(ELeave) CCommDbTest035_03;
-	CleanupStack::PushL(step035_03);
-	step035_03->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step035_03, KErrArgument);
-	CleanupStack::PopAndDestroy(step035_03);
-	
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_035_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 035.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_035_XX_H__)
-#define __STEP_035_XX_H__
-
-
-//
-//	Test step 035.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest035_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest035_01();
-	~CCommDbTest035_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 035.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest035_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest035_02();
-	~CCommDbTest035_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 035.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest035_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest035_03();
-	~CCommDbTest035_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 035.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest035_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest035_04();
-	~CCommDbTest035_04();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_035_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_036_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1131 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 036.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbtemp.h>
-#include <etelmm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_036_xx.h"
-
-
-CCommDbTest036_01::CCommDbTest036_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_01");
-	}
-
-CCommDbTest036_01::~CCommDbTest036_01()
-	{}
-
-TVerdict CCommDbTest036_01::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest036_01::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest036_01::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
-	CleanupStack::PushL(templateRecord);
-	
-	User::LeaveIfError(templateRecord->Modify());
-
-	TBufC8<KCommsDbSvrMaxFieldLength> inputString = _L8("string");
-	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
-	templateRecord->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING), inputString);
-	User::LeaveIfError(templateRecord->StoreModifications());
-
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	//Create a new template record and check the value is the same as the one entered.
-	CCommsDbTemplateRecord* checkRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
-	CleanupStack::PushL(checkRecord);
-	
-	TBuf8<KCommsDbSvrMaxFieldLength> checkString;
-
-	checkRecord->ReadTextL(TPtrC(MODEM_FAX_INIT_STRING), checkString);
-	CleanupStack::PopAndDestroy(checkRecord);
-
-	if(checkString!=inputString)
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest036_01::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest036_02::CCommDbTest036_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_02");
-	}
-
-CCommDbTest036_02::~CCommDbTest036_02()
-	{}
-
-TVerdict CCommDbTest036_02::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest036_02::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest036_02::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
-	CleanupStack::PushL(templateRecord);
-	
-	User::LeaveIfError(templateRecord->Modify());
-
-	TBufC8<KCommsDbSvrMaxFieldLength> firstInputString = _L8("string");
-	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
-	templateRecord->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING), firstInputString);
-	User::LeaveIfError(templateRecord->StoreModifications());
-
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	//Create a view on the modem table, over write the template value previosly set and check it sticks
-
-	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(MODEM_BEARER));
-	TUint32 dummyId;
-	//Create a new record, so we can be sure it is the same as the templated one
-	User::LeaveIfError(tableView->InsertRecord(dummyId));
-	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("NewModem"));
-	//Do overwrite of setting
-	TBufC8<KCommsDbSvrMaxFieldLength> overwriteString = _L8("different string");
-	tableView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING), overwriteString);
-	User::LeaveIfError(tableView->PutRecordChanges());
-
-	TBuf8<KCommsDbSvrMaxFieldLength> retrievedString;
-	tableView->ReadTextL(TPtrC(MODEM_FAX_INIT_STRING), retrievedString);
-	CleanupStack::PopAndDestroy(tableView);
-
-	if(retrievedString!=overwriteString)
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest036_02::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest036_03::CCommDbTest036_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_03");
-	}
-
-CCommDbTest036_03::~CCommDbTest036_03()
-	{}
-
-TVerdict CCommDbTest036_03::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest036_03::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest036_03::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
-	CleanupStack::PushL(templateRecord);
-	
-	User::LeaveIfError(templateRecord->Modify());
-
-	TBufC<KCommsDbSvrMaxFieldLength> inputString = _L("string");
-	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
-	templateRecord->WriteTextL(TPtrC(MODEM_PORT_NAME), inputString);
-	User::LeaveIfError(templateRecord->StoreModifications());
-
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	//Create a view on the modem table, make a new record and check the value is the one set for the template
-
-	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(MODEM_BEARER));
-	TUint32 dummyId;
-	//Create a new record, so we can be sure it is the same as the templated one
-	User::LeaveIfError(tableView->InsertRecord(dummyId));
-	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("NewModem"));
-	User::LeaveIfError(tableView->PutRecordChanges());
-
-	//Retrieve the string we set for the template
-	TBuf<KCommsDbSvrMaxFieldLength> retrievedString;
-	tableView->ReadTextL(TPtrC(MODEM_PORT_NAME), retrievedString);
-	CleanupStack::PopAndDestroy(tableView);
-
-	if(retrievedString!=inputString)
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest036_03::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest036_04::CCommDbTest036_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_04");
-	}
-
-CCommDbTest036_04::~CCommDbTest036_04()
-	{}
-
-TVerdict CCommDbTest036_04::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest036_04::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest036_04::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
-	CleanupStack::PushL(templateRecord);
-	
-	User::LeaveIfError(templateRecord->Modify());
-
-	TBufC<KCommsDbSvrMaxFieldLength> inputString = _L("string");
-	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
-	templateRecord->WriteTextL(TPtrC(MODEM_PORT_NAME), inputString);
-	User::LeaveIfError(templateRecord->StoreModifications());
-
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	//Create a view on the modem table, make a new record and overwrite the value set in the template
-
-	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(MODEM_BEARER));
-	TUint32 dummyId;
-	//Create a new record, so we can be sure it is the same as the templated one
-	User::LeaveIfError(tableView->InsertRecord(dummyId));
-	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("NewModem"));
-	//Do overwrite of setting
-	TBufC<KCommsDbSvrMaxFieldLength> overwriteString = _L("different string");
-	tableView->WriteTextL(TPtrC(MODEM_PORT_NAME), overwriteString);
-	User::LeaveIfError(tableView->PutRecordChanges());
-
-	//Retrieve the string we just set
-	TBuf<KCommsDbSvrMaxFieldLength> retrievedString;
-	tableView->ReadTextL(TPtrC(MODEM_PORT_NAME), retrievedString);
-	CleanupStack::PopAndDestroy(tableView);
-
-	if(retrievedString!=overwriteString)
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest036_04::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest036_05::CCommDbTest036_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_05");
-	}
-
-CCommDbTest036_05::~CCommDbTest036_05()
-	{}
-
-TVerdict CCommDbTest036_05::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest036_05::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest036_05::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
-	CleanupStack::PushL(templateRecord);
-	
-	User::LeaveIfError(templateRecord->Modify());
-
-	TBufC<KCommsDbSvrMaxFieldLength> inputString = _L("test string");
-	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("Name"));
-//	templateRecord->WriteTextL(TPtrC(ISP_IF_NAME), _L("SLIP"));
-	templateRecord->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteLongTextL(TPtrC(ISP_LOGIN_SCRIPT), inputString);
-	User::LeaveIfError(templateRecord->StoreModifications());
-
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	//Create a view on the DialInISP table, make a new record and check the value is the one set for the template
-
-	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
-	TUint32 dummyId;
-	//Create a new record, so we can be sure it is the same as the templated one
-	User::LeaveIfError(tableView->InsertRecord(dummyId));
-	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("Test ISP"));
-//	tableView->WriteTextL(TPtrC(ISP_IF_NAME), _L("Test If"));
-	tableView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), EFalse);
-	tableView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), EFalse);
-	tableView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), EFalse);
-	User::LeaveIfError(tableView->PutRecordChanges());
-
-	//Retrieve the string we set for the template
-	HBufC* retrievedString = tableView->ReadLongTextLC(TPtrC(ISP_LOGIN_SCRIPT));
-
-	TInt ret(KErrNone);
-	if(*retrievedString!=inputString)
-		ret= KErrGeneral;
-
-	CleanupStack::PopAndDestroy();	//retrievedString
-	CleanupStack::PopAndDestroy(tableView);
-
-	return ret;
-	}
-	
-TVerdict CCommDbTest036_05::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest036_06::CCommDbTest036_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_06");
-	}
-
-CCommDbTest036_06::~CCommDbTest036_06()
-	{}
-
-TVerdict CCommDbTest036_06::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest036_06::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest036_06::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
-	CleanupStack::PushL(templateRecord);
-	
-	User::LeaveIfError(templateRecord->Modify());
-
-	TBufC<KCommsDbSvrMaxFieldLength> inputString = _L("test string");
-	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("Name"));
-//	templateRecord->WriteTextL(TPtrC(ISP_IF_NAME), _L("SLIP"));
-	templateRecord->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteLongTextL(TPtrC(ISP_LOGIN_SCRIPT), inputString);
-	User::LeaveIfError(templateRecord->StoreModifications());
-
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	//Create a view on the DialInISP table, make a new record and change the value we set int he template
-
-	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
-	TUint32 dummyId;
-	//Create a new record, so we can be sure it is the same as the templated one
-	User::LeaveIfError(tableView->InsertRecord(dummyId));
-	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("Test ISP"));
-//	tableView->WriteTextL(TPtrC(ISP_IF_NAME), _L("Test If"));
-	tableView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), EFalse);
-	tableView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), EFalse);
-	tableView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), EFalse);
-	//Overwrite value set above in template
-	TBufC<KCommsDbSvrMaxFieldLength> overwriteString = _L("new string");
-	tableView->WriteLongTextL(TPtrC(ISP_LOGIN_SCRIPT), overwriteString);
-	User::LeaveIfError(tableView->PutRecordChanges());
-
-	//Retrieve the string we just set
-	HBufC* retrievedString = tableView->ReadLongTextLC(TPtrC(ISP_LOGIN_SCRIPT));
-
-	TInt ret(KErrNone);
-	if(*retrievedString!=overwriteString)
-		ret= KErrGeneral;
-
-	CleanupStack::PopAndDestroy();	//retrievedString
-	CleanupStack::PopAndDestroy(tableView);
-
-	return ret;
-	}
-	
-TVerdict CCommDbTest036_06::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest036_07::CCommDbTest036_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_07");
-	}
-
-CCommDbTest036_07::~CCommDbTest036_07()
-	{}
-
-TVerdict CCommDbTest036_07::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest036_07::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest036_07::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
-	CleanupStack::PushL(templateRecord);
-	
-	User::LeaveIfError(templateRecord->Modify());
-
-	TBool inputBool = ETrue;
-	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("Name"));
-//	templateRecord->WriteTextL(TPtrC(ISP_IF_NAME), _L("SLIP"));
-	templateRecord->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT), inputBool);	//Set to ETrue, since EFalse is default
-	User::LeaveIfError(templateRecord->StoreModifications());
-
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	//Create a view on the DialInISP table, make a new record and check the value is the one set for the template
-
-	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
-	TUint32 dummyId;
-	//Create a new record, so we can be sure it is the same as the templated one
-	User::LeaveIfError(tableView->InsertRecord(dummyId));
-	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("Test ISP"));
-//	tableView->WriteTextL(TPtrC(ISP_IF_NAME), _L("Test If"));
-	tableView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), EFalse);
-	tableView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), EFalse);
-	tableView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), EFalse);
-	User::LeaveIfError(tableView->PutRecordChanges());
-
-	//Retrieve the bool we set for the template
-	TBool retrievedBool;
-	tableView->ReadBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT), retrievedBool);
-
-	CleanupStack::PopAndDestroy(tableView);
-
-	if(retrievedBool!=inputBool)
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest036_07::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest036_08::CCommDbTest036_08()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_08");
-	}
-
-CCommDbTest036_08::~CCommDbTest036_08()
-	{}
-
-TVerdict CCommDbTest036_08::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest036_08::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest036_08::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
-	CleanupStack::PushL(templateRecord);
-	
-	User::LeaveIfError(templateRecord->Modify());
-
-	TBool inputBool = ETrue;
-	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("Name"));
-//	templateRecord->WriteTextL(TPtrC(ISP_IF_NAME), _L("SLIP"));
-	templateRecord->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT), inputBool);	//Set to ETrue, since EFalse is default
-	User::LeaveIfError(templateRecord->StoreModifications());
-
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	//Create a view on the DialInISP table, make a new record and change the value we set in the template
-
-	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
-	TUint32 dummyId;
-	//Create a new record, so we can be sure it is the same as the templated one
-	User::LeaveIfError(tableView->InsertRecord(dummyId));
-	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("Test ISP"));
-//	tableView->WriteTextL(TPtrC(ISP_IF_NAME), _L("Test If"));
-	tableView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), EFalse);
-	tableView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), EFalse);
-	tableView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), EFalse);
-	//Overwrite the value set in the template
-	TBool overwriteBool = EFalse;
-	tableView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT), overwriteBool);
-	User::LeaveIfError(tableView->PutRecordChanges());
-
-	//Retrieve the bool we just set for the record
-	TBool retrievedBool;
-	tableView->ReadBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT), retrievedBool);
-
-	CleanupStack::PopAndDestroy(tableView);
-
-	if(retrievedBool!=overwriteBool)
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest036_08::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest036_09::CCommDbTest036_09()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_09");
-	}
-
-CCommDbTest036_09::~CCommDbTest036_09()
-	{}
-
-TVerdict CCommDbTest036_09::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest036_09::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest036_09::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
-	CleanupStack::PushL(templateRecord);
-	User::LeaveIfError(templateRecord->Modify());
-
-	TUint32 inputInt = RMobileCall::KCapsSpeed32000;
-	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("Name"));
-	templateRecord->WriteTextL(TPtrC(ISP_IP_NAME_SERVER1),_L("MyDnsServer"));
-	templateRecord->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteUintL(TPtrC(ISP_BEARER_SPEED), inputInt);
-	User::LeaveIfError(templateRecord->StoreModifications());
-
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	//Create a view on the DialInISP table, make a new record and check the value is the one set for the template
-
-	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
-	TUint32 dummyId;
-	//Create a new record, so we can be sure it is the same as the templated one
-	User::LeaveIfError(tableView->InsertRecord(dummyId));
-	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("Test ISP"));
-	tableView->WriteTextL(TPtrC(ISP_IP_NAME_SERVER1),_L("NotMyDnsServer"));
-	tableView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), EFalse);
-	tableView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), EFalse);
-	tableView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), EFalse);
-	User::LeaveIfError(tableView->PutRecordChanges());
-
-	//Retrieve the TUint32 we set for the template
-	TUint32 retrievedInt;
-	tableView->ReadUintL(TPtrC(ISP_BEARER_SPEED), retrievedInt);
-	// And now check that we retrieve the text from the template
-
-	TBuf16<KCommsDbSvrMaxFieldLength> ifAuthName(_L16("Invalid"));
-	tableView->ReadTextL(TPtrC(ISP_IP_NAME_SERVER1), ifAuthName);
-	if(ifAuthName.Compare(_L16("NotMyDnsServer")))
-		{
-		User::Leave(KErrGeneral);
-		}
-
-	CleanupStack::PopAndDestroy(tableView);
-
-	if(retrievedInt!=inputInt)
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest036_09::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest036_10::CCommDbTest036_10()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_10");
-	}
-
-CCommDbTest036_10::~CCommDbTest036_10()
-	{}
-
-TVerdict CCommDbTest036_10::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest036_10::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest036_10::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
-	CleanupStack::PushL(templateRecord);
-	
-	User::LeaveIfError(templateRecord->Modify());
-
-	TUint32 inputInt = RMobileCall::KCapsSpeed32000;
-	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("Name"));
-	templateRecord->WriteTextL(TPtrC(ISP_IP_NAME_SERVER1),_L("MyDnsServer"));
-	templateRecord->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), ETrue);
-	templateRecord->WriteUintL(TPtrC(ISP_BEARER_SPEED), inputInt);
-	User::LeaveIfError(templateRecord->StoreModifications());
-
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	//Create a view on the DialInISP table, make a new record and change the value we set in the template
-	CCommsDbTableView* tableView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
-	TUint32 dummyId;
-	//Create a new record, so we can be sure it is the same as the templated one
-	User::LeaveIfError(tableView->InsertRecord(dummyId));
-	tableView->WriteTextL(TPtrC(COMMDB_NAME), _L("Test ISP"));
-	tableView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER), EFalse);
-	tableView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER), EFalse);
-	tableView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER), EFalse);
-	//Overwrite value we set in the template
-	TUint32 overwriteInt = RMobileCall::KCapsSpeed64000;
-	tableView->WriteUintL(TPtrC(ISP_BEARER_SPEED), overwriteInt);
-	User::LeaveIfError(tableView->PutRecordChanges());
-
-	//Retrieve the TUint32 we just set
-	TUint32 retrievedInt;
-	tableView->ReadUintL(TPtrC(ISP_BEARER_SPEED), retrievedInt);
-
-	TBuf16<KCommsDbSvrMaxFieldLength> ifAuthName(_L16("Invalid"));
-	tableView->ReadTextL(TPtrC(ISP_IP_NAME_SERVER1), ifAuthName);
-	if(ifAuthName.Compare(_L16("MyDnsServer")))
-		{
-		User::Leave(KErrGeneral);
-		}
-
-	CleanupStack::PopAndDestroy(tableView);
-
-	if(retrievedInt!=overwriteInt)
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest036_10::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest036_11::CCommDbTest036_11()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_11");
-	}
-
-CCommDbTest036_11::~CCommDbTest036_11()
-	{}
-
-TVerdict CCommDbTest036_11::doTestStepL( void )
-	{
-	executeStepL();
-	return EFail;	//Test is supposed to panic, so if we get here we've failed
-	}
-
-TVerdict CCommDbTest036_11::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest036_11::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
-	CleanupStack::PushL(templateRecord);
-	
-	templateRecord->StoreModifications();
-
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	return KErrGeneral;
-	}
-	
-TVerdict CCommDbTest036_11::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest036_12::CCommDbTest036_12()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_12");
-	}
-
-CCommDbTest036_12::~CCommDbTest036_12()
-	{}
-
-TVerdict CCommDbTest036_12::doTestStepL( void )
-	{
-	executeStepL();
-	return EFail;	//Test should panic, so if we get here something's wrong
-	}
-
-TVerdict CCommDbTest036_12::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest036_12::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
-	CleanupStack::PushL(templateRecord);
-	
-	templateRecord->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT), ETrue);
-
-	CleanupStack::PopAndDestroy(templateRecord);
-	return KErrGeneral;
-	}
-	
-TVerdict CCommDbTest036_12::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest036_13::CCommDbTest036_13()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_13");
-	}
-
-CCommDbTest036_13::~CCommDbTest036_13()
-	{}
-
-TVerdict CCommDbTest036_13::doTestStepL( void )
-	{
-	if (executeStepL()!=KErrNotFound)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest036_13::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest036_13::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
-	CleanupStack::PushL(templateRecord);
-
-	User::LeaveIfError(templateRecord->Modify());
-	TRAPD(err, templateRecord->WriteBoolL(_L("Invalid"), ETrue));
-
-	CleanupStack::PopAndDestroy(templateRecord);
-	return err;
-	}
-	
-TVerdict CCommDbTest036_13::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest036_14::CCommDbTest036_14()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_14");
-	}
-
-CCommDbTest036_14::~CCommDbTest036_14()
-	{}
-
-TVerdict CCommDbTest036_14::doTestStepL( void )
-	{
-	if (executeStepL()!=KErrNotFound)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest036_14::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest036_14::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
-	CleanupStack::PushL(templateRecord);
-
-	User::LeaveIfError(templateRecord->Modify());
-	TRAPD(err, templateRecord->WriteBoolL(_L(""), ETrue));
-
-	CleanupStack::PopAndDestroy(templateRecord);
-	return err;
-	}
-	
-TVerdict CCommDbTest036_14::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest036_15::CCommDbTest036_15()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_15");
-	}
-
-CCommDbTest036_15::~CCommDbTest036_15()
-	{}
-
-TVerdict CCommDbTest036_15::doTestStepL( void )
-	{
-	if (executeStepL()!=KErrNotFound)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest036_15::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest036_15::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(DIAL_IN_ISP));
-	CleanupStack::PushL(templateRecord);
-
-	TBool dummyBool;
-	TRAPD(err, templateRecord->ReadBoolL(_L("Invalid"), dummyBool));
-
-	CleanupStack::PopAndDestroy(templateRecord);
-	return err;
-	}
-	
-TVerdict CCommDbTest036_15::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest036_16::CCommDbTest036_16()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_16");
-	}
-
-CCommDbTest036_16::~CCommDbTest036_16()
-	{}
-
-TVerdict CCommDbTest036_16::doTestStepL( void )
-	{
-	Log(_L("Step 036.16 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest036_01* step036_01 = new(ELeave) CCommDbTest036_01;
-	CleanupStack::PushL(step036_01);
-	step036_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step036_01, KErrNone);
-	CleanupStack::PopAndDestroy(step036_01);
-
-	CCommDbTest036_02* step036_02 = new(ELeave) CCommDbTest036_02;
-	CleanupStack::PushL(step036_02);
-	step036_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step036_02, KErrNone);
-	CleanupStack::PopAndDestroy(step036_02);
-
-	CCommDbTest036_03* step036_03 = new(ELeave) CCommDbTest036_03;
-	CleanupStack::PushL(step036_03);
-	step036_03->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step036_03, KErrNone);
-	CleanupStack::PopAndDestroy(step036_03);
-	
-	CCommDbTest036_04* step036_04 = new(ELeave) CCommDbTest036_04;
-	CleanupStack::PushL(step036_04);
-	step036_04->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step036_04, KErrNone);
-	CleanupStack::PopAndDestroy(step036_04);
-
-	CCommDbTest036_05* step036_05 = new(ELeave) CCommDbTest036_05;
-	CleanupStack::PushL(step036_05);
-	step036_05->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step036_05, KErrNone);
-	CleanupStack::PopAndDestroy(step036_05);
-
-	CCommDbTest036_06* step036_06 = new(ELeave) CCommDbTest036_06;
-	CleanupStack::PushL(step036_06);
-	step036_06->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step036_06, KErrNone);
-	CleanupStack::PopAndDestroy(step036_06);
-
-	CCommDbTest036_07* step036_07 = new(ELeave) CCommDbTest036_07;
-	CleanupStack::PushL(step036_07);
-	step036_07->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step036_07, KErrNone);
-	CleanupStack::PopAndDestroy(step036_07);
-
-	CCommDbTest036_08* step036_08 = new(ELeave) CCommDbTest036_08;
-	CleanupStack::PushL(step036_08);
-	step036_08->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step036_08, KErrNone);
-	CleanupStack::PopAndDestroy(step036_08);
-
-	CCommDbTest036_09* step036_09 = new(ELeave) CCommDbTest036_09;
-	CleanupStack::PushL(step036_09);
-	step036_09->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step036_09, KErrNone);
-	CleanupStack::PopAndDestroy(step036_09);
-
-	CCommDbTest036_10* step036_10 = new(ELeave) CCommDbTest036_10;
-	CleanupStack::PushL(step036_10);
-	step036_10->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step036_10, KErrNone);
-	CleanupStack::PopAndDestroy(step036_10);
-
-	CCommDbTest036_13* step036_13 = new(ELeave) CCommDbTest036_13;
-	CleanupStack::PushL(step036_13);
-	step036_13->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step036_13, KErrNotFound);
-	CleanupStack::PopAndDestroy(step036_13);
-
-	CCommDbTest036_14* step036_14 = new(ELeave) CCommDbTest036_14;
-	CleanupStack::PushL(step036_14);
-	step036_14->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step036_14, KErrNotFound);
-	CleanupStack::PopAndDestroy(step036_14);
-
-	CCommDbTest036_15* step036_15 = new(ELeave) CCommDbTest036_15;
-	CleanupStack::PushL(step036_15);
-	step036_15->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step036_15, KErrNotFound);
-	CleanupStack::PopAndDestroy(step036_15);
-
-	return iTestStepResult;
-	}
-
-//
-
-CCommDbTest036_17::CCommDbTest036_17()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_17");
-	}
-
-CCommDbTest036_17::~CCommDbTest036_17()
-	{}
-
-TVerdict CCommDbTest036_17::doTestStepL( void )
-	{
-
-	iTestStepResult = EPass;
-
-	CCommDbTest036_11* step036_11 = new(ELeave) CCommDbTest036_11;
-	CleanupStack::PushL(step036_11);
-	step036_11->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step036_11, KErrNone);
-	CleanupStack::PopAndDestroy(step036_11);
-
-	return iTestStepResult;
-	}
-
-//
-
-CCommDbTest036_18::CCommDbTest036_18()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_036_18");
-	}
-
-CCommDbTest036_18::~CCommDbTest036_18()
-	{}
-
-TVerdict CCommDbTest036_18::doTestStepL( void )
-	{
-
-	iTestStepResult = EPass;
-
-	CCommDbTest036_12* step036_12 = new(ELeave) CCommDbTest036_12;
-	CleanupStack::PushL(step036_12);
-	step036_12->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step036_12, KErrNone);
-	CleanupStack::PopAndDestroy(step036_12);
-
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_036_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,317 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 036.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_036_XX_H__)
-#define __STEP_036_XX_H__
-
-
-//
-//	Test step 036.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_01();
-	~CCommDbTest036_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 036.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_02();
-	~CCommDbTest036_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 036.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_03();
-	~CCommDbTest036_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 036.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_04();
-	~CCommDbTest036_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 036.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_05();
-	~CCommDbTest036_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 036.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_06();
-	~CCommDbTest036_06();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 036.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_07();
-	~CCommDbTest036_07();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 036.08
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_08) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_08();
-	~CCommDbTest036_08();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 036.09
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_09) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_09();
-	~CCommDbTest036_09();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 036.10
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_10) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_10();
-	~CCommDbTest036_10();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 036.11
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_11) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_11();
-	~CCommDbTest036_11();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 036.12
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_12) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_12();
-	~CCommDbTest036_12();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 036.13
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_13) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_13();
-	~CCommDbTest036_13();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 036.14
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_14) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_14();
-	~CCommDbTest036_14();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 036.15
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_15) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_15();
-	~CCommDbTest036_15();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 036.16
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_16) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_16();
-	~CCommDbTest036_16();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 036.17
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_17) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_17();
-	~CCommDbTest036_17();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 036.18
-//
-
-NONSHARABLE_CLASS(CCommDbTest036_18) : public CTestStepCommDb
-{
-public:
-	CCommDbTest036_18();
-	~CCommDbTest036_18();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_036_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_037_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 037.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbtemp.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_037_xx.h"
-
-
-CCommDbTest037_01::CCommDbTest037_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_037_01");
-	}
-
-CCommDbTest037_01::~CCommDbTest037_01()
-	{}
-
-TVerdict CCommDbTest037_01::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest037_01::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest037_01::executeStepL()
-	{
-	//alter something in the template
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
-	CleanupStack::PushL(templateRecord);
-	
-	User::LeaveIfError(templateRecord->Modify());
-	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
-	TBufC8<KCommsDbSvrMaxFieldLength> firstInputString = _L8("first string");
-
-	templateRecord->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING), firstInputString);
-	User::LeaveIfError(templateRecord->StoreModifications());
-	//Now start to overwrite initial change, but don't commit, cancel instead.
-	User::LeaveIfError(templateRecord->Modify());
-
-	TBufC8<KCommsDbSvrMaxFieldLength> secondInputString = _L8("second string");
-	templateRecord->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING), secondInputString);
-	templateRecord->CancelModifications();
-
-	TBuf8<KCommsDbSvrMaxFieldLength> retrievedString;
-	templateRecord->ReadTextL(TPtrC(MODEM_FAX_INIT_STRING), retrievedString);
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	if(retrievedString!=firstInputString)
-		return KErrGeneral;
-	
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest037_01::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest037_02::CCommDbTest037_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_037_02");
-	}
-
-CCommDbTest037_02::~CCommDbTest037_02()
-	{}
-
-TVerdict CCommDbTest037_02::doTestStepL( void )
-	{
-	executeStepL();
-	return EPass;	//If we get here we've passed
-	}
-
-TVerdict CCommDbTest037_02::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest037_02::executeStepL()
-	{
-	//alter something in the template
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
-	CleanupStack::PushL(templateRecord);
-
-	templateRecord->CancelModifications();
-	
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest037_02::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest037_03::CCommDbTest037_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_037_03");
-	}
-
-CCommDbTest037_03::~CCommDbTest037_03()
-	{}
-
-TVerdict CCommDbTest037_03::doTestStepL( void )
-	{
-	Log(_L("Step 037.03 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest037_01* step037_01 = new(ELeave) CCommDbTest037_01;
-	CleanupStack::PushL(step037_01);
-	step037_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step037_01, KErrNone);
-	CleanupStack::PopAndDestroy(step037_01);
-
-	CCommDbTest037_02* step037_02 = new(ELeave) CCommDbTest037_02;
-	CleanupStack::PushL(step037_02);
-	step037_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step037_02, KErrNone);
-	CleanupStack::PopAndDestroy(step037_02);
-
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_037_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 037.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_037_XX_H__)
-#define __STEP_037_XX_H__
-
-
-//
-//	Test step 037.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest037_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest037_01();
-	~CCommDbTest037_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 037.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest037_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest037_02();
-	~CCommDbTest037_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 037.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest037_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest037_03();
-	~CCommDbTest037_03();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_037_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_038_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 038.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbtemp.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_038_xx.h"
-
-
-
-CCommDbTest038_01::CCommDbTest038_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_038_01");
-	}
-
-CCommDbTest038_01::~CCommDbTest038_01()
-	{}
-
-TVerdict CCommDbTest038_01::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest038_01::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest038_01::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
-	CleanupStack::PushL(templateRecord);
-	User::LeaveIfError(	templateRecord->Modify());
-	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
-	User::LeaveIfError(templateRecord->StoreModifications());
-
-	//delete the template
-	User::LeaveIfError(templateRecord->Delete());
-
-	TInt ret(KErrNone);
-
-	if(templateRecord->TemplateRecordExists())
-		ret = KErrGeneral;
-
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	return ret;
-	}
-	
-TVerdict CCommDbTest038_01::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest038_02::CCommDbTest038_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_038_02");
-	}
-
-CCommDbTest038_02::~CCommDbTest038_02()
-	{}
-
-TVerdict CCommDbTest038_02::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNotFound)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest038_02::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest038_02::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
-	CleanupStack::PushL(templateRecord);
-
-	User::LeaveIfError(	templateRecord->Modify());
-	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
-	User::LeaveIfError(templateRecord->StoreModifications());
-
-	//delete the template
-	User::LeaveIfError(templateRecord->Delete());
-	
-	TInt ret = templateRecord->Delete();
-
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	return ret;
-	}
-	
-TVerdict CCommDbTest038_02::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest038_03::CCommDbTest038_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_038_03");
-	}
-
-CCommDbTest038_03::~CCommDbTest038_03()
-	{}
-
-TVerdict CCommDbTest038_03::doTestStepL( void )
-	{
-	Log(_L("Step 038.03 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest038_01* step038_01 = new(ELeave) CCommDbTest038_01;
-	CleanupStack::PushL(step038_01);
-	step038_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step038_01, KErrNone);
-	CleanupStack::PopAndDestroy(step038_01);
-
-	CCommDbTest038_02* step038_02 = new(ELeave) CCommDbTest038_02;
-	CleanupStack::PushL(step038_02);
-	step038_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step038_02, KErrNotFound);
-	CleanupStack::PopAndDestroy(step038_02);
-
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_038_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 038.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_038_XX_H__)
-#define __STEP_038_XX_H__
-
-
-//
-//	Test step 038.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest038_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest038_01();
-	~CCommDbTest038_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 038.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest038_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest038_02();
-	~CCommDbTest038_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 038.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest038_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest038_03();
-	~CCommDbTest038_03();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_038_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_039_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 039.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbtemp.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_039_xx.h"
-
-
-CCommDbTest039_01::CCommDbTest039_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_039_01");
-	}
-
-CCommDbTest039_01::~CCommDbTest039_01()
-	{}
-
-TVerdict CCommDbTest039_01::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest039_01::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest039_01::executeStepL()
-	{
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, TPtrC(MODEM_BEARER));
-	CleanupStack::PushL(templateRecord);
-	
-	TInt ret(KErrNone);
-	User::LeaveIfError(templateRecord->Modify());
-	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
-	User::LeaveIfError(templateRecord->StoreModifications());
-
-	if(!templateRecord->TemplateRecordExists())
-		ret = KErrGeneral;
-
-	//delete the template
-	User::LeaveIfError(templateRecord->Delete());
-
-	if(templateRecord->TemplateRecordExists())
-		ret = KErrGeneral;
-
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	return ret;
-	}
-	
-TVerdict CCommDbTest039_01::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-CCommDbTest039_02::CCommDbTest039_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_039_02");
-	}
-
-CCommDbTest039_02::~CCommDbTest039_02()
-	{}
-
-TVerdict CCommDbTest039_02::doTestStepL( void )
-	{
-	Log(_L("Step 039.02 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest039_01* step039_01 = new(ELeave) CCommDbTest039_01;
-	CleanupStack::PushL(step039_01);
-	step039_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step039_01, KErrNone);
-	CleanupStack::PopAndDestroy(step039_01);
-
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_039_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 039.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_039_XX_H__)
-#define __STEP_039_XX_H__
-
-
-//
-//	Test step 039.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest039_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest039_01();
-	~CCommDbTest039_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 039.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest039_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest039_02();
-	~CCommDbTest039_02();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_038_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_040_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 040.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_040_xx.h"
-
-
-CCommDbTest040_01::CCommDbTest040_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_040_01");
-	}
-
-CCommDbTest040_01::~CCommDbTest040_01()
-	{}
-
-TVerdict CCommDbTest040_01::doTestStepL( void )
-	{
-	executeStepL();
-	return EPass;	//If we've got this far we've passed
-	}
-
-TVerdict CCommDbTest040_01::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest040_01::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest040_01::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest040_02::CCommDbTest040_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_040_02");
-	}
-
-CCommDbTest040_02::~CCommDbTest040_02()
-	{}
-
-TVerdict CCommDbTest040_02::doTestStepL( void )
-	{
-	executeStepL();
-	return EPass;	//If we've got this far we've passed
-	}
-
-TVerdict CCommDbTest040_02::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest040_02::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListFull);
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest040_02::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest040_03::CCommDbTest040_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_040_03");
-	}
-
-CCommDbTest040_03::~CCommDbTest040_03()
-	{}
-
-TVerdict CCommDbTest040_03::doTestStepL( void )
-	{
-	Log(_L("Step 040.03 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest040_01* step040_01 = new(ELeave) CCommDbTest040_01;
-	CleanupStack::PushL(step040_01);
-	step040_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step040_01, KErrNone);
-	CleanupStack::PopAndDestroy(step040_01);
-
-	CCommDbTest040_02* step040_02 = new(ELeave) CCommDbTest040_02;
-	CleanupStack::PushL(step040_02);
-	step040_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step040_02, KErrNone);
-	CleanupStack::PopAndDestroy(step040_02);
-	
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_040_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 040.XX group of scenarios 
-// 
-//
-
-#include<cdbover.h>
-
-#if (!defined __STEP_040_XX_H__)
-#define __STEP_040_XX_H__
-
-
-//
-//	Test step 040.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest040_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest040_01();
-	~CCommDbTest040_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 040.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest040_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest040_02();
-	~CCommDbTest040_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 040.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest040_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest040_03();
-	~CCommDbTest040_03();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_040_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_041_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1215 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 040.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_041_xx.h"
-
-
-CCommDbTest041_01::CCommDbTest041_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_01");
-	}
-
-CCommDbTest041_01::~CCommDbTest041_01()
-	{}
-
-TVerdict CCommDbTest041_01::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_01::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_01::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	TUint32 temp = 5000;
-	User::LeaveIfError(iOverSet->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), temp));
-	temp=22;	//Set temp to something different
-	User::LeaveIfError(iOverSet->GetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), temp));
-
-	if(temp!=5000)
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest041_01::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_02::CCommDbTest041_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_02");
-	}
-
-CCommDbTest041_02::~CCommDbTest041_02()
-	{}
-
-TVerdict CCommDbTest041_02::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_02::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_02::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	TBool temp = ETrue;
-	User::LeaveIfError(iOverSet->SetBoolOverride(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), temp));
-	temp=EFalse;
-	User::LeaveIfError(iOverSet->GetBoolOverride(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), temp));
-
-	if(temp==EFalse)
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest041_02::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_03::CCommDbTest041_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_03");
-	}
-
-CCommDbTest041_03::~CCommDbTest041_03()
-	{}
-
-TVerdict CCommDbTest041_03::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_03::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_03::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	TBuf8<KCommsDbSvrMaxFieldLength> temp(_L8("Hi There!!"));
-	User::LeaveIfError(iOverSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), temp));
-	temp = _L8("Go Away!!");
-	User::LeaveIfError(iOverSet->GetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), temp));
-
-	if(temp!=_L8("Hi There!!"))
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest041_03::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_04::CCommDbTest041_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_04");
-	}
-
-CCommDbTest041_04::~CCommDbTest041_04()
-	{}
-
-TVerdict CCommDbTest041_04::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_04::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_04::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	TBuf<KCommsDbSvrMaxFieldLength> temp(_L("Hi There!!"));
-	User::LeaveIfError(iOverSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), temp));
-	temp = _L("Go Away!!");
-	User::LeaveIfError(iOverSet->GetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), temp));
-
-	if(temp!=_L("Hi There!!"))
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest041_04::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_05::CCommDbTest041_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_05");
-	}
-
-CCommDbTest041_05::~CCommDbTest041_05()
-	{}
-
-TVerdict CCommDbTest041_05::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_05::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_05::executeStepL()
-	{
-	_LIT(KLongString, "SEND \"hello\"\nWAIT 20\n{\n\"hello back\"\n");
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	TBuf<KCommsDbSvrMaxFieldLength> temp(KLongString);	//Lots of stuff, nothing important
-	User::LeaveIfError(iOverSet->SetLongDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), temp));
-	temp = _L("Go Away!!");
-	User::LeaveIfError(iOverSet->GetLongDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), temp));
-
-	if(temp!=KLongString)
-		return KErrGeneral;
-
-	TInt stringLength;
-
-	User::LeaveIfError(iOverSet->GetLongDesOverrideLength(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), stringLength));
-
-	if(stringLength!=TPtrC(KLongString).Length())
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest041_05::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_06::CCommDbTest041_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_06");
-	}
-
-CCommDbTest041_06::~CCommDbTest041_06()
-	{}
-
-TVerdict CCommDbTest041_06::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_06::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_06::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-
-	TUint32 tempUint = 5000;
-	User::LeaveIfError(iOverSet->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), tempUint));
-	if(!iOverSet->IsOverridden(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), CCommDbOverrideSettings::EIntValue))
-		return KErrGeneral;
-
-	TBool tempBool = ETrue;
-	User::LeaveIfError(iOverSet->SetBoolOverride(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), tempBool));
-	if(!iOverSet->IsOverridden(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), CCommDbOverrideSettings::EBoolValue))
-		return KErrGeneral;
-
-	TBuf8<KCommsDbSvrMaxFieldLength> temp8String(_L8("Hi There!!"));
-	User::LeaveIfError(iOverSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), temp8String));
-	if(!iOverSet->IsOverridden(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), CCommDbOverrideSettings::EDes8Value))
-		return KErrGeneral;
-	
-	TBuf<KCommsDbSvrMaxFieldLength> temp16String(_L("Hi There!!"));
-	User::LeaveIfError(iOverSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), temp16String));
-	if(!iOverSet->IsOverridden(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), CCommDbOverrideSettings::EDes16Value))
-		return KErrGeneral;
-
-	TBuf<KCommsDbSvrMaxFieldLength> tempLongString(_L("SEND \"hello\"\nWAIT 20\n{\n\"hello back\"\n"));	//Lots of stuff, nothing important
-	User::LeaveIfError(iOverSet->SetLongDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), tempLongString));
-	if(!iOverSet->IsOverridden(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), CCommDbOverrideSettings::ELongDesValue))
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-
-TVerdict CCommDbTest041_06::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_07::CCommDbTest041_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_07");
-	}
-
-CCommDbTest041_07::~CCommDbTest041_07()
-	{}
-
-TVerdict CCommDbTest041_07::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNotFound)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_07::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_07::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-
-	return iOverSet->SetIntOverride(TPtrC(DIAL_OUT_ISP), _L("Where is the Column"), 55);
-	}
-
-TVerdict CCommDbTest041_07::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_08::CCommDbTest041_08()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_08");
-	}
-
-CCommDbTest041_08::~CCommDbTest041_08()
-	{}
-
-TVerdict CCommDbTest041_08::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNotFound)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_08::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_08::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-
-	return iOverSet->SetIntOverride(_L("WhatTable"), TPtrC(ISP_IWF_TO_MS), 55);
-	}
-
-TVerdict CCommDbTest041_08::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_09::CCommDbTest041_09()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_09");
-	}
-
-CCommDbTest041_09::~CCommDbTest041_09()
-	{}
-
-TVerdict CCommDbTest041_09::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNotSupported)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_09::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_09::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	TBuf<KCommsDbSvrMaxFieldLength> temp(_L("Hi There!!"));
-	return iOverSet->SetDesOverride(TPtrC(PROXIES), TPtrC(PROXY_SERVICE_TYPE), temp);
-	}
-
-TVerdict CCommDbTest041_09::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_10::CCommDbTest041_10()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_10");
-	}
-
-CCommDbTest041_10::~CCommDbTest041_10()
-	{}
-
-TVerdict CCommDbTest041_10::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrAlreadyExists)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_10::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_10::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	User::LeaveIfError(iOverSet->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), 5000));
-	return iOverSet->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), 5000);
-	}
-
-TVerdict CCommDbTest041_10::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_11::CCommDbTest041_11()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_11");
-	}
-
-CCommDbTest041_11::~CCommDbTest041_11()
-	{}
-
-TVerdict CCommDbTest041_11::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNotFound)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_11::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_11::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	TBuf<KCommsDbSvrMaxFieldLength> temp;
-	return iOverSet->GetDesOverride(TPtrC(PROXIES), TPtrC(PROXY_SERVICE_TYPE), temp);
-	}
-
-TVerdict CCommDbTest041_11::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_12::CCommDbTest041_12()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_12");
-	}
-
-CCommDbTest041_12::~CCommDbTest041_12()
-	{}
-
-TVerdict CCommDbTest041_12::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_12::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_12::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListFull);
-	if (iOverSet->PartialFull() != CCommDbOverrideSettings::EParamListFull)
-		return KErrGeneral;
-
-	delete iOverSet;
-	iOverSet = NULL;
-
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	if (iOverSet->PartialFull() != CCommDbOverrideSettings::EParamListPartial)
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-
-TVerdict CCommDbTest041_12::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_13::CCommDbTest041_13()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_13");
-	}
-
-CCommDbTest041_13::~CCommDbTest041_13()
-	{}
-
-TVerdict CCommDbTest041_13::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_13::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_13::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	TBuf<KCommsDbSvrMaxFieldLength> temp(_L("There's no place like home"));
-	return iOverSet->SetDesOverride(TPtrC(MODEM_BEARER), TPtrC(MODEM_TSY_NAME), temp);
-	}
-
-TVerdict CCommDbTest041_13::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_14::CCommDbTest041_14()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_14");
-	}
-
-CCommDbTest041_14::~CCommDbTest041_14()
-	{}
-
-TVerdict CCommDbTest041_14::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNotSupported)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_14::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_14::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	
-	return iOverSet->SetIntOverride(TPtrC(MODEM_BEARER), TPtrC(MODEM_STOP_BITS), 10);
-	}
-
-TVerdict CCommDbTest041_14::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_15::CCommDbTest041_15()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_15");
-	}
-
-CCommDbTest041_15::~CCommDbTest041_15()
-	{}
-
-TVerdict CCommDbTest041_15::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_15::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_15::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	TBuf<KCommsDbSvrMaxFieldLength> temp(_L("There's no place like home"));
-	if(KErrNone==iOverSet->SetIntOverride(TPtrC(PROXIES), TPtrC(PROXY_ISP), 0))
-		return KErrGeneral;
-	if(KErrNone==iOverSet->SetDesOverride(TPtrC(PROXIES), TPtrC(PROXY_SERVICE_TYPE), temp))
-		return KErrGeneral;
-	if(KErrNone==iOverSet->SetBoolOverride(TPtrC(PROXIES), TPtrC(PROXY_SERVICE_TYPE), ETrue))
-		return KErrGeneral;
-	if(KErrNone==iOverSet->SetLongDesOverride(TPtrC(PROXIES), TPtrC(PROXY_SERVER_NAME), temp))
-		return KErrGeneral;
-	if(KErrNone==iOverSet->SetDesOverride(TPtrC(PROXIES), TPtrC(PROXY_PROTOCOL_NAME), temp))
-		return KErrGeneral;
-	if(KErrNone==iOverSet->SetIntOverride(TPtrC(PROXIES), TPtrC(PROXY_PORT_NUMBER), 22))
-		return KErrGeneral;
-	if(KErrNone==iOverSet->SetLongDesOverride(TPtrC(PROXIES), TPtrC(PROXY_EXCEPTIONS), temp))
-		return KErrGeneral;
-	return KErrNone;
-	}
-
-TVerdict CCommDbTest041_15::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_16::CCommDbTest041_16()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_16");
-	}
-
-CCommDbTest041_16::~CCommDbTest041_16()
-	{}
-
-TVerdict CCommDbTest041_16::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNotSupported)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_16::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_16::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	TInt err;
-	TBuf<KCommsDbSvrMaxFieldLength> temp(_L("There's no place like home"));
-	if(KErrNotSupported!=(err=iOverSet->SetDesOverride(TPtrC(WAP_ACCESS_POINT), TPtrC(WAP_CURRENT_BEARER), temp)))
-		return err;
-	if(KErrNotSupported!=(err=iOverSet->SetLongDesOverride(TPtrC(WAP_ACCESS_POINT), TPtrC(WAP_START_PAGE), temp)))
-		return err;
-	return KErrNotSupported;
-	}
-
-TVerdict CCommDbTest041_16::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_17::CCommDbTest041_17()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_17");
-	}
-
-CCommDbTest041_17::~CCommDbTest041_17()
-	{}
-
-TVerdict CCommDbTest041_17::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNotSupported)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest041_17::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest041_17::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	TInt err;
-	TBuf<KCommsDbSvrMaxFieldLength> temp(_L("There's no place like home"));
-	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_USAGE), 1)))
-		return err;
-	if(KErrNotSupported!=(err=iOverSet->SetDesOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_APN), temp)))
-		return err;
-	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_PDP_TYPE), 0)))
-		return err;
-	if(KErrNotSupported!=(err=iOverSet->SetDesOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_PDP_ADDRESS), temp)))
-		return err;
-	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_PRECEDENCE), 1)))
-		return err;
-	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_DELAY), 1)))
-		return err;
-	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_RELIABILITY), 1)))
-		return err;
-	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_PEAK_THROUGHPUT), 1)))
-		return err;
-	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_MEAN_THROUGHPUT), 1)))
-		return err;
-	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_MIN_PRECEDENCE), 1)))
-		return err;
-	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_MIN_DELAY), 1)))
-		return err;
-	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_MIN_RELIABILITY), 1)))
-		return err;
-	if(KErrNotSupported!=(err=iOverSet->SetIntOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_MIN_PEAK_THROUGHPUT), 1)))
-		return err;
-	if(KErrNotSupported!=(err=iOverSet->SetBoolOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_DATA_COMPRESSION), ETrue)))
-		return err;
-	if(KErrNotSupported!=(err=iOverSet->SetBoolOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_HEADER_COMPRESSION), ETrue)))
-		return err;
-	if(KErrNotSupported!=(err=iOverSet->SetBoolOverride(TPtrC(DEFAULT_GPRS), TPtrC(DEFAULT_GPRS_ANONYMOUS_ACCESS), ETrue)))
-		return err;
-
-	return KErrNotSupported;
-	}
-
-TVerdict CCommDbTest041_17::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest041_18::CCommDbTest041_18()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_18");
-	}
-
-CCommDbTest041_18::~CCommDbTest041_18()
-	{}
-
-TVerdict CCommDbTest041_18::doTestStepL( void )
-	{
-	Log(_L("Step 041.18 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest041_01* step041_01 = new(ELeave) CCommDbTest041_01;
-	CleanupStack::PushL(step041_01);
-	step041_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_01, KErrNone);
-	CleanupStack::PopAndDestroy(step041_01);
-
-	return iTestStepResult;
-	}
-
-
-
-//
-
-CCommDbTest041_19::CCommDbTest041_19()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_19");
-	}
-
-CCommDbTest041_19::~CCommDbTest041_19()
-	{}
-
-TVerdict CCommDbTest041_19::doTestStepL( void )
-	{
-	Log(_L("Step 041.19 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest041_02* step041_02 = new(ELeave) CCommDbTest041_02;
-	CleanupStack::PushL(step041_02);
-	step041_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_02, KErrNone);
-	CleanupStack::PopAndDestroy(step041_02);
-	
-	return iTestStepResult;
-	}
-	
-//
-
-CCommDbTest041_20::CCommDbTest041_20()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_20");
-	}
-
-CCommDbTest041_20::~CCommDbTest041_20()
-	{}
-
-TVerdict CCommDbTest041_20::doTestStepL( void )
-	{
-	Log(_L("Step 041.20 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest041_03* step041_03 = new(ELeave) CCommDbTest041_03;
-	CleanupStack::PushL(step041_03);
-	step041_03->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_03, KErrNone);
-	CleanupStack::PopAndDestroy(step041_03);
-	
-	return iTestStepResult;
-	}
-	
-//
-
-CCommDbTest041_21::CCommDbTest041_21()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_21");
-	}
-
-CCommDbTest041_21::~CCommDbTest041_21()
-	{}
-
-TVerdict CCommDbTest041_21::doTestStepL( void )
-	{
-	Log(_L("Step 041.21 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest041_04* step041_04 = new(ELeave) CCommDbTest041_04;
-	CleanupStack::PushL(step041_04);
-	step041_04->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_04, KErrNone);
-	CleanupStack::PopAndDestroy(step041_04);
-	
-	return iTestStepResult;
-	}
-	
-//
-
-CCommDbTest041_22::CCommDbTest041_22()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_22");
-	}
-
-CCommDbTest041_22::~CCommDbTest041_22()
-	{}
-
-TVerdict CCommDbTest041_22::doTestStepL( void )
-	{
-	Log(_L("Step 041.22 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest041_05* step041_05 = new(ELeave) CCommDbTest041_05;
-	CleanupStack::PushL(step041_05);
-	step041_05->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_05, KErrNone);
-	CleanupStack::PopAndDestroy(step041_05);
-	
-	return iTestStepResult;
-	}
-	
-//
-
-CCommDbTest041_23::CCommDbTest041_23()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_23");
-	}
-
-CCommDbTest041_23::~CCommDbTest041_23()
-	{}
-
-TVerdict CCommDbTest041_23::doTestStepL( void )
-	{
-	Log(_L("Step 041.23 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest041_06* step041_06 = new(ELeave) CCommDbTest041_06;
-	CleanupStack::PushL(step041_06);
-	step041_06->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_06, KErrNone);
-	CleanupStack::PopAndDestroy(step041_06);
-	
-	return iTestStepResult;
-	}
-	
-//
-
-CCommDbTest041_24::CCommDbTest041_24()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_24");
-	}
-
-CCommDbTest041_24::~CCommDbTest041_24()
-	{}
-
-TVerdict CCommDbTest041_24::doTestStepL( void )
-	{
-	Log(_L("Step 041.24 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest041_07* step041_07 = new(ELeave) CCommDbTest041_07;
-	CleanupStack::PushL(step041_07);
-	step041_07->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_07, KErrNotFound);
-	CleanupStack::PopAndDestroy(step041_07);
-	
-	return iTestStepResult;
-	}
-	
-//
-
-CCommDbTest041_25::CCommDbTest041_25()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_25");
-	}
-
-CCommDbTest041_25::~CCommDbTest041_25()
-	{}
-
-TVerdict CCommDbTest041_25::doTestStepL( void )
-	{
-	Log(_L("Step 041.25 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest041_08* step041_08 = new(ELeave) CCommDbTest041_08;
-	CleanupStack::PushL(step041_08);
-	step041_08->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_08, KErrNotFound);
-	CleanupStack::PopAndDestroy(step041_08);
-	
-	return iTestStepResult;
-	}
-	
-//
-
-CCommDbTest041_26::CCommDbTest041_26()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_26");
-	}
-
-CCommDbTest041_26::~CCommDbTest041_26()
-	{}
-
-TVerdict CCommDbTest041_26::doTestStepL( void )
-	{
-	Log(_L("Step 041.26 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest041_09* step041_09 = new(ELeave) CCommDbTest041_09;
-	CleanupStack::PushL(step041_09);
-	step041_09->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_09, KErrNotSupported);
-	CleanupStack::PopAndDestroy(step041_09);
-	
-	return iTestStepResult;
-	}
-	
-//
-
-CCommDbTest041_27::CCommDbTest041_27()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_27");
-	}
-
-CCommDbTest041_27::~CCommDbTest041_27()
-	{}
-
-TVerdict CCommDbTest041_27::doTestStepL( void )
-	{
-	Log(_L("Step 041.27 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest041_10* step041_10 = new(ELeave) CCommDbTest041_10;
-	CleanupStack::PushL(step041_10);
-	step041_10->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_10, KErrAlreadyExists);
-	CleanupStack::PopAndDestroy(step041_10);
-	
-	return iTestStepResult;
-	}
-	
-//
-
-CCommDbTest041_28::CCommDbTest041_28()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_28");
-	}
-
-CCommDbTest041_28::~CCommDbTest041_28()
-	{}
-
-TVerdict CCommDbTest041_28::doTestStepL( void )
-	{
-	Log(_L("Step 041.28 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest041_11* step041_11 = new(ELeave) CCommDbTest041_11;
-	CleanupStack::PushL(step041_11);
-	step041_11->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_11, KErrNotFound);
-	CleanupStack::PopAndDestroy(step041_11);
-	
-	return iTestStepResult;
-	}
-	
-//
-
-CCommDbTest041_29::CCommDbTest041_29()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_29");
-	}
-
-CCommDbTest041_29::~CCommDbTest041_29()
-	{}
-
-TVerdict CCommDbTest041_29::doTestStepL( void )
-	{
-	Log(_L("Step 041.29 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest041_12* step041_12 = new(ELeave) CCommDbTest041_12;
-	CleanupStack::PushL(step041_12);
-	step041_12->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_12, KErrNone);
-	CleanupStack::PopAndDestroy(step041_12);
-	
-	return iTestStepResult;
-	}
-	
-//
-
-CCommDbTest041_30::CCommDbTest041_30()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_30");
-	}
-
-CCommDbTest041_30::~CCommDbTest041_30()
-	{}
-
-TVerdict CCommDbTest041_30::doTestStepL( void )
-	{
-	Log(_L("Step 041.30 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest041_13* step041_13 = new(ELeave) CCommDbTest041_13;
-	CleanupStack::PushL(step041_13);
-	step041_13->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_13, KErrNone);
-	CleanupStack::PopAndDestroy(step041_13);
-	
-	return iTestStepResult;
-	}
-	
-//
-
-CCommDbTest041_31::CCommDbTest041_31()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_31");
-	}
-
-CCommDbTest041_31::~CCommDbTest041_31()
-	{}
-
-TVerdict CCommDbTest041_31::doTestStepL( void )
-	{
-	Log(_L("Step 041.31 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest041_14* step041_14 = new(ELeave) CCommDbTest041_14;
-	CleanupStack::PushL(step041_14);
-	step041_14->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_14, KErrNotSupported);
-	CleanupStack::PopAndDestroy(step041_14);
-	
-	return iTestStepResult;
-	}
-	
-//
-
-CCommDbTest041_32::CCommDbTest041_32()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_32");
-	}
-
-CCommDbTest041_32::~CCommDbTest041_32()
-	{}
-
-TVerdict CCommDbTest041_32::doTestStepL( void )
-	{
-	Log(_L("Step 041.32 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest041_15* step041_15 = new(ELeave) CCommDbTest041_15;
-	CleanupStack::PushL(step041_15);
-	step041_15->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_15, KErrNone);
-	CleanupStack::PopAndDestroy(step041_15);
-	
-	return iTestStepResult;
-	}
-	
-//
-
-CCommDbTest041_33::CCommDbTest041_33()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_33");
-	}
-
-CCommDbTest041_33::~CCommDbTest041_33()
-	{}
-
-TVerdict CCommDbTest041_33::doTestStepL( void )
-	{
-	Log(_L("Step 041.33 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest041_16* step041_16 = new(ELeave) CCommDbTest041_16;
-	CleanupStack::PushL(step041_16);
-	step041_16->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_16, KErrNotSupported);
-	CleanupStack::PopAndDestroy(step041_16);
-	
-	return iTestStepResult;
-	}
-	
-//
-
-CCommDbTest041_34::CCommDbTest041_34()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_041_34");
-	}
-
-CCommDbTest041_34::~CCommDbTest041_34()
-	{}
-
-TVerdict CCommDbTest041_34::doTestStepL( void )
-	{
-	Log(_L("Step 041.34 called "));
-
-	iTestStepResult = EPass;
-	
-	CCommDbTest041_17* step041_17 = new(ELeave) CCommDbTest041_17;
-	CleanupStack::PushL(step041_17);
-	step041_17->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step041_17, KErrNotSupported);
-	CleanupStack::PopAndDestroy(step041_17);
-	
-	return iTestStepResult;
-	}
-
-//EOF
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_041_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,572 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 041.XX group of scenarios 
-// 
-//
-
-#include<cdbover.h>
-
-#if (!defined __STEP_041_XX_H__)
-#define __STEP_041_XX_H__
-
-
-//
-//	Test step 041.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_01();
-	~CCommDbTest041_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_02();
-	~CCommDbTest041_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_03();
-	~CCommDbTest041_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_04();
-	~CCommDbTest041_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_05();
-	~CCommDbTest041_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_06();
-	~CCommDbTest041_06();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.07
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_07();
-	~CCommDbTest041_07();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.08
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_08) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_08();
-	~CCommDbTest041_08();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.09
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_09) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_09();
-	~CCommDbTest041_09();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.10
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_10) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_10();
-	~CCommDbTest041_10();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.11
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_11) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_11();
-	~CCommDbTest041_11();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.12
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_12) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_12();
-	~CCommDbTest041_12();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.13
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_13) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_13();
-	~CCommDbTest041_13();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.14
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_14) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_14();
-	~CCommDbTest041_14();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.15
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_15) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_15();
-	~CCommDbTest041_15();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.16
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_16) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_16();
-	~CCommDbTest041_16();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.17
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_17) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_17();
-	~CCommDbTest041_17();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-//
-//	Test step 041.18
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_18) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_18();
-	~CCommDbTest041_18();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-
-
-
-//
-//	Test step 041.19
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_19) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_19();
-	~CCommDbTest041_19();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 041.20
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_20) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_20();
-	~CCommDbTest041_20();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 041.21
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_21) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_21();
-	~CCommDbTest041_21();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 041.22
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_22) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_22();
-	~CCommDbTest041_22();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 041.23
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_23) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_23();
-	~CCommDbTest041_23();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 041.24
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_24) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_24();
-	~CCommDbTest041_24();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 041.25
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_25) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_25();
-	~CCommDbTest041_25();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 041.26
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_26) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_26();
-	~CCommDbTest041_26();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 041.27
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_27) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_27();
-	~CCommDbTest041_27();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 041.28
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_28) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_28();
-	~CCommDbTest041_28();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 041.20
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_29) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_29();
-	~CCommDbTest041_29();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 041.30
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_30) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_30();
-	~CCommDbTest041_30();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 041.31
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_31) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_31();
-	~CCommDbTest041_31();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 041.32
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_32) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_32();
-	~CCommDbTest041_32();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 041.33
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_33) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_33();
-	~CCommDbTest041_33();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-//
-//	Test step 041.34
-//
-
-NONSHARABLE_CLASS(CCommDbTest041_34) : public CTestStepCommDb
-{
-public:
-	CCommDbTest041_34();
-	~CCommDbTest041_34();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-
-#endif //__STEP_041_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_042_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 042.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_042_xx.h"
-
-
-CCommDbTest042_01::CCommDbTest042_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_042_01");
-	}
-
-CCommDbTest042_01::~CCommDbTest042_01()
-	{}
-
-TVerdict CCommDbTest042_01::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest042_01::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest042_01::executeStepL()
-	{
-	TInt err(KErrNone);
-
-	CCommDbOverrideSettings* overSet1=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(overSet1);
-	TUint32 temp1 = 5000;
-	User::LeaveIfError(overSet1->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), temp1));
-
-	CCommDbOverrideSettings* overSet2=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(overSet2);
-	TUint32 temp2=5000;
-	User::LeaveIfError(overSet2->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_AUTH_RETRIES), temp2));
-
-	if(overSet1->Compare(overSet2))
-		err = KErrGeneral;
-
-	CleanupStack::PopAndDestroy(overSet2);
-	CleanupStack::PopAndDestroy(overSet1);
-	
-	return err;
-	}
-	
-TVerdict CCommDbTest042_01::doTestStepPostambleL()
-	{
-	return EPass;
-	}
-
-//
-
-CCommDbTest042_02::CCommDbTest042_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_042_02");
-	}
-
-CCommDbTest042_02::~CCommDbTest042_02()
-	{}
-
-TVerdict CCommDbTest042_02::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest042_02::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest042_02::executeStepL()
-	{
-	TInt err(KErrNone);
-
-	CCommDbOverrideSettings* overSet1=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(overSet1);
-	TUint32 temp1 = 5000;
-	User::LeaveIfError(overSet1->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), temp1));
-
-	CCommDbOverrideSettings* overSet2=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(overSet2);
-	TUint32 temp2=5000;
-	User::LeaveIfError(overSet2->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), temp2));
-
-	if(!overSet1->Compare(overSet2))
-		err = KErrGeneral;
-
-	CleanupStack::PopAndDestroy(overSet2);
-	CleanupStack::PopAndDestroy(overSet1);
-	
-	return err;
-	}
-	
-TVerdict CCommDbTest042_02::doTestStepPostambleL()
-	{
-	return EPass;
-	}
-
-//
-
-CCommDbTest042_03::CCommDbTest042_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_042_03");
-	}
-
-CCommDbTest042_03::~CCommDbTest042_03()
-	{}
-
-TVerdict CCommDbTest042_03::doTestStepL( void )
-	{
-	Log(_L("Step 042.03 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest042_01* step042_01 = new(ELeave) CCommDbTest042_01;
-	CleanupStack::PushL(step042_01);
-	step042_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step042_01, KErrNone);
-	CleanupStack::PopAndDestroy(step042_01);
-
-	CCommDbTest042_02* step042_02 = new(ELeave) CCommDbTest042_02;
-	CleanupStack::PushL(step042_02);
-	step042_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step042_02, KErrNone);
-	CleanupStack::PopAndDestroy(step042_02);
-
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_042_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 042.XX group of scenarios 
-// 
-//
-
-#include<cdbover.h>
-
-#if (!defined __STEP_042_XX_H__)
-#define __STEP_042_XX_H__
-
-
-//
-//	Test step 042.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest042_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest042_01();
-	~CCommDbTest042_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-};
-
-//
-//	Test step 042.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest042_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest042_02();
-	~CCommDbTest042_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-};
-
-//
-//	Test step 042.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest042_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest042_03();
-	~CCommDbTest042_03();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_042_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_043_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,473 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 043.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_043_xx.h"
-
-
-CCommDbTest043_01::CCommDbTest043_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_043_01");
-	}
-
-CCommDbTest043_01::~CCommDbTest043_01()
-	{}
-
-TVerdict CCommDbTest043_01::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest043_01::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-	
-	return EPass;
-	}
-
-TInt CCommDbTest043_01::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 2;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, ETrue);
-	
-	CCommDbOverrideSettings* overSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(overSet);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref overPref;
-	overPref.iRanking = 1;
-	overPref.iDirection = ECommDbConnectionDirectionOutgoing;
-	overPref.iDialogPref = ECommDbDialogPrefDoNotPrompt;
-	overPref.iBearer.iBearerSet = KCommDbBearerCSD;
-	overPref.iBearer.iIapId = 2;
-
-	User::LeaveIfError(overSet->SetConnectionPreferenceOverride(overPref));
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref overPref2;
-	overPref2.iRanking = 1;
-	overPref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	overPref2.iDialogPref = ECommDbDialogPrefUnknown;
-	overPref2.iBearer.iBearerSet = 0;
-	overPref2.iBearer.iIapId = 0;
-
-	User::LeaveIfError(overSet->GetConnectionPreferenceOverride(overPref2));
-	CleanupStack::PopAndDestroy(overSet);
-
-	if(!(overPref==overPref2))
-		return KErrGeneral;
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest043_01::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest043_02::CCommDbTest043_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_043_02");
-	}
-
-CCommDbTest043_02::~CCommDbTest043_02()
-	{}
-
-TVerdict CCommDbTest043_02::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrAlreadyExists)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest043_02::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-	
-	return EPass;
-	}
-
-TInt CCommDbTest043_02::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 2;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, ETrue);
-	
-	CCommDbOverrideSettings* overSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(overSet);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref overPref;
-	overPref.iRanking = 1;
-	overPref.iDirection = ECommDbConnectionDirectionOutgoing;
-	overPref.iDialogPref = ECommDbDialogPrefDoNotPrompt;
-	overPref.iBearer.iBearerSet = KCommDbBearerCSD;
-	overPref.iBearer.iIapId = 2;
-
-	User::LeaveIfError(overSet->SetConnectionPreferenceOverride(overPref));
-
-	overPref.iDialogPref = ECommDbDialogPrefPrompt;
-	overPref.iBearer.iBearerSet = KCommDbBearerCSD;
-	overPref.iBearer.iIapId = 2;
-
-	TInt err = overSet->SetConnectionPreferenceOverride(overPref);
-	CleanupStack::PopAndDestroy(overSet);
-
-	return err;
-	}
-	
-TVerdict CCommDbTest043_02::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest043_03::CCommDbTest043_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_043_03");
-	}
-
-CCommDbTest043_03::~CCommDbTest043_03()
-	{}
-
-TVerdict CCommDbTest043_03::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest043_03::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-	
-	return EPass;
-	}
-
-TInt CCommDbTest043_03::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 2;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, ETrue);
-	
-	CCommDbOverrideSettings* overSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(overSet);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref overPref;
-	overPref.iRanking = 1;
-	overPref.iDirection = ECommDbConnectionDirectionOutgoing;
-	overPref.iDialogPref = ECommDbDialogPrefDoNotPrompt;
-	overPref.iBearer.iBearerSet = KCommDbBearerCSD;
-	overPref.iBearer.iIapId = 2;
-
-	User::LeaveIfError(overSet->SetConnectionPreferenceOverride(overPref));
-
-	overPref.iRanking = 0;
-	overPref.iDirection = ECommDbConnectionDirectionUnknown;
-	overPref.iDialogPref = ECommDbDialogPrefUnknown;
-	overPref.iBearer.iBearerSet = 0;
-	overPref.iBearer.iIapId = 0;
-
-	TInt err = overSet->GetConnectionPreferenceOverride(overPref);
-
-	CleanupStack::PopAndDestroy(overSet);
-
-	if(err==KErrArgument)	//Have to map errors to different ones so we can do heap failure tests
-		return KErrNone;	//Nasty, but not a lot else we can do.
-
-	if(err==KErrNone)
-		return KErrGeneral;
-
-	return err;
-	}
-	
-TVerdict CCommDbTest043_03::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest043_04::CCommDbTest043_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_043_04");
-	}
-
-CCommDbTest043_04::~CCommDbTest043_04()
-	{}
-
-TVerdict CCommDbTest043_04::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNotFound)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest043_04::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-	
-	return EPass;
-	}
-
-TInt CCommDbTest043_04::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref1;
-	pref1.iRanking = 1;
-	pref1.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref1.iDialogPref = ECommDbDialogPrefPrompt;
-	pref1.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref1.iBearer.iIapId = 1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, ETrue);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref2;
-	pref2.iRanking = 2;
-	pref2.iDirection = ECommDbConnectionDirectionOutgoing;
-	pref2.iDialogPref = ECommDbDialogPrefPrompt;
-	pref2.iBearer.iBearerSet = KCommDbBearerCSD;
-	pref2.iBearer.iIapId = 2;
-	
-	iPrefView->InsertConnectionPreferenceL(pref2, ETrue);
-	
-	CCommDbOverrideSettings* overSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(overSet);
-
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref overPref;
-	overPref.iRanking = 1;
-	overPref.iDirection = ECommDbConnectionDirectionOutgoing;
-	overPref.iDialogPref = ECommDbDialogPrefUnknown;
-	overPref.iBearer.iBearerSet = 0;
-	overPref.iBearer.iIapId = 0;
-
-	TInt err = overSet->GetConnectionPreferenceOverride(overPref);
-
-	CleanupStack::PopAndDestroy(overSet);
-
-	return err;
-	}
-	
-TVerdict CCommDbTest043_04::doTestStepPostambleL()
-	{
-		//Get rid of our view
-	if(iPrefView)
-		{
-		delete iPrefView;
-		}
-	iPrefView=0;
-
-	//Create a new view that should have the record that was added in executeStepL and
-	// may have been left in by a leave condition
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	if(iPrefView->GotoFirstRecord() == KErrNone)
-		{
-		iPrefView->DeleteConnectionPreferenceL();
-		}
-	
-	// Cleanup after test run
-	CTestStepCommDb::doTestStepPostambleL();	
-	return EPass;
-	}
-
-//
-
-CCommDbTest043_05::CCommDbTest043_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_043_05");
-	}
-
-CCommDbTest043_05::~CCommDbTest043_05()
-	{}
-
-TVerdict CCommDbTest043_05::doTestStepL( void )
-	{
-	Log(_L("Step 043.05 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest043_01* step043_01 = new(ELeave) CCommDbTest043_01;
-	CleanupStack::PushL(step043_01);
-	step043_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step043_01, KErrNone);
-	CleanupStack::PopAndDestroy(step043_01);
-
-	CCommDbTest043_02* step043_02 = new(ELeave) CCommDbTest043_02;
-	CleanupStack::PushL(step043_02);
-	step043_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step043_02, KErrAlreadyExists);
-	CleanupStack::PopAndDestroy(step043_02);
-
-	CCommDbTest043_03* step043_03 = new(ELeave) CCommDbTest043_03;
-	CleanupStack::PushL(step043_03);
-	step043_03->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step043_03, KErrNone);
-	CleanupStack::PopAndDestroy(step043_03);
-
-	CCommDbTest043_04* step043_04 = new(ELeave) CCommDbTest043_04;
-	CleanupStack::PushL(step043_04);
-	step043_04->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step043_04, KErrNotFound);
-	CleanupStack::PopAndDestroy(step043_04);
-
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_043_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 043.XX group of scenarios 
-// 
-//
-
-#include<cdbover.h>
-
-#if (!defined __STEP_043_XX_H__)
-#define __STEP_043_XX_H__
-
-
-//
-//	Test step 043.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest043_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest043_01();
-	~CCommDbTest043_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 043.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest043_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest043_02();
-	~CCommDbTest043_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 043.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest043_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest043_03();
-	~CCommDbTest043_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 043.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest043_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest043_04();
-	~CCommDbTest043_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 043.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest043_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest043_05();
-	~CCommDbTest043_05();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_043_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_044_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 044.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbstore.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_044_xx.h"
-
-
-CCommDbTest044_01::CCommDbTest044_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_044_01");
-	}
-
-CCommDbTest044_01::~CCommDbTest044_01()
-	{}
-
-TVerdict CCommDbTest044_01::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest044_01::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest044_01::executeStepL()
-	{
-	CStoreableOverrideSettings* overSet=CStoreableOverrideSettings::NewL(CStoreableOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(overSet);
-
-	TUint32 tempUint = 5000;
-	User::LeaveIfError(overSet->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), tempUint));
-
-	TBool tempBool = ETrue;
-	User::LeaveIfError(overSet->SetBoolOverride(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), tempBool));
-
-	TBuf8<KCommsDbSvrMaxFieldLength> temp8String(_L8("Hi There!!"));
-	User::LeaveIfError(overSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), temp8String));
-	
-	TBuf<KCommsDbSvrMaxFieldLength> temp16String(_L("Hi There!!"));
-	User::LeaveIfError(overSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), temp16String));
-
-	TBuf<KCommsDbSvrMaxFieldLength> tempLongString(_L("SEND \"hello\"\nWAIT 20\n{\n\"hello back\"\n"));	//Lots of stuff, nothing important
-	User::LeaveIfError(overSet->SetLongDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), tempLongString));
-
-	CleanupStack::PopAndDestroy(overSet);
-
-	return KErrNone;	//We've not left, so we pass
-	}
-	
-TVerdict CCommDbTest044_01::doTestStepPostambleL()
-	{
-	return EPass;
-	}
-
-//
-
-CCommDbTest044_02::CCommDbTest044_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_044_02");
-	}
-
-CCommDbTest044_02::~CCommDbTest044_02()
-	{}
-
-TVerdict CCommDbTest044_02::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest044_02::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest044_02::executeStepL()
-	{
-	CStoreableOverrideSettings* overSet=CStoreableOverrideSettings::NewL(CStoreableOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(overSet);
-
-	TUint32 setUint = 5000;
-	User::LeaveIfError(overSet->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), setUint));
-
-	TBool setBool = ETrue;
-	User::LeaveIfError(overSet->SetBoolOverride(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), setBool));
-
-	TBuf8<KCommsDbSvrMaxFieldLength> set8String(_L8("Hi There!!"));
-	User::LeaveIfError(overSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), set8String));
-	
-	TBuf<KCommsDbSvrMaxFieldLength> set16String(_L("Hi There!!"));
-	User::LeaveIfError(overSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), set16String));
-
-	TBuf<KCommsDbSvrMaxFieldLength> setLongString(_L("SEND \"hello\"\nWAIT 20\n{\n\"hello back\"\n"));	//Lots of stuff, nothing important
-	User::LeaveIfError(overSet->SetLongDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), setLongString));
-
-	//We've made an override object, now store it...
-
-	CBufFlat* store = overSet->StoreLC();
-	TPtr8 ptrToStore=store->Ptr(0);
-
-	//Now restore into a new CStoreableOverrideSettings object
-	CStoreableOverrideSettings* restoreOverSet=CStoreableOverrideSettings::NewL(CStoreableOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(restoreOverSet);
-
-	HBufC8* restoredBuf=HBufC8::NewLC(ptrToStore.Length());
-	TPtr8 ptrToBuf(restoredBuf->Des());
-	ptrToBuf.Copy(ptrToStore);
-	restoreOverSet->RestoreL(restoredBuf);
-	
-	//Check we've got the same stuff in the restored object as in the original
-	TUint32 restoredUint;
-	TBool restoredBool;
-	TBuf8<KCommsDbSvrMaxFieldLength> restored8String;
-	TBuf<KCommsDbSvrMaxFieldLength> restored16String;
-	TBuf<KCommsDbSvrMaxFieldLength> restoredLongString;
-
-	User::LeaveIfError(restoreOverSet->GetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), restoredUint));
-	User::LeaveIfError(restoreOverSet->GetBoolOverride(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), restoredBool));
-	User::LeaveIfError(restoreOverSet->GetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), restored8String));
-	User::LeaveIfError(restoreOverSet->GetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), restored16String));
-	User::LeaveIfError(restoreOverSet->GetLongDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), restoredLongString));
-
-	CleanupStack::PopAndDestroy(restoredBuf);
-	CleanupStack::PopAndDestroy(restoreOverSet);
-	CleanupStack::PopAndDestroy(store);
-	CleanupStack::PopAndDestroy(overSet);
-
-	//Now do a comparison
-	if(restoredUint!=setUint
-		||restoredBool!=setBool
-		||restored8String!=set8String
-		||restored16String!=set16String
-		||restoredLongString!=setLongString)
-		return KErrGeneral;
-
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest044_02::doTestStepPostambleL()
-	{
-	return EPass;
-	}
-
-//
-
-CCommDbTest044_03::CCommDbTest044_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_044_03");
-	}
-
-CCommDbTest044_03::~CCommDbTest044_03()
-	{}
-
-TVerdict CCommDbTest044_03::doTestStepL( void )
-	{
-	Log(_L("Step 044.03 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest044_01* step044_01 = new(ELeave) CCommDbTest044_01;
-	CleanupStack::PushL(step044_01);
-	step044_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step044_01, KErrNone);
-	CleanupStack::PopAndDestroy(step044_01);
-
-	CCommDbTest044_02* step044_02 = new(ELeave) CCommDbTest044_02;
-	CleanupStack::PushL(step044_02);
-	step044_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step044_02, KErrNone);
-	CleanupStack::PopAndDestroy(step044_02);
-
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_044_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 044.XX group of scenarios 
-// 
-//
-
-#if (!defined __STEP_044_XX_H__)
-#define __STEP_044_XX_H__
-
-
-//
-//	Test step 044.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest044_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest044_01();
-	~CCommDbTest044_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 044.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest044_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest044_02();
-	~CCommDbTest044_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 044.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest044_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest044_03();
-	~CCommDbTest044_03();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_044_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_045_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,216 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 045.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbstore.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_045_xx.h"
-
-
-CCommDbTest045_01::CCommDbTest045_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_045_01");
-	}
-
-CCommDbTest045_01::~CCommDbTest045_01()
-	{}
-
-TVerdict CCommDbTest045_01::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest045_01::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest045_01::executeStepL()
-	{
-	CStoreableOverrideSettings* overSet=CStoreableOverrideSettings::NewL(CStoreableOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(overSet);
-
-	TUint32 setUint = 5000;
-	User::LeaveIfError(overSet->SetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), setUint));
-
-	TBool setBool = ETrue;
-	User::LeaveIfError(overSet->SetBoolOverride(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), setBool));
-
-	TBuf8<KCommsDbSvrMaxFieldLength> set8String(_L8("Hi There!!"));
-	User::LeaveIfError(overSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), set8String));
-	
-	TBuf<KCommsDbSvrMaxFieldLength> set16String(_L("Hi There!!"));
-	User::LeaveIfError(overSet->SetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), set16String));
-
-	TBuf<KCommsDbSvrMaxFieldLength> setLongString(_L("SEND \"hello\"\nWAIT 20\n{\n\"hello back\"\n"));	//Lots of stuff, nothing important
-	User::LeaveIfError(overSet->SetLongDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), setLongString));
-
-	HBufC8* storeBuf=HBufC8::NewLC(1024);	//Create a buf on the heap to use as the store
-	TPtr8 storePtr=storeBuf->Des();
-
-	RDesWriteStream writeStream;
-	writeStream.Open(storePtr);
-	writeStream.PushL();
-	
-	overSet->ExternalizeL(writeStream);
-	writeStream.Close();
-	CleanupStack::Pop();	//writeStream
-
-	//Settings have been stored to stream (storeBuf),
-	//now read them into a new settings object and check them
-
-	CStoreableOverrideSettings* restoreOverSet=CStoreableOverrideSettings::NewL(CStoreableOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(restoreOverSet);
-
-	RDesReadStream readStream;
-	readStream.Open(storePtr);
-	readStream.PushL();
-
-	restoreOverSet->InternalizeL(readStream);
-	readStream.Close();
-	CleanupStack::Pop();	//readStream
-
-	//Check we've got the same stuff in the restored object as in the original
-	TUint32 restoredUint;
-	TBool restoredBool;
-	TBuf8<KCommsDbSvrMaxFieldLength> restored8String;
-	TBuf<KCommsDbSvrMaxFieldLength> restored16String;
-	TBuf<KCommsDbSvrMaxFieldLength> restoredLongString;
-
-	User::LeaveIfError(restoreOverSet->GetIntOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IWF_TO_MS), restoredUint));
-	User::LeaveIfError(restoreOverSet->GetBoolOverride(TPtrC(DIAL_OUT_ISP), TPtrC(SERVICE_IF_CALLBACK_ENABLED), restoredBool));
-	User::LeaveIfError(restoreOverSet->GetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_IF_CALLBACK_INFO), restored8String));
-	User::LeaveIfError(restoreOverSet->GetDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_DEFAULT_TEL_NUM), restored16String));
-	User::LeaveIfError(restoreOverSet->GetLongDesOverride(TPtrC(DIAL_OUT_ISP), TPtrC(ISP_LOGIN_SCRIPT), restoredLongString));
-
-	CleanupStack::PopAndDestroy(restoreOverSet);
-	CleanupStack::PopAndDestroy(storeBuf);
-	CleanupStack::PopAndDestroy(overSet);
-
-	//Now do a comparison
-	if(restoredUint!=setUint
-		||restoredBool!=setBool
-		||restored8String!=set8String
-		||restored16String!=set16String
-		||restoredLongString!=setLongString)
-		return KErrGeneral;
-
-
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest045_01::doTestStepPostambleL()
-	{
-	return EPass;
-	}
-
-//
-
-CCommDbTest045_02::CCommDbTest045_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_045_02");
-	}
-
-CCommDbTest045_02::~CCommDbTest045_02()
-	{}
-
-TVerdict CCommDbTest045_02::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrEof)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest045_02::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest045_02::executeStepL()
-	{
-	HBufC8* storeBuf=HBufC8::NewLC(1024);	//Create a buf on the heap to use as the store
-	TPtr8 storePtr=storeBuf->Des();
-
-	//Try and restore from a blank stream
-
-	CStoreableOverrideSettings* restoreOverSet=CStoreableOverrideSettings::NewL(CStoreableOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(restoreOverSet);
-
-	RDesReadStream readStream;
-	storePtr=storeBuf->Des();
-	readStream.Open(storePtr);
-	readStream.PushL();
-
-	TRAPD(err, restoreOverSet->InternalizeL(readStream));
-	readStream.Close();
-	CleanupStack::Pop();	//readStream
-
-
-	CleanupStack::PopAndDestroy(restoreOverSet);
-	CleanupStack::PopAndDestroy(storeBuf);
-
-	return err;
-	}
-	
-TVerdict CCommDbTest045_02::doTestStepPostambleL()
-	{
-	return EPass;
-	}
-
-//
-
-CCommDbTest045_03::CCommDbTest045_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_045_03");
-	}
-
-CCommDbTest045_03::~CCommDbTest045_03()
-	{}
-
-TVerdict CCommDbTest045_03::doTestStepL( void )
-	{
-	Log(_L("Step 045.03 called "));
-
-	iTestStepResult = EPass;
-
-	CCommDbTest045_01* step045_01 = new(ELeave) CCommDbTest045_01;
-	CleanupStack::PushL(step045_01);
-	step045_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step045_01, KErrNone);
-	CleanupStack::PopAndDestroy(step045_01);
-
-	CCommDbTest045_02* step045_02 = new(ELeave) CCommDbTest045_02;
-	CleanupStack::PushL(step045_02);
-	step045_02->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step045_02, KErrEof);
-	CleanupStack::PopAndDestroy(step045_02);
-
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_045_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 045.XX group of scenarios 
-// 
-//
-
-#if (!defined __STEP_045_XX_H__)
-#define __STEP_045_XX_H__
-
-
-//
-//	Test step 045.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest045_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest045_01();
-	~CCommDbTest045_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 045.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest045_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest045_02();
-	~CCommDbTest045_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 045.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest045_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest045_03();
-	~CCommDbTest045_03();
-
-	virtual enum TVerdict doTestStepL( void );
-};
-
-#endif //__STEP_045_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_046_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1027 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 046.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbstore.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_046_xx.h"
-#include <e32math.h>
-
-
-const TInt KTest04605Repeats = 20;
-
-//
-//	Test step 046.01
-//
-
-// constructor
-CCommDbTest046_01::CCommDbTest046_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_046_01");
-	}
-
-// destructor
-CCommDbTest046_01::~CCommDbTest046_01()
-	{
-	}
-
-
-TVerdict CCommDbTest046_01::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest046_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-
-	//This step checks that record id's are created in the expected manner,
-	//and that the record cursor also behaves as expected ie it moves to
-	//the next record, when the record it points to is deleted.
-
-	iTheView = iTheDb->OpenTableLC( TPtrC(DIAL_OUT_ISP) );
-	CleanupStack::Pop(iTheView);
-	//Insert 4 records checking the id each time
-	TUint32 id;
-
-	CDBLEAVE(iTheView->InsertRecord( id ), KErrNone);
-	if ( id != 1 )
-		User::Leave( ret );
-
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),_L("My Service #1"));
-	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
-	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
-	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-
-	CDBLEAVE(iTheView->InsertRecord( id ), KErrNone);
-	if ( id != 2 )
-		User::Leave( ret );
-
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),_L("My Service #2"));
-	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
-	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
-	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-
-	CDBLEAVE(iTheView->InsertRecord( id ), KErrNone);
-	if ( id !=3 )
-		User::Leave( ret );
-
-
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),_L("My Service #3"));
-	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
-	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
-	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-
-
-	CDBLEAVE(iTheView->InsertRecord( id ), KErrNone);
-	if ( id !=4 )
-		User::Leave( ret );
-
-
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),_L("My Service #4"));
-	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
-	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
-	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-
-
-	//Open a new view and move to the last record
-	delete iTheView;
-	iTheView = 0;
-
-	iTheView = iTheDb->OpenTableLC( TPtrC(DIAL_OUT_ISP) );
-	CleanupStack::Pop(iTheView);
-
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-
-	//Delete the last record
-	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoPreviousRecord(), KErrNone);
-	//Check the cursor is now pointing at the previous record
-
-	TUint32 value;
-	iTheView->ReadUintL( TPtrC(COMMDB_ID), value );
-
-	if ( value != 3 )
-		User::Leave( ret );
-
-	//Goto the first record and delete that
-	CDBLEAVE( iTheView->GotoFirstRecord(), KErrNone );
-	CDBLEAVE( iTheView->DeleteRecord(), KErrNone );
-	CDBLEAVE( iTheView->GotoNextRecord(), KErrNone );
-	//Check the cursor is now pointing at the second record
-	
-	iTheView->ReadUintL( TPtrC(COMMDB_ID), value );
-	if ( value != 2 )
-		User::Leave( ret );
-
-	//Insert a new record and check the id is correct
-	
-	CDBLEAVE(iTheView->InsertRecord( id ), KErrNone);
-	/* 
-	DBMS supports cyclic id allocation..commsdat was forced
-	to do that too..but looks like we do reuse the record ids
-	if the deleted record was the last one. I think we should forget about
-	this slip because 
-		a)Its not a behaviour worth having for us and we got away with it anyway
-		b)None of our client seem to give a damn about this for last few years  
-					
-	if ( id != 5 )
-		User::Leave( ret );*/
-		
-	if ( id != 4 )
-		User::Leave( ret );	
-
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),_L("My Service #5"));
-	iTheView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
-	iTheView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
-//	iTheView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
-	iTheView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	iTheView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-
-	ret = KErrNone; //Passed if we get this far
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest046_01::doTestStepL( )
-	{
-	Log(_L("Step 046.01 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 046.02
-//
-
-// constructor
-CCommDbTest046_02::CCommDbTest046_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_046_02");
-	}
-
-// destructor
-CCommDbTest046_02::~CCommDbTest046_02()
-	{
-	}
-
-
-TVerdict CCommDbTest046_02::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-void CCommDbTest046_02::insertTestRecordsL( TUint aQuantity )
-	{
-	TUint count;
-	TUint32 id;
-	CCommsDbTableView* dbView;
-
-	dbView  = iTheDb->OpenTableLC( TPtrC(DIAL_OUT_ISP) );
-
-	for( count=0; count < aQuantity; count++ )
-		{
-
-		CDBLEAVE(dbView->InsertRecord( id ), KErrNone);
-		dbView->WriteTextL(TPtrC(COMMDB_NAME),_L("My Service Test Record"));
-		dbView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-		dbView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
-		dbView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
-//		dbView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
-		dbView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
-		dbView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-		dbView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-		dbView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-		CDBLEAVE( dbView->PutRecordChanges(), KErrNone );
-		
-		}
-	
-	CleanupStack::PopAndDestroy(dbView);
-
-	}
-
-void CCommDbTest046_02::deleteLastRecordsL( TUint aQuantity )
-	{
-	TUint count;
-	TInt ret = KErrGeneral;
-	CCommsDbTableView* dbView;
-
-	dbView  = iTheDb->OpenTableLC( TPtrC(DIAL_OUT_ISP) );
-	CDBLEAVE( dbView->GotoFirstRecord(), KErrNone );
-
-	//Move to the end of the view
-	do
-	{
-		ret = dbView->GotoNextRecord();
-	}while ( ret != KErrNotFound );
-	
-	//Need to move the cursor back into the view
-	dbView->GotoPreviousRecord();
-
-	//Now delete the record and move back one
-	for ( count=0; count< aQuantity; count++)
-		{
-		CDBLEAVE( dbView->DeleteRecord(), KErrNone );
-		CDBLEAVE( dbView->GotoPreviousRecord(), KErrNone );
-		}
-
-	CleanupStack::PopAndDestroy(dbView);
-	}
-
-
-TInt CCommDbTest046_02::executeStepL()
-	{
-	TInt ret=KErrGeneral, count;
-
-	// NOTE: count limit reduced from 100 to 5, because commsdat has an id limit
-	// of 128 when inserting records.  After this, you get a KErrOverflow from
-	// CCommsDbTableView::InsertRecord() in insertTestRecordsL(...).
-	for ( count=0; count < 5; count++ )
-		{
-		insertTestRecordsL( 10 );
-
-		//Start a transaction, write 10 records, then rollback
-		CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-		insertTestRecordsL( 10 );
-		iTheDb->RollbackTransaction();
-
-		//Start a transaction, write 10 records, delete them, then rollback
-		CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-		insertTestRecordsL( 10 );
-		deleteLastRecordsL( 10 );
-		iTheDb->RollbackTransaction();
-
-		//Start a transaction, write 10 records and commit them
-		CDBLEAVE( iTheDb->BeginTransaction(), KErrNone );
-		insertTestRecordsL( 10 );
-		CDBLEAVE( iTheDb->CommitTransaction(), KErrNone );
-
-		}
-
-	ret = KErrNone;
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest046_02::doTestStepL( )
-	{
-	Log(_L("Step 046.02 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-//
-//Thread1 does the first right, our main thread then does the second.
-//They continue to take it in turns to do writes
-
-CCommDbTest046_03::CCommDbTest046_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_046_03");
-	}
-
-CCommDbTest046_03::~CCommDbTest046_03()
-	{}
-
-TVerdict CCommDbTest046_03::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest046_03::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest046_03::Thread1Function(TAny* aPtr)
-	{
-	CTrapCleanup* cleanup=CTrapCleanup::New();
-	if (cleanup==NULL)
-		return(KErrNoMemory);
-
-	TRAPD(err, DoThread1TestL(aPtr));
-	if(err != KErrNone)
-		{
-		return err;
-		}
-
-	delete cleanup;
-	return(KErrNone);
-	}
-
-void CCommDbTest046_03::DoThread1TestL(TAny* aPtr)
-	{
-	TThreadInfo* syncInfo = (TThreadInfo*) aPtr;
-	TRequestStatus localStatus(KRequestPending);
-	syncInfo->iThread1Status = &localStatus;
-	
-	CCommsDatabase* cDb = CCommsDatabase::NewL();
-	CleanupStack::PushL(cDb);
-	CCommsDbTableView* modemTable = cDb->OpenTableLC(TPtrC(MODEM_BEARER));
-
-	TUint32 dummyId;
-	modemTable->InsertRecord(dummyId);
-	modemTable->WriteTextL(TPtrC(COMMDB_NAME),_L("Thread1, Entry1"));
-	User::LeaveIfError(modemTable->PutRecordChanges());
-
-	//this thread is the first on to do all its rights
-	CleanupStack::PopAndDestroy(modemTable);
-	CleanupStack::PopAndDestroy(cDb);
-
-	syncInfo->iMainThread.RequestComplete(syncInfo->iMainThreadStatus, KErrNone);
-	}
-
-TInt CCommDbTest046_03::executeStepL()
-	{
-	//First thing is to empty the modem table
-	CCommsDbTableView* modemTable = iTheDb->OpenTableLC(TPtrC(MODEM_BEARER));
-	while(modemTable->GotoFirstRecord()==KErrNone)
-		modemTable->DeleteRecord();
-
-	RThread thread1;
-	TThreadInfo sync1;
-	TRequestStatus status1(KRequestPending);
-	sync1.iMainThreadStatus=&status1;
-	sync1.iMainThread.Duplicate(RThread(),EOwnerProcess);
-	_LIT(KThread1Name,"Thread1");
-	User::LeaveIfError(thread1.Create(KThread1Name,Thread1Function,KDefaultStackSize,NULL,&sync1));
-	CleanupClosePushL(thread1);
-
-	iTheDb->BeginTransaction();
-
-	TUint32 dummyId;
-	modemTable->InsertRecord(dummyId);
-	_LIT(KTestName, "Main, Entry1");
-	modemTable->WriteTextL(TPtrC(COMMDB_NAME), KTestName);
-
-	//OK, lets start the other thread off now.
-
-	TRequestStatus status2(KRequestPending);
-
-	thread1.Logon(status2);
-	thread1.Resume();
-	User::WaitForRequest(status1,status2);
-
-	//OK, one of the status has completed, if it's status1 then that means thread1 didn't panic
-	//which is a bad thing.
-
-	if(status1 != KRequestPending)
-		User::Leave(KErrGeneral);	//Report error by leaving
-
-	if(thread1.ExitType() != EExitPanic)
-		User::Leave(KErrGeneral);	//Thread1 didn't panic, something else has gone wrong.
-	
-	CleanupStack::PopAndDestroy();	//thread1
-	//Lets finish our entry off, and check it's OK.
-	User::LeaveIfError(modemTable->PutRecordChanges());
-	
-	iTheDb->CommitTransaction();
-
-	CleanupStack::PopAndDestroy(modemTable);
-
-	//Lets make a new modem view and check it's only got our entry in.
-	modemTable=NULL;
-	modemTable = iTheDb->OpenTableLC(TPtrC(MODEM_BEARER));
-	User::LeaveIfError(modemTable->GotoFirstRecord());
-
-	TBuf<KCommsDbSvrMaxFieldLength> tempBuf;
-	modemTable->ReadTextL(TPtrC(COMMDB_NAME), tempBuf);
-
-	if(tempBuf!=KTestName)
-		User::Leave(KErrGeneral);
-
-	CleanupStack::PopAndDestroy(modemTable);
-	return EPass;
-	}
-	
-TVerdict CCommDbTest046_03::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-/*
-Note for anyone who looks at this code.
-It's a bit of a mess, but it seems to do the job. Basically thread1 is the thread trying to
-do a write to the database, and our main thread is the one responsible for checking that
-the change hasn't gone in before PutRecordChanges is called by thread1. After thread1 has
-done it's write, we check that the write was sucessfull. This is done by our main thread
-right at the end of CCommDbTest046_04::executeStepL().
-*/
-
-CCommDbTest046_04::CCommDbTest046_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_046_04");
-	}
-
-CCommDbTest046_04::~CCommDbTest046_04()
-	{}
-
-TVerdict CCommDbTest046_04::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest046_04::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest046_04::Thread1Function(TAny* aPtr)
-	{
-	CTrapCleanup* cleanup=CTrapCleanup::New();
-	if (cleanup==NULL)
-		return(KErrNoMemory);
-
-	TRAPD(err, DoThread1TestL(aPtr));
-
-	delete cleanup;
-	return(err);
-	}
-
-void CCommDbTest046_04::DoThread1TestL(TAny* aPtr)
-	{
-	TThreadInfo* remoteThreadInfo = (TThreadInfo*) aPtr;
-	CCommsDatabase* cDb =CCommsDatabase::NewL();
-	CleanupStack::PushL(cDb);
-
-	CCommsDbTableView* dialInIspView = cDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
-	User::LeaveIfError(dialInIspView->GotoFirstRecord());
-	dialInIspView->UpdateRecord();
-	dialInIspView->WriteLongTextL(TPtrC(ISP_LOGIN_SCRIPT), _L("Changed"));
-
-	remoteThreadInfo->iCaller.RequestComplete(remoteThreadInfo->iStatus1,KErrNone);//We're now ready to kick of the other thread
-
-	User::After(10000000);
-	TInt err = dialInIspView->PutRecordChanges();
-
-	CleanupStack::PopAndDestroy(dialInIspView);
-
-	CleanupStack::PopAndDestroy(cDb);
-	remoteThreadInfo->iCaller.RequestComplete(remoteThreadInfo->iStatus2,err);
-	}
-
-TInt CCommDbTest046_04::executeStepL()
-	{
-	//Set the commdb up so we know what's in the first record of the Dial in ISP before we start.
-	CCommsDbTableView* dialInIspView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
-	User::LeaveIfError(dialInIspView->GotoFirstRecord());
-	dialInIspView->UpdateRecord();
-	dialInIspView->WriteLongTextL(TPtrC(ISP_LOGIN_SCRIPT), _L("Original"));
-	User::LeaveIfError(dialInIspView->PutRecordChanges());
-	CleanupStack::PopAndDestroy(dialInIspView);
-
-	//Start off the first thread, this will run until it has done all but PutRecordChanges is called on the transaction.
-	RThread thread1;
-	TThreadInfo sync1;
-	TRequestStatus status1(KRequestPending);
-	TRequestStatus status2(KRequestPending);
-	sync1.iStatus1=&status1;
-	sync1.iStatus2=&status2;
-	sync1.iCaller.Duplicate(RThread(),EOwnerProcess);
-	_LIT(KThread1Name,"Thread1");
-	TInt err=thread1.Create(KThread1Name,Thread1Function,KDefaultStackSize,NULL,&sync1);
-	CleanupClosePushL(thread1);
-
-	if(err==KErrNone)
-		{
-		thread1.Resume();
-		User::WaitForRequest(status1);
-		}
-	//Thread just kicked off will have run to User::After(10000000); by the time we get to here
-	//We've basically got 10 seconds from here to check that the record hasn't been committed, which sould be plenty long enough. 
-
-	dialInIspView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
-	User::LeaveIfError(dialInIspView->GotoFirstRecord());
-	
-	HBufC* retrievedString = dialInIspView->ReadLongTextLC(TPtrC(ISP_LOGIN_SCRIPT));
-
-	if(*retrievedString!=_L("Original"))
-		User::Leave(KErrGeneral);
-	
-	CleanupStack::PopAndDestroy();	//retrievedString
-	retrievedString=NULL;
-	CleanupStack::PopAndDestroy(dialInIspView);
-
-	User::WaitForRequest(status2);
-	User::LeaveIfError(status2.Int());	//status2.Int() is the value returned when PutRecordChanges is called by thread1.
-
-	//Might as well check that thread1s changes got through....
-	dialInIspView = iTheDb->OpenTableLC(TPtrC(DIAL_IN_ISP));
-	User::LeaveIfError(dialInIspView->GotoFirstRecord());
-	retrievedString= dialInIspView->ReadLongTextLC(TPtrC(ISP_LOGIN_SCRIPT));
-	err=KErrNone;
-	if(*retrievedString!=_L("Changed"))
-		err= KErrGeneral;
-	CleanupStack::PopAndDestroy();	//retrievedString
-	CleanupStack::PopAndDestroy(dialInIspView);
-	CleanupStack::PopAndDestroy();	//thread1
-	return err;
-	}
-	
-TVerdict CCommDbTest046_04::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-
-
-CCommDbTest046_05::CCommDbTest046_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_046_05");
-	}
-
-CCommDbTest046_05::~CCommDbTest046_05()
-	{}
-
-TVerdict CCommDbTest046_05::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest046_05::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest046_05::Thread1Function(TAny* aPtr)
-	{
-	CTrapCleanup* cleanup=CTrapCleanup::New();
-	if (cleanup==NULL)
-		return(KErrNoMemory);
-
-	TRAPD(err, DoThread1TestL(aPtr));
-
-	delete cleanup;
-	return(err);
-	}
-
-void CCommDbTest046_05::DoThread1TestL(TAny* aPtr)
-	{
-	TInt ret;
-	TInt64 seed;
-	TThreadInfo* remoteThreadInfo = (TThreadInfo*) aPtr;
-
-	CCommsDatabase* cDb = CCommsDatabase::NewL();
-	CleanupStack::PushL(cDb);
-
-	for (TInt count=0; count < KTest04605Repeats; count++ )
-		{
-		PrintDebug(_L("DoThread1TestL() - 1. InsertTestRecords"));
-		InsertTestRecordsL(EFalse, 10 , *cDb);
-
-		
-		// Start a transaction, write 10 records, then rollback
-		RandomDelay(seed);
-		while(ret = cDb->BeginTransaction(), ret!=KErrNone)
-			{
-			PrintDebug(_L("DoThread1TestL() - 2. BeginTransaction failed"));
-			User::After(2000);
-			}
-		PrintDebug(_L("DoThread1TestL() - 2. BeginTransaction"));
-		TRequestStatus status1(KRequestPending);
-		cDb->RequestNotification(status1);
-		PrintDebug(_L("DoThread1TestL() - 3. InsertTestRecords"));
-		while(!InsertTestRecordsL(EFalse, 10 , *cDb))
-			{
-			// Error during record insertion, most likely the other thread beat
-			// us to it, Rollback and try again
-			PrintDebug(_L("DoThread1TestL() - Rolling back Transaction"));
-			cDb->RollbackTransaction();
-			User::WaitForRequest(status1);
-			status1 = KRequestPending;
-			RandomDelay(seed);
-			while(ret = cDb->BeginTransaction(), ret!=KErrNone)
-				{
-				PrintDebug(_L("DoThread1TestL() - Begin Transaction Again failed"));
-				User::After(2000);
-				}
-			PrintDebug(_L("DoThread1TestL() - Begin Transaction Again"));
-			cDb->RequestNotification(status1);
-			}
-		// 10 records inserted successfully, now rollback and wait for CommDb
-		PrintDebug(_L("DoThread1TestL() - 4. Rollback"));
-		cDb->RollbackTransaction();
-		PrintDebug(_L("DoThread1TestL() - 5. WaitForRequest"));
-		User::WaitForRequest(status1);
-
-		
-		
-		//Start a transaction, write 10 records, delete them, then rollback
-		RandomDelay(seed);
-		while(ret = cDb->BeginTransaction(), ret!=KErrNone)
-			{
-			PrintDebug(_L("DoThread1TestL() - 6. BeginTransaction failed"));
-			User::After(2000);
-			}
-		PrintDebug(_L("DoThread1TestL() - 6. BeginTransaction"));
-		TRequestStatus status2(KRequestPending);
-		cDb->RequestNotification(status2);
-		PrintDebug(_L("DoThread1TestL() - 7. InsertTestRecords"));
-		while(!InsertTestRecordsL( EFalse, 10 , *cDb))
-			{
-			// Error during record insertion, most likely the other thread beat
-			// us to it, Rollback and try again
-			PrintDebug(_L("DoThread1TestL() - Rolling back Transaction"));
-			cDb->RollbackTransaction();
-			User::WaitForRequest(status2);
-			status2 = KRequestPending;
-			RandomDelay(seed);
-			while(ret = cDb->BeginTransaction(), ret!=KErrNone)
-				{
-				PrintDebug(_L("DoThread1TestL() - Begin Transaction Again failed"));
-				User::After(2000);
-				}
-			PrintDebug(_L("DoThread1TestL() - Begin Transaction Again"));
-			cDb->RequestNotification(status2);
-			}
-		// 10 records inserted successfully, now delete them, rollback and wait for commdb
-		DeleteLastRecordsL(EFalse, 10, *cDb );
-		PrintDebug(_L("DoThread1TestL() - 8. Rollback"));
-		cDb->RollbackTransaction();
-		PrintDebug(_L("DoThread1TestL() - 9. WaitForRequest"));
-		User::WaitForRequest(status2);
-
-		
-		//Start a transaction, write 10 records and commit them
-		RandomDelay(seed);
-		while(ret = cDb->BeginTransaction(), ret!=KErrNone)
-			{
-			PrintDebug(_L("DoThread1TestL() - 10. BeginTransaction failed"));
-			User::After(2000);
-			}
-		PrintDebug(_L("DoThread1TestL() -10. BeginTransaction"));
-		TRequestStatus status3(KRequestPending);
-		cDb->RequestNotification(status3);
-		PrintDebug(_L("DoThread1TestL() -11. InsertRecords"));
-		while(!InsertTestRecordsL(EFalse, 10 , *cDb))
-			{
-			// Error during record insertion, most likely the other thread beat
-			// us to it, Rollback and try again
-			PrintDebug(_L("DoThread1TestL() - Rolling back Transaction"));
-			cDb->RollbackTransaction();
-			User::WaitForRequest(status3);
-			status3 = KRequestPending;
-			RandomDelay(seed);
-			while(ret = cDb->BeginTransaction(), ret!=KErrNone)
-				{
-				PrintDebug(_L("DoThread1TestL() - Begin Transaction Again failed"));
-				User::After(2000);
-				}
-			PrintDebug(_L("DoThread1TestL() - Begin Transaction Again"));
-			cDb->RequestNotification(status3);
-			}
-		// Commit the 10 records, wait for CommDb
-		PrintDebug(_L("DoThread1TestL() -12. Commit"));
-		User::LeaveIfError(cDb->CommitTransaction());
-		PrintDebug(_L("DoThread1TestL() -13. WaitForRequest"));
-		User::WaitForRequest(status3);
-
-		// Give the other thread a chance
-		PrintDebug(_L("DoThread1TestL() -14. User::After"));
-		RandomDelay(seed);
-		}
-	
-	CleanupStack::PopAndDestroy(cDb);
-	PrintDebug(_L("DoThread1TestL() RequestComplete"));
-	remoteThreadInfo->iCaller.RequestComplete(remoteThreadInfo->iStatus1, KErrNone);
-
-	}
-
-TInt CCommDbTest046_05::executeStepL()
-	{
-	TInt ret;
-	
-	//Start off the first thread, this will run until it has done all but PutRecordChanges is called on the transaction.
-	RThread thread1;
-	TInt64 seed;
-	TThreadInfo sync1;
-	TRequestStatus remoteThreadStatus(KRequestPending);
-	sync1.iStatus1=&remoteThreadStatus;
-	sync1.iCaller.Duplicate(RThread(),EOwnerProcess);
-	_LIT(KThread1Name,"Thread1");
-	User::LeaveIfError(thread1.Create(KThread1Name,Thread1Function,KDefaultStackSize,NULL,&sync1));
-	CleanupClosePushL(thread1);
-
-	thread1.Resume();
-	for (TInt count=0; count < KTest04605Repeats; count++ )
-		{
-		PrintDebug(_L("ExecuteStepL() - 1. InsertTestRecords"));
-		InsertTestRecordsL(ETrue, 10, *iTheDb );
-		
-		//Start a transaction, write 10 records, then rollback
-		RandomDelay(seed);
-		while(ret = iTheDb->BeginTransaction(), ret!=KErrNone)
-			{
-			PrintDebug(_L("ExecuteStepL() - 2. BeginTransaction failed"));
-			User::After(2000);
-			}
-		PrintDebug(_L("ExecuteStepL() - 2. BeginTransaction"));
-		TRequestStatus status1(KRequestPending);
-		iTheDb->RequestNotification(status1);
-		PrintDebug(_L("ExecuteStepL() - 3. InsertTestRecords"));
-		while(!InsertTestRecordsL(ETrue, 10 , *iTheDb))
-			{
-			// Error during record insertion, most likely the other thread beat
-			// us to it, Rollback and try again
-			PrintDebug(_L("ExecuteStepL() - Rolling back Transaction"));
-			iTheDb->RollbackTransaction();
-			User::WaitForRequest(status1);
-			status1 = KRequestPending;
-			RandomDelay(seed);
-			while(ret = iTheDb->BeginTransaction(), ret!=KErrNone)
-				{
-				PrintDebug(_L("ExecuteStepL()  - Begin Transaction Again failed"));
-				User::After(2000);
-				}
-			PrintDebug(_L("ExecuteStepL()   - Begin Transaction Again"));
-			iTheDb->RequestNotification(status1);
-			}
-		// 10 records written, now rollback and wait for commdb
-		PrintDebug(_L("ExecuteStepL() - 4. Rollback"));
-		iTheDb->RollbackTransaction();
-		PrintDebug(_L("ExecuteStepL() - 5. WaitForRequest"));
-		User::WaitForRequest(status1);
-
-
-		
-		//Start a transaction, write 10 records, delete them, then rollback
-		RandomDelay(seed);
-		while(ret = iTheDb->BeginTransaction(), ret!=KErrNone)
-			{
-			PrintDebug(_L("ExecuteStepL() - 6. BeginTransaction failed"));
-			User::After(2000);
-			}
-		PrintDebug(_L("ExecuteStepL() - 6. BeginTransaction"));
-		TRequestStatus status2(KRequestPending);
-		iTheDb->RequestNotification(status2);
-		PrintDebug(_L("ExecuteStepL() - 7. InsertTestRecordsL"));
-		while(!InsertTestRecordsL(ETrue, 10 , *iTheDb))
-			{
-			// Error during record insertion, most likely the other thread beat
-			// us to it, Rollback and try again
-			PrintDebug(_L("ExecuteStepL() - Rolling back Transaction"));
-			iTheDb->RollbackTransaction();
-			User::WaitForRequest(status2);
-			status2 = KRequestPending;
-			RandomDelay(seed);
-			while(ret = iTheDb->BeginTransaction(), ret!=KErrNone)
-				{
-				PrintDebug(_L("ExecuteStepL()  - Begin Transaction Again failed"));
-				User::After(2000);
-				}
-			PrintDebug(_L("ExecuteStepL()   - Begin Transaction Again"));
-			iTheDb->RequestNotification(status2);
-			}
-		// 10 records written successfully, now delete them, rollback and wait for commmdb
-		PrintDebug(_L("ExecuteStepL() - 8. DeleteTestRecordsL"));
-		DeleteLastRecordsL(ETrue, 10, *iTheDb);
-		PrintDebug(_L("ExecuteStepL() - 9. Rollback"));
-		iTheDb->RollbackTransaction();
-		PrintDebug(_L("ExecuteStepL() -10. WaitForRequest"));
-		User::WaitForRequest(status2);
-
-
-		
-		//Start a transaction, write 10 records and commit them
-		RandomDelay(seed);
-		while(ret = iTheDb->BeginTransaction(), ret!=KErrNone)
-			{
-			PrintDebug(_L("ExecuteStepL() - 11. BeginTransaction failed"));
-			User::After(2000);
-			}
-		PrintDebug(_L("ExecuteStepL() -11. BeginTransaction"));
-		TRequestStatus status3(KRequestPending);
-		iTheDb->RequestNotification(status3);
-		PrintDebug(_L("ExecuteStepL() -12. InsertTestRecords"));
-		while(!InsertTestRecordsL( ETrue,10 , *iTheDb))
-			{
-			// Error during record insertion, most likely the other thread beat
-			// us to it, Rollback and try again
-			PrintDebug(_L("ExecuteStepL() - Rolling back Transaction"));
-			iTheDb->RollbackTransaction();
-			User::WaitForRequest(status3);
-			status3 = KRequestPending;
-			RandomDelay(seed);
-			while(ret = iTheDb->BeginTransaction(), ret!=KErrNone)
-				{
-				PrintDebug(_L("ExecuteStepL()  - Begin Transaction Again failed"));
-				User::After(2000);
-				}
-			PrintDebug(_L("ExecuteStepL()   - Begin Transaction Again"));
-			iTheDb->RequestNotification(status3);
-			}
-		PrintDebug(_L("ExecuteStepL() -13. Commit"));
-		User::LeaveIfError(iTheDb->CommitTransaction());
-		PrintDebug(_L("ExecuteStepL() -14. WaitForRequest"));
-		User::WaitForRequest(status3);
-		
-
-		// Give the other thread a chance to do stuff
-		PrintDebug(_L("ExecuteStepL() -15. User::After"));
-		RandomDelay(seed);
-		}
-
-	PrintDebug(_L("ExecuteStepL() - Wait For Remote Thread"));
-	User::WaitForRequest(remoteThreadStatus);
-	CleanupStack::PopAndDestroy();	//thread1
-	PrintDebug(_L("ExecuteStepL() - Exiting"));
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest046_05::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-TBool CCommDbTest046_05::InsertTestRecordsL( TBool aCallerIsMainThread, TUint aQuantity, CCommsDatabase& aDb )
-	{
-	TUint32 id;
-	CCommsDbTableView* dbView = aDb.OpenTableLC( TPtrC(DIAL_OUT_ISP) );
-	for(TUint count=0; count < aQuantity; count++ )
-		{
-		while(dbView->InsertRecord( id )!= KErrNone)
-			{
-			if(aCallerIsMainThread)
-				PrintDebug(_L("ExecuteStepL()    Insert Record failed..."));
-			else PrintDebug(_L("DoThread1TestL() Insert Record failed..."));
-			CleanupStack::PopAndDestroy(dbView);
-			return EFalse;
-			}
-		dbView->WriteTextL(TPtrC(COMMDB_NAME),_L("My Service Test Record"));
-		dbView->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-		dbView->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
-		dbView->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue);
-//		dbView->WriteTextL(TPtrC(ISP_IF_NAME),_L("ppp"));
-		dbView->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
-		dbView->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-		dbView->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-		dbView->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-		User::LeaveIfError(dbView->PutRecordChanges());
-		if(aCallerIsMainThread)
-			PrintDebug(_L("ExecuteStepL()    InsertingRecord..."));
-		else PrintDebug(_L("DoThread1TestL() InsertingRecord..."));
-
-	// Allow the other thread to do things between each record insertion
-	User::After(5000);	
-	}
-
-	CleanupStack::PopAndDestroy(dbView);
-	return ETrue;
-	}
-
-void CCommDbTest046_05::DeleteLastRecordsL( TBool aCallerIsMainThread, TUint aQuantity, CCommsDatabase& aDb)
-	{
-	TUint count;
-	TInt ret = KErrGeneral;
-	CCommsDbTableView* dbView;
-
-	dbView  = aDb.OpenTableLC( TPtrC(DIAL_OUT_ISP) );
-	CDBLEAVE( dbView->GotoFirstRecord(), KErrNone );
-
-	//Move to the end of the view
-	do
-	{
-		ret = dbView->GotoNextRecord();
-	}while ( ret != KErrNotFound );
-	
-	//Need to move the cursor back into the view
-	dbView->GotoPreviousRecord();
-
-	//Now delete the record and move back one
-	for ( count=0; count< aQuantity; count++)
-		{
-		// Allow the other thread to do things between each record deletion
-		User::After(5000);
-		User::LeaveIfError(dbView->DeleteRecord());
-		User::LeaveIfError( dbView->GotoPreviousRecord());
-		if(aCallerIsMainThread)
-			PrintDebug(_L("ExecuteStepL()    Record Deleted..."));
-		else PrintDebug(_L("DoThread1TestL() Record Deleted..."));
-
-		}
-
-	CleanupStack::PopAndDestroy(dbView);
-	}
-
-void CCommDbTest046_05::RandomDelay(TInt64 &aSeed)
-	{
-	// Random delay for between 0-1 seconds
-	// Gives a thread a chance to access the database while the other 
-	// thread is still sleeping
-
-	// If this delay is made excessively large, the test is pointeless, 
-	// the two threads will just take turns to do things with the database
-
-	// If the delay is too short both threads will hammer CommDb simulataneously and 
-	// they will effectively deadlock, neither getting the chance to complete anything
-
-	
-	TInt32 delay;
-	TReal rnd = Math::FRand(aSeed);
-	rnd*=1000000;
-	delay=(TInt32) rnd;
-	User::After(delay);
-	}
-
-void CCommDbTest046_05::PrintDebug(TPtrC )//aString)
-	{
-	// Uncomment this line to see whats going on in the debug trace
-	//RDebug::Print(aString);
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_046_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 046.XX group of scenarios 
-// 
-//
-
-#if (!defined __STEP_046_XX_H__)
-#define __STEP_046_XX_H__
-
-
-//
-//	Test step 046.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest046_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest046_01();
-	~CCommDbTest046_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 046.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest046_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest046_02();
-	~CCommDbTest046_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-	void insertTestRecordsL( TUint aQuantity );
-	void deleteLastRecordsL( TUint aQuantity );
-
-};
-
-//
-//	Test step 046.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest046_03) : public CTestStepCommDb
-{
-public:
-	struct TThreadInfo
-	{
-	TRequestStatus* iThread1Status;
-	TRequestStatus* iMainThreadStatus;
-	RThread iMainThread;
-	};
-
-	static void DoThread1TestL(TAny* aPtr);
-	CCommDbTest046_03();
-	~CCommDbTest046_03();
-
-	static TInt Thread1Function(TAny* aPtr);
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 046.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest046_04) : public CTestStepCommDb
-{
-public:
-	struct TThreadInfo
-	{
-	TRequestStatus* iStatus1;
-	TRequestStatus* iStatus2;
-	RThread iCaller;
-	};
-
-	static TInt Thread1Function(TAny* aPtr);
-	static void DoThread1TestL(TAny* aPtr);
-
-	CCommDbTest046_04();
-	~CCommDbTest046_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-};
-
-//
-//	Test step 046.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest046_05) : public CTestStepCommDb
-{
-public:
-	struct TThreadInfo
-	{
-	TRequestStatus* iStatus1;
-	RThread iCaller;
-	};
-
-	static TInt Thread1Function(TAny* aPtr);
-	static void DoThread1TestL(TAny* aPtr);
-
-	CCommDbTest046_05();
-	~CCommDbTest046_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	static TBool InsertTestRecordsL(TBool aCallerIsMainThread, TUint aQuantity, CCommsDatabase& aDb );
-	static void DeleteLastRecordsL( TBool aCallerIsMainThread, TUint aQuantity, CCommsDatabase& aDb );
-	static void RandomDelay(TInt64 &aSeed);
-	static void PrintDebug(TPtrC aString);
-};
-#endif //__STEP_046_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_047_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,490 +0,0 @@
-// Copyright (c) 2001-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:
-// step_046_XX.cpp
-// This contains CommDb Unit Test Cases 046.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbstore.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_047_xx.h"
-#include <e32math.h>
-
-
-//
-//	Test step 0047.001
-//
-
-// constructor
-CCommDbTest047_01::CCommDbTest047_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_047_01");
-	}
-
-// destructor
-CCommDbTest047_01::~CCommDbTest047_01()
-	{
-	}
-
-
-TVerdict CCommDbTest047_01::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-
-TBool CCommDbTest047_01::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial,EDatabaseTypeIAP);
-	return KErrNone;
-	}
-
-TVerdict CCommDbTest047_01::doTestStepL( )
-	{
-	TRAPD(ret,executeStepL());
-	if(ret==KErrNone)
-		{
-		return EPass;	//If we've got this far we've passed
-		}
-	else
-		{
-		return EFail;
-		}
-	}
-
-TVerdict CCommDbTest047_01::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-//	Test step 0047.02
-//
-
-// constructor
-CCommDbTest047_02::CCommDbTest047_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_047_02");
-	}
-
-// destructor
-CCommDbTest047_02::~CCommDbTest047_02()
-	{
-	}
-
-
-TVerdict CCommDbTest047_02::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-
-TBool CCommDbTest047_02::executeStepL()
-	{
-	CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return KErrNone; 
-	} //lint !e550
-
-TVerdict CCommDbTest047_02::doTestStepL( )
-	{
-	TRAPD(ret,executeStepL());
-	if(ret==KErrNone)
-		{
-		return EPass;	//If we've got this far we've passed
-		}
-	else
-		{
-		return EFail;
-		}
-	}
-
-TVerdict CCommDbTest047_02::doTestStepPostambleL()
-	{
-	return EPass;
-	}
-
-//
-//	Test step 0047.03
-//
-
-// constructor
-CCommDbTest047_03::CCommDbTest047_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_047_03");
-	}
-
-// destructor
-CCommDbTest047_03::~CCommDbTest047_03()
-	{
-	}
-
-
-TVerdict CCommDbTest047_03::doTestStepPreambleL()
-	{	
-	return EPass;
-	}
-
-
-TBool CCommDbTest047_03::executeStepL()
-	{
-	CStoreableOverrideSettings::NewL(CStoreableOverrideSettings::EParamListPartial,EDatabaseTypeIAP);
-	return KErrNone;
-	} //lint !e550
-
-TVerdict CCommDbTest047_03::doTestStepL( )
-	{
-	TRAPD(ret,executeStepL());
-	if(ret==KErrNone)
-		{
-		return EPass;	//If we've got this far we've passed
-		}
-	else
-		{
-		return EFail;
-		}
-	}
-
-TVerdict CCommDbTest047_03::doTestStepPostambleL()
-	{
-	return EPass;
-	}
-
-//
-//	Test step 0047.04
-//
-
-// constructor
-CCommDbTest047_04::CCommDbTest047_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_047_04");
-	}
-
-// destructor
-CCommDbTest047_04::~CCommDbTest047_04()
-	{
-	}
-
-
-TVerdict CCommDbTest047_04::doTestStepPreambleL()
-	{	
-	iTheDb=CCommsDatabase::NewL();
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-
-TBool CCommDbTest047_04::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIspConnectionPref pref1;
-
-	iPrefView->InsertConnectionPreferenceL(pref1, EFalse);
-	return KErrNone;
-	}
-
-TVerdict CCommDbTest047_04::doTestStepL( )
-	{
-	TRAPD(ret,executeStepL());
-	if(ret==KErrNotSupported)
-		{
-		return EPass;	//If we've got this far we've passed
-		}
-	else
-		{
-		return EFail;
-		}
-	}
-
-TVerdict CCommDbTest047_04::doTestStepPostambleL()
-	{
-	delete iPrefView;
-	iPrefView = NULL;
-	delete iTheDb;
-	iTheDb=NULL;
-
-	return EPass;
-	}
-
-//
-//	Test step 0047.05
-//
-
-// constructor
-CCommDbTest047_05::CCommDbTest047_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_047_05");
-	}
-
-// destructor
-CCommDbTest047_05::~CCommDbTest047_05()
-	{
-	}
-
-
-TVerdict CCommDbTest047_05::doTestStepPreambleL()
-	{	
-	iTheDb=CCommsDatabase::NewL();
-	return EPass;
-	}
-
-
-TBool CCommDbTest047_05::executeStepL()
-	{
-	CCommDbOverrideSettings* overSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(overSet);
-
-	CCommsDbConnectionPrefTableView::TCommDbIspConnectionPref tempIspPref;
-
-	User::LeaveIfError(overSet->GetConnectionPreferenceOverride(tempIspPref));
-	CleanupStack::PopAndDestroy(overSet);
-	return KErrNone;
-	}
-
-TVerdict CCommDbTest047_05::doTestStepL( )
-	{
-	TRAPD(ret,executeStepL());
-	if(ret==KErrNotSupported)
-		{
-		return EPass;	//If we've got this far we've passed
-		}
-	else
-		{
-		return EFail;
-		}
-	}
-
-TVerdict CCommDbTest047_05::doTestStepPostambleL()
-	{
-	return EPass;
-	}
-
-//
-//	Test step 0047.06
-//
-CCommDbTest047_06::CCommDbTest047_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_047_06");
-	}
-
-CCommDbTest047_06::~CCommDbTest047_06()
-	{}
-
-TVerdict CCommDbTest047_06::doTestStepL( void )
-	{
-	TRAPD(ret,executeStepL());
-	if(ret==KErrNotSupported)
-		{
-		return EPass;	//If we've got this far we've passed
-		}
-	else
-		{
-		return EFail;
-		}
-	}
-
-TVerdict CCommDbTest047_06::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest047_06::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIspConnectionPref pref;
-	iPrefView->ReadConnectionPreferenceL(pref);
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest047_06::doTestStepPostambleL()
-	{
-	delete iPrefView;
-	iPrefView = NULL;
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-//	Test step 0047.07
-//
-
-// constructor
-CCommDbTest047_07::CCommDbTest047_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_047_07");
-	}
-
-// destructor
-CCommDbTest047_07::~CCommDbTest047_07()
-	{
-	}
-
-
-TVerdict CCommDbTest047_07::doTestStepPreambleL()
-	{	
-	iTheDb=CCommsDatabase::NewL();
-	return EPass;
-	}
-
-
-TBool CCommDbTest047_07::executeStepL()
-	{
-	CCommDbOverrideSettings* overSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(overSet);
-
-	CCommsDbConnectionPrefTableView::TCommDbIspConnectionPref tempIspPref;
-
-	User::LeaveIfError(overSet->SetConnectionPreferenceOverride(tempIspPref));
-	CleanupStack::PopAndDestroy(overSet);
-	return KErrNone;
-	}
-
-TVerdict CCommDbTest047_07::doTestStepL( )
-	{
-	TRAPD(ret,executeStepL());
-	if(ret==KErrNotSupported)
-		{
-		return EPass;	//If we've got this far we've passed
-		}
-	else
-		{
-		return EFail;
-		}
-	}
-
-TVerdict CCommDbTest047_07::doTestStepPostambleL()
-	{
-	return EPass;
-	}
-
-//
-//	Test step 0047.08
-//
-CCommDbTest047_08::CCommDbTest047_08()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_047_08");
-	}
-
-CCommDbTest047_08::~CCommDbTest047_08()
-	{}
-
-TVerdict CCommDbTest047_08::doTestStepL( void )
-	{
-	TRAPD(ret,executeStepL());
-	if(ret==KErrNotSupported)
-		{
-		return EPass;	//If we've got this far we've passed
-		}
-	else
-		{
-		return EFail;
-		}
-	}
-
-TVerdict CCommDbTest047_08::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	iPrefView = iTheDb->OpenConnectionPrefTableLC();
-	CleanupStack::Pop();
-
-	return EPass;
-	}
-
-TInt CCommDbTest047_08::executeStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIspConnectionPref pref;
-	iPrefView->UpdateBearerL(pref.iBearer);
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest047_08::doTestStepPostambleL()
-	{
-	delete iPrefView;
-	iPrefView = NULL;
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-//
-//	Test step 0047.13
-//
-
-// constructor
-CCommDbTest047_13::CCommDbTest047_13()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_047_13");
-	}
-
-// destructor
-CCommDbTest047_13::~CCommDbTest047_13()
-	{
-	}
-
-
-TVerdict CCommDbTest047_13::doTestStepPreambleL()
-	{	
-	return EPass;
-	}
-
-
-TBool CCommDbTest047_13::executeStepL()
-	{
-	TCommDbOpeningMethod openingMethod(ECommDbCreated);
-	CCommsDatabase::NewL(EDatabaseTypeISP,openingMethod);
-	return KErrNone;
-	} //lint !e550
-
-TVerdict CCommDbTest047_13::doTestStepL( )
-	{
-	TRAPD(ret,executeStepL());
-	if(ret==KErrNone)
-		{
-		return EPass;	//If we've got this far we've passed
-		}
-	else
-		{
-		return EFail;
-		}
-	}
-
-TVerdict CCommDbTest047_13::doTestStepPostambleL()
-	{
-	return EPass;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_047_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-// Copyright (c) 2002-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:
-// This is the header file for CommDb test 047.XX group of scenarios 
-// 
-//
-
-
-NONSHARABLE_CLASS(CCommDbTest047_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest047_01();
-	~CCommDbTest047_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-};
-
-NONSHARABLE_CLASS(CCommDbTest047_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest047_02();
-	~CCommDbTest047_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-};
-
-NONSHARABLE_CLASS(CCommDbTest047_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest047_03();
-	~CCommDbTest047_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-};
-
-NONSHARABLE_CLASS(CCommDbTest047_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest047_04();
-	~CCommDbTest047_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 047.05
-//
-NONSHARABLE_CLASS(CCommDbTest047_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest047_05();
-	~CCommDbTest047_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-};
-
-//
-//	Test step 047.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest047_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest047_06();
-	~CCommDbTest047_06();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 047.07
-//
-NONSHARABLE_CLASS(CCommDbTest047_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest047_07();
-	~CCommDbTest047_07();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-};
-
-//
-//	Test step 047.08
-//
-NONSHARABLE_CLASS(CCommDbTest047_08) : public CTestStepCommDb
-{
-public:
-	CCommDbTest047_08();
-	~CCommDbTest047_08();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommsDbConnectionPrefTableView* iPrefView;
-};
-
-//
-//	Test step 047.13
-//
-NONSHARABLE_CLASS(CCommDbTest047_13) : public CTestStepCommDb
-{
-public:
-	CCommDbTest047_13();
-	~CCommDbTest047_13();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-};
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_061_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,387 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 061.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbstore.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include <etelmm.h>
-#include "Step_061_xx.h"
-#include <e32math.h>
-
-CCommsDbTableView *CCommDbTest061_xx::OpenIspTable(CCommsDatabase* aDb, TInt &aNoOfRows, TInt aExpectedCount)
-{
-	char OK = 1;
-	TInt ErrCode = KErrGeneral;
-
-	CCommsDbTableView *TableView = NULL;
-	
-	TRAP(ErrCode, TableView = aDb->OpenTableLC( TPtrC(DIAL_OUT_ISP) ); CleanupStack::Pop(TableView););
-
-	if(ErrCode != KErrNone)
-		{
-		Log(_L("CCommDbTest061_xx::OpenIspTable : aDb->OpenTableLC LEFT with %d"),ErrCode);
-		return(NULL);
-		}
-	   
-	aNoOfRows = 0;
-	char DropOut = 0;
-	while(!DropOut)
-	{
-		if(aNoOfRows == 0)
-			ErrCode = TableView->GotoFirstRecord(); 
-		else
-			ErrCode = TableView->GotoNextRecord(); 
-		DropOut = (ErrCode != KErrNone);
-		if(ErrCode == KErrNone)
-			++aNoOfRows;
-	}
-
-	OK = (ErrCode == KErrNotFound); // should be the last value returned.
-	if(OK)
-		OK = (aNoOfRows == aExpectedCount);
-	if(OK)
-	{
-		Log(_L("Found expected number of table entries "));
-		return(TableView);
-	}
-	Log(_L("CCommDbTest061_xx::OpenIspTable : function failed with OK = %d"),OK);
-	return(NULL);
-}
-
-//
-//	Test step 061.01
-//
-
-// constructor
-CCommDbTest061_01::CCommDbTest061_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_061_01");
-	}
-
-// destructor
-CCommDbTest061_01::~CCommDbTest061_01()
-	{
-	}
-
-
-TVerdict CCommDbTest061_01::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest061_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TInt RowCount;
-
-	// Values tested
-	TInt EnumArray[] = {
-		RMobileCall::EProtocolUnspecified, // first two are different ways of saying unspecified
-		RMobileCall::EProtocolUnspecified,
-		RMobileCall::EProtocolV22bis,
-		RMobileCall::EProtocolV32,
-		RMobileCall::EProtocolV34,
-		RMobileCall::EProtocolV110,
-		RMobileCall::EProtocolV120,
-		RMobileCall::EProtocolX31FlagStuffing,
-		RMobileCall::EProtocolPIAFS,
-		RMobileCall::EProtocolBitTransparent,
-		RMobileCall::EProtocolPstnMultimediaVoiceFallback,
-		RMobileCall::EProtocolPstnMultimedia,
-		RMobileCall::EProtocolIsdnMultimedia
-					};
-
-	iTheView = OpenIspTable(iTheDb, RowCount, (sizeof(EnumArray)/sizeof(TInt)));
-
-	char OK = (iTheView != NULL);
-
-	if(OK)
-	{
-		for(TInt i = 0; (i < RowCount) && OK; ++i)
-		{
-			TUint32 BearerProtocol;
-			if(i == 0)
-				iTheView->GotoFirstRecord(); 
-			else
-				iTheView->GotoNextRecord(); 
-			iTheView->ReadUintL(TPtrC(ISP_BEARER_PROTOCOL), BearerProtocol);
-			OK = (BearerProtocol == (TUint)EnumArray[i]);
-		}
-	}
-
-	ret = (OK ? KErrNone : KErrGeneral);
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest061_01::doTestStepL( )
-	{
-	Log(_L("Step 061.01 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 061.02
-//
-
-// constructor
-CCommDbTest061_02::CCommDbTest061_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_061_02");
-	}
-
-// destructor
-CCommDbTest061_02::~CCommDbTest061_02()
-	{
-	}
-
-
-TVerdict CCommDbTest061_02::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest061_02::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TInt RowCount;
-
-	// Values tested
-	TInt EnumArray[] = {
-		RMobileCall::KCapsDataCircuitAsynchronous,
-		RMobileCall::KCapsDataCircuitAsynchronousRDI,
-		RMobileCall::KCapsDataCircuitSynchronous,
-		RMobileCall::KCapsDataCircuitSynchronousRDI,
-		RMobileCall::KCapsPADAsyncUDI,
-		RMobileCall::KCapsPADAsyncRDI,
-		RMobileCall::KCapsPacketAccessSyncUDI,
-		RMobileCall::KCapsPacketAccessSyncRDI,
-		RMobileCall::KCapsServiceExtended
-					};
-
-	iTheView = OpenIspTable(iTheDb, RowCount, (sizeof(EnumArray)/sizeof(TInt)));
-
-	char OK = (iTheView != NULL);
-
-	if(OK)
-	{
-		for(TInt i = 0; (i < RowCount) && OK; ++i)
-		{
-			TUint32 BearerName;
-			if(i == 0)
-				iTheView->GotoFirstRecord(); 
-			else
-				iTheView->GotoNextRecord(); 
-			iTheView->ReadUintL(TPtrC(ISP_BEARER_NAME), BearerName);
-			OK = (BearerName == (TUint)EnumArray[i]);
-		}
-	}
-
-	ret = (OK ? KErrNone : KErrGeneral);
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest061_02::doTestStepL( )
-	{
-	Log(_L("Step 061.02 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 061.03
-//
-
-// constructor
-CCommDbTest061_03::CCommDbTest061_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_061_03");
-	}
-
-// destructor
-CCommDbTest061_03::~CCommDbTest061_03()
-	{
-	}
-
-
-TVerdict CCommDbTest061_03::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest061_03::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TInt RowCount;
-
-	// Values tested
-	TInt EnumArray[] = {
-		RMobileCall::ESpeedUnspecified,
-		RMobileCall::ESpeedAutobauding,
-		RMobileCall::ESpeed2400,
-		RMobileCall::ESpeed4800,
-		RMobileCall::ESpeed9600,
-		RMobileCall::ESpeed14400,
-		RMobileCall::ESpeed19200,
-		RMobileCall::ESpeed28800,
-		RMobileCall::ESpeed32000,
-		RMobileCall::ESpeed33600,
-		RMobileCall::ESpeed38400,
-		RMobileCall::ESpeed43200,
-		RMobileCall::ESpeed48000,
-		RMobileCall::ESpeed56000,
-		RMobileCall::ESpeed57600,
-		RMobileCall::ESpeed64000
-					};
-
-	iTheView = OpenIspTable(iTheDb, RowCount, (sizeof(EnumArray)/sizeof(TInt)));
-
-	char OK = (iTheView != NULL);
-
-	if(OK)
-	{
-		for(TInt i = 0; (i < RowCount) && OK; ++i)
-		{
-			TUint32 BearerSpeed;
-			if(i == 0)
-				iTheView->GotoFirstRecord(); 
-			else
-				iTheView->GotoNextRecord(); 
-			iTheView->ReadUintL(TPtrC(ISP_BEARER_SPEED), BearerSpeed);
-			OK = (BearerSpeed == (TUint)EnumArray[i]);
-		}
-	}
-
-	ret = (OK ? KErrNone : KErrGeneral);
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest061_03::doTestStepL( )
-	{
-	Log(_L("Step 061.03 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 061.04
-//
-
-// constructor
-CCommDbTest061_04::CCommDbTest061_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_061_04");
-	}
-
-// destructor
-CCommDbTest061_04::~CCommDbTest061_04()
-	{
-	}
-
-
-TVerdict CCommDbTest061_04::doTestStepPreambleL()
-	{	
-	openDbL();
-	return EPass;
-	}
-
-TInt CCommDbTest061_04::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TInt RowCount;
-
-	// Values tested (see RMobileCall::TMobileCallDataQoS, etelmm.h)
-	TInt EnumArray[] = {
-		RMobileCall::EQoSUnspecified,
-		RMobileCall::EQoSTransparent,
-		RMobileCall::EQoSNonTransparent,
-		RMobileCall::EQosTransparentPreferred,
-		RMobileCall::EQosNonTransparentPreferred
-					};
-
-	iTheView = OpenIspTable(iTheDb, RowCount, (sizeof(EnumArray)/sizeof(TInt)));
-
-	char OK = (iTheView != NULL);
-
-	if(OK)
-	{
-		for(TInt i = 0; (i < RowCount) && OK; ++i)
-		{
-			TUint32 BearerCE;
-			if(i == 0)
-				iTheView->GotoFirstRecord(); 
-			else
-				iTheView->GotoNextRecord(); 
-			iTheView->ReadUintL(TPtrC(ISP_BEARER_CE), BearerCE);
-			OK = (BearerCE == (TUint)EnumArray[i]);
-		}
-	}
-
-	ret = (OK ? KErrNone : KErrGeneral);
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest061_04::doTestStepL( )
-	{
-	Log(_L("Step 061.04 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_061_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 061.XX group of scenarios 
-// 
-//
-
-#if (!defined __STEP_061_XX_H__)
-#define __STEP_061_XX_H__
-
-
-NONSHARABLE_CLASS(CCommDbTest061_xx) : public CTestStepCommDb
-{
-protected:
-	CCommsDbTableView *OpenIspTable(CCommsDatabase* aDb, TInt &NoOfRows, TInt ExpectedCount);
-
-};
-
-//
-//	Test step 061.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest061_01) : public CCommDbTest061_xx
-{
-public:
-	CCommDbTest061_01();
-	~CCommDbTest061_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-};
-
-//
-//	Test step 061.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest061_02) : public CCommDbTest061_xx
-{
-public:
-	CCommDbTest061_02();
-	~CCommDbTest061_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-};
-
-//
-//	Test step 061.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest061_03) : public CCommDbTest061_xx
-{
-public:
-	CCommDbTest061_03();
-	~CCommDbTest061_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-};
-
-//
-//	Test step 061.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest061_04) : public CCommDbTest061_xx
-{
-public:
-	CCommDbTest061_04();
-	~CCommDbTest061_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-};
-
-
-#endif //__STEP_061_XX_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_062_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,335 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 062.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbtemp.h>
-#include <cdbover.h>
-
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_062_xx.h"
-
-//
-//	Test step 062.01
-//
-
-// constructor
-CCommDbTest062_01::CCommDbTest062_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_062_01");
-	}
-
-// destructor
-CCommDbTest062_01::~CCommDbTest062_01()
-	{
-	}
-
-TVerdict CCommDbTest062_01::doTestStepPreambleL()
-	{	
-	openDbAndViewL(_L("Modem"));
-	return EPass;
-	}
-
-TInt CCommDbTest062_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	TUint32 id;
-
-	
-	//Insert a new record, 
-
-	CDBLEAVE( iTheView->InsertRecord( id ), KErrNone );
-	
-	_LIT(KModem,"US Robotics Sportster");
-	_LIT(KTsy,"HAYES");
-	_LIT8(KModemInitString,"AT&F1");
-	_LIT8(KModemFaxInitString,"AT&d2");
-	//Write some sample data into the table
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME),KModem);
-	iTheView->WriteTextL(TPtrC(MODEM_NIF_NAME),_L("PPP"));
-	iTheView->WriteTextL(TPtrC(MODEM_TSY_NAME),KTsy);
-	iTheView->WriteUintL(TPtrC(MODEM_RATE),(TUint32)EBps57600);
-	iTheView->WriteUintL(TPtrC(MODEM_DATA_BITS),(TUint32)EData8);
-	iTheView->WriteUintL(TPtrC(MODEM_STOP_BITS),(TUint32)EStop1);
-	iTheView->WriteUintL(TPtrC(MODEM_PARITY),(TUint32)EParityNone);
-	iTheView->WriteUintL(TPtrC(MODEM_HANDSHAKING),(TUint32)(KConfigObeyCTS|KConfigObeyDSR|KConfigFailDSR|KConfigObeyDCD|KConfigFailDCD));	//KConfigObeyCTS;
-	iTheView->WriteUintL(TPtrC(MODEM_SPECIAL_RATE),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XON_CHAR),(TUint32)0);
-	iTheView->WriteUintL(TPtrC(MODEM_XOFF_CHAR),(TUint32)0);
-	iTheView->WriteTextL(TPtrC(MODEM_MODEM_INIT_STRING),KModemInitString);
-	iTheView->WriteTextL(TPtrC(MODEM_DATA_INIT_STRING),KNullDesC8);
-	iTheView->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING),KModemFaxInitString);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_PREF),(TUint32)EModemSpeakerSettingAfterDialUntilAnswer);
-	iTheView->WriteUintL(TPtrC(MODEM_SPEAKER_VOL_PREF),(TUint32)EModemSpeakerVolumeQuiet);
-
-	//Insert the record and destroy the view
-	CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-	
-	delete iTheView;
-	iTheView = 0;
-
-	//Open a view and make a change to the record just written
-	iTheView = iTheDb->OpenViewMatchingTextLC( _L("Modem"), TPtrC(COMMDB_NAME), KModem);
-	CleanupStack::Pop();
-
-	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
-	CDBLEAVE( iTheView->UpdateRecord(), KErrNone );
-	_LIT(KModem2,"Another US Robotics Sportster");
-	iTheView->WriteTextL(TPtrC(COMMDB_NAME), KModem2 );
-	
-	//Cancel the changes made and destroy the view
-	iTheView->CancelRecordChanges();
-
-	delete iTheView;
-	iTheView = 0;
-
-	//Open a view to check that the record was not modified
-	iTheView = iTheDb->OpenViewMatchingTextLC( _L("Modem"), TPtrC(COMMDB_NAME), KModem);
-	CleanupStack::Pop();
-
-	CDBLEAVE( ret = iTheView->GotoFirstRecord(), KErrNone );
-
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest062_01::doTestStepL( )
-	{
-	Log(_L("Step 062.01 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 062.02
-//
-
-// constructor
-CCommDbTest062_02::CCommDbTest062_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_062_02");
-	}
-
-// destructor
-CCommDbTest062_02::~CCommDbTest062_02()
-	{
-	}
-
-TVerdict CCommDbTest062_02::doTestStepPreambleL()
-	{	
-	openDbL();
-//	TInt ret = copyTestDatabase( EDatabase_1 );
-//	if(ret != KErrNone) // can't check this at the moment because copyTestDatabase returns 
-//	   User::Leave(ret);// KErrGeneral when it passes!!
-	return EPass;
-	}
-
-
-
-TInt CCommDbTest062_02::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	CCommsDbTableView* table = NULL;
-
-	// Not much to this - in fact it's the specific case raised in the defect report
-	// INC027976 which describes the BC break due to chenging the name of the Modem table 
-	// to ModemBearer
-	
-	__UHEAP_MARK;
-	table = iTheDb->OpenViewLC(_L("Modem"),_L("select * from Modem where Hidden=0")); 
-	CleanupStack::Pop();
-
-	if(table != NULL)
-	{
-		ret = KErrNone;
-		delete table;
-		table = 0;
-	}
-
-	__UHEAP_MARKEND;
-	return ret;
-	}
-
-
-
-TVerdict CCommDbTest062_02::doTestStepL( )
-	{
-	Log(_L("Step 062.02 called "));
-
-	TRAPD(ret, executeStepL());
-	if( ret == KErrNotSupported )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-	}
-
-// Test step 03 is the same as 37_01, except that the literal string 'Modem'
-// is used to verify that template handling is BC.
-
-
-
-CCommDbTest062_03::CCommDbTest062_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_062_03");
-	}
-
-CCommDbTest062_03::~CCommDbTest062_03()
-	{}
-
-TVerdict CCommDbTest062_03::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest062_03::doTestStepPreambleL()
-	{
-	iTheDb=CCommsDatabase::NewL();
-
-	return EPass;
-	}
-
-TInt CCommDbTest062_03::executeStepL()
-	{
-	//alter something in the template
-	CCommsDbTemplateRecord* templateRecord = CCommsDbTemplateRecord::NewL(iTheDb, _L("Modem"));
-	CleanupStack::PushL(templateRecord);
-	
-	User::LeaveIfError(templateRecord->Modify());
-	templateRecord->WriteTextL(TPtrC(COMMDB_NAME), _L("DummyName"));
-	TBufC8<KCommsDbSvrMaxFieldLength> firstInputString = _L8("first string");
-
-	templateRecord->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING), firstInputString);
-	User::LeaveIfError(templateRecord->StoreModifications());
-	//Now start to overwrite initial change, but don't commit, cancel instead.
-	User::LeaveIfError(templateRecord->Modify());
-
-	TBufC8<KCommsDbSvrMaxFieldLength> secondInputString = _L8("second string");
-	templateRecord->WriteTextL(TPtrC(MODEM_FAX_INIT_STRING), secondInputString);
-	templateRecord->CancelModifications();
-
-	TBuf8<KCommsDbSvrMaxFieldLength> retrievedString;
-	templateRecord->ReadTextL(TPtrC(MODEM_FAX_INIT_STRING), retrievedString);
-	CleanupStack::PopAndDestroy(templateRecord);
-
-	if(retrievedString!=firstInputString)
-		return KErrGeneral;
-	
-	return KErrNone;
-	}
-	
-TVerdict CCommDbTest062_03::doTestStepPostambleL()
-	{
-	delete iTheDb;
-	iTheDb=NULL;
-	return EPass;
-	}
-
-// Test steps 04 & 05 are the same as 41_13 & 41_14, except that the literal string
-// 'Modem' is used to access the table to verify that the override handling is BC.
-//
-
-CCommDbTest062_04::CCommDbTest062_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_062_04");
-	}
-
-CCommDbTest062_04::~CCommDbTest062_04()
-	{}
-
-TVerdict CCommDbTest062_04::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNone)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest062_04::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest062_04::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	TBuf<KCommsDbSvrMaxFieldLength> temp(_L("There's no place like home"));
-	return iOverSet->SetDesOverride(_L("Modem"), TPtrC(MODEM_TSY_NAME), temp);
-	}
-
-TVerdict CCommDbTest062_04::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
-
-//
-
-CCommDbTest062_05::CCommDbTest062_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_062_05");
-	}
-
-CCommDbTest062_05::~CCommDbTest062_05()
-	{}
-
-TVerdict CCommDbTest062_05::doTestStepL( void )
-	{
-	if(executeStepL()!=KErrNotSupported)
-		return EFail;
-	return EPass;
-	}
-
-TVerdict CCommDbTest062_05::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest062_05::executeStepL()
-	{
-	iOverSet=CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	
-	return iOverSet->SetIntOverride(_L("Modem"), TPtrC(MODEM_STOP_BITS), 10);
-	}
-
-TVerdict CCommDbTest062_05::doTestStepPostambleL()
-	{
-	delete iOverSet;
-	return EPass;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_062_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-// Copyright (c) 2003-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:
-// step_062_01.h
-// This is the header file for CommDb test 062.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_062_XX_H__)
-#define __STEP_062_XX_H__
-
-
-//
-//	Test step 062.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest062_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest062_01();
-	~CCommDbTest062_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 062.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest062_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest062_02();
-	~CCommDbTest062_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 062.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest062_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest062_03();
-	~CCommDbTest062_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-
-};
-
-//
-//	Test step 062.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest062_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest062_04();
-	~CCommDbTest062_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-
-};
-
-//
-//	Test step 062.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest062_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest062_05();
-	~CCommDbTest062_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-
-private:
-	CCommDbOverrideSettings* iOverSet;
-
-};
-
-
-
-#endif //(__STEP_062_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_064_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 0064.XX
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "Step_064_xx.h"
-
-#include <commsdattypeinfov1_1.h>
-#include <commsdattypesv1_1.h>
-#include <commsdat_partner.h>
-
-
-// table name
-_LIT(KCDTypeNameTestTable, "Test");
-
-#define	KCDTypeNameBinaryFieldTest		      _S("BinaryTest")
-
-// record type id
-const TMDBElementId KCDTIdTestRecord         = 0x5F800000;
-// field type ids
-const TMDBElementId KCDTIdTestBinaryField    = 0x00150000;
-
-
-static const SGenericRecordTypeInfo TestGenRecordInfoBinary[] =
-    {
-	MDB_GENERIC_TYPE_INFO(KCDTIdRecordTag,	     	EUint32,    ENoAttrs,   KCDTypeNameRecordTag),
-    MDB_GENERIC_TYPE_INFO(KCDTIdRecordName,	     	EText,	    ENotNull,   KCDTypeNameRecordName),
-	MDB_GENERIC_TYPE_INFO(KCDTIdTestBinaryField,	EDesC8,  	ENoAttrs,   KCDTypeNameBinaryFieldTest),
-    MDB_GENERIC_TYPE_INFO(0, 0, ENoAttrs, KCDNull) 
-    };
-
-
-
-NONSHARABLE_CLASS(CCDTestBinaryRecord) : public CCDRecordBase
-	{
-public :
-
-	// Constructor
-    CCDTestBinaryRecord(TMDBElementId aElementId)
-        : CCDRecordBase(aElementId), 
-          iBinaryField((aElementId & KCDMaskShowRecordType) | KCDTIdTestBinaryField),
-          iRecordTag((aElementId & KCDMaskShowRecordType) | KCDTIdRecordTag),
-          iRecordName((aElementId & KCDMaskShowRecordType) | KCDTIdRecordName)
-        {}
-        
-    const SRecordTypeInfo* GetRecordInfo(){return iRecordInfo;}    
-
-	DATA_VTABLE
-
-public :
-
-	CMDBField<TDesC8>	iBinaryField;
-	CMDBField<TInt>	 	iRecordTag;  
-	CMDBField<TDesC> 	iRecordName;   
-	
-private:
-    
-		static const SRecordTypeInfo iRecordInfo[];	
-	};
-	
-
-	
-	
-const SRecordTypeInfo CCDTestBinaryRecord::iRecordInfo[]=
-  	{
-		{ KCDTIdRecordTag,	        EInt,		ENoAttrs,   KCDTypeNameRecordTag },
-  		{ KCDTIdRecordName,     	EText,		ENotNull,   KCDTypeNameRecordName },
-		{ KCDTIdTestBinaryField,	EDesC8,		ENotNull,   KCDTypeNameBinaryFieldTest },
-  		{ 0, 0, ENoAttrs, KCDNull }
-  	};	
-
-
-START_ATTRIBUTE_TABLE(CCDTestBinaryRecord, KCDTIdTestRecord,  KCDTIdTestRecord )
-	X_REGISTER_ATTRIBUTE(CCDTestBinaryRecord,   iBinaryField, TMDBBin)
-	X_REGISTER_ATTRIBUTE(CCDTestBinaryRecord,   iRecordTag,    TMDBNum )
-	X_REGISTER_ATTRIBUTE(CCDTestBinaryRecord,   iRecordName,   TMDBText )
-END_ATTRIBUTE_TABLE()
-
-
-_LIT8(KTestBinary, "a long binary string,a long binary string,a long binary string,a long binary string,a long binary string,a long binary string,a long binary string,end");
-
-
-
-
-
-//
-//	Test step 064.001
-//
-
-// constructor
-CCommDbTest064_01::CCommDbTest064_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_064_01");
-	}
-
-// destructor
-CCommDbTest064_01::~CCommDbTest064_01()
-	{
-	}
-
-
-TInt CCommDbTest064_01::executeStepL()
-	{
-	TInt ret=KErrGeneral;
-	
-	//set up a generic record with a binary field	
-	INFO_PRINTF1(_L("Creating  a user defined table"));
-
-	CMDBSession *cmdbSession = CMDBSession::NewL(KCDVersion1_1);
-
-	CleanupStack::PushL(cmdbSession); 
-
-	CMDBGenericRecord* testRecord = static_cast<CMDBGenericRecord*>(CCDRecordBase::RecordFactoryL(KCDNewTableRequest));
-	CleanupStack::PushL(testRecord); 
-    testRecord->InitializeL(KCDTypeNameTestTable(), TestGenRecordInfoBinary);	
-         
-	testRecord->StoreL(*cmdbSession);
-	CleanupStack::PopAndDestroy(testRecord);	
-	CleanupStack::PopAndDestroy(cmdbSession);
-	
-	
-	//now use commdbshim api to read and write to the binary field
-	CCommsDatabase*		theDb;
-	CCommsDbTableView*	theView;
-	TUint32 recordId;
-
-	//CDBLEAVE( iTheView->PutRecordChanges(), KErrNone );
-	theDb = CCommsDatabase::NewL();
-	theView = theDb->OpenTableLC( KCDTypeNameTestTable );
-	CleanupStack::Pop();
-	
-	TBuf8<KMaxLongTextLength> value(KTestBinary);
-	CDBLEAVE(theView->InsertRecord(recordId), KErrNone );
-	theView->WriteTextL(TPtrC(KCDTypeNameBinaryFieldTest), value );
-	CDBLEAVE(theView->PutRecordChanges(), KErrNone );
-	CDBLEAVE(theView->GotoFirstRecord(), KErrNone );
-
-	TBuf8<KMaxLongTextLength> value2;
-	theView->ReadTextL( TPtrC(KCDTypeNameBinaryFieldTest), value2 );
-
- 	if( value2.Compare( value ) == 0)
-		{
-		ret = KErrNone;
-		}
-
-	delete theView;
-	delete theDb;
-
-	return ret;
-	}
-
-
-TVerdict CCommDbTest064_01::doTestStepL( )
-	{
-	Log(_L("Step 064.01 called "));
-
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-		
-	return iTestStepResult;
-	}
-
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/Step_064_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-// Copyright (c) 2001-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:
-// This is the header file for CommDb test 064.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_064_XX_H__)
-#define __STEP_064_XX_H__
-
-
-//
-//	Test step 064.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest064_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest064_01();
-	~CCommDbTest064_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-
-private:
-
-};
-
-#endif //(__STEP_064_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/TestSuiteCommdb.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CTestSuiteCommDb 
-// This is the container class for all the CommDb test steps
-// 
-//
-
-#if (!defined __TESTSUITCOMMDB_H__)
-#define __TESTSUITCOMMDB_H__
-
-#include <networking/testsuite.h>
-
-
-NONSHARABLE_CLASS(CTestSuiteCommDb) : public CTestSuite
-{
-public:
-	void InitialiseL( void );
-	~CTestSuiteCommDb();
-	TPtrC GetVersion( void );
-	void AddTestStepL( CTestStepCommDb * ptrTestStep );
-
-
-private:
-
-};
-
-// these values have been copied from Testenv.h
-const TInt KSmallBufSize = 256;
-const TInt KLargeBufSize = 2048;
-const TInt KHugeBufSize = 16384;
-
-// CommDb test macros copied from Testenv.h
-typedef TBuf8<KLargeBufSize> TLargeBuf;
-#define IPADDR(a,b,c,d) (TUint32)(((a)<<24)|((b)<<16)|((c)<<8)|(d))
-
-//Test suite parameters
-const TInt KHeapFailure	= 500;
-
-#endif /* __TESTSUITCOMMDB_H__ */
--- a/commsconfig/commsdatabaseshim/ts_commdb/Teststepcommdb.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,642 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CTestCase which is the base class for all the TestCase DLLs
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <f32file.h>
-// Test system includes
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include <comms-infras/commdb/protection/protectdb.h>
-#include <comms-infras/commdb/protection/protectcpdb.h>
-#else
-//these headers are user includes in the new env.
-#include "protectdb.h"
-#include "protectcpdb.h"
-#endif
-
-#include <cdbpreftable.h>
-#include "CDBSTD.H"
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include <networking/testsuite.h>
-#include "TestSuiteCommdb.h"
-
-
-// constructor
-CTestStepCommDb::CTestStepCommDb()
-	{
-	iRemoteObjects = EFalse;
-	}
-
-// destructor
-CTestStepCommDb::~CTestStepCommDb()
-	{
-	popAndDestroyDatabaseObjects();
-	}
-
-// file copy
-void CTestStepCommDb::copyFileL(const TDesC& anOld,const TDesC& aNew)
-	{
-	// create a fileserver
-	RFs fileSystem;
-
-	// connect to file server
-	User::LeaveIfError(fileSystem.Connect());
-	CleanupClosePushL(fileSystem);
-
-	// create a file manager
-	CFileMan * fileMan = CFileMan::NewL(fileSystem);
-	CleanupStack::PushL(fileMan);
-
-	// parse the filenames
-	TParse source;
-	User::LeaveIfError(source.Set(anOld, NULL, NULL));
-
-	// parse the filenames
-	TParse target;
-	User::LeaveIfError(target.Set(aNew, NULL, NULL));
-
-	// do the copy
-	User::LeaveIfError(fileMan->Copy(source.FullName(), target.FullName(), CFileMan::EOverWrite));
-
-	// make read/write
-	User::LeaveIfError(fileSystem.SetAtt(source.FullName(),NULL, KEntryAttReadOnly));
-
-	// clean up
-	CleanupStack::PopAndDestroy(fileMan);
-	CleanupStack::PopAndDestroy(&fileSystem);
-	}
-
-void CTestStepCommDb::deleteFileL(const TDesC& aFileName)
-	{
-	// create a fileserver
-	RFs  fileSystem;
-
-	User::LeaveIfError(fileSystem.Connect());
-	CleanupClosePushL(fileSystem);
-
-	Log(_L("Set file to read-write in order to delete"));
-
-	// Remove read only flag
-	TInt ret = fileSystem.SetAtt(aFileName, 0, KEntryAttReadOnly);
-	if (ret == KErrNotFound)
-		{
-		// If file already removed then no need to delete it
-		Log(_L("File not found"));
-		CleanupStack::PopAndDestroy(&fileSystem);
-		return;
-		}
-	User::LeaveIfError(ret);
-
-	// Delete file
-	User::LeaveIfError(fileSystem.Delete(aFileName));
-	Log(_L("deleted file"));
-
-	// clean up
-	CleanupStack::PopAndDestroy(&fileSystem);
-	}
-
-void CTestStepCommDb::DeleteCurrentDatabaseL()
-	{
-	RDbs rDbs;
-
-//	User::LeaveIfError(rDbs.Connect());
-	TInt ret(KErrNone);
-	ret = rDbs.Connect();
-	if(ret!=KErrNone)
-		{
-		Log(_L("CTestStepCommDb::DeleteCurrentDatabaseL : rDbs.Connect FAILED with %d"),ret );
-		User::Leave(ret);
-		}
-
-	CleanupClosePushL(rDbs);
-	TName commDb(KCDrive);
-	commDb.Append(KDbBaseName);
-	TUid KCommsDbFileUid = { 0x10004e1d };
-	// May need to make several
-	// attempts if it is transiently locked; report these and if
-	// not successful after a number of attempts report this and abort
-	TInt remainingTries = 5;
-//	TInt ret (KErrNone);
-	while(remainingTries-- > 0)
-		{
-		ret = rDbs.DeleteDatabase(commDb, KCommsDbFileUid);
-		if(ret == KErrNone || ret == KErrPathNotFound || ret == KErrNotFound)
-			{
-			ret = KErrNone;
-			break;
-			}
-		else
-			{
-			Log(_L("CTestStepCommDb::DeleteCurrentDatabaseL : rDbs.DeleteDatabase FAILED to delete %S %S with %d"),&KCDrive,&KDbBaseName,ret);
-			}
-		}
-	User::LeaveIfError(ret);
-	CleanupStack::PopAndDestroy(&rDbs);
-	}
-
-void CTestStepCommDb::CopyDatabaseL(const TDesC& aSource)
-	{
-	RFs fs;
-	User::LeaveIfError(fs.Connect());
-	CleanupClosePushL(fs);
-
-	RDbs rDbs;
-	User::LeaveIfError(rDbs.Connect());
-	CleanupClosePushL(rDbs);
-	const TUid KCommsDbFileUid = {0x10004e1d};
-
-	TInt remainingTries = 5;
-	TInt ret (KErrNone);
-	DeleteCurrentDatabaseL();
-	while(remainingTries-- > 0)
-		{
-		ret = rDbs.CopyDatabase(aSource, KDbFileName, KCommsDbFileUid);
-		if(ret == KErrNone || ret == KErrPathNotFound || ret == KErrNotFound)
-			{
-			break;
-			}
-		}
-	User::LeaveIfError(ret);
-	CleanupStack::PopAndDestroy(&rDbs);
-	CleanupStack::PopAndDestroy(&fs);
-	}
-
-
-TInt CTestStepCommDb::copyTestDatabase( TDatabaseNumber aDbNumber )
-	{
-	(void)aDbNumber;
-	return KErrNone;
-	}
-
-TInt CTestStepCommDb::copyDatabaseToDefault( TDatabaseNumber aDbNumber )
-	{
-	(void)aDbNumber;
-	return KErrNone;
-	}
-
-TBool CTestStepCommDb::openDbAndViewL( const TDesC16& aTable )
-	{
-	TBool created = EFalse;
-
-	//Only create Db and view objects if they're not already created
-	if ( ! iTheDb )
-		{
-		iTheDb=CCommsDatabase::NewL();
-		created = ETrue;
-		}
-
-	if ( !iTheView )
-		{
-		iTheView=iTheDb->OpenTableLC( aTable );
-		CleanupStack::Pop(); //no need to put it on the cleanup stack
-		}
-
-	return created;
-	}
-
-TVerdict CTestStepCommDb::doTestStepPostambleL()
-	{
-	if ( iTheView )
-		{
-		delete iTheView;
-		iTheView = 0;
-		}
-
-	if ( iTheDb )
-		{
-		delete iTheDb;
-		iTheDb = 0;
-		}
-
-	return EPass;
-	}
-
-
-
-void CTestStepCommDb::popAndDestroyDatabaseObjects()
-	{
-		// doTestStepPostambleL();
-	}
-
-TBool CTestStepCommDb::openDbL()
-	{
-
-	TBool created = EFalse;
-
-	if ( !iTheDb )
-		{
-		//Only open the Db if its not already open
-		TRAPD(ret,iTheDb=CCommsDatabase::NewL());
-		if(ret!=KErrNone)
-			{
-			Log(_L("CTestStepCommDb::openDbL : CCommsDatabase::NewL LEFT with %d"),ret);
-			User::Leave(ret);
-			}
-		created = ETrue;
-		}
-	return created;
-
-	}
-
-void CTestStepCommDb::setRemoteDatabaseObjects( CCommsDatabase* aDb, CCommsDbTableView* aDbView )
-	{
-		if ( !iTheDb )
-			{
-			//make sure that no-one else has already set the objects
-			iTheDb = aDb;
-			iTheView = aDbView;
-			iRemoteObjects = ETrue;
-			}
-	}
-
-
-void CTestStepCommDb::clearRemoteDatabaseObjects()
-	{
-		if( iRemoteObjects )
-			{
-			//Only clear objects if they were previously set remotly
-			iTheDb = 0;
-			iTheView = 0;
-			}
-	}
-
-TInt CTestStepCommDb::executeStepL()
-	{
-		return KErrGeneral;
-	}
-
-
-TInt CTestStepCommDb::executeStep(CTestStepCommDb& aTestStep)
-	{
-	TInt r,ret= KErrNone;
-
-	TRAP( r, ret = aTestStep.executeStepL() );
-
-	if ( r != KErrNone )
-		ret = r;
-
-	return ret;
-	}
-
-TInt CTestStepCommDb::executeStep( )
-	{
-	TInt ret=0;
-
-	TRAPD( r, ret = executeStepL() );
-
-	if ( r != KErrNone )
-		ret = r;
-
-	return ret;
-	}
-
-//
-//This heap failure member function is used when a test step needs a Database and a View
-//object.
-//
-TInt CTestStepCommDb::doTestStepWithHeapFailureL( CTestStepCommDb& aTestStep, TInt aReturnValue)
-	{
-	TInt ret=0;
-
-	for (TInt i=1; i< KHeapFailure ; i++)
-		{
-		aTestStep.doTestStepPreambleL();
-
-		__UHEAP_FAILNEXT(i);
-
-		ret = aTestStep.executeStep();
-
-		__UHEAP_RESET;
-
-		aTestStep.doTestStepPostambleL();
-
-		if ( ret == KErrNoMemory )
-			{
-			//The heap failure has been trapped correctly
-			continue;
-			}
-		else if ( ret == aReturnValue )
-			{
-			//Test step normal behaviour
-			TPtrC ExpectedErrortxt = CLog::EpocErrorToText(ret);
-			Log(_L("%s PASSED heap failure test, i = %d return code==%S"),
-				aTestStep.iTestStepName.PtrZ(), i, &ExpectedErrortxt );
-
-			break;
-			}
-		else
-			{
-			// test step has not returned the exepected error value ( which was either KErrNoMemory or aReturnValue )
-			TPtrC unexpectedErrortxt = CLog::EpocErrorToText(ret);
-			TPtrC Error = CLog::EpocErrorToText(aReturnValue);
-			Log(_L("%s *FAILED* heap failure test, i=%d return code:%S expected:%S"),
-				aTestStep.iTestStepName.PtrZ(), i, &unexpectedErrortxt, &Error );
-			iTestStepResult = EFail;
-			break;
-			}
-
-		}
-
-	return KErrNone;
-	}
-
-void CTestStepCommDb::CheckTableIsProtectedL(CCommsDbProtectTableView* aTable)
-	{
-
-	TESTL(iTheDb->BeginTransaction()==KErrNone);
-
-	if(aTable->GotoFirstRecord()==KErrNone)
-		{
-		// Check settings on Record
-		RDbRowSet::TAccess tableAccess = RDbRowSet::EUpdatable;
-		TInt ret = aTable->GetTableAccess(tableAccess);
-		TESTL(ret == KErrNone);
-		TESTL(tableAccess == RDbRowSet::EReadOnly);
-
-		// Test that first record cannot be updated
-		TRAP(ret,UpdateRecordL(aTable,KErrAccessDenied));
-		TESTL(ret == KErrNone);
-
-		// Test that cannot delete first record
-		TRAP(ret,DeleteRecordL(aTable,KErrAccessDenied));
-		TESTL(ret == KErrNone);
-
-		// Test that cannot insert new record
-		TRAP(ret,InsertRecordL(aTable,KErrAccessDenied));
-		TESTL(ret == KErrNone);
-
-		aTable->GotoFirstRecord();
-		}
-	TESTL(iTheDb->CommitTransaction()==KErrNone);
-	}
-
-
-void CTestStepCommDb::CheckTableIsProtectedL(CCommsDbProtectConnectPrefTableView* aTable)
-	{
-
-	TESTL(iTheDb->BeginTransaction()==KErrNone);
-	if(aTable->GotoFirstRecord()==KErrNone)
-		{
-		// Check settings on Record
-		RDbRowSet::TAccess tableAccess = RDbRowSet::EUpdatable;
-		TInt ret = aTable->GetTableAccess(tableAccess);
-		TESTL(ret == KErrNone);
-		TESTL(tableAccess == RDbRowSet::EReadOnly);
-
-		// Test that first record cannot be updated
-		TRAP(ret,UpdateRecordL(aTable,KErrAccessDenied));
-		TESTL(ret == KErrNone);
-
-		// Test that cannot delete first record
-		TRAP(ret,DeleteRecordL(aTable,KErrAccessDenied));
-		TESTL(ret == KErrNone);
-
-		// Test that cannot insert new record
-		TRAP(ret,InsertRecordL(aTable,KErrAccessDenied));
-		TESTL(ret == KErrNone);
-
-		aTable->GotoFirstRecord();
-		}
-	TESTL(iTheDb->CommitTransaction()==KErrNone);
-	}
-
-void CTestStepCommDb::CheckTableIsNotProtectedL(CCommsDbProtectTableView* aTable)
-	{
-	TESTL(iTheDb->BeginTransaction()==KErrNone);
-	if(aTable->GotoFirstRecord()==KErrNone)
-		{
-		// Check settings on Table
-		RDbRowSet::TAccess tableAccess = RDbRowSet::EReadOnly;
-		TInt ret = aTable->GetTableAccess(tableAccess);
-		TESTL(ret == KErrNone);
-		TESTL(tableAccess == RDbRowSet::EUpdatable);
-
-		// Test can update first record
-		TRAP(ret,UpdateRecordL(aTable,KErrNone));
-		TESTL(ret == KErrNone);
-
-		// Test that can delete record
-		TRAP(ret,DeleteRecordL(aTable,KErrNone));
-		TESTL(ret == KErrNone);
-
-		// Test that can insert new record
-		TRAP(ret,InsertRecordL(aTable,KErrNone));
-		TESTL(ret == KErrNone);
-
-		aTable->GotoFirstRecord();
-		}
-	TESTL(iTheDb->CommitTransaction()==KErrNone);
-	}
-
-void CTestStepCommDb::CheckTableIsNotProtectedL(CCommsDbProtectConnectPrefTableView* aTable)
-	{
-	TESTL(iTheDb->BeginTransaction()==KErrNone);
-	if(aTable->GotoFirstRecord()==KErrNone)
-		{
-		// Check settings on Table
-		RDbRowSet::TAccess tableAccess = RDbRowSet::EReadOnly;
-		TInt ret = aTable->GetTableAccess(tableAccess);
-		TESTL(ret == KErrNone);
-		TESTL(tableAccess == RDbRowSet::EUpdatable);
-
-		// Test can update first record
-		TRAP(ret,UpdateRecordL(aTable,KErrNone));
-		TESTL(ret == KErrNone);
-
-		// Test that can delete record
-		TRAP(ret,DeleteRecordL(aTable,KErrNone));
-		TESTL(ret == KErrNone);
-
-		// Test that can insert new record
-		TRAP(ret,InsertRecordL(aTable,KErrNone));
-		TESTL(ret == KErrNone);
-
-		aTable->GotoFirstRecord();
-		}
-	TESTL(iTheDb->CommitTransaction()==KErrNone);
-	}
-
-void CTestStepCommDb::GoToPositionL(CCommsDbProtectTableView* aTable,TInt aPos)
-	{
-	TESTL(aTable->GotoFirstRecord()==KErrNone);
-	for (TInt i = 0; i < aPos; i++)
-		{
-		TESTL(aTable->GotoNextRecord()==KErrNone);
-		}
-	}
-
-void CTestStepCommDb::ProtectRecordL(CCommsDbProtectTableView* aTable, TInt aResult)
-	{
-	TESTL(aTable->ProtectRecord()==aResult);
-	}
-
-void CTestStepCommDb::ProtectRecordL(CCommsDbProtectConnectPrefTableView* aTable, TInt aResult)
-	{
-	TESTL(aTable->ProtectRecord()==aResult);
-	}
-
-void CTestStepCommDb::UnprotectRecordL(CCommsDbProtectTableView* aTable, TInt aResult)
-	{
-	TESTL(aTable->UnprotectRecord()==aResult);
-	}
-
-void CTestStepCommDb::UnprotectRecordL(CCommsDbProtectConnectPrefTableView* aTable, TInt aResult)
-	{
-	TESTL(aTable->UnprotectRecord()==aResult);
-	}
-
-void CTestStepCommDb::UpdateRecordL(CCommsDbProtectTableView* aTable, TInt aResult)
-	{
-
-	TESTL(aTable->UpdateRecord()==aResult);
-	if (aResult == KErrNone)
-		{
-		ModifyRecordL(aTable);
-		TESTL(aTable->PutRecordChanges()==KErrNone);
-		}
-	}
-
-void CTestStepCommDb::UpdateRecordL(CCommsDbProtectConnectPrefTableView* aTable, TInt aExpectedResult)
-	{
-
-	TUint32 Ranking;
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref RecordData;
-
-	TInt ErrVal = ChangeCPRankingL(aTable, Ranking); // Try modifying a field.
-
-	TESTL(ErrVal == aExpectedResult);
-
-	if (ErrVal == KErrNone)
-		{
-		// The change was allowed, so check it actually happened.
-		aTable->ReadConnectionPreferenceL(RecordData);
-		TESTL(Ranking == RecordData.iRanking);
-		}
-	}
-
-void CTestStepCommDb::DeleteRecordL(CCommsDbProtectTableView* aTable, TInt aResult)
-	{
-	TESTL(aTable->DeleteRecord()==aResult);
-	}
-
-void CTestStepCommDb::DeleteRecordL(CCommsDbProtectConnectPrefTableView* aTable, TInt aExpectedResult)
-	{
-	TRAPD(ErrVal, aTable->DeleteConnectionPreferenceL());
-	TESTL(ErrVal == aExpectedResult);
-	}
-
-void CTestStepCommDb::InsertRecordL(CCommsDbProtectTableView* aTable, TInt aExpectedResult)
-	{
-	TUint32 recordId;
-	TInt ret = aTable->InsertRecord(recordId);
-	TESTL(ret==aExpectedResult||ret==KErrAlreadyExists); //for some tables insertion fails
-											  //because they can only have
-											//one record (i.e. DEFAULT_GPRS)
-	if (ret == KErrNone)
-		{
-		PopulateInsertedRecordL(aTable);
-		TESTL(aTable->PutRecordChanges()==KErrNone);
-		}
-	}
-
-void CTestStepCommDb::InsertRecordL(CCommsDbProtectConnectPrefTableView* aTable, TInt aExpectedResult)
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref PrefData1, PrefData2;
-
-	PrefData1.iRanking = 0;
-	PrefData1.iDirection = ECommDbConnectionDirectionOutgoing;
-	PrefData1.iDialogPref = ECommDbDialogPrefWarn;
-	PrefData1.iBearer.iBearerSet = ECommDbBearerCSD;
-	PrefData1.iBearer.iIapId = 1;
-
-	TRAPD(ErrVal, aTable->InsertConnectionPreferenceL(PrefData1));
-	TESTL(ErrVal==aExpectedResult); //for some tables insertion fails
-											  //because they can only have
-											//one record (i.e. DEFAULT_GPRS)
-	if (ErrVal == KErrNone)
-		{
-		aTable->ReadConnectionPreferenceL(PrefData2);
-		TESTL(PrefData1 == PrefData2);
-		}
-	}
-
-
-#define TEST_FCN(_F_)		{TRAPD(ret,_F_); TESTL(ret == KErrNone);}
-
-void CTestStepCommDb::ModifyRecordL(CCommsDbProtectTableView* aTable)
-//
-// Modify some field in current record
-//
-	{
-	TEST_FCN(aTable->WriteTextL(TPtrC(COMMDB_NAME),_L("test")));
-	}
-// Extract the protection state for the current record,
-// and leave if it's not the state expected
-void CTestStepCommDb::CheckRecordAccessL(CCommsDbProtectConnectPrefTableView* aTable, TInt aExpectedAccess)
-	{
-	TInt FoundAccess;
-	// Set the state to one not expected, so it will fail if not explicitly changed
-	if (aExpectedAccess == RDbRowSet::EUpdatable)
-		FoundAccess = RDbRowSet::EReadOnly;
-	else
-		FoundAccess = RDbRowSet::EUpdatable;
-
-	TESTL(aTable->GetRecordAccess(FoundAccess) == KErrNone);
-	TESTL(aExpectedAccess == FoundAccess);
-	}
-void CTestStepCommDb::PopulateInsertedRecordL(CCommsDbProtectTableView* aTable)
-//
-// Populate minimal set of fields in current newly inserted record.
-//
-	{
-	TBuf<50> tableName;
-	aTable->GetTableName(tableName);
-
-	if (tableName == TPtrC(DIAL_OUT_ISP))
-		{
-		TEST_FCN(aTable->WriteTextL(TPtrC(COMMDB_NAME),_L("Inserted Service")));
-		TEST_FCN(aTable->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue));
-		TEST_FCN(aTable->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse));
-		TEST_FCN(aTable->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),ETrue));
-		TEST_FCN(aTable->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue));
-		TEST_FCN(aTable->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue));
-		TEST_FCN(aTable->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue));
-		TEST_FCN(aTable->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue));
-		}
-
-	// EXTEND OR MODIFY this function if want to use different table
-	}
-// Just a utility function - for checking the protection of the Connection Preferences
-// table and its records, we just try changing the ranking field of the first one.
-TInt CTestStepCommDb::ChangeCPRankingL(CCommsDbProtectConnectPrefTableView* aTable, TUint32& Ranking)
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref  RecordData;
-
-	aTable->ReadConnectionPreferenceL(RecordData);
-	if(RecordData.iRanking == 1)
-		Ranking = 0;
-	else
-		Ranking = 1;
-	TRAPD(ErrVal, aTable->ChangeConnectionPreferenceRankL(Ranking));
-	return(ErrVal);
-	}
-
-#undef TEST_FCN
--- a/commsconfig/commsdatabaseshim/ts_commdb/Teststepcommdb.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CTestCaseCommDb which is the base class for all 
-// the CommDb suite test cases
-// 
-//
-
-#if (!defined __COMMDBTESTSTEP_H__)
-#define __COMMDBTESTSTEP_H__
-
-_LIT(KCommDbName, "C:\\private\\100012a5\\DBS_10004e1d_CDBV3.DAT");
-
-
-class CTestSuite;
-class CTestSuiteCommDb;
-class CCommsDatabase;
-class CCommsDbTableView;
-class CCommsDbProtectTableView;
-class CCommsDbProtectConnectPrefTableView;
-
-NONSHARABLE_CLASS(CTestStepCommDb) : public CTestStep
-{
-public:
-	CTestStepCommDb();
-	~CTestStepCommDb();
-
-	// pointer to suite which owns this test 
-	CTestSuiteCommDb * iCommDbSuite;
-
-	//Functions to set and clear the database objects that will
-	//be used by test steps derived from this class.
-	//This prevents the test steps from creating their own database objects
-	void setRemoteDatabaseObjects( CCommsDatabase* aDb, CCommsDbTableView* aDbView );
-	void clearRemoteDatabaseObjects();
-
-	TInt executeStep( CTestStepCommDb& aTestStep );
-	TInt executeStep( );
-	virtual TInt executeStepL();
-	TVerdict doTestStepPostambleL();
-	TInt doTestStepWithHeapFailureL( CTestStepCommDb& aTestStep, TInt aReturnValue );
-	TInt doTestStepWithHeapFailureDb( CTestStepCommDb& aTestStep, TInt aReturnValue );
-
-	enum TDatabaseNumber
-		{
-		EDatabase_1,		//Records in ISP tables only
-		EDatabase_7			//No records
-		};
-	TInt copyTestDatabase( TDatabaseNumber aDbNumber );
-	TInt copyDatabaseToDefault( TDatabaseNumber aDbNumber );
-	void copyFileL (const TDesC& anOld,const TDesC& aNew);
-	void deleteFileL (const TDesC& aFileName);
-
-	void DeleteCurrentDatabaseL();
-	void CopyDatabaseL(const TDesC& aSource);
-
-
-	//Pointers to the current database objects
-	CCommsDatabase*		iTheDb;
-	CCommsDbTableView*	iTheView;
-
-
-protected:
-	//Set by derived steps when local database objects have been allocated
-	TBool	iLocalObjects;
-
-	//Opens a database object and assigns it to iTheDb
-	TBool openDbL();
-	//Opens a database and a table view, assigns them to iTheDb and iTheView
-	TBool openDbAndViewL( const TDesC16& aTable );
-	//Releases any objects assigned to iTheDb and iTheView
-	void popAndDestroyDatabaseObjects();
-
-	TInt ChangeCPRankingL(CCommsDbProtectConnectPrefTableView* aTable, TUint32& Ranking);
-	//Functions needed for Protection tests
-	void    CheckTableIsProtectedL(CCommsDbProtectTableView* aTable);
-	void    CheckTableIsNotProtectedL(CCommsDbProtectTableView* aTable);
-	void    GoToPositionL(CCommsDbProtectTableView* aTable,TInt aPos);
-
-	void    UpdateRecordL   (CCommsDbProtectTableView* aTable,TInt aResult);
-	void    DeleteRecordL   (CCommsDbProtectTableView* aTable,TInt aResult);
-	void    InsertRecordL   (CCommsDbProtectTableView* aTable,TInt aResult);
-	void    ModifyRecordL   (CCommsDbProtectTableView* aTable);
-	void    PopulateInsertedRecordL(CCommsDbProtectTableView* aTable);
-
-	void    CheckTableIsProtectedL(CCommsDbProtectConnectPrefTableView* aTable);
-	void    CheckTableIsNotProtectedL(CCommsDbProtectConnectPrefTableView* aTable);
-	void    GoToPositionL(CCommsDbProtectConnectPrefTableView* aTable,TInt aPos);
-
-	void    UpdateRecordL   (CCommsDbProtectConnectPrefTableView* aTable,TInt aResult);
-	void    DeleteRecordL   (CCommsDbProtectConnectPrefTableView* aTable,TInt aResult);
-	void    InsertRecordL   (CCommsDbProtectConnectPrefTableView* aTable,TInt aResult);
-	void    ModifyRecordL   (CCommsDbProtectConnectPrefTableView* aTable);
-	void    PopulateInsertedRecordL(CCommsDbProtectConnectPrefTableView* aTable);
-
-	void    CheckRecordAccessL(CCommsDbProtectConnectPrefTableView* aTable, TInt aExpectedAccess);
-
-	void    ProtectRecordL  (CCommsDbProtectTableView* aTable,TInt aResult);
-	void    UnprotectRecordL(CCommsDbProtectTableView* aTable,TInt aResult);
-
-    void    ProtectRecordL(CCommsDbProtectConnectPrefTableView* aTable, TInt aResult);
-	void    UnprotectRecordL(CCommsDbProtectConnectPrefTableView* aTable,TInt aResult);
-
-
-private:
-	//Set when remote database object are in use
-	TBool	iRemoteObjects;
-
-};
-
-#define CDBLEAVE( exp1, exp2 )			{	\
-											TInt _r;	\
-											_r = (exp1);  \
-											if ( _r!=exp2 ) User::Leave(_r);\
-										}
-
-_LIT(KInvalidColumnName, "InvalidColumn");
-
-#endif /* __COMMDBTESTSTEP_H__ */
--- a/commsconfig/commsdatabaseshim/ts_commdb/Testsuitecommdb.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,549 +0,0 @@
-// Copyright (c) 2001-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:
-// This main DLL entry point for the TS_CommDb.dll
-// 
-//
-
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include <networking/testsuite.h>
-#include "TestSuiteCommdb.h"
-#include "step_001_01.h"
-#include "step_002_01.h"
-#include "Step_003_xx.h"
-#include "step_004_xx.h"
-#include "step_005_xx.h"
-#include "step_006_xx.h"
-#include "Step_007_xx.h"
-#include "Step_008_xx.h"
-#include "Step_009_xx.h"
-#include "Step_010_xx.h"
-#include "Step_011_xx.h"
-#include "Step_012_xx.h"
-#include "Step_013_xx.h"
-#include "Step_014_xx.h"
-#include "Step_015_xx.h"
-#include "Step_016_xx.h"
-#include "Step_017_xx.h"
-#include "Step_018_xx.h"
-#include "Step_019_xx.h"
-#include "Step_020_xx.h"
-#include "Step_021_xx.h"
-#include "Step_022_xx.h"
-#include "Step_023_xx.h"
-#include "Step_024_xx.h"
-#include "Step_025_xx.h"
-#include "Step_026_xx.h"
-#include "Step_027_xx.h"
-#include "Step_028_xx.h"
-#include "Step_029_xx.h"
-#include "Step_030_xx.h"
-#include "Step_031_xx.h"
-#include "Step_032_xx.h"
-#include "Step_033_xx.h"
-#include "Step_034_xx.h"
-#include "Step_035_xx.h"
-#include "Step_036_xx.h"
-#include "Step_037_xx.h"
-#include "Step_038_xx.h"
-#include "Step_039_xx.h"
-#include "Step_040_xx.h"
-#include "Step_041_xx.h"
-#include "Step_042_xx.h"
-#include "Step_043_xx.h"
-#include "Step_044_xx.h"
-#include "Step_045_xx.h"
-#include "Step_046_xx.h"
-#include "Step_047_xx.h"
-#include "step_051_xx.h"
-#include "step_052_xx.h"
-#include "step_053_xx.h"
-#include "step_054_xx.h"
-#include "step_055_xx.h"
-#include "step_056_xx.h"
-#include "step_057_xx.h"
-#include "step_058_xx.h"
-#include "step_059_xx.h"
-#include "Step_061_xx.h"
-#include "Step_062_xx.h"
-#include "step_063_xx.h"
-#include "Step_064_xx.h"
-#include "CommDbPreCopy.h"
-
-
-EXPORT_C CTestSuiteCommDb* NewTestSuiteCommDb( void ) 
-    { 
-	return new (ELeave) CTestSuiteCommDb;
-    }
-
-// destructor
-CTestSuiteCommDb::~CTestSuiteCommDb()
-{
-}
-
-// make a version string available for test system 
-#ifdef _DEBUG
-_LIT(KTxtVersion,"1.0 (udeb)");
-#else
-_LIT(KTxtVersion,"1.0");
-#endif
-
-TPtrC CTestSuiteCommDb::GetVersion( void )
-	{
-	return KTxtVersion();
-	}
-
-// Add a test step into the suite
-void CTestSuiteCommDb::AddTestStepL( CTestStepCommDb * ptrTestStep )
-{
-	// test steps contain a pointer back to the suite which owns them
-	ptrTestStep->iCommDbSuite = this; 
-
-	// add the step using tyhe base class method
-	CTestSuite::AddTestStepL(ptrTestStep);
-}
-
-
-// second phase constructor for CommDb test suite
-// this creates all the CommDb test steps and
-// stores them inside CTestSuiteCommDb
-void CTestSuiteCommDb::InitialiseL( void )
-{
-
-	// add test steps
-	AddTestStepL( new(ELeave) CCommDbTest001_01 );
-	AddTestStepL( new(ELeave) CCommDbTest001_03 );
-	AddTestStepL( new(ELeave) CCommDbTest001_04 );
-	AddTestStepL( new(ELeave) CCommDbTest001_05 );
-	AddTestStepL( new(ELeave) CCommDbTest001_07 );
-	AddTestStepL( new(ELeave) CCommDbTest001_08 );
-	AddTestStepL( new(ELeave) CCommDbTest001_09 );
-	AddTestStepL( new(ELeave) CCommDbTest001_10 );
-	AddTestStepL( new(ELeave) CCommDbTest002_01 );
-	AddTestStepL( new(ELeave) CCommDbTest003_01 );
-	AddTestStepL( new(ELeave) CCommDbTest003_02 );
-	AddTestStepL( new(ELeave) CCommDbTest003_03 );
-	AddTestStepL( new(ELeave) CCommDbTest003_04 );
-	AddTestStepL( new(ELeave) CCommDbTest003_05 );
-	AddTestStepL( new(ELeave) CCommDbTest003_06 );
-	AddTestStepL( new(ELeave) CCommDbTest003_07 );
-	AddTestStepL( new(ELeave) CCommDbTest003_08 );
-	AddTestStepL( new(ELeave) CCommDbTest004_01 );
-	AddTestStepL( new(ELeave) CCommDbTest004_02 );
-	AddTestStepL( new(ELeave) CCommDbTest004_03 );
-	AddTestStepL( new(ELeave) CCommDbTest004_04 );
-	AddTestStepL( new(ELeave) CCommDbTest004_05 );
-	AddTestStepL( new(ELeave) CCommDbTest004_06 );
-	AddTestStepL( new(ELeave) CCommDbTest005_01 );
-	AddTestStepL( new(ELeave) CCommDbTest005_02 );
-	AddTestStepL( new(ELeave) CCommDbTest005_03 );
-	AddTestStepL( new(ELeave) CCommDbTest005_04 );
-	AddTestStepL( new(ELeave) CCommDbTest006_01 );
-	AddTestStepL( new(ELeave) CCommDbTest006_02 );
-	AddTestStepL( new(ELeave) CCommDbTest006_03 );
-	AddTestStepL( new(ELeave) CCommDbTest006_04 );
-	AddTestStepL( new(ELeave) CCommDbTest006_05 );
-	AddTestStepL( new(ELeave) CCommDbTest007_01 );
-	AddTestStepL( new(ELeave) CCommDbTest007_02 );
-	AddTestStepL( new(ELeave) CCommDbTest007_03 );
-	AddTestStepL( new(ELeave) CCommDbTest007_04 );
-	AddTestStepL( new(ELeave) CCommDbTest007_05 );
-	AddTestStepL( new(ELeave) CCommDbTest007_06 );	
-	AddTestStepL( new(ELeave) CCommDbTest007_07 );
-	AddTestStepL( new(ELeave) CCommDbTest007_08 );
-	AddTestStepL( new(ELeave) CCommDbTest007_09 );
-	AddTestStepL( new(ELeave) CCommDbTest007_10 );
-	AddTestStepL( new(ELeave) CCommDbTest007_11 );
-	AddTestStepL( new(ELeave) CCommDbTest007_12 );
-	AddTestStepL( new(ELeave) CCommDbTest007_14 );
-	AddTestStepL( new(ELeave) CCommDbTest007_15 );
-	AddTestStepL( new(ELeave) CCommDbTest007_16 );
-	AddTestStepL( new(ELeave) CCommDbTest007_17 );
-	AddTestStepL( new(ELeave) CCommDbTest007_18 );
-	AddTestStepL( new(ELeave) CCommDbTest007_19 );
-	AddTestStepL( new(ELeave) CCommDbTest007_20 );
-	AddTestStepL( new(ELeave) CCommDbTest008_01 );
-	AddTestStepL( new(ELeave) CCommDbTest008_02 );
-	AddTestStepL( new(ELeave) CCommDbTest008_03 );
-	AddTestStepL( new(ELeave) CCommDbTest008_04 );
-	AddTestStepL( new(ELeave) CCommDbTest009_01 );
-	AddTestStepL( new(ELeave) CCommDbTest009_02 );
-	AddTestStepL( new(ELeave) CCommDbTest009_03 );
-	AddTestStepL( new(ELeave) CCommDbTest009_04 );
-	AddTestStepL( new(ELeave) CCommDbTest009_05 );
-	AddTestStepL( new(ELeave) CCommDbTest009_06 );
-	AddTestStepL( new(ELeave) CCommDbTest009_07 );
-	AddTestStepL( new(ELeave) CCommDbTest009_08 );
-	AddTestStepL( new(ELeave) CCommDbTest009_09 );
-	AddTestStepL( new(ELeave) CCommDbTest009_10 );
-	AddTestStepL( new(ELeave) CCommDbTest009_11 );
-	AddTestStepL( new(ELeave) CCommDbTest009_12 );
-	AddTestStepL( new(ELeave) CCommDbTest009_13 );
-	AddTestStepL( new(ELeave) CCommDbTest009_14 );
-	AddTestStepL( new(ELeave) CCommDbTest009_15 );
-	AddTestStepL( new(ELeave) CCommDbTest009_16 );
-	AddTestStepL( new(ELeave) CCommDbTest009_17 );
-	AddTestStepL( new(ELeave) CCommDbTest009_18 );
-	AddTestStepL( new(ELeave) CCommDbTest009_19 );
-	AddTestStepL( new(ELeave) CCommDbTest009_20 );
-	AddTestStepL( new(ELeave) CCommDbTest009_21 );
-	AddTestStepL( new(ELeave) CCommDbTest010_01 );
-	AddTestStepL( new(ELeave) CCommDbTest010_02 );
-	AddTestStepL( new(ELeave) CCommDbTest010_03 );
-	AddTestStepL( new(ELeave) CCommDbTest010_04 );
-	AddTestStepL( new(ELeave) CCommDbTest010_05 );
-	AddTestStepL( new(ELeave) CCommDbTest011_01 );
-	AddTestStepL( new(ELeave) CCommDbTest011_02 );
-	AddTestStepL( new(ELeave) CCommDbTest011_03 );
-	AddTestStepL( new(ELeave) CCommDbTest011_04 );
-	AddTestStepL( new(ELeave) CCommDbTest012_01 );
-	AddTestStepL( new(ELeave) CCommDbTest012_02 );
-	AddTestStepL( new(ELeave) CCommDbTest012_03 );
-	AddTestStepL( new(ELeave) CCommDbTest012_04 );
-	AddTestStepL( new(ELeave) CCommDbTest012_05 );
-	AddTestStepL( new(ELeave) CCommDbTest012_06 );
-	AddTestStepL( new(ELeave) CCommDbTest012_07 );
-	AddTestStepL( new(ELeave) CCommDbTest013_01 );
-	AddTestStepL( new(ELeave) CCommDbTest013_02 );
-	AddTestStepL( new(ELeave) CCommDbTest013_03 );
-	AddTestStepL( new(ELeave) CCommDbTest013_04 );
-	AddTestStepL( new(ELeave) CCommDbTest014_01 );
-	AddTestStepL( new(ELeave) CCommDbTest014_02 );
-	AddTestStepL( new(ELeave) CCommDbTest014_03 );
-	AddTestStepL( new(ELeave) CCommDbTest014_04 );
-	AddTestStepL( new(ELeave) CCommDbTest015_01 );
-	AddTestStepL( new(ELeave) CCommDbTest015_02 );
-	AddTestStepL( new(ELeave) CCommDbTest015_03 );
-	AddTestStepL( new(ELeave) CCommDbTest015_04 );
-	AddTestStepL( new(ELeave) CCommDbTest015_05 );
-	AddTestStepL( new(ELeave) CCommDbTest015_06 );
-	AddTestStepL( new(ELeave) CCommDbTest015_07 );
-	AddTestStepL( new(ELeave) CCommDbTest015_08 );
-	AddTestStepL( new(ELeave) CCommDbTest015_09 );
-	AddTestStepL( new(ELeave) CCommDbTest015_10 );
-	AddTestStepL( new(ELeave) CCommDbTest015_11 );
-	AddTestStepL( new(ELeave) CCommDbTest015_12 );
-	AddTestStepL( new(ELeave) CCommDbTest015_13 );
-	AddTestStepL( new(ELeave) CCommDbTest015_14 );
-	AddTestStepL( new(ELeave) CCommDbTest015_15 );
-	AddTestStepL( new(ELeave) CCommDbTest015_16 );
-	AddTestStepL( new(ELeave) CCommDbTest016_01 );
-	AddTestStepL( new(ELeave) CCommDbTest016_02 );
-	AddTestStepL( new(ELeave) CCommDbTest016_04 );
-	AddTestStepL( new(ELeave) CCommDbTest016_05 );
-	AddTestStepL( new(ELeave) CCommDbTest016_07 );
-	AddTestStepL( new(ELeave) CCommDbTest016_08 );
-	AddTestStepL( new(ELeave) CCommDbTest016_09 ); 
-	AddTestStepL( new(ELeave) CCommDbTest017_01 ); 
-	AddTestStepL( new(ELeave) CCommDbTest017_02 ); 
-	AddTestStepL( new(ELeave) CCommDbTest017_03 ); 
-	AddTestStepL( new(ELeave) CCommDbTest017_04 ); 
-	AddTestStepL( new(ELeave) CCommDbTest017_05 ); 
-	AddTestStepL( new(ELeave) CCommDbTest017_06 ); 
-	AddTestStepL( new(ELeave) CCommDbTest017_07 ); 
-	AddTestStepL( new(ELeave) CCommDbTest018_01 ); 
-	AddTestStepL( new(ELeave) CCommDbTest018_02 ); 
-	AddTestStepL( new(ELeave) CCommDbTest018_03 ); 
-	AddTestStepL( new(ELeave) CCommDbTest018_04 ); 
-	AddTestStepL( new(ELeave) CCommDbTest018_05 );
-	AddTestStepL( new(ELeave) CCommDbTest018_06 );
-	AddTestStepL( new(ELeave) CCommDbTest018_07 );
-	AddTestStepL( new(ELeave) CCommDbTest018_08 );
-	AddTestStepL( new(ELeave) CCommDbTest019_01 ); 
-	AddTestStepL( new(ELeave) CCommDbTest019_02 ); 
-	AddTestStepL( new(ELeave) CCommDbTest019_03 ); 
-	AddTestStepL( new(ELeave) CCommDbTest019_04 ); 
-	AddTestStepL( new(ELeave) CCommDbTest019_05 ); 
-	AddTestStepL( new(ELeave) CCommDbTest019_06 ); 
-	AddTestStepL( new(ELeave) CCommDbTest019_07 ); 
-	AddTestStepL( new(ELeave) CCommDbTest019_08 );
-	AddTestStepL( new(ELeave) CCommDbTest019_09 );
-	AddTestStepL( new(ELeave) CCommDbTest019_10 );
-	AddTestStepL( new(ELeave) CCommDbTest019_11 );
-	AddTestStepL( new(ELeave) CCommDbTest019_12 );
-	AddTestStepL( new(ELeave) CCommDbTest019_13 );
-	AddTestStepL( new(ELeave) CCommDbTest019_14 );
-	AddTestStepL( new(ELeave) CCommDbTest020_01 );
-	AddTestStepL( new(ELeave) CCommDbTest020_02 );
-	AddTestStepL( new(ELeave) CCommDbTest020_03 );
-	AddTestStepL( new(ELeave) CCommDbTest020_04 );
-	AddTestStepL( new(ELeave) CCommDbTest020_05 );
-	AddTestStepL( new(ELeave) CCommDbTest020_06 );
-	AddTestStepL( new(ELeave) CCommDbTest020_07 );
-	AddTestStepL( new(ELeave) CCommDbTest020_08 );
-	AddTestStepL( new(ELeave) CCommDbTest021_01 );
-	AddTestStepL( new(ELeave) CCommDbTest021_02 );
-	AddTestStepL( new(ELeave) CCommDbTest021_03 );
-	AddTestStepL( new(ELeave) CCommDbTest021_04 );
-	AddTestStepL( new(ELeave) CCommDbTest021_05 );
-	AddTestStepL( new(ELeave) CCommDbTest022_01 );
-	AddTestStepL( new(ELeave) CCommDbTest022_02 );
-	AddTestStepL( new(ELeave) CCommDbTest022_03 );
-	AddTestStepL( new(ELeave) CCommDbTest022_04 );
-	AddTestStepL( new(ELeave) CCommDbTest022_05 );
-	AddTestStepL( new(ELeave) CCommDbTest022_06 );
-	AddTestStepL( new(ELeave) CCommDbTest022_07 );
-	AddTestStepL( new(ELeave) CCommDbTest022_08 );
-	AddTestStepL( new(ELeave) CCommDbTest022_09 );
-	AddTestStepL( new(ELeave) CCommDbTest022_10 );
-	AddTestStepL( new(ELeave) CCommDbTest022_11 );
-	AddTestStepL( new(ELeave) CCommDbTest022_12 );
-	AddTestStepL( new(ELeave) CCommDbTest022_13 );
-	AddTestStepL( new(ELeave) CCommDbTest022_14 );
-	AddTestStepL( new(ELeave) CCommDbTest022_16 );
-	AddTestStepL( new(ELeave) CCommDbTest022_17 );
-	AddTestStepL( new(ELeave) CCommDbTest022_18 );
-	AddTestStepL( new(ELeave) CCommDbTest022_19 );
-	AddTestStepL( new(ELeave) CCommDbTest022_20 );
-	AddTestStepL( new(ELeave) CCommDbTest022_21 );
-	AddTestStepL( new(ELeave) CCommDbTest022_22 );
-	AddTestStepL( new(ELeave) CCommDbTest022_23 );
-	AddTestStepL( new(ELeave) CCommDbTest022_24 );
-	AddTestStepL( new(ELeave) CCommDbTest022_25 );
-	AddTestStepL( new(ELeave) CCommDbTest022_26 );
-	AddTestStepL( new(ELeave) CCommDbTest022_27 );
-	AddTestStepL( new(ELeave) CCommDbTest022_28 );
-	AddTestStepL( new(ELeave) CCommDbTest022_29 );
-	AddTestStepL( new(ELeave) CCommDbTest022_30 );
-	AddTestStepL( new(ELeave) CCommDbTest023_01 );
-	AddTestStepL( new(ELeave) CCommDbTest023_02 );
-	AddTestStepL( new(ELeave) CCommDbTest023_03 );
-	AddTestStepL( new(ELeave) CCommDbTest023_04 );
-	AddTestStepL( new(ELeave) CCommDbTest023_05 );
-	AddTestStepL( new(ELeave) CCommDbTest023_06 );
-	AddTestStepL( new(ELeave) CCommDbTest024_01 );
-	AddTestStepL( new(ELeave) CCommDbTest024_02 );
-	AddTestStepL( new(ELeave) CCommDbTest024_03 );
-	AddTestStepL( new(ELeave) CCommDbTest024_04 );
-	AddTestStepL( new(ELeave) CCommDbTest024_05 );
-	AddTestStepL( new(ELeave) CCommDbTest024_06 );
-	AddTestStepL( new(ELeave) CCommDbTest024_07 );
-	AddTestStepL( new(ELeave) CCommDbTest024_08 );
-	AddTestStepL( new(ELeave) CCommDbTest024_09 );
-	AddTestStepL( new(ELeave) CCommDbTest025_01 );
-	AddTestStepL( new(ELeave) CCommDbTest025_02 );
-	AddTestStepL( new(ELeave) CCommDbTest026_01 );
-	AddTestStepL( new(ELeave) CCommDbTest026_02 );
-	AddTestStepL( new(ELeave) CCommDbTest026_03 );
-	AddTestStepL( new(ELeave) CCommDbTest026_04 );
-	AddTestStepL( new(ELeave) CCommDbTest026_05 );
-	AddTestStepL( new(ELeave) CCommDbTest026_06 );
-	AddTestStepL( new(ELeave) CCommDbTest026_07 );
-	AddTestStepL( new(ELeave) CCommDbTest026_08 );
-	AddTestStepL( new(ELeave) CCommDbTest026_09 );
-	AddTestStepL( new(ELeave) CCommDbTest026_10 );
-	AddTestStepL( new(ELeave) CCommDbTest026_11 );
-	AddTestStepL( new(ELeave) CCommDbTest026_12 );
-	AddTestStepL( new(ELeave) CCommDbTest026_13 );
-	AddTestStepL( new(ELeave) CCommDbTest026_14 );
-	AddTestStepL( new(ELeave) CCommDbTest026_15 );
-	AddTestStepL( new(ELeave) CCommDbTest026_16 );
-	AddTestStepL( new(ELeave) CCommDbTest027_01 );
-	AddTestStepL( new(ELeave) CCommDbTest027_02 );
-	AddTestStepL( new(ELeave) CCommDbTest028_01 );
-	AddTestStepL( new(ELeave) CCommDbTest028_02 );
-	AddTestStepL( new(ELeave) CCommDbTest028_03 );
-	AddTestStepL( new(ELeave) CCommDbTest028_04 );
-	AddTestStepL( new(ELeave) CCommDbTest028_05 );
-	AddTestStepL( new(ELeave) CCommDbTest028_06 );
-	AddTestStepL( new(ELeave) CCommDbTest028_07 );
-	AddTestStepL( new(ELeave) CCommDbTest029_01 );
-	AddTestStepL( new(ELeave) CCommDbTest029_02 );
-	AddTestStepL( new(ELeave) CCommDbTest029_03 );
-	AddTestStepL( new(ELeave) CCommDbTest029_04 );
-	AddTestStepL( new(ELeave) CCommDbTest030_01 );
-	AddTestStepL( new(ELeave) CCommDbTest030_02 );
-	AddTestStepL( new(ELeave) CCommDbTest030_03 ); 
-	AddTestStepL( new(ELeave) CCommDbTest031_01 );
-	AddTestStepL( new(ELeave) CCommDbTest031_02 );
-	AddTestStepL( new(ELeave) CCommDbTest031_03 );
-	AddTestStepL( new(ELeave) CCommDbTest031_04 );
-	AddTestStepL( new(ELeave) CCommDbTest031_05 );
-	AddTestStepL( new(ELeave) CCommDbTest032_01 );
-	AddTestStepL( new(ELeave) CCommDbTest032_02 );
-	AddTestStepL( new(ELeave) CCommDbTest032_03 );
-	AddTestStepL( new(ELeave) CCommDbTest032_04 );
-	AddTestStepL( new(ELeave) CCommDbTest032_05 );
-	AddTestStepL( new(ELeave) CCommDbTest033_01 );
-	AddTestStepL( new(ELeave) CCommDbTest033_02 );
-	AddTestStepL( new(ELeave) CCommDbTest033_03 );
-	AddTestStepL( new(ELeave) CCommDbTest033_04 );
-	AddTestStepL( new(ELeave) CCommDbTest033_05 );
-	AddTestStepL( new(ELeave) CCommDbTest033_06 );
-	AddTestStepL( new(ELeave) CCommDbTest033_07 );
-	AddTestStepL( new(ELeave) CCommDbTest033_08 );
-	AddTestStepL( new(ELeave) CCommDbTest033_09 );
-	AddTestStepL( new(ELeave) CCommDbTest034_01 );
-	AddTestStepL( new(ELeave) CCommDbTest034_02 );
-	AddTestStepL( new(ELeave) CCommDbTest034_03 );
-	AddTestStepL( new(ELeave) CCommDbTest034_04 );
-	AddTestStepL( new(ELeave) CCommDbTest034_05 );
-	AddTestStepL( new(ELeave) CCommDbTest034_06 );
-
-	AddTestStepL( new(ELeave) CCommDbTest035_01 );
-	AddTestStepL( new(ELeave) CCommDbTest035_02 );
-	AddTestStepL( new(ELeave) CCommDbTest035_03 );
-	AddTestStepL( new(ELeave) CCommDbTest035_04 );
-	AddTestStepL( new(ELeave) CCommDbTest036_01 );
-	AddTestStepL( new(ELeave) CCommDbTest036_02 );
-	AddTestStepL( new(ELeave) CCommDbTest036_03 );
-	AddTestStepL( new(ELeave) CCommDbTest036_04 );
-	AddTestStepL( new(ELeave) CCommDbTest036_05 );
-	AddTestStepL( new(ELeave) CCommDbTest036_06 );
-	AddTestStepL( new(ELeave) CCommDbTest036_07 );
-	AddTestStepL( new(ELeave) CCommDbTest036_08 );
-	AddTestStepL( new(ELeave) CCommDbTest036_09 );
-	AddTestStepL( new(ELeave) CCommDbTest036_10 );
-	AddTestStepL( new(ELeave) CCommDbTest036_11 );
-	AddTestStepL( new(ELeave) CCommDbTest036_12 );
-	AddTestStepL( new(ELeave) CCommDbTest036_13 );
-	AddTestStepL( new(ELeave) CCommDbTest036_14 );
-	AddTestStepL( new(ELeave) CCommDbTest036_15 );
-	AddTestStepL( new(ELeave) CCommDbTest036_16 );
-	AddTestStepL( new(ELeave) CCommDbTest036_17 );
-	AddTestStepL( new(ELeave) CCommDbTest036_18 );
-	AddTestStepL( new(ELeave) CCommDbTest037_01 );
-	AddTestStepL( new(ELeave) CCommDbTest037_02 );
-	AddTestStepL( new(ELeave) CCommDbTest037_03 );
-	AddTestStepL( new(ELeave) CCommDbTest038_01 );
-	AddTestStepL( new(ELeave) CCommDbTest038_02 );
-	AddTestStepL( new(ELeave) CCommDbTest038_03 );
-	AddTestStepL( new(ELeave) CCommDbTest039_01 );
-	AddTestStepL( new(ELeave) CCommDbTest039_02 );
-	AddTestStepL( new(ELeave) CCommDbTest040_01 );
-	AddTestStepL( new(ELeave) CCommDbTest040_02 );
-	AddTestStepL( new(ELeave) CCommDbTest040_03 );
-	AddTestStepL( new(ELeave) CCommDbTest041_01 );
-	AddTestStepL( new(ELeave) CCommDbTest041_02 );
-	AddTestStepL( new(ELeave) CCommDbTest041_03 );
-	AddTestStepL( new(ELeave) CCommDbTest041_04 );
-	AddTestStepL( new(ELeave) CCommDbTest041_05 );
-	AddTestStepL( new(ELeave) CCommDbTest041_06 );
-	AddTestStepL( new(ELeave) CCommDbTest041_07 );
-	AddTestStepL( new(ELeave) CCommDbTest041_08 );
-	AddTestStepL( new(ELeave) CCommDbTest041_09 );
-	AddTestStepL( new(ELeave) CCommDbTest041_10 );
-	AddTestStepL( new(ELeave) CCommDbTest041_11 );
-	AddTestStepL( new(ELeave) CCommDbTest041_12 );
-	AddTestStepL( new(ELeave) CCommDbTest041_13 );
-	AddTestStepL( new(ELeave) CCommDbTest041_14 );
-	AddTestStepL( new(ELeave) CCommDbTest041_15 );
-	AddTestStepL( new(ELeave) CCommDbTest041_16 );
-	AddTestStepL( new(ELeave) CCommDbTest041_17 );
-	AddTestStepL( new(ELeave) CCommDbTest041_18 );
-	AddTestStepL( new(ELeave) CCommDbTest041_19 );
-	AddTestStepL( new(ELeave) CCommDbTest041_20 );
-	AddTestStepL( new(ELeave) CCommDbTest041_21 );
-	AddTestStepL( new(ELeave) CCommDbTest041_22 );
-	AddTestStepL( new(ELeave) CCommDbTest041_23 );
-	AddTestStepL( new(ELeave) CCommDbTest041_24 );
-	AddTestStepL( new(ELeave) CCommDbTest041_25 );
-	AddTestStepL( new(ELeave) CCommDbTest041_26 );
-	AddTestStepL( new(ELeave) CCommDbTest041_27 );
-	AddTestStepL( new(ELeave) CCommDbTest041_28 );
-	AddTestStepL( new(ELeave) CCommDbTest041_29 );
-	AddTestStepL( new(ELeave) CCommDbTest041_30 );
-	AddTestStepL( new(ELeave) CCommDbTest041_31 );
-	AddTestStepL( new(ELeave) CCommDbTest041_32 );
-	AddTestStepL( new(ELeave) CCommDbTest041_33 );	
-	AddTestStepL( new(ELeave) CCommDbTest041_34 );
-	AddTestStepL( new(ELeave) CCommDbTest042_01 );
-	AddTestStepL( new(ELeave) CCommDbTest042_02 );
-	AddTestStepL( new(ELeave) CCommDbTest042_03 );
-	AddTestStepL( new(ELeave) CCommDbTest043_01 );
-	AddTestStepL( new(ELeave) CCommDbTest043_02 );
-	AddTestStepL( new(ELeave) CCommDbTest043_03 );
-	AddTestStepL( new(ELeave) CCommDbTest043_04 );
-	AddTestStepL( new(ELeave) CCommDbTest043_05 );
-	AddTestStepL( new(ELeave) CCommDbTest044_01 );
-	AddTestStepL( new(ELeave) CCommDbTest044_02 );
-	AddTestStepL( new(ELeave) CCommDbTest044_03 );
-	AddTestStepL( new(ELeave) CCommDbTest045_01 );
-	AddTestStepL( new(ELeave) CCommDbTest045_02 );
-	AddTestStepL( new(ELeave) CCommDbTest045_03 );
-	AddTestStepL( new(ELeave) CCommDbTest046_01 );
-	AddTestStepL( new(ELeave) CCommDbTest046_02 );
-	AddTestStepL( new(ELeave) CCommDbTest046_03 );
-	AddTestStepL( new(ELeave) CCommDbTest046_04 );
-	AddTestStepL( new(ELeave) CCommDbTest046_05 );
-	AddTestStepL( new(ELeave) CCommDbTest047_01 );
-	AddTestStepL( new(ELeave) CCommDbTest047_02 );
-	AddTestStepL( new(ELeave) CCommDbTest047_03 );
-	AddTestStepL( new(ELeave) CCommDbTest047_04 );
-	AddTestStepL( new(ELeave) CCommDbTest047_05 );
-	AddTestStepL( new(ELeave) CCommDbTest047_06 );
-	AddTestStepL( new(ELeave) CCommDbTest047_07 );
-	AddTestStepL( new(ELeave) CCommDbTest047_08 );
-	AddTestStepL( new(ELeave) CCommDbTest047_13 );
-	AddTestStepL( new(ELeave) CCommDbTest051_01 );
-	AddTestStepL( new(ELeave) CCommDbTest051_02 );
-	AddTestStepL( new(ELeave) CCommDbTest052_01 );
-	AddTestStepL( new(ELeave) CCommDbTest052_02 );
-	AddTestStepL( new(ELeave) CCommDbTest053_01 );
-	AddTestStepL( new(ELeave) CCommDbTest053_02 );
-	AddTestStepL( new(ELeave) CCommDbTest054_01 );
-	AddTestStepL( new(ELeave) CCommDbTest054_02 );
-	AddTestStepL( new(ELeave) CCommDbTest055_01 );
-	AddTestStepL( new(ELeave) CCommDbTest055_02 );
-	AddTestStepL( new(ELeave) CCommDbTest056_01 );
-	AddTestStepL( new(ELeave) CCommDbTest056_02 );
-	AddTestStepL( new(ELeave) CCommDbTest057_01 );
-	AddTestStepL( new(ELeave) CCommDbTest057_02 );
-	AddTestStepL( new(ELeave) CCommDbTest058_01 );
-	AddTestStepL( new(ELeave) CCommDbTest058_02 );
-	AddTestStepL( new(ELeave) CCommDbTest059_01 );
-	AddTestStepL( new(ELeave) CCommDbTest060_01 );
-	AddTestStepL( new(ELeave) CCommDbTest060_02 );
-	AddTestStepL( new(ELeave) CCommDbTest061_01 );
-	AddTestStepL( new(ELeave) CCommDbTest061_02 );
-	AddTestStepL( new(ELeave) CCommDbTest061_03 );
-	AddTestStepL( new(ELeave) CCommDbTest061_04 );
-	AddTestStepL( new(ELeave) CCommDbTest062_01 );
-	AddTestStepL( new(ELeave) CCommDbTest062_02 );
-	AddTestStepL( new(ELeave) CCommDbTest062_03 );
-	AddTestStepL( new(ELeave) CCommDbTest062_04 );
-	AddTestStepL( new(ELeave) CCommDbTest062_05 );
-	AddTestStepL( new(ELeave) CCommDbTest063_01 );
-	AddTestStepL( new(ELeave) CCommDbTest063_02 );
-	AddTestStepL( new(ELeave) CCommDbTest063_03 );
-	AddTestStepL( new(ELeave) CCommDbTest063_04 );
-	AddTestStepL( new(ELeave) CCommDbTest063_05 );
-	AddTestStepL( new(ELeave) CCommDbTest063_06 );
-	AddTestStepL( new(ELeave) CCommDbTest063_07 );
-	AddTestStepL( new(ELeave) CCommDbTest063_08 );
-	AddTestStepL( new(ELeave) CCommDbTest064_01 );
-	AddTestStepL( new(ELeave) CCommDbPreCopy );
-
-	// Ensure that the properties get created; normally the RootServer does this
-	CommsDat::CMDBSession* ptrCommsdatSession = NULL;
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	TRAPD(result, ptrCommsdatSession = CommsDat::CMDBSession::NewL(KCDVersion1_2));
-#else
-	TRAPD(result, ptrCommsdatSession = CommsDat::CMDBSession::NewL(KCDVersion1_1));
-#endif
-	if (result == KErrNone)
-		{
-		result = ptrCommsdatSession->PublishProperties();
-		delete ptrCommsdatSession;
-		}
-
-}
-
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/Ts_commdb.mmp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-// Copyright (c) 2001-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:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET        ts_commdb.dll
-TARGETTYPE    dll
-UID           0x1000008d 0x101F52C4
-VENDORID 0x70000001
-
-EPOCALLOWDLLDATA 
-
-SOURCEPATH    ../ts_commdb
-SOURCE        Testsuitecommdb.cpp
-SOURCE		  Teststepcommdb.cpp
-SOURCE		  step_001_01.cpp
-SOURCE		  step_002_01.cpp
-SOURCE		  Step_003_xx.cpp
-SOURCE		  step_004_xx.cpp
-SOURCE		  step_005_xx.cpp
-SOURCE		  step_006_xx.cpp
-SOURCE		  Step_007_xx.cpp
-SOURCE		  Step_008_xx.cpp
-SOURCE		  Step_009_xx.cpp
-SOURCE		  Step_010_xx.cpp
-SOURCE		  Step_011_xx.cpp
-SOURCE		  Step_012_xx.cpp
-SOURCE		  Step_013_xx.cpp
-SOURCE		  Step_014_xx.cpp
-SOURCE		  Step_015_xx.cpp
-SOURCE		  Step_016_xx.cpp
-SOURCE		  Step_017_xx.cpp
-SOURCE        	  Step_018_xx.cpp
-SOURCE        	  Step_019_xx.cpp
-SOURCE        	  Step_020_xx.cpp
-SOURCE        	  Step_021_xx.cpp
-SOURCE        	  Step_022_xx.cpp
-SOURCE	        Step_023_xx.cpp
-SOURCE	        Step_024_xx.cpp
-SOURCE        	  Step_025_xx.cpp
-SOURCE		  Step_026_xx.cpp
-SOURCE		  Step_027_xx.cpp
-SOURCE		  Step_028_xx.cpp
-SOURCE		  Step_029_xx.cpp
-SOURCE		  Step_030_xx.cpp
-SOURCE		  Step_031_xx.cpp
-SOURCE		  Step_032_xx.cpp
-SOURCE		  Step_033_xx.cpp
-SOURCE		  Step_034_xx.cpp
-SOURCE		  Step_035_xx.cpp
-SOURCE		  Step_036_xx.cpp
-SOURCE		  Step_037_xx.cpp
-SOURCE		  Step_038_xx.cpp
-SOURCE		  Step_039_xx.cpp
-SOURCE		  Step_040_xx.cpp
-SOURCE		  Step_041_xx.cpp
-SOURCE		  Step_042_xx.cpp
-SOURCE		  Step_043_xx.cpp
-SOURCE		  Step_044_xx.cpp
-SOURCE		  Step_045_xx.cpp
-SOURCE		  Step_046_xx.cpp
-SOURCE              Step_047_xx.cpp
-SOURCE		  step_051_xx.cpp
-SOURCE		  step_052_xx.cpp
-SOURCE		  step_053_xx.cpp
-SOURCE		  step_054_xx.cpp
-SOURCE		  step_055_xx.cpp
-SOURCE		  step_056_xx.cpp
-SOURCE		  step_057_xx.cpp
-SOURCE		  step_058_xx.cpp
-SOURCE		  step_059_xx.cpp
-SOURCE		  Step_061_xx.cpp
-SOURCE		  Step_062_xx.cpp
-SOURCE		  step_063_xx.cpp
-SOURCE		  Step_064_xx.cpp
-SOURCE		CommDbPreCopy.cpp
-
-USERINCLUDE   ../ts_commdb
-USERINCLUDE   ../commdbshim/INC
-
-#ifndef SYMBIAN_OLD_EXPORT_LOCATION
-//In the new nev the ProtectDB.h and the protectcpdb.h headers are not exported, so need to be user includes.
-USERINCLUDE   ../commdbshim/ProtectedDB
-#endif
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE /epoc32/include
-#else
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-#endif
-
-LIBRARY       euser.lib commdb.lib
-
-
-LIBRARY       efsrv.lib
-LIBRARY	      integrationtestutils.lib estor.lib bafl.lib
-
-       LIBRARY	      edbms.lib
-
-       LIBRARY	      commsdat.lib
-
-
-CAPABILITY ALL -Tcb
-
-SMPSAFE
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/008.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-//
-// 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:
-//
-//
-PRINT example CommDb test
-PRINT 
-//
-LOAD_SUITE TS_CommDb.dll
-
-MULTITHREAD
-
-RUN_TEST_STEP -1, TS_CommDb,step_008_01
-TEST_COMPLETE 
-
-RUN_TEST_STEP -1, TS_CommDb,step_008_02
-TEST_COMPLETE 
-
-RUN_TEST_STEP -1, TS_CommDb,step_008_03
-TEST_COMPLETE 
-
-RUN_TEST_STEP -1, TS_CommDb,step_008_04
-TEST_COMPLETE 
\ No newline at end of file
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/020.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>record1</Name>
-        <IAPService>DialOutISP.record1</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>record2</Name>
-        <IAPService>DialOutISP.record2</IAPService>
-        <ChargecardRef>Chargecard.Dummy Mercury Chargecard</ChargecardRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-</ModemBearerTable>
-
-<LANBearerTable>
-</LANBearerTable>
-
-<LANServiceTable>
-</LANServiceTable>
-
-<DialInISPTable>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="add">
-        <Name>record1</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfName>ppp</IfName>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>me</IfAuthName>
-        <IfAuthPass>wt</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>TRUE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>48</ChannelCoding>
-        <AIUR>9600</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>record2</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfName>ppp</IfName>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>fgh</IfAuthName>
-        <IfAuthPass>dfgb</IfAuthPass>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>TRUE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-    </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
-    <Chargecard operation="add">
-        <Name>Dummy BT Chargecard</Name>
-        <AccountNumber>144,12345678</AccountNumber>
-        <Pin>0000</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>HFG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-    <Chargecard operation="add">
-        <Name>Dummy Mercury Chargecard</Name>
-        <AccountNumber>0500800800,,12345678</AccountNumber>
-        <Pin>****</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>J,K,0FG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsBearer>2</SmsBearer>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>2</ConnectionAttempts>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-</DefaultGPRSTable>
-
-<ProxyTable>
-</ProxyTable>
-
-<LocationTable>
-    <Location operation="add">
-        <Name>Default Location</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-        <DialOutCode>9,</DialOutCode>
-    </Location>
-    <Location operation="add">
-        <Name>Mobile</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-</LocationTable>
-
-<SecureSocketTable>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/021.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>record1</Name>
-        <IAPService>DialOutISP.record1</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>record2</Name>
-        <IAPService>DialOutISP.record2</IAPService>
-        <ChargecardRef>Chargecard.Dummy Mercury Chargecard</ChargecardRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-</ModemBearerTable>
-
-<LANBearerTable>
-</LANBearerTable>
-
-<LANServiceTable>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="template">
-        <Name>Default Dial In ISP</Name> 
-        <UseLoginScript>FALSE</UseLoginScript> 
-        <IpAddrFromServer>TRUE</IpAddrFromServer> 
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer> 
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp> 
-        <EnableLCPExtension>FALSE</EnableLCPExtension> 
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth> 
-        <EnableSWComp>FALSE</EnableSWComp> 
-        <UseEdge>FALSE</UseEdge> 
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Record #1</Name> 
-        <UseLoginScript>FALSE</UseLoginScript> 
-        <IpAddrFromServer>TRUE</IpAddrFromServer> 
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer> 
-        <Authentication>0</Authentication> 
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp> 
-        <EnableLCPExtension>FALSE</EnableLCPExtension> 
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth> 
-        <EnableSWComp>FALSE</EnableSWComp> 
-        <BearerName>ASYNCHRONOUS</BearerName> 
-        <BearerSpeed>UNSPECIFIED</BearerSpeed> 
-        <BearerCE>UNSPECIFIED</BearerCE> 
-        <UseEdge>FALSE</UseEdge> 
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Record #2</Name> 
-        <UseLoginScript>FALSE</UseLoginScript> 
-        <IpAddrFromServer>FALSE</IpAddrFromServer> 
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer> 
-        <LoginScript>New Record</LoginScript> 
-        <Authentication>0</Authentication> 
-        <IfNetworks>ip</IfNetworks> 
-        <IpAddr>New Record</IpAddr> 
-        <IpNameServer1>New Record</IpNameServer1> 
-        <IpNameServer2>New Record</IpNameServer2> 
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp> 
-        <EnableLCPExtension>FALSE</EnableLCPExtension> 
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth> 
-        <EnableSWComp>FALSE</EnableSWComp> 
-        <BearerName>ASYNCHRONOUS</BearerName> 
-        <BearerSpeed>UNSPECIFIED</BearerSpeed> 
-        <BearerCE>UNSPECIFIED</BearerCE> 
-        <UseEdge>FALSE</UseEdge> 
-    </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="add">
-        <Name>record1</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfName>ppp</IfName>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>me</IfAuthName>
-        <IfAuthPass>wt</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>TRUE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>48</ChannelCoding>
-        <AIUR>9600</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>record2</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>435t</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfName>ppp</IfName>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>fgh</IfAuthName>
-        <IfAuthPass>dfgb</IfAuthPass>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>TRUE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-    </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
-    <Chargecard operation="add">
-        <Name>Dummy BT Chargecard</Name>
-        <AccountNumber>144,12345678</AccountNumber>
-        <Pin>0000</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>HFG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-    <Chargecard operation="add">
-        <Name>Dummy Mercury Chargecard</Name>
-        <AccountNumber>0500800800,,12345678</AccountNumber>
-        <Pin>****</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>J,K,0FG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsBearer>2</SmsBearer>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>2</ConnectionAttempts>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-</DefaultGPRSTable>
-
-<ProxyTable>
-</ProxyTable>
-
-<LocationTable>
-    <Location operation="add">
-        <Name>Default Location</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-        <DialOutCode>9,</DialOutCode>
-    </Location>
-    <Location operation="add">
-        <Name>Mobile</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-</LocationTable>
-
-<SecureSocketTable>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/022.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,819 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Record #1</Name>
-        <IAPService>DialOutISP.Record #1</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office Direct Dial</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #5</Name>
-        <IAPService>OutgoingGPRS.Record #5</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #2</Name>
-        <IAPService>DialOutISP.Record #2</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #3</Name>
-        <IAPService>DialInISP.Record #3</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Home</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #7</Name>
-        <IAPService>OutgoingGPRS.Record #5</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #4</Name>
-        <IAPService>DialInISP.Record #4</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #6</Name>
-        <IAPService>DialInISP.Record #4</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #9</Name>
-        <IAPService>IncomingGPRS.Record #9</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #10</Name>
-        <IAPService>IncomingGPRS.Record #10</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #11</Name>
-        <IAPService>LANService.Record #11</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #12</Name>
-        <IAPService>LANService.Record #12</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>0</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>Null Modem 115200bps</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>NTRASTSY</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageValidityPeriod>0</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
-    <LANBearer operation="add">
-        <Name>Dummy LAN Bearer</Name>
-        <Agent>PSD.agt</Agent>
-        <IfName>ppp</IfName>
-        <LDDName>Dummy LDD</LDDName>
-        <PDDName>Dummy PDD</PDDName>
-    </LANBearer>
-</LANBearerTable>
-
-<LANServiceTable>
-    <LANService operation="add">
-        <Name>Record #11</Name>
-        <IfNetworks>ip,ip6</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>194.72.6.1</IpGateway>
-        <IpAddr>192.168.0.100</IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.52</IpNameServer2>
-    </LANService>
-    <LANService operation="add">
-        <Name>Record #12</Name>
-        <IfNetworks>New Record</IfNetworks>
-        <IpNetMask>0.0.0.0</IpNetMask>
-        <IpGateway>0.0.0.0</IpGateway>
-        <IpAddr>0.0.0.0</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>0.0.0.0</IpNameServer1>
-        <IpNameServer2>0.0.0.0</IpNameServer2>
-    </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="template">
-        <Name>Default Dial In ISP</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Record #3</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Authentication>0</Authentication>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Record #4</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <LoginScript>New Record</LoginScript>
-        <Authentication>0</Authentication>
-        <IfNetworks>ip</IfNetworks>
-        <IpAddr>New Record</IpAddr>
-        <IpNameServer1>New Record</IpNameServer1>
-        <IpNameServer2>New Record</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="template">
-        <Name>Default Dial Out ISP</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>TRUE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Record #1</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>TRUE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND &quot;CLIENT&quot;+&lt;0x0d&gt;\nWAIT 3\n{\n&quot;SERVER&quot; OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>9600</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Record #2</Name>
-        <DialResolution>FALSE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <LoginScript>New Record</LoginScript>
-        <LoginName>New Record</LoginName>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>New Record</IfAuthName>
-        <IfAuthPass>New Record</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <IfCallbackType>IETF0</IfCallbackType>
-        <IfCallbackInfo>New Record</IfCallbackInfo>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpAddr>New Record</IpAddr>
-        <IpNameServer1>New Record</IpNameServer1>
-        <IpNameServer2>New Record</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>9600</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<ChargecardTable>
-    <Chargecard operation="add">
-        <Name>Dummy BT Chargecard</Name>
-        <AccountNumber>144,12345678</AccountNumber>
-        <Pin>0000</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>HFG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-    <Chargecard operation="add">
-        <Name>Dummy Mercury Chargecard</Name>
-        <AccountNumber>0500800800,,12345678</AccountNumber>
-        <Pin>****</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>J,K,0FG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable1</Name>
-        <Ranking>2</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>PROMPT</DialogPref>
-        <BearerSet>PSD</BearerSet>
-        <IAPRef>IAP.Record #5</IAPRef>
-    </ConnectionPreferences>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable2</Name>
-        <Ranking>0</Ranking>
-        <Direction>INCOMING</Direction>
-        <DialogPref>DONOTPROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Record #3</IAPRef>
-    </ConnectionPreferences>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable3</Name>
-        <Ranking>1</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>PROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Record #1</IAPRef>
-    </ConnectionPreferences>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsBearer>2</SmsBearer>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>2</ConnectionAttempts>
-        <ModemForDataAndFax>2</ModemForDataAndFax>
-        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
-        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
-        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.Intranet</DefaultNetwork>
-        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-    <IncomingGPRS operation="add">
-        <Name>Record #9</Name>
-        <APN>Test</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>0.0.0.0</PDPAddress>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>1</ReqPrecedence>
-        <ReqDelay>1</ReqDelay>
-        <ReqReliability>1</ReqReliability>
-        <ReqPeakThroughput>1</ReqPeakThroughput>
-        <ReqMeanThroughput>1</ReqMeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNameServer1>0.0.0.0</IpNameServer1>
-        <IpNameServer2>0.0.0.0</IpNameServer2>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </IncomingGPRS>
-    <IncomingGPRS operation="add">
-        <Name>Record #10</Name>
-        <APN>New Record</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>New Record</PDPAddress>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>1</ReqPrecedence>
-        <ReqDelay>1</ReqDelay>
-        <ReqReliability>1</ReqReliability>
-        <ReqPeakThroughput>1</ReqPeakThroughput>
-        <ReqMeanThroughput>1</ReqMeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <GprsUseEdge>TRUE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>-1</QosWarningTimeout>
-    </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="add">
-        <Name>Record #5</Name>
-        <APN>Test</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>2</ReqPrecedence>
-        <ReqDelay>4</ReqDelay>
-        <ReqReliability>3</ReqReliability>
-        <ReqPeakThroughput>3</ReqPeakThroughput>
-        <ReqMeanThroughput>31</ReqMeanThroughput>
-        <MinPrecedence>2</MinPrecedence>
-        <MinDelay>4</MinDelay>
-        <MinReliability>3</MinReliability>
-        <MinPeakThroughput>3</MinPeakThroughput>
-        <MinMeanThroughput>31</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.51</IpNameServer2>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>Record #6</Name>
-        <APN>New Record</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>New Record</PDPAddress>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>2</ReqPrecedence>
-        <ReqDelay>4</ReqDelay>
-        <ReqReliability>3</ReqReliability>
-        <ReqPeakThroughput>3</ReqPeakThroughput>
-        <ReqMeanThroughput>31</ReqMeanThroughput>
-        <MinPrecedence>2</MinPrecedence>
-        <MinDelay>4</MinDelay>
-        <MinReliability>3</MinReliability>
-        <MinPeakThroughput>3</MinPeakThroughput>
-        <MinMeanThroughput>31</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <GprsUseEdge>TRUE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>-1</QosWarningTimeout>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-    <DefaultGPRS operation="add">
-        <Name>Dummy Default GPRS Settings</Name>
-        <APN>Access point name</APN>
-        <PDPType>IPV6</PDPType>
-        <PDPAddress>www.wid.com</PDPAddress>
-        <Usage>1</Usage>
-        <Precedence>1</Precedence>
-        <Delay>1</Delay>
-        <Reliability>1</Reliability>
-        <PeakThroughput>1</PeakThroughput>
-        <MeanThroughput>1</MeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-    </DefaultGPRS>
-</DefaultGPRSTable>
-
-<ProxyTable>
-    <Proxy operation="add">
-        <Name>ProxyTable1</Name>
-        <ISPRef>DialOutISP.Record #1</ISPRef>
-        <UseProxyServer>TRUE</UseProxyServer>
-        <ProtocolName>http</ProtocolName>
-        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
-        <PortNumber>80</PortNumber>
-        <Exceptions>www.dummyproxy.com/exception</Exceptions>
-    </Proxy>
-</ProxyTable>
-
-<LocationTable>
-    <Location operation="template">
-        <Name>Default Location</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-        <DialOutCode>9,</DialOutCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office Direct Dial</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-    </Location>
-    <Location operation="add">
-        <Name>Mobile</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Home</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>TRUE</UsePulseDial>
-        <WaitForDialTone>TRUE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>181</AreaCode>
-    </Location>
-</LocationTable>
-
-<SecureSocketTable>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable1</Name>
-        <ProtocolName>ssl3.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable2</Name>
-        <ProtocolName>tls1.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-    <WAPAccessPoint operation="template">
-        <Name>Default Dial In ISP</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-    </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-    <WAPIPBearer operation="template">
-        <Name>WAPIPBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.-1</IAPRef>
-        <ProxyPortNumber>0</ProxyPortNumber>
-    </WAPIPBearer>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-    <WAPSMSBearer operation="template">
-        <Name>WAPSMSBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-    </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/022_30.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,387 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Telia online</Name>
-		<IAPService>OutgoingGPRS.Default Outgoing Gprs</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps PSD</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::5</PortName>
-        <ControlChannelPortName>COMM::5</ControlChannelPortName>
-        <TSYName>trpat</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>0</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>Null Modem 115200bps PSD</Name>
-        <Agent>PSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::5</PortName>
-        <ControlChannelPortName>COMM::5</ControlChannelPortName>
-        <TSYName>SEMC</TSYName>
-        <CSYName>CAIFMUX</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>52</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>635040</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>600</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
-</LANBearerTable>
-
-<LANServiceTable>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="add">
-        <Name>Record #1</Name> 
-        <UseLoginScript>FALSE</UseLoginScript> 
-        <IpAddrFromServer>TRUE</IpAddrFromServer> 
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer> 
-        <Authentication>0</Authentication> 
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp> 
-        <EnableLCPExtension>FALSE</EnableLCPExtension> 
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth> 
-        <EnableSWComp>FALSE</EnableSWComp> 
-        <BearerName>ASYNCHRONOUS</BearerName> 
-        <BearerSpeed>UNSPECIFIED</BearerSpeed> 
-        <BearerCE>UNSPECIFIED</BearerCE> 
-        <UseEdge>FALSE</UseEdge> 
-    </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>DefaultRecordName-1</Name>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsBearer>2</SmsBearer>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <GPRSClassCBearer>GPRS</GPRSClassCBearer>
-        <ConnectionAttempts>1</ConnectionAttempts>
-        <ModemForDataAndFax>2</ModemForDataAndFax>
-        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
-        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
-        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
-        <MaxMBufHeap>2</MaxMBufHeap>
-        <DefaultNetwork>Network.Intranet</DefaultNetwork>
-        <BearerAvailabilityCheckTSY>SEMC</BearerAvailabilityCheckTSY>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="template">
-        <Name>Default Outgoing Gprs</Name>
-        <APN>www.sonyericsson.com</APN>
-        <PDPType>IPV4</PDPType>
-        <ReqPrecedence>1</ReqPrecedence>
-        <ReqDelay>1</ReqDelay>
-        <ReqReliability>1</ReqReliability>
-        <ReqPeakThroughput>1</ReqPeakThroughput>
-        <ReqMeanThroughput>1</ReqMeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpAddr>0.0.0.0</IpAddr>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <IpNameServer1>0.0.0.0</IpNameServer1>
-        <IpNameServer2>0.0.0.0</IpNameServer2>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>1000000</QosWarningTimeout>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-</DefaultGPRSTable>
-
-<ProxyTable>
-</ProxyTable>
-
-<LocationTable>
-    <Location operation="template">
-        <Name>Default Location</Name>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-    </Location>
-    <Location operation="add">
-        <Name>Office</Name>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-        <DialOutCode>9</DialOutCode>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-    </Location>
-</LocationTable>
-
-<SecureSocketTable>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-    <WAPAccessPoint operation="template">
-        <Name>Default Dial In ISP</Name> 
-        <CurrentBearer>WAPIPBearer</CurrentBearer> 
-    </WAPAccessPoint>
-    <WAPAccessPoint operation="add">
-        <Name>Dummy WAP Settings</Name> 
-        <CurrentBearer>WAPIPBearer</CurrentBearer> 
-        <StartPage>www.wapstart.com</StartPage> 
-    </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-    <WAPSMSBearer operation="template">
-        <Name>WAPSMSBearerTable1</Name> 
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint> 
-        <WSPOption>CONNECTIONLESS</WSPOption> 
-        <Security>FALSE</Security> 
-    </WAPSMSBearer>
-    <WAPSMSBearer operation="add">
-        <Name>WAPSMSBearerTable2</Name> 
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint> 
-        <GatewayAddress>+442079460221</GatewayAddress> 
-        <WSPOption>CONNECTIONORIENTED</WSPOption> 
-        <Security>FALSE</Security> 
-        <ServiceCentreAddress>+442079460223</ServiceCentreAddress> 
-    </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-<WLANServiceExtensionTable>
-</WLANServiceExtensionTable>
-
-<PANServiceExtensionsTable>
-</PANServiceExtensionsTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/023.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,510 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
-
- -->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Record #1</Name>
-        <IAPService>DialOutISP.Record #1</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #2</Name>
-        <IAPService>DialOutISP.Record #2</IAPService>
-        <ChargecardRef>Chargecard.Dummy Mercury Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #3</Name>
-        <IAPService>DialInISP.Record #1</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #4</Name>
-        <IAPService>DialInISP.Record #2</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #5</Name>
-        <IAPService>OutgoingGPRS.Record #1</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #6</Name>
-        <IAPService>OutgoingGPRS.Record #2</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #7</Name>
-        <IAPService>OutgoingGPRS.Record #2</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #8</Name>
-        <IAPService>DialInISP.Record #2</IAPService>
-        <ChargecardRef>Chargecard.Dummy Mercury Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #9</Name>
-        <IAPService>IncomingGPRS.Record #1</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #10</Name>
-        <IAPService>IncomingGPRS.Record #2</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #11</Name>
-        <IAPService>LANService.Record #1</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #12</Name>
-        <IAPService>LANService.Record #2</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-</ModemBearerTable>
-
-<LANBearerTable>
-</LANBearerTable>
-
-<LANServiceTable>
-    <LANService operation="add">
-        <Name>Record #1</Name>
-        <IfNetworks>Record #1</IfNetworks>
-        <IpNetMask>0.0.0.0</IpNetMask>
-        <IpGateway>0.0.0.0</IpGateway>
-        <IpAddr>0.0.0.0</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>0.0.0.0</IpNameServer1>
-        <IpNameServer2>0.0.0.0</IpNameServer2>
-    </LANService>
-    <LANService operation="add">
-        <Name>Record #2</Name>
-        <IfNetworks>Record #2</IfNetworks>
-        <IpNetMask>0.0.0.0</IpNetMask>
-        <IpGateway>0.0.0.0</IpGateway>
-        <IpAddr>0.0.0.0</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>0.0.0.0</IpNameServer1>
-        <IpNameServer2>0.0.0.0</IpNameServer2>
-    </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="add">
-        <Name>Record #1</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <LoginScript>New Record</LoginScript>
-        <Authentication>0</Authentication>
-        <IfName>ppp</IfName>
-        <IfNetworks>ip</IfNetworks>
-        <IpAddr>New Record</IpAddr>
-        <IpNameServer1>New Record</IpNameServer1>
-        <IpNameServer2>New Record</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Record #2</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <LoginScript>New Record</LoginScript>
-        <Authentication>0</Authentication>
-        <IfName>ppp</IfName>
-        <IfNetworks>ip</IfNetworks>
-        <IpAddr>New Record</IpAddr>
-        <IpNameServer1>New Record</IpNameServer1>
-        <IpNameServer2>New Record</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-    </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="add">
-        <Name>Record #1</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfName>ppp</IfName>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>me</IfAuthName>
-        <IfAuthPass>wt</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>TRUE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>48</ChannelCoding>
-        <AIUR>9600</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Record #2</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfName>ppp</IfName>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>fgh</IfAuthName>
-        <IfAuthPass>dfgb</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>TRUE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>48</ChannelCoding>
-        <AIUR>9600</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-    </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<ChargecardTable>
-    <Chargecard operation="add">
-        <Name>Dummy BT Chargecard</Name>
-        <AccountNumber>144,12345678</AccountNumber>
-        <Pin>0000</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>HFG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-    <Chargecard operation="add">
-        <Name>Dummy Mercury Chargecard</Name>
-        <AccountNumber>0500800800,,12345678</AccountNumber>
-        <Pin>****</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>J,K,0FG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsBearer>2</SmsBearer>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>2</ConnectionAttempts>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-    <IncomingGPRS operation="add">
-        <Name>Record #1</Name>
-        <APN>1234</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>4321</PDPAddress>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-        <IfName>New Record</IfName>
-        <AuthRetries>0</AuthRetries>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>-1</QosWarningTimeout>
-    </IncomingGPRS>
-    <IncomingGPRS operation="add">
-        <Name>Record #2</Name>
-        <APN>7890</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>0987</PDPAddress>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-        <IfName>New Record</IfName>
-        <AuthRetries>0</AuthRetries>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>-1</QosWarningTimeout>
-    </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="add">
-        <Name>Record #1</Name>
-        <APN>1234</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>4321</PDPAddress>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-        <IfName>New Record</IfName>
-        <AuthRetries>0</AuthRetries>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>-1</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>Record #2</Name>
-        <APN>0987</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>7890</PDPAddress>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-        <IfName>New Record</IfName>
-        <AuthRetries>0</AuthRetries>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>-1</QosWarningTimeout>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-</DefaultGPRSTable>
-
-<ProxyTable>
-    <Proxy operation="add">
-        <Name>ProxyTable1</Name>
-        <ISPRef>DialOutISP.Record #1</ISPRef>
-        <UseProxyServer>FALSE</UseProxyServer>
-        <ProtocolName>New Record</ProtocolName>
-        <ProxyServerName>New Record</ProxyServerName>
-        <PortNumber>0</PortNumber>
-        <Exceptions>New Record</Exceptions>
-    </Proxy>
-    <Proxy operation="add">
-        <Name>ProxyTable2</Name>
-        <ISPRef>DialOutISP.Record #2</ISPRef>
-        <UseProxyServer>FALSE</UseProxyServer>
-        <ProtocolName>New Record</ProtocolName>
-        <ProxyServerName>New Record</ProxyServerName>
-        <PortNumber>0</PortNumber>
-        <Exceptions>New Record</Exceptions>
-    </Proxy>
-</ProxyTable>
-
-<LocationTable>
-    <Location operation="add">
-        <Name>Default Location</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-        <DialOutCode>9,</DialOutCode>
-    </Location>
-    <Location operation="add">
-        <Name>Mobile</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-</LocationTable>
-
-<SecureSocketTable>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/024.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,484 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
-
- -->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Record #1</Name>
-        <IAPService>DialOutISP.Record #1</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #2</Name>
-        <IAPService>DialOutISP.Record #2</IAPService>
-        <ChargecardRef>Chargecard.Dummy Mercury Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #3</Name>
-        <IAPService>DialInISP.Record #1</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #4</Name>
-        <IAPService>DialInISP.Record #2</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #5</Name>
-        <IAPService>OutgoingGPRS.Record #1</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #6</Name>
-        <IAPService>OutgoingGPRS.Record #2</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #9</Name>
-        <IAPService>IncomingGPRS.Record #1</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #10</Name>
-        <IAPService>IncomingGPRS.Record #2</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #11</Name>
-        <IAPService>LANService.Record #1</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Record #12</Name>
-        <IAPService>LANService.Record #2</IAPService>
-        <ChargecardRef>Chargecard.Dummy BT Chargecard</ChargecardRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-</ModemBearerTable>
-
-<LANBearerTable>
-</LANBearerTable>
-
-<LANServiceTable>
-    <LANService operation="add">
-        <Name>Record #1</Name>
-        <IfNetworks>Record #1</IfNetworks>
-        <IpNetMask>0.0.0.0</IpNetMask>
-        <IpGateway>0.0.0.0</IpGateway>
-        <IpAddr>0.0.0.0</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>0.0.0.0</IpNameServer1>
-        <IpNameServer2>0.0.0.0</IpNameServer2>
-    </LANService>
-    <LANService operation="add">
-        <Name>Record #2</Name>
-        <IfNetworks>Record #2</IfNetworks>
-        <IpNetMask>0.0.0.0</IpNetMask>
-        <IpGateway>0.0.0.0</IpGateway>
-        <IpAddr>0.0.0.0</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>0.0.0.0</IpNameServer1>
-        <IpNameServer2>0.0.0.0</IpNameServer2>
-    </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="add">
-        <Name>Record #1</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <LoginScript>New Record</LoginScript>
-        <Authentication>0</Authentication>
-        <IfName>ppp</IfName>
-        <IfNetworks>ip</IfNetworks>
-        <IpAddr>New Record</IpAddr>
-        <IpNameServer1>New Record</IpNameServer1>
-        <IpNameServer2>New Record</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Record #2</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <LoginScript>New Record</LoginScript>
-        <Authentication>0</Authentication>
-        <IfName>ppp</IfName>
-        <IfNetworks>ip</IfNetworks>
-        <IpAddr>New Record</IpAddr>
-        <IpNameServer1>New Record</IpNameServer1>
-        <IpNameServer2>New Record</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-    </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="add">
-        <Name>Record #1</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfName>ppp</IfName>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>me</IfAuthName>
-        <IfAuthPass>wt</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>TRUE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>48</ChannelCoding>
-        <AIUR>9600</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Record #2</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfName>ppp</IfName>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>fgh</IfAuthName>
-        <IfAuthPass>dfgb</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>TRUE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>48</ChannelCoding>
-        <AIUR>9600</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-    </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<ChargecardTable>
-    <Chargecard operation="add">
-        <Name>Dummy BT Chargecard</Name>
-        <AccountNumber>144,12345678</AccountNumber>
-        <Pin>0000</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>HFG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-    <Chargecard operation="add">
-        <Name>Dummy Mercury Chargecard</Name>
-        <AccountNumber>0500800800,,12345678</AccountNumber>
-        <Pin>****</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>J,K,0FG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsBearer>2</SmsBearer>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>2</ConnectionAttempts>
-        <ModemForDataAndFax>3</ModemForDataAndFax>
-        <LocationForDataAndFax>Location.Default Location</LocationForDataAndFax>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-    <IncomingGPRS operation="add">
-        <Name>Record #1</Name>
-        <APN>1234</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>4321</PDPAddress>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-        <IfName>New Record</IfName>
-        <AuthRetries>0</AuthRetries>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>-1</QosWarningTimeout>
-    </IncomingGPRS>
-    <IncomingGPRS operation="add">
-        <Name>Record #2</Name>
-        <APN>7890</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>0987</PDPAddress>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-        <IfName>New Record</IfName>
-        <AuthRetries>0</AuthRetries>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>-1</QosWarningTimeout>
-    </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="add">
-        <Name>Record #1</Name>
-        <APN>1234</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>4321</PDPAddress>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-        <IfName>New Record</IfName>
-        <AuthRetries>0</AuthRetries>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>-1</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>Record #2</Name>
-        <APN>0987</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>7890</PDPAddress>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-        <IfName>New Record</IfName>
-        <AuthRetries>0</AuthRetries>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>-1</QosWarningTimeout>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-</DefaultGPRSTable>
-
-<ProxyTable>
-</ProxyTable>
-
-<LocationTable>
-    <Location operation="add">
-        <Name>Default Location</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-        <DialOutCode>9,</DialOutCode>
-    </Location>
-    <Location operation="add">
-        <Name>Mobile</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-</LocationTable>
-
-<SecureSocketTable>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/061_01.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1288 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
-
- In the case of that IfAuthName or IfAuthPass is 'replaceme' or DefaultTelNum is '+442079460224'
- it needs to be changed to the proper value for testing
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Pipex CSD Serial</Name>
-        <IAPService>DialOutISP.Protocol Test 1</IAPService>
-        <IAPBearer>ModemBearer.GSM Mobile Phone via Serial</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office Direct Dial</LocationRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>0</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>30</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GSM Mobile Phone via Serial</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>19200</Rate>
-        <Handshaking>196</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>6</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
-    <LANBearer operation="add">
-        <Name>Assabet on-board Ethernet</Name>
-        <Agent>nullagent.agt</Agent>
-        <IfName>ethint</IfName>
-        <LDDName>not used</LDDName>
-        <PDDName>not used</PDDName>
-        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
-    </LANBearer>
-</LANBearerTable>
-
-<LANServiceTable>
-    <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip,ip6</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>194.72.6.1</IpGateway>
-        <IpAddr>192.168.0.100</IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.52</IpNameServer2>
-    </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="template">
-        <Name>Default Dial In ISP</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Dial In ISP01</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="template">
-        <Name>Default Dial Out ISP</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>TRUE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Protocol Test 1</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Protocol UNSPECIFIED</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Protocol Test 2</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Protocol 0</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Protocol Test 3</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Nondescript</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>V22BIS</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Protocol Test 4</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Protocol V32</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>V32</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Protocol Test 5</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Protocol V34</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>V34</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Protocol Test 6</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Protocol V110</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>V110</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Protocol Test 7</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Protocol V120</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>V120</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Protocol Test 8</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Protocol X31FLAGSTUFFING</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>X31FLAGSTUFFING</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Protocol Test 9</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Protocol PIAFS</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>PIAFS</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Protocol Test 10</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Protocol BITTRANSPARENT</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>BITTRANSPARENT</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Protocol Test 11</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Protocol PSTNMULTIMEDIAVOICEFALLBACK</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>PSTNMULTIMEDIAVOICEFALLBACK</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Protocol Test 12</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Protocol PSTNMULTIMEDIA</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>PSTNMULTIMEDIA</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Protocol Test 13</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Protocol ISDNMULTIMEDIA</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>ISDNMULTIMEDIA</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
-    <CDMA2000PacketService operation="add">
-        <Name>test name cdma2000</Name>
-        <IwfName>Test2000</IwfName>
-        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
-        <PdpType>IPV4</PdpType>
-        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
-        <ReqRevPriority>PRIORITY04</ReqRevPriority>
-        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
-        <ReqRevBitrate>32KBPS</ReqRevBitrate>
-        <ReqFwdLoss>LOSS1</ReqFwdLoss>
-        <ReqRevLoss>LOSS1</ReqRevLoss>
-        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
-        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
-        <MinFwdBitrate>32KBPS</MinFwdBitrate>
-        <MinRevBitrate>32KBPS</MinRevBitrate>
-        <AccptFwdLoss>LOSS2</AccptFwdLoss>
-        <AccptRevLoss>LOSS2</AccptRevLoss>
-        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
-        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNetMask>0.255.255.255</IpNetMask>
-        <IpGateway>10.0.0.1</IpGateway>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <ApType>2</ApType>
-        <QosWarningTimeout>1000000</QosWarningTimeout>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <RlpMode>TRANSPARENT</RlpMode>
-        <CDMAMobileIP>FALSE</CDMAMobileIP>
-        <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
-        <CDMANaiType>0</CDMANaiType>        
-    </CDMA2000PacketService>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
-    <Chargecard operation="add">
-        <Name>Dummy BT Chargecard</Name>
-        <AccountNumber>144,12345678</AccountNumber>
-        <Pin>0000</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>HFG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-    <Chargecard operation="add">
-        <Name>Dummy Mercury Chargecard</Name>
-        <AccountNumber>0500800800,,12345678</AccountNumber>
-        <Pin>****</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>J,K,0FG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable1</Name>
-        <Ranking>1</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>PROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
-    </ConnectionPreferences>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable2</Name>
-        <Ranking>2</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>PROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
-    </ConnectionPreferences>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsBearer>2</SmsBearer>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>2</ConnectionAttempts>
-        <ModemForDataAndFax>2</ModemForDataAndFax>
-        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
-        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
-        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.Intranet</DefaultNetwork>
-        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-    <IncomingGPRS operation="add">
-        <Name>Incoming GPRS Settings PlaceHolder</Name>
-        <APN>Test</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>0.0.0.0</PDPAddress>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>1</ReqPrecedence>
-        <ReqDelay>1</ReqDelay>
-        <ReqReliability>1</ReqReliability>
-        <ReqPeakThroughput>1</ReqPeakThroughput>
-        <ReqMeanThroughput>1</ReqMeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNameServer1>0.0.0.0</IpNameServer1>
-        <IpNameServer2>0.0.0.0</IpNameServer2>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-    </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS01</Name>
-        <APN>gprs01APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS02</Name>
-        <APN>gprs02APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS03</Name>
-        <APN>gprs03APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-    <DefaultGPRS operation="add">
-        <Name>Dummy Default GPRS Settings</Name>
-        <APN>Access point name</APN>
-        <PDPType>IPV6</PDPType>
-        <PDPAddress>www.wid.com</PDPAddress>
-        <Usage>1</Usage>
-        <Precedence>1</Precedence>
-        <Delay>1</Delay>
-        <Reliability>1</Reliability>
-        <PeakThroughput>1</PeakThroughput>
-        <MeanThroughput>1</MeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-    </DefaultGPRS>
-</DefaultGPRSTable>
-
-<ProxyTable>
-    <Proxy operation="add">
-        <Name>ProxyTable1</Name>
-        <ISPRef>DialOutISP.Protocol Test 1</ISPRef>
-        <UseProxyServer>TRUE</UseProxyServer>
-        <ProtocolName>http</ProtocolName>
-        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
-        <PortNumber>80</PortNumber>
-        <Exceptions>www.dummyproxy.com/exception</Exceptions>
-    </Proxy>
-</ProxyTable>
-
-<LocationTable>
-    <Location operation="template">
-        <Name>Default Location</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-        <DialOutCode>9,</DialOutCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office Direct Dial</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-    </Location>
-    <Location operation="add">
-        <Name>Mobile</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Home</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>TRUE</UsePulseDial>
-        <WaitForDialTone>TRUE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>181</AreaCode>
-    </Location>
-</LocationTable>
-
-<SecureSocketTable>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable1</Name>
-        <ProtocolName>ssl3.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable2</Name>
-        <ProtocolName>tls1.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-    <WAPAccessPoint operation="template">
-        <Name>Default Dial In ISP</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-    </WAPAccessPoint>
-    <WAPAccessPoint operation="add">
-        <Name>Dummy WAP Settings</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-        <StartPage>www.wapstart.com</StartPage>
-    </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-    <WAPIPBearer operation="template">
-        <Name>WAPIPBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.-1</IAPRef>
-        <ProxyPortNumber>0</ProxyPortNumber>
-    </WAPIPBearer>
-    <WAPIPBearer operation="add">
-        <Name>WAPIPBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
-        <GatewayAddress>www.wapgateway.com</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
-        <ProxyPortNumber>1</ProxyPortNumber>
-    </WAPIPBearer>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-    <WAPSMSBearer operation="template">
-        <Name>WAPSMSBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-    </WAPSMSBearer>
-    <WAPSMSBearer operation="add">
-        <Name>WAPSMSBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
-        <GatewayAddress>+442079460221</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <ServiceCentreAddress>+442079460223</ServiceCentreAddress>
-    </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/061_02.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
- All Rights Reserved
-
- In the case of that IfAuthName or IfAuthPass is 'replaceme' or DefaultTelNum is '+442079460224'
- it needs to be changed to the proper value for testing
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Pipex CSD Serial</Name>
-        <IAPService>DialOutISP.Bearer Name Test 1</IAPService>
-        <IAPBearer>ModemBearer.GSM Mobile Phone via Serial</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office Direct Dial</LocationRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>0</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>30</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GSM Mobile Phone via Serial</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>19200</Rate>
-        <Handshaking>196</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>6</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
-    <LANBearer operation="add">
-        <Name>Assabet on-board Ethernet</Name>
-        <Agent>nullagent.agt</Agent>
-        <IfName>ethint</IfName>
-        <LDDName>not used</LDDName>
-        <PDDName>not used</PDDName>
-        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
-    </LANBearer>
-</LANBearerTable>
-
-<LANServiceTable>
-    <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip,ip6</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>194.72.6.1</IpGateway>
-        <IpAddr>192.168.0.100</IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.52</IpNameServer2>
-    </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="template">
-        <Name>Default Dial In ISP</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Dial In ISP01</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="template">
-        <Name>Default Dial Out ISP</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>TRUE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Name Test 1</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Name ASYNCHRONOUS</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Name Test 2</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Name ASYNCHRONOUSRDI</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUSRDI</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Name Test 3</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Name SYNCHRONOUS</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>SYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Name Test 4</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Name SYNCHRONOUSRDI</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>SYNCHRONOUSRDI</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Name Test 5</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Name PADASYNCUDI</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>PADASYNCUDI</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Name Test 6</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Name PADASYNCRDI</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>PADASYNCRDI</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Name Test 7</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Name DADS</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>DADS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Name Test 8</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Name ACCESSSYNCRDI</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ACCESSSYNCRDI</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Name Test 9</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Name SERVICEEXTENDED</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>SERVICEEXTENDED</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
-    <CDMA2000PacketService operation="add">
-        <Name>test name cdma2000</Name>
-        <IwfName>Test2000</IwfName>
-        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
-        <PdpType>IPV4</PdpType>
-        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
-        <ReqRevPriority>PRIORITY04</ReqRevPriority>
-        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
-        <ReqRevBitrate>32KBPS</ReqRevBitrate>
-        <ReqFwdLoss>LOSS1</ReqFwdLoss>
-        <ReqRevLoss>LOSS1</ReqRevLoss>
-        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
-        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
-        <MinFwdBitrate>32KBPS</MinFwdBitrate>
-        <MinRevBitrate>32KBPS</MinRevBitrate>
-        <AccptFwdLoss>LOSS2</AccptFwdLoss>
-        <AccptRevLoss>LOSS2</AccptRevLoss>
-        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
-        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNetMask>0.255.255.255</IpNetMask>
-        <IpGateway>10.0.0.1</IpGateway>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <ApType>2</ApType>
-        <QosWarningTimeout>1000000</QosWarningTimeout>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <RlpMode>TRANSPARENT</RlpMode>
-        <CDMAMobileIP>FALSE</CDMAMobileIP>
-        <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
-        <CDMANaiType>0</CDMANaiType>        
-    </CDMA2000PacketService>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
-    <Chargecard operation="add">
-        <Name>Dummy BT Chargecard</Name>
-        <AccountNumber>144,12345678</AccountNumber>
-        <Pin>0000</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>HFG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-    <Chargecard operation="add">
-        <Name>Dummy Mercury Chargecard</Name>
-        <AccountNumber>0500800800,,12345678</AccountNumber>
-        <Pin>****</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>J,K,0FG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable1</Name>
-        <Ranking>1</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>PROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
-    </ConnectionPreferences>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable2</Name>
-        <Ranking>2</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>PROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
-    </ConnectionPreferences>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsBearer>2</SmsBearer>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>2</ConnectionAttempts>
-        <ModemForDataAndFax>2</ModemForDataAndFax>
-        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
-        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
-        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.Intranet</DefaultNetwork>
-        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-    <IncomingGPRS operation="add">
-        <Name>Incoming GPRS Settings PlaceHolder</Name>
-        <APN>Test</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>0.0.0.0</PDPAddress>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>1</ReqPrecedence>
-        <ReqDelay>1</ReqDelay>
-        <ReqReliability>1</ReqReliability>
-        <ReqPeakThroughput>1</ReqPeakThroughput>
-        <ReqMeanThroughput>1</ReqMeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNameServer1>0.0.0.0</IpNameServer1>
-        <IpNameServer2>0.0.0.0</IpNameServer2>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-    </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS01</Name>
-        <APN>gprs01APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS02</Name>
-        <APN>gprs02APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS03</Name>
-        <APN>gprs03APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-    <DefaultGPRS operation="add">
-        <Name>Dummy Default GPRS Settings</Name>
-        <APN>Access point name</APN>
-        <PDPType>IPV6</PDPType>
-        <PDPAddress>www.wid.com</PDPAddress>
-        <Usage>1</Usage>
-        <Precedence>1</Precedence>
-        <Delay>1</Delay>
-        <Reliability>1</Reliability>
-        <PeakThroughput>1</PeakThroughput>
-        <MeanThroughput>1</MeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-    </DefaultGPRS>
-</DefaultGPRSTable>
-
-<ProxyTable>
-    <Proxy operation="add">
-        <Name>ProxyTable1</Name>
-        <ISPRef>DialOutISP.Bearer Name Test 1</ISPRef>
-        <UseProxyServer>TRUE</UseProxyServer>
-        <ProtocolName>http</ProtocolName>
-        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
-        <PortNumber>80</PortNumber>
-        <Exceptions>www.dummyproxy.com/exception</Exceptions>
-    </Proxy>
-</ProxyTable>
-
-<LocationTable>
-    <Location operation="template">
-        <Name>Default Location</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-        <DialOutCode>9,</DialOutCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office Direct Dial</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-    </Location>
-    <Location operation="add">
-        <Name>Mobile</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Home</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>TRUE</UsePulseDial>
-        <WaitForDialTone>TRUE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>181</AreaCode>
-    </Location>
-</LocationTable>
-
-<SecureSocketTable>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable1</Name>
-        <ProtocolName>ssl3.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable2</Name>
-        <ProtocolName>tls1.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-    <WAPAccessPoint operation="template">
-        <Name>Default Dial In ISP</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-    </WAPAccessPoint>
-    <WAPAccessPoint operation="add">
-        <Name>Dummy WAP Settings</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-        <StartPage>www.wapstart.com</StartPage>
-    </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-    <WAPIPBearer operation="template">
-        <Name>WAPIPBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.-1</IAPRef>
-        <ProxyPortNumber>0</ProxyPortNumber>
-    </WAPIPBearer>
-    <WAPIPBearer operation="add">
-        <Name>WAPIPBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
-        <GatewayAddress>www.wapgateway.com</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.1</IAPRef>
-        <ProxyPortNumber>1</ProxyPortNumber>
-    </WAPIPBearer>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-    <WAPSMSBearer operation="template">
-        <Name>WAPSMSBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-    </WAPSMSBearer>
-    <WAPSMSBearer operation="add">
-        <Name>WAPSMSBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
-        <GatewayAddress>+442079460221</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <ServiceCentreAddress>+442079460223</ServiceCentreAddress>
-    </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/061_03.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1428 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
-
- In the case of that IfAuthName or IfAuthPass is 'replaceme' or DefaultTelNum is '+442079460224'
- it needs to be changed to the proper value for testing
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Pipex CSD Serial</Name>
-        <IAPService>DialOutISP.Bearer Speed Test 1</IAPService>
-        <IAPBearer>ModemBearer.GSM Mobile Phone via Serial</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office Direct Dial</LocationRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>0</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>30</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GSM Mobile Phone via Serial</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>19200</Rate>
-        <Handshaking>196</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>6</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
-    <LANBearer operation="add">
-        <Name>Assabet on-board Ethernet</Name>
-        <Agent>nullagent.agt</Agent>
-        <IfName>ethint</IfName>
-        <LDDName>not used</LDDName>
-        <PDDName>not used</PDDName>
-        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
-    </LANBearer>
-</LANBearerTable>
-
-<LANServiceTable>
-    <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip,ip6</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>194.72.6.1</IpGateway>
-        <IpAddr>192.168.0.100</IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.52</IpNameServer2>
-    </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="template">
-        <Name>Default Dial In ISP</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Dial In ISP01</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="template">
-        <Name>Default Dial Out ISP</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>TRUE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Speed Test 1</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Speed UNSPECIFIED</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Speed Test 2</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Speed AUTOBAUDING</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>AUTOBAUDING</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Speed Test 3</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Speed 2400</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>2400</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Speed Test 4</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Speed 4800</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>4800</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Speed Test 5</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Speed 9600</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>9600</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Speed Test 6</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Speed 14400</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>14400</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Speed Test 7</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Speed 19200</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>19200</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Speed Test 8</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Speed 28800</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>28800</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Speed Test 9</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Speed 32000</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>32000</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Speed Test 10</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Speed 33600</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>33600</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Speed Test 11</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Speed 38400</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>38400</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Speed Test 12</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Speed 43200</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>43200</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Speed Test 13</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Speed 48000</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>48000</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Speed Test 14</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Speed 56000</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>56000</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Speed Test 15</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Speed 57600</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>57600</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Speed Test 16</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer Speed 64000</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>64000</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
-    <CDMA2000PacketService operation="add">
-        <Name>test name cdma2000</Name>
-        <IwfName>Test2000</IwfName>
-        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
-        <PdpType>IPV4</PdpType>
-        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
-        <ReqRevPriority>PRIORITY04</ReqRevPriority>
-        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
-        <ReqRevBitrate>32KBPS</ReqRevBitrate>
-        <ReqFwdLoss>LOSS1</ReqFwdLoss>
-        <ReqRevLoss>LOSS1</ReqRevLoss>
-        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
-        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
-        <MinFwdBitrate>32KBPS</MinFwdBitrate>
-        <MinRevBitrate>32KBPS</MinRevBitrate>
-        <AccptFwdLoss>LOSS2</AccptFwdLoss>
-        <AccptRevLoss>LOSS2</AccptRevLoss>
-        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
-        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNetMask>0.255.255.255</IpNetMask>
-        <IpGateway>10.0.0.1</IpGateway>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <ApType>2</ApType>
-        <QosWarningTimeout>1000000</QosWarningTimeout>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <RlpMode>TRANSPARENT</RlpMode>
-        <CDMAMobileIP>FALSE</CDMAMobileIP>
-        <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
-        <CDMANaiType>0</CDMANaiType>        
-    </CDMA2000PacketService>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
-    <Chargecard operation="add">
-        <Name>Dummy BT Chargecard</Name>
-        <AccountNumber>144,12345678</AccountNumber>
-        <Pin>0000</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>HFG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-    <Chargecard operation="add">
-        <Name>Dummy Mercury Chargecard</Name>
-        <AccountNumber>0500800800,,12345678</AccountNumber>
-        <Pin>****</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>J,K,0FG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable1</Name>
-        <Ranking>1</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>PROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
-    </ConnectionPreferences>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable2</Name>
-        <Ranking>2</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>PROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
-    </ConnectionPreferences>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsBearer>2</SmsBearer>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>2</ConnectionAttempts>
-        <ModemForDataAndFax>2</ModemForDataAndFax>
-        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
-        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
-        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.Intranet</DefaultNetwork>
-        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-    <IncomingGPRS operation="add">
-        <Name>Incoming GPRS Settings PlaceHolder</Name>
-        <APN>Test</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>0.0.0.0</PDPAddress>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>1</ReqPrecedence>
-        <ReqDelay>1</ReqDelay>
-        <ReqReliability>1</ReqReliability>
-        <ReqPeakThroughput>1</ReqPeakThroughput>
-        <ReqMeanThroughput>1</ReqMeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNameServer1>0.0.0.0</IpNameServer1>
-        <IpNameServer2>0.0.0.0</IpNameServer2>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-    </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS01</Name>
-        <APN>gprs01APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS02</Name>
-        <APN>gprs02APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS03</Name>
-        <APN>gprs03APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-    <DefaultGPRS operation="add">
-        <Name>Dummy Default GPRS Settings</Name>
-        <APN>Access point name</APN>
-        <PDPType>IPV6</PDPType>
-        <PDPAddress>www.wid.com</PDPAddress>
-        <Usage>1</Usage>
-        <Precedence>1</Precedence>
-        <Delay>1</Delay>
-        <Reliability>1</Reliability>
-        <PeakThroughput>1</PeakThroughput>
-        <MeanThroughput>1</MeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-    </DefaultGPRS>
-</DefaultGPRSTable>
-
-<ProxyTable>
-    <Proxy operation="add">
-        <Name>ProxyTable1</Name>
-        <ISPRef>DialOutISP.Bearer Speed Test 1</ISPRef>
-        <UseProxyServer>TRUE</UseProxyServer>
-        <ProtocolName>http</ProtocolName>
-        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
-        <PortNumber>80</PortNumber>
-        <Exceptions>www.dummyproxy.com/exception</Exceptions>
-    </Proxy>
-</ProxyTable>
-
-<LocationTable>
-    <Location operation="template">
-        <Name>Default Location</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-        <DialOutCode>9,</DialOutCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office Direct Dial</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-    </Location>
-    <Location operation="add">
-        <Name>Mobile</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Home</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>TRUE</UsePulseDial>
-        <WaitForDialTone>TRUE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>181</AreaCode>
-    </Location>
-</LocationTable>
-
-<SecureSocketTable>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable1</Name>
-        <ProtocolName>ssl3.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable2</Name>
-        <ProtocolName>tls1.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-    <WAPAccessPoint operation="template">
-        <Name>Default Dial In ISP</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-    </WAPAccessPoint>
-    <WAPAccessPoint operation="add">
-        <Name>Dummy WAP Settings</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-        <StartPage>www.wapstart.com</StartPage>
-    </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-    <WAPIPBearer operation="template">
-        <Name>WAPIPBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.-1</IAPRef>
-        <ProxyPortNumber>0</ProxyPortNumber>
-    </WAPIPBearer>
-    <WAPIPBearer operation="add">
-        <Name>WAPIPBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
-        <GatewayAddress>www.wapgateway.com</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.1</IAPRef>
-        <ProxyPortNumber>1</ProxyPortNumber>
-    </WAPIPBearer>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-    <WAPSMSBearer operation="template">
-        <Name>WAPSMSBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-    </WAPSMSBearer>
-    <WAPSMSBearer operation="add">
-        <Name>WAPSMSBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
-        <GatewayAddress>+442079460221</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <ServiceCentreAddress>+442079460223</ServiceCentreAddress>
-    </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/061_04.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,911 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
-
- In the case of that IfAuthName or IfAuthPass is 'replaceme' or DefaultTelNum is '+442079460224'
- it needs to be changed to the proper value for testing
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Pipex CSD Serial</Name>
-        <IAPService>DialOutISP.Bearer Name Test 1</IAPService>
-        <IAPBearer>ModemBearer.GSM Mobile Phone via Serial</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office Direct Dial</LocationRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>0</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>30</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GSM Mobile Phone via Serial</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>19200</Rate>
-        <Handshaking>196</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>6</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
-    <LANBearer operation="add">
-        <Name>Assabet on-board Ethernet</Name>
-        <Agent>nullagent.agt</Agent>
-        <IfName>ethint</IfName>
-        <LDDName>not used</LDDName>
-        <PDDName>not used</PDDName>
-        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
-    </LANBearer>
-</LANBearerTable>
-
-<LANServiceTable>
-    <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip,ip6</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>194.72.6.1</IpGateway>
-        <IpAddr>192.168.0.100</IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.52</IpNameServer2>
-    </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="template">
-        <Name>Default Dial In ISP</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Dial In ISP01</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="template">
-        <Name>Default Dial Out ISP</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>TRUE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Name Test 1</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer CE UNSPECIFIED</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Name Test 2</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer CE TRANSPARENT</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>TRANSPARENT</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Name Test 3</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer CE NONTRANSPARENT</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>NONTRANSPARENT</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Name Test 4</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer CE TRANSPARENTPREF</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>TRANSPARENTPREF</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Bearer Name Test 5</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>Bearer CE NONTRANSPARENTPREF</Description>
-        <Type>INTERNETONLY</Type>
-        <DefaultTelNum>+442079460224</DefaultTelNum>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>replaceme</IfAuthName>
-        <IfAuthPass>replaceme</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>NONTRANSPARENTPREF</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
-    <CDMA2000PacketService operation="add">
-        <Name>test name cdma2000</Name>
-        <IwfName>Test2000</IwfName>
-        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
-        <PdpType>IPV4</PdpType>
-        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
-        <ReqRevPriority>PRIORITY04</ReqRevPriority>
-        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
-        <ReqRevBitrate>32KBPS</ReqRevBitrate>
-        <ReqFwdLoss>LOSS1</ReqFwdLoss>
-        <ReqRevLoss>LOSS1</ReqRevLoss>
-        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
-        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
-        <MinFwdBitrate>32KBPS</MinFwdBitrate>
-        <MinRevBitrate>32KBPS</MinRevBitrate>
-        <AccptFwdLoss>LOSS2</AccptFwdLoss>
-        <AccptRevLoss>LOSS2</AccptRevLoss>
-        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
-        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNetMask>0.255.255.255</IpNetMask>
-        <IpGateway>10.0.0.1</IpGateway>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <ApType>2</ApType>
-        <QosWarningTimeout>1000000</QosWarningTimeout>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <RlpMode>TRANSPARENT</RlpMode>
-        <CDMAMobileIP>FALSE</CDMAMobileIP>
-        <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
-        <CDMANaiType>0</CDMANaiType>        
-    </CDMA2000PacketService>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
-    <Chargecard operation="add">
-        <Name>Dummy BT Chargecard</Name>
-        <AccountNumber>144,12345678</AccountNumber>
-        <Pin>0000</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>HFG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-    <Chargecard operation="add">
-        <Name>Dummy Mercury Chargecard</Name>
-        <AccountNumber>0500800800,,12345678</AccountNumber>
-        <Pin>****</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>J,K,0FG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable1</Name>
-        <Ranking>1</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>PROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
-    </ConnectionPreferences>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable2</Name>
-        <Ranking>2</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>PROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Pipex CSD Serial</IAPRef>
-    </ConnectionPreferences>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsBearer>2</SmsBearer>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>2</ConnectionAttempts>
-        <ModemForDataAndFax>2</ModemForDataAndFax>
-        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
-        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
-        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.Intranet</DefaultNetwork>
-        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-    <IncomingGPRS operation="add">
-        <Name>Incoming GPRS Settings PlaceHolder</Name>
-        <APN>Test</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>0.0.0.0</PDPAddress>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>1</ReqPrecedence>
-        <ReqDelay>1</ReqDelay>
-        <ReqReliability>1</ReqReliability>
-        <ReqPeakThroughput>1</ReqPeakThroughput>
-        <ReqMeanThroughput>1</ReqMeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNameServer1>0.0.0.0</IpNameServer1>
-        <IpNameServer2>0.0.0.0</IpNameServer2>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-    </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS01</Name>
-        <APN>gprs01APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS02</Name>
-        <APN>gprs02APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS03</Name>
-        <APN>gprs03APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-    <DefaultGPRS operation="add">
-        <Name>Dummy Default GPRS Settings</Name>
-        <APN>Access point name</APN>
-        <PDPType>IPV6</PDPType>
-        <PDPAddress>www.wid.com</PDPAddress>
-        <Usage>1</Usage>
-        <Precedence>1</Precedence>
-        <Delay>1</Delay>
-        <Reliability>1</Reliability>
-        <PeakThroughput>1</PeakThroughput>
-        <MeanThroughput>1</MeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-    </DefaultGPRS>
-</DefaultGPRSTable>
-
-<ProxyTable>
-    <Proxy operation="add">
-        <Name>ProxyTable1</Name>
-        <ISPRef>DialOutISP.Bearer Name Test 1</ISPRef>
-        <UseProxyServer>TRUE</UseProxyServer>
-        <ProtocolName>http</ProtocolName>
-        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
-        <PortNumber>80</PortNumber>
-        <Exceptions>www.dummyproxy.com/exception</Exceptions>
-    </Proxy>
-</ProxyTable>
-
-<LocationTable>
-    <Location operation="template">
-        <Name>Default Location</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-        <DialOutCode>9,</DialOutCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office Direct Dial</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-    </Location>
-    <Location operation="add">
-        <Name>Mobile</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Home</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>TRUE</UsePulseDial>
-        <WaitForDialTone>TRUE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>181</AreaCode>
-    </Location>
-</LocationTable>
-
-<SecureSocketTable>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable1</Name>
-        <ProtocolName>ssl3.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable2</Name>
-        <ProtocolName>tls1.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-    <WAPAccessPoint operation="template">
-        <Name>Default Dial In ISP</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-    </WAPAccessPoint>
-    <WAPAccessPoint operation="add">
-        <Name>Dummy WAP Settings</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-        <StartPage>www.wapstart.com</StartPage>
-    </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-    <WAPIPBearer operation="template">
-        <Name>WAPIPBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.-1</IAPRef>
-        <ProxyPortNumber>0</ProxyPortNumber>
-    </WAPIPBearer>
-    <WAPIPBearer operation="add">
-        <Name>WAPIPBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
-        <GatewayAddress>www.wapgateway.com</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.1</IAPRef>
-        <ProxyPortNumber>1</ProxyPortNumber>
-    </WAPIPBearer>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-    <WAPSMSBearer operation="template">
-        <Name>WAPSMSBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-    </WAPSMSBearer>
-    <WAPSMSBearer operation="add">
-        <Name>WAPSMSBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
-        <GatewayAddress>+442079460221</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <ServiceCentreAddress>+442079460223</ServiceCentreAddress>
-    </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/064_01.cfg	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-############################################################
-## EMPTY FILE FOR te_commsdat tests
-## 
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/Cdb_udeb.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1286 +0,0 @@
-//
-// 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:
-//
-//
-PRINT example CommDb test
-PRINT
-
-PRINT IfAuthName needs to be replaced
-PRINT in 061_01.xml, 061_02.xml ,061_03.xml, 061_04.xml
-PRINT
-//Do all our moving round & making databases first
-
-//run_script z:\TestData\scripts\esock_test_unloadesock.script
-
-//LOAD_SUITE TS_Esock.dll
-
-run_utils copyfile z:\testdata\configs\default5.dat c:\corrupt.dat
-
-//Ready to go.
-//run protection tests
-run_script z:\testdata\scripts\test_all_protection
-
-LOAD_SUITE TS_CommDb.dll
-
-// ced processing tests.
-
-//run_script z:\TestData\scripts\esock_test_unloadesock.script
-PRINT IfAuthName needs to be replaced
-PRINT
-CED z:\testdata\configs\061_01.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_061_01
-TEST_COMPLETE
-
-PRINT IfAuthName needs to be replaced
-PRINT
-CED z:\testdata\configs\061_02.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_061_02
-TEST_COMPLETE
-
-PRINT IfAuthName needs to be replaced
-PRINT
-CED z:\testdata\configs\061_03.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_061_03
-TEST_COMPLETE
-
-PRINT IfAuthName needs to be replaced
-PRINT
-CED z:\testdata\configs\061_04.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_061_04
-TEST_COMPLETE
-
-// finished ced processing tests.
-
-// database creation tests
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_001_01
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_001_03
-TEST_COMPLETE
-
-CED z:\testdata\configs\corrupt.xml -f
-
-// Note - this test modified for 9.1 as manipulates cdbv3.dat file
-RUN_TEST_STEP 100000, TS_CommDb,step_001_04
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_001_05
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_001_07
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_001_08
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_001_09
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_001_10
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_002_01
-TEST_COMPLETE
-
-// finished database creation tests
-
-run_script z:\TestData\scripts\esock_test_loadesock.script
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_003_01
-TEST_COMPLETE 
-
-RUN_TEST_STEP 100000, TS_CommDb,step_003_02
-TEST_COMPLETE 
-
-RUN_TEST_STEP 100000, TS_CommDb,step_003_03
-TEST_COMPLETE 
-
-RUN_PANIC_STEP 100000, TS_CommDb,step_003_04
-TEST_COMPLETE 
-
-RUN_TEST_STEP 100000, TS_CommDb,step_003_05
-TEST_COMPLETE 
-
-RUN_TEST_STEP 100000, TS_CommDb,step_003_06 
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_003_07 
-TEST_COMPLETE
-
-RUN_PANIC_STEP 1000000, TS_CommDb,step_003_08 
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_004_01
-TEST_COMPLETE 
-
-RUN_PANIC_STEP 100000, TS_CommDb,step_004_02
-TEST_COMPLETE 
-
-RUN_PANIC_STEP 100000, TS_CommDb,step_004_03
-TEST_COMPLETE 
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_004_04
-TEST_COMPLETE 
-
-RUN_PANIC_STEP 1000000, TS_CommDb,step_004_05
-TEST_COMPLETE 
-
-RUN_PANIC_STEP 1000000, TS_CommDb,step_004_06
-TEST_COMPLETE 
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_005_01
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_005_02
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_005_03
-TEST_COMPLETE 
-RUN_TEST_STEP 1000000, TS_CommDb,step_005_04
-TEST_COMPLETE 
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_006_01
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_006_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_006_03
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_006_04
-
-CED z:\testdata\configs\default1.xml -f
-
-TEST_COMPLETE 
-RUN_TEST_STEP 1000000, TS_CommDb,step_006_05
-TEST_COMPLETE 
-      
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_007_01
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_02
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_03
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_04
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_05
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_06
-TEST_COMPLETE 
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_007_07
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_08
-TEST_COMPLETE 
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_007_09
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_10
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_11
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_12
-TEST_COMPLETE 
-RUN_PANIC_STEP 100000, TS_CommDb,step_007_14
-TEST_COMPLETE 
-RUN_TEST_STEP 1000000, TS_CommDb,step_007_15
-TEST_COMPLETE 
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_007_16
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_007_17
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_007_18
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_007_19
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_PANIC_STEP 1000000, TS_CommDb,step_007_20
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_008_01
-TEST_COMPLETE 
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_008_02
-TEST_COMPLETE 
-
-RUN_TEST_STEP 100000, TS_CommDb,step_008_03
-TEST_COMPLETE 
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_008_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_009_01
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_009_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_009_03
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_009_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_009_05
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_009_06
-TEST_COMPLETE
-RUN_PANIC_STEP 100000, TS_CommDb,step_009_07
-TEST_COMPLETE 
-RUN_PANIC_STEP 100000, TS_CommDb,step_009_08
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_009_09
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_009_10
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_009_11
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_009_12
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_009_13
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_009_14
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_009_15
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_009_16
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_009_17
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_009_18
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_009_19
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_PANIC_STEP 100000, TS_CommDb,step_009_20
-TEST_COMPLETE
-RUN_PANIC_STEP 100000, TS_CommDb,step_009_21
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_010_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_010_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_010_03
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_010_04
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_010_05
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_011_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_011_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_011_03
-
-CED z:\testdata\configs\default1.xml -f
-
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_011_04
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_013_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_013_02
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_013_03
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_013_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_014_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_014_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_014_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_014_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_015_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_015_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_015_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_015_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_015_05
-TEST_COMPLETE
-
-//This step panics because of the __ASSERT_DEBUG in the CommitTransactionL
-RUN_PANIC_STEP 100000, TS_CommDb,step_015_06
-TEST_COMPLETE
-
-//RUN_TEST_STEP 100000, TS_CommDb,step_015_06
-//TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_015_07
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_015_08
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_015_09
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_015_10
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_015_11
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_015_12
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_015_13
-TEST_COMPLETE                                
-RUN_TEST_STEP 1000000, TS_CommDb,step_015_14
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_015_15
-TEST_COMPLETE                                
-RUN_TEST_STEP 1000000, TS_CommDb,step_015_16
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-// TODO - these 7 tests should pass - are failing because of notifications
-
-RUN_TEST_STEP 100000, TS_CommDb,step_016_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_016_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_016_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_016_05
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_016_07
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_016_08
-TEST_COMPLETE
-
-RUN_TEST_STEP 2000000, TS_CommDb,step_016_09
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_017_01
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-// These 5 steps should pass - notifications
-
-RUN_TEST_STEP 100000, TS_CommDb,step_017_02
-TEST_COMPLETE
-
-//CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_017_03
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_017_04
-TEST_COMPLETE
-
-
-//CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 2000000, TS_CommDb,step_017_05
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 2000000, TS_CommDb,step_017_06
-TEST_COMPLETE
-
-RUN_TEST_STEP 2000000, TS_CommDb,step_017_07
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_018_01
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_018_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_018_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_018_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_018_05
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_018_06
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_018_07
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_018_08
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_019_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_019_02
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_019_03
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_019_04
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_019_05
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_019_06
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_019_07
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_019_08
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_019_09
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_019_10
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_019_11
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_019_12
-TEST_COMPLETE
-
-//OOM run when _19_07 is fixed
-RUN_TEST_STEP 1000000, TS_CommDb,step_019_13
-TEST_COMPLETE
-
-//OOM run when 19_07 is fixed
-RUN_TEST_STEP 1000000, TS_CommDb,step_019_14
-TEST_COMPLETE
-
-CED z:\testdata\configs\020.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_020_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_020_02
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_020_03
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_020_04
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_020_05
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_020_06
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_020_07
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_020_08
-TEST_COMPLETE
-
-CED z:\testdata\configs\021.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_021_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_021_02
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_021_03
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_021_04
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_021_05
-TEST_COMPLETE
-
-CED z:\testdata\configs\022.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_022_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_02
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_03
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_04
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_05
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_06
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_07
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_08
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_09
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_10
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_11
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_12
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_13
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_14
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_16
-TEST_COMPLETE
-
-CED z:\testdata\configs\022.xml -f
-RUN_TEST_STEP 1000000, TS_CommDb,step_022_17
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_022_18
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_022_19
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_022_20
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_022_21
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_022_22
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_022_23
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_022_24
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_022_25
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_022_26
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_022_27
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_022_28
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_022_29
-TEST_COMPLETE
-
-CED z:\testdata\configs\022_30.xml -f
-RUN_TEST_STEP 1000, TS_CommDb,step_022_30
-TEST_COMPLETE
-
-CED z:\testdata\configs\023.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_023_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_023_02
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_023_03
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_023_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\023.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_023_05
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_023_06
-TEST_COMPLETE
-
-CED z:\testdata\configs\024.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_024_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_024_02
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_024_03
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_024_04
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_024_05
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_024_06
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_024_07
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_024_08
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_024_09
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_025_01
-TEST_COMPLETE 
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_025_02
-TEST_COMPLETE 
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_026_01
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_026_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_026_03
-TEST_COMPLETE 
-
-RUN_TEST_STEP 100000, TS_CommDb,step_026_04
-TEST_COMPLETE 
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_026_05
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_026_06
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_026_07
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_026_08
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_026_09
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_026_10
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_026_11
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_026_12
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_026_13
-TEST_COMPLETE
-
-//OOM run when 26_06 is fixed
-RUN_TEST_STEP 1000000, TS_CommDb,step_026_14
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_026_15
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_026_16
-TEST_COMPLETE
-
-CED z:\testdata\configs\022.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_027_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_027_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_028_01
-TEST_COMPLETE
- 
-RUN_TEST_STEP 100000, TS_CommDb,step_028_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_028_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_028_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_028_05
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_028_06
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_028_07
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_029_01
-TEST_COMPLETE
- 
-RUN_TEST_STEP 100000, TS_CommDb,step_029_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_029_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_029_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_030_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_030_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_030_03
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_031_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_031_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_031_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_031_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_031_05
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_032_01
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_032_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_032_03
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_032_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_032_05
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_033_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_033_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_033_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_033_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-//OOM run when 33_01 is fixed
-RUN_TEST_STEP 1000000, TS_CommDb,step_033_05
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-//OOM run when 33_02 is fixed
-RUN_TEST_STEP 1000000, TS_CommDb,step_033_06
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_033_07
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_033_08
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_033_09
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_034_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_034_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_034_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_034_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_034_05
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_034_06
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\default.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_035_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_035_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_035_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_035_04
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\022.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_05
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_06
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_07
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_08
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_09
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_10
-TEST_COMPLETE
-
-RUN_PANIC_STEP 100000, TS_CommDb,step_036_11
-TEST_COMPLETE
-
-RUN_PANIC_STEP 100000, TS_CommDb,step_036_12
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_13
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_14
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_15
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_036_16
-TEST_COMPLETE
-
-RUN_PANIC_STEP 1000000, TS_CommDb,step_036_17
-TEST_COMPLETE
-
-RUN_PANIC_STEP 1000000, TS_CommDb,step_036_18
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\default.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_037_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_037_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_037_03
-TEST_COMPLETE
-
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_038_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_038_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_038_03
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_039_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_039_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_040_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_040_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_040_03
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_05
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_06
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_07
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_08
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_09
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_10
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_11
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_12
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_13
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_14
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_15
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_16
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_17
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_18
-TEST_COMPLETE
-
-CED z:\testdata\configs\default.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_19
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_20
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_21
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_22
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_23
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_24
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_25
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_26
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_27
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_28
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_29
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_30
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_31
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_32
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_33
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_34
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_042_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_042_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_042_03
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_043_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_043_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_043_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_043_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_043_05
-TEST_COMPLETE
-
-CED z:\testdata\configs\default.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_044_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_044_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_044_03
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_045_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_045_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_045_03
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_046_01
-TEST_COMPLETE
-
-// These 3 tests need to pass.  Are broken because of transactions needing to complete differently
-
-RUN_TEST_STEP 500000, TS_CommDb,step_046_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default.xml -f
-
-RUN_TEST_STEP 500000, TS_CommDb,step_046_03
-TEST_COMPLETE
-
-CED z:\testdata\configs\default.xml -f
-
-RUN_TEST_STEP 500000, TS_CommDb,step_046_04
-TEST_COMPLETE
-
-//
-// This test is broken in a number of ways. The test uses two threads to access the
-// CommDB, but there behaviour of CommsDAT is slightly different to that of CommDB.
-// Sometimes some functions leave with KErrLocked and this causes the test to fail.
-// Other times a panic occurs as the two accesses to the same data cause the API
-// to panic, which the test does not expect.
-//
-// For now it will have to remain commented out.
-//
-//RUN_TEST_STEP 2000000, TS_CommDb,step_046_05
-//TEST_COMPLETE
-
-
-CED z:\testdata\configs\default1.xml -f
-
-// BC tests of Modem table renaming.
-
-RUN_TEST_STEP 100000, TS_CommDb,step_062_01
-TEST_COMPLETE
-
-CED z:\testdata\configs\default.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_062_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_062_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_062_05
-TEST_COMPLETE
-
-CED  Z:\testdata\configs\064_01.cfg
-RUN_TEST_STEP 100000, TS_CommDb,step_064_01
-TEST_COMPLETE
-
-MULTITHREAD
-
-CED z:\testdata\configs\default.xml -f
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_02
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_03
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_04
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_05
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_06
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_07
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_08
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_13
-TEST_COMPLETE
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/CombinationalTest.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-//
-// 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:
-//
-//
-PRINT example CommDb Protect test
-PRINT 
-//
-run_script z:\TestData\scripts\esock_test_unloadesock.script
-CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
-run_script z:\TestData\scripts\esock_test_loadesock.script
-
-LOAD_SUITE TS_CommDb.dll
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_059_01
-TEST_COMPLETE
-
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/Corrupt.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2042 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-    <Network operation="add">
-        <Name>mRouter</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>NT RAS with Null Modem</Name>
-        <IAPService>DialOutISP.NT RAS</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>CSD IAP PlaceHolder01</Name>
-        <IAPService>DialOutISP.ISP01</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>CSD IAP PlaceHolder02</Name>
-        <IAPService>DialOutISP.ISP02</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>GPRS IAP PlaceHolder01</Name>
-        <IAPService>OutgoingGPRS.GPRS01</IAPService>
-        <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>GPRS IAP PlaceHolder02</Name>
-        <IAPService>OutgoingGPRS.GPRS02</IAPService>
-        <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>mRouter Rs232</Name>
-        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
-        <IAPBearer>ModemBearer.mRouterRs232Bearer</IAPBearer>
-        <IAPNetwork>Network.mRouter</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>mRouter Ir</Name>
-        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
-        <IAPBearer>ModemBearer.mRouterIrBearer</IAPBearer>
-        <IAPNetwork>Network.mRouter</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>mRouter BT</Name>
-        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
-        <IAPBearer>ModemBearer.mRouterBtBearer</IAPBearer>
-        <IAPNetwork>Network.mRouter</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>mRouter USB</Name>
-        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
-        <IAPBearer>ModemBearer.mRouterUsbBearer</IAPBearer>
-        <IAPNetwork>Network.mRouter</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>mRouter Wins</Name>
-        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
-        <IAPBearer>ModemBearer.mRouterWinsBearer</IAPBearer>
-        <IAPNetwork>Network.mRouter</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>VPN IAP</Name>
-        <IAPService>VpnService.VPN1</IAPService>
-        <IAPBearer>VirtualBearer.VPN Bearer1</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>EKA1 Assabet on-board ethernet</Name>
-        <IAPService>LANService.Ethernet</IAPService>
-        <IAPBearer>LANBearer.EKA1 Assabet on-board Ethernet</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>EKA2 Assabet on-board ethernet</Name>
-        <IAPService>LANService.Ethernet</IAPService>
-        <IAPBearer>LANBearer.EKA2 Assabet on-board Ethernet</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>EKA1 emulator ethernet</Name>
-        <IAPService>LANService.Ethernet</IAPService>
-        <IAPBearer>LANBearer.EKA1 emulator Ethernet</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>EKA2 emulator ethernet</Name>
-        <IAPService>LANService.Ethernet</IAPService>
-        <IAPBearer>LANBearer.EKA2 emulator Ethernet</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>0</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>Null Modem 115200bps</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>US Robotics Sportster</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>57600</Rate>
-        <Handshaking>244</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT&amp;F1</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT&amp;d2</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>Dacom Surfer</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>57600</Rate>
-        <Handshaking>244</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT&amp;F</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT&amp;d2</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GSM Mobile Phone via Infrared</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>IRCOMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>IRCOMM</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>196</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GSM Mobile Phone via Serial</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>19200</Rate>
-        <Handshaking>196</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GPRS Ericsson R520m via IR</Name>
-        <Agent>PSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>IRCOMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>IRCOMM</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GPRS Ericsson R520m/T68i via Serial</Name>
-        <Agent>PSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>19200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <IspInitString>*99***1#</IspInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GPRS Motorola Mobile Phone via Serial</Name>
-        <Agent>PSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>57600</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>WinTunnel Modem</Name>
-        <Agent>null.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::6</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>mRouterWinsBearer</Name>
-        <Agent>mRouterAgent.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>WINS::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>WINSCSY</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>mRouterRs232Bearer</Name>
-        <Agent>mRouterAgent.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>mRouterIrBearer</Name>
-        <Agent>mRouterAgent.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>IRCOMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>IRCOMM</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>mRouterBtBearer</Name>
-        <Agent>mRouterAgent.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>BTCOMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>BTCOMM</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>mRouterUsbBearer</Name>
-        <Agent>mRouterAgent.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>ACM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECACM</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
-    <LANBearer operation="add">
-        <Name>EKA1 Assabet on-board Ethernet</Name>
-        <Agent>nullagt.agt</Agent>
-        <IfName>ethint</IfName>
-        <LDDName>EtherCard</LDDName>
-        <PDDName>EtherCard.Smc</PDDName>
-        <LDDFilename>ethercard</LDDFilename>
-        <PDDFilename>EtherSmc</PDDFilename>
-        <PacketDriverName>EtherPkt.drv</PacketDriverName>
-        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
-    </LANBearer>
-    <LANBearer operation="add">
-        <Name>EKA2 Assabet on-board Ethernet</Name>
-        <Agent>nullagt.agt</Agent>
-        <IfName>ethint</IfName>
-        <LDDName>Ethernet</LDDName>
-        <PDDName>Ethernet.Assabet</PDDName>
-        <LDDFilename>enet</LDDFilename>
-        <PDDFilename>ethernet</PDDFilename>
-        <PacketDriverName>EtherPkt.drv</PacketDriverName>
-        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
-    </LANBearer>
-    <LANBearer operation="add">
-        <Name>EKA1 emulator Ethernet</Name>
-        <Agent>nullagt.agt</Agent>
-        <IfName>ethint</IfName>
-        <LDDName>Ethercard</LDDName>
-        <PDDName>Ethercard.wins</PDDName>
-        <LDDFilename>ethercard</LDDFilename>
-        <PDDFilename>etherwins</PDDFilename>
-        <PacketDriverName>EtherPkt.drv</PacketDriverName>
-        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
-    </LANBearer>
-    <LANBearer operation="add">
-        <Name>EKA2 emulator Ethernet</Name>
-        <Agent>nullagt.agt</Agent>
-        <IfName>ethint</IfName>
-        <LDDName>Ethernet</LDDName>
-        <PDDName>Ethernet.Wins</PDDName>
-        <LDDFilename>enet</LDDFilename>
-        <PDDFilename>ethernet</PDDFilename>
-        <PacketDriverName>EtherPkt.drv</PacketDriverName>
-        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
-    </LANBearer>
-</LANBearerTable>
-
-<LANServiceTable>
-    <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip,ip6</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>194.72.6.1</IpGateway>
-        <IpAddr>192.168.0.100</IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.52</IpNameServer2>
-    </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="template">
-        <Name>Default Dial In ISP</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Dial In ISP01</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="template">
-        <Name>Default Dial Out ISP</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>TRUE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>NT RAS</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>TRUE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Description>Test</Description>
-        <Type>INTERNETONLY</Type>
-        <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND &quot;CLIENT&quot;+&lt;0x0d&gt;\nWAIT 3\n{\n&quot;SERVER&quot; OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>ISP01</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Description>PlaceHolder for ISP01</Description>
-        <Type>INTERNETONLY</Type>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>xxx</IfAuthName>
-        <IfAuthPass>yyy</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>ISP02</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Description>PlaceHolder for ISP02</Description>
-        <Type>INTERNETONLY</Type>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>xxx</IfAuthName>
-        <IfAuthPass>yyy</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>ISP03</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Description>PlaceHolder for ISP03</Description>
-        <Type>INTERNETONLY</Type>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>xxx</IfAuthName>
-        <IfAuthPass>yyy</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>ISP04</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Description>PlaceHolder for ISP04</Description>
-        <Type>INTERNETONLY</Type>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>xxx</IfAuthName>
-        <IfAuthPass>yyy</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>ISP05</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Description>PlaceHolder for ISP05</Description>
-        <Type>INTERNETONLY</Type>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>xxx</IfAuthName>
-        <IfAuthPass>yyy</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>mRouterDialOutIsp</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Description>mRouterDialOutIsp</Description>
-        <Type>INTERNETONLY</Type>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>IfAuthPass=</IfAuthName>
-        <IfAuthPass>AuthRetries=0</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
-    <CDMA2000PacketService operation="add">
-        <Name>test name cdma2000</Name>
-        <IwfName>Test2000</IwfName>
-        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
-        <PdpType>IPV4</PdpType>
-        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
-        <ReqRevPriority>PRIORITY04</ReqRevPriority>
-        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
-        <ReqRevBitrate>32KBPS</ReqRevBitrate>
-        <ReqFwdLoss>LOSS1</ReqFwdLoss>
-        <ReqRevLoss>LOSS1</ReqRevLoss>
-        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
-        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
-        <MinFwdBitrate>32KBPS</MinFwdBitrate>
-        <MinRevBitrate>32KBPS</MinRevBitrate>
-        <AccptFwdLoss>LOSS2</AccptFwdLoss>
-        <AccptRevLoss>LOSS2</AccptRevLoss>
-        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
-        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <AuthRetries>1</AuthRetries>
-        <IpNetMask>0.255.255.255</IpNetMask>
-        <IpGateway>10.0.0.1</IpGateway>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <ApType>2</ApType>
-        <QosWarningTimeout>1000000</QosWarningTimeout>
-        <RlpMode>TRANSPARENT</RlpMode>
-        <CDMANaiType>0</CDMANaiType>
-    </CDMA2000PacketService>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
-    <Chargecard operation="add">
-        <Name>Dummy BT Chargecard</Name>
-        <AccountNumber>144,12345678</AccountNumber>
-        <Pin>0000</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>HFG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-    <Chargecard operation="add">
-        <Name>Dummy Mercury Chargecard</Name>
-        <AccountNumber>0500800800,,12345678</AccountNumber>
-        <Pin>****</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>J,K,0FG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable1</Name>
-        <Ranking>0</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>PROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.NT RAS with Null Modem</IAPRef>
-    </ConnectionPreferences>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable2</Name>
-        <Ranking>1</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>PROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.NT RAS with Null Modem</IAPRef>
-    </ConnectionPreferences>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <WAPAccess>WAPAccessPoint.Default Dial In ISP</WAPAccess>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsBearer>2</SmsBearer>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>2</ConnectionAttempts>
-        <ModemForDataAndFax>2</ModemForDataAndFax>
-        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
-        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
-        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.Intranet</DefaultNetwork>
-        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-    <IncomingGPRS operation="add">
-        <Name>Incoming GPRS Settings PlaceHolder</Name>
-        <APN>Test</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>0.0.0.0</PDPAddress>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>1</ReqPrecedence>
-        <ReqDelay>1</ReqDelay>
-        <ReqReliability>1</ReqReliability>
-        <ReqPeakThroughput>1</ReqPeakThroughput>
-        <ReqMeanThroughput>1</ReqMeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNameServer1>0.0.0.0</IpNameServer1>
-        <IpNameServer2>0.0.0.0</IpNameServer2>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-    </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS01</Name>
-        <APN>gprs01APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS02</Name>
-        <APN>gprs02APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS03</Name>
-        <APN>gprs03APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-    <DefaultGPRS operation="add">
-        <Name>Dummy Default GPRS Settings</Name>
-        <APN>Access point name</APN>
-        <PDPType>IPV6</PDPType>
-        <PDPAddress>www.wid.com</PDPAddress>
-        <Usage>1</Usage>
-        <Precedence>1</Precedence>
-        <Delay>1</Delay>
-        <Reliability>1</Reliability>
-        <PeakThroughput>1</PeakThroughput>
-        <MeanThroughput>1</MeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-    </DefaultGPRS>
-</DefaultGPRSTable>
-
-<ProxyTable>
-    <Proxy operation="add">
-        <Name>ProxyTable1</Name>
-        <ISPRef>DialOutISP.NT RAS</ISPRef>
-        <UseProxyServer>TRUE</UseProxyServer>
-        <ProtocolName>http</ProtocolName>
-        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
-        <PortNumber>80</PortNumber>
-        <Exceptions>www.dummyproxy.com/exception</Exceptions>
-    </Proxy>
-</ProxyTable>
-
-<LocationTable>
-    <Location operation="template">
-        <Name>Default Location</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-        <DialOutCode>9,</DialOutCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office Direct Dial</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-    </Location>
-    <Location operation="add">
-        <Name>Mobile</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Home</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>TRUE</UsePulseDial>
-        <WaitForDialTone>TRUE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>181</AreaCode>
-    </Location>
-</LocationTable>
-
-<SecureSocketTable>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable1</Name>
-        <ProtocolName>ssl3.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable2</Name>
-        <ProtocolName>tls1.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-    <WAPAccessPoint operation="template">
-        <Name>Default Dial In ISP</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-    </WAPAccessPoint>
-    <WAPAccessPoint operation="add">
-        <Name>Dummy WAP Settings</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-        <StartPage>www.wapstart.com</StartPage>
-    </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-    <WAPIPBearer operation="template">
-        <Name>WAPIPBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.-1</IAPRef>
-        <ProxyPortNumber>0</ProxyPortNumber>
-    </WAPIPBearer>
-    <WAPIPBearer operation="add">
-        <Name>WAPIPBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
-        <GatewayAddress>www.wapgateway.com</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.CSD IAP PlaceHolder01</IAPRef>
-        <ProxyPortNumber>1</ProxyPortNumber>
-    </WAPIPBearer>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-    <WAPSMSBearer operation="template">
-        <Name>WAPSMSBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-    </WAPSMSBearer>
-    <WAPSMSBearer operation="add">
-        <Name>WAPSMSBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
-        <GatewayAddress>+442079460221</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <ServiceCentreAddress>+442079460223</ServiceCentreAddress>
-    </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-    <VirtualBearer operation="template">
-        <Name>Default VPN Bearer</Name>
-        <Agent>VPN.agt</Agent>
-        <IfName>VPN.nif</IfName>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-    </VirtualBearer>
-    <VirtualBearer operation="add">
-        <Name>VPN Bearer1</Name>
-        <Agent>ntras.agt</Agent>
-        <IfName>ppp.nif</IfName>
-        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
-    </VirtualBearer>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-    <VpnService operation="template">
-        <Name>Default VPN</Name>
-        <Policy>DefaultVPNpolicy</Policy>
-        <HomeIAP>IAP.NT RAS with Null Modem</HomeIAP>
-        <HomeNetwork>Network.-1</HomeNetwork>
-    </VpnService>
-    <VpnService operation="add">
-        <Name>VPN1</Name>
-        <Policy>VPNpolicy1</Policy>
-        <HomeIAP>IAP.CSD IAP PlaceHolder01</HomeIAP>
-        <HomeNetwork>Network.Intranet</HomeNetwork>
-    </VpnService>
-</VpnServiceTable>
-
-<WLANServiceExtensionTable>
-</WLANServiceExtensionTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/Default.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2043 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-    <Network operation="add">
-        <Name>mRouter</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>NT RAS with Null Modem</Name>
-        <IAPService>DialOutISP.NT RAS</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>CSD IAP PlaceHolder01</Name>
-        <IAPService>DialOutISP.ISP01</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>CSD IAP PlaceHolder02</Name>
-        <IAPService>DialOutISP.ISP02</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>GPRS IAP PlaceHolder01</Name>
-        <IAPService>OutgoingGPRS.GPRS01</IAPService>
-        <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>GPRS IAP PlaceHolder02</Name>
-        <IAPService>OutgoingGPRS.GPRS02</IAPService>
-        <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>mRouter Rs232</Name>
-        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
-        <IAPBearer>ModemBearer.mRouterRs232Bearer</IAPBearer>
-        <IAPNetwork>Network.mRouter</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>mRouter Ir</Name>
-        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
-        <IAPBearer>ModemBearer.mRouterIrBearer</IAPBearer>
-        <IAPNetwork>Network.mRouter</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>mRouter BT</Name>
-        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
-        <IAPBearer>ModemBearer.mRouterBtBearer</IAPBearer>
-        <IAPNetwork>Network.mRouter</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>mRouter USB</Name>
-        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
-        <IAPBearer>ModemBearer.mRouterUsbBearer</IAPBearer>
-        <IAPNetwork>Network.mRouter</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>mRouter Wins</Name>
-        <IAPService>DialOutISP.mRouterDialOutIsp</IAPService>
-        <IAPBearer>ModemBearer.mRouterWinsBearer</IAPBearer>
-        <IAPNetwork>Network.mRouter</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>VPN IAP</Name>
-        <IAPService>VpnService.VPN1</IAPService>
-        <IAPBearer>VirtualBearer.VPN Bearer1</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>EKA1 Assabet on-board ethernet</Name>
-        <IAPService>LANService.Ethernet</IAPService>
-        <IAPBearer>LANBearer.EKA1 Assabet on-board Ethernet</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>EKA2 Assabet on-board ethernet</Name>
-        <IAPService>LANService.Ethernet</IAPService>
-        <IAPBearer>LANBearer.EKA2 Assabet on-board Ethernet</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>EKA1 emulator ethernet</Name>
-        <IAPService>LANService.Ethernet</IAPService>
-        <IAPBearer>LANBearer.EKA1 emulator Ethernet</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>EKA2 emulator ethernet</Name>
-        <IAPService>LANService.Ethernet</IAPService>
-        <IAPBearer>LANBearer.EKA2 emulator Ethernet</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>0</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>Null Modem 115200bps</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>US Robotics Sportster</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>57600</Rate>
-        <Handshaking>244</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT&amp;F1</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT&amp;d2</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>Dacom Surfer</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>57600</Rate>
-        <Handshaking>244</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT&amp;F</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT&amp;d2</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GSM Mobile Phone via Infrared</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>IRCOMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>IRCOMM</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>196</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GSM Mobile Phone via Serial</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>19200</Rate>
-        <Handshaking>196</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GPRS Ericsson R520m via IR</Name>
-        <Agent>PSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>IRCOMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>IRCOMM</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GPRS Ericsson R520m/T68i via Serial</Name>
-        <Agent>PSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>19200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <IspInitString>*99***1#</IspInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GPRS Motorola Mobile Phone via Serial</Name>
-        <Agent>PSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>57600</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>WinTunnel Modem</Name>
-        <Agent>null.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::6</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>mRouterWinsBearer</Name>
-        <Agent>mRouterAgent.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>WINS::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>WINSCSY</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>mRouterRs232Bearer</Name>
-        <Agent>mRouterAgent.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>mRouterIrBearer</Name>
-        <Agent>mRouterAgent.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>IRCOMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>IRCOMM</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>mRouterBtBearer</Name>
-        <Agent>mRouterAgent.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>BTCOMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>BTCOMM</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>mRouterUsbBearer</Name>
-        <Agent>mRouterAgent.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>ACM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECACM</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-        <SIRSettings>0</SIRSettings>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
-    <LANBearer operation="add">
-        <Name>EKA1 Assabet on-board Ethernet</Name>
-        <Agent>nullagt.agt</Agent>
-        <IfName>ethint</IfName>
-        <LDDName>EtherCard</LDDName>
-        <PDDName>EtherCard.Smc</PDDName>
-        <LDDFilename>ethercard</LDDFilename>
-        <PDDFilename>EtherSmc</PDDFilename>
-        <PacketDriverName>EtherPkt.drv</PacketDriverName>
-        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
-    </LANBearer>
-    <LANBearer operation="add">
-        <Name>EKA2 Assabet on-board Ethernet</Name>
-        <Agent>nullagt.agt</Agent>
-        <IfName>ethint</IfName>
-        <LDDName>Ethernet</LDDName>
-        <PDDName>Ethernet.Assabet</PDDName>
-        <LDDFilename>enet</LDDFilename>
-        <PDDFilename>ethernet</PDDFilename>
-        <PacketDriverName>EtherPkt.drv</PacketDriverName>
-        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
-    </LANBearer>
-    <LANBearer operation="add">
-        <Name>EKA1 emulator Ethernet</Name>
-        <Agent>nullagt.agt</Agent>
-        <IfName>ethint</IfName>
-        <LDDName>Ethercard</LDDName>
-        <PDDName>Ethercard.wins</PDDName>
-        <LDDFilename>ethercard</LDDFilename>
-        <PDDFilename>etherwins</PDDFilename>
-        <PacketDriverName>EtherPkt.drv</PacketDriverName>
-        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
-    </LANBearer>
-    <LANBearer operation="add">
-        <Name>EKA2 emulator Ethernet</Name>
-        <Agent>nullagt.agt</Agent>
-        <IfName>ethint</IfName>
-        <LDDName>Ethernet</LDDName>
-        <PDDName>Ethernet.Wins</PDDName>
-        <LDDFilename>enet</LDDFilename>
-        <PDDFilename>ethernet</PDDFilename>
-        <PacketDriverName>EtherPkt.drv</PacketDriverName>
-        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
-    </LANBearer>
-</LANBearerTable>
-
-<LANServiceTable>
-    <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip,ip6</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>194.72.6.1</IpGateway>
-        <IpAddr>192.168.0.100</IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.52</IpNameServer2>
-    </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="template">
-        <Name>Default Dial In ISP</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Dial In ISP01</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="template">
-        <Name>Default Dial Out ISP</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>TRUE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>NT RAS</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>TRUE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Description>Test</Description>
-        <Type>INTERNETONLY</Type>
-        <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND &quot;CLIENT&quot;+&lt;0x0d&gt;\nWAIT 3\n{\n&quot;SERVER&quot; OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>ISP01</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Description>PlaceHolder for ISP01</Description>
-        <Type>INTERNETONLY</Type>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>xxx</IfAuthName>
-        <IfAuthPass>yyy</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>ISP02</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Description>PlaceHolder for ISP02</Description>
-        <Type>INTERNETONLY</Type>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>xxx</IfAuthName>
-        <IfAuthPass>yyy</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>ISP03</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Description>PlaceHolder for ISP03</Description>
-        <Type>INTERNETONLY</Type>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>xxx</IfAuthName>
-        <IfAuthPass>yyy</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>ISP04</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Description>PlaceHolder for ISP04</Description>
-        <Type>INTERNETONLY</Type>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>xxx</IfAuthName>
-        <IfAuthPass>yyy</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>ISP05</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Description>PlaceHolder for ISP05</Description>
-        <Type>INTERNETONLY</Type>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>xxx</IfAuthName>
-        <IfAuthPass>yyy</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>mRouterDialOutIsp</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Description>mRouterDialOutIsp</Description>
-        <Type>INTERNETONLY</Type>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>IfAuthPass=</IfAuthName>
-        <IfAuthPass>AuthRetries=0</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
-    <CDMA2000PacketService operation="add">
-        <Name>test name cdma2000</Name>
-        <IwfName>Test2000</IwfName>
-        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
-        <PdpType>IPV4</PdpType>
-        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
-        <ReqRevPriority>PRIORITY04</ReqRevPriority>
-        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
-        <ReqRevBitrate>32KBPS</ReqRevBitrate>
-        <ReqFwdLoss>LOSS1</ReqFwdLoss>
-        <ReqRevLoss>LOSS1</ReqRevLoss>
-        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
-        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
-        <MinFwdBitrate>32KBPS</MinFwdBitrate>
-        <MinRevBitrate>32KBPS</MinRevBitrate>
-        <AccptFwdLoss>LOSS2</AccptFwdLoss>
-        <AccptRevLoss>LOSS2</AccptRevLoss>
-        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
-        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <AuthRetries>1</AuthRetries>
-        <IpNetMask>0.255.255.255</IpNetMask>
-        <IpGateway>10.0.0.1</IpGateway>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <ApType>2</ApType>
-        <QosWarningTimeout>1000000</QosWarningTimeout>
-        <RlpMode>TRANSPARENT</RlpMode>
-        <CDMANaiType>0</CDMANaiType>
-    </CDMA2000PacketService>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
-    <Chargecard operation="add">
-        <Name>Dummy BT Chargecard</Name>
-        <AccountNumber>144,12345678</AccountNumber>
-        <Pin>0000</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>HFG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-    <Chargecard operation="add">
-        <Name>Dummy Mercury Chargecard</Name>
-        <AccountNumber>0500800800,,12345678</AccountNumber>
-        <Pin>****</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>J,K,0FG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable1</Name>
-        <Ranking>0</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>PROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.NT RAS with Null Modem</IAPRef>
-    </ConnectionPreferences>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable2</Name>
-        <Ranking>1</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>PROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.NT RAS with Null Modem</IAPRef>
-    </ConnectionPreferences>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <WAPAccess>WAPAccessPoint.Default Dial In ISP</WAPAccess>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsBearer>2</SmsBearer>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>2</ConnectionAttempts>
-        <ModemForDataAndFax>2</ModemForDataAndFax>
-        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
-        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
-        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.Intranet</DefaultNetwork>
-        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-    <IncomingGPRS operation="add">
-        <Name>Incoming GPRS Settings PlaceHolder</Name>
-        <APN>Test</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>0.0.0.0</PDPAddress>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>1</ReqPrecedence>
-        <ReqDelay>1</ReqDelay>
-        <ReqReliability>1</ReqReliability>
-        <ReqPeakThroughput>1</ReqPeakThroughput>
-        <ReqMeanThroughput>1</ReqMeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNameServer1>0.0.0.0</IpNameServer1>
-        <IpNameServer2>0.0.0.0</IpNameServer2>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-    </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS01</Name>
-        <APN>gprs01APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS02</Name>
-        <APN>gprs02APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS03</Name>
-        <APN>gprs03APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-    <DefaultGPRS operation="add">
-        <Name>Dummy Default GPRS Settings</Name>
-        <APN>Access point name</APN>
-        <PDPType>IPV6</PDPType>
-        <PDPAddress>www.wid.com</PDPAddress>
-        <Usage>1</Usage>
-        <Precedence>1</Precedence>
-        <Delay>1</Delay>
-        <Reliability>1</Reliability>
-        <PeakThroughput>1</PeakThroughput>
-        <MeanThroughput>1</MeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-    </DefaultGPRS>
-</DefaultGPRSTable>
-
-<ProxyTable>
-    <Proxy operation="add">
-        <Name>ProxyTable1</Name>
-        <ISPRef>DialOutISP.NT RAS</ISPRef>
-        <UseProxyServer>TRUE</UseProxyServer>
-        <ProtocolName>http</ProtocolName>
-        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
-        <PortNumber>80</PortNumber>
-        <Exceptions>www.dummyproxy.com/exception</Exceptions>
-    </Proxy>
-</ProxyTable>
-
-<LocationTable>
-    <Location operation="template">
-        <Name>Default Location</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-        <DialOutCode>9,</DialOutCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office Direct Dial</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-    </Location>
-    <Location operation="add">
-        <Name>Mobile</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Home</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>TRUE</UsePulseDial>
-        <WaitForDialTone>TRUE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>181</AreaCode>
-    </Location>
-</LocationTable>
-
-<SecureSocketTable>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable1</Name>
-        <ProtocolName>ssl3.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable2</Name>
-        <ProtocolName>tls1.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-    <WAPAccessPoint operation="template">
-        <Name>Default Dial In ISP</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-    </WAPAccessPoint>
-    <WAPAccessPoint operation="add">
-        <Name>Dummy WAP Settings</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-        <StartPage>www.wapstart.com</StartPage>
-    </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-    <WAPIPBearer operation="template">
-        <Name>WAPIPBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.-1</IAPRef>
-        <ProxyPortNumber>0</ProxyPortNumber>
-    </WAPIPBearer>
-    <WAPIPBearer operation="add">
-        <Name>WAPIPBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
-        <GatewayAddress>www.wapgateway.com</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.CSD IAP PlaceHolder01</IAPRef>
-        <ProxyPortNumber>1</ProxyPortNumber>
-    </WAPIPBearer>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-    <WAPSMSBearer operation="template">
-        <Name>WAPSMSBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-    </WAPSMSBearer>
-    <WAPSMSBearer operation="add">
-        <Name>WAPSMSBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
-        <GatewayAddress>+442079460221</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <ServiceCentreAddress>+442079460223</ServiceCentreAddress>
-    </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-    <VirtualBearer operation="template">
-        <Name>Default VPN Bearer</Name>
-        <Agent>VPN.agt</Agent>
-        <IfName>VPN.nif</IfName>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-    </VirtualBearer>
-    <VirtualBearer operation="add">
-        <Name>VPN Bearer1</Name>
-        <Agent>ntras.agt</Agent>
-        <IfName>ppp.nif</IfName>
-        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
-    </VirtualBearer>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-    <VpnService operation="template">
-        <Name>Default VPN</Name>
-        <Policy>DefaultVPNpolicy</Policy>
-        <HomeIAP>IAP.NT RAS with Null Modem</HomeIAP>
-        <HomeNetwork>Network.-1</HomeNetwork>
-    </VpnService>
-    <VpnService operation="add">
-        <Name>VPN1</Name>
-        <Policy>VPNpolicy1</Policy>
-        <HomeIAP>IAP.CSD IAP PlaceHolder01</HomeIAP>
-        <HomeNetwork>Network.Intranet</HomeNetwork>
-    </VpnService>
-</VpnServiceTable>
-
-<WLANServiceExtensionTable>
-</WLANServiceExtensionTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/Default1.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,357 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-</NetworkTable>
-
-<IAPTable>
-</IAPTable>
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>0</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
-</LANBearerTable>
-
-<LANServiceTable>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="add">
-        <Name>Record #1</Name>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Record #2</Name>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Record #3</Name>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Record #4 (Read Only)</Name>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Record #5 (Read Only)</Name>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-    </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="add">
-        <Name>Record #1</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>TRUE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Description>Isp #1</Description>
-        <Type>INTERNETANDWAP</Type>
-        <DisplayPCT>TRUE</DisplayPCT>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>TRUE</IfCallbackEnabled>
-        <IfCallbackInfo>Call me back</IfCallbackInfo>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <EnableSWComp>TRUE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Record #2</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>TRUE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>Record #3</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>TRUE</UseLoginScript>
-        <PromptForLogin>TRUE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <DisplayPCT>TRUE</DisplayPCT>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>TRUE</IfCallbackEnabled>
-        <IfCallbackInfo>Call me back</IfCallbackInfo>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <EnableSWComp>TRUE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>UNSPECIFIED</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-    </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="add">
-        <Name>Record #5</Name>
-        <APN>Test</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>2</ReqPrecedence>
-        <ReqDelay>4</ReqDelay>
-        <ReqReliability>3</ReqReliability>
-        <ReqPeakThroughput>3</ReqPeakThroughput>
-        <ReqMeanThroughput>31</ReqMeanThroughput>
-        <MinPrecedence>2</MinPrecedence>
-        <MinDelay>4</MinDelay>
-        <MinReliability>3</MinReliability>
-        <MinPeakThroughput>3</MinPeakThroughput>
-        <MinMeanThroughput>31</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.51</IpNameServer2>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>Record #6</Name>
-<APN>TheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDog1234</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>New Record</PDPAddress>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>2</ReqPrecedence>
-        <ReqDelay>4</ReqDelay>
-        <ReqReliability>3</ReqReliability>
-        <ReqPeakThroughput>3</ReqPeakThroughput>
-        <ReqMeanThroughput>31</ReqMeanThroughput>
-        <MinPrecedence>2</MinPrecedence>
-        <MinDelay>4</MinDelay>
-        <MinReliability>3</MinReliability>
-        <MinPeakThroughput>3</MinPeakThroughput>
-        <MinMeanThroughput>31</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <GprsUseEdge>TRUE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>-1</QosWarningTimeout>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-</DefaultGPRSTable>
-
-<ProxyTable>
-</ProxyTable>
-
-<LocationTable>
-</LocationTable>
-
-<SecureSocketTable>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/Default7.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-</NetworkTable>
-
-<IAPTable>
-</IAPTable>
-
-<ModemBearerTable>
-</ModemBearerTable>
-
-<LANBearerTable>
-</LANBearerTable>
-
-<LANServiceTable>
-</LANServiceTable>
-
-<DialInISPTable>
-</DialInISPTable>
-
-<DialOutISPTable>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-</DefaultGPRSTable>
-
-<ProxyTable>
-</ProxyTable>
-
-<LocationTable>
-</LocationTable>
-
-<SecureSocketTable>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/PanicTest.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-//
-// 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:
-//
-//
-PRINT example CommDb Protect test
-PRINT 
-//
-MULTITHREAD
-//
-LOAD_SUITE TS_CommDb.dll
-
-
-RUN_PANIC_STEP 10000, TS_CommDb,step_060_01
-TEST_COMPLETE
-
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/ProtectRecord-ConnPref.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-//
-// 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:
-//
-//
-PRINT example CommDb Protect test
-PRINT 
-//
-run_script z:\TestData\scripts\esock_test_unloadesock.script
-CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
-run_script z:\TestData\scripts\esock_test_loadesock.script
-
-LOAD_SUITE TS_CommDb.dll
-
-RUN_TEST_STEP -1, TS_CommDb,step_054_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_054_02
-TEST_COMPLETE
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/ProtectRecord-Normal.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-//
-// 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:
-//
-//
-PRINT example CommDb Protect test
-PRINT 
-//
-run_script z:\TestData\scripts\esock_test_unloadesock.script
-CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
-run_script z:\TestData\scripts\esock_test_loadesock.script
-
-LOAD_SUITE TS_CommDb.dll
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_052_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_052_02
-TEST_COMPLETE
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/ProtectTable-ConnPref.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-//
-// 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:
-//
-//
-PRINT example CommDb Protect test
-PRINT 
-//
-run_script z:\TestData\scripts\esock_test_unloadesock.script
-CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
-run_script z:\TestData\scripts\esock_test_loadesock.script
-
-LOAD_SUITE TS_CommDb.dll
-LOAD_SUITE ts_connpref.dll
-
-RUN_TEST_STEP -1, ts_connpref, ConstructAndVersion
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, ts_connpref, SetAndGetConnPrefs
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, ts_connpref, ComparePrefs
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, ts_connpref, AssignAndCopyConstruct
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, ts_connpref, ExtensionIdAndCast
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, ts_connpref, MultiConnPref
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, ts_connpref, MultiConnPrefVersion
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, ts_connpref, MultiConnectionAttempts
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,   step_053_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,  step_053_02
-TEST_COMPLETE
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/ProtectTable-Normal.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-//
-// 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:
-//
-//
-PRINT example CommDb Protect test
-PRINT 
-//
-run_script z:\TestData\scripts\esock_test_unloadesock.script
-CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
-run_script z:\TestData\scripts\esock_test_loadesock.script
-
-LOAD_SUITE TS_CommDb.dll
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_051_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_051_02
-TEST_COMPLETE
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/TestProtectRecord-ConnPref.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-//
-// 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:
-//
-//
-PRINT example CommDb Protect test
-PRINT 
-//
-run_script z:\TestData\scripts\esock_test_unloadesock.script
-CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
-run_script z:\TestData\scripts\esock_test_loadesock.script
-
-LOAD_SUITE TS_CommDb.dll
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_058_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_058_02
-TEST_COMPLETE
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/TestProtectRecord-Normal.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-//
-// 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:
-//
-//
-PRINT example CommDb Protect test
-PRINT 
-//
-run_script z:\TestData\scripts\esock_test_unloadesock.script
-CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
-run_script z:\TestData\scripts\esock_test_loadesock.script
-
-LOAD_SUITE TS_CommDb.dll
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_056_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_056_02
-TEST_COMPLETE
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/TestProtectTable-ConnPref.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-//
-// 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:
-//
-//
-PRINT example CommDb Protect test
-PRINT 
-//
-run_script z:\TestData\scripts\esock_test_unloadesock.script
-CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
-run_script z:\TestData\scripts\esock_test_loadesock.script
-
-LOAD_SUITE TS_CommDb.dll
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_057_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_057_02
-TEST_COMPLETE
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/TestProtectTable-Normal.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-//
-// 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:
-//
-//
-PRINT example CommDb Protect test
-PRINT 
-//
-run_script z:\TestData\scripts\esock_test_unloadesock.script
-CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
-run_script z:\TestData\scripts\esock_test_loadesock.script
-
-LOAD_SUITE TS_CommDb.dll
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_055_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_055_02
-TEST_COMPLETE
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/Test_All_Protection-precommsdat.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-//
-// 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:
-//
-//
-PRINT example CommDb Protect test
-PRINT 
-//
-//run_script z:\TestData\scripts\esock_test_unloadesock.script
-CED z:\testdata\configs\Protect.xml -f
-//run_script z:\TestData\scripts\esock_test_loadesock.script
-
-LOAD_SUITE TS_CommDb.dll
-
-RUN_TEST_STEP -1, TS_CommDb,step_051_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_051_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_052_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_052_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_053_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_053_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_054_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_054_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_055_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_055_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_056_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_056_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_057_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_057_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_058_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_058_02
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_059_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_060_01
-TEST_COMPLETE
-
-//Added new test to test the fix for 
-//DEF035522: CommDb protection is easily circumvented using public APIs
-RUN_TEST_STEP -1, TS_CommDb,step_060_02
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_063_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_063_02
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_063_03
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_063_04
-TEST_COMPLETE
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/Test_All_Protection.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-//
-// 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:
-//
-//
-PRINT example CommDb Protect test
-PRINT 
-//
-//run_script z:\TestData\scripts\esock_test_unloadesock.script
-CED z:\testdata\configs\Protect.xml -f
-//run_script z:\TestData\scripts\esock_test_loadesock.script
-
-LOAD_SUITE TS_CommDb.dll
-
-RUN_TEST_STEP -1, TS_CommDb,step_051_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_051_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_052_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_052_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_053_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_053_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_054_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_054_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_055_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_055_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_056_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_056_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_057_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_057_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP -1, TS_CommDb,step_058_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_058_02
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_059_01
-TEST_COMPLETE
-
-//This TC panics because the __ASSERT_DEBUG in the RollbackTransaction method
-//RUN_TEST_STEP -1, TS_CommDb,step_060_01
-//TEST_COMPLETE
-
-//Added new test to test the fix for 
-//DEF035522: CommDb protection is easily circumvented using public APIs
-RUN_TEST_STEP -1, TS_CommDb,step_060_02
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_063_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_063_02
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_063_03
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_063_04
-TEST_COMPLETE
-
-//Added new tests for codebase 
-RUN_TEST_STEP -1, TS_CommDb,step_063_05
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_063_06
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_063_07
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_063_08
-TEST_COMPLETE
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/Test_Both_Types.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-//
-// 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:
-//
-//
-PRINT example CommDb Protect test
-PRINT 
-//
-run_script z:\TestData\scripts\esock_test_unloadesock.script
-CED c:\test\CommDb\ts_commdb\C\Protect.xml -f
-run_script z:\TestData\scripts\esock_test_loadesock.script
-
-LOAD_SUITE TS_CommDb.dll
-
-//Protecting Normal table
-RUN_TEST_STEP -1, TS_CommDb,step_051_01
-TEST_COMPLETE
-//Protecting Connection Pref Table
-RUN_TEST_STEP -1, TS_CommDb,step_053_01
-TEST_COMPLETE
-
-//UProtecting Normal table
-RUN_TEST_STEP -1, TS_CommDb,step_051_02
-TEST_COMPLETE
-//UProtecting Connection Pref Table
-RUN_TEST_STEP -1, TS_CommDb,step_053_02
-TEST_COMPLETE
-
-//Protecting Normal Record
-RUN_TEST_STEP -1, TS_CommDb,step_052_01
-TEST_COMPLETE
-//Protecting Connection Pref Record
-RUN_TEST_STEP -1, TS_CommDb,step_054_01
-TEST_COMPLETE
-
-//UProtecting Normal Record
-RUN_TEST_STEP -1, TS_CommDb,step_052_02
-TEST_COMPLETE
-//UProtecting Connection Pref Record
-RUN_TEST_STEP -1, TS_CommDb,step_054_02
-TEST_COMPLETE
-
-
-//Test Protecting Normal table
-RUN_TEST_STEP -1, TS_CommDb,step_055_01
-TEST_COMPLETE
-//Protecting Connection Pref Table
-RUN_TEST_STEP -1, TS_CommDb,step_057_01
-TEST_COMPLETE
-
-//Test UProtecting Normal table
-RUN_TEST_STEP -1, TS_CommDb,step_055_02
-TEST_COMPLETE
-//UProtecting Connection Pref Table
-RUN_TEST_STEP -1, TS_CommDb,step_057_02
-TEST_COMPLETE
-
-//Test Protecting Normal Record
-RUN_TEST_STEP -1, TS_CommDb,step_056_01
-TEST_COMPLETE
-//TEst Protecting Connection Pref Record
-RUN_TEST_STEP -1, TS_CommDb,step_058_01
-TEST_COMPLETE
-
-//Test UProtecting Normal Record
-RUN_TEST_STEP -1, TS_CommDb,step_056_02
-TEST_COMPLETE
-//Test UProtecting Connection Pref Record
-RUN_TEST_STEP -1, TS_CommDb,step_058_02
-TEST_COMPLETE
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/cdb_udeb-precommsdat.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1004 +0,0 @@
-//
-// 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:
-//
-//
-PRINT example CommDb test
-PRINT
-
-PRINT IfAuthName needs to be replaced
-PRINT in 061_01.xml, 061_02.xml ,061_03.xml, 061_04.xml
-PRINT
-//Do all our moving round & making databases first
-
-//run_script z:\TestData\scripts\esock_test_unloadesock.script
-
-//LOAD_SUITE TS_Esock.dll
-
-run_utils copyfile z:\testdata\configs\default5.dat c:\corrupt.dat
-
-//Ready to go.
-//run protection tests
-run_script z:\testdata\scripts\test_all_protection
-
-LOAD_SUITE TS_CommDb.dll
-
-// ced processing tests.
-
-//run_script z:\TestData\scripts\esock_test_unloadesock.script
-PRINT IfAuthName needs to be replaced
-PRINT
-CED z:\testdata\configs\061_01.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_061_01
-TEST_COMPLETE
-
-PRINT IfAuthName needs to be replaced
-PRINT
-CED z:\testdata\configs\061_02.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_061_02
-TEST_COMPLETE
-
-PRINT IfAuthName needs to be replaced
-PRINT
-CED z:\testdata\configs\061_03.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_061_03
-TEST_COMPLETE
-
-PRINT IfAuthName needs to be replaced
-PRINT
-CED z:\testdata\configs\061_04.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_061_04
-TEST_COMPLETE
-
-// finished ced processing tests.
-
-// database creation tests
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_001_01
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_001_03
-TEST_COMPLETE
-
-CED z:\testdata\configs\corrupt.xml -f
-
-// Note - this test modified for 9.1 as manipulates cdbv3.dat file
-RUN_TEST_STEP 100000, TS_CommDb,step_001_04
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_001_05
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_001_07
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_001_08
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_001_09
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_001_10
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_002_01
-TEST_COMPLETE
-
-// finished database creation tests
-
-//run_script z:\TestData\scripts\esock_test_loadesock.script
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_003_01
-TEST_COMPLETE 
-
-RUN_TEST_STEP 100000, TS_CommDb,step_003_02
-TEST_COMPLETE 
-
-RUN_TEST_STEP 100000, TS_CommDb,step_003_03
-TEST_COMPLETE 
-
-RUN_TEST_STEP 100000, TS_CommDb,step_003_05
-TEST_COMPLETE 
-
-RUN_TEST_STEP 100000, TS_CommDb,step_003_06 
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_003_07 
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_004_01
-TEST_COMPLETE 
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_004_04
-TEST_COMPLETE 
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_005_01
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_005_02
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_005_03
-TEST_COMPLETE 
-RUN_TEST_STEP 1000000, TS_CommDb,step_005_04
-TEST_COMPLETE 
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_006_01
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_006_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_006_03
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_006_04
-
-CED z:\testdata\configs\default1.xml -f
-
-TEST_COMPLETE 
-RUN_TEST_STEP 1000000, TS_CommDb,step_006_05
-TEST_COMPLETE 
-      
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_007_01
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_02
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_03
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_04
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_05
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_06
-TEST_COMPLETE 
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_007_07
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_08
-TEST_COMPLETE 
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_007_09
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_10
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_11
-TEST_COMPLETE 
-RUN_TEST_STEP 100000, TS_CommDb,step_007_12
-TEST_COMPLETE 
-RUN_TEST_STEP 1000000, TS_CommDb,step_007_15
-TEST_COMPLETE 
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_007_16
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_007_17
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_008_01
-TEST_COMPLETE 
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_008_02
-TEST_COMPLETE 
-
-RUN_TEST_STEP 100000, TS_CommDb,step_008_03
-TEST_COMPLETE 
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_008_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_009_01
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_009_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_009_03
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_009_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_009_05
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_009_06
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_009_09
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_009_10
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_009_11
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_010_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_010_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_010_03
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_010_04
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_010_05
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_011_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_011_03
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_011_04
-TEST_COMPLETE
-
-
-// Step 01 and 02 not run anymore
-//RUN_TEST_STEP 100000, TS_CommDb,step_012_01
-//TEST_COMPLETE
-//RUN_TEST_STEP 100000, TS_CommDb,step_012_02
-//TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_012_03
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_012_04
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_012_05
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_012_06
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_012_07
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_013_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_013_03
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_013_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_014_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_014_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_014_03
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_015_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_015_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_015_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_015_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_015_07
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_015_08
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_015_09
-TEST_COMPLETE
-
-// TODO - these 7 tests should pass - are failing because of notifications
-
-RUN_TEST_STEP 100000, TS_CommDb,step_016_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_016_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_016_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_016_05
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_016_07
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_016_08
-TEST_COMPLETE
-
-RUN_TEST_STEP 2000000, TS_CommDb,step_016_09
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_017_01
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-// These 5 steps should pass - notifications
-
-RUN_TEST_STEP 100000, TS_CommDb,step_017_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_017_03
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_017_04
-TEST_COMPLETE
-
-
-//CED z:\testdata\configs\default1.xml -f
-
-//RUN_TEST_STEP 2000000, TS_CommDb,step_017_05
-//TEST_COMPLETE
-
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 2000000, TS_CommDb,step_017_06
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_018_01
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_018_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_018_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_018_04
-TEST_COMPLETE
-
-//CED z:\testdata\configs\default1.xml -f
-
-//RUN_TEST_STEP 1000000, TS_CommDb,step_018_05
-//TEST_COMPLETE
-
-CED z:\testdata\configs\default1.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_019_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_019_02
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_019_03
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_019_04
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_019_05
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_019_06
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_019_07
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_019_08
-TEST_COMPLETE
-
-CED z:\testdata\configs\020.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_020_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_020_02
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_020_03
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_020_04
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_020_05
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_020_06
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_020_07
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_020_08
-TEST_COMPLETE
-
-CED z:\testdata\configs\021.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_021_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_021_02
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_021_03
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_021_04
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_021_05
-TEST_COMPLETE
-
-CED z:\testdata\configs\022.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_022_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_02
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_03
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_04
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_05
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_06
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_07
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_08
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_09
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_10
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_11
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_12
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_13
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_022_14
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_022_16
-TEST_COMPLETE
-
-CED z:\testdata\configs\023.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_023_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_023_02
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_023_03
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_023_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\024.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_024_01
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_024_02
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_024_03
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_024_04
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_024_05
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_024_06
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_024_07
-TEST_COMPLETE
-RUN_TEST_STEP 100000, TS_CommDb,step_024_08
-TEST_COMPLETE
-RUN_TEST_STEP 1000000, TS_CommDb,step_024_09
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_025_01
-TEST_COMPLETE 
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_025_02
-TEST_COMPLETE 
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_026_01
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_026_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_026_03
-TEST_COMPLETE 
-
-RUN_TEST_STEP 100000, TS_CommDb,step_026_04
-TEST_COMPLETE 
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_026_05
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_026_06
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_026_07
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_026_08
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_026_09
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\022.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_027_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_027_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_028_01
-TEST_COMPLETE
- 
-RUN_TEST_STEP 100000, TS_CommDb,step_028_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_028_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_028_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_028_05
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_028_06
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_028_07
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_029_01
-TEST_COMPLETE
- 
-RUN_TEST_STEP 100000, TS_CommDb,step_029_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_029_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_030_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_030_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_030_03
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_031_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_031_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_031_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_031_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_031_05
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_032_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_032_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_032_03
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_032_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_033_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_033_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_033_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_033_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_033_05
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_034_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_034_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_034_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_034_05
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_034_06
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\default.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_035_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_035_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_035_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_035_04
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\022.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_05
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_06
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_07
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_08
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_09
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_10
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_13
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_14
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_036_15
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_036_16
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\default.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_037_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_037_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_037_03
-TEST_COMPLETE
-
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_038_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_038_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_038_03
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_039_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_039_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_040_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_040_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_040_03
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_05
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_06
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_07
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_08
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_09
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_10
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_11
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_12
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_13
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_14
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_15
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_16
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_041_17
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_041_18
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_042_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_042_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_042_03
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_043_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_043_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_043_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_043_04
-TEST_COMPLETE
-
-CED z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_043_05
-TEST_COMPLETE
-
-CED z:\testdata\configs\default.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_044_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_044_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_044_03
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_045_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_045_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 1000000, TS_CommDb,step_045_03
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\default7.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_046_01
-TEST_COMPLETE
-
-// These 3 tests need to pass.  Are broken because of transactions needing to complete differently
-
-RUN_TEST_STEP 500000, TS_CommDb,step_046_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default.xml -f
-
-RUN_TEST_STEP 500000, TS_CommDb,step_046_04
-TEST_COMPLETE
-
-// Maybe broken, too long to wait
-RUN_TEST_STEP 2000000, TS_CommDb,step_046_05
-TEST_COMPLETE
-
-
-CED z:\testdata\configs\default1.xml -f
-
-// BC tests of Modem table renaming.
-
-RUN_TEST_STEP 100000, TS_CommDb,step_062_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_062_02
-TEST_COMPLETE
-
-CED z:\testdata\configs\default.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_062_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_062_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_062_05
-TEST_COMPLETE
-
-MULTITHREAD
-
-CED z:\testdata\configs\default.xml -f
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_01
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_02
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_03
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_04
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_05
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_06
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_07
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_08
-TEST_COMPLETE
-
-RUN_TEST_STEP -1, TS_CommDb,step_047_13
-TEST_COMPLETE
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/cdb_urel.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-//
-// 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:
-//
-//run_script z:\TestData\scripts\esock_test_unloadesock.script
-
-//LOAD_SUITE TS_Esock.dll
-
-//
-PRINT example CommDb test
-PRINT 
-
-PRINT IfAuthName needs to be replaced
-PRINT in 061_01.xml, 061_02.xml ,061_03.xml, 061_04.xml
-PRINT
-//
-
-LOAD_SUITE TS_CommDb.dll
-
-PRINT IfAuthName needs to be replaced
-PRINT
-CED  z:\testdata\configs\061_01.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_061_01
-TEST_COMPLETE
-
-PRINT IfAuthName needs to be replaced
-PRINT
-CED  z:\testdata\configs\061_02.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_061_02
-TEST_COMPLETE
-
-PRINT IfAuthName needs to be replaced
-PRINT
-CED  z:\testdata\configs\061_03.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_061_03
-TEST_COMPLETE
-
-PRINT IfAuthName needs to be replaced
-PRINT
-CED  z:\testdata\configs\061_04.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_061_04
-TEST_COMPLETE
-
-
-// CED processing tests.
-
-CED  z:\testdata\configs\default1.xml -f
-
-RUN_PANIC_STEP 100000, TS_CommDb,step_003_04
-TEST_COMPLETE 
-
-RUN_PANIC_STEP 100000, TS_CommDb,step_004_02
-TEST_COMPLETE 
-
-
-RUN_PANIC_STEP 100000, TS_CommDb,step_007_14
-TEST_COMPLETE 
-
-RUN_PANIC_STEP 100000, TS_CommDb,step_009_07
-TEST_COMPLETE 
-RUN_PANIC_STEP 100000, TS_CommDb,step_009_08
-TEST_COMPLETE 
-
-RUN_TEST_STEP 100000, TS_CommDb,step_013_02
-TEST_COMPLETE
-
-
-RUN_TEST_STEP 100000, TS_CommDb,step_015_05
-TEST_COMPLETE
-
-RUN_PANIC_STEP 100000, TS_CommDb,step_015_06
-TEST_COMPLETE
-
-CED  z:\testdata\configs\default3.xml -f
-
-RUN_TEST_STEP 100000, TS_CommDb,step_029_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_034_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_046_03
-TEST_COMPLETE
-
-// BC tests of Modem table renaming.
-RUN_TEST_STEP 100000, TS_CommDb,step_062_01
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_062_02
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_062_03
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_062_04
-TEST_COMPLETE
-
-RUN_TEST_STEP 100000, TS_CommDb,step_062_05
-TEST_COMPLETE
-
-// The following two steps should always be last two step cases for EKA2
-
-RUN_PANIC_STEP 100000, TS_CommDb,step_036_11
-TEST_COMPLETE
-
-RUN_PANIC_STEP 100000, TS_CommDb,step_036_12
-TEST_COMPLETE
-
-
-//Cleanup other files we've left
-//run_script z:\TestData\scripts\esock_test_loadesock.script
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/default3.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,640 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>record1</Name>
-        <IAPService>DialOutISP.record1</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>record2</Name>
-        <IAPService>DialOutISP.record2</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Home</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>record1</Name>
-        <IAPService>DialInISP.Default Dial In ISP</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Home</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>record2</Name>
-        <IAPService>DialInISP.record2</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.3</LocationRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>0</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>Null Modem 115200bps</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>NTRASTSY</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageValidityPeriod>0</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
-</LANBearerTable>
-
-<LANServiceTable>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="template">
-        <Name>Default Dial In ISP</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>record1</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Authentication>0</Authentication>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>record2</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <LoginScript>New Record</LoginScript>
-        <Authentication>0</Authentication>
-        <IfNetworks>ip</IfNetworks>
-        <IpAddr>New Record</IpAddr>
-        <IpNameServer1>New Record</IpNameServer1>
-        <IpNameServer2>New Record</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="template">
-        <Name>Default Dial Out ISP</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>TRUE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>record1</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>TRUE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND &quot;CLIENT&quot;+&lt;0x0d&gt;\nWAIT 3\n{\n&quot;SERVER&quot; OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>asdfs</IfAuthName>
-        <IfAuthPass>asdfas</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>9600</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>record2</Name>
-        <DialResolution>FALSE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <LoginScript>New Record</LoginScript>
-        <LoginName>New Record</LoginName>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>New Record</IfAuthName>
-        <IfAuthPass>New Record</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <IfCallbackType>IETF0</IfCallbackType>
-        <IfCallbackInfo>New Record</IfCallbackInfo>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpAddr>New Record</IpAddr>
-        <IpNameServer1>New Record</IpNameServer1>
-        <IpNameServer2>New Record</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>9600</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
-    <Chargecard operation="add">
-        <Name>New Record</Name>
-        <AccountNumber>New Record</AccountNumber>
-        <Pin>New Record</Pin>
-        <LocalRule>New Record</LocalRule>
-        <NatRule>New Record</NatRule>
-        <IntlRule>New Record</IntlRule>
-    </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsBearer>2</SmsBearer>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>2</ConnectionAttempts>
-        <ModemForDataAndFax>2</ModemForDataAndFax>
-        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
-        <LocationForDataAndFax>Location.Office Direct Dial</LocationForDataAndFax>
-        <LocationForPhoneServicesAndSMS>Location.Office Direct Dial</LocationForPhoneServicesAndSMS>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.Intranet</DefaultNetwork>
-        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="add">
-        <Name>Record #5</Name>
-        <APN>Test</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>2</ReqPrecedence>
-        <ReqDelay>4</ReqDelay>
-        <ReqReliability>3</ReqReliability>
-        <ReqPeakThroughput>3</ReqPeakThroughput>
-        <ReqMeanThroughput>31</ReqMeanThroughput>
-        <MinPrecedence>2</MinPrecedence>
-        <MinDelay>4</MinDelay>
-        <MinReliability>3</MinReliability>
-        <MinPeakThroughput>3</MinPeakThroughput>
-        <MinMeanThroughput>31</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.51</IpNameServer2>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>Record #6</Name>
-        <APN>TheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDogTheQuickBrownFoxJumpedOverTheLazyDog1234</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>New Record</PDPAddress>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>2</ReqPrecedence>
-        <ReqDelay>4</ReqDelay>
-        <ReqReliability>3</ReqReliability>
-        <ReqPeakThroughput>3</ReqPeakThroughput>
-        <ReqMeanThroughput>31</ReqMeanThroughput>
-        <MinPrecedence>2</MinPrecedence>
-        <MinDelay>4</MinDelay>
-        <MinReliability>3</MinReliability>
-        <MinPeakThroughput>3</MinPeakThroughput>
-        <MinMeanThroughput>31</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <GprsUseEdge>TRUE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>-1</QosWarningTimeout>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-    <DefaultGPRS operation="add">
-        <Name>Dummy Default GPRS Settings</Name>
-        <APN>Access point name</APN>
-        <PDPType>IPV6</PDPType>
-        <PDPAddress>www.wid.com</PDPAddress>
-        <Usage>1</Usage>
-        <Precedence>1</Precedence>
-        <Delay>1</Delay>
-        <Reliability>1</Reliability>
-        <PeakThroughput>1</PeakThroughput>
-        <MeanThroughput>1</MeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-    </DefaultGPRS>
-</DefaultGPRSTable>
-
-<ProxyTable>
-</ProxyTable>
-
-<LocationTable>
-    <Location operation="template">
-        <Name>Default Location</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office Direct Dial</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-    </Location>
-    <Location operation="add">
-        <Name>Mobile</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Home</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>TRUE</UsePulseDial>
-        <WaitForDialTone>TRUE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>181</AreaCode>
-    </Location>
-</LocationTable>
-
-<SecureSocketTable>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable1</Name>
-        <ProtocolName>ssl3.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable2</Name>
-        <ProtocolName>tls1.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-    <WAPAccessPoint operation="template">
-        <Name>Default Dial In ISP</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-    </WAPAccessPoint>
-    <WAPAccessPoint operation="add">
-        <Name>Dummy WAP Settings</Name> 
-        <CurrentBearer>WAPIPBearer</CurrentBearer> 
-        <StartPage>www.wapstart.com</StartPage> 
-    </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-    <WAPIPBearer operation="template">
-        <Name>WAPIPBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.-1</IAPRef>
-        <ProxyPortNumber>0</ProxyPortNumber>
-    </WAPIPBearer>
-    <WAPIPBearer operation="add">
-        <Name>WAPIPBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.1</AccessPoint>
-        <GatewayAddress>www.wapgateway.com</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.record2</IAPRef>
-        <ProxyPortNumber>1</ProxyPortNumber>
-    </WAPIPBearer>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-    <WAPSMSBearer operation="template">
-        <Name>WAPSMSBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-    </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/default5.dat	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-P  ¾ N 0V‘ÙÐS      %  ‡Ý	@         @	   •   
-   @   s          @   0        @      @   P        @      @   q     @5   P       @      @      @   °        @      @   Ð        @      @   ð        @      @          @      @   0       @      @   P       @      @3   0       @      @          @      @   °       @      @   Ð       @      @   ð       @      @!          @      @#   0       @      @%   P       @      @'   p       @      @)          @      @+   °       @      @-   Ð       @      @/   ð       @      @1          @      @3   0       @      @5   P       Ô^i     4NetworkIdName2Hidden  ReadOnly      IAPIdName2Hidden  ReadOnly (IAPService8IAPServiceType2$IAPBearer4IAPBearerType2(IAPNetworkLIAPNetworkWeighting Location      (DialOutISPvIdName2Hidden  ReadOnly 8DialResolution 8UseLoginScript 8PromptForLogin <IfPromptForAuth @IpAddrFromServer LIpDNSAddrFromServer ,Description 2Type 4DefaultTelNum 2,LoginScript $LoginName 2$LoginPass 2(Chargecard (DisplayPCT   IfParams 2(IfNetworks 2(IfAuthName 2(IfAuthPass 2,AuthRetries DIfCallbackEnabled  8IfCallbackType 8IfCallbackInfo 2<CallbackTimeout IpAddr 2$IpNetMask 2$IpGateway 24IpNameServer1 24IpNameServer2 2HEnableIPHeaderComp  HEnableLCPExtension  PDisablePlainTextAuth  0EnableSWComp  (BearerName ,BearerSpeed  BearerCE (InitString 2(BearerType 4ChannelCoding AIUR HRequestedTimeSlots @MaximumTimeSlots 4BearerService 8BearerProtocol (RlpVersion IwfToMs MsToIwf  AckTimer XRetransmissionAttempts @ResequencePeriod 8V42Compression 0V42Codewords 0V42MaxLength $Asymmetry <UserInitUpgrade  UseEdge       $DialInISP8IdName2Hidden  ReadOnly @IpAddrFromServer LIpDNSAddrFromServer ,Description 2Type 8UseLoginScript  ,LoginScript 8Authentication ,AuthRetries  IfParams 2(IfNetworks 2IpAddr 2$IpNetMask 2$IpGateway 24IpNameServer1 24IpNameServer2 2HEnableIPHeaderComp  HEnableLCPExtension  PDisablePlainTextAuth  0EnableSWComp  (BearerName ,BearerSpeed  BearerCE (InitString 2UseEdge   
-    8WAPAccessPointIdName2Hidden  ReadOnly 4CurrentBearer2$StartPage      ,WAPIPBearerIdHidden  ReadOnly 4AccessPointId<ProxyPortNumber8GatewayAddress 2IAP $WSPOption  Security  (ProxyLogin 24ProxyPassword 2     0WAPSMSBearerIdHidden  ReadOnly 4AccessPointId8GatewayAddress 2PServiceCentreAddress 2$WSPOption  Security       0OutgoingGPRSLIdName2Hidden  ReadOnly PDPType<IfPromptForAuth @IpAddrFromServer LIpDNSAddrFromServer APN (PDPAddress 24ReqPrecedence  ReqDelay 8ReqReliability DReqPeakThroughput DReqMeanThroughput 4MinPrecedence  MinDelay 8MinReliability DMinPeakThroughput DMinMeanThroughput <DataCompression  DHeaderCompression  ,GprsUseEdge  <AnonymousAccess   IfParams 2(IfNetworks 2(IfAuthName 2(IfAuthPass 2,AuthRetries $IpNetMask 2$IpGateway 2IpAddr 24IpNameServer1 24IpNameServer2 2HEnableLCPExtension  PDisablePlainTextAuth  LGprsAccessPointType DQosWarningTimeout      0IncomingGPRSLIdName2@@@@@@@dOnly PDPType<IfPromptForAuth @IpAddrFromServer LIpDNSAddrFromServer APN (PDPAddress 24ReqPrecedence  ReqDelay 8ReqReliability DReqPeakThroughput DReqMeanThroughput 4MinPrecedence  MinDelay 8MinReliability DMinPeakThroughput DMinMeanThroughput <DataCompression  DHeaderCompression  ,GprsUseEdge  <AnonymousAccess   IfParams 2(IfNetworks 2(IfAuthName 2(IfAuthPass 2,AuthRetries $IpNetMask 2$IpGateway 2IpAddr 24IpNameServer1 24IpNameServer2 2HEnableLCPExtension  PDisablePlainTextAuth  LGprsAccessPointType DQosWarningTimeout      (LANServiceIdName2Hidden  ReadOnly @IpAddrFromServer LIpDNSAddrFromServer (IfNetworks 2$IpNetMask 2$IpGateway 2IpAddr 24IpNameServer1 24IpNameServer2 2     ,ModemBearer˜IdName2Hidden  ReadOnly Agent 2IfName 2 PortName 2XControlChannelPortName 2TSYName 2CSYName 2 DataBits  StopBits Parity Rate ,Handshaking ,SpecialRate XonChar  XoffChar 0FaxClassPref ,SpeakerPref 8SpeakerVolPref <ModemInitString 28DataInitString 24FaxInitString 24IspInitString 2<DialPauseLength 28CarrierTimeout 2LAutoAnswerRingCount 2PSpeakerVolContorlLow 2\SpeakerVolControlMedium 2TSpeakerVolControlHigh 2@SpeakerAlwaysOff 2TSpeakerOnUntilCarrier 2<SpeakerAlwaysOn 2hSpeakerOnAfterUntilCarrier 2PDialToneWaitModifier 24CallProgress1 24CallProgress2 24CallProgress3 24CallProgress4 2EchoOff 2,VerboseText 2 QuietOff 2QuietOn 2`DialCommandStateModifier 2OnLine 2HResetConfiguration 2LReturnToFactoryDefs 2<DCDOnDuringLink 2$DTRHangUp 2,DSRAlwaysOn 2<RTSCTSHandshake 2@XonXoffHandshake 2<EscapeCharacter 2DEscapeGuardPeriod 2LFaxClassInterrogate 2 FaxClass 2(NoDialTone 2Busy 2 NoAnswer 2Carrier 2Connect 2DCompressionClass5 2DCompressionV42bis 2<CompressionNone 20ProtocolLAPD 2,ProtocolALT 2LProtocolALTCELLULAR 20ProtocolNone 2LMessageCentreNumber 2TMessageValidityPeriod TMessageDeliveryReport  HMinimumSignalLevel dLastSocketActivityTimeout `LastSessionClosedTimeout \LastSocketClosedTimeout      $LANBearerIdName2Hidden  ReadOnly Agent2IfName2LDDName2PDDName2dLastSocketActivityTimeout `LastSessionClosedTimeout \LastSocketClosedTimeout  
\ No newline at end of file
--- a/commsconfig/commsdatabaseshim/ts_commdb/scripts/protect.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>NT RAS</Name>
-        <IAPService>DialOutISP.NT RAS</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office Direct Dial</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>NTRas GPRS</Name>
-        <IAPService>OutgoingGPRS.NTRas GPRS</IAPService>
-        <IAPBearer>ModemBearer.GPRS Ericsson R520m via IR</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>iTest name cdma2000</Name>
-	<IAPService>OutgoingGPRS.NTRas GPRS</IAPService>
-        <IAPBearer>ModemBearer.GPRS Ericsson R520m via IR</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>Default Dial In ISP</Name>
-        <IAPService>DialInISP.Dial In CS ISP</IAPService>
-        <IAPBearer>ModemBearer.US Robotics Sportster</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Home</LocationRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>0</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>Null Modem 115200bps</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::3</PortName>
-        <TSYName>NTRASTSY</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageValidityPeriod>0</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>US Robotics Sportster</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>57600</Rate>
-        <Handshaking>244</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT&amp;F1</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT&amp;d2</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>Dacom Surfer</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>57600</Rate>
-        <Handshaking>244</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT&amp;F</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT&amp;d2</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GSM Mobile Phone via Infrared</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>IRCOMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>IRCOMM</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>196</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GSM Mobile Phone via Serial</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>19200</Rate>
-        <Handshaking>196</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GPRS Ericsson R520m via IR</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>IRCOMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>IRCOMM</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GPRS Ericsson R520m via Serial</Name>
-        <Agent>null.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GPRS Motorola Mobile Phone via Serial</Name>
-        <Agent>null.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>MM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>57600</Rate>
-        <Handshaking>4</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+442079460223</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
-    <LANBearer operation="add">
-        <Name>Assabet on-board Ethernet</Name>
-        <Agent>nullagent.agt</Agent>
-        <IfName>ethint</IfName>
-        <LDDName>not used</LDDName>
-        <PDDName>not used</PDDName>
-        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
-    </LANBearer>
-</LANBearerTable>
-
-<LANServiceTable>
-    <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip,ip6</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>194.72.6.1</IpGateway>
-        <IpAddr>192.168.0.100</IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.52</IpNameServer2>
-    </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="template">
-        <Name>Default Dial In ISP</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Dial In CS ISP</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="template">
-        <Name>Default Dial Out ISP</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>TRUE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>NT RAS</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>TRUE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND &quot;CLIENT&quot;+&lt;0x0d&gt;\nWAIT 3\n{\n&quot;SERVER&quot; OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip,ip6</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<ChargecardTable>
-    <Chargecard operation="add">
-        <Name>Dummy BT Chargecard</Name>
-        <AccountNumber>144,12345678</AccountNumber>
-        <Pin>0000</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>HFG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-    <Chargecard operation="add">
-        <Name>Dummy Mercury Chargecard</Name>
-        <AccountNumber>0500800800,,12345678</AccountNumber>
-        <Pin>****</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>J,K,0FG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable1</Name>
-        <Ranking>2</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>PROMPT</DialogPref>
-        <BearerSet>PSD</BearerSet>
-        <IAPRef>IAP.NTRas GPRS</IAPRef>
-    </ConnectionPreferences>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable2</Name>
-        <Ranking>0</Ranking>
-        <Direction>INCOMING</Direction>
-        <DialogPref>DONOTPROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Default Dial In ISP</IAPRef>
-    </ConnectionPreferences>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable3</Name>
-        <Ranking>1</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>DONOTPROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.NT RAS</IAPRef>
-    </ConnectionPreferences>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsBearer>2</SmsBearer>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>2</ConnectionAttempts>
-        <ModemForDataAndFax>2</ModemForDataAndFax>
-        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
-        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
-        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.Intranet</DefaultNetwork>
-        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-    <IncomingGPRS operation="add">
-        <Name>Dummy Incoming GPRS Settings</Name>
-        <APN>Test</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>0.0.0.0</PDPAddress>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>1</ReqPrecedence>
-        <ReqDelay>1</ReqDelay>
-        <ReqReliability>1</ReqReliability>
-        <ReqPeakThroughput>1</ReqPeakThroughput>
-        <ReqMeanThroughput>1</ReqMeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNameServer1>0.0.0.0</IpNameServer1>
-        <IpNameServer2>0.0.0.0</IpNameServer2>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-    </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="add">
-        <Name>NTRas GPRS</Name>
-        <APN>Test</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>2</ReqPrecedence>
-        <ReqDelay>4</ReqDelay>
-        <ReqReliability>3</ReqReliability>
-        <ReqPeakThroughput>3</ReqPeakThroughput>
-        <ReqMeanThroughput>31</ReqMeanThroughput>
-        <MinPrecedence>2</MinPrecedence>
-        <MinDelay>4</MinDelay>
-        <MinReliability>3</MinReliability>
-        <MinPeakThroughput>3</MinPeakThroughput>
-        <MinMeanThroughput>31</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.51</IpNameServer2>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-    <DefaultGPRS operation="add">
-        <Name>Dummy Default GPRS Settings</Name>
-        <APN>Access point name</APN>
-        <PDPType>IPV6</PDPType>
-        <PDPAddress>www.wid.com</PDPAddress>
-        <Usage>1</Usage>
-        <Precedence>1</Precedence>
-        <Delay>1</Delay>
-        <Reliability>1</Reliability>
-        <PeakThroughput>1</PeakThroughput>
-        <MeanThroughput>1</MeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-    </DefaultGPRS>
-</DefaultGPRSTable>
-
-<ProxyTable>
-    <Proxy operation="add">
-        <Name>ProxyTable1</Name>
-        <ISPRef>DialOutISP.NT RAS</ISPRef>
-        <UseProxyServer>TRUE</UseProxyServer>
-        <ProtocolName>http</ProtocolName>
-        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
-        <PortNumber>80</PortNumber>
-        <Exceptions>www.dummyproxy.com/exception</Exceptions>
-    </Proxy>
-</ProxyTable>
-
-<LocationTable>
-    <Location operation="template">
-        <Name>Default Location</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-        <DialOutCode>9,</DialOutCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office Direct Dial</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-    </Location>
-    <Location operation="add">
-        <Name>Mobile</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Home</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>TRUE</UsePulseDial>
-        <WaitForDialTone>TRUE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>181</AreaCode>
-    </Location>
-</LocationTable>
-
-<SecureSocketTable>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable1</Name>
-        <ProtocolName>ssl3.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable2</Name>
-        <ProtocolName>tls1.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-    <WAPAccessPoint operation="template">
-        <Name>Default Dial In ISP</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-    </WAPAccessPoint>
-    <WAPAccessPoint operation="add">
-        <Name>Dummy WAP Settings</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-        <StartPage>www.wapstart.com</StartPage>
-    </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-    <WAPIPBearer operation="template">
-        <Name>WAPIPBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.-1</IAPRef>
-        <ProxyPortNumber>0</ProxyPortNumber>
-    </WAPIPBearer>
-    <WAPIPBearer operation="add">
-        <Name>WAPIPBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
-        <GatewayAddress>www.wapgateway.com</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.NTRas GPRS</IAPRef>
-        <ProxyPortNumber>1</ProxyPortNumber>
-    </WAPIPBearer>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-    <WAPSMSBearer operation="template">
-        <Name>WAPSMSBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-    </WAPSMSBearer>
-    <WAPSMSBearer operation="add">
-        <Name>WAPSMSBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
-        <GatewayAddress>+442079460221</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <ServiceCentreAddress>+442079460223</ServiceCentreAddress>
-    </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_001_01.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,420 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Case 001.01
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "step_001_01.h"
-
-#include <commdb.h>
-
-// constructor
-CCommDbTest001_01::CCommDbTest001_01()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_001_01");
-}
-
-// destructor
-CCommDbTest001_01::~CCommDbTest001_01()
-{
-}
-
-TVerdict CCommDbTest001_01::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest001_01::executeStepL()
-	{
-	CCommsDatabase* TheDb = NULL;
-	TRAPD( err, TheDb=CCommsDatabase::NewL() );
-	delete TheDb;
-	return err;
-	}
-
-// do Test step 001.01
-TVerdict CCommDbTest001_01::doTestStepL( )
-{
-	TInt res;
-	Log(_L("Step 001.01 called "));
-	res = executeStepL();
-	if (res == KErrNone)
-		{
-		iTestStepResult = EPass;
-		}
-	else
-		{
-		Log(_L("Step 001.01 failed with error: %d"),res);
-		iTestStepResult = EFail;
-		}
-
-	return iTestStepResult;
-}
-
-// constructor
-CCommDbTest001_03::CCommDbTest001_03()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_001_03");
-}
-
-// destructor
-CCommDbTest001_03::~CCommDbTest001_03()
-{
-}
-
-TInt CCommDbTest001_03::executeStepL()
-{
-	TInt ret = KErrNone;
-
-	CCommsDatabase* TheDb = NULL;
-	TRAPD( err, TheDb=CCommsDatabase::NewL() );
-	if (err != KErrNone)
-		ret = err;
-
-	delete TheDb;
-	return ret;
-}
-
-// do Test step 001.03
-TVerdict CCommDbTest001_03::doTestStepL( )
-{
-
-	Log(_L("Step 001.03 called "));
-
-	if (executeStepL() == KErrNone)
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-}
-
-// constructor
-CCommDbTest001_04::CCommDbTest001_04()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_001_04");
-}
-
-// destructor
-CCommDbTest001_04::~CCommDbTest001_04()
-{
-}
-
-TVerdict CCommDbTest001_04::doTestStepPreambleL()
-	{
-	return EPass;
-	}
-
-TInt CCommDbTest001_04::executeStepL()
-{
-	CCommsDatabase* TheDb = NULL;
-	TRAPD( err, TheDb=CCommsDatabase::NewL() );
-
-	delete TheDb;
-
-	return err;
-}
-
-// do Test step 001.04
-TVerdict CCommDbTest001_04::doTestStepL( )
-{
-
-	Log(_L("Step 001.04 called "));
-    if (executeStepL() == KErrNone)
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-
-	return iTestStepResult;
-}
-
-// constructor
-CCommDbTest001_05::CCommDbTest001_05()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_001_05");
-}
-
-// destructor
-CCommDbTest001_05::~CCommDbTest001_05()
-{
-}
-
-TVerdict CCommDbTest001_05::doTestStepPreambleL()
-	{
-	// delete database file before running this test
-	return EPass;
-	}
-
-TInt CCommDbTest001_05::executeStepL()
-{
-	TInt ret = KErrGeneral;
-
-	CCommsDatabase* TheDb;
-	TCommDbOpeningMethod openingMethod;
-	TheDb=CCommsDatabase::NewL(openingMethod);
-
-	if ( openingMethod == ECommDbOpened )
-		ret = KErrNone;
-
-	delete TheDb;
-
-	return ret;
-}
-
-// do Test step 001.05
-TVerdict CCommDbTest001_05::doTestStepL( )
-{
-
-	Log(_L("Step 001.05 called "));
-
-	if (executeStepL() == KErrNone)
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-}
-
-// constructor
-CCommDbTest001_07::CCommDbTest001_07()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_001_07");
-}
-
-// destructor
-CCommDbTest001_07::~CCommDbTest001_07()
-{
-}
-
-TInt CCommDbTest001_07::executeStepL()
-{
-	// make sure database exists before running this test
-	TInt ret = KErrGeneral;
-
-	copyTestDatabase( EDatabase_1 );
-
-	CCommsDatabase* TheDb;
-	TCommDbOpeningMethod openingMethod;
-	TheDb=CCommsDatabase::NewL(openingMethod);
-
-	if ( openingMethod == ECommDbOpened )
-		ret = KErrNone;
-
-	delete TheDb;
-
-	return ret;
-}
-
-// do Test step 001.07
-TVerdict CCommDbTest001_07::doTestStepL( )
-{
-
-	Log(_L("Step 001.07 called "));
-
-	if (executeStepL() == KErrNone)
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-}
-
-// constructor
-CCommDbTest001_08::CCommDbTest001_08()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_001_08");
-}
-
-// destructor
-CCommDbTest001_08::~CCommDbTest001_08()
-{
-}
-
-TInt CCommDbTest001_08::executeStepL()
-{
-	TInt ret = KErrNone;
-
-	CCommsDatabase* TheDb = NULL;
-	TRAPD( err, TheDb=CCommsDatabase::NewL(EFalse) );
-	if (err != KErrNone)
-		ret = err;
-
-	// if we get here, test was successful
-	delete TheDb;
-
-	return ret;
-}
-
-// do Test step 001.08
-TVerdict CCommDbTest001_08::doTestStepL( )
-{
-
-	Log(_L("Step 001.08 called "));
-
-	if (executeStepL() == KErrNone)
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-}
-
-// constructor
-CCommDbTest001_09::CCommDbTest001_09()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_001_09");
-}
-
-// destructor
-CCommDbTest001_09::~CCommDbTest001_09()
-{
-}
-
-TInt CCommDbTest001_09::executeStepL()
-{
-	TInt ret = KErrNone;
-
-	CCommsDatabase* TheDb = NULL;
-	TRAPD( err, TheDb=CCommsDatabase::NewL(ETrue) );
-	if (err != KErrNone)
-		ret = err;
-
-	// if we get here, test was successful
-	delete TheDb;
-
-	return ret;
-}
-
-// do Test step 001.09
-TVerdict CCommDbTest001_09::doTestStepL( )
-{
-
-	Log(_L("Step 001.09 called "));
-
-	if (executeStepL() == KErrNone)
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-	return iTestStepResult;
-}
-
-// constructor
-CCommDbTest001_10::CCommDbTest001_10()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_001_10");
-}
-
-// destructor
-CCommDbTest001_10::~CCommDbTest001_10()
-{
-}
-
-// do Test step 001.10
-TVerdict CCommDbTest001_10::doTestStepL( )
-{
-
-	Log(_L("Step 001.10 called "));
-
-	iTestStepResult = EPass;
-
-	//Heap test for 001.01
-
-	CCommDbTest001_01* step001_01 = new CCommDbTest001_01;
-	CleanupStack::PushL(step001_01);
-	step001_01->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step001_01, KErrNone);
-	if( step001_01->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step001_01);
-
-	//Heap test for 001.03
-
-	CCommDbTest001_03* step001_03 = new CCommDbTest001_03;
-	CleanupStack::PushL(step001_03);
-	step001_03->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step001_03, KErrNone);
-	if( step001_03->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step001_03);
-
-	//Heap test for 001.04
-
-	CCommDbTest001_04* step001_04 = new CCommDbTest001_04;
-	CleanupStack::PushL(step001_04);
-	step001_04->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step001_04, KErrNone);
-	if( step001_04->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step001_04);
-
-	//Heap test for 001.05
-
-	CCommDbTest001_05* step001_05 = new CCommDbTest001_05;
-	CleanupStack::PushL(step001_05);
-	step001_05->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step001_05, KErrNone);
-	if( step001_05->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step001_05);
-
-	//Heap test for 001.07
-
-	CCommDbTest001_07* step001_07 = new CCommDbTest001_07;
-	CleanupStack::PushL(step001_07);
-	step001_07->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step001_07, KErrNone);
-	if( step001_07->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step001_07);
-
-	//Heap test for 001.08
-
-	CCommDbTest001_08* step001_08 = new CCommDbTest001_08;
-	CleanupStack::PushL(step001_08);
-	step001_08->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step001_08, KErrNone);
-	if( step001_08->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step001_08);
-
-	//Heap test for 001.09
-
-	CCommDbTest001_09* step001_09 = new CCommDbTest001_09;
-	CleanupStack::PushL(step001_09);
-	step001_09->iSuite = iSuite;
-	doTestStepWithHeapFailureL( *step001_09, KErrNone);
-	if( step001_09->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step001_09);
-
-	return iTestStepResult;
-}
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_001_01.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-// Copyright (c) 2001-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:
-// step_001_01.cpp
-// This is the header file for CommDb test 001.01
-// 
-//
-
-
-#if (!defined __STEP_001_01_H__)
-#define __STEP_001_01_H__
-
-NONSHARABLE_CLASS(CCommDbTest001_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest001_01();
-	~CCommDbTest001_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	virtual enum TVerdict doTestStepPreambleL();
-
-};
-
-NONSHARABLE_CLASS(CCommDbTest001_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest001_03();
-	~CCommDbTest001_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-
-};
-
-NONSHARABLE_CLASS(CCommDbTest001_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest001_04();
-	~CCommDbTest001_04();
-
-	virtual enum TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-
-};
-
-NONSHARABLE_CLASS(CCommDbTest001_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest001_05();
-	~CCommDbTest001_05();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	virtual enum TVerdict doTestStepPreambleL();
-
-};
-
-NONSHARABLE_CLASS(CCommDbTest001_07) : public CTestStepCommDb
-{
-public:
-	CCommDbTest001_07();
-	~CCommDbTest001_07();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-
-};
-
-NONSHARABLE_CLASS(CCommDbTest001_08) : public CTestStepCommDb
-{
-public:
-	CCommDbTest001_08();
-	~CCommDbTest001_08();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-
-};
-
-NONSHARABLE_CLASS(CCommDbTest001_09) : public CTestStepCommDb
-{
-public:
-	CCommDbTest001_09();
-	~CCommDbTest001_09();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-
-};
-
-NONSHARABLE_CLASS(CCommDbTest001_10) : public CTestStepCommDb
-{
-public:
-	CCommDbTest001_10();
-	~CCommDbTest001_10();
-
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-#endif //(__STEP_001_01_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_002_01.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Case 002.01
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "step_002_01.h"
-
-#include <commdb.h>
-
-
-
-// constructor
-CCommDbTest002_01::CCommDbTest002_01()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_002_01");
-}
-
-// destructor
-CCommDbTest002_01::~CCommDbTest002_01()
-{
-}
-
-// do Test step 002.01
-TVerdict CCommDbTest002_01::doTestStepL( )
-{
-
-	Log(_L("Step 002.01 called "));
-
-	// delete database file before running this test
-/*#ifdef __SECURE_DATA__
-	DeleteCurrentDatabaseL();
-#else*/
-//#endif
-
-	CCommsDatabase* TheDb;
-	TheDb=CCommsDatabase::NewL();
-	CleanupStack::PushL(TheDb);
-	TVersion DbVersion = TheDb->Version();
-
-	CleanupStack::PopAndDestroy();
-
-	Log(_L("Version details: Major %d Minor %d Build %x"), DbVersion.iMajor, DbVersion.iMinor, DbVersion.iBuild);
-	if ( DbVersion.iMinor == 1 && DbVersion.iMajor == 1 && DbVersion.iBuild == 0x1 )
-	{
-		iTestStepResult=EPass;
-	}
-	else
-	{
-		iTestStepResult=EFail;
-	}
-
-	return iTestStepResult;
-}
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_002_01.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-// Copyright (c) 2001-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:
-// step_002_01.cpp
-// This is the header file for CommDb test 001.01
-// 
-//
-
-
-#if (!defined __STEP_002_01_H__)
-#define __STEP_002_01_H__
-
-NONSHARABLE_CLASS(CCommDbTest002_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest002_01();
-	~CCommDbTest002_01();
-
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-#endif //(__STEP_002_01_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_004_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,316 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 004.01 - 004.04
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "step_004_xx.h"
-
-
-
-
-//
-//	Test step 004.001
-//
-
-// constructor
-CCommDbTest004_01::CCommDbTest004_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_004_01");
-	}
-
-// destructor
-CCommDbTest004_01::~CCommDbTest004_01()
-	{
-	}
-
-TVerdict CCommDbTest004_01::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-TInt CCommDbTest004_01::executeStepL()
-	{
-	TInt ret = KErrGeneral;
-
-	TBuf<KCommsDbSvrMaxColumnNameLength> tableName;
-
-	// Get the table name and check it matches with the known value
-	iTheView->GetTableName( tableName );
-	if ( tableName.Compare( TPtrC(DIAL_OUT_ISP)) == 0 )
-		ret = KErrNone;
-
-	return ret;
-	}
-
-TVerdict CCommDbTest004_01::doTestStepL( )
-	{
-	Log(_L("Step 004.01 called "));
-
-
-	if ( executeStep()== KErrNone )
-		{
-		iTestStepResult = EPass;	
-		}
-	else
-		{
-		iTestStepResult = EFail;
-		}
-
-
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 004.002
-//
-
-// constructor
-CCommDbTest004_02::CCommDbTest004_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_004_02");
-	}
-
-// destructor
-CCommDbTest004_02::~CCommDbTest004_02( )
-	{
-	}
-
-TVerdict CCommDbTest004_02::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-#define BUFFER_TOO_SMALL	5	//Must be smaller than the length of the DAIL_OUT_ISP table name
-
-TBool CCommDbTest004_02::executeStepL()
-	{
-	TBuf<BUFFER_TOO_SMALL> tableName;
-
-	//NB. This should cause a Panic!
-
-	iTheView->GetTableName( tableName );
-
-	if ( tableName.Compare( TPtrC(DIAL_OUT_ISP)) == 0 )
-		{
-		iTestStepResult = EPass;	
-		}
-	else
-		{
-		iTestStepResult = EFail;
-		}
-
-	return EFail;
-	}
-
-
-TVerdict CCommDbTest004_02::doTestStepL( )
-	{
-	if  ( executeStep() )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-
-		
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 004.003
-//
-
-// constructor
-CCommDbTest004_03::CCommDbTest004_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_004_03");
-	}
-
-// destructor
-CCommDbTest004_03::~CCommDbTest004_03()
-	{
-	}
-
-TVerdict CCommDbTest004_03::doTestStepPreambleL()
-	{	
-	copyTestDatabase( EDatabase_1 );
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-//NB. If a zero size buffer is used this will cause an ARM compiler error
-#define BUFFER_VERYSMALL	1
-
-TBool CCommDbTest004_03::executeStepL()
-	{
-	
-	TBuf<BUFFER_VERYSMALL> tableName;
-
-	//NB. This should cause a Panic
-	
-	iTheView->GetTableName( tableName );
-
-	if ( tableName.Compare( TPtrC(DIAL_OUT_ISP)) == 0 )
-		{
-		iTestStepResult = EPass;	
-		}
-	else
-		{
-		iTestStepResult = EFail;
-		}
-
-	return EFail;
-	}
-
-TVerdict CCommDbTest004_03::doTestStepL( )
-	{
-	
-	if ( executeStep() )
-		{
-		iTestStepResult = EPass;	
-		}
-	else
-		{
-		iTestStepResult = EFail;
-		}
-
-	
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 004.004
-//
-
-// constructor
-CCommDbTest004_04::CCommDbTest004_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_004_04");
-	}
-
-// destructor
-CCommDbTest004_04::~CCommDbTest004_04()
-	{
-	}
-
-
-TVerdict CCommDbTest004_04::doTestStepL( )
-	{
-	Log(_L("Step 004.04 called "));
-	
-	iTestStepResult = EPass;
-
-	//Heap test for 004.01
-
-	CCommDbTest004_01* step004_01 = new CCommDbTest004_01;
-	CleanupStack::PushL(step004_01);
-	step004_01->iSuite = iSuite;				
-	doTestStepWithHeapFailureL( *step004_01, KErrNone);
-	if( step004_01->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step004_01);
-	
-	return iTestStepResult;
-	}
-	
-//
-//	Test step 004.005
-//
-
-// constructor
-CCommDbTest004_05::CCommDbTest004_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_004_05");
-	}
-
-// destructor
-CCommDbTest004_05::~CCommDbTest004_05()
-	{
-	}
-
-
-TVerdict CCommDbTest004_05::doTestStepL( )
-	{
-	
-	iTestStepResult = EPass;	
-	
-	//Heap test for 004.02
-//	    a panic is expected
-	CCommDbTest004_02* step004_02 = new CCommDbTest004_02;
-	CleanupStack::PushL(step004_02);
-	step004_02->iSuite = iSuite;				
-	doTestStepWithHeapFailureL( *step004_02, KErrNone);
-	if( step004_02->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step004_02);
-
-	return iTestStepResult;
-	}
-
-	
-//
-//	Test step 004.006
-//
-
-// constructor
-CCommDbTest004_06::CCommDbTest004_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_004_06");
-	}
-
-// destructor
-CCommDbTest004_06::~CCommDbTest004_06()
-	{
-	}
-
-
-TVerdict CCommDbTest004_06::doTestStepL( )
-	{
-	
-	iTestStepResult = EPass;	
-	//Heap test for 004.03
-
-	// a panic is expected
-	CCommDbTest004_03* step004_03 = new CCommDbTest004_03;
-	CleanupStack::PushL(step004_03);
-	step004_03->iSuite = iSuite;				
-	doTestStepWithHeapFailureL( *step004_03, KErrNone);
-	if( step004_03->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step004_03);
-
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_004_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-// Copyright (c) 2001-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:
-// step_004_01.cpp
-// This is the header file for CommDb test 004.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_004_XX_H__)
-#define __STEP_004_XX_H__
-
-
-//
-//	Test step 004.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest004_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest004_01();
-	~CCommDbTest004_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 004.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest004_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest004_02();
-	~CCommDbTest004_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TBool executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-
-};
-
-//
-//	Test step 004.03
-//
-
-//Removed since this test will not compile on Code warrior due to having an array of zero length
-
-NONSHARABLE_CLASS(CCommDbTest004_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest004_03();
-	~CCommDbTest004_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TBool executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 004.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest004_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest004_04();
-	~CCommDbTest004_04();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-
-};
-
-//
-//	Test step 004.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest004_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest004_05();
-	~CCommDbTest004_05();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-
-};
-
-//
-//	Test step 004.06
-//
-
-NONSHARABLE_CLASS(CCommDbTest004_06) : public CTestStepCommDb
-{
-public:
-	CCommDbTest004_06();
-	~CCommDbTest004_06();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-
-};
-
-#endif //(__STEP_004_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_005_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,284 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 005.01 - 005.04
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "step_005_xx.h"
-
-
-
-
-//
-//	Test step 005.001
-//
-
-// constructor
-CCommDbTest005_01::CCommDbTest005_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_005_01");
-	}
-
-// destructor
-CCommDbTest005_01::~CCommDbTest005_01()
-	{
-	}
-
-
-TVerdict CCommDbTest005_01::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_IN_ISP));
-	return EPass;
-	}
-
-
-TBool CCommDbTest005_01::executeStepL()
-	{
-	TDbColType colType;
-	TUint32 attrib;
-	TBool ret=EFail;
-
-	//NB this step is design NOT to leave. 
-
-	//Read column type attibutes and check against the known true values
-	iTheView->ReadTypeAttribL( TPtrC(ISP_DESCRIPTION), colType, attrib );
-	if ( colType == EDbColText && attrib == 0 )
-		ret = EPass;
-
-	if ( ret == EPass )
-		{
-			iTheView->ReadTypeAttribL( TPtrC(ISP_LOGIN_SCRIPT), colType, attrib );
-			if ( !(colType == EDbColLongText && attrib == 0) )
-				ret = EFail;
-		}
-
-	if ( ret == EPass )
-		{
-			iTheView->ReadTypeAttribL( TPtrC(ISP_TYPE), colType, attrib );
-			if ( !(colType == EDbColUint32 && attrib == 0) )
-				ret = EFail;
-		}
-
-	if ( ret == EPass )
-		{
-			iTheView->ReadTypeAttribL( TPtrC(ISP_USE_LOGIN_SCRIPT), colType, attrib );
-			if ( !(colType == EDbColBit && attrib == 0) )
-				ret = EFail;
-		}
-
-	return ret;
-	}
-
-TVerdict CCommDbTest005_01::doTestStepL( )
-	{
-	Log(_L("Step 005.01 called "));
-	
-	if ( executeStep() )
-		{
-		iTestStepResult = EFail;
-		}
-	else
-		{
-		iTestStepResult = EPass;
-		}
-		
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 005.002
-//
-
-// constructor
-CCommDbTest005_02::CCommDbTest005_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_005_02");
-	}
-
-// destructor
-CCommDbTest005_02::~CCommDbTest005_02()
-	{
-	}
-
-TVerdict CCommDbTest005_02::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TBool CCommDbTest005_02::executeStepL()
-	{
-	TDbColType colType;
-	TUint32 attrib;
-	TBool ret=EFail;
-
-
-	//NB. This step is designed not to leave
-
-	//Read attributes for columns, and check against known correct values
-	iTheView->ReadTypeAttribL( TPtrC(COMMDB_ID), colType, attrib );
-
-	if ( colType == EDbColUint32 && attrib == (TDbCol::EAutoIncrement|TDbCol::ENotNull) )
-		ret = EPass;
-
-	if ( ret == EPass )
-		{
-			iTheView->ReadTypeAttribL( TPtrC(COMMDB_NAME), colType, attrib );
-			if ( !(colType == EDbColText && attrib == TDbCol::ENotNull) )
-				ret = EFail;
-		}
-
-	return ret;
-		
-	}
-
-TVerdict CCommDbTest005_02::doTestStepL( )
-	{
-	Log(_L("Step 005.02 called "));
-
-	if ( executeStep() )
-		{
-		iTestStepResult = EFail;
-		}
-	else
-		{
-		iTestStepResult = EPass;
-		}
-
-	
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 005.003
-//
-
-// constructor
-CCommDbTest005_03::CCommDbTest005_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_005_03");
-}
-
-// destructor
-CCommDbTest005_03::~CCommDbTest005_03()
-	{
-	}
-
-TVerdict CCommDbTest005_03::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest005_03::executeStepL()
-	{
-	TDbColType colType;
-	TUint32 attrib;
-
-	//NB. This test should leave
-	TRAPD(ret, iTheView->ReadTypeAttribL( KInvalidColumnName, colType, attrib ) );
-
-	return ret;
-	}
-
-TVerdict CCommDbTest005_03::doTestStepL( )
-	{
-	Log(_L("Step 005.03 called "));
-
-	iTestStepResult = EFail;
-	
-	if ( executeStep() == KErrNotFound )
-		iTestStepResult = EPass;
-
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 005.004
-//
-
-// constructor
-CCommDbTest005_04::CCommDbTest005_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_005_04");
-	}
-
-// destructor
-CCommDbTest005_04::~CCommDbTest005_04()
-	{
-	}
-
-
-
-TVerdict CCommDbTest005_04::doTestStepL( )
-	{
-	Log(_L("Step 005.04 called "));
-	
-	iTestStepResult = EPass;
-
-	//Heap test for 005.01
-
-	CCommDbTest005_01* step005_01 = new CCommDbTest005_01;
-	CleanupStack::PushL(step005_01);
-	step005_01->iSuite = iSuite;				
-	doTestStepWithHeapFailureL( *step005_01, KErrNone);
-	if( step005_01->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step005_01);
-		
-	//Heap test for 005.02
-	
-	CCommDbTest005_02* step005_02 = new CCommDbTest005_02;
-	CleanupStack::PushL(step005_02);
-	step005_02->iSuite = iSuite;				
-	doTestStepWithHeapFailureL( *step005_02, KErrNone);
-	if( step005_02->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step005_02);
-
-
-	
-	//Heap test for 005.03
-
-	
-	CCommDbTest005_03* step005_03 = new CCommDbTest005_03;
-	CleanupStack::PushL(step005_03);
-	step005_03->iSuite = iSuite;				
-	doTestStepWithHeapFailureL( *step005_03, KErrNotFound);
-	if( step005_03->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step005_03);
-
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_005_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-// Copyright (c) 2001-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:
-// step_005_01.cpp
-// This is the header file for CommDb test 005.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_005_XX_H__)
-#define __STEP_005_XX_H__
-
-
-//
-//	Test step 005.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest005_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest005_01();
-	~CCommDbTest005_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict	doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 005.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest005_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest005_02();
-	~CCommDbTest005_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TBool executeStepL();
-	TVerdict	doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 005.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest005_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest005_03();
-	~CCommDbTest005_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TBool executeStepL();
-	TVerdict	doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 005.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest005_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest005_04();
-	~CCommDbTest005_04();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-#endif //(__STEP_005_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_006_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,260 +0,0 @@
-// Copyright (c) 2001-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:
-// This contains CommDb Unit Test Cases 006.01 - 006.05
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "step_006_xx.h"
-
-
-
-//
-//	Test step 006.001
-//
-
-// constructor
-CCommDbTest006_01::CCommDbTest006_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_006_01");
-	}
-
-// destructor
-CCommDbTest006_01::~CCommDbTest006_01()
-	{
-	}
-
-TVerdict CCommDbTest006_01::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(DIAL_OUT_ISP));
-	return EPass;
-	}
-
-TInt CCommDbTest006_01::executeStepL()
-	{
-	TInt ret = iTheView->GotoFirstRecord(); 	
-	return ret;
-	}
-
-TVerdict CCommDbTest006_01::doTestStepL( )
-	{
-	Log(_L("Step 006.01 called "));
-
-	if ( executeStepL() == KErrNone )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-	
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 006.002
-//
-
-// constructor
-CCommDbTest006_02::CCommDbTest006_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_006_02");
-	// default to no local objects allocated
-	iLocalObjects = EFalse;
-	}
-
-// destructor
-CCommDbTest006_02::~CCommDbTest006_02()
-	{
-	}
-
-TVerdict CCommDbTest006_02::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(IAP));
-	return EPass;
-	}
-
-TInt CCommDbTest006_02::executeStepL()
-	{
-	TInt ret = iTheView->GotoFirstRecord(); 	
-	return ret;
-	}
-
-TVerdict CCommDbTest006_02::doTestStepL( )
-	{
-	Log(_L("Step 006.02 called "));
-	
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-	
-	return iTestStepResult;
-	}
-
-//
-//	Test step 006.003
-//
-
-// constructor
-CCommDbTest006_03::CCommDbTest006_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_006_03");
-	}
-
-// destructor
-CCommDbTest006_03::~CCommDbTest006_03()
-	{
-	}
-
-TVerdict CCommDbTest006_03::doTestStepPreambleL()
-	{
-	openDbAndViewL(TPtrC(DIAL_IN_ISP));
-	return EPass;
-	}
-
-TInt CCommDbTest006_03::executeStepL()
-	{
-	TInt ret = iTheView->GotoFirstRecord(); 	
-	return ret;
-	}
-
-TVerdict CCommDbTest006_03::doTestStepL( )
-	{
-	Log(_L("Step 006.03 called "));
-
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-	
-		
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 006.004
-//
-
-// constructor
-CCommDbTest006_04::CCommDbTest006_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_006_04");
-	// default to no local objects allocated
-	iLocalObjects = EFalse;
-	}
-
-// destructor
-CCommDbTest006_04::~CCommDbTest006_04()
-	{
-	}
-
-
-TVerdict CCommDbTest006_04::doTestStepPreambleL()
-	{	
-	openDbAndViewL(TPtrC(IAP));
-	return EPass;
-	}
-
-
-TInt CCommDbTest006_04::executeStepL()
-	{
-	TInt ret = iTheView->GotoFirstRecord(); 	
-	return ret;
-	}
-
-TVerdict CCommDbTest006_04::doTestStepL( )
-	{
-	Log(_L("Step 006.04 called "));
-	
-	if ( executeStepL() == KErrNotFound )
-		iTestStepResult = EPass;
-	else
-		iTestStepResult = EFail;
-	
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 006.005
-//
-
-// constructor
-CCommDbTest006_05::CCommDbTest006_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_006_05");
-	}
-
-// destructor
-CCommDbTest006_05::~CCommDbTest006_05()
-	{
-	}
-
-
-TVerdict CCommDbTest006_05::doTestStepL( )
-	{
-	Log(_L("Step 006.04 called "));
-	
-	iTestStepResult = EPass;
-
-	//Heap test for 006.01
-	CCommDbTest006_01* step006_01 = new CCommDbTest006_01;
-	CleanupStack::PushL(step006_01);
-	step006_01->iSuite = iSuite;				
-	doTestStepWithHeapFailureL( *step006_01, KErrNone);
-	if( step006_01->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step006_01);
-		
-	//Heap test for 006.02
-	
-	CCommDbTest006_02* step006_02 = new CCommDbTest006_02;
-	CleanupStack::PushL(step006_02);
-	step006_02->iSuite = iSuite;				
-	doTestStepWithHeapFailureL( *step006_02, KErrNotFound);
-	if( step006_02->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step006_02);
-
-
-	
-	//Heap test for 006.03
-// it is not possible to copy database files, so this tests couldn't run 
-// with proper conditions(database)
-	//Heap test for 006.04
-	CCommDbTest006_04* step006_04 = new CCommDbTest006_04;
-	CleanupStack::PushL(step006_04);
-	step006_04->iSuite = iSuite;				
-	doTestStepWithHeapFailureL( *step006_04, KErrNotFound);
-	if( step006_04->iTestStepResult == EFail )
-		iTestStepResult = EFail;
-	CleanupStack::PopAndDestroy(step006_04);
-
-
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_006_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-// Copyright (c) 2001-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:
-// step_006_01.cpp
-// This is the header file for CommDb test 006.XX group of scenarios 
-// 
-//
-
-
-#if (!defined __STEP_006_XX_H__)
-#define __STEP_006_XX_H__
-
-
-//
-//	Test step 006.01
-//
-
-NONSHARABLE_CLASS(CCommDbTest006_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest006_01();
-	~CCommDbTest006_01();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 006.02
-//
-
-NONSHARABLE_CLASS(CCommDbTest006_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest006_02();
-	~CCommDbTest006_02();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-
-//
-//	Test step 006.03
-//
-
-NONSHARABLE_CLASS(CCommDbTest006_03) : public CTestStepCommDb
-{
-public:
-	CCommDbTest006_03();
-	~CCommDbTest006_03();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 006.04
-//
-
-NONSHARABLE_CLASS(CCommDbTest006_04) : public CTestStepCommDb
-{
-public:
-	CCommDbTest006_04();
-	~CCommDbTest006_04();
-
-	virtual enum TVerdict doTestStepL( void );
-	TInt executeStepL();
-	TVerdict doTestStepPreambleL();
-
-private:
-
-};
-
-//
-//	Test step 006.05
-//
-
-NONSHARABLE_CLASS(CCommDbTest006_05) : public CTestStepCommDb
-{
-public:
-	CCommDbTest006_05();
-	~CCommDbTest006_05();
-
-	virtual enum TVerdict doTestStepL( void );
-
-private:
-
-};
-
-#endif //(__STEP_006_XX_H__)
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_051_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-// Copyright (c) 2003-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:
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbstore.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include <comms-infras/commdb/protection/protectdb.h>
-#include <comms-infras/commdb/protection/protectcpdb.h>
-#else
-//these headers are user includes in the new env.
-#include "protectdb.h"
-#include "protectcpdb.h"
-#endif
-
-#include <cdbpreftable.h>
-
-#include "step_051_xx.h"
-
-
-//
-//	Test step 051.01
-//
-
-CCommDbTest051_01::CCommDbTest051_01()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_051_01");
-
-}
-
-CCommDbTest051_01::~CCommDbTest051_01()
-{
-	delete iTheDb;
-}
-
-
-TVerdict CCommDbTest051_01::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-//protect normal table
-enum TVerdict CCommDbTest051_01::doTestStepL( void )
-	{
-
-	Log(_L("Normal Table : Protection.. "));
-	iTestStepResult = EPass;
-	CCommsDbProtectTableView* table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
-
-	if(table->GotoFirstRecord()==KErrNone)
-		{
-		TESTL(table->ProtectTable()==KErrNone);
-		iTestStepResult = EPass;
-		Log(_L("\t\tSUCCESS"));
-		}
-	else
-		{
-		iTestStepResult = EFail;
-		Log(_L("FAIL"));
-		}
-	CleanupStack::PopAndDestroy(); 
-	return iTestStepResult;
-	}
-
-//
-//	Test step 051.02
-//
-
-CCommDbTest051_02::CCommDbTest051_02()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_051_02");
-
-}
-
-CCommDbTest051_02::~CCommDbTest051_02()
-{
-	delete iTheDb;
-}
-
-TVerdict CCommDbTest051_02::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-//Unprotect Normal Table
-enum TVerdict CCommDbTest051_02::doTestStepL( void )
-	{
-	Log(_L("Normal Table : Unprotection .."));
-	iTestStepResult = EPass;
-	CCommsDbProtectTableView* table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
-	if(table->GotoFirstRecord()==KErrNone)
-		{
-		TESTL(table->UnprotectTable()==KErrNone);
-		iTestStepResult = EPass;
-		Log(_L("\t\tSUCCESS"));
-		}
-	else
-		{
-		iTestStepResult = EFail;
-		Log(_L("FAIL"));
-		}
-	CleanupStack::PopAndDestroy(); 
-	return iTestStepResult;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_051_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-// Copyright (c) 2003-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:
-//
-
-#if !defined(__STEP051_01_H__)
-#define __STEP051_01_H__
-
-
-//
-//Normal Table protection
-//
-
-NONSHARABLE_CLASS(CCommDbTest051_01) : public CTestStepCommDb
-{
-public:
-	CCommDbTest051_01();
-	virtual ~CCommDbTest051_01();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-};
-
-
-//
-//Normal Table Unprotection
-//
-NONSHARABLE_CLASS(CCommDbTest051_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest051_02();
-	virtual ~CCommDbTest051_02();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-#endif 
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_052_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +0,0 @@
-// Copyright (c) 2003-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:
-//
- 
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbstore.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include <comms-infras/commdb/protection/protectdb.h>
-#include <comms-infras/commdb/protection/protectcpdb.h>
-#else
-//these headers are user includes in the new env.
-#include "protectdb.h"
-#include "protectcpdb.h"
-#endif
-
-#include <cdbpreftable.h>
-
-#include "step_052_xx.h"
-
-
-//
-//	Test step 052.01
-//
-
-
-CCommDbTest052_01::CCommDbTest052_01()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_052_01");
-}
-
-CCommDbTest052_01::~CCommDbTest052_01()
-{
-	delete iTheDb;
-}
-
-TVerdict CCommDbTest052_01::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-//Protect normal Record
-enum TVerdict CCommDbTest052_01::doTestStepL( void )
-	{
-
-	Log(_L("Normal Record : Protection .."));
-	iTestStepResult = EPass;
-
-	// Test using dial out isp table as running t_createdb places several records
-	// in the table as opposed to just one as in some tables
-	CCommsDbProtectTableView* table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
-	TESTL(iTheDb->BeginTransaction()==KErrNone);
-	
-	if(table->GotoFirstRecord()==KErrNone)
-		{
-		// Protect the first record
-		ProtectRecordL(table,KErrNone);
-		iTestStepResult = EPass;
-		Log(_L("\t\tSUCCESS"));
-		}
-	else
-		{
-		iTestStepResult = EFail;
-		Log(_L("\t\tFAIL"));
-		}
-
-	TESTL(iTheDb->CommitTransaction()==KErrNone);
-	CleanupStack::PopAndDestroy(); 
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 052.02
-//
-
-CCommDbTest052_02::CCommDbTest052_02()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_052_02");
-}
-
-CCommDbTest052_02::~CCommDbTest052_02()
-{
-	delete iTheDb;
-}
-
-TVerdict CCommDbTest052_02::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-
-//UnProtect normal Record
-enum TVerdict CCommDbTest052_02::doTestStepL( void )
-	{
-
-	Log(_L("Normal Record : Unprotection .."));
-	iTestStepResult = EPass;
-
-	CCommsDbProtectTableView* table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
-	TESTL(iTheDb->BeginTransaction()==KErrNone);
-
-	if(table->GotoFirstRecord()==KErrNone)
-		{
-		// UnProtect the first record
-		UnprotectRecordL(table,KErrNone);
-		iTestStepResult = EPass;
-		Log(_L("\t\tSUCCESS"));
-		}
-	else
-		{
-		iTestStepResult = EFail;
-		Log(_L("\t\tFAIL"));
-		}
-
-	TESTL(iTheDb->CommitTransaction()==KErrNone);
-	CleanupStack::PopAndDestroy(); //table
-	return iTestStepResult;
-
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_052_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// Copyright (c) 2003-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:
-//
- 
-#if !defined(__STEP_052_XX_H__)
-#define __STEP_052_XX_H__
-
-
-
-NONSHARABLE_CLASS(CCommDbTest052_01 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest052_01();
-	virtual ~CCommDbTest052_01();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-
-//
-//Normal Table Unprotection
-//
-NONSHARABLE_CLASS(CCommDbTest052_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest052_02();
-	virtual ~CCommDbTest052_02();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-#endif
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_053_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-// Copyright (c) 2003-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:
-//
- 
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbstore.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include <comms-infras/commdb/protection/protectdb.h>
-#include <comms-infras/commdb/protection/protectcpdb.h>
-#else
-//these headers are user includes in the new env.
-#include "protectdb.h"
-#include "protectcpdb.h"
-#endif
-
-
-#include <cdbpreftable.h>
-
-#include "step_053_xx.h"
-
-//
-//	Test step 053.01
-//
-
-CCommDbTest053_01::CCommDbTest053_01()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_053_01");
-}
-
-CCommDbTest053_01::~CCommDbTest053_01()
-{
-	delete iTheDb;
-}
-
-TVerdict CCommDbTest053_01::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-//Protect Connection Preference Table
-enum TVerdict CCommDbTest053_01::doTestStepL( void )
-	{
-
-	Log(_L("Connection Preference Table : Protection .."));
-	iTestStepResult = EPass;
-
-	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
-
-	if(table->GotoFirstRecord()==KErrNone)
-		{
-		TESTL(table->ProtectTable()==0);
-		iTestStepResult = EPass;
-		Log(_L("\t\tSUCCESS"));
-		}
-	else
-		{
-		iTestStepResult = EFail;
-		Log(_L("\t\tFAIL"));
-		}
-	CleanupStack::PopAndDestroy(); 
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 053.02
-//
-
-CCommDbTest053_02::CCommDbTest053_02()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_053_02");
-}
-
-CCommDbTest053_02::~CCommDbTest053_02()
-{
-	delete iTheDb;
-}
-
-TVerdict CCommDbTest053_02::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-//UnProtect Connection pref Record
-enum TVerdict CCommDbTest053_02::doTestStepL( void )
-	{
-
-	Log(_L("Connection Preference Table : Unprotection .."));
-	iTestStepResult = EPass;
-
-	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
-
-	if(table->GotoFirstRecord()==KErrNone)
-		{
-		TESTL(table->UnprotectTable()==KErrNone);
-		iTestStepResult = EPass;
-		Log(_L("\t\tSUCCESS"));
-		}
-	else
-		{
-		iTestStepResult = EFail;
-		Log(_L("\t\tFAIL"));
-		}
-	CleanupStack::PopAndDestroy(); 
-	return iTestStepResult;
-	}
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_053_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-// Copyright (c) 2003-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:
-//
- 
-#if !defined(__STEP_053_XX_H__)
-#define __STEP_053_XX_H__
-
-//
-//Connection Pref Table Protection
-//
-
-
-NONSHARABLE_CLASS(CCommDbTest053_01 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest053_01();
-	virtual ~CCommDbTest053_01();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-
-//
-//Connection Pref Table Unprotection
-//
-NONSHARABLE_CLASS(CCommDbTest053_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest053_02();
-	virtual ~CCommDbTest053_02();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-#endif
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_054_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-// Copyright (c) 2003-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:
-//
- 
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbstore.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include <comms-infras/commdb/protection/protectdb.h>
-#include <comms-infras/commdb/protection/protectcpdb.h>
-#else
-//these headers are user includes in the new env.
-#include "protectdb.h"
-#include "protectcpdb.h"
-#endif
-
-#include <cdbpreftable.h>
-
-#include "step_054_xx.h"
-
-//
-//	Test step 054.01
-//
-
-CCommDbTest054_01::CCommDbTest054_01()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_054_01");
-}
-
-CCommDbTest054_01::~CCommDbTest054_01()
-{
-	delete iTheDb;
-}
-
-TVerdict CCommDbTest054_01::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-//Protect Connection Preference Record
-enum TVerdict CCommDbTest054_01::doTestStepL( void )
-	{
-
-	Log(_L("Connection Preference Record : Protection .."));
-	iTestStepResult = EPass;
-
-	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
-	TESTL(iTheDb->BeginTransaction()==KErrNone);
-	
-	if(table->GotoFirstRecord()==KErrNone)
-		{
-		// Protect the first record
-		ProtectRecordL(table,KErrNone);
-		iTestStepResult = EPass;
-		Log(_L("\t\tSUCCESS"));
-		}
-	else
-		{
-		iTestStepResult = EFail;
-		Log(_L("\t\tFAIL"));
-		}
-
-	TESTL(iTheDb->CommitTransaction()==KErrNone);
-
-	CleanupStack::PopAndDestroy(); 
-	return iTestStepResult;
-	}
-
-//
-//	Test step 054.02
-//
-
-CCommDbTest054_02::CCommDbTest054_02()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_054_02");
-}
-
-CCommDbTest054_02::~CCommDbTest054_02()
-{
-	delete iTheDb;
-}
-
-TVerdict CCommDbTest054_02::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-//Protect Connection Preference Record
-enum TVerdict CCommDbTest054_02::doTestStepL( void )
-	{
-
-	Log(_L("Connection Preference Record : Unprotection .."));
-	iTestStepResult = EPass;
-
-	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
-	TESTL(iTheDb->BeginTransaction()==KErrNone);
-
-	if(table->GotoFirstRecord()==KErrNone)
-		{
-		// UnProtect the first record
-		UnprotectRecordL(table,KErrNone);
-		iTestStepResult = EPass;
-		Log(_L("\t\tSUCCESS"));
-		}
-	else
-		{
-		iTestStepResult = EFail;
-		Log(_L("\t\tFAIL"));
-		}
-
-	TESTL(iTheDb->CommitTransaction()==KErrNone);
-
-	CleanupStack::PopAndDestroy(); 
-	return iTestStepResult;
-	}
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_054_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// Copyright (c) 2003-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:
-//
- 
-#if !defined(__STEP_054_XX_H__)
-#define __STEP_054_XX_H__
-
-
-
-NONSHARABLE_CLASS(CCommDbTest054_01 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest054_01();
-	virtual ~CCommDbTest054_01();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-
-//
-//Normal Table Unprotection
-//
-NONSHARABLE_CLASS(CCommDbTest054_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest054_02();
-	virtual ~CCommDbTest054_02();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-#endif
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_055_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-// Copyright (c) 2003-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:
-//
- 
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbstore.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include <comms-infras/commdb/protection/protectdb.h>
-#include <comms-infras/commdb/protection/protectcpdb.h>
-#else
-//these headers are user includes in the new env.
-#include "protectdb.h"
-#include "protectcpdb.h"
-#endif
-
-#include <cdbpreftable.h>
-
-#include "step_055_xx.h"
-
-//
-//	Test step 055.01
-//
-
-//TestProtectTables
-CCommDbTest055_01::CCommDbTest055_01()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_055_01");
-}
-
-CCommDbTest055_01::~CCommDbTest055_01()
-{
-	delete iTheDb;
-}
-
-TVerdict CCommDbTest055_01::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-enum TVerdict CCommDbTest055_01::doTestStepL( void )
-	{
-
-	Log(_L("Test Normal Table : Protection .."));
-	iTestStepResult = EPass;
-
-	CCommsDbProtectTableView* table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
-	CheckTableIsNotProtectedL(table);
-
-	TUint32 recordId;
-	table->ReadUintL(TPtrC(COMMDB_ID),recordId);
-	
-	TESTL(table->ProtectTable()==KErrNone);
-	TUint32 postProtectRecordId;
-	table->ReadUintL(TPtrC(COMMDB_ID),postProtectRecordId);
-	TESTL(postProtectRecordId==recordId);
-	
-	CheckTableIsProtectedL(table);
-	iTestStepResult = EPass;
-	Log(_L("\t\tSUCCESS"));
-
-	CleanupStack::PopAndDestroy(); 
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 055.02
-//
-
-
-//TestUnprotectTables
-CCommDbTest055_02::CCommDbTest055_02()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_055_02");
-}
-
-CCommDbTest055_02::~CCommDbTest055_02()
-{
-	delete iTheDb;
-}
-
-TVerdict CCommDbTest055_02::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-//Protect Connection Preference Record
-enum TVerdict CCommDbTest055_02::doTestStepL( void )
-	{
-
-	Log(_L("Test Normal Table : unprotection .."));
-	iTestStepResult = EPass;
-
-	CCommsDbProtectTableView* table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
-	CheckTableIsProtectedL(table);
-
-	TUint32 recordId;
-	table->ReadUintL(TPtrC(COMMDB_ID),recordId);
-	
-	TESTL(table->UnprotectTable()==KErrNone);
-	TUint32 postProtectRecordId;
-	table->ReadUintL(TPtrC(COMMDB_ID),postProtectRecordId);
-	TESTL(postProtectRecordId==recordId);
-	
-	CheckTableIsNotProtectedL(table);
-	
-	iTestStepResult = EPass;
-	Log(_L("\t\tSUCCESS"));
-
-	CleanupStack::PopAndDestroy(); 
-	return iTestStepResult;
-	}
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_055_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2003-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:
-//
- 
-#if !defined(__STEP_055_XX_H__)
-#define __STEP_055_XX_H__
-
-
-
-NONSHARABLE_CLASS(CCommDbTest055_01 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest055_01();
-	virtual ~CCommDbTest055_01();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-
-NONSHARABLE_CLASS(CCommDbTest055_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest055_02();
-	virtual ~CCommDbTest055_02();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-#endif
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_056_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,188 +0,0 @@
-// Copyright (c) 2003-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:
-//
- 
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbstore.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include <comms-infras/commdb/protection/protectdb.h>
-#include <comms-infras/commdb/protection/protectcpdb.h>
-#else
-//these headers are user includes in the new env.
-#include "protectdb.h"
-#include "protectcpdb.h"
-#endif
-
-#include <cdbpreftable.h>
-
-#include "step_056_xx.h"
-
-//
-//	Test step 056.01
-//
-
-//TestProtectRecords
-CCommDbTest056_01::CCommDbTest056_01()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_056_01");
-}
-
-CCommDbTest056_01::~CCommDbTest056_01()
-{
-	delete iTheDb;
-}
-
-TVerdict CCommDbTest056_01::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-enum TVerdict CCommDbTest056_01::doTestStepL( void )
-	{
-
-	Log(_L("Test Normal Records : Protection .."));
-	iTestStepResult = EPass;
-
-	CCommsDbProtectTableView* table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
-	TESTL(iTheDb->BeginTransaction()==KErrNone);
-	
-	TESTL(table->GotoFirstRecord()==KErrNone);
-	
-	// Check record security level is writable
-	TInt recordAccess = 1;
-	TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
-	TESTL(recordAccess == 0);
-
-	// Modify and test the first record
-	TRAPD(ret,UpdateRecordL(table,KErrNone));
-	TESTL(ret == KErrNone);
-	
-	TRAP(ret,ProtectRecordL(table,KErrNone));		
-	TESTL(ret == KErrNone);
-
-		// Test that protection is effective
-	TRAP(ret,UpdateRecordL(table,KErrAccessDenied));
-	TESTL(ret == KErrNone);
-	TRAP(ret,DeleteRecordL(table,KErrAccessDenied));
-	TESTL(ret == KErrNone);
-
-		// Check record security level is read only
-	TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
-	TESTL(recordAccess == 1);
-
-	table->GotoFirstRecord();
-
-	TESTL(iTheDb->CommitTransaction()==KErrNone);
-
-
-	iTestStepResult = EPass;
-	Log(_L("\t\tSUCCESS"));
-
-	CleanupStack::PopAndDestroy(); 
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 056.02
-//
-
-//TestUnprotectRecords
-CCommDbTest056_02::CCommDbTest056_02()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_056_02");
-}
-
-CCommDbTest056_02::~CCommDbTest056_02()
-{
-	delete iTheDb;
-}
-
-TVerdict CCommDbTest056_02::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-enum TVerdict CCommDbTest056_02::doTestStepL( void )
-	{
-
-	Log(_L("Test Normal Records : unprotection .."));
-	iTestStepResult = EPass;
-
-	CCommsDbProtectTableView* table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
-	TESTL(iTheDb->BeginTransaction()==KErrNone);
-
-	if(table->GotoFirstRecord()==KErrNone)
-		{
-		// Check record state is read only
-		TInt recordAccess = 0;
-		TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
-		TESTL(recordAccess == 1);
-
-		// Check record cannot be updated
-		TRAPD(ret, UpdateRecordL(table,KErrAccessDenied));
-		TESTL(ret == KErrNone);
-
-		// Unprotect record
-		table->GotoFirstRecord();
-		TRAP(ret,UnprotectRecordL(table,KErrNone));
-		TESTL(ret == KErrNone);
-
-		// Check record state is now writable
-		TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
-		TESTL(recordAccess == 0);
-
-		// Test record can now be updated
-		TRAP(ret,UpdateRecordL(table,KErrNone));
-		TESTL(ret == KErrNone);
-		}
-
-	TESTL(iTheDb->CommitTransaction()==KErrNone);
-	
-	// Do separate transaction to check deletion is 
-	// allowed as want to be able to roll this back
-	TESTL(iTheDb->BeginTransaction()==KErrNone);
-	
-	if(table->GotoFirstRecord()==KErrNone)
-		{
-		// Check can delete record
-		TRAPD(ret,DeleteRecordL(table,KErrNone));
-		TESTL(ret == KErrNone);
-		} 
-	
-	//don't commit as don't want to risk making db empty.
-	iTheDb->RollbackTransaction();
-
-
-	iTestStepResult = EPass;
-	Log(_L("\t\tSUCCESS"));
-
-	CleanupStack::PopAndDestroy(); 
-	return iTestStepResult;
-	}
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_056_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2003-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:
-//
- 
-#if !defined(__STEP_056_XX_H__)
-#define __STEP_056_XX_H__
-
-
-
-NONSHARABLE_CLASS(CCommDbTest056_01 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest056_01();
-	virtual ~CCommDbTest056_01();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-
-NONSHARABLE_CLASS(CCommDbTest056_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest056_02();
-	virtual ~CCommDbTest056_02();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-#endif
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_057_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-// Copyright (c) 2003-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:
-//
- 
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbstore.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include <comms-infras/commdb/protection/protectdb.h>
-#include <comms-infras/commdb/protection/protectcpdb.h>
-#else
-//these headers are user includes in the new env.
-#include "protectdb.h"
-#include "protectcpdb.h"
-#endif
-
-#include <cdbpreftable.h>
-
-#include "step_057_xx.h"
-
-//
-//	Test step 057.01
-//
-
-//TestProtectRecords
-CCommDbTest057_01::CCommDbTest057_01()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_057_01");
-}
-
-CCommDbTest057_01::~CCommDbTest057_01()
-{
-	delete iTheDb;
-}
-
-TVerdict CCommDbTest057_01::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-enum TVerdict CCommDbTest057_01::doTestStepL( void )
-	{
-
-	Log(_L("Test Protect Connection Prefs Table "));
-	iTestStepResult = EPass;
-
-    CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref  RecordData1, RecordData2;
-
-	// protect the table and do some checking
-	// database is modified
-	//
-
-	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
-	CheckTableIsNotProtectedL(table);
-
-	table->ReadConnectionPreferenceL(RecordData1);
-
-	TESTL(table->ProtectTable()==KErrNone);
-	
-	CheckTableIsProtectedL(table);
-	table->ReadConnectionPreferenceL(RecordData2);
-	TESTL(RecordData1 == RecordData2);
-
-	iTestStepResult = EPass;
-	Log(_L("\t\tSUCCESS"));
-
-	CleanupStack::PopAndDestroy(); 
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 057.02
-//
-
-//TestUnprotectRecords
-CCommDbTest057_02::CCommDbTest057_02()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_057_02");
-}
-
-CCommDbTest057_02::~CCommDbTest057_02()
-{
-	delete iTheDb;
-}
-
-TVerdict CCommDbTest057_02::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-enum TVerdict CCommDbTest057_02::doTestStepL( void )
-	{
-
-	Log(_L("Test UnProtect Connection Prefs Table .."));
-	iTestStepResult = EPass;
-
-	// unprotect the table and do some checking
-	// database is modified
-	//
-	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
-	CheckTableIsProtectedL(table);
-
-	TESTL(table->UnprotectTable()==KErrNone);
-	
-	CheckTableIsNotProtectedL(table);
-	
-	iTestStepResult = EPass;
-	Log(_L("\t\tSUCCESS"));
-	CleanupStack::PopAndDestroy(); 
-	return iTestStepResult;
-	}
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_057_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2003-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:
-//
- 
-#if !defined(__STEP_057_XX_H__)
-#define __STEP_057_XX_H__
-
-
-
-NONSHARABLE_CLASS(CCommDbTest057_01 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest057_01();
-	virtual ~CCommDbTest057_01();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-
-NONSHARABLE_CLASS(CCommDbTest057_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest057_02();
-	virtual ~CCommDbTest057_02();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-#endif
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_058_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,191 +0,0 @@
-// Copyright (c) 2003-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:
-//
- 
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbstore.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include <comms-infras/commdb/protection/protectdb.h>
-#include <comms-infras/commdb/protection/protectcpdb.h>
-#else
-//these headers are user includes in the new env.
-#include "protectdb.h"
-#include "protectcpdb.h"
-#endif
-
-#include <cdbpreftable.h>
-
-#include "step_058_xx.h"
-
-//
-//	Test step 058.01
-//
-
-//TestProtectRecords
-CCommDbTest058_01::CCommDbTest058_01()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_058_01");
-}
-
-CCommDbTest058_01::~CCommDbTest058_01()
-{
-	delete iTheDb;
-}
-
-TVerdict CCommDbTest058_01::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-
-enum TVerdict CCommDbTest058_01::doTestStepL( void )
-	{
-	TUint32 Ranking;
-	Log(_L("Test Protect Connection Prefs Records "));
-	iTestStepResult = EPass;
-
-	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
-
-	TESTL(iTheDb->BeginTransaction()==KErrNone);
-	
-	TESTL(table->GotoFirstRecord()==KErrNone);
-
-	// Check record security level is writable
-	TInt recordAccess = RDbRowSet::EReadOnly;
-	TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
-	TESTL(recordAccess == RDbRowSet::EUpdatable);
-
-	// Modify and test the first record
-	TESTL(ChangeCPRankingL(table, Ranking) == KErrNone);
-
-	TRAPD(ErrVal,ProtectRecordL(table,KErrNone));		
-	TESTL(ErrVal == KErrNone);
-
-	// Check record security level is read only
-	TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
-	TESTL(recordAccess == RDbRowSet::EReadOnly);
-
-	// Test that protection is effective - i.e we can't change the record
-	ErrVal = ChangeCPRankingL(table, Ranking); // Try modifying a field.
-	TESTL(ErrVal == KErrAccessDenied);
-
-	// Check record security level is still read only
-	TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
-	TESTL(recordAccess == RDbRowSet::EReadOnly);
-
-	table->GotoFirstRecord();
-
-	TESTL(iTheDb->CommitTransaction()==KErrNone);
-
-	iTestStepResult = EPass;
-	Log(_L("\t\tSUCCESS"));
-
-	CleanupStack::PopAndDestroy(); 
-	return iTestStepResult;
-	}
-
-
-//
-//	Test step 058.02
-//
-
-//TestUnprotectRecords
-
-CCommDbTest058_02::CCommDbTest058_02()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_058_02");
-}
-
-CCommDbTest058_02::~CCommDbTest058_02()
-{
-	delete iTheDb;
-}
-
-TVerdict CCommDbTest058_02::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-
-enum TVerdict CCommDbTest058_02::doTestStepL( void )
-	{
-
-	Log(_L("Test UnProtect Connection Prefs Records .."));
-	iTestStepResult = EPass;
-
-	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
-
-	TESTL(iTheDb->BeginTransaction()==KErrNone);
-
-	if(table->GotoFirstRecord()==KErrNone)
-		{
-		// Check record state is read only
-		TInt recordAccess = RDbRowSet::EUpdatable;
-		TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
-		TESTL(recordAccess == RDbRowSet::EReadOnly);
-
-		// Check record cannot be updated
-		TRAPD(ret, UpdateRecordL(table,KErrAccessDenied));
-		TESTL(ret == KErrNone);
-
-		// Unprotect record
-		table->GotoFirstRecord();
-		TRAP(ret,UnprotectRecordL(table,KErrNone));
-		TESTL(ret == KErrNone);
-
-		// Check record state is now writable
-		TESTL(table->GetRecordAccess(recordAccess) == KErrNone);
-		TESTL(recordAccess == RDbRowSet::EUpdatable);
-
-		// Test record can now be updated
-		TRAP(ret,UpdateRecordL(table,KErrNone));
-		TESTL(ret == KErrNone);
-		}
-
-	TESTL(iTheDb->CommitTransaction()==KErrNone);
-	
-	// Do separate transaction to check deletion is 
-	// allowed as want to be able to roll this back
-	TESTL(iTheDb->BeginTransaction()==KErrNone);
-	
-	if(table->GotoFirstRecord()==KErrNone)
-		{
-		// Check can delete record
-		TRAPD(ret,DeleteRecordL(table,KErrNone));
-		TESTL(ret == KErrNone);
-		} 
-	
-	//don't commit as don't want to risk making db empty.
-	iTheDb->RollbackTransaction();
-
-	iTestStepResult = EPass;
-	Log(_L("\t\tSUCCESS"));
-	CleanupStack::PopAndDestroy(); 
-	return iTestStepResult;
-	}
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_058_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2003-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:
-//
- 
-#if !defined(__STEP_058_XX_H__)
-#define __STEP_058_XX_H__
-
-
-
-NONSHARABLE_CLASS(CCommDbTest058_01 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest058_01();
-	virtual ~CCommDbTest058_01();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-
-NONSHARABLE_CLASS(CCommDbTest058_02) : public CTestStepCommDb
-{
-public:
-	CCommDbTest058_02();
-	virtual ~CCommDbTest058_02();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-#endif
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_059_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,342 +0,0 @@
-// Copyright (c) 2003-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:
-//
- 
-// EPOC includes
-#include <e32base.h>
-#include <commdb.h>
-#include <d32comm.h>
-#include <cdbstore.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include <comms-infras/commdb/protection/protectdb.h>
-#include <comms-infras/commdb/protection/protectcpdb.h>
-#else
-//these headers are user includes in the new env.
-#include "protectdb.h"
-#include "protectcpdb.h"
-#endif
-
-#include <cdbpreftable.h>
-
-#include "step_059_xx.h"
-
-#define ACCESS_TYPE_TABLE		_S("AccessTypeTable")
-#define TABLE_ACC_NAME          _S("TableName")
-#define TABLE_ACC_TYPE          _S("AccessType")
-
-//
-//	Test step 059.01
-//
-
-//TestProtectRecords
-CCommDbTest059_01::CCommDbTest059_01()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_059_01");
-}
-
-CCommDbTest059_01::~CCommDbTest059_01()
-{
-	delete iTheDb;
-}
-
-TVerdict CCommDbTest059_01::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-enum TVerdict CCommDbTest059_01::doTestStepL( void )
-	{
-	Log(_L("Combinational test (Only for Conn Pref)"));
-	iTestStepResult = EPass;
-
-
-// Try a combination of operations on a table, as follows:
-// 1) protect record
-// 2) attempt update to protected record
-// 3) attempt update to unprotected record
-// 4) attempt delete of unprotected record
-// 5) protect table
-// 6) attempt record insertion
-// 7) attempt protected record deletion & update
-// 8) attempt unprotected record deletion and update
-// 9) unprotect table
-// 10) attempt record insertion
-// 11) attempt record deletion
-// 12) attempt update to protected record
-// 13) attempt update to unprotected record
-// 15) unprotect record
-// 15) attempt update to formerly unprotected record
-// 16) attempt update to unprotected record
-//
-	CCommsDbProtectConnectPrefTableView* table = (CCommsDbProtectConnectPrefTableView *)iTheDb->OpenConnectionPrefTableLC();
-			
-	TESTL(iTheDb->BeginTransaction()==KErrNone);
-
-	if(table->GotoFirstRecord()==KErrNone)
-		{
-		// Add another record to the table (so there should be 3)
-		InsertRecordL(table,KErrNone);
-
-		TESTL(table->GotoFirstRecord()==KErrNone);
-		TESTL(table->GotoNextRecord()==KErrNone);
-
-		// 1) Protect the second record
-		CheckRecordAccessL(table,RDbRowSet::EUpdatable); 
-		ProtectRecordL(table,KErrNone);
-		CheckRecordAccessL(table,RDbRowSet::EReadOnly); 
-		
-		// 2) Check record cannot be updated
-		UpdateRecordL(table,KErrAccessDenied);
-
-		// Go to the first record (unprotected)
-
-		TESTL(table->GotoFirstRecord()==KErrNone);
-		CheckRecordAccessL(table,RDbRowSet::EUpdatable); 
-
-		// 3) Check it can be updated
-		UpdateRecordL(table,KErrNone);
-
-		// 4) Check it can be deleted
-		DeleteRecordL(table,KErrNone);
-
-		//(which means that the new first record should be protected.....)
-		TESTL(table->GotoFirstRecord()==KErrNone);
-		CheckRecordAccessL(table,RDbRowSet::EReadOnly); 
-
-		// 5) Unprotect the first record which should be protected
-		CheckRecordAccessL(table,RDbRowSet::EReadOnly); 
-		UnprotectRecordL(table,KErrNone);
-		CheckRecordAccessL(table,RDbRowSet::EUpdatable); 
-		
-		// 6) Attempt update to formerly protected record (should succeed)
-		UpdateRecordL(table,KErrNone);
-		
-		// End the transaction, as a protect table is a separate one.
-		TESTL(iTheDb->CommitTransaction()==KErrNone);
-
-		// 7) Protect the table
-		TESTL(table->ProtectTable()==KErrNone);
-
-		TESTL(iTheDb->BeginTransaction()==KErrNone);
-
-		// 8) Check a record can't be inserted
-		InsertRecordL(table,KErrAccessDenied);
-
-		// 9) Check a record can't be deleted or updated
-		DeleteRecordL(table,KErrAccessDenied);
-		UpdateRecordL(table,KErrAccessDenied);
-		
-		// End the transaction, as unprotect table is a separate one.
-		TESTL(iTheDb->CommitTransaction()==KErrNone);
-
-		// 10) Unprotect the table
-		TESTL(table->UnprotectTable()==KErrNone);
-	
-		table->GotoFirstRecord();
-		TESTL(iTheDb->BeginTransaction()==KErrNone);
-		// 11) Check a record can be inserted
-		InsertRecordL(table,KErrNone);
-
-		// 12) Check an unprotected record can be deleted, but a protected one can't
-		// Again, yes it can so don't test this here.
-		DeleteRecordL(table,KErrNone);
-
-		// 13) Check the unprotected record can be updated
-		// Delete a record so there's only one left. Otherwise an update now will
-		// fail validation due to duplicate records.
-		TESTL(table->GotoFirstRecord()==KErrNone);
-		DeleteRecordL(table,KErrNone);
-		TESTL(table->GotoFirstRecord()==KErrNone);
-		UpdateRecordL(table,KErrNone);
-		
-		// 14) Finally check that last record can be deleted
-		TESTL(table->GotoFirstRecord()==KErrNone);
-		DeleteRecordL(table,KErrNone);
-		}
-	TESTL(iTheDb->CommitTransaction()==KErrNone);
-
-	iTestStepResult = EPass;
-	Log(_L("\t\tSUCCESS"));
-
-	CleanupStack::PopAndDestroy(); 
-	return iTestStepResult;
-	}
-
-
-
-//
-//	Test step 060.01
-//
-
-//Panic Test
-CCommDbTest060_01::CCommDbTest060_01()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_060_01");
-
-}
-
-CCommDbTest060_01::~CCommDbTest060_01()
-	{
-	delete iTheDb;
-	}
-
-TVerdict CCommDbTest060_01::doTestStepPreambleL()
-	{	
-	iTheDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-	return EPass;
-	}
-
-enum TVerdict CCommDbTest060_01::doTestStepL( void )
-	{
-	iTestStepResult = EFail;
-
-	//turn-off JIT debugging...
-//	User::SetJustInTime(EFalse);
-
-	// Use the same table as step_055_01
-	CCommsDbProtectTableView* table = NULL;
-	table = (CCommsDbProtectTableView *)iTheDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
-
-	CheckTableIsNotProtectedL(table);
-
-	// Protection uses transaction, transaction within transaction is not allowed
-	// this test ensures that the ProtectTable code handles this correctly
-	if (table->GotoFirstRecord() == KErrNone)
-		{
-	    if (iTheDb->BeginTransaction() == KErrNone)
-			{
-			// Set protection from within a transaction
-			TESTL(table->ProtectTable()==KErrNone);
-	
-			CheckTableIsProtectedL(table);
-			iTestStepResult = EPass;
-			Log(_L("\t\tSUCCESS"));
-				
-			iTheDb->RollbackTransaction();
-			}
-		}
-	CleanupStack::PopAndDestroy(table);
-	
-	return iTestStepResult;
-	}
-
-//
-//	Test step 060.02
-//This test case is for testing the fix for 
-//DEF035522: CommDb protection is easily circumvented using public APIs
-//
-
-//Panic Test
-CCommDbTest060_02::CCommDbTest060_02()
-{
-	// store the name of this test case
-	iTestStepName = _L("step_060_02");
-
-}
-
-CCommDbTest060_02::~CCommDbTest060_02()
-{
-
-}
-
-enum TVerdict CCommDbTest060_02::doTestStepL( void )
-	{
-
-	iTestStepResult = EPass;
-	CCommsDatabase* db = CCommsDatabase::NewL();
-	CleanupStack::PushL(db);
-	//Protect ISP the table
-	Log(_L("Protect ISP table"));
-	TRAPD(protect, ProtectISPTableL(db));
-	if( protect != KErrNone)
-		{
-		Log(_L("Failed to protect ISP table"));
-		return EFail;
-		}
-	//try to remove the protection using public APIs
-	Log(_L("Try to remove the protection using public APIs"));
-	TRAPD(unprotect, RemoveProtectionL(db));
-	//Should return KErrNotFound
-	if (unprotect != KErrNotFound)
-		{
-		Log(_L("Protection settings broken using public APIs"));
-		return EFail;
-		}
-	Log(_L("Table is well protected!! "));
-	CleanupStack::PopAndDestroy(db);
-	return iTestStepResult;
-	}
-
-void CCommDbTest060_02::ProtectISPTableL(CCommsDatabase* aDb)
-//
-//  Protect the DialOutISP table using the hidden APIs
-//
-	{
-
-	CCommsDbProtectTableView* view = (CCommsDbProtectTableView*) aDb->OpenTableLC(TPtrC(DIAL_OUT_ISP));
-    if(view->GotoFirstRecord() == KErrNone)
-		{
-		User::LeaveIfError(view->ProtectTable());
-		}
-
-	CleanupStack::PopAndDestroy(view);
-	}
-
-
-void CCommDbTest060_02::RemoveProtectionL(CCommsDatabase* aDb)
-//
-//  Use the public CommDb APIs to modify the AccessTypeTable
-//
-	{
-	
-	aDb->ShowHiddenRecords();
-	//should fail here as its trying to open ACCESS_TYPE_TABLE
-	//leaves with KErrNotFound
-	CCommsDbTableView* view = aDb->OpenTableLC(TPtrC(ACCESS_TYPE_TABLE));
-	
-	//Shouldn't get here..
-	Log(_L("Contents of Access Type table:"));
-	while (view->GotoNextRecord() == KErrNone)
-		{
-		// display the current access settings
-		TBuf<KCommsDbSvrMaxFieldLength> name;
-		view->ReadTextL(TPtrC(TABLE_ACC_NAME), name);
-
-		TUint32 accessType;
-		view->ReadUintL(TPtrC(TABLE_ACC_TYPE), accessType);
-
-		RDebug::Print(_L("Table: '%S'\tAccess type: %d"), &name, accessType);
-
-		// now set the access type to 'updateable'
-		view->UpdateRecord();
-		view->WriteUintL(TPtrC(TABLE_ACC_TYPE), (TUint32)RDbRowSet::EUpdatable);
-		view->PutRecordChanges();
-
-		// display the new access settings
-		view->ReadUintL(TPtrC(TABLE_ACC_TYPE), accessType);
-		Log(_L("Table: '%S'\tNew access type: %d"), &name, accessType);
-		}
-
-	CleanupStack::PopAndDestroy(view);
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_059_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2003-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:
-//
- 
-#if !defined(__STEP_059_XX_H__)
-#define __STEP_059_XX_H__
-
-
-
-NONSHARABLE_CLASS(CCommDbTest059_01 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest059_01();
-	virtual ~CCommDbTest059_01();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-//PAnic Test
-NONSHARABLE_CLASS(CCommDbTest060_01 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest060_01();
-	virtual ~CCommDbTest060_01();
-	TVerdict doTestStepPreambleL();
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-NONSHARABLE_CLASS(CCommDbTest060_02 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest060_02();
-	virtual ~CCommDbTest060_02();
-	virtual enum TVerdict doTestStepL( void );	
-	void ProtectISPTableL(CCommsDatabase*);
-	void RemoveProtectionL(CCommsDatabase*);
-};
-#endif
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_063_xx.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,466 +0,0 @@
-// Copyright (c) 2006-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:
-// This contains CommDb Unit Test Cases 063.XX
-// 
-//
-
-// EPOC includes
-#include <commdb.h>
-#include <d32dbms.h>
-#include <badesca.h>
-#include <cdbstore.h>
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include <comms-infras/commdb/protection/protectdb.h>
-#include <comms-infras/commdb/protection/protectcpdb.h>
-#else
-//these headers are user includes in the new env.
-#include "protectdb.h"
-#include "protectcpdb.h"
-#endif
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include "Teststepcommdb.h"
-#include "TestSuiteCommdb.h"
-#include "step_063_xx.h"
-
-//
-//	Test step 063.01
-//
-
-// constructor
-CCommDbTest063_01::CCommDbTest063_01()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_063_01");
-	}
-
-// destructor
-CCommDbTest063_01::~CCommDbTest063_01()
-	{}
-	
-enum TVerdict CCommDbTest063_01::doTestStepL( void )
-	{
-	iTestStepResult = EPass;
-
-	iTheProtectedDb = CCommsDatabaseProtect::NewL();
-
-	if(iTheProtectedDb->ProtectTable(TPtrC(DIAL_OUT_ISP))!=KErrNone)
-		{iTestStepResult = EFail;}
-
-	RDbRowSet::TAccess rowSet = RDbRowSet::EUpdatable;
-	TRAPD(ret, rowSet = iTheProtectedDb->GetTableAccessL(TPtrC(DIAL_OUT_ISP)));
-
-	if (ret != KErrNone || rowSet != RDbRowSet::EReadOnly)
-		{
-		iTestStepResult = EFail;
-		}
-
-	delete iTheProtectedDb;
-	iTheProtectedDb=NULL;
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 063.02
-//
-
-// constructor
-CCommDbTest063_02::CCommDbTest063_02()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_063_02");
-	}
-
-// destructor
-CCommDbTest063_02::~CCommDbTest063_02()
-	{}
-	
-enum TVerdict CCommDbTest063_02::doTestStepL( void )
-	{
-	iTestStepResult = EPass;
-
-	iTheProtectedDb = CCommsDatabaseProtect::NewL();
-
-	if(iTheProtectedDb->UnProtectTable(TPtrC(DIAL_OUT_ISP))!=KErrNone)
-		{
-		iTestStepResult = EFail;
-		}
-
-	RDbRowSet::TAccess rowSet = RDbRowSet::EReadOnly;
-	TRAPD(ret, rowSet = iTheProtectedDb->GetTableAccessL(TPtrC(DIAL_OUT_ISP)));
-
-	if (ret != KErrNone || rowSet != RDbRowSet::EUpdatable)
-		{
-		iTestStepResult = EFail;
-		}
-
-	delete iTheProtectedDb;
-	iTheProtectedDb=NULL;
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 063.03
-//
-
-// constructor
-CCommDbTest063_03::CCommDbTest063_03()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_063_03");
-	}
-
-// destructor
-CCommDbTest063_03::~CCommDbTest063_03()
-	{}
-	
-enum TVerdict CCommDbTest063_03::doTestStepL( void )
-	{
-	iTestStepResult = EPass;
-
-	iTheProtectedDb = CCommsDatabaseProtect::NewL();
-
-	//Construct table list
-	CPtrCArray* tableArray;
-	tableArray = new (ELeave) CPtrCArray(2);
-	CleanupStack::PushL(tableArray);
-
-	TRAPD(ret, tableArray->InsertL(0,DIAL_OUT_ISP));
-	if (ret != KErrNone)
-		{
-		iTestStepResult = EFail;
-		CleanupStack::PopAndDestroy(tableArray);
-		delete iTheProtectedDb;
-		iTheProtectedDb=NULL;
-		return iTestStepResult;
-		}
-
-	TRAP(ret, tableArray->InsertL(1,DIAL_IN_ISP));
-	if (ret != KErrNone)
-		{
-		iTestStepResult = EFail;
-		CleanupStack::PopAndDestroy(tableArray);
-		delete iTheProtectedDb;
-		iTheProtectedDb=NULL;
-		return iTestStepResult;
-		}
-	
-	if(iTheProtectedDb->ProtectTables(*tableArray) != KErrNone)
-		{
-		iTestStepResult = EFail;
-		CleanupStack::PopAndDestroy(tableArray);
-		delete iTheProtectedDb;
-		iTheProtectedDb=NULL;
-		return iTestStepResult;
-		}
-
-	RDbRowSet::TAccess rowSet = RDbRowSet::EUpdatable;
-	TRAP(ret, rowSet = iTheProtectedDb->GetTableAccessL(TPtrC(DIAL_IN_ISP)));
-
-	if (ret != KErrNone || rowSet != RDbRowSet::EReadOnly)
-		{
-		iTestStepResult = EFail;
-		}
-
-	CleanupStack::PopAndDestroy(tableArray);
-
-	delete iTheProtectedDb;
-	iTheProtectedDb=NULL;
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 063.04
-//
-
-// constructor
-CCommDbTest063_04::CCommDbTest063_04()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_063_04");
-	}
-
-// destructor
-CCommDbTest063_04::~CCommDbTest063_04()
-	{}
-	
-enum TVerdict CCommDbTest063_04::doTestStepL( void )
-	{
-	iTestStepResult = EPass;
-
-	iTheProtectedDb = CCommsDatabaseProtect::NewL();
-
-	//Construct table list
-	CPtrCArray* tableArray;
-	tableArray = new (ELeave) CPtrCArray(2);
-	CleanupStack::PushL(tableArray);
-
-	TRAPD(ret, tableArray->InsertL(0,DIAL_OUT_ISP));
-	if (ret != KErrNone)
-		{
-		iTestStepResult = EFail;
-		CleanupStack::PopAndDestroy(tableArray);
-		delete iTheProtectedDb;
-		iTheProtectedDb=NULL;
-		return iTestStepResult;
-		}
-
-	TRAP(ret, tableArray->InsertL(1,DIAL_IN_ISP));
-	if (ret != KErrNone)
-		{
-		iTestStepResult = EFail;
-		CleanupStack::PopAndDestroy(tableArray);
-		delete iTheProtectedDb;
-		iTheProtectedDb=NULL;
-		return iTestStepResult;
-		}
-
-	if(iTheProtectedDb->UnprotectTables(*tableArray) != KErrNone)
-		{
-		iTestStepResult = EFail;
-		CleanupStack::PopAndDestroy(tableArray);
-		delete iTheProtectedDb;
-		iTheProtectedDb=NULL;
-		return iTestStepResult;
-		}
-
-	RDbRowSet::TAccess rowSet = RDbRowSet::EReadOnly;
-	TRAP(ret, rowSet = iTheProtectedDb->GetTableAccessL(TPtrC(DIAL_IN_ISP)));
-
-	if (ret != KErrNone || rowSet != RDbRowSet::EUpdatable)
-		{
-		iTestStepResult = EFail;
-		}
-
-	CleanupStack::PopAndDestroy(tableArray);
-
-	delete iTheProtectedDb;
-	iTheProtectedDb=NULL;
-
-	return iTestStepResult;
-	}
-
-//
-//	Test step 063.05
-//
-
-// constructor
-CCommDbTest063_05::CCommDbTest063_05()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_063_05");
-	}
-
-// destructor
-CCommDbTest063_05::~CCommDbTest063_05()
-	{
-	}
-	
-enum TVerdict CCommDbTest063_05::doTestStepL( void )
-	{	
-	iTestStepResult = EPass;
-	TBool val=0;
-	iTheProtectedDb = CCommsDatabaseProtect::NewL(val);
-	if(iTheProtectedDb->ProtectTable(TPtrC(DIAL_OUT_ISP)) != KErrNone)
-		{
-		iTestStepResult = EFail;
-		}
-	RDbRowSet::TAccess rowSet = RDbRowSet::EUpdatable;
-	TRAPD(ret, rowSet = iTheProtectedDb->GetTableAccessL(TPtrC(DIAL_OUT_ISP)));
-	if (ret != KErrNone || rowSet != RDbRowSet::EReadOnly)
-		{
-		iTestStepResult = EFail;
-		}
-	delete iTheProtectedDb;
-	iTheProtectedDb=NULL;
-    return iTestStepResult;
-	}
-		
-	//
-//	Test step 063.06
-//
-
-// constructor
-CCommDbTest063_06::CCommDbTest063_06()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_063_06");
-	}
-
-// destructor
-CCommDbTest063_06::~CCommDbTest063_06()
-	{
-	}
-	
-enum TVerdict CCommDbTest063_06::doTestStepL( void )
-	{
-	iTestStepResult = EPass;
-    TBool val=0;
-	iTheProtectedDb = CCommsDatabaseProtect::NewL(val);
-	if(iTheProtectedDb->UnProtectTable(TPtrC(DIAL_OUT_ISP)) != KErrNone)
-		{
-		iTestStepResult = EFail;
-		}
-	RDbRowSet::TAccess rowSet = RDbRowSet::EReadOnly;
-	TRAPD(ret, rowSet = iTheProtectedDb->GetTableAccessL(TPtrC(DIAL_OUT_ISP)));
-	if (ret != KErrNone || rowSet != RDbRowSet::EUpdatable)
-		{
-		iTestStepResult = EFail;
-		}
-	delete iTheProtectedDb;
-	iTheProtectedDb=NULL;
-	return iTestStepResult;
-	}
-
-//
-//	Test step 063.07
-//
-
-// constructor
-CCommDbTest063_07::CCommDbTest063_07()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_063_07");
-	}
-
-// destructor
-CCommDbTest063_07::~CCommDbTest063_07()
-	{
-	}
-	
-enum TVerdict CCommDbTest063_07::doTestStepL( void )
-	{
-	iTestStepResult = EPass;
-	TBool val=0;
-	iTheProtectedDb = CCommsDatabaseProtect::NewL(val);
-	//Construct table list
-	CPtrCArray* tableArray = new (ELeave) CPtrCArray(2);
-	CleanupStack::PushL(tableArray);
-	TRAPD(ret, tableArray->InsertL(0,DIAL_OUT_ISP));
-	if (ret != KErrNone)
-		{
-		iTestStepResult = EFail;
-		CleanupStack::PopAndDestroy(tableArray);
-		delete iTheProtectedDb;
-		iTheProtectedDb=NULL;
-		return iTestStepResult;
-		}
-	TRAP(ret, tableArray->InsertL(1,DIAL_IN_ISP));
-	if (ret != KErrNone)
-		{
-		iTestStepResult = EFail;
-		CleanupStack::PopAndDestroy(tableArray);
-		delete iTheProtectedDb;
-		iTheProtectedDb=NULL;
-		return iTestStepResult;
-		}	
-	if(iTheProtectedDb->ProtectTables(*tableArray) != KErrNone)
-		{
-		iTestStepResult = EFail;
-		CleanupStack::PopAndDestroy(tableArray);
-		delete iTheProtectedDb;
-		iTheProtectedDb=NULL;
-		return iTestStepResult;
-		}
-	RDbRowSet::TAccess rowSet = RDbRowSet::EUpdatable;
-	TRAP(ret, rowSet = iTheProtectedDb->GetTableAccessL(TPtrC(DIAL_IN_ISP)));
-	if (ret != KErrNone || rowSet != RDbRowSet::EReadOnly)
-		{
-		iTestStepResult = EFail;
-		}
-	CleanupStack::PopAndDestroy(tableArray);
-	delete iTheProtectedDb;
-	iTheProtectedDb=NULL;
-	return iTestStepResult;
-	}
-
-//
-//	Test step 063.08
-//
-
-// constructor
-CCommDbTest063_08::CCommDbTest063_08()
-	{
-	// store the name of this test case
-	iTestStepName = _L("step_063_08");
-	}
-
-// destructor
-CCommDbTest063_08::~CCommDbTest063_08()
-	{
-	}
-	
-enum TVerdict CCommDbTest063_08::doTestStepL( void )
-	{
-	iTestStepResult = EPass;
-	TBool val=0;
-	iTheProtectedDb = CCommsDatabaseProtect::NewL(val);
-	//Construct table list
-	CPtrCArray* tableArray = new (ELeave) CPtrCArray(2);
-	CleanupStack::PushL(tableArray);
-	TRAPD(ret, tableArray->InsertL(0,DIAL_OUT_ISP));
-	if (ret != KErrNone)
-		{
-		iTestStepResult = EFail;
-		CleanupStack::PopAndDestroy(tableArray);
-		delete iTheProtectedDb;
-		iTheProtectedDb=NULL;
-		return iTestStepResult;
-		}
-	TRAP(ret, tableArray->InsertL(1,DIAL_IN_ISP));
-	if (ret != KErrNone)
-		{
-		iTestStepResult = EFail;
-		CleanupStack::PopAndDestroy(tableArray);
-		delete iTheProtectedDb;
-		iTheProtectedDb=NULL;
-		return iTestStepResult;
-		}
-	if(iTheProtectedDb->UnprotectTables(*tableArray) != KErrNone)
-		{
-		iTestStepResult = EFail;
-		CleanupStack::PopAndDestroy(tableArray);
-		delete iTheProtectedDb;
-		iTheProtectedDb=NULL;
-		return iTestStepResult;
-		}
-	RDbRowSet::TAccess rowSet = RDbRowSet::EReadOnly;
-	TRAP(ret, rowSet = iTheProtectedDb->GetTableAccessL(TPtrC(DIAL_IN_ISP)));
-	if (ret != KErrNone || rowSet != RDbRowSet::EUpdatable)
-		{
-		iTestStepResult = EFail;
-		}
-	CleanupStack::PopAndDestroy(tableArray);
-	delete iTheProtectedDb;
-	iTheProtectedDb=NULL;
-	return iTestStepResult;
-	}
-	
-
-
-
-	
-	
-	
-	
-	
-	
-
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/step_063_xx.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-// Copyright (c) 2006-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:
-//
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include <comms-infras/commdb/protection/protectdb.h>
-#include <comms-infras/commdb/protection/protectcpdb.h>
-#else
-//these headers are user includes in the new env.
-#include "protectdb.h"
-#include "protectcpdb.h"
-#endif
- 
-#if !defined(__STEP_063_XX_H__)
-#define __STEP_063_XX_H__
-
-NONSHARABLE_CLASS(CCommDbTest063_01 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest063_01();
-	virtual ~CCommDbTest063_01();
-	virtual enum TVerdict doTestStepL( void );
-private:
-	CCommsDatabaseProtect* iTheProtectedDb;
-};
-
-NONSHARABLE_CLASS(CCommDbTest063_02 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest063_02();
-	virtual ~CCommDbTest063_02();
-	virtual enum TVerdict doTestStepL( void );
-private:
-	CCommsDatabaseProtect* iTheProtectedDb;
-};
-
-NONSHARABLE_CLASS(CCommDbTest063_03 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest063_03();
-	virtual ~CCommDbTest063_03();
-	virtual enum TVerdict doTestStepL( void );
-private:
-	CCommsDatabaseProtect* iTheProtectedDb;
-};
-
-NONSHARABLE_CLASS(CCommDbTest063_04 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest063_04();
-	virtual ~CCommDbTest063_04();
-	virtual enum TVerdict doTestStepL( void );
-private:
-	CCommsDatabaseProtect* iTheProtectedDb;
-};
-
-#endif
-
-
-
-
-NONSHARABLE_CLASS(CCommDbTest063_05 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest063_05();
-	virtual ~CCommDbTest063_05();
-	virtual enum TVerdict doTestStepL( void );
-private:
-	CCommsDatabaseProtect* iTheProtectedDb;
-};
-
-NONSHARABLE_CLASS(CCommDbTest063_06 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest063_06();
-	virtual ~CCommDbTest063_06();
-	virtual enum TVerdict doTestStepL( void );
-private:
-	CCommsDatabaseProtect* iTheProtectedDb;
-};
-
-NONSHARABLE_CLASS(CCommDbTest063_07 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest063_07();
-	virtual ~CCommDbTest063_07();
-	virtual enum TVerdict doTestStepL( void );
-private:
-	CCommsDatabaseProtect* iTheProtectedDb;
-};
-
-NONSHARABLE_CLASS(CCommDbTest063_08 ) : public CTestStepCommDb
-{
-public:
-	CCommDbTest063_08();
-	virtual ~CCommDbTest063_08();
-	virtual enum TVerdict doTestStepL( void );
-private:
-	CCommsDatabaseProtect* iTheProtectedDb;
-};
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/te_cdma2000Settings/config/te_cdmacommdbsettings.xml	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-    <Network operation="add">
-        <Name>mRouter</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-</IAPTable>
-
-<ModemBearerTable>
-</ModemBearerTable>
-
-<LANBearerTable>
-</LANBearerTable>
-
-<LANServiceTable>
-</LANServiceTable>
-
-<DialInISPTable>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="add">
-        <Name>NT RAS</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>TRUE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <Ip6DNSAddrFromServer>TRUE</Ip6DNSAddrFromServer>
-        <Description>Test</Description>
-        <Type>INTERNETONLY</Type>
-        <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND &quot;CLIENT&quot;+&lt;0x0d&gt;\nWAIT 3\n{\n&quot;SERVER&quot; OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfServerMode>TRUE</IfServerMode>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>TRUE</EnableSWComp>
-    </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
-    <CDMA2000PacketService operation="add">
-        <Name>Mobile IP</Name>
-        <IwfName>Test2000</IwfName>
-        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
-        <PdpType>IPV4</PdpType>
-        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
-        <ReqRevPriority>PRIORITY04</ReqRevPriority>
-        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
-        <ReqRevBitrate>32KBPS</ReqRevBitrate>
-        <ReqFwdLoss>LOSS1</ReqFwdLoss>
-        <ReqRevLoss>LOSS1</ReqRevLoss>
-        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
-        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
-        <MinFwdBitrate>32KBPS</MinFwdBitrate>
-        <MinRevBitrate>32KBPS</MinRevBitrate>
-        <AccptFwdLoss>LOSS2</AccptFwdLoss>
-        <AccptRevLoss>LOSS2</AccptRevLoss>
-        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
-        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
-        <EnableSWComp>1</EnableSWComp>
-        <EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfExternIpConfigAlwaysRejectAuth>TRUE</IfExternIpConfigAlwaysRejectAuth>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <AuthRetries>1</AuthRetries>
-        <IpNetMask>1.1.1.1</IpNetMask>
-        <IpGateway>1.1.1.1</IpGateway>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <ApType>2</ApType>
-        <QosWarningTimeout>1000000</QosWarningTimeout>
-        <Ip6DNSAddrFromServer>TRUE</Ip6DNSAddrFromServer>
-        <RlpMode>TRANSPARENT</RlpMode>
-        <CDMANaiType>1</CDMANaiType>
-        <CDMASimpleIpAuthAlgorithm>3</CDMASimpleIpAuthAlgorithm>
-        <CDMASimpleIpPapSsHandle>11</CDMASimpleIpPapSsHandle>
-        <CDMASimpleIpChapSsHandle>12</CDMASimpleIpChapSsHandle>
-        <CDMAMobileIpTBit>0</CDMAMobileIpTBit>
-        <CDMAMobileIpHomeAddress>1.2.3.4</CDMAMobileIpHomeAddress>
-        <CDMAMobileIpPrimaryHomeAgent>1.2.3.4</CDMAMobileIpPrimaryHomeAgent>
-        <CDMAMobileIpSecondaryHomeAgent>1.2.3.4</CDMAMobileIpSecondaryHomeAgent>
-        <CDMAMobileIpMnAaaAuthAlgorithm>1</CDMAMobileIpMnAaaAuthAlgorithm>
-        <CDMAMobileIpMnAaaSpiIndicator>TRUE</CDMAMobileIpMnAaaSpiIndicator>
-        <CDMAMobileIpMnAaaSpi>1</CDMAMobileIpMnAaaSpi>
-        <CDMAMobileIpMnAaaSsData>MnAaaSsHandleLongerThan128Bits</CDMAMobileIpMnAaaSsData>
-        <CDMAMobileIpMnHaAuthAlgorithm>1</CDMAMobileIpMnHaAuthAlgorithm>
-        <CDMAMobileIpMnHaSpiIndicator>TRUE</CDMAMobileIpMnHaSpiIndicator>
-        <CDMAMobileIpMnHaSpi>1</CDMAMobileIpMnHaSpi>
-        <CDMAMobileIpMnHaSsData>MnHaSsHandleLongerThan128Bits</CDMAMobileIpMnHaSsData>
-        <CDMAFchMux>1</CDMAFchMux>
-        <CDMASchMux>2</CDMASchMux>
-    </CDMA2000PacketService>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-	 <DefaultCDMA2000 operation="add">
-	 	<Name>Default</Name>
-	 	<Usage>1</Usage>
-		<IwfName>Test2000</IwfName>
-		<ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
-		<PdpType>IPV4</PdpType>
-		<PdpAddress>1.2.3.4</PdpAddress>
-		<ReqFwdPriority>PRIORITY04</ReqFwdPriority>
-		<ReqRevPriority>PRIORITY04</ReqRevPriority>
-		<ReqFwdBitrate>32KBPS</ReqFwdBitrate>
-		<ReqRevBitrate>32KBPS</ReqRevBitrate>
-		<ReqFwdLoss>LOSS1</ReqFwdLoss>
-		<ReqRevLoss>LOSS1</ReqRevLoss>
-		<ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
-		<ReqRevMaxdelay>40MS</ReqRevMaxdelay>
-		<MinFwdBitrate>32KBPS</MinFwdBitrate>
-		<MinRevBitrate>32KBPS</MinRevBitrate>
-		<AccptFwdLoss>LOSS2</AccptFwdLoss>
-		<AccptRevLoss>LOSS2</AccptRevLoss>
-		<AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
-		<AccptRevMaxdelay>120MS</AccptRevMaxdelay>
-		<EnableIPHeaderComp>TRUE</EnableIPHeaderComp>
-		<AnonymousAccess>FALSE</AnonymousAccess>
-		<HomeAgentAddress>1.2.3.4</HomeAgentAddress>
-		<CDMAOperationMode>1</CDMAOperationMode>
-		<CDMAMobileIPTimeout>100</CDMAMobileIPTimeout>
-		<CDMAMobileIpMaxNumRetry>2</CDMAMobileIpMaxNumRetry>
-		<CDMAMobileIpFirstRetryTimeout>10000000</CDMAMobileIpFirstRetryTimeout>
-		<CDMAMobileIpReregThreshold>11</CDMAMobileIpReregThreshold>
-        <CDMAFchMux>1</CDMAFchMux>
-        <CDMASchMux>2</CDMASchMux>
-	 </DefaultCDMA2000>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
-    <Chargecard operation="add">
-        <Name>ChargecardTable1</Name>
-    </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <WAPAccess>WAPAccessPoint.Default Dial In ISP</WAPAccess>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>2</ConnectionAttempts>
-        <ModemForDataAndFax>2</ModemForDataAndFax>
-        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
-        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
-        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.Intranet</DefaultNetwork>
-        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
-        <CDMAOperationCapability>4</CDMAOperationCapability>
-        <CDMASimpleIpMaxNumNai>5</CDMASimpleIpMaxNumNai>
-        <CDMASimpleIpMaxNaiLength>72</CDMASimpleIpMaxNaiLength>
-        <CDMASimpleIpMaxSsLength>100</CDMASimpleIpMaxSsLength>
-        <CDMASimpleIpAuthSupported>3</CDMASimpleIpAuthSupported>
-        <CDMAMobileIpMaxNumNai>5</CDMAMobileIpMaxNumNai>
-        <CDMAMobileIpMaxNAILength>72</CDMAMobileIpMaxNAILength>
-        <CDMAMobileIpMaxMnAaaSsLength>100</CDMAMobileIpMaxMnAaaSsLength>
-        <CDMAMobileIpMnAaaAuthAlgorithm>1</CDMAMobileIpMnAaaAuthAlgorithm>
-        <CDMAMobileIpMaxMnHaSsLength>100</CDMAMobileIpMaxMnHaSsLength>
-        <CDMAMobileIpMnHaAuthAlgorithm>1</CDMAMobileIpMnHaAuthAlgorithm>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-</DefaultGPRSTable>
-
-<ProxyTable>
-</ProxyTable>
-
-<LocationTable>
-    <Location operation="template">
-        <Name>Default Location</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-        <DialOutCode>9,</DialOutCode>
-    </Location>
-</LocationTable>
-
-<SecureSocketTable>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-    <WAPAccessPoint operation="template">
-        <Name>Default Dial In ISP</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-    </WAPAccessPoint>
-    <WAPAccessPoint operation="add">
-        <Name>Dummy WAP Settings</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-        <StartPage>www.wapstart.com</StartPage>
-    </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/commsconfig/commsdatabaseshim/ts_commdb/te_cdma2000Settings/group/bld.inf	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2004-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:
-// Component description file 
-// 
-//
-
-
-PRJ_TESTEXPORTS
-
-// for winscw
-../scripts/te_cdmacommdbsettings.script     /epoc32/release/winscw/udeb/z/testdata/scripts/te_cdmacommdbsettings.script
-../config/te_cdmacommdbsettings.cfg         /epoc32/release/winscw/udeb/z/testdata/configs/te_cdmacommdbsettings.cfg 
-../config/te_cdmacommdbsettings.xml	    /epoc32/release/winscw/udeb/z/testdata/configs/te_cdmacommdbsettings.xml
-
-// for winscw (urel)
-../scripts/te_cdmacommdbsettings.script     /epoc32/release/winscw/urel/z/testdata/scripts/te_cdmacommdbsettings.script
-../config/te_cdmacommdbsettings.cfg         /epoc32/release/winscw/urel/z/testdata/configs/te_cdmacommdbsettings.cfg 
-../config/te_cdmacommdbsettings.xml	    /epoc32/release/winscw/urel/z/testdata/configs/te_cdmacommdbsettings.xml
-
-
-
-
-// for wins
-../scripts/te_cdmacommdbsettings.script     /epoc32/release/wins/udeb/z/testdata/scripts/te_cdmacommdbsettings.script
-../config/te_cdmacommdbsettings.cfg         /epoc32/release/wins/udeb/z/testdata/configs/te_cdmacommdbsettings.cfg 
-../config/te_cdmacommdbsettings.xml	    /epoc32/release/wins/udeb/z/testdata/configs/te_cdmacommdbsettings.xml	
-
-// for wins (urel)
-../scripts/te_cdmacommdbsettings.script     /epoc32/release/wins/urel/z/testdata/scripts/te_cdmacommdbsettings.script
-../config/te_cdmacommdbsettings.cfg         /epoc32/release/wins/urel/z/testdata/configs/te_cdmacommdbsettings.cfg 
-../config/te_cdmacommdbsettings.xml	    /epoc32/release/wins/urel/z/testdata/configs/te_cdmacommdbsettings.xml	
-
-
-
-// ROM
-../group/te_cdmacommdbsettings.iby 	/epoc32/rom/include/te_cdmacommdbsettings.iby 
-
-PRJ_TESTMMPFILES
-
-te_cdmacommdbsettings.mmp
--- a/commsconfig/commsdatabaseshim/ts_commdb/te_cdma2000Settings/group/te_cdmacommdbsettings.mmp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// Copyright (c) 2004-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:
-// Using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET      te_cdmacommdbsettingssvr.exe
-TARGETTYPE  exe
-UID             0x1000007A 0x102014E6
-VENDORID 0x70000001
-
-
-
-SOURCEPATH  ../src
-SOURCE	    ../src/te_cdmacommdbsettingssvr.cpp
-SOURCE	    ../src/Cdma2000settingsstep.cpp	
-
-		
-
-USERINCLUDE    ../inc
-SYSTEMINCLUDE  /epoc32/include
-SYSTEMINCLUDE  /epoc32/include/test
-
-LIBRARY		testexecutelogclient.lib
-LIBRARY		testexecuteutils.lib
-LIBRARY     	euser.lib
-LIBRARY         commdb.lib
-
-CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
-
-
-
-
-SMPSAFE
--- a/commsconfig/commsdatabaseshim/ts_commdb/te_cdma2000Settings/inc/Cdma2000settingsstep.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-// Copyright (c) 2004-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:
-// Interface for CDMA2000 CommDB settings test.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
- 
-#ifndef __CDMA2000SETTINGSSTEP_H__
-#define __CDMA2000SETTINGSSTEP_H__
-
-#include "te_cdmacommdbsettingssvr.h"
-
-#include <testexecutestepbase.h>
-#include <commdb.h>
-
-namespace te_Cdma2000CommDbSettings
-	{
-/**
- Defines CDMA2000 CommDB settings test.
- 
- @internalComponent
- @test
- */
-class CCdma2000SettingsTestStep: public CTestStep
-	{
-public:
-	CCdma2000SettingsTestStep();
-	~CCdma2000SettingsTestStep();
-	TVerdict doTestStepL();
-	
-private:
-	void CloseCommDbTable();
-	void OpenCommDbTableL(const TPtrC& aTableName);
-	TBool CheckTableTBool(const TPtrC aCommDbTableCols[]);
-	TBool CheckTableTUint32(const TPtrC aCommDbTableCols[]);
-	TBool CheckTableText(const TPtrC aCommDbTableCols[]);
-	void DoTestSequenceL();	
-	
-	/** CommDB  */
-	CCommsDatabase*		iCommDb;
-	
-	/** A view on CommDB used to access columns */
-	CCommsDbTableView*	iCommDbView;	
-	};
-	
-_LIT(KCdma2000SettingsStep, "CCdma2000SettingsStep");	
-	}
-
-
-#endif // __CDMA2000SETTINGSSTEP_H__
--- a/commsconfig/commsdatabaseshim/ts_commdb/te_cdma2000Settings/inc/te_cdmacommdbsettingssvr.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-// Copyright (c) 2004-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:
-// Standard TestExecute server header:
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-
-#ifndef __TE_Cdma2000settingsSVR_H__
-#define __TE_Cdma2000settingsSVR_H__
-
-#include <testexecuteserverbase.h>
-
-/**
-TestSuite server
-
-@internalComponent
-@test
-*/
-class CTe_Cdma2000CommdbSettingsSvr : public CTestServer
-	{
-public:
-	static CTe_Cdma2000CommdbSettingsSvr* NewL();
-	virtual CTestStep* CreateTestStep(const TDesC& aStepName);
-	RFs& Fs(){return iFs;};
-
-private:
-	RFs iFs;
-	};
-	
-#endif
--- a/commsconfig/commsdatabaseshim/ts_commdb/te_cdma2000Settings/scripts/te_cdmacommdbsettings.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-// Copyright (c) 2004-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:
-// This test runs using the TestExecute framework using the following test list entry:
-// TESTEXECUTE,logs\\testexecute\\te_cdmacommdbsettingssvr.htm
-// 
-//
-
-//! @file 
-//! @internalComponent
-//! @brief Tests CDMA2000 CommDB settings.
-
-RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
-PRINT Running CDMA2000 CommDB settings tests.
-LOAD_SUITE te_cdmacommdbsettingssvr 
-
-
-
-PRINT Configuring CommDB with CDMA2000 Settings using CFG file format...
-CED -i z:\testdata\configs\te_cdmacommdbsettings.cfg
-RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-START_TESTCASE					COMINF-commdb-0101
-//! @SYMTestCaseID				COMINF-commdb-0101	
-//! @SYMTestCaseDesc 			Verifies that CDMA2000 CommDB settings are accessible
-//! @SYMFssID					CDMA/Networking/Netinfra/COMMDB
-//! @SYMFssID					CDMA/Networking/Settings/NAI/STOR
-//! @SYMTestStatus 				Implemented
-//! @SYMTestPriority			Critical
-//! @SYMTestActions 			See SGL.GT0161.307 CDMA2000 CommDB Settings Test Specification document
-//! @SYMTestExpectedResults 	See SGL.GT0161.307 CDMA2000 CommDB Settings Test Specification document
-RUN_TEST_STEP 20 te_cdmacommdbsettingssvr CCdma2000SettingsStep  
-END_TESTCASE					COMINF-commdb-0101
-
-
-
-RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
-PRINT Configuring CommDB with CDMA2000 Settings using XML file format...
-CED -i z:\testdata\configs\te_cdmacommdbsettings.xml
-RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
-
-START_TESTCASE					COMINF-commdb-0102
-//! @SYMTestCaseID				COMINF-commdb-0102
-//! @SYMTestCaseDesc 			Verifies that CDMA2000 CommDB settings are accessible
-//! @SYMFssID					CDMA/Networking/Netinfra/COMMDB
-//! @SYMFssID					CDMA/Networking/Settings/NAI/STOR
-//! @SYMTestStatus 				Implemented
-//! @SYMTestPriority			Critical
-//! @SYMTestActions 			See SGL.GT0161.307 CDMA2000 CommDB Settings Test Specification document
-//! @SYMTestExpectedResults 	See SGL.GT0161.307 CDMA2000 CommDB Settings Test Specification document
-RUN_TEST_STEP 20 te_cdmacommdbsettingssvr CCdma2000SettingsStep 
-END_TESTCASE					COMINF-commdb-0102
-
-
-RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
-
-
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/te_cdma2000Settings/src/Cdma2000settingsstep.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,509 +0,0 @@
-// Copyright (c) 2004-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:
-// CommDB CDMA2000 Settings test implementation
-// 
-//
-
-/**
- @file 
- @internalComponent 
-*/
-
-#include "Cdma2000settingsstep.h"
-#include <testexecutelog.h>
-
-#include <e32std.h>
-#include <e32base.h>
-
-using namespace te_Cdma2000CommDbSettings;
-
-namespace
-	{
-	// "End of table" marker.
-	_LIT(KNoMoreEntriesLit, "NO_MORE_ENTRIES");
-	const TPtrC KNoMoreEntries(KNoMoreEntriesLit);
-	
-	
-	//
-	// CDMA2000 CommDB column constants:
-	//
-	// These constants are defined in cdbcols.h and are used 
-	// to access CDMA related settings via CommDB. Some constants in the 
-	// are aliased to the generic SERVICE_xxx constants, e.g
-	//
-	// #define CDMA_ENABLE_IP_HEADER_COMP  SERVICE_ENABLE_IP_HEADER_COMP
-	//
-	// The tables below may contain entries for both the SERVICE_xxx constant
-	// and the corresponding CDMA_xxx constant. The purpose of this duplication is 
-	// to verify that the particular field is accessible via both the SERVICE and the CDMA 
-	// constant. The SERVICE_xxx constants are typically used by the sytem (e.g. PPP) to access 
-	// settings common to all the service tables. The specific CDMA_xxx constants may be used by CDMA 
-	// specific code to manipulate CDMA tables only.
-		
-	// GlobalSettings table: TUint32 values.
-	const TPtrC KCdmaGlobalSettingsTableTUint32[] =
-		{		
-		CDMA_OP_CAPABILITY,
-		CDMA_SIMIP_MAX_NUM_NAI,
-		CDMA_SIMIP_MAX_NAI_LENGTH,
-		CDMA_SIMIP_MAX_SS_LENGTH,
-		CDMA_SIMIP_AUTH_SUPPORTED,
-		CDMA_MIP_MAX_NUM_NAI,
-		CDMA_MIP_MAX_NAI_LENGTH,
-		CDMA_MIP_MAX_MN_AAA_SS_LENGTH,
-		CDMA_MIP_MN_AAA_AUTH_ALGORITHM,
-		CDMA_MIP_MAX_MN_HA_SS_LENGTH,
-		CDMA_MIP_MN_HA_AUTH_ALGORITHM,
-		KNoMoreEntries
-		};
-	
-	// DefaultCDMA2000SettingsTable: TBool values.
-	const TPtrC KDefaultCdma2000SettingsTableTBool[] = 
-		{
-		DEFAULT_CDMA_ENABLE_IP_HEADER_COMP, // #defined as SERVICE_ENABLE_IP_HEADER_COMP
-		SERVICE_ENABLE_IP_HEADER_COMP,
-		KNoMoreEntries	
-		};
-		
-	// DefaultCDMA2000SettingsTable: TUint32 values.
-	const TPtrC KDefaultCdma2000SettingsTableTUint32[] = 
-		{
-		CDMA_OP_MODE, 
-		CDMA_MIP_MAX_NUM_RETRY, 
-		CDMA_MIP_FIRST_RETRY_TIMEOUT,
-		CDMA_MIP_REREG_THRESHOLD,
-		DEFAULT_CDMA_FCH_MUX,
-		DEFAULT_CDMA_SCH_MUX,
-		KNoMoreEntries	
-		};
-		
-	// CDMA2000PacketServiceTable: TUint32 values.
-	const TPtrC KCdma2000PacketServiceTableTUint32[] =
-		{		
-		CDMA_NAI_TYPE,
-		CDMA_SIMIP_AUTH_ALGORITHM,
-		CDMA_SIMIP_PAP_SS_HANDLE,
-		CDMA_SIMIP_CHAP_SS_HANDLE,			
-		CDMA_MIP_T_BIT,			
-		CDMA_MIP_MN_AAA_AUTH_ALGORITHM,
-		CDMA_MIP_MN_AAA_SPI,
-		CDMA_MIP_MN_HA_AUTH_ALGORITHM,
-		CDMA_MIP_MN_HA_SPI,
-		CDMA_FCH_MUX,
-		CDMA_SCH_MUX,
-		KNoMoreEntries
-		};
-	
-	// CDMA2000PacketServiceTable: TBool values.
-	const TPtrC KCdma2000PacketServiceTableTBool[] = 
-		{
-		SERVICE_IF_EXTERN_IP_CONFIG_ALWAYS_REJECT_AUTH,
-		CDMA_IF_EXTERN_IP_CONFIG_ALWAYS_REJECT_AUTH, // #defined as SERVICE_IF_EXTERN_IP_CONFIG_ALWAYS_REJECT_AUTH
-		CDMA_MIP_MN_AAA_SPI_INDICATOR,
-		CDMA_MIP_MN_HA_SPI_INDICATOR,
-		CDMA_ENABLE_IP_HEADER_COMP, // #defined as SERVICE_ENABLE_IP_HEADER_COMP
-		SERVICE_ENABLE_IP_HEADER_COMP,
-		SERVICE_ENABLE_SW_COMP,
-		KNoMoreEntries
-		};
-	
-	// CDMA2000PacketServiceTable: Text values.	
-	const TPtrC KCdma2000PacketServiceTableText[] = 
-		{
-		CDMA_MIP_HOME_ADDRESS,
-		CDMA_MIP_PRIMARY_HOME_AGENT,
-		CDMA_MIP_SECONDARY_HOME_AGENT,
-		CDMA_MIP_MN_AAA_SS_DATA,
-		CDMA_MIP_MN_HA_SS_DATA,
-		KNoMoreEntries
-		};
-			
-	// DialOutIsp table: TBool values.
-	const TPtrC KDialOutIspTableTBool[] =
-		{
-		ISP_IF_SERVER_MODE,
-		KNoMoreEntries
-		};
-	
-	
-	//----------------------------------------------------------------
-	// Test for named constants:
-	// If the following constants are absent, this code will not compile.	
-	const TUint KCdmaEnumValues[] =
-		{
-		//-------------------------------------------------
-		// Global Settings
-				
-		// CDMA_OP_CAPABILITY values
-		ECommDbCdmaOpCapabilitySimpleIp,
-		ECommDbCdmaOpCapabilityMobileIp,
-		ECommDbCdmaOpCapabilityFallback,
-		
-		// CDMA_SIMIP_AUTH_SUPPORTED values
-		ECommDbCdmaSimpIpCapabilityChap,
-		ECommDbCdmaSimpIpCapabilityPap,
-		
-		// CDMA_MIP_MN_AAA_AUTH_ALGORITHM 
-		// CDMA_MIP_MN_HA_AUTH_ALGORITHM values
-		ECommDbCdmaMIpMd5,
-
-		
-		//---------------------------------------------------
-		// DEFAULT_CDMA2000_SETTINGS_TABLE 
-				
-		//CDMA_OP_MODE
-		ECommDbCdmaOpSimpleIp,
-		ECommDbCdmaOpFallback,
-		ECommDbCdmaOpMobileIp,	
-		
-		//----------------------------------------------------
-		// CDMA2000_PACKET_SERVICE_TABLE
-					
-		//  CDMA_OP_MODE values
-		ECommDbCdmaOpSimpleIp,
-		ECommDbCdmaOpFallback,
-		ECommDbCdmaOpMobileIp,	
-		
-		// CDMA_NAI_TYPE values
-		ECommDbCdmaNaiSimpleIp,
-		ECommDbCdmaNaiMobileIp,
-		
-		// CDMA_SIMIP_AUTH_ALGORITHM
-		ECommDbCdmaSimpIpAuthNone,
-		ECommDbCdmaSimpIpAuthChap,
-		ECommDbCdmaSimpIpAuthPap,
-		ECommDbCdmaSimpIpAuthFallback,
-		
-		// CDMA_MIP_MN_AAA_AUTH_ALGORITHM
-	    // CDMA_MIP_MN_HA_AUTH_ALGORITHM values
-		ECommDbCdmaMIpAuthNone,
-		ECommDbCdmaMIpAuthMd5	
-		};	
-	//-------------------------------------------------------------------	
-	} // module namespace
-
-
-/**
-Verifies that the specified TBool columns can be read from CommDB.
-
-@param aCommDbTableCols CommDB columns to be read
-@return ETrue if all the columns could be read, EFalse otherwise
-*/
-TBool CCdma2000SettingsTestStep::CheckTableTBool(const TPtrC aCommDbTableCols[])
-	{
-	TBool isCheckOk = ETrue;
-	__UHEAP_MARK;	
-	
-	// Attempt to read all the columns.
-		
-	for (TInt curCol = 0; KNoMoreEntries != aCommDbTableCols[curCol]; curCol++)
-		{
-		TBool value = EFalse; 
-		TRAPD(err, iCommDbView->ReadBoolL(aCommDbTableCols[curCol], value));						
-	
-		switch(err)
-			{
-			case KErrNone: // Column exists and is not null: OK
-			INFO_PRINTF3(_L("OK: Column [%S], value. [%d]"), &aCommDbTableCols[curCol], value);
-			break;
-			
-			case KErrNotFound: // Column does not exist: Error
-				INFO_PRINTF3(_L("ERROR.  Column [%S] does not exist. Error code [%d]: KErrNotFound"), &aCommDbTableCols[curCol], err);
-				isCheckOk = EFalse;
-				break;
-			
-			case KErrUnknown: // Column exists, but is null: Error
-				INFO_PRINTF3(_L("ERROR.  Column [%S] does exists but is null: Error code [%d]: KErrUnknown."), &aCommDbTableCols[curCol], err);
-				isCheckOk = EFalse;
-				break;
-			
-			default: // Some other error.
-				INFO_PRINTF3(_L("ERROR.  Error code [%d] when reading column [%S]."), err, &aCommDbTableCols[curCol]);
-				isCheckOk = EFalse;
-			};	
-		}	
-	
-	__UHEAP_MARKEND;
-	return isCheckOk;
-	}
-
-
-/**
-Verifies that the specified TUint32 columns can be read from CommDB.
-
-@param aCommDbTableCols CommDB columns to be read
-@return ETrue if all the columns could be read, EFalse otherwise
-*/
-TBool CCdma2000SettingsTestStep::CheckTableTUint32(const TPtrC aCommDbTableCols[])
-	{
-	TBool isCheckOk = ETrue;
-	__UHEAP_MARK;
-	
-	// Attempt to read all the columns.
-	
-	for(TInt curCol = 0; KNoMoreEntries != aCommDbTableCols[curCol]; curCol++)
-		{
-		TUint32 value = 0; 
-		TInt err = KErrNone;
-		if(aCommDbTableCols == KCdmaGlobalSettingsTableTUint32)
-			{
-			TRAP(err, iCommDb->GetGlobalSettingL(aCommDbTableCols[curCol], value));
-			}			
-		else
-			{
-			TRAP(err, iCommDbView->ReadUintL(aCommDbTableCols[curCol], value));
-			}			
-	
-		switch(err)
-			{
-			case KErrNone: // Column exists and is not null: OK
-			INFO_PRINTF3(_L("OK: Column [%S], value. [%d]"), &aCommDbTableCols[curCol], value);
-			break;
-			
-			case KErrNotFound: // Column does not exist: Error
-				INFO_PRINTF3(_L("ERROR.  Column [%S] does not exist. Error code [%d]: KErrNotFound"), &aCommDbTableCols[curCol], err);
-				isCheckOk = EFalse;
-				break;
-			
-			case KErrUnknown: // Column exists, but is null: Error
-				INFO_PRINTF3(_L("ERROR.  Column [%S] does exists but is null Error code [%d]: KErrUnknown."), &aCommDbTableCols[curCol], err);
-				isCheckOk = EFalse;
-				break;
-			
-			default: // Some other error.
-				INFO_PRINTF3(_L("ERROR.  Error code [%d] when reading column [%S]."), err, &aCommDbTableCols[curCol]);
-				isCheckOk = EFalse;
-			};	
-		}	
-	
-	__UHEAP_MARKEND;
-	return isCheckOk;
-	}	
-	
-/**
-Verifies that the specified TText columns can be read from CommDB.
-
-@param aCommDbTableCols CommDB columns to be read
-@return ETrue if all the columns could be read, EFalse otherwise
-*/	
-TBool CCdma2000SettingsTestStep::CheckTableText(const TPtrC aCommDbTableCols[])
-	{
-	TBool isCheckOk = ETrue;
-	__UHEAP_MARK;
-	
-	// Attempt to read all the columns.
-	
-	for(TInt curCol = 0; KNoMoreEntries != aCommDbTableCols[curCol]; curCol++)
-		{
-		TBuf<KCommsDbSvrMaxColumnNameLength> value; 
-		TRAPD(err, iCommDbView->ReadTextL(aCommDbTableCols[curCol], value));
-		
-		switch(err)
-			{
-			case KErrNone: // Column exists and is not null: OK				
-				INFO_PRINTF3(_L("OK: Column [%S], value. [%S]"), &aCommDbTableCols[curCol],  &value);	
-				break;
-			
-			case KErrNotFound: // Column does not exist: Error
-				INFO_PRINTF3(_L("ERROR.  Column [%S] does not exist. Error code [%d]: KErrNotFound"), &aCommDbTableCols[curCol], err);
-				isCheckOk = EFalse;
-				break;
-			
-			case KErrUnknown: // Column exists, but is null: Error
-				INFO_PRINTF3(_L("ERROR.  Column [%S] does exists but is null Error code [%d]: KErrUnknown."), &aCommDbTableCols[curCol], err);
-				isCheckOk = EFalse;
-				break;
-			
-			default: // Some other error.
-				INFO_PRINTF3(_L("ERROR.  Error code [%d] when reading column [%S]."), err, &aCommDbTableCols[curCol]);
-				isCheckOk = EFalse;
-			}	
-		}
-	
-	__UHEAP_MARKEND;
-	return isCheckOk;
-	}
-
-
-/**
- C++ Constructor
- 
- @post Test name is setup. 
- */	
-CCdma2000SettingsTestStep::CCdma2000SettingsTestStep():
-	iCommDb(NULL),
-	iCommDbView(NULL)	
-	{
-	SetTestStepName(KCdma2000SettingsStep);		
-	}
-
-/** C++ Destructor */	
-CCdma2000SettingsTestStep::~CCdma2000SettingsTestStep()
-	{
-	if(iCommDbView) delete iCommDbView; // Lint generates warning if CloseCommDbTable() is used here.
-	if(iCommDb)     delete iCommDb;
-	}
-	
-/** Closes CommDB table opened previously with a call to OpenCommDbTableL */
-void CCdma2000SettingsTestStep::CloseCommDbTable()
-	{
-	if(iCommDbView)
-		{
-		delete iCommDbView;
-		iCommDbView = NULL;
-		}
-	}
-
-/**
-Opens a view on the first record of a CommDB table.
-
-@param aTableName the table to open.
-@leave if CommDB access methods leave. 
-*/
-void CCdma2000SettingsTestStep::OpenCommDbTableL(const TPtrC& aTableName)
-	{
-	ASSERT(!iCommDbView);
-	
-	const TUint32 KRecordId = 1;
-	iCommDbView = iCommDb->OpenViewMatchingUintLC(aTableName, TPtrC(COMMDB_ID), KRecordId);
-	// Take iCommDbView off the cleanup stack so it is never deleted without
-	// setting the pointer to NULL, but rather with a call to
-	// CloseCommDbTable() or in the destructor.
-	CleanupStack::Pop(iCommDbView);
-	
-	TInt err = iCommDbView->GotoFirstRecord(); 
-	if (KErrNone != err)
-		{
-		INFO_PRINTF4(_L("Table[%S]:  Record[%d] does not exist. Error[%d]"), &aTableName, KRecordId, err);				
-		User::Leave(err);		
-		}
-	INFO_PRINTF1(_L(""));
-	INFO_PRINTF3(_L("Opened Table[%S].  Record[%d]. ========================== "), &aTableName, KRecordId);	
-	}
-
-
-/**
-Carries out the actual test sequence for CDMA2000 CommDB Settings. 
-
-@leave if CommDB access methods leave. 
-*/
-void CCdma2000SettingsTestStep::DoTestSequenceL()
-	{
-	__UHEAP_MARK;
-
-	//
-	// Create CommDB
-	//
-	ASSERT(!iCommDb);
-	iCommDb = CCommsDatabase::NewL();
-	// Don't put iCommDb onto cleanup stack so it is never deleted without
-	// setting the pointer to NULL, but rather below or in the destructor.
-	iCommDb->ShowHiddenRecords();
-	
-	//
-	// Carry out the testing	
-	//
-	
-	// DefaultCDMA2000SettingsTable	
-	OpenCommDbTableL(TPtrC(DEFAULT_CDMA2000_SETTINGS_TABLE));	
-	if(CheckTableTUint32(KDefaultCdma2000SettingsTableTUint32) &&
-	   CheckTableTBool(KDefaultCdma2000SettingsTableTBool))
-		{
-		INFO_PRINTF1(_L("===>OK: DefaultCDMA2000Settings table"));
-		}
-	else
-		{
-		INFO_PRINTF1(_L("===>ERROR: accessing DefaultCDMA2000Settings table."));
-		SetTestStepResult(EFail);
-		}
-	CloseCommDbTable();
-	
-	// CDMA2000PacketServiceTable	
-	OpenCommDbTableL(TPtrC(CDMA2000_PACKET_SERVICE_TABLE));
-	if(CheckTableTUint32(KCdma2000PacketServiceTableTUint32) && // TUint32 columns
-	   CheckTableTBool(KCdma2000PacketServiceTableTBool)     && // TBool columns     
-	   CheckTableText(KCdma2000PacketServiceTableText))         // Text columns
-		{
-		INFO_PRINTF1(_L("===>OK: CDMA2000PacketServiceTable table"));
-		}
-	else
-		{
-		INFO_PRINTF1(_L("===>ERROR: accessing CDMA2000PacketServiceTable table."));
-		SetTestStepResult(EFail);
-		}
-	CloseCommDbTable();	
-	
-	// DialOutIsp
-	OpenCommDbTableL(TPtrC(DIAL_OUT_ISP));
-	if(CheckTableTBool(KDialOutIspTableTBool))
-		{
-		INFO_PRINTF1(_L("===>OK: DialOutIsp table"));
-		}
-	else
-		{
-		INFO_PRINTF1(_L("===>ERROR: accessing DialOutIsp table."));
-		SetTestStepResult(EFail);
-		}	
-	CloseCommDbTable();		
-	
-	// Global Settings
-	INFO_PRINTF1(_L(""));
-	INFO_PRINTF1(_L("Reading Global Settings ================================"));				
-	if(CheckTableTUint32(KCdmaGlobalSettingsTableTUint32))
-		{
-		INFO_PRINTF1(_L("===>OK: GlobalSettings table"));
-		}
-	else
-		{
-		INFO_PRINTF1(_L("===>ERROR: accessing GlobalSettings table."));
-		SetTestStepResult(EFail);
-		}
-	
-
-	//
-	// Close CommDB
-	//
-	delete iCommDb;
-	iCommDb = NULL;
-	
-	__UHEAP_MARKEND;
-	}
-
-/**
- Verifies that all CDMA2000 settings can be accessed.
- 
- @return result of the test: EPass if all settings can be accessed.
- */
-TVerdict CCdma2000SettingsTestStep::doTestStepL()
-	{
-	//---------------------------------------------------------------------
-	// Reference KCdmaEnumValues[] to supress ARM5 compiler warning regarding unreferenced variable
-	// This has no consequences for the test.
-	INFO_PRINTF2(_L("Referencing KCdmaEnumValues: element 0=[%d]"), KCdmaEnumValues[0]);
-	//---------------------------------------------------------------------
-	
-	
-	
-	SetTestStepResult(EPass);
-	
-	TRAPD(testErr, DoTestSequenceL());
-	if(KErrNone != testErr)
-		{
-		SetTestStepResult(ETestSuiteError);
-		INFO_PRINTF2(_L("ERROR: internal test suite error [%d]."), testErr);
-		}	
-			
-	return TestStepResult();		
-	}
-	
--- a/commsconfig/commsdatabaseshim/ts_commdb/te_cdma2000Settings/src/te_cdmacommdbsettingssvr.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-// Copyright (c) 2004-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:
-// Implementation of CTeCdma2000settingsServer class
-// for (WINS && !EKA2) versions will be xxxServer.Dll and require a thread to be started
-// in the process of the client. The client initialises the server by calling the
-// one and only ordinal.
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-
-
-#include "Cdma2000settingsstep.h"
-#include "te_cdmacommdbsettingssvr.h"
-
-using namespace te_Cdma2000CommDbSettings;
-
-_LIT(KServerName,"te_cdmacommdbsettingssvr");
-
-CTe_Cdma2000CommdbSettingsSvr* CTe_Cdma2000CommdbSettingsSvr::NewL()
-/**
- * @return - Instance of the test server
- * Called inside the MainL() function to create and start the
- * CTestServer derived server.
- */
-	{
-	CTe_Cdma2000CommdbSettingsSvr * server = new (ELeave)CTe_Cdma2000CommdbSettingsSvr;
-	CleanupStack::PushL(server);
-	
-	// Either use a StartL or ConstructL, the latter will permit
-	// Server Logging.
-
-	//server->StartL(KServerName); 
-	server-> ConstructL(KServerName);
-	CleanupStack::Pop(server);
-	return server;
-	}
-
-// EKA2 much simpler
-// Just an E32Main and a MainL()
-LOCAL_C void MainL()
-/**
- * Much simpler, uses the new Rendezvous() call to sync with the client
- */
-	{
-	// Leave the hooks in for platform security
-#if (defined __DATA_CAGING__)
-	RProcess().DataCaging(RProcess::EDataCagingOn);
-	RProcess().SecureApi(RProcess::ESecureApiOn);
-#endif
-	CActiveScheduler* sched=NULL;
-	sched=new(ELeave) CActiveScheduler;
-	CActiveScheduler::Install(sched);
-	CTe_Cdma2000CommdbSettingsSvr* server = NULL;
-	// Create the CTestServer derived server
-	TRAPD(err,server = CTe_Cdma2000CommdbSettingsSvr::NewL());
-	if(!err)
-		{
-		// Sync with the client and enter the active scheduler
-		RProcess::Rendezvous(KErrNone);
-		sched->Start();
-		}
-	delete server;
-	delete sched;
-	}
-
-// Only a DLL on emulator for typhoon and earlier
-
-GLDEF_C TInt E32Main()
-/**
- * @return - Standard Epoc error code on exit
- */
-	{
-	CTrapCleanup* cleanup = CTrapCleanup::New();
-	if(cleanup == NULL)
-		{
-		return KErrNoMemory;
-		}
-	TRAP_IGNORE(MainL());
-	delete cleanup;
-	return KErrNone;
-    }
-
-// Create a thread in the calling process
-// Emulator typhoon and earlier
-
-CTestStep* CTe_Cdma2000CommdbSettingsSvr::CreateTestStep(const TDesC& aStepName)
-/**
- * @return - A CTestStep derived instance
- * Implementation of CTestServer pure virtual
- */
-	{	
-	CTestStep* testStep = NULL;
-	
-	if(aStepName == KCdma2000SettingsStep)  
-		{
-		testStep = new CCdma2000SettingsTestStep;
-		}
-
-	
-	return testStep;
-	}
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_connpref.mmp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-* 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:
-*
-*/
-
-TARGET                  ts_connpref.dll
-TARGETTYPE              dll
-
-SOURCEPATH              ../ts_commdb/ts_connpref 
-SOURCE                  TS_ConnPrefSuite.cpp 	TS_ConnPrefHelperSteps.cpp
-SOURCE                  TS_ConnPrefSteps.cpp	TS_ConnPrefStep.cpp
-
-USERINCLUDE             ../ts_commdb/ts_connpref
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE           /epoc32/include
-#else
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-#endif
-
-LIBRARY                 euser.lib
-LIBRARY                 esock.lib
-LIBRARY                 commdb.lib
-LIBRARY	integrationtestutils.lib
-
-CAPABILITY ALL -Tcb
-
-VENDORID 0x70000001
-
-SMPSAFE
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_connpref/TS_ConnPrefHelperSteps.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains the implementation of the helper steps (initialisation and waiting
-// for esock to die)
-// 
-//
-
-/**
- @file TS_ConnPrefHelperSteps.cpp
-*/
-
-#include "TS_ConnPrefHelperSteps.h"
-//
-
-#include <e32base.h>
-#include <e32std.h>
-//
-
-CTS_ConnPrefForceCCoverWrite::CTS_ConnPrefForceCCoverWrite(TPtrC aName) : CTS_ConnPrefStep()
-{
-	iTestStepName=aName;
-}
-
-CTS_ConnPrefForceCCoverWrite::~CTS_ConnPrefForceCCoverWrite()
-{
-}
-
-enum TVerdict CTS_ConnPrefForceCCoverWrite::doTestStepL(void)
-/*
- * It appears that CCover only writes to its data file every now and again, so force it here 
- * to write its data just before we shutdown and lose anything that has changed
- */
-{
-	#ifdef CCOVER
-		cov_write();
-	#endif
-
-	return iTestStepResult;
-} // TS_ConnPrefHelperSteps
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_connpref/TS_ConnPrefHelperSteps.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/**
-* Copyright (c) 2002-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:
-* This is the header file with the declartions of the RConnection test step classes that basically 
-* aren't proper tests at all - thet are just helper functions encapsulated as test steps so that they
-* can be called from the scripts.
-* 
-*
-*/
-
-
-
-/**
- @file TS_ConnPrefHelperSteps.h
-*/
-
-#if (!defined __TS_CONNPREFHELPERSTEPS_H__)
-#define __TS_CONNPREFHELPERSTEPS_H__
-
-#include "TS_ConnPrefStep.h"
-
-class CTS_ConnPrefForceCCoverWrite: public CTS_ConnPrefStep
-{
-public:
-	CTS_ConnPrefForceCCoverWrite(TPtrC aName);
-	virtual ~CTS_ConnPrefForceCCoverWrite();
-
-	virtual enum TVerdict doTestStepL(void);
-};
-
-#endif
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_connpref/TS_ConnPrefStep.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-// Copyright (c) 2002-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:
-// This contains CTS_ConnPrefStep class which is
-// the base class for all the ConnPref test steps
-// 
-//
-
-/**
- @file TS_ConnPrefStep.cpp
-*/
-#include "TS_ConnPrefStep.h"
-
-
-// Constructor
-CTS_ConnPrefStep::CTS_ConnPrefStep() 
-	{			
-	}
-
-// Destructor
-CTS_ConnPrefStep::~CTS_ConnPrefStep()
-	{ 
-	}	
-
-void CTS_ConnPrefStep::ExpLogExtra(const TText8* aFile, TInt aLine, TInt aSeverity,
-		TRefByValue<const TDesC> aFmt,...)
-	{
-	VA_LIST aList;
-	VA_START( aList, aFmt );
-
-
-	// Log to the suite's logger
-	iSuite->LogExtra( aFile, aLine, aSeverity, aFmt, aList );
-
-	VA_END( aList ); 
-
-	}
-
-enum TVerdict CTS_ConnPrefStep::Test(TInt aResult)
-	{	
-	if (!aResult)
-		{
-		iSuite->LogExtra((TText8*)__FILE__, __LINE__, ESevrWarn, KEGeneric);
-		return EFail;
-		}
-	return EPass;
-	}
-
-
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_connpref/TS_ConnPrefStep.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/**
-* Copyright (c) 2006-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:
-* This defines the CTS_ConnPrefStep class which is the base class for all 
-* the ConnPrefStep test step classes
-* 
-*
-*/
-
-
-
-/**
- @file TS_ConnPrefStep.cpp.h
-*/
- 
-#if (!defined __TS_CONNPREFSTEP_H__)
-#define __TS_CONNPREFSTEP_H__
-
-#include <e32std.h>
-#include <cdbstore.h>
-
-#include <networking/teststep.h>
-#include "TS_ConnPrefSuite.h"
-
-// Connection Configuration Lits
-_LIT(KNameDefault, "default");
-
-// Test step names
-_LIT(KConstructAndVersion,  "ConstructAndVersion"); 
-_LIT(KSetAndGetConnPrefs,  "SetAndGetConnPrefs"); 
-_LIT(KComparePrefs,  "ComparePrefs");  
-_LIT(KAssignAndCopyConstruct ,  "AssignAndCopyConstruct"); 
-_LIT(KExtensionIdAndCast ,  "ExtensionIdAndCast"); 
-_LIT(KMultiConnPref ,  "MultiConnPref");
-_LIT(KMultiConnPrefVersion,  "MultiConnPrefVersion");
-_LIT(KMultiConnectionAttempts,  "MultiConnectionAttempts");
-
-//Error string.
-_LIT(KEGeneric, "Test left!"); 
-			
-
-class CTS_ConnPrefSuite;
-
-/* CTS_ConnPrefStep class declaration
- * Provides the base class for all ConnPref test steps
- *
- */
-class CTS_ConnPrefStep : public CTestStep
-	{
-public:
-	CTS_ConnPrefStep();
-	virtual ~CTS_ConnPrefStep();
-	enum TVerdict Test(TInt aResult);
-
-	void ExpLogExtra(const TText8* aFile, TInt aLine, TInt aSeverity,
-		TRefByValue<const TDesC> aFmt,...);
-	
-	
-	CTS_ConnPrefSuite* iOwnerSuite;	///< Pointer to suite which owns this test step
-	
-	};
-
-#endif /* __TS_CONNPREFSTEP_H__ */
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_connpref/TS_ConnPrefSteps.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,373 +0,0 @@
-// Copyright (c) 2006-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:
-//
-
-#include <commdbconnpref.h>
-#include <e32test.h>
-
-#include "TS_ConnPrefSteps.h"
-
-CTS_ConstructAndVersion::CTS_ConstructAndVersion()
-	{
-	iTestStepName = KConstructAndVersion;
-	}
-
-CTS_ConstructAndVersion::~CTS_ConstructAndVersion()
-	{	
-	}
-
-enum TVerdict CTS_ConstructAndVersion::doTestStepL()
-	{
-
-	TCommDbConnPref connPref;
-
-	Test(connPref.ExtensionId() == TConnPref::EConnPrefCommDb);		
-	TVersion ver = connPref.Version();
-	Test(ver.iMajor == TCommDbMultiConnPref::KMajorVersionNumber);		
-	Test(ver.iMinor == TCommDbMultiConnPref::TCommDbMultiConnPref::KMinorVersionNumber);		
-	Test(ver.iBuild == TCommDbMultiConnPref::TCommDbMultiConnPref::KBuildVersionNumber);
-	Test(connPref.BearerSet() == KCommDbBearerUnknown);		
-	Test(connPref.DialogPreference() == ECommDbDialogPrefUnknown);		
-	Test(connPref.Direction() == ECommDbConnectionDirectionUnknown);
-	Test(connPref.IapId() == 0);		
-	Test(connPref.NetId() == 0);
-	
-	return EPass;
-	}
-
-CTS_SetAndGetConnPrefs::CTS_SetAndGetConnPrefs()
-	{
-	iTestStepName = KSetAndGetConnPrefs; 
-	}
-
-CTS_SetAndGetConnPrefs::~CTS_SetAndGetConnPrefs()
-	{	
-	}
-
-enum TVerdict CTS_SetAndGetConnPrefs::doTestStepL()
-	{
-
-	TCommDbConnPref connPref;
-
-	connPref.SetBearerSet((KCommDbBearerWcdma | KCommDbBearerLAN));
-	Test(connPref.BearerSet() == (KCommDbBearerWcdma | KCommDbBearerLAN));
-
-	connPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-	Test(connPref.DialogPreference() == ECommDbDialogPrefDoNotPrompt);
-
-	connPref.SetDirection(ECommDbConnectionDirectionOutgoing);
-	Test(connPref.Direction() == ECommDbConnectionDirectionOutgoing);
-
-	connPref.SetIapId(123);
-	Test(connPref.IapId() == 123);
-
-	connPref.SetNetId(456);
-	Test(connPref.NetId() == 456);
-
-	return EPass;
-	}
-
-
-CTS_ComparePrefs::CTS_ComparePrefs()
-	{
-	iTestStepName = KComparePrefs; 
-	}
-
-CTS_ComparePrefs::~CTS_ComparePrefs()
-	{	
-	}
-
-enum TVerdict CTS_ComparePrefs::doTestStepL()
-	{
-	
-	TCommDbConnPref connPref1;
-	connPref1.SetBearerSet((KCommDbBearerWcdma | KCommDbBearerLAN));
-	connPref1.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-	connPref1.SetDirection(ECommDbConnectionDirectionOutgoing);
-	connPref1.SetIapId(123);
-	connPref1.SetNetId(456);
-
-	TCommDbConnPref connPref2;
-	connPref2.SetBearerSet((KCommDbBearerWcdma | KCommDbBearerLAN));
-	connPref2.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-	connPref2.SetDirection(ECommDbConnectionDirectionOutgoing);
-	connPref2.SetIapId(123);
-	connPref2.SetNetId(456);
-
-	TCommDbConnPref connPref3;
-	connPref3.SetBearerSet(KCommDbBearerCSD);
-	connPref3.SetDialogPreference(ECommDbDialogPrefWarn);
-	connPref3.SetDirection(ECommDbConnectionDirectionIncoming);
-	connPref3.SetIapId(987);
-	connPref3.SetNetId(654);
-
-	TCommDbConnPref connPref4;
-	connPref4.SetBearerSet(KCommDbBearerCSD);
-	connPref4.SetDirection(ECommDbConnectionDirectionIncoming);
-	connPref4.SetNetId(654);	
-
-	Test(connPref2.Compare(connPref1) == 0);
-	Test(connPref2 == connPref1);
-
-	Test(connPref1.Compare(connPref2) == 0);
-	Test(connPref1 == connPref2);
-
-	Test(connPref1.Compare(connPref1) == 0);
-	Test(connPref1 == connPref1);
-
-	Test(connPref3.Compare(connPref1) != 0);
-	Test(connPref3 != connPref1);
-
-	Test(connPref1.Compare(connPref3) != 0);
-	Test(connPref1 != connPref3);
-
-	Test(connPref4 == connPref3);
-	Test(connPref3 == connPref4);
-
-	Test(connPref4 != connPref2);
-	Test(connPref2 != connPref4);
-
-	return EPass;
-	}
-
-CTS_AssignAndCopyConstruct::CTS_AssignAndCopyConstruct()
-	{
-	iTestStepName = KAssignAndCopyConstruct; 
-	}
-
-CTS_AssignAndCopyConstruct::~CTS_AssignAndCopyConstruct()
-	{	
-	}
-
-enum TVerdict CTS_AssignAndCopyConstruct::doTestStepL()
-	{
-
-	TCommDbConnPref connPref1;
-	connPref1.SetBearerSet((KCommDbBearerWcdma | KCommDbBearerLAN));
-	connPref1.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-	connPref1.SetDirection(ECommDbConnectionDirectionOutgoing);
-	connPref1.SetIapId(123);
-	connPref1.SetNetId(456);
-
-	TCommDbConnPref connPref2(connPref1);
-	Test(connPref2.Compare(connPref1) == 0);
-	Test(connPref1.Compare(connPref2) == 0);
-
-	TCommDbConnPref connPref3 = connPref1;
-	Test(connPref3.Compare(connPref1) == 0);
-	Test(connPref1.Compare(connPref3) == 0);
-
-	TCommDbConnPref connPref4;
-	connPref4 = connPref1;
-	Test(connPref4.Compare(connPref1) == 0);
-	Test(connPref1.Compare(connPref4) == 0);
-
-	return EPass;
-	}
-
-CTS_ExtensionIdAndCast::CTS_ExtensionIdAndCast()
-	{
-	iTestStepName = KExtensionIdAndCast; 
-	}
-
-CTS_ExtensionIdAndCast::~CTS_ExtensionIdAndCast()
-	{	
-	}
-
-enum TVerdict CTS_ExtensionIdAndCast::doTestStepL()
-	{
-
-	TCommDbConnPref commdbPref1;
-	commdbPref1.SetBearerSet((KCommDbBearerWcdma | KCommDbBearerLAN));
-	commdbPref1.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-	commdbPref1.SetDirection(ECommDbConnectionDirectionOutgoing);
-	commdbPref1.SetIapId(123);
-	commdbPref1.SetNetId(456);
-
-	TConnPref basePref(commdbPref1);
-	Test(basePref.ExtensionId() == TConnPref::EConnPrefCommDb);
-
-	TCommDbConnPref commdbPref2 = TCommDbConnPref::Cast(basePref);
-	Test(commdbPref2 == commdbPref1);
-	
-	return EPass;
-	}
-
-
-CTS_MultiConnPref::CTS_MultiConnPref()
-	{
-	iTestStepName = KMultiConnPref; 
-	}
-
-CTS_MultiConnPref::~CTS_MultiConnPref()
-	{	
-	}
-
-enum TVerdict CTS_MultiConnPref::doTestStepL()
-	{
-
-	TCommDbConnPref connPref1;
-	connPref1.SetBearerSet((KCommDbBearerWcdma | KCommDbBearerLAN));
-	connPref1.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-	connPref1.SetDirection(ECommDbConnectionDirectionOutgoing);
-	connPref1.SetIapId(123);
-	connPref1.SetNetId(456);
-
-	TCommDbConnPref connPref2;
-	connPref2.SetBearerSet(KCommDbBearerCSD);
-	connPref2.SetDialogPreference(ECommDbDialogPrefWarn);
-	connPref2.SetDirection(ECommDbConnectionDirectionIncoming);
-	connPref2.SetIapId(987);
-	connPref2.SetNetId(654);
-
-	TCommDbMultiConnPref multiPref;
-	TInt err(KErrNone);
-
-	err = multiPref.SetPreference(0, connPref1);
-	Test(err == KErrArgument);
-	
-	err = multiPref.SetPreference(1, connPref1);
-	Test(err == KErrNone);
-
-	err = multiPref.SetPreference(2, connPref2);
-	Test(err == KErrNone);
-
-	err = multiPref.SetPreference(3, connPref2);
-	Test(err == KErrArgument);
-
-	TCommDbConnPref connPref3;
-
-	err = multiPref.GetPreference(0, connPref3);
-	Test(err == KErrArgument);
-
-	err = multiPref.GetPreference(1, connPref3);
-	Test(err == KErrNone);
-	Test(connPref3 == connPref1);
-
-	err = multiPref.GetPreference(2, connPref3);
-	Test(err == KErrNone);
-	Test(connPref3 == connPref2);
-
-	err = multiPref.GetPreference(3, connPref3);
-	Test(err == KErrArgument);
-
-	TConnPref basePref(multiPref);
-	Test(basePref.ExtensionId() == TConnPref::EConnPrefCommDbMulti);
-
-	TCommDbMultiConnPref multiPref2;	
-	TCommDbConnPref connPref4;
-	err = multiPref2.GetPreference(1, connPref4);
-	Test(err == KErrNone);
-	Test(connPref4 == connPref1);
-
-	TCommDbConnPref connPref5;
-	err = multiPref2.GetPreference(2, connPref5);
-	Test(err == KErrNone);
-	Test(connPref5 == connPref2);
-
-	Test(multiPref.ConnectionAttempts()==TCommDbMultiConnPref::KMaxMultiConnPrefCount);
-
-	multiPref.SetConnectionAttempts(0);
-	Test(multiPref.ConnectionAttempts()==TCommDbMultiConnPref::KMaxMultiConnPrefCount);
-
-	multiPref.SetConnectionAttempts(1);
-	Test(multiPref.ConnectionAttempts()==1);
-
-	multiPref.SetConnectionAttempts(2);
-	Test(multiPref.ConnectionAttempts()==2);
-
-	multiPref.SetConnectionAttempts(TCommDbMultiConnPref::KMaxMultiConnPrefCount+1);
-	Test(multiPref.ConnectionAttempts()==TCommDbMultiConnPref::KMaxMultiConnPrefCount);
-
-	return EPass;
-	}
-
-//
-//	Test step CTS_MultiConnPrefVersion
-//
-
-// constructor
-CTS_MultiConnPrefVersion::CTS_MultiConnPrefVersion()
-	{
-	// store the name of this test case
-	iTestStepName = KMultiConnPrefVersion;
-	}
-
-// destructor
-CTS_MultiConnPrefVersion::~CTS_MultiConnPrefVersion()
-	{
-	}
-
-// do Test step CTS_MultiConnPrefVersion
-TVerdict CTS_MultiConnPrefVersion::doTestStepL()
-	{
-	Log(_L("CTS_MultiConnPrefVersion called "));
-	iTestStepResult = EFail;
-    TCommDbMultiConnPref pref;	
-	TVersion dbVersion = pref.Version();
-	Log(_L("TCommDbMultiConnPref::Version -> Major=%d, Minor=%d, Build=%d"), TCommDbMultiConnPref::KMajorVersionNumber, TCommDbMultiConnPref::KMinorVersionNumber, TCommDbMultiConnPref::KBuildVersionNumber);	
-	//Test for the expected return value
-	if ( dbVersion.iMinor == TCommDbMultiConnPref::KMinorVersionNumber && 
-         dbVersion.iMajor == TCommDbMultiConnPref::KMajorVersionNumber && 
-         dbVersion.iBuild == TCommDbMultiConnPref::KBuildVersionNumber )
-		{
-		iTestStepResult = EPass;
-		}
-    return iTestStepResult;
-	}
-	
-
-//
-//	Test step CTS_MultiConnectionAttempts
-//
-
-// constructor
-CTS_MultiConnectionAttempts::CTS_MultiConnectionAttempts()
-	{
-	// store the name of this test case
-	iTestStepName = KMultiConnectionAttempts;
-	}
-
-// destructor
-CTS_MultiConnectionAttempts::~CTS_MultiConnectionAttempts()
-	{
-	}	
-	
-// do Test step CTS_MultiConnectionAttempts
-TVerdict CTS_MultiConnectionAttempts::doTestStepL( )
-	{
-	Log(_L("Step CTS_MultiConnectionAttempts called "));
-	iTestStepResult = EFail;
-	TCommDbMultiConnPref prefPtr;	
-	TInt numAttempts = prefPtr.ConnectionAttempts();
-	Log(_L("Expected NumAttempts:= %d, Actual NumAttempts:=%d"), TCommDbMultiConnPref::KMaxMultiConnPrefCount,numAttempts);
-	if(numAttempts != TCommDbMultiConnPref::KMaxMultiConnPrefCount )
-		{
-	return iTestStepResult;
-		}
-	numAttempts	 = 3 ;
-	prefPtr.SetConnectionAttempts(numAttempts);
-	TInt attempsCheck = prefPtr.ConnectionAttempts();
-	Log(_L("Expected NumAttempts:= %d, Actual NumAttempts:=%d"), TCommDbMultiConnPref::KMaxMultiConnPrefCount,attempsCheck);
-	Log(_L("This test fails because  no. of attempts is > 2"));
-	if(numAttempts == attempsCheck )
-		{
-		iTestStepResult = EFail;
-		}
-	return iTestStepResult;
-	}
-	
-	
-	
-	
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_connpref/TS_ConnPrefSteps.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-/**
-* Copyright (c) 2006-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:
-* This defines the TS_RConnectionStep class which is the base class for all 
-* the RConnection multihoming test step classes
-* 
-*
-*/
-
-
-
-/**
- @file TS_RConnectionStep.h
-*/
- 
-#if (!defined __TS_CONNPREFSTEPS_H__)
-#define __TS_CONNPREFSTEPS_H__
-
-#include <e32std.h>
-#include <cdbstore.h>
-#include <es_sock.h>
-#include <in_sock.h>
-#include <es_enum.h>
-#include <commdbconnpref.h>
-
-#include <networking/teststep.h>
-#include "TS_ConnPrefSuite.h"
-#include "TS_ConnPrefStep.h"
-
-//
-class CTS_ConstructAndVersion : public CTS_ConnPrefStep
-{
-public:
-	CTS_ConstructAndVersion();
-	virtual ~CTS_ConstructAndVersion();
-	virtual enum TVerdict doTestStepL();
-};
-
-//
-class CTS_SetAndGetConnPrefs : public CTS_ConnPrefStep
-{
-public:
-	CTS_SetAndGetConnPrefs();
-	virtual ~CTS_SetAndGetConnPrefs();
-	virtual enum TVerdict doTestStepL();
-};
-
-//
-class CTS_ComparePrefs : public CTS_ConnPrefStep
-{
-public:
-	CTS_ComparePrefs();
-	virtual ~CTS_ComparePrefs();
-	virtual enum TVerdict doTestStepL();
-};
-
-//
-class CTS_AssignAndCopyConstruct : public CTS_ConnPrefStep
-{
-public:
-	CTS_AssignAndCopyConstruct();
-	virtual ~CTS_AssignAndCopyConstruct();
-	virtual enum TVerdict doTestStepL();
-};
-
-// 
-class CTS_ExtensionIdAndCast : public CTS_ConnPrefStep
-{
-public:
-	CTS_ExtensionIdAndCast();
-	virtual ~CTS_ExtensionIdAndCast();
-	virtual enum TVerdict doTestStepL();
-};
-
-//  
-class CTS_MultiConnPref : public CTS_ConnPrefStep
-{
-public:
-	CTS_MultiConnPref();
-	virtual ~CTS_MultiConnPref();
-	virtual enum TVerdict doTestStepL();
-};
-
-
-///////////////////////////////////////
-//	Test step CTS_MultiConnPrefVersion
-///////////////////////////////////////
-
-NONSHARABLE_CLASS(CTS_MultiConnPrefVersion) : public CTS_ConnPrefStep
-{
-public:
-	CTS_MultiConnPrefVersion();
-	virtual ~CTS_MultiConnPrefVersion();
-	virtual enum TVerdict doTestStepL();
-	CCommsDbTableView*	iTheView;
-	CCommsDatabase*		iTheDb;
-
-};
-
-////////////////////////////////////////////
-//	Test step CTS_MultiConnectionAttempts
-////////////////////////////////////////////
-
-NONSHARABLE_CLASS(CTS_MultiConnectionAttempts): public CTS_ConnPrefStep
-{
-public:
-	CTS_MultiConnectionAttempts();
-	virtual ~CTS_MultiConnectionAttempts();
-	virtual enum TVerdict doTestStepL();
-};
-
-
-#endif /* __TS_CONNPREFSTEPS_H__ */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_connpref/TS_ConnPrefSuite.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-// Copyright (c) 2006-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:
-// This defines the TS_ConnPrefSuite class which is the 
-// container class for the TS_ConnPrefStep derived test steps
-// 
-//
-
-/**
- @file TS_ConnPrefSuite.cpp
-*/
-#include "TS_ConnPrefSuite.h"
-#include "TS_ConnPrefStep.h"
-#include "TS_ConnPrefHelperSteps.h"
-#include "TS_ConnPrefSteps.h"
-
-
-EXPORT_C CTS_ConnPrefSuite* NewTS_ConnPrefSuite( void ) 
-/** Polymorphic interface, exported ordinal 1.  Called by scheduletest
- * and used to instantiate the suite
- * @return a pointer to the created TS_ConnPrefSuite object
- */
-{
-	CTS_ConnPrefSuite* ts = 0;
-	TRAPD(err,ts = new (ELeave) CTS_ConnPrefSuite);
-	if (err == KErrNone)
-		return ts;
-	return 0;
-}
-
-CTS_ConnPrefSuite::~CTS_ConnPrefSuite()
-/** 
- * the destructor has to clean up any TConnDetails and TSock Details left hanging around
- * 
- */
-{
-}
-
-void CTS_ConnPrefSuite::AddTestStepL(CTS_ConnPrefStep* ptrTestStep )
-/**
- * adds a test step to the test suite object, using the base class method
- * @param ptrTestStep - a pointer to the test step to be added
- */
-{
-	CTestSuite::AddTestStepL(ptrTestStep);
-}
-
-void CTS_ConnPrefSuite::InitialiseL( void )
-/**
- * Effective second-phase constructor.  Creates all suite test steps
- * and associates them with the suite.
- */
-{
-	// Helper test steps	
-	AddTestStepL(new(ELeave) CTS_ConnPrefForceCCoverWrite(_L("ForceCCoverWrite")));
-	//Add the test steps for the tests which mainly use the dummy nif
-	AddTestStepL(new(ELeave) CTS_ConstructAndVersion ());  
-	AddTestStepL(new(ELeave) CTS_SetAndGetConnPrefs()); 
-	AddTestStepL(new(ELeave) CTS_AssignAndCopyConstruct ()); 
-	AddTestStepL(new(ELeave) CTS_ComparePrefs ()); 
-	AddTestStepL(new(ELeave) CTS_ExtensionIdAndCast ()); 
-	AddTestStepL(new(ELeave) CTS_MultiConnPref ()); 
-	AddTestStepL(new(ELeave) CTS_MultiConnPrefVersion ());
-	AddTestStepL(new(ELeave) CTS_MultiConnectionAttempts ());
- 	
-}
-
-TPtrC CTS_ConnPrefSuite::GetVersion( void )
-/**
- * Give version information back to Schedultest
- * @return The descriptor of the version
- */
-{
-	return KTxtVersion();
-}
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_connpref/TS_ConnPrefSuite.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/**
-* Copyright (c) 2002-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:
-* Header for TS_ConnPrefSuite class. This is the container
-* class for all the CommDb ConnPrefSuite test steps
-* 
-*
-*/
-
-
-
-/**
- @file TS_ConnPrefSuite.h
-*/
-
-#if (!defined __TS_CONNPREFSUITE_H__)
-#define __TS_CONNPREFSUITE_H__
-
-#include <e32std.h>
-#include <networking/testsuite.h>
-
-
-#define MAX_NAME_LENGTH		10			///< Maximum length of connection name
-
-_LIT (KTxtVersion,"1.00");				///< Version string for ScheduleTest
-//_LIT (KConnLogString, "Name [%S], RConnection[%x], RSocketServ[%x], Clients: %i");
-
-
-class CTS_ConnPrefStep;
-
-class CTS_ConnPrefSuite : public CTestSuite
-{
-public:
-	virtual		~CTS_ConnPrefSuite();
-	void		InitialiseL(void);
-	void		AddTestStepL(CTS_ConnPrefStep* ptrTestStep );
-	TPtrC		GetVersion(void);	
-	
-private:
-	// nuffin
-};
-
-void CommInitL(TBool);
-
-#endif /* __TS_CONNEPREFSUITE_H__ */
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_encrpt.mmp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* 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:
-*
-*/
-
-TARGET                  ts_encrpt.dll
-TARGETTYPE              dll
-
-SOURCEPATH              ../ts_commdb/ts_encrpt 
-SOURCE                  TS_EncrptSuite.cpp 	
-SOURCE                  TS_EncrptStep.cpp
-SOURCE                  Ts_EncrptSteps.cpp
-
-USERINCLUDE             ../ts_commdb/ts_encrpt
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE           /epoc32/include
-#else
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-#endif
-
-
-LIBRARY                 euser.lib
-LIBRARY                 commdb.lib
-LIBRARY	integrationtestutils.lib
-
-CAPABILITY ALL -Tcb
-
-VENDORID 0x70000001
-
-SMPSAFE
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_encrpt/TS_EncrptStep.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-// Copyright (c) 2002-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:
-// This contains CTS_EncrptStep class which is
-// the base class for all the Encrpt test steps
-// 
-//
-
-/**
- @file TS_EncrptStep.cpp
-*/
-#include "TS_EncrptStep.h"
-
-CTS_EncrptStep::CTS_EncrptStep()
-	{	
-	}
-
-CTS_EncrptStep::~CTS_EncrptStep()
-	{ 
-	}	
-
-void CTS_EncrptStep::ExpLogExtra(const TText8* aFile, TInt aLine, TInt aSeverity,
-		TRefByValue<const TDesC> aFmt,...)
-	{
-	VA_LIST aList;
-	VA_START( aList, aFmt );
-
-
-	// Log to the suite's logger
-	iSuite->LogExtra( aFile, aLine, aSeverity, aFmt, aList );
-
-	VA_END( aList ); 
-
-	}
-
-enum TVerdict CTS_EncrptStep::Test(TInt aResult)
-	{	
-	if (!aResult)
-		{								
-		iSuite->LogExtra((TText8*)__FILE__, __LINE__, ESevrWarn, KEGeneric);
-		return EFail;
-		}
-	return EPass;
-	}
-
-
-void CTS_EncrptStep::Set(TGlobalDbIds * aGlobals)
-	{ Dll::SetTls(aGlobals); }
-
-TGlobalDbIds* CTS_EncrptStep::Get()
-	{ TGlobalDbIds * d=(TGlobalDbIds *)Dll::Tls(); return d; }
-
-
-
-
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_encrpt/TS_EncrptStep.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/**
-* Copyright (c) 2002-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:
-* This defines the CTS_EncrptStep class which is the base class for all 
-* the EncrptStep test step classes
-* 
-*
-*/
-
-
-
-/**
- @file TS_EncrptStep.cpp.h
-*/
- 
-#if (!defined __TS_ENCRPTSTEP_H__)
-#define __TS_ENCRPTSTEP_H__
-
-#include <e32std.h>
-#include <cdbstore.h>
-
-#include <networking/teststep.h>
-#include "TS_EncrptSuite.h"
-
-// Connection Configuration Lits
-_LIT(KNameDefault, "default");
-
-// Test step names
-_LIT(KCreateEntries,  "CreateEntries"); 
-_LIT(KCheckPasswords ,  "CheckPasswords");
-_LIT(KDeleteEntries  ,  "DeleteEntries");
-
-//Error strings
-_LIT(KEGeneric, "Test left!");
-
-class TGlobalDbIds;			
-class CTS_EncrptSuite;
-
-/* CTS_ConnPrefStep class declaration
- * Provides the base class for all ConnPref test steps
- *
- */
-class CTS_EncrptStep : public CTestStep
-	{
-public:
-	CTS_EncrptStep();
-	virtual ~CTS_EncrptStep();
-	enum TVerdict Test(TInt aResult);
-
-	void ExpLogExtra(const TText8* aFile, TInt aLine, TInt aSeverity,
-		TRefByValue<const TDesC> aFmt,...);
-
-	TGlobalDbIds* Get();
-	void Set(TGlobalDbIds * aGlobals);
-	
-	CTS_EncrptSuite* iOwnerSuite;	///< Pointer to suite which owns this test step
-	
-	};
-
-
-class TGlobalDbIds
-{ 
-public:
-	TUint32 id1;
-	TUint32 id2;
-};
-
-#endif /* __TS_ENCRPTSTEP_H__ */
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_encrpt/TS_EncrptSteps.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/**
-* Copyright (c) 2002-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:
-* This defines the TS_RConnectionStep class which is the base class for all 
-* the RConnection multihoming test step classes
-* 
-*
-*/
-
-
-
-/**
- @file TS_RConnectionStep.h
-*/
- 
-#if (!defined __TS_ENCRPTSTEPS_H__)
-#define __TS_ENCRPTSTEPS_H__
-
-#include <e32std.h>
-#include <cdbstore.h>
-#include <es_sock.h>
-#include <in_sock.h>
-#include <es_enum.h>
-#include <commdbconnpref.h>
-
-#include <networking/teststep.h>
-#include "TS_EncrptSuite.h"
-#include "TS_EncrptStep.h"
-
-
-class CTS_CreateEntries : public CTS_EncrptStep
-{
-public:
-	CTS_CreateEntries();
-	virtual ~CTS_CreateEntries();
-	virtual enum TVerdict doTestStepL();
-};
-
-class CTS_CheckPasswords: public CTS_EncrptStep
-{
-public:
-	CTS_CheckPasswords();
-	virtual ~CTS_CheckPasswords();
-	virtual enum TVerdict doTestStepL();
-};
-
-class CTS_DeleteEntries: public CTS_EncrptStep
-{
-public:
-	CTS_DeleteEntries();
-	virtual ~CTS_DeleteEntries();
-	virtual enum TVerdict doTestStepL();
-};
-
-
-
-#endif /* __TS_ENCRPTSTEPS_H__ */
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_encrpt/TS_EncrptSuite.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-// Copyright (c) 2002-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:
-// This defines the TS_EncrptSuite class which is the 
-// container class for the TS_EncrptStep derived test steps
-// 
-//
-
-/**
- @file TS_EncrptSuite.cpp
-*/
-#include "TS_EncrptSuite.h"
-#include "TS_EncrptStep.h"
-#include "TS_EncrptSteps.h"
-
-
-EXPORT_C CTS_EncrptSuite* NewTS_ConnPrefSuite( void ) 
-/** Polymorphic interface, exported ordinal 1.  Called by scheduletest
- * and used to instantiate the suite
- * @return a pointer to the created TS_ConnPrefSuite object
- */
-{
-	CTS_EncrptSuite* ts = 0;
-	TRAPD(err,ts = new (ELeave) CTS_EncrptSuite);
-	if (err == KErrNone)
-		return ts;
-
-	return 0;
-}
-
-CTS_EncrptSuite::~CTS_EncrptSuite()
-/** 
- * the destructor has to clean up any TConnDetails and TSock Details left hanging around
- * 
- */
-{
-}
-
-void CTS_EncrptSuite::AddTestStepL(CTS_EncrptStep* ptrTestStep )
-/**
- * adds a test step to the test suite object, using the base class method
- * @param ptrTestStep - a pointer to the test step to be added
- */
-{
-	CTestSuite::AddTestStepL(ptrTestStep);
-}
-
-void CTS_EncrptSuite::InitialiseL( void )
-/**
- * Effective second-phase constructor.  Creates all suite test steps
- * and associates them with the suite.
- */
-{
-	
-	// Add the test steps for the tests which mainly use the dummy nif
-	AddTestStepL(new(ELeave) CTS_CreateEntries ());  
-	AddTestStepL(new(ELeave) CTS_CheckPasswords ());  
-	AddTestStepL(new(ELeave) CTS_DeleteEntries ());  
-	
-}
-
-TPtrC CTS_EncrptSuite::GetVersion( void )
-/**
- * Give version information back to Schedultest
- * @return The descriptor of the version
- */
-{
-	return KTxtVersion();
-}
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_encrpt/TS_EncrptSuite.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/**
-* Copyright (c) 2002-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:
-* Header for TS_ConnPrefSuite class. This is the container
-* class for all the CommDb ConnPrefSuite test steps
-* 
-*
-*/
-
-
-
-/**
- @file TS_ConnPrefSuite.h
-*/
-
-#if (!defined __TS_ENCRPTSUITE_H__)
-#define __TS_ENCRPTSUITE_H__
-
-#include <e32std.h>
-#include <networking/testsuite.h>
-
-
-#define MAX_NAME_LENGTH		10			///< Maximum length of connection name
-
-_LIT (KTxtVersion,"1.00");				///< Version string for ScheduleTest
-
-
-class CTS_EncrptStep;
-
-class CTS_EncrptSuite : public CTestSuite
-{
-public:
-	virtual		~CTS_EncrptSuite();
-	void		InitialiseL(void);
-	void		AddTestStepL(CTS_EncrptStep* ptrTestStep );
-	TPtrC		GetVersion(void);	
-	
-private:
-	// nuffin
-};
-
-void CommInitL(TBool);
-
-#endif /* __TS_ENCRPTSUITE_H__ */
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_encrpt/Ts_EncrptSteps.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,200 +0,0 @@
-// Copyright (c) 1997-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:
-// TS_ENCRPT.CPP
-// Test code for encryption in Database
-// 
-//
-
-#include <e32test.h>
-#include <f32file.h>
-#include <d32comm.h>
-#include <cdbcols.h>
-#include <commdb.h>
-#include <cdblen.h>
-
-#include "TS_EncrptSteps.h"
-
-
-//#define KSvDbFileName	_L("\\SYSTEM\\DATA\\CDBV2.DAT")		// test database
-
-#define pass1			_L("PASS")
-#define pass2			_L("1234567890")
-#define pass3			_L("abcdefghijklmnopqrstuvwxyz")
-#define pass4			_L("!\xa3$%^&*()_+-=?><,.@~:;'#|")
-
-
-CTS_CreateEntries::CTS_CreateEntries()
-	{
-	iTestStepName = KCreateEntries;
-	}
-
-CTS_CreateEntries::~CTS_CreateEntries()
-	{	
-	}
-
-enum TVerdict CTS_CreateEntries::doTestStepL()
-	{
-	
-	TUint32 id1 = 0;  
-	TUint32 id2 = 0; 
-		
-	Log(_L("Testing encryption"));
-
-    CCommsDatabase* db=CCommsDatabase::NewL(EDatabaseTypeIAP);
-		CleanupStack::PushL(db);
-	User::LeaveIfError(db->BeginTransaction());
-	
-	CCommsDbTableView* table=db->OpenTableLC(TPtrC(DIAL_OUT_ISP));
-	Test(table->InsertRecord(id1)==KErrNone);
-	table->WriteTextL(TPtrC(COMMDB_NAME),_L("Test 1"));
-	table->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	table->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
-	table->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
-	table->WriteTextL(TPtrC(ISP_LOGIN_NAME),_L("AnnW"));
-	table->WriteTextL(TPtrC(ISP_LOGIN_PASS),pass1);
-	table->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
-	table->WriteTextL(TPtrC(ISP_IF_AUTH_NAME),_L("RasUser"));
-	table->WriteTextL(TPtrC(ISP_IF_AUTH_PASS),pass2);
-	table->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	table->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	table->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	Test(table->PutRecordChanges()==KErrNone);
-
-	Test(table->InsertRecord(id2)==KErrNone);
-	table->WriteTextL(TPtrC(COMMDB_NAME),_L("Test 2"));
-	table->WriteBoolL(TPtrC(ISP_DIAL_RESOLUTION),ETrue);
-	table->WriteBoolL(TPtrC(ISP_USE_LOGIN_SCRIPT),EFalse);
-	table->WriteBoolL(TPtrC(ISP_PROMPT_FOR_LOGIN),EFalse);
-	table->WriteTextL(TPtrC(ISP_LOGIN_NAME),_L("AnnW"));
-	table->WriteTextL(TPtrC(ISP_LOGIN_PASS),pass3);
-	table->WriteBoolL(TPtrC(ISP_IF_PROMPT_FOR_AUTH),ETrue);
-	table->WriteTextL(TPtrC(ISP_IF_AUTH_NAME),_L("RasUser"));
-	table->WriteTextL(TPtrC(ISP_IF_AUTH_PASS),pass4);
-	table->WriteBoolL(TPtrC(ISP_IP_ADDR_FROM_SERVER),ETrue);
-	table->WriteBoolL(TPtrC(ISP_IP_DNS_ADDR_FROM_SERVER),ETrue);
-	table->WriteBoolL(TPtrC(ISP_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-	Test(table->PutRecordChanges()==KErrNone);
-
-	Test(db->CommitTransaction()==KErrNone);
-	CleanupStack::PopAndDestroy(2);
-	
-	// Allocate global storage to be held in tls.
-	TGlobalDbIds  *globals=new(ELeave) TGlobalDbIds ;
-	globals->id1 = id1;
-	globals->id2 = id2;
-	CTS_EncrptStep::Set(globals);
-
-	Log(_L("IAP Entries Added Successfully"));
-
-	return EPass;
-	}
-
-
-CTS_CheckPasswords::CTS_CheckPasswords()
-	{
-	iTestStepName = KCheckPasswords;
-	}
-
-CTS_CheckPasswords::~CTS_CheckPasswords()
-	{	
-	}
-
-enum TVerdict CTS_CheckPasswords::doTestStepL()
-	{
-
-	Log(_L("Checking passwords"));
-
-	TGlobalDbIds* globals = CTS_EncrptStep::Get();
-
-	TUint32 id1 = globals->id1;  
-	TUint32 id2 = globals->id2;
-
-	CCommsDatabase* db=CCommsDatabase::NewL(EDatabaseTypeIAP);
-		CleanupStack::PushL(db);
-	
-	CCommsDbTableView* table=db->OpenViewMatchingUintLC(TPtrC(DIAL_OUT_ISP), TPtrC(COMMDB_ID), id1);
-
-	TBuf<KCommsDbSvrMaxFieldLength> password;
-	Test(table->GotoFirstRecord()==KErrNone);
-	table->ReadTextL(TPtrC(ISP_LOGIN_PASS),password);
-	Test(password==pass1);
-	table->ReadTextL(TPtrC(ISP_IF_AUTH_PASS),password);
-	Test(password==pass2);
-
-	CleanupStack::PopAndDestroy(table);
-	table = NULL;
-	table = db->OpenViewMatchingUintLC(TPtrC(DIAL_OUT_ISP), TPtrC(COMMDB_ID), id2);
-
-	Test(table->GotoFirstRecord()== KErrNone);
-	table->ReadTextL(TPtrC(ISP_LOGIN_PASS),password);
-	Test(password==pass3);
-	table->ReadTextL(TPtrC(ISP_IF_AUTH_PASS),password);
-	Test(password==pass4);
-	
-	CleanupStack::PopAndDestroy(2);
-
-	return EPass;
-	}
-
-
-CTS_DeleteEntries::CTS_DeleteEntries()
-	{
-	iTestStepName = KDeleteEntries;
-	}
-
-CTS_DeleteEntries::~CTS_DeleteEntries()
-	{	
-	}
-
-enum TVerdict CTS_DeleteEntries::doTestStepL()
-	{
-
-	Log(_L("Delete the IAP entries."));
-
-	TGlobalDbIds* globals = CTS_EncrptStep::Get();
-	TUint32 id1 = globals->id1;  
-	TUint32 id2 = globals->id2;
-
-    CCommsDatabase* db = CCommsDatabase::NewL(EDatabaseTypeIAP);
-		CleanupStack::PushL(db);
-	
-	CCommsDbTableView* table = db->OpenViewMatchingUintLC(TPtrC(DIAL_OUT_ISP), TPtrC(COMMDB_ID), id1);
-
-	if (table->GotoFirstRecord() == KErrNone)
-		table->DeleteRecord();
-
-	CleanupStack::PopAndDestroy(table);
-	table = NULL;
-	table = db->OpenViewMatchingUintLC(TPtrC(DIAL_OUT_ISP), TPtrC(COMMDB_ID), id2);
-
-	if (table->GotoFirstRecord() == KErrNone)
-		table->DeleteRecord();
-
-	CleanupStack::PopAndDestroy(2);
-
-	Log(_L("IAP Entries Deleted Successfully"));
-
-	delete globals;
-	CTS_EncrptStep::Set(NULL);
-	
-	return EPass;
-	}
-
-
-
-
-
-
-
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_usecases.mmp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-* 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:
-*
-*/
-
-TARGET                  ts_usecases.dll
-TARGETTYPE              dll
-
-SOURCEPATH              ../ts_commdb/ts_usecases 
-SOURCE                  TS_UseCasesSuite.cpp 	
-SOURCE                  TS_UseCasesStep.cpp
-SOURCE                  TS_UseCasesSteps.cpp
-
-USERINCLUDE             ../ts_commdb/ts_usecases
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE           /epoc32/include
-#else
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-#endif
-
-LIBRARY                 euser.lib
-LIBRARY                 commdb.lib
-LIBRARY	integrationtestutils.lib
-
-CAPABILITY ALL -Tcb
-
-VENDORID 0x70000001
-
-SMPSAFE
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_usecases/TS_UseCasesStep.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-// Copyright (c) 2002-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:
-// This contains CTS_UseCasesStep class which is
-// the base class for all the Encrpt test steps
-// 
-//
-
-/**
- @file TS_UseCasesStep.cpp
-*/
-#include "TS_UseCasesStep.h"
-
-
-CTS_UseCasesStep::CTS_UseCasesStep() 
-	{			
-	}
-
-CTS_UseCasesStep::~CTS_UseCasesStep()
-	{ 
-	}	
-
-enum TVerdict CTS_UseCasesStep::Test(TInt aResult)
-	{	
-	if (!aResult)
-		{
-		return EFail;		
-		}
-	return EPass;
-	}
-
-void CTS_UseCasesStep::Set(TGlobalData * aGlobals)
-	{ Dll::SetTls(aGlobals); }
-
-TGlobalData* CTS_UseCasesStep::Get()
-	{ TGlobalData * d=(TGlobalData *)Dll::Tls(); return d; }
-
-
-
-
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_usecases/TS_UseCasesStep.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/**
-* Copyright (c) 2002-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:
-* This defines the CTS_EncrptStep class which is the base class for all 
-* the EncrptStep test step classes
-* 
-*
-*/
-
-
-
-/**
- @file TS_EncrptStep.cpp.h
-*/
- 
-#if (!defined __TS_USECASESSTEP_H__)
-#define __TS_USECASESSTEP_H__
-
-#include <e32std.h>
-#include <cdbstore.h>
-
-#include <networking/teststep.h>
-#include "TS_UseCasesSuite.h"
-
-// Connection Configuration Lits
-_LIT(KNameDefault, "default");
-
-// Test step names
-_LIT(KCreatingDatabaseAndView,  "CreatingDatabaseAndView"); 
-_LIT(KUsecaseReading,  "UsecaseReading");  
-_LIT(KUsecaseWriting,  "UsecaseWriting"); 
-_LIT(KUsecaseOverridingATableEntry  ,  "UsecaseOverridingATableEntry"); 
-_LIT(KUsecaseOverridingThePreferenceTable  ,  "UsecaseOverridingThePreferenceTable"); 
-_LIT(KUsecaseUsingATemplate  ,  "UsecaseUsingATemplate"); 
-			
-class TGlobalData;
-class CTS_UseCasesSuite;
-
-/* CTS_ConnPrefStep class declaration
- * Provides the base class for all ConnPref test steps
- *
- */
-class CTS_UseCasesStep : public CTestStep
-	{
-public:
-	CTS_UseCasesStep();
-	virtual ~CTS_UseCasesStep();
-	enum TVerdict Test(TInt aResult);
-
-	void ExpLogExtra(const TText8* aFile, TInt aLine, TInt aSeverity,
-		TRefByValue<const TDesC> aFmt,...);
-	
-	TGlobalData* Get();
-	void Set(TGlobalData * aGlobals);
-
-	CTS_UseCasesSuite* iOwnerSuite;	///< Pointer to suite which owns this test step
-	
-	};
-
-class TGlobalData
-{
-public:
-	CCommsDbTableView* iView;
-	CCommsDatabase* iDb;
-};
-
-#endif /* __TS_USECASESSTEP_H__ */
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_usecases/TS_UseCasesSteps.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,225 +0,0 @@
-// Copyright (c) 2001-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:
-// Use cases as in the commdb design overview
-// 
-//
-
-#include <e32test.h>
-#include <f32file.h>
-#include <commdb.h>
-#include <cdbover.h>
-#include <cdbtemp.h>
-
-#include "TS_UseCasesSteps.h"
-
-//
-CTS_CreatingDatabaseAndView::CTS_CreatingDatabaseAndView()
-	{
-	iTestStepName = KCreatingDatabaseAndView;
-	}
-
-CTS_CreatingDatabaseAndView::~CTS_CreatingDatabaseAndView()
-	{	
-	}
-
-enum TVerdict CTS_CreatingDatabaseAndView::doTestStepL()
-	{
-		
-	CCommsDbTableView* view;
-	CCommsDatabase* db = CCommsDatabase::NewL();
-	const TPtrC kTable1(DIAL_OUT_ISP);
-	const TPtrC kColumn1(ISP_TYPE);
-	view = db->OpenViewMatchingUintLC(kTable1, kColumn1, EIspTypeInternetOnly);
-	CleanupStack::Pop(view);
-
-	// Allocate global storage to be held in tls.
-	TGlobalData*  globals=new(ELeave) TGlobalData ;
-	globals->iDb = db;
-	globals->iView = view;
-	CTS_UseCasesStep::Set(globals);
-
-	return EPass;
-	}
-
-//
-CTS_UsecaseReading::CTS_UsecaseReading()
-	{
-	iTestStepName = KUsecaseReading;
-	}
-
-CTS_UsecaseReading::~CTS_UsecaseReading()
-	{	
-	}
-
-enum TVerdict CTS_UsecaseReading::doTestStepL()
-	{
-
-	TGlobalData* globals = CTS_UseCasesStep::Get();
-	CCommsDbTableView* view= globals->iView;  
-		
-	const TPtrC kColumn(ISP_DESCRIPTION);
-
-	TBuf<KCommsDbSvrMaxFieldLength> description;
-
-	view->GotoFirstRecord();
-	view->ReadTextL(kColumn, description);
-	
-	return EPass;
-	}
-
-//
-CTS_UsecaseWriting::CTS_UsecaseWriting()
-	{
-	iTestStepName = KUsecaseWriting;
-	}
-
-CTS_UsecaseWriting::~CTS_UsecaseWriting()
-	{	
-	}
-
-enum TVerdict CTS_UsecaseWriting::doTestStepL()
-	{
-	
-	TGlobalData* globals = CTS_UseCasesStep::Get();
-	CCommsDbTableView* view= globals->iView;  
-	
-	const TPtrC kColumn(ISP_DESCRIPTION);
-	const TPtrC kDescription(_L("A new description put in by t_usecases"));
-
-	TInt ret = view->GotoNextRecord();
-	if(ret == KErrNone)
-		{
-		ret = view->UpdateRecord();
-		if(ret == KErrNone)
-			{
-			view->WriteTextL(kColumn, kDescription);
-			view->PutRecordChanges();
-			}
-		}
-
-	return EPass;
-	}
-
-//
-CTS_UsecaseOverridingATableEntry::CTS_UsecaseOverridingATableEntry()
-	{
-	iTestStepName = KUsecaseOverridingATableEntry;
-	}
-
-CTS_UsecaseOverridingATableEntry::~CTS_UsecaseOverridingATableEntry()
-	{	
-	}
-
-enum TVerdict CTS_UsecaseOverridingATableEntry::doTestStepL()
-	{
-	const TPtrC kTable(DIAL_OUT_ISP);
-	const TPtrC kColumn(ISP_DESCRIPTION);
-	const TPtrC kOverride(_L("An overriden description"));
-	TBuf<KCommsDbSvrMaxFieldLength> overridenValue;
-
-	CCommDbOverrideSettings *override;
-	override = CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(override);
-
-	override->SetDesOverride(kTable, kColumn, kOverride);
-
-	if (override->GetDesOverride(kTable, kColumn, overridenValue) != KErrNone)
-		{
-		User::Leave(__LINE__);
-		}
-	if (overridenValue != kOverride)
-		{
-		User::Leave(__LINE__);
-		}
-
-	CleanupStack::PopAndDestroy(override);
-
-	return EPass;
-	}
-
-//
-CTS_UsecaseOverridingThePreferenceTable::CTS_UsecaseOverridingThePreferenceTable()
-	{
-	iTestStepName = KUsecaseOverridingThePreferenceTable;
-	}
-
-CTS_UsecaseOverridingThePreferenceTable::~CTS_UsecaseOverridingThePreferenceTable()
-	{	
-	}
-
-enum TVerdict CTS_UsecaseOverridingThePreferenceTable::doTestStepL()
-	{
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref overrideSettings;
-	CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref overridenValue;
-
-	CCommDbOverrideSettings* override;
-	override = CCommDbOverrideSettings::NewL(CCommDbOverrideSettings::EParamListPartial);
-	CleanupStack::PushL(override);
-
-	overrideSettings.iDialogPref = ECommDbDialogPrefPrompt;
-	overrideSettings.iRanking = 1;
-	overrideSettings.iDirection = ECommDbConnectionDirectionOutgoing;
-	override->SetConnectionPreferenceOverride(overrideSettings);
-
-	overridenValue.iRanking = 1;
-	override->GetConnectionPreferenceOverride(overridenValue);
-
-	if (!(overrideSettings == overridenValue))
-		{
-		User::Leave(__LINE__);
-		}
-
-	CleanupStack::PopAndDestroy(override);
-
-	return EPass;
-	}
-
-//
-CTS_UsecaseUsingATemplate::CTS_UsecaseUsingATemplate()
-	{
-	iTestStepName = KUsecaseUsingATemplate;
-	}
-
-CTS_UsecaseUsingATemplate::~CTS_UsecaseUsingATemplate()
-	{	
-	}
-
-enum TVerdict CTS_UsecaseUsingATemplate::doTestStepL()
-	{
-
-	TGlobalData* globals = CTS_UseCasesStep::Get();
-	CCommsDatabase* db = globals->iDb;
-	CCommsDbTableView* view= globals->iView; 
-	
-	const TPtrC kTable(DIAL_OUT_ISP);
-	const TPtrC kColumn(ISP_DESCRIPTION);
-	const TPtrC kDescription(_L("A default description put in by t_usecases"));
-
-	CCommsDbTemplateRecord* temp;
-	temp = CCommsDbTemplateRecord::NewL(db, kTable);
-	CleanupStack::PushL(temp);
-
-	temp->Modify();
-	temp->WriteTextL(kColumn, kDescription);
-	temp->StoreModifications();
-	
-	CleanupStack::PopAndDestroy(temp);
-	 
-	delete view; 
-	delete db;		
-	delete globals;
-	CTS_UseCasesStep::Set(NULL);
-	
-	return EPass;
-	}
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_usecases/TS_UseCasesSteps.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-/**
-* Copyright (c) 2002-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:
-* This defines the TS_RConnectionStep class which is the base class for all 
-* the RConnection multihoming test step classes
-* 
-*
-*/
-
-
-
-/**
- @file TS_RConnectionStep.h
-*/
- 
-#if (!defined __TS_USECASESSTEPS_H__)
-#define __TS_USECASESSTEPS_H__
-
-#include <e32std.h>
-#include <cdbstore.h>
-#include <es_sock.h>
-#include <in_sock.h>
-#include <es_enum.h>
-#include <commdbconnpref.h>
-
-#include <networking/teststep.h>
-#include "TS_UseCasesSuite.h"
-#include "TS_UseCasesStep.h"
-
-
-class CTS_CreatingDatabaseAndView : public CTS_UseCasesStep
-{
-public:
-	CTS_CreatingDatabaseAndView();
-	virtual ~CTS_CreatingDatabaseAndView();
-	virtual enum TVerdict doTestStepL();
-};  
-
-
-class CTS_UsecaseReading: public CTS_UseCasesStep
-{
-public:
-	CTS_UsecaseReading();
-	virtual ~CTS_UsecaseReading();
-	virtual enum TVerdict doTestStepL();
-};  
-
-
-class CTS_UsecaseWriting: public CTS_UseCasesStep
-{
-public:
-	CTS_UsecaseWriting();
-	virtual ~CTS_UsecaseWriting();
-	virtual enum TVerdict doTestStepL();
-};  
-
-
-class CTS_UsecaseOverridingATableEntry: public CTS_UseCasesStep
-{
-public:
-	CTS_UsecaseOverridingATableEntry();
-	virtual ~CTS_UsecaseOverridingATableEntry();
-	virtual enum TVerdict doTestStepL();
-};  
-
-
-class CTS_UsecaseOverridingThePreferenceTable: public CTS_UseCasesStep
-{
-public:
-	CTS_UsecaseOverridingThePreferenceTable();
-	virtual ~CTS_UsecaseOverridingThePreferenceTable();
-	virtual enum TVerdict doTestStepL();
-};   
-
-
-class CTS_UsecaseUsingATemplate: public CTS_UseCasesStep
-{
-public:
-	CTS_UsecaseUsingATemplate();
-	virtual ~CTS_UsecaseUsingATemplate();
-	virtual enum TVerdict doTestStepL();
-};   
-
-
-#endif /* __TS_USECASESSTEPS_H__ */
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_usecases/TS_UseCasesSuite.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-// Copyright (c) 2002-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:
-// This defines the TS_UseCasesSuite class which is the 
-// container class for the CTS_UseCasesStep derived test steps
-// 
-//
-
-/**
- @file TS_UseCasesSuite.cpp
-*/
-#include "TS_UseCasesSuite.h"
-#include "TS_UseCasesStep.h"
-#include "TS_UseCasesSteps.h"
-
-
-EXPORT_C CTS_UseCasesSuite* NewTS_ConnPrefSuite( void ) 
-/** Polymorphic interface, exported ordinal 1.  Called by scheduletest
- * and used to instantiate the suite
- * @return a pointer to the created TS_ConnPrefSuite object
- */
-{
-	CTS_UseCasesSuite* ts = 0;
-	TRAPD(err,ts = new (ELeave) CTS_UseCasesSuite);
-	if (err == KErrNone)
-		return ts;
-	return 0;
-}
-
-CTS_UseCasesSuite::~CTS_UseCasesSuite()
-/** 
- * the destructor has to clean up any TConnDetails and TSock Details left hanging around
- * 
- */
-{
-}
-
-void CTS_UseCasesSuite::AddTestStepL(CTS_UseCasesStep* ptrTestStep )
-/**
- * adds a test step to the test suite object, using the base class method
- * @param ptrTestStep - a pointer to the test step to be added
- */
-{
-	CTestSuite::AddTestStepL(ptrTestStep);
-}
-
-void CTS_UseCasesSuite::InitialiseL( void )
-/**
- * Effective second-phase constructor.  Creates all suite test steps
- * and associates them with the suite.
- */
-{
-
-	// Add the test steps for the tests which mainly use the dummy nif
-	AddTestStepL(new(ELeave) CTS_CreatingDatabaseAndView ());
-	AddTestStepL(new(ELeave) CTS_UsecaseReading ());
-	AddTestStepL(new(ELeave) CTS_UsecaseWriting ());
-	AddTestStepL(new(ELeave) CTS_UsecaseOverridingATableEntry ());
-	AddTestStepL(new(ELeave) CTS_UsecaseOverridingThePreferenceTable ());
-	AddTestStepL(new(ELeave) CTS_UsecaseUsingATemplate ()); 
-	
-	
-}
-
-TPtrC CTS_UseCasesSuite::GetVersion( void )
-/**
- * Give version information back to Schedultest
- * @return The descriptor of the version
- */
-{
-	return KTxtVersion();
-}
--- a/commsconfig/commsdatabaseshim/ts_commdb/ts_usecases/TS_UseCasesSuite.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/**
-* Copyright (c) 2002-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:
-* Header for TS_ConnPrefSuite class. This is the container
-* class for all the CommDb ConnPrefSuite test steps
-* 
-*
-*/
-
-
-
-/**
- @file TS_ConnPrefSuite.h
-*/
-
-#if (!defined __TS_USECASESSUITE_H__)
-#define __TS_USECASESSUITE_H__
-
-#include <e32std.h>
-#include <networking/testsuite.h>
-
-
-#define MAX_NAME_LENGTH		10			///< Maximum length of connection name
-
-_LIT (KTxtVersion,"1.00");				///< Version string for ScheduleTest
-
-
-class CTS_UseCasesStep;
-
-class CTS_UseCasesSuite : public CTestSuite
-{
-public:
-	virtual		~CTS_UseCasesSuite();
-	void		InitialiseL(void);
-	void		AddTestStepL(CTS_UseCasesStep* ptrTestStep );
-	TPtrC		GetVersion(void);	
-	
-private:
-	// nuffin
-};
-
-#endif /* __TS_USECASESSUITE_H__ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/group/TE_mbufmgr.mmp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,71 @@
+// Copyright (c) 2001-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:
+// CTMbufmgr.mmp
+// using relative paths for sourcepath and user includes
+// 
+//
+
+TARGET        te_ctmbufmgr.exe
+TARGETTYPE    EXE
+UID           0x1000008d 0x101F529F
+VENDORID 0x70000001
+
+SOURCEPATH    ..\src
+
+SOURCE        TE_mbufmgrServer.cpp        
+SOURCE        TestStepCTMbufmgr.cpp
+SOURCE        Test01CreateDeleteMBufMgr.cpp 
+SOURCE        Test02AllocDealloc.cpp
+SOURCE        Test03AllocLeave.cpp          
+SOURCE        Test04CopyInOut.cpp
+SOURCE        Test05CopyInOutOffset.cpp     
+SOURCE        Test06SplitL.cpp
+SOURCE        Test07TrimStart.cpp           
+SOURCE        Test08TrimEnd.cpp
+SOURCE        Test09Align.cpp               
+SOURCE        Test10CopyL.cpp
+SOURCE        Test11AsyncAlloc.cpp          
+SOURCE        Test12General.cpp
+SOURCE        Test13Performance.cpp         
+SOURCE        Test14HeapFreeCheck.cpp
+SOURCE        Test15Concurrency.cpp
+SOURCE        test16memoryfull.cpp
+SOURCE        test17requestsizelimits.cpp
+SOURCE        test18exhaustmidsizepools.cpp
+SOURCE        Test19Prepend.cpp
+SOURCE        test20poolceilingfull.cpp
+SOURCE        test21commsbufs.cpp
+SOURCE        Test22Append.cpp
+SOURCE        Test23RMBufQ.cpp
+
+
+USERINCLUDE   ..\inc
+
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY     euser.lib mbufmgr.lib
+LIBRARY     efsrv.lib
+LIBRARY     netmeta.lib		// for the ABIv2
+LIBRARY		commsbufs.lib
+LIBRARY		TestExecuteUtils.lib
+LIBRARY	     testexecutelogclient.lib
+
+#if !defined(WINS) && !defined(GCC32)
+LIBRARY					commsfw.lib
+#endif
+
+CAPABILITY ALL -Tcb
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/TE_mbufmgrServer.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) 2008 Symbian Ltd.  All rights reserved.
+ *
+ */
+#if (!defined __TE_mbufmgr_SERVER_H__)
+#define __TE_mbufmgr_SERVER_H__
+
+#include <test/TestExecuteServerBase.h>
+#include <es_mbman.h> 
+//const TUint KMBufMinHeapSize        = 4 * 1024;
+
+class CTE_mbufmgrServer : public CTestServer
+	{
+public:
+	static CTE_mbufmgrServer* NewL();
+	virtual CTestStep* CreateTestStep(const TDesC& aStepName);
+	RFs& Fs(){return iFs;};
+
+private:
+	RFs iFs;
+	};
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test01CreateDeleteMBufMgr.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test step 1
+// 
+//
+
+#if (!defined __TEST01CREATEDELETEMBUFMGR_H__)
+#define __TEST01CREATEDELETEMBUFMGR_H__
+
+#include "teststepctmbufmgr.h"
+NONSHARABLE_CLASS(CTest01CreateDeleteMBufMgr) : public CTestStepCTMbufmgr
+{
+public:
+	CTest01CreateDeleteMBufMgr();
+	~CTest01CreateDeleteMBufMgr();
+
+	virtual enum TVerdict doTestStepL( void );
+
+};
+
+#endif //(__TEST01CREATEDELETEMBUFMGR_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test02AllocDealloc.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test step 02 
+// 
+//
+
+#if (!defined __TEST02ALLOCDEALLOC_H__)
+#define __TEST02ALLOCDEALLOC_H__
+
+NONSHARABLE_CLASS(CTest02AllocDealloc) : public CTestStepCTMbufmgr
+{
+public:
+	CTest02AllocDealloc();
+	~CTest02AllocDealloc();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+
+};
+
+#endif //(__TEST02ALLOCDEALLOC_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test03AllocLeave.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test step 03 
+// 
+//
+
+#if (!defined __TEST03ALLOCLEAVE_H__)
+#define __TEST03ALLOCLEAVE_H__
+
+NONSHARABLE_CLASS(CTest03AllocLeave) : public CTestStepCTMbufmgr
+{
+public:
+	CTest03AllocLeave();
+	~CTest03AllocLeave();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+
+};
+
+#endif //(__TEST03ALLOCLEAVE_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test04CopyInOut.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test step 04 
+// 
+//
+
+#if (!defined __TEST04COPYINOUT_H__)
+#define __TEST04COPYINOUT_H__
+
+NONSHARABLE_CLASS(CTest04CopyInOut) : public CTestStepCTMbufmgr
+{
+public:
+	CTest04CopyInOut();
+	~CTest04CopyInOut();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+
+};
+
+#endif //(__TEST04COPYINOUT_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test05CopyInOutOffset.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test step 05 
+// 
+//
+
+#if (!defined __TEST05COPYINOUTOFFSET_H__)
+#define __TEST05COPYINOUTOFFSET_H__
+
+NONSHARABLE_CLASS(CTest05CopyInOutOffset) : public CTestStepCTMbufmgr
+{
+public:
+	CTest05CopyInOutOffset();
+	~CTest05CopyInOutOffset();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+
+};
+
+#endif //(__TEST05COPYINOUTOFFSET_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test06SplitL.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test step 06 
+// 
+//
+
+#if (!defined __TEST06SPLIT_H__)
+#define __TEST06SPLIT_H__
+
+NONSHARABLE_CLASS(CTest06Split) : public CTestStepCTMbufmgr
+{
+public:
+	CTest06Split();
+	~CTest06Split();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+
+};
+
+#endif //(__TEST06SPLIT_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test07TrimStart.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test step 07
+// 
+//
+
+#if (!defined __TEST07TRIMSTART_H__)
+#define __TEST07TRIMSTART_H__
+
+NONSHARABLE_CLASS(CTest07TrimStart) : public CTestStepCTMbufmgr
+{
+public:
+	CTest07TrimStart();
+	~CTest07TrimStart();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+
+};
+
+#endif //(__TEST07TRIMSTART_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test08TrimEnd.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test step 08
+// 
+//
+
+#if (!defined __TEST08TRIMEND_H__)
+#define __TEST08TRIMEND_H__
+
+NONSHARABLE_CLASS(CTest08TrimEnd) : public CTestStepCTMbufmgr
+{
+public:
+	CTest08TrimEnd();
+	~CTest08TrimEnd();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+
+};
+
+#endif //(__TEST08TRIMEND_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test09Align.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,50 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test step 09
+// 
+//
+
+#if (!defined __TEST09ALIGN_H__)
+#define __TEST09ALIGN_H__
+
+NONSHARABLE_CLASS(CTest09Align) : public CTestStepCTMbufmgr
+{
+public:
+	CTest09Align();
+	~CTest09Align();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+	struct RMBufInfo {
+		TInt aOffset;
+		TInt aLength;
+	};
+	struct CScriptInput {  // This str. will be obtained 
+		RMBufInfo aBuf[50];// from the script file
+		TInt aBufsBefore;
+		TInt aBufsAfter;
+	};
+	struct CTestStr		   // This str. will 'simulate' a header
+	{					   // that has to be aligned within chain
+		TUint32 iSrcAddr;
+		TUint32 iDstAddr;
+		TUint16 iSrcPort;
+		TUint16 iDstPort;
+		TUint16 iLength;
+		TUint16 iOptions;
+		TUint8  iData[48];
+	};
+};
+
+#endif //(__TEST09ALIGN_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test10CopyL.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,44 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test step 10
+// 
+//
+
+
+#if (!defined __TEST10COPYL_H__)
+#define __TEST10COPYL_H__
+
+
+NONSHARABLE_CLASS(CTest10Copy) : public CTestStepCTMbufmgr
+{
+public:
+	CTest10Copy();
+	~CTest10Copy();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+	struct RMBufInfo {
+		TInt aOffset;
+		TInt aLength;
+	};
+	struct CScriptInput {   // This str will be obtained 
+		RMBufInfo aBuf[50]; // from the script file
+		TInt aBufs;
+		TInt aChainLen;
+		TInt aCopyOffset;
+		TInt aCopyLen;
+	};
+};
+
+#endif //(__TEST10COPYL_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test11AsyncAlloc.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,37 @@
+// Copyright (c) 2002-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:
+// Test11AsyncAlloc.cpp
+// Contains declarations of test step 11 
+// 
+//
+
+
+#if (!defined __TEST11ASYNCALLOC_H__)
+#define __TEST11ASYNCALLOC_H__
+
+
+NONSHARABLE_CLASS(CTest11AsyncAlloc) : public CTestStepCTMbufmgr
+{
+public:
+	CTest11AsyncAlloc();
+	~CTest11AsyncAlloc();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+
+};
+
+
+
+#endif //(__TEST11ASYNCALLOC_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test12General.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,42 @@
+// Copyright (c) 2002-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:
+// Test12General.cpp
+// Contains declarations of test step 12 
+// 
+//
+
+
+#if (!defined __TEST12GENERAL_H__)
+#define __TEST12GENERAL_H__
+class RMBufChain;
+class RMBufPktQ;
+NONSHARABLE_CLASS(CTest12General) : public CTestStepCTMbufmgr
+{
+public:
+	CTest12General();
+	~CTest12General();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+
+	void LeaveIfErrorL(TInt aErr, RMBufChain& aChain, const TDesC& aMsg);
+	void LeaveIfDifferentL(TInt aLHS, TInt aRHS, RMBufChain& aChain, const TDesC& aMsg);
+	void Test_QueueStats(RMBufPktQ &aQueue, const TText *aName);
+	typedef struct Test_str //This will be header used in test
+	{
+		TUint8 iHdr[20];
+	} Test_str;
+
+};
+#endif //(__TEST12GENERAL_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test13Performance.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test step 13 
+// 
+//
+
+#if (!defined __TEST13PERFORMANCE_H__)
+#define __TEST13PERFORMANCE_H__
+
+NONSHARABLE_CLASS(CTest13Performance) : public CTestStepCTMbufmgr
+{
+public:
+	CTest13Performance();
+	~CTest13Performance();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+
+};
+
+#endif //(__TEST13PERFORMANCE_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test14HeapFreeCheck.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test step 14 
+// 
+//
+
+#if (!defined __TEST14HEAPFREECHECK_H__)
+#define __TEST14HEAPFREECHECK_H__
+
+NONSHARABLE_CLASS(CTest14HeapFreeCheck) : public CTestStepCTMbufmgr
+{
+public:
+	CTest14HeapFreeCheck();
+	~CTest14HeapFreeCheck();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+
+};
+
+#endif //(__TEST14HEAPFREECHECK_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test15Concurrency.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,35 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test 15
+// 
+//
+
+#if (!defined __TEST15CONCURRENCY_H__)
+#define __TEST15CONCURRENCY_H__
+
+NONSHARABLE_CLASS(CTest15Concurrency) : public CTestStepCTMbufmgr
+{
+public:
+	CTest15Concurrency();
+	~CTest15Concurrency();
+	virtual enum TVerdict doTestStepL( void );
+private:
+	static TInt fHighPriorityThread(TAny*); //High priority thread in this test
+
+	TInt iMainThreadTries;
+	TInt iMainThreadFails;
+	TInt iHighThreadTries;
+	TInt iHighThreadFails;
+};	
+#endif //(__TEST15CONCURRENCY_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test19Prepend.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 2008-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:
+// Test19Prepend.h
+// Contains declaration of test step 19
+//
+//
+
+#if (!defined __TEST19PREPEND_H__)
+#define __TEST19PREPEND_H__
+
+NONSHARABLE_CLASS(CTest19Prepend) : public CTestStepCTMbufmgr
+{
+public:
+	CTest19Prepend();
+	~CTest19Prepend();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+};
+
+#endif //(__TEST09ALIGN_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test22Append.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 2008-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:
+// Test22Append.h
+// Contains declaration of test step 22
+//
+//
+
+#if (!defined __TEST22APPEND_H__)
+#define __TEST22APPEND_H__
+
+NONSHARABLE_CLASS(CTest22Append) : public CTestStepCTMbufmgr
+{
+public:
+	CTest22Append();
+	~CTest22Append();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+};
+
+#endif //(__TEST09ALIGN_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/Test23RMBufQ.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 2008-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:
+// Test22Append.h
+// Contains declaration of test step 22
+//
+//
+
+#if (!defined __TEST23RMBUFQ_H__)
+#define __TEST23RMBUFQ_H__
+
+NONSHARABLE_CLASS(CTest23RMBufQ) : public CTestStepCTMbufmgr
+{
+public:
+	CTest23RMBufQ();
+	~CTest23RMBufQ();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+};
+
+#endif //(__TEST09ALIGN_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/TestStepCTMbufmgr.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,55 @@
+// Copyright (c) 2002-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:
+// Contains declaration of CTestStepCTMbufmgr class that is
+// base class for all test step classes in this test.
+// 
+//
+
+#if (!defined __TESTSTEPSCTMBUFMGR_H__)
+#define __TESTSTEPSCTMBUFMGR_H__
+
+#include <cflog.h>
+#include <comms-infras/commsbufpondop.h>
+#include <es_mbuf.h>
+#include <es_mbman.h>
+
+//#include <networking/teststep.h>
+#include <test/testexecutestepbase.h>
+
+//const TUint KMBufMinHeapSize        = 4 * 1024;
+
+//const TUint KMBufDefaultHeapSize    = 256 * 1024;
+
+class CCommsBufManager;
+class CTestSuiteCTMbufmgr;
+class TCommsBufPoolCreateInfo;
+NONSHARABLE_CLASS(CTestStepCTMbufmgr) : public CTestStep
+{
+public:
+	CTestStepCTMbufmgr();
+	~CTestStepCTMbufmgr();
+
+	CTestSuiteCTMbufmgr * iEsockSuite;// Pointer to the suite which owns this test
+protected:
+	void StripeMem(TUint8 *aBuf, TInt aStartPos, TInt anEndPos, TUint aStartChar, TUint anEndChar);
+	void StripeDes(TDes8 &aBuf, TInt aStartPos, TInt anEndPos, TUint aStartChar, TUint anEndChar);
+	void CreateInstanceMBufMgrL(TInt aMaxHeapSize);
+	void CreateInstanceMBufMgrL(RArray<TCommsBufPoolCreateInfo>& aPoolCreateInfo);
+
+	CActiveScheduler* 				iActSch;
+	RCommsBufPondOp 				iBufPond;
+};
+
+#endif /* __TESTSTEPSCTMBUFMGR_H__ */
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/test16memoryfull.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,94 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test 16
+// 
+//
+
+#if (!defined __TEST16MEMORYFULL_H__)
+#define __TEST16MEMORYFULL_H__
+
+#include <cflog.h>
+#include <es_mbuf.h>
+
+static const TInt KFactor = 10;
+static const TInt KFactor1 = 9;
+static const TInt KFactor2 = 8;
+static const TInt KFactor3 = 7;
+
+class RCommsBufPond;
+class RMBufAsyncRequest;
+
+
+NONSHARABLE_CLASS(CTest16MemoryFull) : public CTestStepCTMbufmgr
+{
+public:
+	CTest16MemoryFull();
+	~CTest16MemoryFull();
+	virtual enum TVerdict doTestStepL( void );
+	TInt iMainThreadTries;
+	TInt iMainThreadFails;
+	TInt iMainThreadSizeFails;
+	TInt iMainThreadLastFailure;
+	TInt iThread1AllocTries, iThread2AllocTries, iThread3Tries;
+	TInt iThread1MemoryFull, iThread2MemoryFull, iThread3AllocFails;
+	TInt iThread1SizeFails, iThread2SizeFails, iThread3Fails;
+	TInt iThread1LastMemoryFull, iThread2LastMemoryFull;
+	TInt iThread1MaxLen, iThread2MaxLen, iThread3MaxLen;
+	TUint iThread1AllocTime, iThread1FreeTime;
+	TUint iThread2AllocTime, iThread2FreeTime;
+	TInt iAllocatedMemory;
+	TAny* iNotifierAllocator;
+
+	void FillDes(TDes8 &aBuf, TInt aStartPos, TInt anEndPos, TUint aStartChar, TUint anEndChar);
+	RCommsBufPond& BufPond(); 
+
+};	
+
+NONSHARABLE_CLASS(CMBufAsyncMemFull) : public CActive
+{
+public:
+	CMBufAsyncMemFull(CTest16MemoryFull* aTestObject,
+				RMBufAsyncRequest& aMBufAsyncReq, 
+				TDes8 *aDes1, 
+				TDes8 *aDes2);
+
+	~CMBufAsyncMemFull() { Cancel(); }
+
+	void RunL();
+
+	void DoCancel()  { iMBufAsyncReq.Cancel(); }
+
+	TInt DoStartTest();
+
+private:
+
+static TInt fThread1(TAny*); //High priority thread in this test
+static TInt fThread2(TAny*); //High priority thread in this test
+static TInt fThread3(TAny*); //High priority thread in this test
+
+	CTest16MemoryFull* iTestObject;
+	TInt iRequested_size[KFactor];
+	TDes8 *iDes1;
+	TDes8 *iDes2;
+	RThread iThread1;
+	RThread iThread2;
+	RThread iThread3;
+	
+	TInt iRequestloop;
+	
+	RMBufAsyncRequest& iMBufAsyncReq;
+	RMBufChain iChain;
+};
+
+#endif //(__TEST16MEMORYFULL_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/test17requestsizelimits.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test 17
+// 
+//
+
+
+#if (!defined __TEST17REQUESTSIZELIMITS_H__)
+#define __TEST17REQUESTSIZELIMITS_H__
+
+NONSHARABLE_CLASS(CTest17RequestSizeLimits) : public CTestStepCTMbufmgr
+{
+public:
+	CTest17RequestSizeLimits();
+	~CTest17RequestSizeLimits();
+	
+	virtual enum TVerdict doTestStepL( void );
+	
+	void FillDes(TDes8 &aBuf, TInt aStartPos, TInt anEndPos, TUint aStartChar, TUint anEndChar);
+};
+
+#endif //(__TEST17REQUESTSIZELIMITS_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/test18exhaustmidsizepools.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test 18
+// 
+//
+
+
+#if (!defined __TEST18EXHAUSTMIDSIZEPOOLS_H__)
+#define __TEST18EXHAUSTMIDSIZEPOOLS_H__
+
+NONSHARABLE_CLASS(CTest18ExhaustMidSizePools) : public CTestStepCTMbufmgr
+{
+public:
+	CTest18ExhaustMidSizePools();
+	~CTest18ExhaustMidSizePools();
+	
+	virtual enum TVerdict doTestStepL( void );
+	
+	void FillDes(TDes8 &aBuf, TInt aStartPos, TInt anEndPos, TUint aStartChar, TUint anEndChar);
+};
+
+#endif /*__TEST18EXHAUSTMIDSIZEPOOLS_H__*/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/test20poolceilingfull.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,65 @@
+/*
+* 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: 
+*
+*/
+#ifndef __TEST20POOLCEILINGFULL_H__
+#define __TEST20POOLCEILINGFULL_H__
+
+#include <cflog.h>
+#include <es_mbuf.h>
+
+NONSHARABLE_CLASS(CTest20PoolCeilingFull) : public CTestStepCTMbufmgr
+	{
+	public:
+	CTest20PoolCeilingFull();
+	~CTest20PoolCeilingFull();
+	virtual enum TVerdict doTestStepL( void );
+	RCommsBufPond& BufPond(); 
+
+	RMBufChain iChain;
+	};
+
+NONSHARABLE_CLASS(CMBufAsyncPoolCeilingFull) : public CActive
+	{
+	public:
+	CMBufAsyncPoolCeilingFull(CTest20PoolCeilingFull& aTestObject);
+
+	~CMBufAsyncPoolCeilingFull();
+
+	void RunL();
+
+	void DoCancel();
+
+	TInt DoStartTest();
+	
+	private:
+	void CompleteSelf();
+	static TInt fThread1(TAny*); //High priority thread in this test
+	static TInt fThread2(TAny*); //High priority thread in this test
+	static TInt fThread3(TAny*); //High priority thread in this test
+
+	CTest20PoolCeilingFull& iTestObject;
+
+	RThread iThread1;
+	RThread iThread2;
+	RThread iThread3;
+	TInt iIteration;
+	TInt iError;
+	
+	RMBufAsyncRequest 	iAsyncRequest;
+	RMBufChain			iAsyncChain;
+	};
+
+#endif // __TEST20POOLCEILINGFULL_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/inc/test21commsbufs.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 2002-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:
+// Contains declaration of test step 21
+// 
+//
+
+#ifndef __TEST21COMMSBUFS_H__
+#define __TEST21COMMSBUFS_H__
+
+NONSHARABLE_CLASS(CTest21CommsBufs) : public CTestStepCTMbufmgr
+{
+public:
+	CTest21CommsBufs();
+	~CTest21CommsBufs();
+
+	virtual enum TVerdict doTestStepL( void );
+private:
+
+};
+
+#endif // __TEST21COMMSBUFS_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest05-CopyIn.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,2 @@
+[MBufMgrTest05]
+test=CopyIn
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest05-CopyOut.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,2 @@
+[MBufMgrTest05]
+test=CopyOut
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest06-1st.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,3 @@
+[MBufMgrTest06]
+Length=100
+Offset=60
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest06-2nd.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,3 @@
+[MBufMgrTest06]
+Length=200
+Offset=129
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest06-3rd.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,3 @@
+[MBufMgrTest06]
+Length=300
+Offset=160
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest06-4th.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,4 @@
+[MBufMgrTest06]
+Length=700
+Offset=260
+ForceSmallBuf=1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest07-1st.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,3 @@
+[MBufMgrTest07]
+Length=100
+Offset=60
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest07-2nd.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,3 @@
+[MBufMgrTest07]
+Length=200
+Offset=128
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest07-3rd.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,3 @@
+[MBufMgrTest07]
+Length=300
+Offset=160
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest08-1st.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,3 @@
+[MBufMgrTest08]
+Length=100
+Offset=60
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest08-2nd.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,3 @@
+[MBufMgrTest08]
+Length=200
+Offset=128
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest08-3rd.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,3 @@
+[MBufMgrTest08]
+Length=300
+Offset=160
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest09-1st.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,12 @@
+[MBufMgrTest09]
+
+Length01= 100
+Offset01= 20
+
+Length02= 20
+Offset02= 40
+
+
+Length03= -1
+
+BuffsAfter=2
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest09-2nd.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,12 @@
+[MBufMgrTest09]
+
+Length01= 100
+Offset01= 21
+
+Length02= 20
+Offset02= 40
+
+
+Length03= -1
+
+BuffsAfter=2
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest09-3rd.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,12 @@
+[MBufMgrTest09]
+
+Length01= 40
+Offset01= 20
+
+Length02= 40
+Offset02= 40
+
+
+Length03= -1
+
+BuffsAfter=2
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest09-4th.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,12 @@
+[MBufMgrTest09]
+
+Length01= 40
+Offset01= 21
+
+Length02= 40
+Offset02= 40
+
+
+Length03= -1
+
+BuffsAfter=2
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest09-5th.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,14 @@
+[MBufMgrTest09]
+
+Length01= 40
+Offset01= 21
+
+Length02= 24
+Offset02= 40
+
+Length03= 40
+Offset03= 40
+
+Length04= -1
+
+BuffsAfter=2
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest10-1st.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,15 @@
+[MBufMgrTest10]
+
+Length01= 20
+Offset01= 21
+
+Length02= 20
+Offset02= 40
+
+Length03= 50
+Offset03= 40
+
+Length04= -1
+
+CopyOffset=2
+CopyLen = 90
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/MBufTest13-1st.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,3 @@
+[MBufMgrTest13]
+MBufNo= 200
+LoopNo= 10
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/mbuftest.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,241 @@
+//RUN_SCRIPT 102.script
+PRINT TE_CTMBufMgr: Group test 
+PRINT ------------------------------
+PRINT
+
+LOAD_SUITE te_ctmbufmgr
+PRINT ------------------------------
+PRINT
+
+PRINT Test 01: Create/Delete MBufMgr
+START_TESTCASE			COMINF-CTMBufManager-0101
+//! @SYMTestCaseID		COMINF-CTMBufManager-0101
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest01
+END_TESTCASE			COMINF-CTMBufManager-0101
+PRINT ------------------------------
+PRINT
+
+PRINT Test 02: Alloc/Dealloc RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0102
+//! @SYMTestCaseID		COMINF-CTMBufManager-0102
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest02
+END_TESTCASE			COMINF-CTMBufManager-0102
+PRINT ------------------------------
+PRINT
+
+PRINT Test 03: Alloc/Dealloc RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0103
+//! @SYMTestCaseID		COMINF-CTMBufManager-0103
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest03
+END_TESTCASE			COMINF-CTMBufManager-0103
+PRINT ------------------------------
+PRINT
+
+PRINT Test 04: CopyIn/Out 
+START_TESTCASE			COMINF-CTMBufManager-0104
+//! @SYMTestCaseID		COMINF-CTMBufManager-0104
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest04
+END_TESTCASE			COMINF-CTMBufManager-0104
+PRINT ------------------------------
+PRINT
+
+PRINT Test 05: CopyIn/Out with Offset 
+START_TESTCASE			COMINF-CTMBufManager-0105
+//! @SYMTestCaseID		COMINF-CTMBufManager-0105
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest05 z:\testdata\configs\MBufTest05-CopyIn.ini
+END_TESTCASE			COMINF-CTMBufManager-0105
+PRINT ------------------------------
+PRINT
+
+PRINT Test 05: CopyIn/Out with Offset 
+START_TESTCASE			COMINF-CTMBufManager-0106
+//! @SYMTestCaseID		COMINF-CTMBufManager-0106
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest05 z:\testdata\configs\MBufTest05-CopyOut.ini
+END_TESTCASE			COMINF-CTMBufManager-0106
+PRINT ------------------------------
+PRINT
+
+PRINT Test 06: Split the chain on the first and only RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0107
+//! @SYMTestCaseID		COMINF-CTMBufManager-0107
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest06 z:\testdata\configs\MBufTest06-1st.ini
+END_TESTCASE			COMINF-CTMBufManager-0107
+PRINT ------------------------------
+PRINT
+
+PRINT Test 06: Split the chain on the boundary of the 1st & 2nd RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0108
+//! @SYMTestCaseID		COMINF-CTMBufManager-0108
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest06 z:\testdata\configs\MBufTest06-2nd.ini
+END_TESTCASE			COMINF-CTMBufManager-0108
+PRINT ------------------------------
+PRINT
+
+PRINT Test 06: Split the chain (containing 3 RMBufs) on the 2nd RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0109
+//! @SYMTestCaseID		COMINF-CTMBufManager-0109
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest06 z:\testdata\configs\MBufTest06-3rd.ini
+END_TESTCASE			COMINF-CTMBufManager-0109
+PRINT ------------------------------
+PRINT
+
+PRINT Test 07: TrimStart the chain on the first and only RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0110
+//! @SYMTestCaseID		COMINF-CTMBufManager-0110
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest07 z:\testdata\configs\MBufTest07-1st.ini
+END_TESTCASE			COMINF-CTMBufManager-0110
+PRINT ------------------------------
+PRINT
+
+PRINT Test 07: TrimStart the chain on the boundary of the 1st & 2nd RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0111
+//! @SYMTestCaseID		COMINF-CTMBufManager-0111
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest07 z:\testdata\configs\MBufTest07-2nd.ini
+END_TESTCASE			COMINF-CTMBufManager-0111
+PRINT ------------------------------
+PRINT
+
+PRINT Test 07: TrimStart the chain (containing 3 RMBufs) on the 2nd RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0112
+//! @SYMTestCaseID		COMINF-CTMBufManager-0112
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest07 z:\testdata\configs\MBufTest07-3rd.ini
+END_TESTCASE			COMINF-CTMBufManager-0112
+PRINT ------------------------------
+PRINT
+
+PRINT Test 08: TrimEnd the chain on the first and only RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0113
+//! @SYMTestCaseID		COMINF-CTMBufManager-0113
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest08 z:\testdata\configs\MBufTest08-1st.ini
+END_TESTCASE			COMINF-CTMBufManager-0113
+PRINT ------------------------------
+PRINT
+
+PRINT Test 08: TrimEnd the chain on the boundary of the 1st & 2nd RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0114
+//! @SYMTestCaseID		COMINF-CTMBufManager-0114
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest08 z:\testdata\configs\MBufTest08-2nd.ini
+END_TESTCASE			COMINF-CTMBufManager-0114
+PRINT ------------------------------
+PRINT
+
+PRINT Test 08: TrimEnd the chain (containing 3 RMBufs) on the 2nd RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0115
+//! @SYMTestCaseID		COMINF-CTMBufManager-0115
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest08 z:\testdata\configs\MBufTest08-3rd.ini
+END_TESTCASE			COMINF-CTMBufManager-0115
+PRINT ------------------------------
+PRINT
+
+
+PRINT Test 09: Align - already aligned and fits
+START_TESTCASE			COMINF-CTMBufManager-0116
+//! @SYMTestCaseID		COMINF-CTMBufManager-0116
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest09 z:\testdata\configs\MBufTest09-1st.ini
+END_TESTCASE			COMINF-CTMBufManager-0116
+PRINT ------------------------------
+PRINT
+
+PRINT Test 09: Align - not aligned but fits
+START_TESTCASE			COMINF-CTMBufManager-0117
+//! @SYMTestCaseID		COMINF-CTMBufManager-0117
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest09 z:\testdata\configs\MBufTest09-2nd.ini
+END_TESTCASE			COMINF-CTMBufManager-0117
+PRINT ------------------------------
+PRINT
+
+PRINT Test 09: Align - already aligned but does not fit
+START_TESTCASE			COMINF-CTMBufManager-0118
+//! @SYMTestCaseID		COMINF-CTMBufManager-0118
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest09 z:\testdata\configs\MBufTest09-3rd.ini
+END_TESTCASE			COMINF-CTMBufManager-0118
+PRINT ------------------------------
+PRINT
+
+PRINT Test 09: Align - not aligned, does not fit
+START_TESTCASE			COMINF-CTMBufManager-0119
+//! @SYMTestCaseID		COMINF-CTMBufManager-0119
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest09 z:\testdata\configs\MBufTest09-4th.ini
+END_TESTCASE			COMINF-CTMBufManager-0119
+PRINT ------------------------------
+PRINT
+
+PRINT Test 09: Align - not aligned, does not fit and it should free a RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0120
+//! @SYMTestCaseID		COMINF-CTMBufManager-0120
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest09 z:\testdata\configs\MBufTest09-5th.ini
+END_TESTCASE			COMINF-CTMBufManager-0120
+PRINT ------------------------------
+PRINT
+
+PRINT Test 10: CopyL 
+START_TESTCASE			COMINF-CTMBufManager-0121
+//! @SYMTestCaseID		COMINF-CTMBufManager-0121
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest10 z:\testdata\configs\MBufTest10-1st.ini
+END_TESTCASE			COMINF-CTMBufManager-0121
+PRINT ------------------------------
+PRINT
+
+PRINT Test 11: Async alloc 
+START_TESTCASE			COMINF-CTMBufManager-0122
+//! @SYMTestCaseID		COMINF-CTMBufManager-0122
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest11
+END_TESTCASE			COMINF-CTMBufManager-0122
+PRINT ------------------------------
+PRINT
+
+PRINT Test 12: General test 
+START_TESTCASE			COMINF-CTMBufManager-0123
+//! @SYMTestCaseID		COMINF-CTMBufManager-0123
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest12
+END_TESTCASE			COMINF-CTMBufManager-0123
+PRINT ------------------------------
+PRINT
+
+PRINT Test 13: Performance test 
+START_TESTCASE			COMINF-CTMBufManager-0124
+//! @SYMTestCaseID		COMINF-CTMBufManager-0124
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest13 z:\testdata\configs\MBufTest13-1st.ini
+END_TESTCASE			COMINF-CTMBufManager-0124
+PRINT ------------------------------
+PRINT
+
+PRINT Test 14: Heap Free Check 
+START_TESTCASE			COMINF-CTMBufManager-0125
+//! @SYMTestCaseID		COMINF-CTMBufManager-0125
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest14
+END_TESTCASE			COMINF-CTMBufManager-0125
+PRINT ------------------------------
+PRINT
+
+PRINT Test 15: Concurency
+START_TESTCASE			COMINF-CTMBufManager-0126
+//! @SYMTestCaseID		COMINF-CTMBufManager-0126
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest15
+END_TESTCASE			COMINF-CTMBufManager-0126
+PRINT ------------------------------
+PRINT
+
+PRINT Test 16: MemoryFull
+START_TESTCASE			COMINF-CTMBufManager-0127
+//! @SYMTestCaseID		COMINF-CTMBufManager-0127
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest16
+END_TESTCASE			COMINF-CTMBufManager-0127
+PRINT ------------------------------
+PRINT
+
+PRINT Test 17: Request Size Limit test
+START_TESTCASE			COMINF-CTMBufManager-0128
+//! @SYMTestCaseID		COMINF-CTMBufManager-0128
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest17
+END_TESTCASE			COMINF-CTMBufManager-0128
+PRINT ------------------------------
+PRINT
+
+PRINT Test 18: Exhaust Middle Size Pools test
+START_TESTCASE			COMINF-CTMBufManager-0129
+//! @SYMTestCaseID		COMINF-CTMBufManager-0129
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest18
+END_TESTCASE			COMINF-CTMBufManager-0129
+PRINT ------------------------------
+PRINT
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/scripts/te_mbuftest.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,310 @@
+//
+// 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: 
+//
+//! @file
+//! @SYMTestSuiteName COMMS-MBUFMGR
+//! @SYMScriptTestEnvironment Standard Symbian HRP or emulator environment
+
+//RUN_SCRIPT 102.script
+PRINT TE_CTMBufMgr: Group test 
+PRINT ------------------------------
+PRINT
+
+LOAD_SUITE te_ctmbufmgr
+PRINT ------------------------------
+PRINT
+
+PRINT Test 01: Create/Delete MBufMgr
+START_TESTCASE			COMINF-CTMBufManager-0101
+//! @SYMTestCaseID		COMINF-CTMBufManager-0101
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest01
+END_TESTCASE			COMINF-CTMBufManager-0101
+PRINT ------------------------------
+PRINT
+
+PRINT Test 02: Alloc/Dealloc RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0102
+//! @SYMTestCaseID		COMINF-CTMBufManager-0102
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest02
+END_TESTCASE			COMINF-CTMBufManager-0102
+PRINT ------------------------------
+PRINT
+
+PRINT Test 03: Alloc/Dealloc RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0103
+//! @SYMTestCaseID		COMINF-CTMBufManager-0103
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest03
+END_TESTCASE			COMINF-CTMBufManager-0103
+PRINT ------------------------------
+PRINT
+
+PRINT Test 04: CopyIn/Out 
+START_TESTCASE			COMINF-CTMBufManager-0104
+//! @SYMTestCaseID		COMINF-CTMBufManager-0104
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest04
+END_TESTCASE			COMINF-CTMBufManager-0104
+PRINT ------------------------------
+PRINT
+
+PRINT Test 05: CopyIn/Out with Offset 
+START_TESTCASE			COMINF-CTMBufManager-0105
+//! @SYMTestCaseID		COMINF-CTMBufManager-0105
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest05 z:\testdata\configs\MBufTest05-CopyIn.ini
+END_TESTCASE			COMINF-CTMBufManager-0105
+PRINT ------------------------------
+PRINT
+
+PRINT Test 05: CopyIn/Out with Offset 
+START_TESTCASE			COMINF-CTMBufManager-0106
+//! @SYMTestCaseID		COMINF-CTMBufManager-0106
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest05 z:\testdata\configs\MBufTest05-CopyOut.ini
+END_TESTCASE			COMINF-CTMBufManager-0106
+PRINT ------------------------------
+PRINT
+
+PRINT Test 06: Split the chain on the first and only RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0107
+//! @SYMTestCaseID		COMINF-CTMBufManager-0107
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest06 z:\testdata\configs\MBufTest06-1st.ini
+END_TESTCASE			COMINF-CTMBufManager-0107
+PRINT ------------------------------
+PRINT
+
+PRINT Test 06: Split the chain on the boundary of the 1st & 2nd RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0108
+//! @SYMTestCaseID		COMINF-CTMBufManager-0108
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest06 z:\testdata\configs\MBufTest06-2nd.ini
+END_TESTCASE			COMINF-CTMBufManager-0108
+PRINT ------------------------------
+PRINT
+
+START_TESTCASE			COMINF-MBUFMGR-0602
+//! @SYMTestCaseID		COMINF-MBUFMGR-0602
+PRINT Test 06: Split the chain (containing 3 RMBufs) on the 2nd RMBuf
+HANDLES_MARK
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest06 z:\testdata\configs\MBufTest06-3rd.ini
+HANDLES_CHECK
+TEST_COMPLETE
+PRINT ------------------------------
+PRINT
+END_TESTCASE			COMINF-MBUFMGR-0602
+
+START_TESTCASE			COMINF-MBUFMGR-0603
+//! @SYMTestCaseID		COMINF-MBUFMGR-0603
+PRINT Test 06: Split a chain of big bufs when only small reamaining
+HANDLES_MARK
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest06 z:\testdata\configs\MBufTest06-4th.ini
+TEST_COMPLETE
+HANDLES_CHECK
+PRINT ------------------------------
+PRINT
+END_TESTCASE			COMINF-MBUFMGR-0603
+
+PRINT Test 07: TrimStart the chain on the first and only RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0110
+//! @SYMTestCaseID		COMINF-CTMBufManager-0110
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest07 z:\testdata\configs\MBufTest07-1st.ini
+END_TESTCASE			COMINF-CTMBufManager-0110
+PRINT ------------------------------
+PRINT
+
+PRINT Test 07: TrimStart the chain on the boundary of the 1st & 2nd RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0111
+//! @SYMTestCaseID		COMINF-CTMBufManager-0111
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest07 z:\testdata\configs\MBufTest07-2nd.ini
+END_TESTCASE			COMINF-CTMBufManager-0111
+PRINT ------------------------------
+PRINT
+
+PRINT Test 07: TrimStart the chain (containing 3 RMBufs) on the 2nd RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0112
+//! @SYMTestCaseID		COMINF-CTMBufManager-0112
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest07 z:\testdata\configs\MBufTest07-3rd.ini
+END_TESTCASE			COMINF-CTMBufManager-0112
+PRINT ------------------------------
+PRINT
+
+PRINT Test 08: TrimEnd the chain on the first and only RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0113
+//! @SYMTestCaseID		COMINF-CTMBufManager-0113
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest08 z:\testdata\configs\MBufTest08-1st.ini
+END_TESTCASE			COMINF-CTMBufManager-0113
+PRINT ------------------------------
+PRINT
+
+PRINT Test 08: TrimEnd the chain on the boundary of the 1st & 2nd RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0114
+//! @SYMTestCaseID		COMINF-CTMBufManager-0114
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest08 z:\testdata\configs\MBufTest08-2nd.ini
+END_TESTCASE			COMINF-CTMBufManager-0114
+PRINT ------------------------------
+PRINT
+
+PRINT Test 08: TrimEnd the chain (containing 3 RMBufs) on the 2nd RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0115
+//! @SYMTestCaseID		COMINF-CTMBufManager-0115
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest08 z:\testdata\configs\MBufTest08-3rd.ini
+END_TESTCASE			COMINF-CTMBufManager-0115
+PRINT ------------------------------
+PRINT
+
+
+PRINT Test 09: Align - already aligned and fits
+START_TESTCASE			COMINF-CTMBufManager-0116
+//! @SYMTestCaseID		COMINF-CTMBufManager-0116
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest09 z:\testdata\configs\MBufTest09-1st.ini
+END_TESTCASE			COMINF-CTMBufManager-0116
+PRINT ------------------------------
+PRINT
+
+PRINT Test 09: Align - not aligned but fits
+START_TESTCASE			COMINF-CTMBufManager-0117
+//! @SYMTestCaseID		COMINF-CTMBufManager-0117
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest09 z:\testdata\configs\MBufTest09-2nd.ini
+END_TESTCASE			COMINF-CTMBufManager-0117
+PRINT ------------------------------
+PRINT
+
+PRINT Test 09: Align - already aligned but does not fit
+START_TESTCASE			COMINF-CTMBufManager-0118
+//! @SYMTestCaseID		COMINF-CTMBufManager-0118
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest09 z:\testdata\configs\MBufTest09-3rd.ini
+END_TESTCASE			COMINF-CTMBufManager-0118
+PRINT ------------------------------
+PRINT
+
+PRINT Test 09: Align - not aligned, does not fit
+START_TESTCASE			COMINF-CTMBufManager-0119
+//! @SYMTestCaseID		COMINF-CTMBufManager-0119
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest09 z:\testdata\configs\MBufTest09-4th.ini
+END_TESTCASE			COMINF-CTMBufManager-0119
+PRINT ------------------------------
+PRINT
+
+PRINT Test 09: Align - not aligned, does not fit and it should free a RMBuf
+START_TESTCASE			COMINF-CTMBufManager-0120
+//! @SYMTestCaseID		COMINF-CTMBufManager-0120
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest09 z:\testdata\configs\MBufTest09-5th.ini
+END_TESTCASE			COMINF-CTMBufManager-0120
+PRINT ------------------------------
+PRINT
+
+PRINT Test 10: CopyL 
+START_TESTCASE			COMINF-CTMBufManager-0121
+//! @SYMTestCaseID		COMINF-CTMBufManager-0121
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest10 z:\testdata\configs\MBufTest10-1st.ini
+END_TESTCASE			COMINF-CTMBufManager-0121
+PRINT ------------------------------
+PRINT
+
+PRINT Test 11: Async alloc 
+START_TESTCASE			COMINF-CTMBufManager-0122
+//! @SYMTestCaseID		COMINF-CTMBufManager-0122
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest11
+END_TESTCASE			COMINF-CTMBufManager-0122
+PRINT ------------------------------
+PRINT
+
+PRINT Test 12: General test 
+START_TESTCASE			COMINF-CTMBufManager-0123
+//! @SYMTestCaseID		COMINF-CTMBufManager-0123
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest12
+END_TESTCASE			COMINF-CTMBufManager-0123
+PRINT ------------------------------
+PRINT
+
+PRINT Test 13: Performance test 
+START_TESTCASE			COMINF-CTMBufManager-0124
+//! @SYMTestCaseID		COMINF-CTMBufManager-0124
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest13 z:\testdata\configs\MBufTest13-1st.ini
+END_TESTCASE			COMINF-CTMBufManager-0124
+PRINT ------------------------------
+PRINT
+
+PRINT Test 14: Heap Free Check 
+START_TESTCASE			COMINF-CTMBufManager-0125
+//! @SYMTestCaseID		COMINF-CTMBufManager-0125
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest14
+END_TESTCASE			COMINF-CTMBufManager-0125
+PRINT ------------------------------
+PRINT
+
+PRINT Test 15: Concurency
+START_TESTCASE			COMINF-CTMBufManager-0126
+//! @SYMTestCaseID		COMINF-CTMBufManager-0126
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest15
+END_TESTCASE			COMINF-CTMBufManager-0126
+PRINT ------------------------------
+PRINT
+
+PRINT Test 16: MemoryFull
+START_TESTCASE			COMINF-CTMBufManager-0127
+//! @SYMTestCaseID		COMINF-CTMBufManager-0127
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest16
+END_TESTCASE			COMINF-CTMBufManager-0127
+PRINT ------------------------------
+PRINT
+
+PRINT Test 17: Request Size Limit test
+START_TESTCASE			COMINF-CTMBufManager-0128
+//! @SYMTestCaseID		COMINF-CTMBufManager-0128
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest17
+END_TESTCASE			COMINF-CTMBufManager-0128
+PRINT ------------------------------
+PRINT
+
+PRINT Test 18: Exhaust Middle Size Pools test
+START_TESTCASE			COMINF-CTMBufManager-0129
+//! @SYMTestCaseID		COMINF-CTMBufManager-0129
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest18
+END_TESTCASE			COMINF-CTMBufManager-0129
+PRINT ------------------------------
+PRINT
+
+PRINT Test 19: Prepend
+START_TESTCASE			COMINF-CTMBufManager-0130
+//! @SYMTestCaseID		COMINF-CTMBufManager-0130
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest19
+END_TESTCASE			COMINF-CTMBufManager-0130
+PRINT ------------------------------
+PRINT
+
+PRINT Test 20: PoolCeilingMemoryFull
+START_TESTCASE			COMINF-MBUFMGR-0131
+//! @SYMTestCaseID		COMINF-MBUFMGR-0131
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest20
+END_TESTCASE			COMINF-MBUFMGR-0131
+PRINT ------------------------------
+
+PRINT Test 21: commsbufsmiscellaneous
+START_TESTCASE			COMINF-MBUFMGR-0132
+//! @SYMTestCaseID		COMINF-MBUFMGR-0132
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest21
+END_TESTCASE			COMINF-MBUFMGR-0132
+PRINT ------------------------------
+
+PRINT Test 22: Append
+START_TESTCASE			COMINF-MBUFMGR-0133
+//! @SYMTestCaseID		COMINF-MBUFMGR-0133
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest22
+END_TESTCASE			COMINF-MBUFMGR-0133
+PRINT ------------------------------
+
+PRINT Test 23: RMBufQ
+START_TESTCASE			COMINF-MBUFMGR-0134
+//! @SYMTestCaseID		COMINF-MBUFMGR-0134
+RUN_TEST_STEP 10000 te_ctmbufmgr MBufMgrTest23
+END_TESTCASE			COMINF-MBUFMGR-0134
+PRINT ------------------------------
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/TE_mbufmgrServer.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,180 @@
+/**
+ * Copyright (c) Symbian Ltd 2008
+ *
+ * @file TE_mbufmgrServer.cpp
+ *
+ * Example file/test code to demonstrate how to develop a TestExecute Server
+ * Developers should take this project as a template and substitute their own
+ * code at the __EDIT_ME__ tags
+ *
+ * for (WINS && !EKA2) versions will be xxxServer.Dll and require a thread to be started
+ * in the process of the client. The client initialises the server by calling the
+ * one and only ordinal.
+ */
+#include "TE_mbufmgrServer.h"
+#include "TestStepCTMbufmgr.h"
+
+#include "Test01CreateDeleteMBufMgr.h"
+#include "Test02AllocDealloc.h"
+#include "Test03AllocLeave.h"
+#include "Test04CopyInOut.h"
+#include "Test05CopyInOutOffset.h"
+#include "Test06SplitL.h"
+#include "Test07TrimStart.h"
+#include "Test08TrimEnd.h"
+#include "Test09Align.h"
+#include "Test10CopyL.h"
+#include "Test11AsyncAlloc.h"
+#include "Test12General.h"
+#include "Test13Performance.h"
+#include "Test14HeapFreeCheck.h"
+#include "Test15Concurrency.h"
+#include "test16memoryfull.h"
+#include "test17requestsizelimits.h"
+#include "test18exhaustmidsizepools.h"
+#include "test19prepend.h"
+#include "test20poolceilingfull.h"
+#include "test21commsbufs.h"
+#include "Test22Append.h"
+#include "Test23RMBufQ.h"
+
+EXPORT_C CTE_mbufmgrServer* NewMbufmgrServer( void ) 
+	{ 
+	return new (ELeave) CTE_mbufmgrServer;
+	}
+	
+// __EDIT_ME__ - Substitute the name of your test server 
+_LIT(KServerName,"te_ctmbufmgr");
+// __EDIT_ME__ - Use your own server class name
+CTE_mbufmgrServer* CTE_mbufmgrServer::NewL()
+/**
+ * @return - Instance of the test server
+ * Called inside the MainL() function to create and start the
+ * CTestServer derived server.
+ */
+	{
+	// __EDIT_ME__ new your server class here
+	CTE_mbufmgrServer * server = new (ELeave) CTE_mbufmgrServer();
+	CleanupStack::PushL(server);
+	
+	// Either use a StartL or ConstructL, the latter will permit
+	// Server Logging.
+
+	//server->StartL(KServerName); 
+	server->ConstructL(KServerName);
+	CleanupStack::Pop(server);
+	return server;
+	}
+
+// EKA2 much simpler
+// Just an E32Main and a MainL()
+LOCAL_C void MainL()
+/**
+ * Much simpler, uses the new Rendezvous() call to sync with the client
+ */
+	{
+	// Leave the hooks in for platform security
+#if (defined __DATA_CAGING__)
+	RProcess().DataCaging(RProcess::EDataCagingOn);
+	RProcess().SecureApi(RProcess::ESecureApiOn);
+#endif
+	CActiveScheduler* sched=NULL;
+	sched=new(ELeave) CActiveScheduler;
+	CActiveScheduler::Install(sched);
+	// __EDIT_ME__ Your server name
+	CTE_mbufmgrServer* server = NULL;
+	// Create the CTestServer derived server
+	// __EDIT_ME__ Your server name
+	TRAPD(err,server = CTE_mbufmgrServer::NewL());
+	if(!err)
+		{
+		// Sync with the client and enter the active scheduler
+		RProcess::Rendezvous(KErrNone);
+		sched->Start();
+		}
+	delete server;
+	delete sched;
+	}
+
+// Only a DLL on emulator for typhoon and earlier
+
+GLDEF_C TInt E32Main()
+/**
+ * @return - Standard Epoc error code on exit
+ */
+	{
+	CTrapCleanup* cleanup = CTrapCleanup::New();
+	if(cleanup == NULL)
+		{
+		return KErrNoMemory;
+		}
+	TRAP_IGNORE(MainL());
+	delete cleanup;
+	return KErrNone;
+    }
+
+// Create a thread in the calling process
+// Emulator typhoon and earlier
+
+// __EDIT_ME__ - Use your own server class name
+CTestStep* CTE_mbufmgrServer::CreateTestStep(const TDesC& aStepName)
+/**
+ * @return - A CTestStep derived instance
+ * Implementation of CTestServer pure virtual
+ */
+	{
+	CTestStep* testStep = NULL;
+	// __EDIT_ME__ - Create your own test steps here
+	// This server creates just one step but create as many as you want
+	// They are created "just in time" when the worker thread is created
+
+	if(aStepName.Compare(_L("MBufMgrTest01")) == 0 )
+		testStep = new(ELeave) CTest01CreateDeleteMBufMgr;
+	else if(aStepName.Compare(_L("MBufMgrTest02")) == 0 )
+		testStep = new(ELeave) CTest02AllocDealloc;
+	else if(aStepName.Compare(_L("MBufMgrTest03")) == 0 )
+		testStep = new(ELeave) CTest03AllocLeave;
+	else if(aStepName.Compare(_L("MBufMgrTest04")) == 0 )
+		testStep = new(ELeave) CTest04CopyInOut;
+	else if(aStepName.Compare(_L("MBufMgrTest05")) == 0 )
+		testStep = new(ELeave) CTest05CopyInOutOffset;
+	else if(aStepName.Compare(_L("MBufMgrTest06")) == 0 )
+		testStep = new(ELeave) CTest06Split;	
+	else if(aStepName.Compare(_L("MBufMgrTest07")) == 0 )
+		testStep = new(ELeave) CTest07TrimStart;
+	else if(aStepName.Compare(_L("MBufMgrTest08")) == 0 )
+		testStep = new(ELeave) CTest08TrimEnd;
+	else if(aStepName.Compare(_L("MBufMgrTest09")) == 0 )
+		testStep = new(ELeave) CTest09Align;
+	else if(aStepName.Compare(_L("MBufMgrTest10")) == 0 )
+		testStep = new(ELeave) CTest10Copy;
+	else if(aStepName.Compare(_L("MBufMgrTest11")) == 0 )
+		testStep = new(ELeave) CTest11AsyncAlloc;
+	else if(aStepName.Compare(_L("MBufMgrTest12")) == 0 )
+		testStep = new(ELeave) CTest12General;
+	else if(aStepName.Compare(_L("MBufMgrTest13")) == 0 )
+		testStep = new(ELeave) CTest13Performance;
+	else if(aStepName.Compare(_L("MBufMgrTest14")) == 0 )
+		testStep = new(ELeave) CTest14HeapFreeCheck;
+	else if(aStepName.Compare(_L("MBufMgrTest15")) == 0 )
+		testStep = new(ELeave) CTest15Concurrency;
+	else if(aStepName.Compare(_L("MBufMgrTest16")) == 0 )
+		testStep = new(ELeave) CTest16MemoryFull;
+	else if(aStepName.Compare(_L("MBufMgrTest17")) == 0 )
+		testStep = new(ELeave) CTest17RequestSizeLimits;
+	else if(aStepName.Compare(_L("MBufMgrTest18")) == 0 )
+		testStep = new(ELeave) CTest18ExhaustMidSizePools;
+	else if(aStepName.Compare(_L("MBufMgrTest19")) == 0 )
+		testStep = new(ELeave) CTest19Prepend;
+	else if(aStepName.Compare(_L("MBufMgrTest20")) == 0 )
+		testStep = new(ELeave) CTest20PoolCeilingFull;
+	else if(aStepName.Compare(_L("MBufMgrTest21")) == 0 )
+		testStep = new(ELeave) CTest21CommsBufs;
+	else if(aStepName.Compare(_L("MBufMgrTest22")) == 0 )
+		testStep = new(ELeave) CTest22Append;
+	else if(aStepName.Compare(_L("MBufMgrTest23")) == 0 )
+		testStep = new(ELeave) CTest23RMBufQ;
+
+	return testStep;
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test01CreateDeleteMBufMgr.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,65 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 01 to Create & destroy RMBufManager
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+
+#include "Test01CreateDeleteMBufMgr.h"
+#include <comms-infras/commsbufpond.h>
+
+// constructor
+CTest01CreateDeleteMBufMgr::CTest01CreateDeleteMBufMgr()
+	{
+	SetTestStepName(_L("MBufMgrTest01"));// Store the name of this test case
+	}
+
+// destructor
+CTest01CreateDeleteMBufMgr::~CTest01CreateDeleteMBufMgr() 
+	{
+	}
+
+// 
+enum TVerdict CTest01CreateDeleteMBufMgr::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+	//-------------- substep 1 -------------------- 
+	INFO_PRINTF1(_L("  01 Create CMBufManager and install active scheduler: blh blah blha"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
+
+	//-------------- substep 2 -------------------- 
+	INFO_PRINTF1(_L("  02 Clean up stack:"));
+    iBufPond.Close();
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+
+        SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test02AllocDealloc.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,114 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 02 Allocate/Dealocate RMBuf
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+#include "Test02AllocDealloc.h"
+#include <comms-infras/commsbufpond.h>
+
+// constructor
+CTest02AllocDealloc::CTest02AllocDealloc()
+	{
+	SetTestStepName(_L("MBufMgrTest02"));// Store the name of this test case
+	}
+
+// destructor
+CTest02AllocDealloc::~CTest02AllocDealloc() 
+	{
+	}
+
+// 
+enum TVerdict CTest02AllocDealloc::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+	//-------------- substep 1 -------------------- 
+	INFO_PRINTF1(_L("  01 Create CMBufManager and install active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
+	CleanupClosePushL(iBufPond);
+
+	TBool firstFail = EFalse;
+	TBool secondFail = EFalse;
+
+	//-------------- substep 2 -------------------- 
+	INFO_PRINTF1(_L("  02 Allocate 5000-bytes long RMBuf:"));
+	RMBuf* buf=static_cast<RMBuf*>(iBufPond.Alloc(5000, 0, KMaxTInt));
+	if (buf == NULL)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't allocate RMBuf:"));
+		firstFail = ETrue;
+		}
+	else
+		{
+		//-------------- substep 3 -------------------- 
+		INFO_PRINTF1(_L("  03 Deallocating RMBuf"));
+		buf->Free();
+		}
+	//-------------- substep 4 --------------------
+	INFO_PRINTF1(_L("  04 Allocate 0-byte long RMBuf:"));
+	buf = static_cast<RMBuf*>(iBufPond.Alloc(0, 0, KMaxTInt));
+	if (buf == NULL)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't allocate RMBuf:"));
+		secondFail = ETrue;
+		}
+	else
+		{
+		//-------------- substep 5 --------------------
+		_LIT(aLog1, "  05 Allocated RMBuf size : %d");
+		INFO_PRINTF2(aLog1, buf->Size());
+		if (buf->Length() != 0)
+			{
+			_LIT(aLog2, "Error: RMBuf length : %d ");
+			INFO_PRINTF2(aLog2, buf->Length());
+			secondFail = ETrue;
+			}
+		else
+			{
+			_LIT(aLog3, "  Info: RMBuf length : %d ");
+			INFO_PRINTF2(aLog3, buf->Length());
+			}
+		//-------------- substep 6 --------------------
+		INFO_PRINTF1(_L("  06 Deallocating RMBuf"));
+		buf->Free();
+		}
+	//-------------- substep 7 --------------------
+	INFO_PRINTF1(_L("  07 Clean up stack:"));
+    CleanupStack::PopAndDestroy();  // iBufPond
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+
+    if (firstFail || secondFail)
+    	{
+    	SetTestStepResult(EFail);
+    	return TestStepResult();
+    	}
+
+	SetTestStepResult(EPass);
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test03AllocLeave.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,102 @@
+// Copyright (c) 2008 Symbian Ltd.  All rights reserved.
+//
+//
+// Contributors:
+//
+// Description:
+// Contains MBufMgr Test Step 03
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+
+#include "Test03AllocLeave.h"
+#include <comms-infras/commsbufpond.h>
+
+// constructor
+CTest03AllocLeave::CTest03AllocLeave()
+	{
+	SetTestStepName(_L("MBufMgrTest03"));// Store the name of this test case
+	}
+
+// destructor
+CTest03AllocLeave::~CTest03AllocLeave() 
+	{
+	}
+
+// 
+enum TVerdict CTest03AllocLeave::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+	//-------------- substep 1 -------------------- 
+	INFO_PRINTF1(_L("  01 Create CMBufManager (with 15K alloc memory) and install active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+
+	CreateInstanceMBufMgrL(65536);
+	CleanupClosePushL(iBufPond);
+	//-------------- substep 2 --------------------
+	RMBuf* mbufs[14];
+	TInt i;
+	INFO_PRINTF1(_L("  02 Allocate 42000-bytes long worth of mbufs"));
+	for (i = 0; i < sizeof(mbufs)/sizeof(mbufs[0]); ++i)
+		{
+		mbufs[i] = static_cast<RMBuf*>(iBufPond.Alloc(3000, 0, KMaxTInt));
+		if (mbufs[i] == NULL)
+			{
+			INFO_PRINTF1(_L("Error: Couldn't allocate RMBuf:"));
+			User::Leave(EFail);
+			}	
+		}
+	
+
+	//-------------- substep 3 -------------------- 
+	INFO_PRINTF1(_L("  03 Allocate 8192-bytes long RMBuf2:"));
+	RMBuf* aMBuf2 = NULL;
+	RMBufChain chain;
+	TInt ret;
+	TRAP(ret,chain.AllocL(16384);)
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Info: Couldn't allocate RMBuf as it should be so."));
+		if (ret == KErrNoMBufs)
+			{
+			SetTestStepResult(EPass);
+			}
+		else
+			{
+			INFO_PRINTF2(_L("Error: The reason AllocL has failed with %d"),KErrNoMBufs);
+			SetTestStepResult(EFail);
+
+			}
+		}
+	//INFO_PRINTF2(_L("  Heap Size after failed alloc %d"),iMBMngr->__DbgGetHeapSize());
+	// Cleanup .
+	//-------------- substep 4 -------------------- 
+	INFO_PRINTF1(_L("  04 Deallocate RMBufs (1, 2 & 3):"));
+	for (i = 0; i < sizeof(mbufs)/sizeof(mbufs[0]); ++i)
+		{
+		mbufs[i]->Free();
+		}
+
+	if (aMBuf2 != NULL)
+		aMBuf2->Free();
+
+	//-------------- substep 5 -------------------- 
+	INFO_PRINTF1(_L("  05 Clean up stack:"));
+    CleanupStack::PopAndDestroy();
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+	return TestStepResult();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test04CopyInOut.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,109 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 04 for CopyIn() & CopyOut() methods
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+
+#include "Test04CopyInOut.h"
+#include <comms-infras/commsbufpond.h>
+// constructor
+CTest04CopyInOut::CTest04CopyInOut()
+	{
+	SetTestStepName(_L("MBufMgrTest04"));// Store the name of this test case
+	}
+
+// destructor
+CTest04CopyInOut::~CTest04CopyInOut() 
+	{
+	}
+
+// 
+enum TVerdict CTest04CopyInOut::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+	//-------------- substep 1 -------------------- 
+	INFO_PRINTF1(_L("  01 Create CMBufManager and install active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
+	CleanupClosePushL(iBufPond);
+
+	//-------------- substep 2 -------------------- 
+	INFO_PRINTF1(_L("  02 Allocate two 5000-bytes long descriptors (Des1 & Des2):"));
+	TBuf8<5000> *aDes1, *aDes2;
+    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<5000> );
+    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<5000> );
+	aDes1->SetLength(5000);
+	aDes2->SetLength(5000);
+
+	//-------------- substep 3 -------------------- 
+	INFO_PRINTF1(_L("  03 Fill in the Des1 with a pattern:"));
+	StripeDes(*aDes1, 0, 5000, '@', 'Z');
+	
+	//-------------- substep 4 -------------------- 
+	INFO_PRINTF1(_L("  04 Allocate 5000-bytes long RMBufChain:"));
+	RMBufChain aChain;
+	TRAPD(ret,aChain.AllocL(5000));
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't allocate RMBuf:"));
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 5 -------------------- 
+	INFO_PRINTF1(_L("  05 Copy in Des1 into Chain:"));
+    aChain.CopyIn(*aDes1);
+
+	//-------------- substep 6 -------------------- 
+	INFO_PRINTF1(_L("  06 Fill in Des2 with zeros:"));
+	StripeDes(*aDes2, 0, 5000, 0, 0);
+
+	//-------------- substep 7 -------------------- 
+	INFO_PRINTF1(_L("  07 Copy out Chain into Des2:"));
+    aChain.CopyOut(*aDes2);
+
+	//-------------- substep 8 -------------------- 
+	INFO_PRINTF1(_L("  08 Compare the contents of Des1 & Des2:"));
+	if(aDes1->Compare(*aDes2))
+		{
+		INFO_PRINTF1(_L("Error: The content is not the same"));
+		aChain.Free();
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 9 -------------------- 
+	INFO_PRINTF1(_L("  09 Free chain. Clean up stack:"));
+	aChain.Free();
+    CleanupStack::PopAndDestroy(aDes2);
+    CleanupStack::PopAndDestroy(aDes1);
+    CleanupStack::PopAndDestroy();
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+        SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test05CopyInOutOffset.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,166 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 05 for CopyIn() & CopyOut() methods with offset
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+
+#include "Test05CopyInOutOffset.h"
+#include <comms-infras/commsbufpond.h>
+// constructor
+CTest05CopyInOutOffset::CTest05CopyInOutOffset()
+	{
+	SetTestStepName(_L("MBufMgrTest05"));// Store the name of this test case
+	}
+
+// destructor
+CTest05CopyInOutOffset::~CTest05CopyInOutOffset() 
+	{
+	}
+
+// 
+enum TVerdict CTest05CopyInOutOffset::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+	//-------------- substep 0 -------------------- 
+	bool aTest; 
+	INFO_PRINTF1(_L("  00 Read from script which test to run:"));
+	TPtrC aPtrResult;
+	TInt bRet = GetStringFromConfig(_L("MBufMgrTest05"), _L("test"), aPtrResult);
+	if (!bRet)
+		{
+		return EFail;
+		}
+
+	if      (aPtrResult==_L("CopyIn" )) 
+		{
+		aTest = true;
+	 	INFO_PRINTF1(_L("     ------------ Copy In Test starts ---------------:"));
+		}
+	else if (aPtrResult==_L("CopyOut")) 
+		{
+		aTest = false;
+	 	INFO_PRINTF1(_L("     ------------ Copy Out Test starts --------------:"));
+		}
+	else 
+		{
+		INFO_PRINTF1(_L("Failed to read test case - there should be either CopyIn or CopyOut - case sensitive"));
+         SetTestStepResult(EFail);
+
+		return TestStepResult();  
+		}
+
+	//-------------- substep 1 -------------------- 
+	INFO_PRINTF1(_L("  01 Create CMBufManager and install active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
+	CleanupClosePushL(iBufPond);
+
+	//-------------- substep 2 --------------------
+	INFO_PRINTF1(_L("  02 Allocate two 5000-bytes long descriptors (Des1 & Des2):"));
+	TBuf8<5000> *aDes1, *aDes2;
+    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<5000> );
+    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<5000> );
+	aDes1->SetLength(5000);
+	aDes2->SetLength(5000);
+
+	//-------------- substep 3 -------------------- 
+	INFO_PRINTF1(_L("  03 Allocate 5000-bytes long RMBufChain:"));
+	RMBufChain aChain;
+	TRAPD(ret,aChain.AllocL(5000));
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't allocate RMBuf:"));
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 4 -------------------- 
+	INFO_PRINTF1(_L("  04 Fill in Des1 with a pattern:"));
+	StripeDes(*aDes1, 0, 5000, '@', 'Z');
+	
+	//-------------- substep 5 -------------------- 
+	INFO_PRINTF1(_L("  05 Fill in Des2 with a patter different then that in Des1:"));
+	StripeDes(*aDes2, 0, 5000, 'a', 'z');
+
+	//-------------- substep 6 -------------------- 
+	INFO_PRINTF1(_L("  06 Fill in Chain with zeros:"));
+    aChain.FillZ();
+
+	if (aTest)
+		{
+	//----------- CopyIn() method check only-----------
+		//-------------- substep 7 -------------------- 
+		INFO_PRINTF1(_L("  07 Copy in the last 4000 bytes of Des1 into the last 4000 of Chain:"));
+		aChain.CopyIn(aDes1->Mid(1000),1000);
+
+		//-------------- substep 8 -------------------- 
+		INFO_PRINTF1(_L("  08 Copy out Chain into Des2:"));
+		aChain.CopyOut(*aDes2);
+
+		//-------------- substep 9 -------------------- 
+		INFO_PRINTF1(_L("  09 Fill in the 1st 1000 bytes of Des1 with zeros:"));
+		StripeDes(*aDes1, 0, 1000, '\0', '\0');
+		}
+	else
+		{    
+	//----------- CopyOut() method check unly-----------
+		//-------------- substep 7 -------------------- 
+		INFO_PRINTF1(_L("  07 Copy in Des1 into Chain:"));
+		aChain.CopyIn(*aDes1);
+
+		//-------------- substep 8 -------------------- 
+		INFO_PRINTF1(_L("  08 Fill in the 1st 1000 bytes of Des1 & Des2 with zeros:"));
+		StripeDes(*aDes1, 0, 1000, '\0', '\0');
+		StripeDes(*aDes2, 0, 1000, '\0', '\0');
+
+		//-------------- substep 9 -------------------- 
+		INFO_PRINTF1(_L("  09 Copy out the last 4000 bytes of Chain into last 4000 of Des2:"));
+		TPtr8 dest((TUint8*)aDes2->Ptr()+1000,4000,4000);
+		aChain.CopyOut(dest, 1000);
+		}
+
+	//-------------- substep 10 -------------------- 
+	INFO_PRINTF1(_L("  10 Compare the content of Des1 & Des2:"));
+	if(aDes1->Compare(*aDes2))
+		{
+		aChain.Free();
+		INFO_PRINTF1(_L("Error: The content is not the same"));
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 11 -------------------- 
+	INFO_PRINTF1(_L("  11 Free the chain. Clean up stack:"));
+	aChain.Free();
+    CleanupStack::PopAndDestroy(aDes2);
+    CleanupStack::PopAndDestroy(aDes1);
+    CleanupStack::PopAndDestroy(); // iBufPond
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+        SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test06SplitL.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,243 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 06 for SplitL method
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+
+#include "Test06SplitL.h"
+#include <comms-infras/commsbufpond.h>
+// constructor
+CTest06Split::CTest06Split()
+	{
+	SetTestStepName(_L("MBufMgrTest06"));// Store the name of this test case
+	}
+
+// destructor
+CTest06Split::~CTest06Split()	
+	{
+	}
+
+// 
+enum TVerdict CTest06Split::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+	//-------------- substep 0 -------------------- 
+	INFO_PRINTF1(_L("  00 Read parameters from the script:"));
+	TInt aOffset;// Will contain the position in chain where split action will be done
+	TInt aLength;// Will contain the length of desc & chains in the test
+	TInt bRet = GetIntFromConfig(_L("MBufMgrTest06"), _L("Length"), aLength);
+	if (!bRet) 
+		{
+        SetTestStepResult(EFail);
+
+		return TestStepResult();
+		}
+	bRet = GetIntFromConfig(_L("MBufMgrTest06"), _L("Offset"), aOffset);
+	if (!bRet) 
+		{
+        SetTestStepResult(EFail);
+
+		return TestStepResult();
+		}
+	TBool forceSmallBuf = EFalse;
+    bRet = GetIntFromConfig(_L("MBufMgrTest06"), _L("ForceSmallBuf"), forceSmallBuf);
+ 	INFO_PRINTF2(_L("     ------- Chain & Desc LENGTH   = %d --"), aLength);
+ 	INFO_PRINTF2(_L("     ------- OFFSET where to Split = %d --"), aOffset);
+	if ( (aLength > 1000)    ||(aLength <0) ||
+		 (aOffset > aLength) || (aOffset <0)  )
+		{
+		INFO_PRINTF1(_L("ERROR: Wrong input parameter(s)"));
+         SetTestStepResult(EFail);
+
+		return TestStepResult();
+		}
+
+	//-------------- substep 1 -------------------- 
+	INFO_PRINTF1(_L("  01 Creating CMBufManager and installing active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+
+	enum { KBigBuf = 256, KSmallBuf = 128 };
+	if(forceSmallBuf)
+	    {
+        RArray<TCommsBufPoolCreateInfo> createInfoArray;
+        
+        TCommsBufPoolCreateInfo createInfo;
+        createInfo.iBufSize = KSmallBuf;
+        createInfo.iInitialBufs = 128;
+        createInfo.iGrowByBufs = 64;
+        createInfo.iMinFreeBufs = 40;
+        createInfo.iCeiling = 410; 
+        createInfoArray.AppendL(createInfo);
+        
+        createInfo.iBufSize = KBigBuf;
+        createInfo.iInitialBufs = 3;
+        createInfo.iGrowByBufs = 1;
+        createInfo.iMinFreeBufs = 1;
+        createInfo.iCeiling = 3;
+        createInfoArray.AppendL(createInfo);
+
+        CreateInstanceMBufMgrL(createInfoArray);
+
+        createInfoArray.Close();
+	    }	
+	else
+	    {
+        CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
+	    }
+	
+	CleanupClosePushL(iBufPond);
+
+	//-------------- substep 2 -------------------- 
+	INFO_PRINTF1(_L("  02 Allocating two descriptors (Des1 & Des2):"));
+	TBuf8<1000> *aDes1, *aDes2;
+    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<1000> );
+    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<1000> );
+	aDes1->SetLength(aLength);
+	aDes2->SetLength(aLength);
+
+	//-------------- substep 3 -------------------- 
+	INFO_PRINTF1(_L("  03 Fill in Des1 with a pattern:"));
+	StripeDes(*aDes1, 0, aLength, '@', 'Z');
+	
+	//-------------- substep 4 -------------------- 
+	INFO_PRINTF1(_L("  04 Fill in Des2 with zeros:"));
+	StripeDes(*aDes1, 0, aLength, 0, 0);
+	
+	//-------------- substep 5 -------------------- 
+	INFO_PRINTF1(_L("  05 Allocate Chain1:"));
+	RMBufChain aChain1;
+	TRAPD(ret,aChain1.AllocL(aLength));
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't allocate Chain1:"));
+		User::Leave(EFail);
+		}
+	
+	if(forceSmallBuf)
+	    {
+        for(RMBuf* buf = aChain1.First(); buf; buf = buf->Next())
+            {
+            if(buf->Size() != KBigBuf)
+                {
+                INFO_PRINTF3(_L("-- initial chain should be composed of %d buf, found %d buf"), KBigBuf, buf->Size());
+                User::Leave(EFail);
+                }
+            }
+	    }
+
+	//-------------- substep 6 -------------------- 
+	INFO_PRINTF1(_L("  06 Copy in Des1 into Chain1:"));
+	aChain1.CopyIn(*aDes1);
+
+	//-------------- substep 7 -------------------- 
+	INFO_PRINTF1(_L("  07 Split Chain1. The 2nd part goes to Chain2:"));
+	RMBufChain aChain2;
+	TRAP(ret,aChain1.SplitL(aOffset, aChain2));
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't Split"));
+		aChain1.Free();
+		aChain2.Free();
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 8 -------------------- 
+	INFO_PRINTF1(_L("  08 Check the length of the chains. They should be OFFSET and (LENGTH - OFFSET):"));
+	TInt temp;
+	if ( (temp = aChain1.Length()) != aOffset)
+		{
+		INFO_PRINTF3(_L("Error: Chain1 length is %d instead of %d"), temp, aOffset);
+		aChain1.Free();
+		aChain2.Free();
+		User::Leave(EFail);
+		}
+
+	if ( (temp = aChain2.Length()) != aLength - aOffset)
+		{
+		INFO_PRINTF3(_L("Error: Chain2 length is %d instead of %d"), temp, aLength - aOffset);
+		aChain1.Free();
+		aChain2.Free();
+		User::Leave(EFail);
+		}
+	
+    if(forceSmallBuf)
+        {
+        if(!aChain2.First() || aChain2.First()->Size() != KSmallBuf ||
+           !aChain2.First()->Next() || aChain2.First()->Next()->Size() != KSmallBuf)
+            {
+            INFO_PRINTF2(_L("-- split chain should start with two %d buf"), KSmallBuf);
+            User::Leave(EFail);
+            }
+        }
+
+	//-------------- substep 9 -------------------- 
+	INFO_PRINTF1(_L("  09 Copy out Chain1 into Des2:"));
+	aChain1.CopyOut(*aDes2);
+
+	//-------------- substep 10 -------------------- 
+	INFO_PRINTF1(_L("  10 Check the length of Des2. It should be OFFSET "));
+	if ( (temp = aDes2->Length()) != aOffset)
+		{
+		INFO_PRINTF3(_L("Error: Des2 length is %d instead of %d"), temp, aOffset);
+		aChain1.Free();
+		aChain2.Free();
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 11 -------------------- 
+	INFO_PRINTF1(_L("  11 Set the length of Des2 to LENGTH value"));
+	aDes2->SetLength(aLength);
+
+	//-------------- substep 12 -------------------- 
+	INFO_PRINTF1(_L("  12 Copy out the whole Chain2 into Des2 at offset = OFFSET"));
+	TPtr8 dest((TUint8*)aDes2->Ptr() + aOffset, aLength-aOffset, aLength - aOffset);
+	aChain2.CopyOut(dest);
+	
+	//-------------- substep 13 -------------------- 
+	INFO_PRINTF1(_L("  13 Compare the content of Des1 & Des2:"));
+	if(aDes1->Compare(*aDes2))
+		{
+		aChain1.Free();
+		aChain2.Free();
+		INFO_PRINTF1(_L("Error: The content is not the same"));
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 14 -------------------- 
+	INFO_PRINTF1(_L("  14 Free the chains. Clean up stack:"));
+	aChain1.Free();
+	aChain2.Free();
+    CleanupStack::PopAndDestroy(aDes2);
+    CleanupStack::PopAndDestroy(aDes1);
+    CleanupStack::PopAndDestroy(); // iBufPond
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+        SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test07TrimStart.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,160 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 07 for TrimStart() method
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+
+#include "Test07TrimStart.h"
+#include <comms-infras/commsbufpond.h>
+// constructor
+CTest07TrimStart::CTest07TrimStart()
+	{
+	SetTestStepName(_L("MBufMgrTest07"));// Store the name of this test case
+	}
+
+// destructor
+CTest07TrimStart::~CTest07TrimStart() 
+	{
+	}
+
+// 
+enum TVerdict CTest07TrimStart::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+	//-------------- substep 0 -------------------- 
+	INFO_PRINTF1(_L("  00 Read parameters from the script:"));
+	TInt aOffset;// Will contain the position in chain where split action will be done
+	TInt aLength;// Will contain the length of desc & chains in the test
+	TInt bRet = GetIntFromConfig(_L("MBufMgrTest07"), _L("Length"), aLength);
+	if (!bRet) 
+		{
+         SetTestStepResult(EFail);
+
+		return TestStepResult();
+		}
+	bRet = GetIntFromConfig(_L("MBufMgrTest07"), _L("Offset"), aOffset);
+	if (!bRet) 
+		{
+         SetTestStepResult(EFail);
+
+		return TestStepResult();
+		}
+   	INFO_PRINTF2(_L("     ------- Chain LENGTH              = %d --"), aLength);
+ 	INFO_PRINTF2(_L("     ------- OFFSET where to TrimStart = %d --"), aOffset);
+	if ( (aLength > 1000)    ||(aLength <0) ||
+		 (aOffset > aLength) || (aOffset <0)  )
+		{
+		INFO_PRINTF1(_L("ERROR: Wrong input parameter(s)"));
+         SetTestStepResult(EFail);
+
+		return TestStepResult();
+		}
+
+	//-------------- substep 1 -------------------- 
+	INFO_PRINTF1(_L("  01 Creating CMBufManager and installing active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
+	CleanupClosePushL(iBufPond);
+
+	//-------------- substep 2 -------------------- 
+	INFO_PRINTF1(_L("  02 Allocate two desc. of Length:LENGTH(Des1) & (LENGTH-OFFSET)(Des2):"));
+	TBuf8<1000> *aDes1, *aDes2;
+    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<1000> );
+    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<1000> );
+	aDes1->SetLength(aLength);
+	aDes2->SetLength(aLength-aOffset);
+
+	//-------------- substep 3 -------------------- 
+	INFO_PRINTF1(_L("  03 Fill in Des1 with a pattern:"));
+	StripeDes(*aDes1, 0, aLength, '@', 'Z');
+	
+	//-------------- substep 4 -------------------- 
+	INFO_PRINTF1(_L("  04 Fill in Des2 with zeros:"));
+	StripeDes(*aDes2, 0, aLength-aOffset, 0, 0);
+
+	//-------------- substep 5 -------------------- 
+	INFO_PRINTF1(_L("  05 Allocate Chain:"));
+	RMBufChain aChain;
+	TRAPD(ret,aChain.AllocL(aLength));
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't allocate RMBuf:"));
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 6 -------------------- 
+	INFO_PRINTF1(_L("  06 Copy in Des1 into Chain1:"));
+	aChain.CopyIn(*aDes1);
+
+	//-------------- substep 7 -------------------- 
+	INFO_PRINTF1(_L("  07 TrimStart Chain1 at OFFSET position (actually, remove the 1st OFFSET bytes:"));
+	aChain.TrimStart(aOffset);
+
+	//-------------- substep 8 -------------------- 
+	INFO_PRINTF1(_L("  08 Check the length of the chain. It should be (LENGTH - OFFSET):"));
+	TInt temp;
+	if ( (temp = aChain.Length()) != aLength-aOffset)
+		{
+		INFO_PRINTF3(_L("Error: Chain length is %d instead of %d"), temp, aLength-aOffset);
+		aChain.Free();
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 09 -------------------- 
+	INFO_PRINTF1(_L("  09 Copy the last (LENGTH-OFFSET) bytes of Des1 into the start of Des1:"));
+	(void)Mem::Copy((TUint8 *)aDes1->Ptr(), (TUint8 *)aDes1->Ptr()+aOffset, aLength-aOffset);
+
+	//-------------- substep 10 -------------------- 
+	INFO_PRINTF1(_L("  10 Set the length of Des1 to value LENGTH-OFFSET"));
+	aDes1->SetLength(aLength-aOffset);
+	
+	//-------------- substep 11 -------------------- 
+	INFO_PRINTF1(_L("  11 Copy out Chain into Des2:"));
+	aChain.CopyOut(*aDes2);
+
+	//-------------- substep 12 -------------------- 
+	INFO_PRINTF1(_L("  12 Compare the content of Des1 & Des2:"));
+	if(aDes1->Compare(*aDes2))
+		{
+		aChain.Free();
+		INFO_PRINTF1(_L("Error: The content is not the same"));
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 13 -------------------- 
+	INFO_PRINTF1(_L("  13 Free the chains. Clean up stack:"));
+	aChain.Free();
+    CleanupStack::PopAndDestroy(aDes2);
+    CleanupStack::PopAndDestroy(aDes1);
+    CleanupStack::PopAndDestroy();
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+        SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test08TrimEnd.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,156 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 8 for TrimEnd() method
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+
+#include "Test08TrimEnd.h"
+#include <comms-infras/commsbufpond.h>
+// constructor
+CTest08TrimEnd::CTest08TrimEnd()
+	{
+	SetTestStepName(_L("MBufMgrTest08"));// Store the name of this test case
+	}
+
+// destructor
+CTest08TrimEnd::~CTest08TrimEnd() 
+	{
+	}
+
+// 
+enum TVerdict CTest08TrimEnd::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+	//-------------- substep 0 -------------------- 
+	INFO_PRINTF1(_L("  00 Read parameters from the script:"));
+	TInt aOffset;// Will contain the position in chain where split action will be done
+	TInt aLength;// Will contain the length of desc & chains in the test
+	TInt bRet = GetIntFromConfig(_L("MBufMgrTest08"), _L("Length"), aLength);
+	if (!bRet) 
+		{
+         SetTestStepResult(EFail);
+
+		return TestStepResult();
+		}
+	bRet = GetIntFromConfig(_L("MBufMgrTest08"), _L("Offset"), aOffset);
+	if (!bRet) 
+		{
+         SetTestStepResult(EFail);
+
+		return TestStepResult();
+		}
+   	INFO_PRINTF2(_L("     ------- Chain LENGTH              = %d --"), aLength);
+ 	INFO_PRINTF2(_L("     ------- OFFSET where to TrimStart = %d --"), aOffset);
+	if ( (aLength > 1000)    ||(aLength <0) ||
+		 (aOffset > aLength) || (aOffset <0)  )
+		{
+		INFO_PRINTF1(_L("ERROR: Wrong input parameter(s)"));
+         SetTestStepResult(EFail);
+
+		return TestStepResult();
+		}
+
+	//-------------- substep 1 -------------------- 
+	INFO_PRINTF1(_L("  01 Creating CMBufManager and installing active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
+	CleanupClosePushL(iBufPond);
+
+	//-------------- substep 2 -------------------- 
+	INFO_PRINTF1(_L("  02 Allocate two desc. of Length:LENGTH(Des1) & OFFSET(Des2):"));
+	TBuf8<1000> *aDes1, *aDes2;
+    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<1000> );
+    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<1000> );
+	aDes1->SetLength(aLength);
+	aDes2->SetLength(aOffset);
+
+	//-------------- substep 3 -------------------- 
+	INFO_PRINTF1(_L("  03 Fill in Des1 with a pattern:"));
+	StripeDes(*aDes1, 0, aLength, '@', 'Z');
+	
+	//-------------- substep 4 -------------------- 
+	INFO_PRINTF1(_L("  04 Fill in Des2 with zeros:"));
+	StripeDes(*aDes2, 0, aOffset, 0, 0);
+	
+	//-------------- substep 5 -------------------- 
+	INFO_PRINTF1(_L("  05 Allocate Chain:"));
+	RMBufChain aChain;
+	TRAPD(ret,aChain.AllocL(aLength));
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't allocate RMBuf:"));
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 6 -------------------- 
+	INFO_PRINTF1(_L("  06 Copy in Des1 into Chain1:"));
+	aChain.CopyIn(*aDes1);
+
+	//-------------- substep 7 -------------------- 
+	INFO_PRINTF1(_L("  07 TrimEnd Chain1 at OFFSET position (i.e. remove the bytes after OFFSET position:"));
+	aChain.TrimEnd(aOffset);
+
+	//-------------- substep 8 -------------------- 
+	INFO_PRINTF1(_L("  08 Check the length of the chain. It should be OFFSET:"));
+	TInt temp;
+	if ( (temp = aChain.Length()) != aOffset)
+		{
+		INFO_PRINTF3(_L("Error: Chain length is %d instead of %d"), temp, aOffset);
+		aChain.Free();
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 9 -------------------- 
+	INFO_PRINTF1(_L("  09 Set the length of Des1 to value OFFSET"));
+	aDes1->SetLength(aOffset);
+	
+	//-------------- substep 10 -------------------- 
+	INFO_PRINTF1(_L("  10 Copy out Chain into Des2:"));
+	aChain.CopyOut(*aDes2);
+
+	//-------------- substep 11 -------------------- 
+	INFO_PRINTF1(_L("  11 Compare the content of Des1 & Des2:"));
+	if(aDes1->Compare(*aDes2))
+		{
+		aChain.Free();
+		INFO_PRINTF1(_L("Error: The content is not the same"));
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 12 -------------------- 
+	INFO_PRINTF1(_L("  12 Free the chains. Clean up stack:"));
+	aChain.Free();
+    CleanupStack::PopAndDestroy(aDes2);
+    CleanupStack::PopAndDestroy(aDes1);
+    CleanupStack::PopAndDestroy();
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+        SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test09Align.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,173 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 09 for Align() methods
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+
+#include "Test09Align.h"
+#include <comms-infras/commsbufpond.h>
+
+// constructor
+CTest09Align::CTest09Align()
+	{
+	SetTestStepName(_L("MBufMgrTest09"));// Store the name of this test case
+	}
+
+// destructor
+CTest09Align::~CTest09Align() 
+	{
+	}
+
+// 
+enum TVerdict CTest09Align::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+	//-------------- substep 0 -------------------- 
+	INFO_PRINTF1(_L("  00 Read parameters from the script:"));
+	CScriptInput* aInput;
+	CleanupStack::PushL( aInput= new (ELeave) CScriptInput );
+	TInt i;
+	TBuf<20> aBuf; 
+	TInt bRet;
+	aInput->aBufsBefore=0;
+	for (i = 0;i<50;i++)
+		{
+		aBuf.Format(_L("Length%02d"),i+1);
+		bRet = GetIntFromConfig(_L("MBufMgrTest09"), aBuf, aInput->aBuf[i].aLength);
+                    SetTestStepResult(EFail);
+
+		if (!bRet) return TestStepResult();
+		if (aInput->aBuf[i].aLength == -1) break; 
+
+		aBuf.Format(_L("Offset%02d"),i+1);
+		bRet = GetIntFromConfig(_L("MBufMgrTest09"), aBuf, aInput->aBuf[i].aOffset);
+                    SetTestStepResult(EFail);
+
+		if (!bRet) return TestStepResult();
+		aInput->aBufsBefore++;
+		}
+	bRet = GetIntFromConfig(_L("MBufMgrTest09"),_L("BuffsAfter") , aInput->aBufsAfter);
+
+   	INFO_PRINTF1(_L("     The following has been read from the script:"));
+   	INFO_PRINTF2(_L("     Number of RMBufs in chain before align= %2d"),aInput->aBufsBefore);
+   	INFO_PRINTF2(_L("     Number of RMBufs in chain after align = %2d"),aInput->aBufsAfter);
+	
+	for (i = 0; i < aInput->aBufsBefore ; i++ )
+		{
+   		INFO_PRINTF4(_L("     Chain #%2d: Offset=%3d Length=%3d"),
+					         i+1, aInput->aBuf[i].aOffset, aInput->aBuf[i].aLength);
+		}
+
+	//-------------- substep 1 -------------------- 
+	INFO_PRINTF1(_L("  01 Create CMBufManager and install active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+	
+	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
+	CleanupClosePushL(iBufPond);
+
+	//-------------- substep 2 -------------------- 
+	INFO_PRINTF1(_L("  02 Create TestStr structure and fill it with data:"));
+	CTestStr* aTestStr1;
+	CleanupStack::PushL( aTestStr1 = new (ELeave) CTestStr );
+
+	aTestStr1->iSrcAddr = 0x01234567;
+	aTestStr1->iDstAddr = 0x89abcdef;
+	aTestStr1->iSrcPort = 0x0246;
+	aTestStr1->iDstPort = 0x8ace;
+	aTestStr1->iLength  = sizeof(CTestStr);
+	aTestStr1->iOptions = 0x1359;
+	StripeMem(aTestStr1->iData, 0, sizeof(aTestStr1->iData), '@', 'Z');
+	
+	//-------------- substep 3 -------------------- 
+	INFO_PRINTF1(_L("  03 Create a chain containing RMBufs as specified in the script:"));
+	RMBufChain aChain;
+	RMBuf *buf=0;
+	for (i = aInput->aBufsBefore-1; i >= 0 ; i-- )
+		{
+		buf = static_cast<RMBuf*>(iBufPond.Alloc(KMBufSmallSize, 0, KMaxTInt));
+		if (buf==NULL)
+			{
+			INFO_PRINTF1(_L("Error:Could not allocate buffer"));
+			aChain.Free();
+			User::Leave(EFail);
+			}
+		buf->SetData(aInput->aBuf[i].aOffset,aInput->aBuf[i].aLength);
+		aChain.Prepend(buf);
+		}
+
+	//-------------- substep 4 -------------------- 
+	INFO_PRINTF1(_L("  04 Copy in TestStr into Chain:"));
+	aChain.CopyIn(TPtrC8((TUint8 *)aTestStr1, sizeof(CTestStr)));
+
+	CTestStr* aTestStr3 = (CTestStr*)(aChain.First()->Ptr());
+
+	//-------------- substep 5 --------------------
+	INFO_PRINTF1(_L("  05 Allign Chain for the size of TestStr:"));
+	aChain.Align(sizeof(CTestStr));
+
+	//-------------- substep 6 -------------------- 
+	INFO_PRINTF1(_L("  06 Check the number of RMBufs in chain after allign:"));
+	if (aChain.NumBufs() != aInput->aBufsAfter) 
+		{
+		INFO_PRINTF3(_L("ERROR: Number of bufs is %d instead of %d"),aChain.NumBufs(),aInput->aBufsAfter);
+		aChain.Free();
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 7 -------------------- 
+	INFO_PRINTF1(_L("  07 Create the pointer of TestStr type and point to the 1st RMBuf in chain:"));
+	CTestStr* aTestStr2 = (CTestStr*)(aChain.First()->Ptr());
+
+	//-------------- substep 8 -------------------- 
+	INFO_PRINTF1(_L("  08 Compare TestStr1 and TestData2. They should be the same:"));
+	if ( (aTestStr1->iSrcAddr != aTestStr2->iSrcAddr) ||
+		 (aTestStr1->iDstAddr != aTestStr2->iDstAddr) ||
+	     (aTestStr1->iSrcPort != aTestStr2->iSrcPort) ||
+		 (aTestStr1->iDstPort != aTestStr2->iDstPort) ||
+	     (aTestStr1->iLength  != aTestStr2->iLength)  ||
+	     (aTestStr1->iOptions != aTestStr2->iOptions) ||
+	     (Mem::Compare(aTestStr1->iData, sizeof(aTestStr1->iData), 
+		      aTestStr2->iData, sizeof(aTestStr2->iData))) )
+		{
+		INFO_PRINTF1(_L("ERROR: They are not the same"));
+		aChain.Free();
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 9 -------------------- 
+	INFO_PRINTF1(_L("  09 Free the chain. Clean up stack:"));
+	aChain.Free();
+    CleanupStack::PopAndDestroy(aTestStr1);
+    CleanupStack::PopAndDestroy();
+	CActiveScheduler::Install(NULL);
+    CleanupStack::PopAndDestroy(iActSch);
+    CleanupStack::PopAndDestroy(aInput);
+        SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test10CopyL.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,166 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 10 for CopyL() methods
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+
+#include "Test10CopyL.h"
+#include <comms-infras/commsbufpond.h>
+
+// constructor
+CTest10Copy::CTest10Copy()
+	{
+	SetTestStepName(_L("MBufMgrTest10"));// Store the name of this test case
+	}
+
+// destructor
+CTest10Copy::~CTest10Copy() 
+	{
+	}
+
+// 
+enum TVerdict CTest10Copy::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+	//-------------- substep 0 -------------------- 
+	INFO_PRINTF1(_L("  00 Read parameters from the script:"));
+	CScriptInput* aInput;//It will hold input
+	CleanupStack::PushL( aInput= new (ELeave) CScriptInput );
+	TInt i;
+	TBuf<20> aBuf; 
+	TInt bRet;
+	aInput->aBufs=0;
+	aInput->aChainLen=0;
+	for (i = 0;i<50;i++)
+		{
+		aBuf.Format(_L("Length%02d"),i+1);
+		bRet = GetIntFromConfig(_L("MBufMgrTest10"), aBuf, aInput->aBuf[i].aLength);
+		
+		if (!bRet) return TestStepResult();
+		if (aInput->aBuf[i].aLength == -1) break; 
+
+		aBuf.Format(_L("Offset%02d"),i+1);
+		bRet = GetIntFromConfig(_L("MBufMgrTest10"), aBuf, aInput->aBuf[i].aOffset);
+
+		if (!bRet) return TestStepResult();
+
+		aInput->aBufs++;
+		aInput->aChainLen += aInput->aBuf[i].aLength;
+		}
+	bRet = GetIntFromConfig(_L("MBufMgrTest10"),_L("CopyOffset") , aInput->aCopyOffset);
+	bRet = GetIntFromConfig(_L("MBufMgrTest10"),_L("CopyLen") , aInput->aCopyLen);
+
+   	INFO_PRINTF1(_L("     The following has been read from the script:"));
+   	INFO_PRINTF3(_L("     Number of RMBufs in chain = %2d, with overall length CHAINLEN=%d"),aInput->aBufs,aInput->aChainLen);
+	
+	for (i = 0; i < aInput->aBufs ; i++ )
+		{
+   		INFO_PRINTF4(_L("     RMBuf #%2d: Offset=%3d Length=%3d"),
+					         i+1, aInput->aBuf[i].aOffset, aInput->aBuf[i].aLength);
+		}
+   	INFO_PRINTF3(_L("     CopyL() parameters: COPYOFFSET=%d COPYLEN=%d"),aInput->aCopyOffset, aInput->aCopyLen);
+
+	//-------------- substep 1 -------------------- 
+	INFO_PRINTF1(_L("  01 Create CMBufManager and install active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
+	CleanupClosePushL(iBufPond);
+
+	//-------------- substep 2 -------------------- 
+	INFO_PRINTF1(_L("  02 Allocate two descriptors (Des1 & Des2) of length = Min(COPYLEN, CHAINLEN - COPYOFFSET):"));
+	TBuf8<5000> *aDes1, *aDes2;
+	TInt aDesLength;
+    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<5000> );
+    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<5000> );
+	aDesLength = Min(aInput->aCopyLen, aInput->aChainLen-aInput->aCopyOffset);
+	aDes1->SetLength(aDesLength);
+	aDes2->SetLength(aDesLength);
+
+	//-------------- substep 3 -------------------- 
+	INFO_PRINTF1(_L("  03 Fill in Des1 with a pattern:"));
+	StripeDes(*aDes1, 0, aDesLength, '@', 'Z');
+
+	//-------------- substep 4 -------------------- 
+	INFO_PRINTF1(_L("  04 Create Chain1 containing RMBufs as specified in the script:"));
+	RMBufChain aChain1;
+	RMBuf *buf=0;
+	for (i = aInput->aBufs-1; i >= 0 ; i-- )
+		{
+		buf = static_cast<RMBuf*>(iBufPond.Alloc(KMBufSmallSize,0, KMaxTInt));
+		if (buf==NULL)
+			{
+			INFO_PRINTF1(_L("Error:Could not allocate buffer"));
+			aChain1.Free();
+			User::Leave(EFail);
+			}
+		buf->SetData(aInput->aBuf[i].aOffset,aInput->aBuf[i].aLength);
+		aChain1.Prepend(buf);
+		}
+
+	//-------------- substep 5 -------------------- 
+	INFO_PRINTF1(_L("  05 Copy in Des1 into Chain1 at offset=COPYOFFSET:"));
+	TBuf8<5000> *aDesTemp;
+    CleanupStack::PushL( aDesTemp = new(ELeave) TBuf8<5000> );
+	aDesTemp->SetLength(aDesLength+aInput->aCopyOffset);
+	Mem::Copy ((TAny*)(aDesTemp->Ptr()+aInput->aCopyOffset), aDes1->Ptr(), aDesLength);
+    aChain1.CopyIn(*aDesTemp);
+    CleanupStack::PopAndDestroy(aDesTemp);
+
+	//-------------- substep 6 -------------------- 
+	INFO_PRINTF1(_L("  06 Copy Chain1 into Chain2:"));
+    RMBufChain aChain2;
+	aChain1.CopyL(aChain2,aInput->aCopyOffset, aInput->aCopyLen);
+
+	//-------------- substep 7 -------------------- 
+	INFO_PRINTF1(_L("  07 Copy out Chain2 into Des2:"));
+    aChain2.CopyOut(*aDes2);
+	
+	//-------------- substep 8 -------------------- 
+	INFO_PRINTF1(_L("  08 Compare the content of Des1 & Des2:"));
+	if(aDes1->Compare(*aDes2))
+		{
+		INFO_PRINTF1(_L("Error: The content is not the same"));
+		aChain1.Free();
+		aChain2.Free();
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 9 -------------------- 
+	INFO_PRINTF1(_L("  09 Free chain. Clean up stack:"));
+	aChain1.Free();
+	aChain2.Free();
+    CleanupStack::PopAndDestroy(aDes2);
+    CleanupStack::PopAndDestroy(aDes1);
+    CleanupStack::PopAndDestroy();
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+    CleanupStack::PopAndDestroy(aInput);
+    SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test11AsyncAlloc.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,105 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 11 Async. Allocate
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+#include "Test11AsyncAlloc.h"
+
+#include <comms-infras/commsbufpond.h>
+// constructor
+CTest11AsyncAlloc::CTest11AsyncAlloc()
+	{
+	SetTestStepName(_L("MBufMgrTest11"));// Store the name of this test case
+	}
+
+// destructor
+CTest11AsyncAlloc::~CTest11AsyncAlloc()	
+	{
+	}
+
+class CMBufAsyncReq : public CActive
+{
+public:
+	CMBufAsyncReq(RMBufAsyncRequest &aMBufAsyncReq)
+		:CActive(EPriorityStandard)
+		,iMBufAsyncReq(aMBufAsyncReq) 	{ }
+
+	~CMBufAsyncReq() { Cancel(); }
+
+	void RunL()      { CActiveScheduler::Stop(); }
+
+	void DoCancel()  { iMBufAsyncReq.Cancel(); }
+
+	TInt DoAsyncRequest(RMBufChain& aChain, TInt aSize)
+		{
+		iMBufAsyncReq.Alloc(aChain, aSize, iStatus);
+		SetActive();
+		CActiveScheduler::Start();
+		return iStatus.Int();
+		}
+private:
+	RMBufAsyncRequest& iMBufAsyncReq;
+};
+
+enum TVerdict CTest11AsyncAlloc::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+	//-------------- substep 1 -------------------- 
+	INFO_PRINTF1(_L("  01 Create CMBufManager and install active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
+	CleanupClosePushL(iBufPond);
+
+	//-------------- substep 2 -------------------- 
+	INFO_PRINTF1(_L("  02 Create and install active object that will do async. alloc on request:"));
+	RMBufAsyncRequest async;
+	CMBufAsyncReq* testAsync;
+	CleanupStack::PushL(testAsync = new(ELeave) CMBufAsyncReq(async));
+	CActiveScheduler::Add(testAsync);
+	
+	//-------------- substep 3 -------------------- 
+	INFO_PRINTF1(_L("  03 Async. alloce 5000-bytes long RMBuf:"));
+	RMBufChain aChain;
+	TInt ret = testAsync->DoAsyncRequest(aChain, 5000);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't allocate Chain:"));
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 4 -------------------- 
+	INFO_PRINTF1(_L("  04 Free the chain. Clean up stack:"));
+	aChain.Free();
+    CleanupStack::PopAndDestroy(testAsync);
+    CleanupStack::PopAndDestroy();
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+        SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test12General.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,341 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 12 General Test
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+#include "Test12General.h"
+#include <comms-infras/commsbufpond.h>
+
+// constructor
+CTest12General::CTest12General()
+	{
+	SetTestStepName(_L("MBufMgrTest12"));// Store the name of this test case
+	}
+
+// destructor
+CTest12General::~CTest12General() 
+	{
+	}
+
+void CTest12General::LeaveIfErrorL(TInt aErr, RMBufChain& aChain, const TDesC& aMsg)
+	{
+	if(aErr != KErrNone)
+		{
+		TBuf<129> logLine;
+		logLine.Format(_L("Error %d from %S"), aErr, &aMsg);
+		INFO_PRINTF2(_L("%S"), &logLine);
+		aChain.Free();
+		User::Leave(EFail);
+		}
+	}
+
+void CTest12General::LeaveIfDifferentL(TInt aLHS, TInt aRHS, RMBufChain& aChain, const TDesC& aMsg)
+	{
+	if(aLHS != aRHS)
+		{
+		TBuf<129> logLine;
+		logLine.Format(_L("%d != %d in %S"), aLHS, aRHS, &aMsg);
+		INFO_PRINTF2(_L("%S"), &logLine);
+		aChain.Free();
+		User::Leave(EFail);
+		}
+	}
+//
+enum TVerdict CTest12General::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+	//-------------- substep 1 -------------------- 
+	INFO_PRINTF1(_L("  01 - Create CMBufManager and install active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
+	CleanupClosePushL(iBufPond);
+
+	//-------------- substep 2 -------------------- 
+	INFO_PRINTF1(_L("  02 - Allocate two desc. (Des1 & Des2) of length 12345."));
+	INFO_PRINTF1(_L("     - Fill Des1 with a pattern, and Des2 with zeros:"));
+	TBuf8<12345> *aDes1, *aDes2;
+    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<12345> );
+    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<12345> );
+	aDes1->SetLength(12345);
+	aDes2->SetLength(12345);
+	StripeDes(*aDes1, 0, 12345, '@', 'Z');
+	StripeDes(*aDes2, 0, 12345, 0, 0);
+
+	//-------------- substep 3 -------------------- 
+	INFO_PRINTF1(_L("  03 - Copy in Des1 into Chain:"));
+	RMBufChain aChain;
+	TRAPD(ret,aChain.AllocL(12345));
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't allocate RMBufChain:"));
+		User::Leave(EFail);
+		}
+	aChain.CopyIn(*aDes1);
+
+	//-------------- substep 4 -------------------- 
+	INFO_PRINTF1(_L("  04 - Split Chain into  packets of 5000 bytes. Prepend Header1 to each:"));
+	INFO_PRINTF1(_L("     - Place them into Outq1 packet queue. Print the content of Outq1:"));
+	int len = aChain.Length();
+	RMBufChain aTempChain;
+	Test_str aHeader1;
+	StripeMem((TUint8 *)&aHeader1, 0, sizeof(aHeader1), 'a', 'm');
+	RMBufPktQ aOutq1;
+
+	while (len>5000)
+		{
+		TRAP(ret,aChain.SplitL(5000, aTempChain));
+		if (ret != KErrNone)
+			{
+			INFO_PRINTF1(_L("Error: Couldn't Split chain:"));
+			aChain.Free();
+			User::Leave(EFail);
+			}
+		TRAP(ret,aChain.PrependL(sizeof(aHeader1)));
+		if (ret != KErrNone)
+			{
+			INFO_PRINTF1(_L("Error: Couldn't prepend header to the chain:"));
+			aChain.Free();
+			User::Leave(EFail);
+			}
+		aChain.CopyIn(TPtrC8((TUint8 *)&aHeader1, sizeof(aHeader1)));
+		aOutq1.Append(aChain);
+		aChain.Append(aTempChain);
+		len -= 5000;
+		}
+	TRAP(ret,aChain.PrependL(sizeof(aHeader1)));
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't prepend header to the chain:"));
+		aChain.Free();
+		User::Leave(EFail);
+		}
+	aChain.CopyIn(TPtrC8((TUint8 *)&aHeader1, sizeof(aHeader1)));
+	aOutq1.Append(aChain);
+
+	Test_QueueStats(aOutq1, _S("OutQ1"));
+
+	//-------------- substep 5 -------------------- 
+	INFO_PRINTF1(_L("  05 - Split packets of Outq1 into 556-byte long packets and prepend another Header2 onto each. Place them all into packet queue Outq2:"));
+	INFO_PRINTF1(_L("     - Place them all into packet queue Outq2. Print the contents of Outq1 & Outq2"));
+	Test_str aHeader2;
+	StripeMem((TUint8 *)&aHeader2, 0, sizeof(aHeader2), 'n', 'z');
+	RMBufPktQ aOutq2;
+	while (!aOutq1.IsEmpty())
+		{
+		(void)aOutq1.Remove(aChain);
+		len = aChain.Length();
+		while (len>556)
+			{
+			TRAP(ret,aChain.SplitL(556, aTempChain));
+			if (ret != KErrNone)
+				{
+				INFO_PRINTF1(_L("Error: Couldn't Split chain:"));
+				aChain.Free();
+				User::Leave(EFail);
+				}
+			TRAP(ret,aChain.PrependL(sizeof(aHeader2)));
+			if (ret != KErrNone)
+				{
+				INFO_PRINTF1(_L("Error: Couldn't prepend header to the chain:"));
+				aChain.Free();
+				User::Leave(EFail);
+				}
+			aChain.CopyIn(TPtrC8((TUint8 *)&aHeader2, sizeof(aHeader2)));
+			aOutq2.Append(aChain);
+			aChain.Append(aTempChain);
+			len -= 556;
+			}
+		TRAP(ret,aChain.PrependL(sizeof(aHeader2)));
+		if (ret != KErrNone)
+			{
+			INFO_PRINTF1(_L("Error: Couldn't prepend header to the chain:"));
+			aChain.Free();
+			User::Leave(EFail);
+			}
+		aChain.CopyIn(TPtrC8((TUint8 *)&aHeader2, sizeof(aHeader2)));
+		aOutq2.Append(aChain);
+		}
+	Test_QueueStats(aOutq1, _S("OutQ1"));
+	Test_QueueStats(aOutq2, _S("OutQ2"));
+
+	//-------------- substep 6 -------------------- 
+	INFO_PRINTF1(_L("  06 - Copy the chains from Outq2 into another packet queue Inq2."));
+	INFO_PRINTF1(_L("     - Print the contents of Outq2 & Inq1:"));
+	RMBufPktQ aInq2;
+
+	while (!aOutq2.IsEmpty())
+		{
+		(void)aOutq2.Remove(aChain);
+		TRAP(ret,aChain.CopyL(aTempChain));
+		if (ret != KErrNone)
+			{
+			INFO_PRINTF1(_L("Error: Couldn't copy chain"));
+			aChain.Free();
+			User::Leave(EFail);
+			}
+		aChain.Free();
+		aChain.Assign(aTempChain);
+		aInq2.Append(aChain);
+		}
+
+	Test_QueueStats(aOutq2, _S("OutQ2"));
+	Test_QueueStats(aInq2, _S("InQ2"));
+
+	//-------------- substep 7 -------------------- 
+	INFO_PRINTF1(_L("  07 - Group the chains back to 5000+Header1 long packets (Including removal of Header2)."));
+	INFO_PRINTF1(_L("     - Check the content of each Header2 that is removed."));
+	INFO_PRINTF1(_L("     - Place them in packet queue Inq1. Print the contents of Inq2 & Inq1:"));
+	RMBufPktQ aInq1;
+	Test_str aTempHeader;
+	aChain.Init();
+	len = 0;
+	while (!aInq2.IsEmpty())
+		{
+		while (len<5020 && !aInq2.IsEmpty())
+			{
+			(void)aInq2.Remove(aTempChain);
+			TPtr8 dest((TUint8 *)&aTempHeader, sizeof(aTempHeader),sizeof(aTempHeader));
+			aTempChain.CopyOut(dest);
+			aTempChain.TrimStart(sizeof(aTempHeader));
+			len += aTempChain.Length();
+			aChain.Append(aTempChain);
+			if(Mem::Compare((TUint8 *)&aHeader2, sizeof(aHeader2), 
+				            (TUint8 *)&aTempHeader, sizeof(aTempHeader))!=0)
+				{
+				INFO_PRINTF1(_L("Error: The content of header is not the same"));
+				aChain.Free();
+				User::Leave(EFail);
+				}
+			}
+		aInq1.Append(aChain);
+		aChain.Init();
+		len = 0;
+		}
+	Test_QueueStats(aInq2, _S("InQ2"));
+	Test_QueueStats(aInq1, _S("InQ1"));
+
+	//-------------- substep 8 -------------------- 
+	INFO_PRINTF1(_L("  08 - Group the packets into a single packet (Removing Header1, as well)."));
+	INFO_PRINTF1(_L("     - Check the content of each Header1 that is removed."));
+	INFO_PRINTF1(_L("     - Place it in Chain. Print the contents of Inq1:"));
+
+	while (!aInq1.IsEmpty())
+		{
+		(void)aInq1.Remove(aTempChain);
+		TPtr8 dest1((TUint8 *)&aTempHeader, sizeof(aTempHeader), sizeof(aTempHeader));
+		aTempChain.CopyOut(dest1);
+		aTempChain.TrimStart(sizeof(aTempHeader));
+		len = aTempChain.Length();
+		len = len;
+		aChain.Append(aTempChain);
+		if(Mem::Compare((TUint8 *)&aHeader1, sizeof(aHeader1), 
+				  (TUint8 *)&aTempHeader, sizeof(aTempHeader))!=0)
+			{
+			INFO_PRINTF1(_L("Error: The content of header is not the same"));
+			aChain.Free();
+			User::Leave(EFail);
+			}
+		}
+	len = aChain.Length();
+	len = len;
+	Test_QueueStats(aInq1, _S("InQ1"));
+
+	//-------------- substep 9 -------------------- 
+	INFO_PRINTF1(_L("  09 - Copy out Chain into Des2.:"));
+	aChain.CopyOut(*aDes2);
+
+	//-------------- substep 10 -------------------- 
+	INFO_PRINTF1(_L("  10 - Compare the content of Des1 & Des2:"));
+	if(aDes1->Compare(*aDes2))
+		{
+		aChain.Free();
+		INFO_PRINTF1(_L("Error: The content is not the same"));
+		User::Leave(EFail);
+		}
+	aChain.Free();
+
+	//-------------- substep 11 --------------------
+	INFO_PRINTF1(_L("  11 - RMBufChain::ReallocL():"));
+	TRAP(ret, aChain.AllocL(32));
+	// ...32 bytes at start
+	LeaveIfErrorL(ret, aChain, _L("AllocL(32)") );
+	TRAP(ret, aChain.ReAllocL(24));
+	// ...24 bytes at start
+	LeaveIfErrorL(ret, aChain, _L("ReAllocL(24)") );	
+	LeaveIfDifferentL(24, aChain.Length(), aChain, _L("length check") );
+	aChain.TrimStart(8);
+	// ...16 bytes starting at offset 8
+	LeaveIfDifferentL(16, aChain.Length(), aChain, _L("length check") );
+	TRAP(ret, aChain.ReAllocL(32));
+	// ...32 bytes starting at offset 8
+	LeaveIfErrorL(ret, aChain, _L("ReAllocL(32)") );
+	LeaveIfDifferentL(32, aChain.Length(), aChain, _L("length check") );
+	TRAP(ret, aChain.ReAllocL(120));
+	// ...120 bytes starting at offset 8, only one buffer
+	LeaveIfErrorL(ret, aChain, _L("ReAllocL(120)") );
+	LeaveIfDifferentL(120, aChain.Length(), aChain, _L("length check") );
+	LeaveIfDifferentL((TInt) aChain.First(), (TInt) aChain.Last(), aChain, _L("single buff check") );
+	TRAP(ret, aChain.ReAllocL(121));
+	// ...121 bytes starting at offset 8, two buffers
+	LeaveIfErrorL(ret, aChain, _L("ReAllocL(121)") );
+	LeaveIfDifferentL(121, aChain.Length(), aChain, _L("length check") );
+	TBool sameBuff = aChain.First() == aChain.Last();
+	LeaveIfDifferentL(sameBuff, 0, aChain, _L("two buffs check") );
+	aChain.Free();
+
+	//-------------- substep 12 -------------------- 
+	INFO_PRINTF1(_L("  12 - Clean up stack:"));
+    CleanupStack::PopAndDestroy(aDes2);
+    CleanupStack::PopAndDestroy(aDes1);
+    CleanupStack::PopAndDestroy();
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+        SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
+
+void CTest12General::Test_QueueStats(RMBufPktQ &aQueue, const TText *aName)
+	{
+	RMBufChain chain = (RMBufChain)aQueue.First();
+
+	INFO_PRINTF2(_L("    Queue stats %5s    : "), aName);
+	
+	if (chain.IsEmpty()) 
+		INFO_PRINTF1(_L("        Empty"));
+	else
+		{
+		TInt n = 0;
+		while (!chain.IsEmpty())
+			{
+			n++;
+			INFO_PRINTF3(_L("        chain #%2d:%d "), n, chain.Length());
+			chain = chain.Next();
+			}
+		}
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test13Performance.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,189 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 13 that measures the time spent for alloc/free methods
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+
+#include "Test13Performance.h"
+
+#include <comms-infras/commsbufpond.h>
+// constructor
+CTest13Performance::CTest13Performance()
+	{
+	SetTestStepName(_L("MBufMgrTest13"));// Store the name of this test case
+	}
+
+// destructor
+CTest13Performance::~CTest13Performance() 
+	{
+	}
+
+
+// 
+enum TVerdict CTest13Performance::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+	TInt aMBufNo; //Taken from the script;
+	TInt aLoopNo; //Taken from the script;
+	TTime aTimeStart, aTimeStop;
+	//-------------- substep 0 -------------------- 
+	INFO_PRINTF1(_L("  00 Read parameters from the script:"));
+	TInt bRet = GetIntFromConfig(_L("MBufMgrTest13"), _L("MBufNo"), aMBufNo);
+
+	if (!bRet)
+		return TestStepResult();
+
+	bRet = GetIntFromConfig(_L("MBufMgrTest13"), _L("LoopNo"), aLoopNo);
+
+	if (!bRet)
+		return TestStepResult();
+
+
+	INFO_PRINTF3(_L("     Info: MBUFNO = %d, LOOPNO= %d"),aMBufNo, aLoopNo);
+
+	//-------------- substep 1 -------------------- 
+	INFO_PRINTF1(_L("  01 Create CMBufManager and install active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+
+	CreateInstanceMBufMgrL((TUint)(3*KMBufSmallSize*aMBufNo));
+	CleanupClosePushL(iBufPond);
+
+	TInt i,j,k; //Counters
+	TInt64 us;
+	RMBufQ aBufList1, aBufList2; //Will contain all small buffers;
+	RMBuf* aBuf=0;
+
+	for (i = 0; i<aLoopNo; i++)
+		{
+		INFO_PRINTF2(_L(" Loop #%d"), i + 1);
+
+		//-------------- substep 2 -------------------- 
+		INFO_PRINTF1(_L("  02 Allocate Chain that contains RMBUFNO buffers. Free Chain."));
+		INFO_PRINTF1(_L("     ...Repeat the same 1000 times.Display the time spent:"));
+		RMBufChain aChain;
+		aTimeStart.UniversalTime();
+		for (j = 0;j < 1000; j++)
+		{
+			TRAPD(ret,aChain.AllocL(KMBufSmallSize*aMBufNo));
+			if (ret != KErrNone)
+				{
+				INFO_PRINTF1(_L("Error: Couldn't allocate RMBuf:"));
+				return TestStepResult();
+				}
+
+			aChain.Free();
+		}
+		aTimeStop.UniversalTime();
+		us = aTimeStop.MicroSecondsFrom(aTimeStart).Int64()/1000;
+		INFO_PRINTF2(_L("     ...Info: The time spent on 1000 alloc and free is %d mS"),us);
+
+		//-------------- substep 3 -------------------- 
+		INFO_PRINTF2(_L("  03 Create %d chains, each containing one RMBuf."), 2 * aMBufNo);
+		INFO_PRINTF1(_L("     ...Then, free all even chains:"));
+
+		aTimeStart.UniversalTime();
+		TInt attemptCount = 0;
+		for (j = 0;j<2*aMBufNo;j++)
+			{
+			aBuf = static_cast<RMBuf*>(iBufPond.Alloc(KMBufSmallSize, 0, KMaxTInt));
+			if (aBuf == NULL)
+				{
+				++attemptCount;
+				if(attemptCount == 3)
+				    {
+					INFO_PRINTF2(_L("Error: Couldn't allocate RMBuf number %d:"),j);
+					User::Leave(EFail);
+				    }
+				else
+				    {
+				    User::After(100000);
+				    }
+				}
+			if(aBuf)
+			    {
+			    aBufList1.Append(aBuf);
+			    }
+			}
+
+		k=0;
+		while (!aBufList1.IsEmpty())
+			{
+			k++;
+			aBuf = aBufList1.Remove();
+			if (k%2)
+				{
+				aBuf->Free();
+				}
+			else
+				{
+				aBufList2.Append(aBuf);
+				}
+			}
+		aTimeStop.UniversalTime();
+		us = aTimeStop.MicroSecondsFrom(aTimeStart).Int64()/1000;
+		INFO_PRINTF2(_L("     ...Info: The time spent is %d mS"), us);
+
+
+		//-------------- substep 4 -------------------- 
+		INFO_PRINTF1(_L("  04 Allocate Chain that contains RMBUFNO buffers. Free Chain."));
+		INFO_PRINTF1(_L("     ...Repeat the same 1000 times.Display the time spent:"));
+		aTimeStart.UniversalTime();
+		for (j = 0;j < 1000; j++)
+		{
+			TRAPD(ret,aChain.AllocL(KMBufSmallSize*aMBufNo));
+			if (ret != KErrNone)
+				{
+				INFO_PRINTF2(_L("Error: Couldn't allocate RMBuf number %d:"),j);
+				User::Leave(EFail);
+				}
+
+			aChain.Free();
+		} 
+		aTimeStop.UniversalTime();
+		us = aTimeStop.MicroSecondsFrom(aTimeStart).Int64()/1000;
+		INFO_PRINTF2(_L("     ...Info: The time spent on 1000 alloc and free is %d mS"),us);
+		
+		//-------------- substep 5 -------------------- 
+		INFO_PRINTF1(_L("  05 Free all remainig chains:"));
+		while (!aBufList2.IsEmpty())
+			{
+			aBuf = aBufList2.Remove();
+			aBuf->Free();
+			}
+	}
+
+
+	//-------------- substep 9 -------------------- 
+	INFO_PRINTF1(_L("  09 Clean up stack:"));
+    CleanupStack::PopAndDestroy();
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+
+	SetTestStepResult(EPass);
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test14HeapFreeCheck.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,127 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 14 that check rmbud does not use heap allocation
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+//#include <e32cmn.h>	// maybe this is needed for eka2 ?
+#include <e32std.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+
+#include "Test14HeapFreeCheck.h"
+#include <comms-infras/commsbufpond.h>
+// constructor
+CTest14HeapFreeCheck::CTest14HeapFreeCheck()
+	{
+	SetTestStepName(_L("MBufMgrTest14"));// Store the name of this test case
+	}
+
+// destructor
+CTest14HeapFreeCheck::~CTest14HeapFreeCheck()	
+	{
+	}
+
+// 
+enum TVerdict CTest14HeapFreeCheck::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+#if defined (_DEBUG)
+	//-------------- substep 1 -------------------- 
+	INFO_PRINTF1(_L("  01 Creating CMBufManager and installing active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
+	CleanupClosePushL(iBufPond);
+
+	//-------------- substep 2 -------------------- 
+	INFO_PRINTF1(_L("  02 Allocating two descriptors (Des1 & Des2):"));
+	TBuf8<1000> *aDes1, *aDes2;
+    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<1000> );
+    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<1000> );
+	aDes1->SetLength(1000);
+	aDes2->SetLength(1000);
+
+	//-------------- substep 2 -------------------- 
+	INFO_PRINTF1(_L("  02 Set User heap to fail at the next alloc.:"));
+	User::__DbgSetAllocFail(RHeap::EUser, RHeap::EFailNext, 0);
+
+	//-------------- substep 3 -------------------- 
+	INFO_PRINTF1(_L("  03 Allocate Chain1:"));
+	RMBufChain aChain1;
+	TRAPD(ret,aChain1.AllocL(1000));
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't allocate Chain1:"));
+		User::__DbgSetAllocFail(RHeap::EUser, RHeap::ENone, 0);
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 4 -------------------- 
+	INFO_PRINTF1(_L("  04 Copy in Des1 into Chain1:"));
+	aChain1.CopyIn(*aDes1);
+
+	//-------------- substep 5 -------------------- 
+	INFO_PRINTF1(_L("  05 Split Chain1. The 2nd part goes to Chain2:"));
+	RMBufChain aChain2;
+	TRAP(ret,aChain1.SplitL(300, aChain2));
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't Split"));
+		aChain1.Free();
+		aChain2.Free();
+		User::__DbgSetAllocFail(RHeap::EUser, RHeap::ENone, 0);
+		User::Leave(EFail);
+		}
+
+	//-------------- substep 6 -------------------- 
+	INFO_PRINTF1(_L("  06 Copy out Chain1 into Des2:"));
+	aChain1.CopyOut(*aDes2);
+
+	//-------------- substep 7 -------------------- 
+	INFO_PRINTF1(_L("  07 Copy Chain1 into Chain3:"));
+    RMBufChain aChain3;
+	aChain1.CopyL(aChain3,0, 200);
+
+	//-------------- substep 8 -------------------- 
+	INFO_PRINTF1(_L("  08 Free the chains. Clean up stack:"));
+	aChain1.Free();
+	aChain2.Free();
+	aChain3.Free();
+	User::__DbgSetAllocFail(RHeap::EUser, RHeap::ENone, 0);
+    CleanupStack::PopAndDestroy(aDes2);
+    CleanupStack::PopAndDestroy(aDes1);
+    CleanupStack::PopAndDestroy();
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+        SetTestStepResult(EPass);
+
+	return TestStepResult();
+#else
+	INFO_PRINTF1(_L("Info: Test Disabled on release build"));
+        SetTestStepResult(EPass);
+
+	return TestStepResult();
+#endif
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test15Concurrency.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,227 @@
+// Copyright (c) 2002-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:
+// Contains IPC Test 15
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+#include <ss_std.h>
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+
+#include "Test15Concurrency.h"
+#include <comms-infras/commsbufpond.h>
+
+// constructor
+CTest15Concurrency::CTest15Concurrency()
+	{
+	SetTestStepName(_L("MBufMgrTest15"));// Store the name of this test case
+	iMainThreadTries = 0;
+	iMainThreadFails = 0;
+	iHighThreadTries = 0;
+	iHighThreadFails = 0;
+	}
+
+// destructor
+CTest15Concurrency::~CTest15Concurrency() 
+	{
+	}
+
+// 
+TInt CTest15Concurrency::fHighPriorityThread(TAny* aInput)
+	{
+	CTest15Concurrency* pTestObject = (CTest15Concurrency*)aInput;
+	// We need to introduce this new client thread to the MBufMgr
+	TCommsBufPondTLSOp tls(pTestObject->iBufPond);
+	tls.Set();
+	
+	CTrapCleanup* aCleanup = CTrapCleanup::New();
+
+	//Install active scheduler
+    CActiveScheduler* aActSch = new CActiveScheduler;
+	if(aActSch==NULL)
+		{
+		return KErrNoMemory;
+		}
+	CActiveScheduler::Install(aActSch);
+
+	RTimer aTimer; 
+	TRequestStatus aTimerStatus;	// Request status associated with timer
+	aTimer.CreateLocal();			// Create timer for this thread
+	//-------------- substep 1 -------------------- 
+
+	// Allocate two 500-bytes long descriptors (Des1 & Des2):"));
+	TBuf8<500> *aDes1 = NULL;
+	TBuf8<500> *aDes2 = NULL;
+
+    TRAPD(ret, aDes1 = new(ELeave) TBuf8<500>);
+	if(ret!=KErrNone)
+		{
+		return ret;
+		}
+
+    TRAP(ret, aDes2 = new(ELeave) TBuf8<500>);
+	if(ret!=KErrNone)
+		{
+		delete aDes1;
+		return ret;
+		}
+
+	aDes1->SetLength(500);
+	aDes2->SetLength(500);
+
+	//Fill in the Des1 with a pattern
+	pTestObject->StripeDes(*aDes1, 0, 500, 'a', 'z');
+	
+	for (TInt i = 0 ; i<1000;i++)
+		{
+		//Allocate 500-bytes long RMBufChain
+		RMBufChain aChain;
+		TRAP(ret,aChain.AllocL(500));
+		if (ret != KErrNone)
+			{ 
+			break;
+			}
+		//Copy in Des1 into Chain
+		aChain.CopyIn(*aDes1);
+		//Fill in Des2 with zeros
+		pTestObject->StripeDes(*aDes2, 0, 500, 0, 0);
+		//Copy out Chain into Des2;
+		aChain.CopyOut(*aDes2);
+		//Compare the contents of Des1 & Des2
+		if(aDes1->Compare(*aDes2))	
+			pTestObject->iHighThreadFails++;
+		pTestObject->iHighThreadTries++;
+		//Free chain
+		aChain.Free();
+		//Sleep for 5ms
+		aTimer.After(aTimerStatus,5000);
+		User::WaitForRequest(aTimerStatus); 
+		}
+	delete aDes1;
+	delete aDes2;
+	CActiveScheduler::Install(NULL);
+	delete aActSch;
+	delete aCleanup;
+	return ret;
+}
+
+
+ 
+enum TVerdict CTest15Concurrency::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+	volatile TExitType aExit;
+
+	//-------------- substep 1 -------------------- 
+	INFO_PRINTF1(_L("  01 Create CMBufManager and install active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
+	CleanupClosePushL(iBufPond);
+
+	//-------------------substep 01-----------------------------	
+	INFO_PRINTF1(_L("  02 Create high priority thread and resume it:"));
+	RThread aThread;
+
+	TInt err=aThread.Create(_L("testThreadRec"), 
+		                       fHighPriorityThread, 
+ 							   KDefaultStackSize, 
+							   KDefaultHeapSize, 
+							   KDefaultHeapSize, 
+							   (TAny*)this,
+							   EOwnerProcess);
+	if (err!=KErrNone)
+		{
+		_LIT(aLog,"Error:Could not create the thread. err = %d"); INFO_PRINTF2(aLog,err);
+		User::Leave(EFail);
+		}
+	aThread.SetPriority(EPriorityAbsoluteHigh);
+	aThread.Resume();
+
+	//-------------------substep 03-----------------------------	
+	INFO_PRINTF1(_L("  02 Do tests in loop end stop when the other finishes"));
+	INFO_PRINTF1(_L("     ...It will take a while (about 10 sec.):"));
+
+	// Allocate two 5000-bytes long descriptors (Des1 & Des2):"));
+	TBuf8<5000> *aDes1, *aDes2;
+    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<5000> );
+    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<5000> );
+	aDes1->SetLength(5000);
+	aDes2->SetLength(5000);
+	//Fill in the Des1 with a pattern:"));
+	StripeDes(*aDes1, 0, 5000, '@', 'Z');
+
+	do {
+		//Allocate 5000-bytes long RMBufChain
+		RMBufChain aChain;
+		TRAPD(ret,aChain.AllocL(5000));
+		if (ret != KErrNone)
+			{
+			INFO_PRINTF1(_L("Error: Couldn't allocate RMBuf:"));
+			User::Leave(EFail);
+			}
+		//Copy in Des1 into Chain
+		aChain.CopyIn(*aDes1);
+		//Fill in Des2 with zeros:"));
+		StripeDes(*aDes2, 0, 5000, 0, 0);
+		//Copy out Chain into Des2:"));
+		aChain.CopyOut(*aDes2);
+		//Compare the contents of Des1 & Des2:
+		if(aDes1->Compare(*aDes2))	iMainThreadFails++;
+		iMainThreadTries++;
+		//Free chain
+		aChain.Free();
+
+		//Check whether the other task has finished
+		aExit = aThread.ExitType();
+		}
+	while (aExit == EExitPending);
+
+	//Clean up stack
+	CleanupStack::PopAndDestroy(aDes2);
+    CleanupStack::PopAndDestroy(aDes1);
+    CleanupStack::PopAndDestroy();
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+
+	//-------------------substep 02-----------------------------	
+	INFO_PRINTF3(_L("     Info: Number of main thread checkings: %d with %d fails"),iMainThreadTries,iMainThreadFails);
+	INFO_PRINTF3(_L("     Info: Number of high priority thread checkings: %d with %d fails"),iHighThreadTries,iHighThreadFails);
+	aThread.Close();
+	if (iHighThreadTries <1000)
+		{
+		INFO_PRINTF1(_L("   Error: High priority thread ended before 1000 loops are finished"));
+         SetTestStepResult(EFail);
+
+		return TestStepResult();
+		}
+	if ( iHighThreadFails || iMainThreadFails)
+		{
+        SetTestStepResult(EFail);
+
+		return TestStepResult();
+		}
+        SetTestStepResult(EPass);
+
+	return TestStepResult();
+  }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test19Prepend.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,243 @@
+// Copyright (c) 2008-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:
+// Test19Prepend.cpp
+// Contains MBufMgr Test Step 19 for Prepend() methods
+//
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+
+#include "TestStepCTMbufmgr.h"
+
+#include "Test19Prepend.h"
+
+// constructor
+CTest19Prepend::CTest19Prepend()
+	{
+	SetTestStepName( _L("MBufMgrTest19") );	// Store the name of this test case
+	}
+
+// destructor
+CTest19Prepend::~CTest19Prepend()
+	{
+	}
+
+//
+enum TVerdict CTest19Prepend::doTestStepL(void)
+	{
+	//-------------- substep 1 --------------------
+	INFO_PRINTF1(_L("  01 Create CMBufManager and install active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+
+	RArray<TCommsBufPoolCreateInfo> poolInfoArray;
+	TCommsBufPoolCreateInfo createInfo;
+	createInfo.iBufSize = 128;
+	createInfo.iInitialBufs = 128;
+	createInfo.iGrowByBufs = 64;
+	createInfo.iMinFreeBufs = 40;
+	createInfo.iCeiling = (KMBufDefaultHeapSize / 2)/createInfo.iBufSize;
+	poolInfoArray.AppendL(createInfo);
+	CreateInstanceMBufMgrL(poolInfoArray);
+	CleanupClosePushL(iBufPond);
+	poolInfoArray.Close ();
+
+	TBool firstFail = EFalse;
+	TBool secondFail = EFalse;
+	TInt ret;
+	RMBufChain chain,chain2;
+
+	//-------------- substep 2 --------------------
+	INFO_PRINTF1(_L("  02 Prepend 20 bytes to an empty chain"));
+	ret = chain.Prepend(20);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't prepend:"));
+		firstFail = ETrue;
+		}
+	else
+		{
+	    if(chain.NumBufs() != 1)
+	        {
+	        INFO_PRINTF1(_L("Error: Wrong number of MBufs allocated:"));
+			secondFail = ETrue;
+		    }
+		if(chain.Length() != 20)
+			{
+			INFO_PRINTF1(_L("Error: Wrong number of bytes prepended:"));
+			secondFail = ETrue;
+			}
+		//-------------- substep 3 --------------------
+		INFO_PRINTF1(_L("  03 Deallocating RMBufChain"));
+		chain.Free();
+		}
+
+	//-------------- substep 4 --------------------
+	INFO_PRINTF1(_L("  04 Prepend 200 bytes to an empty chain"));
+    ret = chain.Prepend(200);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't prepend:"));
+		firstFail = ETrue;
+		}
+	else
+		{
+	    if(chain.NumBufs() != 2)
+	        {
+	        INFO_PRINTF1(_L("Error: Wrong number of MBufs allocated:"));
+			secondFail = ETrue;
+		    }
+		if(chain.Length() != 200)
+			{
+			INFO_PRINTF1(_L("Error: Wrong number of bytes prepended:"));
+			secondFail = ETrue;
+			}
+		//-------------- substep 6 --------------------
+		INFO_PRINTF1(_L("  05 Deallocating RMBufChain"));
+		chain.Free();
+		}
+	//-------------- substep 6 --------------------
+	INFO_PRINTF1(_L("  06 Prepend 20 bytes to an existing chain"));
+	ret = chain.Alloc(20);
+	if (ret != KErrNone)
+	    {
+	    INFO_PRINTF1(_L("Error: Couldn't allocate initial chain:"));
+        firstFail = ETrue;
+	    }
+    else
+        {
+		ret = chain.Prepend(20);
+		if (ret != KErrNone)
+			{
+			INFO_PRINTF1(_L("Error: Couldn't prepend:"));
+			firstFail = ETrue;
+			}
+		else
+			{
+			if(chain.NumBufs() != 2)
+				{
+				INFO_PRINTF1(_L("Error: Wrong number of MBufs allocated:"));
+				secondFail = ETrue;
+				}
+			if(chain.Length() != 40)
+				{
+				INFO_PRINTF1(_L("Error: Wrong number of bytes:"));
+				secondFail = ETrue;
+				}
+		    //-------------- substep 7 --------------------
+			INFO_PRINTF1(_L("  07 Deallocating RMBufChain"));
+			chain.Free();
+			}
+		}
+	//-------------- substep 8 --------------------
+	INFO_PRINTF1(_L("  08 Prepend 200 bytes to an existing chain"));
+	ret = chain.Alloc(20);
+	if (ret != KErrNone)
+	    {
+	    INFO_PRINTF1(_L("Error: Couldn't allocate initial chain:"));
+        firstFail = ETrue;
+	    }
+    else
+        {
+		ret = chain.Prepend(200);
+		if (ret != KErrNone)
+			{
+			INFO_PRINTF1(_L("Error: Couldn't prepend:"));
+			firstFail = ETrue;
+			}
+		else
+			{
+			if(chain.NumBufs() != 3)
+				{
+				INFO_PRINTF1(_L("Error: Wrong number of MBufs allocated:"));
+				secondFail = ETrue;
+				}
+			if(chain.Length() != 220)
+				{
+				INFO_PRINTF1(_L("Error: Wrong number of bytes:"));
+				secondFail = ETrue;
+				}
+		    //-------------- substep 7 --------------------
+			INFO_PRINTF1(_L("  09 Deallocating RMBufChain"));
+			chain.Free();
+			}
+		}
+	//-------------- substep 10 --------------------
+	INFO_PRINTF1(_L("  10 Prepend one chain onto another chain"));
+	ret = chain.Alloc(20);
+	if (ret != KErrNone)
+	    {
+        INFO_PRINTF1(_L("Error: Couldn't allocate initial chain:"));
+        firstFail = ETrue;
+	    }
+    else
+        {
+		ret = chain2.Alloc(200);
+		if (ret != KErrNone)
+			{
+			INFO_PRINTF1(_L("Error: Couldn't allocate second chain:"));
+			firstFail = ETrue;
+			}
+		else
+			{
+			RMBuf* first = chain2.First();
+			chain.Prepend(chain2);
+
+			if(chain.NumBufs() != 3)
+				{
+				INFO_PRINTF1(_L("Error: Wrong number of MBufs in the chain:"));
+				secondFail = ETrue;
+				}
+			if(chain.Length() != 220)
+				{
+				INFO_PRINTF1(_L("Error: Wrong number of bytes:"));
+				secondFail = ETrue;
+				}
+			if(chain.First() != first)
+			    {
+				INFO_PRINTF1(_L("Error: chain2 not prepended correctly:"));
+				secondFail = ETrue;
+				}
+		    //-------------- substep 11 --------------------
+			INFO_PRINTF1(_L("  11 Deallocating RMBufChains"));
+			chain2.Free();
+			}
+		chain.Free();
+		}
+	//-------------- substep 12 --------------------
+	INFO_PRINTF1(_L("  12 Clean up stack:"));
+    CleanupStack::PopAndDestroy(); // pond
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+
+    if (firstFail || secondFail)
+    	{
+        SetTestStepResult(EFail);
+    	}
+    else
+    	{
+        SetTestStepResult(EPass);
+    	}
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test22Append.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,244 @@
+// Copyright (c) 2008-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:
+// Test22Append.cpp
+// Contains MBufMgr Test Step 22 for Append() methods
+//
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+
+#include "TestStepCTMbufmgr.h"
+
+#include "Test22Append.h"
+
+// constructor
+CTest22Append::CTest22Append()
+	{
+	SetTestStepName(_L("MBufMgrTest22"));// Store the name of this test case
+	}
+
+// destructor
+CTest22Append::~CTest22Append()
+	{
+	}
+
+//
+enum TVerdict CTest22Append::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+	//-------------- substep 1 --------------------
+	INFO_PRINTF1(_L("  01 Create CMBufManager and install active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+
+	RArray<TCommsBufPoolCreateInfo> poolInfoArray;
+	TCommsBufPoolCreateInfo createInfo;
+	createInfo.iBufSize = 128;
+	createInfo.iInitialBufs = 128;
+	createInfo.iGrowByBufs = 64;
+	createInfo.iMinFreeBufs = 40;
+	createInfo.iCeiling = (KMBufDefaultHeapSize / 2)/createInfo.iBufSize;
+	poolInfoArray.AppendL(createInfo);
+	CreateInstanceMBufMgrL(poolInfoArray);
+	CleanupClosePushL(iBufPond);
+	poolInfoArray.Close ();
+
+	TBool firstFail = EFalse;
+	TBool secondFail = EFalse;
+	TInt ret;
+	RMBufChain chain,chain2;
+
+	//-------------- substep 2 --------------------
+	INFO_PRINTF1(_L("  02 Append 20 bytes to an empty chain"));
+	ret = chain.Append(20);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't append:"));
+		firstFail = ETrue;
+		}
+	else
+		{
+	    if(chain.NumBufs() != 1)
+	        {
+		    INFO_PRINTF1(_L("Error: Wrong number of MBufs allocated:"));
+			secondFail = ETrue;
+		    }
+		if(chain.Length() != 20)
+			{
+		    INFO_PRINTF1(_L("Error: Wrong number of bytes appended:"));
+			secondFail = ETrue;
+			}
+		//-------------- substep 3 --------------------
+		INFO_PRINTF1(_L("  03 Deallocating RMBufChain"));
+		chain.Free();
+		}
+
+	//-------------- substep 4 --------------------
+	INFO_PRINTF1(_L("  04 Append 200 bytes to an empty chain"));
+    ret = chain.Append(200);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't append:"));
+		firstFail = ETrue;
+		}
+	else
+		{
+	    if(chain.NumBufs() != 2)
+	        {
+		    INFO_PRINTF1(_L("Error: Wrong number of MBufs allocated:"));
+			secondFail = ETrue;
+		    }
+		if(chain.Length() != 200)
+			{
+		    INFO_PRINTF1(_L("Error: Wrong number of bytes appended:"));
+			secondFail = ETrue;
+			}
+		//-------------- substep 6 --------------------
+		INFO_PRINTF1(_L("  05 Deallocating RMBufChain"));
+		chain.Free();
+		}
+	//-------------- substep 6 --------------------
+	INFO_PRINTF1(_L("  06 Append 20 bytes to an existing chain"));
+	ret = chain.Alloc(20);
+	if (ret != KErrNone)
+	    {
+        INFO_PRINTF1(_L("Error: Couldn't allocate initial chain:"));
+        firstFail = ETrue;
+	    }
+    else
+        {
+		ret = chain.Append(20);
+		if (ret != KErrNone)
+			{
+			INFO_PRINTF1(_L("Error: Couldn't append:"));
+			firstFail = ETrue;
+			}
+		else
+			{
+			if(chain.NumBufs() != 1)
+				{
+				INFO_PRINTF1(_L("Error: Wrong number of MBufs allocated:"));
+				secondFail = ETrue;
+				}
+			if(chain.Length() != 40)
+				{
+				INFO_PRINTF1(_L("Error: Wrong number of bytes:"));
+				secondFail = ETrue;
+				}
+		    //-------------- substep 7 --------------------
+			INFO_PRINTF1(_L("  07 Deallocating RMBufChain"));
+			chain.Free();
+			}
+		}
+	//-------------- substep 8 --------------------
+	INFO_PRINTF1(_L("  08 Append 200 bytes to an existing chain"));
+	ret = chain.Alloc(20);
+	if (ret != KErrNone)
+	    {
+        INFO_PRINTF1(_L("Error: Couldn't allocate initial chain:"));
+        firstFail = ETrue;
+	    }
+    else
+        {
+		ret = chain.Append(200);
+		if (ret != KErrNone)
+			{
+			INFO_PRINTF1(_L("Error: Couldn't append:"));
+			firstFail = ETrue;
+			}
+		else
+			{
+			if(chain.NumBufs() != 2)
+				{
+				INFO_PRINTF1(_L("Error: Wrong number of MBufs allocated:"));
+				secondFail = ETrue;
+				}
+			if(chain.Length() != 220)
+				{
+				INFO_PRINTF1(_L("Error: Wrong number of bytes:"));
+				secondFail = ETrue;
+				}
+		    //-------------- substep 9 --------------------
+			INFO_PRINTF1(_L("  09 Deallocating RMBufChain"));
+			chain.Free();
+			}
+		}
+	//-------------- substep 10 --------------------
+	INFO_PRINTF1(_L("  10 Append one chain onto another chain"));
+	ret = chain.Alloc(20);
+	if (ret != KErrNone)
+	    {
+        INFO_PRINTF1(_L("Error: Couldn't allocate initial chain:"));
+        firstFail = ETrue;
+	    }
+    else
+        {
+		ret = chain2.Alloc(200);
+		if (ret != KErrNone)
+			{
+			INFO_PRINTF1(_L("Error: Couldn't allocate second chain:"));
+			firstFail = ETrue;
+			}
+		else
+			{
+			RMBuf* first = chain.First();
+			chain.Append(chain2);
+
+			if(chain.NumBufs() != 3)
+				{
+				INFO_PRINTF1(_L("Error: Wrong number of MBufs in the chain:"));
+				secondFail = ETrue;
+				}
+			if(chain.Length() != 220)
+				{
+				INFO_PRINTF1(_L("Error: Wrong number of bytes:"));
+				secondFail = ETrue;
+				}
+			if(chain.First() != first)
+			    {
+				INFO_PRINTF1(_L("Error: chain2 not appended correctly:"));
+				secondFail = ETrue;
+				}
+		    //-------------- substep 11 --------------------
+			INFO_PRINTF1(_L("  11 Deallocating RMBufChains"));
+			chain2.Free();
+			}
+		chain.Free();
+		}
+	//-------------- substep 12 --------------------
+	INFO_PRINTF1(_L("  12 Clean up stack:"));
+    CleanupStack::PopAndDestroy(); // pond
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+
+    if (firstFail || secondFail)
+    	{
+		SetTestStepResult(EFail);
+    	}
+	else
+		{
+		SetTestStepResult(EPass);
+		}
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/Test23RMBufQ.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,174 @@
+// Copyright (c) 2008-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:
+// Test23RMBufQ.cpp
+// Contains MBufMgr Test Step 22 for Append() methods
+//
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+
+#include "TestStepCTMbufmgr.h"
+
+#include "Test23RMBufQ.h"
+
+// constructor
+CTest23RMBufQ::CTest23RMBufQ()
+	{
+	SetTestStepName(_L("MBufMgrTest23"));// Store the name of this test case
+	}
+
+// destructor
+CTest23RMBufQ::~CTest23RMBufQ()
+	{
+	}
+
+//
+enum TVerdict CTest23RMBufQ::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+
+	//-------------- substep 1 --------------------
+	INFO_PRINTF1(_L("  01 Create CMBufManager and install active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+
+	RArray<TCommsBufPoolCreateInfo> poolInfoArray;
+	TCommsBufPoolCreateInfo createInfo;
+	createInfo.iBufSize = 128;
+	createInfo.iInitialBufs = 128;
+	createInfo.iGrowByBufs = 64;
+	createInfo.iMinFreeBufs = 40;
+	createInfo.iCeiling = (KMBufDefaultHeapSize / 2)/createInfo.iBufSize;
+	poolInfoArray.AppendL(createInfo);
+	CreateInstanceMBufMgrL(poolInfoArray);
+	CleanupClosePushL(iBufPond);
+	poolInfoArray.Close ();
+
+	TBool firstFail = EFalse;
+	TBool secondFail = EFalse;
+	TInt ret;
+	RMBufChain chain,chain2;
+
+	//-------------- substep 2 --------------------
+	INFO_PRINTF1(_L("  2 Append a chain onto an RMBuqQ"));
+	ret = chain.Alloc(20);
+	if (ret != KErrNone)
+	    {
+        INFO_PRINTF1(_L("Error: Couldn't allocate initial chain:"));
+        firstFail = ETrue;
+	    }
+    else
+        {
+		ret = chain2.Alloc(20);
+		if (ret != KErrNone)
+			{
+			INFO_PRINTF1(_L("Error: Couldn't allocate second chain:"));
+			firstFail = ETrue;
+			}
+		else
+			{
+			RMBuf* first2 = chain2.First();
+			RMBuf* first = chain.First();
+
+			RMBufQ aBufList;
+			aBufList.Assign(chain);
+
+			aBufList.Append(chain2);
+
+			// Check that the buffers come back out of the queue in the right order
+			if(aBufList.Remove() != first)
+				{
+				INFO_PRINTF1(_L("Error: chain not appended to RMBufQ correctly:"));
+				secondFail = ETrue;
+				}
+			if(aBufList.Remove() != first2)
+				{
+				INFO_PRINTF1(_L("Error: chain not appended to RMBufQ correctly:"));
+				secondFail = ETrue;
+				}
+			//-------------- substep 3 --------------------
+			INFO_PRINTF1(_L("  3 Deallocating RMBufChains"));
+			chain2.Free();
+		    }
+		chain.Free();
+		}
+	//-------------- substep 4 --------------------
+	INFO_PRINTF1(_L("  4 Prepend a chain onto an RMBuqQ"));
+	ret = chain.Alloc(20);
+	if (ret != KErrNone)
+	    {
+        INFO_PRINTF1(_L("Error: Couldn't allocate initial chain:"));
+        firstFail = ETrue;
+	    }
+    else
+        {
+		ret = chain2.Alloc(20);
+		if (ret != KErrNone)
+			{
+			INFO_PRINTF1(_L("Error: Couldn't allocate second chain:"));
+			firstFail = ETrue;
+			}
+		else
+			{
+			RMBuf* first2 = chain2.First();
+			RMBuf* first = chain.First();
+
+			RMBufQ aBufList;
+			aBufList.Assign(chain);
+
+			aBufList.Prepend(chain2);
+
+			// Check that the buffers come back out of the queue in the right order
+			if(aBufList.Remove() != first2)
+				{
+				INFO_PRINTF1(_L("Error: chain not prepended to RMBufQ correctly:"));
+				secondFail = ETrue;
+				}
+			if(aBufList.Remove() != first)
+				{
+				INFO_PRINTF1(_L("Error: chain not prepended to RMBufQ correctly:"));
+				secondFail = ETrue;
+				}
+			//-------------- substep 5 --------------------
+			INFO_PRINTF1(_L("  5 Deallocating RMBufChains"));
+			chain2.Free();
+		    }
+		chain.Free();
+		}
+	//-------------- substep 6 ---------------------
+	INFO_PRINTF1(_L("  6 Clean up stack:"));
+    CleanupStack::PopAndDestroy(); // pond
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+	
+	if (firstFail || secondFail)
+    	{
+		SetTestStepResult(EFail);
+    	}
+	else
+		{
+		SetTestStepResult(EPass);
+		}
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/TestStepCTMbufmgr.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,117 @@
+// Copyright (c) 2001-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:
+// Contains definition of CTestStepCTMbufmgr which is the base class
+// for all the Mbufmgr Test Step classes
+// 
+//
+
+// EPOC includes
+//#include <e32base.h>
+//#include <es_sock.h>
+
+// Test system includes
+#include <es_mbuf.h>
+
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#include "networking/testsuite.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#include <networking/testsuite.h>
+//#endif
+
+#include "TestStepCTMbufmgr.h"
+#include <comms-infras/commsbufpond.h>
+#include <comms-infras/commsbufpondop.h>
+
+// constructor
+CTestStepCTMbufmgr::CTestStepCTMbufmgr() 
+	{
+	}
+
+// destructor
+CTestStepCTMbufmgr::~CTestStepCTMbufmgr()
+	{
+	}
+
+void CTestStepCTMbufmgr::StripeMem(TUint8 *aBuf, 
+								   TInt aStartPos, 
+								   TInt anEndPos, 
+								   TUint aStartChar, 
+								   TUint anEndChar)
+	{
+	TUint character=aStartChar;
+	for (TInt i=aStartPos;i<anEndPos;i++)
+		{
+		aBuf[i]=(TText8)character;
+		if(++character>anEndChar) character=aStartChar;
+		}
+	}
+
+void CTestStepCTMbufmgr::StripeDes(TDes8 &aBuf, 
+								   TInt aStartPos, 
+								   TInt anEndPos, 
+								   TUint aStartChar, 
+								   TUint anEndChar)
+// Mark a buffer with repeating byte pattern
+	{
+	__ASSERT_ALWAYS(aStartChar<=anEndChar, User::Panic(_L("MBufTest"),0));
+	__ASSERT_ALWAYS(aStartPos<=anEndPos, User::Panic(_L("MBufTest"),0));
+	__ASSERT_ALWAYS(anEndPos<=aBuf.Length(), User::Panic(_L("MBufTest"),0));
+
+	StripeMem((TUint8 *)aBuf.Ptr(), aStartPos, anEndPos, aStartChar, anEndChar);
+	}
+
+// create an mbuf manager instance with some arbitrary default mbuf size alloc info
+// - refer CMBufManager::NewL notes regarding explaination of why this is deliberately not done within the mbuf manager
+static const TInt KMBuf_MBufSize = 128;
+static const TInt KMBuf_MinGrowth = 64;
+static const TInt KMBuf_GrowthThreshold = 40;
+#define SYMBIAN_MBUFMGR_BACKGROUND_ALLOCATION
+#ifndef SYMBIAN_MBUFMGR_BACKGROUND_ALLOCATION
+static const TInt KMBuf_InitialAllocation = 128;
+#endif
+void CTestStepCTMbufmgr::CreateInstanceMBufMgrL(TInt aMaxHeapSize)
+	{
+
+	RArray<TCommsBufPoolCreateInfo> poolInfoArray;
+	TCommsBufPoolCreateInfo createInfo;
+#ifdef SYMBIAN_MBUFMGR_BACKGROUND_ALLOCATION
+	
+	// this method used for tests that dont do background allocation so make the 
+	// pool big enough to fill the heap
+	createInfo.iBufSize = KMBuf_MBufSize;
+	createInfo.iInitialBufs = (aMaxHeapSize/(KMBuf_MBufSize+sizeof(RMBuf)))-1;
+	createInfo.iGrowByBufs = KMBuf_MinGrowth;
+	createInfo.iMinFreeBufs = KMBuf_GrowthThreshold;
+	createInfo.iCeiling = aMaxHeapSize/KMBuf_MBufSize;
+#else
+	createInfo.iBufSize = KMBuf_MBufSize;
+	createInfo.iInitialBufs = KMBuf_InitialAllocation;
+	createInfo.iGrowByBufs = KMBuf_MinGrowth;
+	createInfo.iMinFreeBufs = KMBuf_GrowthThreshold;
+	createInfo.iCeiling = aMaxHeapSize/KMBuf_MBufSize;	
+#endif
+	poolInfoArray.Append ( createInfo );		
+
+	User::LeaveIfError(iBufPond.Open(poolInfoArray));
+	poolInfoArray.Close ();
+	}
+
+void CTestStepCTMbufmgr::CreateInstanceMBufMgrL(RArray<TCommsBufPoolCreateInfo>& aPoolCreateInfo)
+	{
+	User::LeaveIfError(iBufPond.Open(aPoolCreateInfo));
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/test16memoryfull.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,702 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 16 - Memory Full
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+#include <ss_std.h>
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+
+#include "test16memoryfull.h"
+
+#include <comms-infras/mbufallocator.h>
+#include <comms-infras/commsbufpond.h>
+// constructor
+CTest16MemoryFull::CTest16MemoryFull()
+	{
+	SetTestStepName( _L("MBufMgrTest16") );	// Store the name of this test case
+	}
+
+// destructor
+CTest16MemoryFull::~CTest16MemoryFull()
+	{
+	}
+
+//
+void CTest16MemoryFull::FillDes(TDes8 &aBuf, TInt aStartPos, TInt anEndPos, TUint aStartChar, TUint anEndChar)
+	{
+	StripeDes(aBuf, aStartPos, anEndPos, aStartChar, anEndChar);
+	}
+
+RCommsBufPond& CTest16MemoryFull::BufPond()
+	{
+	return iBufPond;
+	}
+
+enum TVerdict CTest16MemoryFull::doTestStepL(void)
+	{
+	//-------------- substep 1 --------------------
+	INFO_PRINTF1(_L("  01 Create CMBufManager and install active scheduler:"));
+	CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+
+	// Create some initial pools
+	// AddL(KMBuf_MBufSize, KMBuf_InitialAllocation, KMBuf_MinGrowth, KMBuf_GrowthThreshold)
+	// Background memory allocation (CMBufPoolManager::RunL) is used more frequently if
+	// the KMBuf_MinGrowth and the KMBuf_GrowthThreshold are similar in size
+	// Synchronous allocation (AllocPool(*poolChain, growth, ETrue)) occurs when the
+	// requested size (iChain.CopyIn(size)) is larger than the KMBuf_MinGrowth
+	// Multiple threads attempt to grow different poolchains at the same time when there
+	// are a greater variety of pool sizes to grow.
+	// 16384
+
+	RArray<TCommsBufPoolCreateInfo> createInfoArray;
+	
+	TCommsBufPoolCreateInfo createInfo;
+	createInfo.iBufSize = 128;
+	createInfo.iInitialBufs = 128;
+	createInfo.iGrowByBufs = 64;
+	createInfo.iMinFreeBufs = 40;
+	createInfo.iCeiling = 410; 
+
+	TCommsBufPoolCreateInfo createInfo2;
+	createInfo2.iBufSize = 256;
+	createInfo2.iInitialBufs = 64;
+	createInfo2.iGrowByBufs = 7;
+	createInfo2.iMinFreeBufs = 6;
+	createInfo2.iCeiling = 204;
+
+	TCommsBufPoolCreateInfo createInfo3;
+	createInfo3.iBufSize = 512;
+	createInfo3.iInitialBufs = 32;
+	createInfo3.iGrowByBufs = 6;
+	createInfo3.iMinFreeBufs = 5;
+	createInfo3.iCeiling = 125;
+
+	TCommsBufPoolCreateInfo createInfo4;
+	createInfo4.iBufSize = 1024;
+	createInfo4.iInitialBufs = 16;
+	createInfo4.iGrowByBufs = 5;
+	createInfo4.iMinFreeBufs = 4;
+	createInfo4.iCeiling = 51; 
+
+	TCommsBufPoolCreateInfo createInfo5;
+	createInfo5.iBufSize = 2048;
+	createInfo5.iInitialBufs = 8;
+	createInfo5.iGrowByBufs = 4;
+	createInfo5.iMinFreeBufs = 3;
+	createInfo5.iCeiling = 15; 
+
+	createInfoArray.Append(createInfo);
+	createInfoArray.Append(createInfo2);
+	createInfoArray.Append(createInfo3);
+	createInfoArray.Append(createInfo4);
+	createInfoArray.Append(createInfo5);
+	// Create 262144
+	CreateInstanceMBufMgrL(createInfoArray);
+	CleanupClosePushL(iBufPond);
+	createInfoArray.Close ();
+
+	TBuf8<KFactor*KFactor*KFactor*KFactor> *aDes1, *aDes2;
+	CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<KFactor*KFactor*KFactor*KFactor> );
+	CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<KFactor*KFactor*KFactor*KFactor> );
+
+	//-------------------substep 02-----------------------------
+	INFO_PRINTF1(_L("  02 Create and install active object that will do the test:"));
+	RMBufAsyncRequest async;
+	CMBufAsyncMemFull* memoryfull;
+	CleanupStack::PushL(memoryfull = new(ELeave) CMBufAsyncMemFull(this, async, aDes1, aDes2));
+	CActiveScheduler::Add(memoryfull);
+
+	//-------------------substep 03-----------------------------
+	INFO_PRINTF1(_L("  03 Start the test:"));
+
+	TInt ret = memoryfull->DoStartTest();
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Async Alloc's failing in test run:"));
+		User::Leave(EFail);
+		}
+
+	// If allocation less than expected then there may be a problem.
+	// So get the allocated memory for each pool chain
+	RMBufAllocator allocator;
+
+	TInt size = allocator.NextMBufSize(0);
+	_LIT(aLogD,"     Info: Available MBufs in %d Pool Chain: %d"); 
+	while (size != KErrNotFound)
+		{
+		INFO_PRINTF3(aLogD, size, allocator.BytesAvailable(size) / size);
+		size = allocator.NextMBufSize(size);
+		}
+	
+//	TInt heapSize = iMBMngr->__DbgGetHeapSize();
+	
+	//Clean up stack
+	CleanupStack::PopAndDestroy(memoryfull);
+	CleanupStack::PopAndDestroy(aDes2);
+	CleanupStack::PopAndDestroy(aDes1);
+	CleanupStack::PopAndDestroy();
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+	
+	//-------------------substep 04-----------------------------
+	_LIT(aLog1,"     Info: Number of main thread checkings: %d with %d fails last failure on %d");
+	INFO_PRINTF4(aLog1,iMainThreadTries,iMainThreadFails,iMainThreadLastFailure);
+	_LIT(aLog2,"     Info: Number of main thread allocate size failures: %d");
+	INFO_PRINTF2(aLog2,iMainThreadSizeFails);
+	_LIT(aLog3,"     Info: Number of high priority thread checkings: %d with %d fails");
+	INFO_PRINTF3(aLog3,iThread3Tries,iThread3Fails);
+	_LIT(aLog4,"     Info: Number of high priority thread allocation failures: %d");
+	INFO_PRINTF2(aLog4,iThread3AllocFails);
+	_LIT(aLog5,"     Info: Number of memory gobbler allocate tries and failures: %d with %d memory full last memory full on %d");
+	INFO_PRINTF4(aLog5,iThread1AllocTries,iThread1MemoryFull,iThread1LastMemoryFull);
+	_LIT(aLog6,"     Info: Number of memory gobbler allocate size failures: %d");
+	INFO_PRINTF2(aLog6,iThread1SizeFails);
+	_LIT(aLog7,"     Info: Number of memory gobbler allocate tries and failures: %d with %d memory full last memory full on %d");
+	INFO_PRINTF4(aLog7,iThread2AllocTries,iThread2MemoryFull,iThread2LastMemoryFull);
+	_LIT(aLog8,"     Info: Number of memory gobbler allocate size failures: %d");
+	INFO_PRINTF2(aLog8,iThread2SizeFails);
+	_LIT(aLog9,"     Info: Max chain length for memory gobbler allocation: %d ; %d");
+	INFO_PRINTF3(aLog9,iThread1MaxLen,iThread2MaxLen);
+//	_LIT(aLogA,"     Info: Max allocated memory: %d"); Log(aLogA,heapSize);
+	_LIT(aLogB,"     Info: Basic API (uses TLS) - Average time to allocate mbufs: %d ; Average time to free mbufs %d");
+	INFO_PRINTF3(aLogB,iThread1AllocTime/iThread1AllocTries,iThread1FreeTime/(1000 - iThread1AllocTries));
+	_LIT(aLogC,"     Info: Higher Speed API (no TLS) - Average time to allocate mbufs: %d ; Average time to free mbufs %d");
+	INFO_PRINTF3(aLogC,iThread2AllocTime/iThread2AllocTries,iThread2FreeTime/(1000 - iThread2AllocTries));
+	
+	if (iThread3Tries <1000)
+		{
+		INFO_PRINTF1(_L("   Error: High priority thread ended before 1000 loops are finished"));
+
+		return EFail;
+		}
+
+	// test to see if the byte by byte comparisons failed
+	if ( iThread3Fails || iMainThreadFails || iThread1SizeFails || iThread2SizeFails)
+		{
+		INFO_PRINTF1(_L("   Error: MBuf allocation failure"));
+
+        SetTestStepResult(EFail);
+		return TestStepResult();
+		}
+
+	// Test the maximum allocated memory
+	// Some of the possible problems include failing to background allocate new memory
+/*	if ( KMBufDefaultHeapSize > (heapSize + KMBufDefaultHeapSize/100) )
+		{
+		Log(_L("   Error: Background allocation may have failed"));
+
+		return EFail;
+		}
+*/   async.Close();
+
+    SetTestStepResult(EPass);
+	return TestStepResult();
+  }
+
+  // Async request
+CMBufAsyncMemFull::CMBufAsyncMemFull(CTest16MemoryFull* aTestObject,
+		RMBufAsyncRequest& aMBufAsyncReq,
+		TDes8 *aDes1,
+		TDes8 *aDes2)
+		:CActive(EPriorityStandard)
+		,iTestObject(aTestObject)
+		,iDes1(aDes1)
+		,iDes2(aDes2)
+		,iMBufAsyncReq(aMBufAsyncReq)
+	{
+	}
+
+TInt CMBufAsyncMemFull::DoStartTest()
+	{
+
+	// Create some random sizes for allocation later
+	for (TInt i=1; i<(KFactor+1); i++)
+		{
+		iRequested_size[i-1] = i * i * i * KFactor;
+		}
+
+	// Allocate two 5000-bytes long descriptors (Des1 & Des2):"));
+	iDes1->SetLength(iRequested_size[KFactor-1]);
+	iDes2->SetLength(iRequested_size[KFactor-1]);
+	//Fill in the Des1 with a pattern:"));
+	iTestObject->FillDes(*iDes1, 0, iRequested_size[KFactor-1], '@', 'Z');
+
+	//-------------------substep 01-----------------------------
+
+	TInt err=iThread1.Create(_L("testThread1Rec"),
+		                       fThread1,
+ 							   KDefaultStackSize,
+							   KDefaultHeapSize,
+							   KMaxHeapSize,
+							   (TAny*)iTestObject,
+							   EOwnerProcess);
+	if (err!=KErrNone)
+		{
+		User::Leave(EFail);
+		}
+	iThread1.SetPriority(EPriorityAbsoluteHigh);
+	iThread1.Resume();
+
+	//-------------------substep 02-----------------------------
+	RThread aThread2;
+
+	err=iThread2.Create(_L("testThread2Rec"),
+		                       fThread2,
+ 							   KDefaultStackSize,
+							   KDefaultHeapSize,
+ 							   KMaxHeapSize,
+							   (TAny*)iTestObject,
+							   EOwnerProcess);
+	if (err!=KErrNone)
+		{
+		User::Leave(EFail);
+		}
+	iThread2.SetPriority(EPriorityAbsoluteHigh);
+	iThread2.Resume();
+
+	//-------------------substep 03-----------------------------
+	RThread aThread3;
+
+	err=iThread3.Create(_L("testThread3Rec"),
+		                       fThread3,
+ 							   KDefaultStackSize,
+							   KDefaultHeapSize,
+							   KMaxHeapSize,
+							   (TAny*)iTestObject,
+							   EOwnerProcess);
+	if (err!=KErrNone)
+		{
+		User::Leave(EFail);
+		}
+	iThread3.SetPriority(EPriorityAbsoluteHigh);
+	iThread3.Resume();
+
+	//-------------------substep 04-----------------------------
+
+	iMBufAsyncReq.Alloc(iChain, iRequested_size[iRequestloop], iStatus);
+	SetActive();
+	CActiveScheduler::Start();
+
+	iThread1.Close();
+	iThread2.Close();
+	iThread3.Close();
+
+	return iStatus.Int();
+	}
+
+
+void CMBufAsyncMemFull::RunL()
+	{
+	if (iStatus.Int() == KErrNone)
+		{
+
+		//Copy in Des1 into Chain
+		iChain.CopyIn(iDes1->LeftTPtr(iRequested_size[iRequestloop]));
+		//Fill left most part of Des2 with zeros:"));
+		iDes2->SetLength(iRequested_size[KFactor-1]);
+		iTestObject->FillDes(*iDes2, 0, iRequested_size[iRequestloop], 0, 0);
+		//Copy out Chain into Des2:"));
+		iChain.CopyOut(*iDes2);
+		//Compare the contents of Des1 & Des2:
+		if((iDes1->LeftTPtr(iRequested_size[iRequestloop])).
+				Compare(iDes2->Left(iRequested_size[iRequestloop])))
+			{
+			iTestObject->iMainThreadFails++;
+			iTestObject->iMainThreadLastFailure = iTestObject->iMainThreadTries;
+			if (iChain.Length() != iRequested_size[iRequestloop])
+				{
+				iTestObject->iMainThreadSizeFails++;
+				}
+			}
+		iTestObject->iMainThreadTries++;
+		//Free chain
+		iChain.Free();
+
+		//Check whether the other task has finished
+		TBool isRunning1 = ETrue;
+		TBool isRunning2 = ETrue;
+		TBool isRunning3 = ETrue;
+		volatile TExitType aExit;
+		aExit = iThread1.ExitType();
+		if (aExit != EExitPending)
+			{
+			isRunning1 = EFalse;
+			}
+		aExit = iThread2.ExitType();
+		if (aExit != EExitPending)
+			{
+			isRunning2 = EFalse;
+			}
+		aExit = iThread3.ExitType();
+		if (aExit != EExitPending)
+			{
+			isRunning3 = EFalse;
+			}
+
+		iRequestloop++;
+		if (iRequestloop>9)
+			{
+			iRequestloop = 0;
+			}
+
+		if (isRunning1 || isRunning2 || isRunning3)
+			{
+
+			iMBufAsyncReq.Alloc(iChain, iRequested_size[iRequestloop], iStatus);
+
+			SetActive();
+
+			return;
+			}
+		}
+	
+	CActiveScheduler::Stop();
+
+	}
+
+// The memory gobbler thread
+TInt CMBufAsyncMemFull::fThread1(TAny* aInput)
+	{
+	CTest16MemoryFull* pTestObject = (CTest16MemoryFull*)aInput;
+	// We need to introduce this new client thread to the MBufMgr
+	TCommsBufPondTLSOp tls(pTestObject->BufPond());
+	tls.Set();
+	
+	CTrapCleanup* aCleanup = CTrapCleanup::New();
+
+	//Install active scheduler
+    CActiveScheduler* aActSch = new CActiveScheduler;
+	if(aActSch==NULL)
+		{
+		return KErrNoMemory;
+		}
+	CActiveScheduler::Install(aActSch);
+
+	RTimer aTimer;
+	TRequestStatus aTimerStatus;	// Request status associated with timer
+	aTimer.CreateLocal();			// Create timer for this thread
+	//-------------- substep 1 --------------------
+
+	// Create some random sizes for allocation later
+	TInt requested_size[KFactor1];
+	for (TInt i=1; i<(KFactor1+1); i++)
+		{
+		requested_size[i-1] = i * i * KFactor1;
+		}
+
+	// Allocate two 5000-bytes long descriptors (Des1 & Des2):"));
+	TBuf8<KFactor1*KFactor1*KFactor1> *aDes1=NULL;
+	TRAPD(ret, aDes1 = new(ELeave) TBuf8<KFactor1*KFactor1*KFactor1> );
+	if(ret!=KErrNone)
+		{
+		return ret;
+		}
+
+	aDes1->SetLength(requested_size[KFactor1-1]);
+
+	//Fill in the Des1 with a pattern:"));
+	pTestObject->FillDes(*aDes1, 0, requested_size[KFactor1-1], 1, 1);
+	
+	TUint time;
+	RMBufChain aChain;
+	RMBufChain bChain;
+	TInt requestloop = 0;
+	TBool isFillMe = ETrue;
+	for (TInt i = 0 ; i<1000;i++)
+		{
+
+		if (isFillMe)
+			{
+			pTestObject->iThread1AllocTries++;
+			//Use up mbuf memory by appending to a chain
+			time = User::FastCounter();
+			TRAP(ret,aChain.AllocL(requested_size[requestloop]));
+			time = User::FastCounter() - time;
+			if (ret != KErrNone)
+				{
+				isFillMe = EFalse;
+				pTestObject->iThread1MemoryFull++;
+				pTestObject->iThread1LastMemoryFull = pTestObject->iThread1AllocTries - 1;
+				}
+			else
+				{
+				pTestObject->iThread1AllocTime += time;
+				//Copy in Des1 into Chain
+				aChain.CopyIn(aDes1->LeftTPtr(requested_size[requestloop]));
+				if (aChain.Length() != requested_size[requestloop])
+					{
+					pTestObject->iThread1SizeFails++;
+					}
+				// Now grow the chain
+				bChain.Append(aChain);
+				}
+			}
+		else
+			{
+			//Free some memory
+			TInt length = bChain.Length();
+			if (length > pTestObject->iThread1MaxLen)
+				{
+				pTestObject->iThread1MaxLen = length;
+				}
+			TInt trimOffset = length - requested_size[requestloop];
+			if (trimOffset > 0)
+				{
+				time = User::FastCounter();
+				bChain.TrimEnd(trimOffset);
+				time = User::FastCounter() - time;
+				pTestObject->iThread1FreeTime += time;
+				}
+			else
+				{
+				isFillMe = ETrue;
+				}
+			}
+
+		//Sleep for 5ms
+		aTimer.After(aTimerStatus,5000);
+		User::WaitForRequest(aTimerStatus);
+
+		requestloop++;
+		if (requestloop>(KFactor1-1))
+			{
+			requestloop = 0;
+			}
+		}
+	// Free the memory
+	bChain.Free();
+
+	delete aDes1;
+	CActiveScheduler::Install(NULL);
+	delete aActSch;
+	delete aCleanup;
+	return ret;
+}
+
+// The memory gobbler thread
+TInt CMBufAsyncMemFull::fThread2(TAny* aInput)
+	{
+	CTest16MemoryFull* pTestObject = (CTest16MemoryFull*)aInput;
+	// We need to introduce this new client thread to the MBufMgr
+	TCommsBufPondTLSOp tls(pTestObject->BufPond());
+	tls.Set();
+
+	CTrapCleanup* aCleanup = CTrapCleanup::New();
+
+	//Install active scheduler
+	CActiveScheduler* aActSch = new CActiveScheduler;
+	if(aActSch==NULL)
+		{
+		return KErrNoMemory;
+		}
+	CActiveScheduler::Install(aActSch);
+
+	RTimer aTimer;
+	TRequestStatus aTimerStatus;	// Request status associated with timer
+	aTimer.CreateLocal();			// Create timer for this thread
+	//-------------- substep 1 --------------------
+
+	// Create some random sizes for allocation later
+	TInt requested_size[KFactor2];
+	for (TInt i=1; i<(KFactor2+1); i++)
+		{
+		requested_size[i-1] = i * i * KFactor2;
+		}
+
+	// Allocate two 5000-bytes long descriptors (Des1 & Des2):"));
+	TBuf8<KFactor2*KFactor2*KFactor2> *aDes1=NULL;
+	TRAPD(ret, aDes1 = new(ELeave) TBuf8<KFactor2*KFactor2*KFactor2> );
+	if(ret!=KErrNone)
+		{
+		return ret;
+		}
+
+	aDes1->SetLength(requested_size[KFactor2-1]);
+
+	//Fill in the Des1 with a pattern:"));
+	pTestObject->FillDes(*aDes1, 0, requested_size[KFactor2-1], 2, 2);
+	
+	RMBufAllocator allocator;
+	TUint time;
+	
+	RMBufChain aChain;
+	RMBufChain bChain;
+	TInt requestloop = 0;
+	TBool isFillMe = ETrue;
+	for (TInt i = 0 ; i<1000;i++)
+		{
+
+		if (isFillMe)
+			{
+			pTestObject->iThread2AllocTries++;
+			//Use up mbuf memory by appending to a chain
+			time = User::FastCounter();
+			TRAP(ret,aChain.AllocL(requested_size[requestloop], allocator));
+			time = User::FastCounter() - time;
+			if (ret != KErrNone)
+				{
+				isFillMe = EFalse;
+				pTestObject->iThread2MemoryFull++;
+				pTestObject->iThread2LastMemoryFull = pTestObject->iThread2AllocTries - 1;
+				}
+			else
+				{
+				pTestObject->iThread2AllocTime += time;
+				//Copy in Des1 into Chain
+				aChain.CopyIn(aDes1->LeftTPtr(requested_size[requestloop]));
+				if (aChain.Length() != requested_size[requestloop])
+					{
+					pTestObject->iThread2SizeFails++;
+					}
+				// Now grow the chain
+				bChain.Append(aChain);
+				}
+			}
+		else
+			{
+			//Free some memory
+			TInt length = bChain.Length();
+			if (length > pTestObject->iThread2MaxLen)
+				{
+				pTestObject->iThread2MaxLen = length;
+				}
+			TInt trimOffset = length - requested_size[requestloop];
+			if (trimOffset > 0)
+				{
+				time = User::FastCounter();
+				bChain.TrimEnd(trimOffset);
+				time = User::FastCounter() - time;
+				pTestObject->iThread2FreeTime += time;
+				}
+			else
+				{
+				isFillMe = ETrue;
+				}
+			}
+
+		//Sleep for 5ms
+		aTimer.After(aTimerStatus,5000);
+		User::WaitForRequest(aTimerStatus);
+
+		requestloop++;
+		if (requestloop>(KFactor2-1))
+			{
+			requestloop = 0;
+			}
+		}
+	// Free the memory
+	bChain.Free();
+
+	delete aDes1;
+
+	CActiveScheduler::Install(NULL);
+	delete aActSch;
+	delete aCleanup;
+	return ret;
+}
+
+//
+TInt CMBufAsyncMemFull::fThread3(TAny* aInput)
+	{
+	CTest16MemoryFull* pTestObject = (CTest16MemoryFull*)aInput;
+	// We need to introduce this new client thread to the MBufMgr
+	TCommsBufPondTLSOp tls(pTestObject->BufPond());
+	tls.Set();
+
+	CTrapCleanup* aCleanup = CTrapCleanup::New();
+
+	//Install active scheduler
+	CActiveScheduler* aActSch = new CActiveScheduler;
+	if(aActSch==NULL)
+		{
+		return KErrNoMemory;
+		}
+	CActiveScheduler::Install(aActSch);
+
+	RTimer aTimer;
+	TRequestStatus aTimerStatus;	// Request status associated with timer
+	aTimer.CreateLocal();			// Create timer for this thread
+	//-------------- substep 1 --------------------
+
+	// Allocate two 500-bytes long descriptors (Des1 & Des2):"));
+	TBuf8<500> *aDes1 = NULL;
+	TBuf8<500> *aDes2 = NULL;
+
+	TRAPD(ret, aDes1 = new(ELeave) TBuf8<500>);
+	if(ret!=KErrNone)
+		{
+		return ret;
+		}
+
+	TRAP(ret, aDes2 = new(ELeave) TBuf8<500>);
+	if(ret!=KErrNone)
+		{
+		delete aDes1;
+		return ret;
+		}
+
+	aDes1->SetLength(500);
+	aDes2->SetLength(500);
+
+	//Fill in the Des1 with a pattern
+	pTestObject->FillDes(*aDes1, 0, 500, 'a', 'z');
+
+	for (TInt i = 0 ; i<1000;i++)
+		{
+		//Allocate 500-bytes long RMBufChain
+		RMBufChain aChain;
+		TRAP(ret,aChain.AllocL(500));
+		if (ret == KErrNone)
+			{
+			//Copy in Des1 into Chain
+			aChain.CopyIn(*aDes1);
+			//Fill in Des2 with zeros
+			pTestObject->FillDes(*aDes2, 0, 500, 0, 0);
+			//Copy out Chain into Des2;
+			aChain.CopyOut(*aDes2);
+			//Compare the contents of Des1 & Des2
+			if(aDes1->Compare(*aDes2))
+				pTestObject->iThread3Fails++;
+			//Free chain
+			aChain.Free();
+			}
+		else
+			{
+			pTestObject->iThread3AllocFails++;
+			}
+		pTestObject->iThread3Tries++;
+		//Sleep for 5ms
+		aTimer.After(aTimerStatus,5000);
+		User::WaitForRequest(aTimerStatus);
+		}
+	delete aDes1;
+	delete aDes2;
+	CActiveScheduler::Install(NULL);
+	delete aActSch;
+	delete aCleanup;
+	return ret;
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/test17requestsizelimits.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,314 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 17 for getting mbufs within request size limits
+// 
+//
+
+
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+#include "TestStepCTMbufmgr.h"
+
+#include "test17requestsizelimits.h"
+
+// RHeap information
+#include <comms-infras/mbufallocator.h>
+#include <comms-infras/commsbufpond.h>
+
+CTest17RequestSizeLimits::CTest17RequestSizeLimits()
+	{
+	SetTestStepName( _L("MBufMgrTest17") );	// Store the name of this test case
+	}
+
+CTest17RequestSizeLimits::~CTest17RequestSizeLimits()
+	{
+	}
+
+void CTest17RequestSizeLimits::FillDes(TDes8 &aBuf, TInt aStartPos, TInt anEndPos, TUint aStartChar, TUint anEndChar)
+	{
+	StripeDes(aBuf, aStartPos, anEndPos, aStartChar, anEndChar);
+	}
+
+enum TVerdict CTest17RequestSizeLimits::doTestStepL(void)
+	{
+	//-------------- substep 1 --------------------
+	INFO_PRINTF1(_L("  01 Create CMBufManager and install active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+
+	// Create some initial pools
+	// AddL(KMBuf_MBufSize, KMBuf_InitialAllocation, KMBuf_MinGrowth, KMBuf_GrowthThreshold)
+	// Background memory allocation (CMBufPoolManager::RunL) is used more frequently if
+	// the KMBuf_MinGrowth and the KMBuf_GrowthThreshold are similar in size
+	// Synchronous allocation (AllocPool(*poolChain, growth, ETrue)) occurs when the
+	// requested size (iChain.CopyIn(size)) is larger than the KMBuf_MinGrowth
+	// Multiple threads attempt to grow different poolchains at the same time when there
+	// are a greater variety of pool sizes to grow.
+	// 16384
+	TInt totalPools = 5;
+	TInt poolSize = KMBufDefaultHeapSize/totalPools;	
+	RArray<TCommsBufPoolCreateInfo> createInfoArray;
+	
+	TCommsBufPoolCreateInfo createInfo;
+	createInfo.iBufSize = 128;
+	createInfo.iInitialBufs = 128;
+	createInfo.iGrowByBufs = 64;
+	createInfo.iMinFreeBufs = 40;
+	createInfo.iCeiling = poolSize/createInfo.iBufSize;
+
+	TCommsBufPoolCreateInfo createInfo2;
+	createInfo2.iBufSize = 256;
+	createInfo2.iInitialBufs = 64;
+	createInfo2.iGrowByBufs = 7;
+	createInfo2.iMinFreeBufs = 6;
+	createInfo2.iCeiling = poolSize/createInfo.iBufSize;	
+
+	TCommsBufPoolCreateInfo createInfo3;
+	createInfo3.iBufSize = 512;
+	createInfo3.iInitialBufs = 32;
+	createInfo3.iGrowByBufs = 6;
+	createInfo3.iMinFreeBufs = 5;
+	createInfo3.iCeiling = poolSize/createInfo.iBufSize;	
+
+	TCommsBufPoolCreateInfo createInfo4;
+	createInfo4.iBufSize = 1024;
+	createInfo4.iInitialBufs = 16;
+	createInfo4.iGrowByBufs = 5;
+	createInfo4.iMinFreeBufs = 4;
+	createInfo4.iCeiling = poolSize/createInfo.iBufSize;	
+
+	TCommsBufPoolCreateInfo createInfo5;
+	createInfo5.iBufSize = 2048;
+	createInfo5.iInitialBufs = 8;
+	createInfo5.iGrowByBufs = 4;
+	createInfo5.iMinFreeBufs = 3;
+	createInfo5.iCeiling = poolSize/createInfo.iBufSize;	
+
+	createInfoArray.Append(createInfo);
+	createInfoArray.Append(createInfo2);
+	createInfoArray.Append(createInfo3);
+	createInfoArray.Append(createInfo4);
+	createInfoArray.Append(createInfo5);
+	// Create 262144
+	CreateInstanceMBufMgrL(createInfoArray);
+	CleanupClosePushL(iBufPond);
+	createInfoArray.Close ();
+	RMBufAllocator allocator;
+	
+	//-------------- substep 2 --------------------
+	INFO_PRINTF1(_L("  02 Fill in the Des1 with a pattern:"));
+	TBuf8<5000> *aDes1 = NULL;
+	TRAPD(ret, aDes1 = new(ELeave) TBuf8<5000>);
+	if(ret != KErrNone)
+		return EFail;
+
+	aDes1->SetLength(5000);
+	FillDes(*aDes1, 0, 5000, 1, 1);
+	
+	TBool firstAllocFail = EFalse;
+	TBool secondAllocFail = EFalse;
+	TBool thirdAllocFail = EFalse;
+	
+	TUint time;
+	RMBufChain aChain;
+		
+	//-------------- substep 3 --------------------
+	INFO_PRINTF1(_L("  03 Allocate 5000-bytes long RMBufChain with 128-bytes long RMBuf:"));
+
+	time = User::FastCounter();
+	ret = aChain.Alloc(5000, 128, 128, allocator);
+	time = User::FastCounter() - time;
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't allocate RMBufChain:"));
+		User::Leave(EFail);
+		}
+	
+	//Copy in Des1 into Chain
+	aChain.CopyIn(aDes1->LeftTPtr(5000));
+	if (aChain.Length() != 5000)
+		{
+		INFO_PRINTF1(_L("Error: Allocated RMBufChain size does not match requested:"));
+		firstAllocFail = ETrue;
+		}
+	
+	TInt count = 0;
+	//Check RMBuf size is really 128
+	RMBuf* mBuf = aChain.First();
+	while (mBuf != NULL)
+		{
+		count++;
+		if (mBuf->Size() != 128)
+			{
+			INFO_PRINTF1(_L("Error: RMBuf size does not match requested:"));
+			firstAllocFail = ETrue;
+			break;
+			}
+		mBuf = mBuf->Next();
+		}
+	
+	if (firstAllocFail == EFalse)
+		{
+		_LIT(aLog1, "     Info: Time to allocate 5000-bytes long RMBufChain with %d 128-bytes long RMBuf: %d"); 
+		INFO_PRINTF3(aLog1, count, time);
+		}
+	
+	//-------------- substep 4 --------------------
+	INFO_PRINTF1(_L("  04 Deallocating RMBufChain"));
+	aChain.Free();
+
+	//-------------- substep 5 --------------------
+	INFO_PRINTF1(_L("  05 Allocate 50-bytes long RMBufChain with 1024-bytes long RMBuf:"));
+
+	time = User::FastCounter();
+	ret = aChain.Alloc(50, 1024, 1024, allocator);
+	time = User::FastCounter() - time;
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't allocate RMBufChain:"));
+		User::Leave(EFail);
+		}
+	
+	//Copy in Des1 into Chain
+	aChain.CopyIn(aDes1->LeftTPtr(50));
+	if (aChain.Length() != 50)
+		{
+		INFO_PRINTF1(_L("Error: Allocated RMBufChain size does not match requested:"));
+		secondAllocFail = ETrue;
+		}
+	
+	count = 0;
+	//Check RMBuf size is really 1024
+	mBuf = aChain.First();
+	while (mBuf != NULL)
+		{
+		count++;
+		if (mBuf->Size() != 1024)
+			{
+			INFO_PRINTF1(_L("Error: RMBuf size does not match requested:"));
+			secondAllocFail = ETrue;
+			break;
+			}
+		mBuf = mBuf->Next();
+		}
+	
+	if (secondAllocFail == EFalse)
+		{
+		_LIT(aLog2, "     Info: Time to allocate 50-bytes long RMBufChain with %d 1024-bytes long RMBuf: %d"); 
+		INFO_PRINTF3(aLog2, count, time);
+		}
+	
+	//-------------- substep 6 --------------------
+	INFO_PRINTF1(_L("  06 Deallocating RMBufChain"));
+	aChain.Free();
+	
+	//-------------- substep 7 --------------------
+	INFO_PRINTF1(_L("  07 Allocate 1500-bytes long RMBufChain with RMBuf size between 1100 and 2000:"));
+
+	ret = aChain.Alloc(1500, 1100, 2000, allocator);
+	if (ret == KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Allocated with false size RMBuf:"));
+		thirdAllocFail = ETrue;
+		aChain.Free();
+		}
+	else
+		INFO_PRINTF1(_L("     Info: Couldn't allocate because no MBuf with size between 1100 and 2000:"));
+
+	//-------------- substep 8 --------------------
+	INFO_PRINTF1(_L("  08 Allocate 1500-bytes long RMBufChain with RMBuf min. size 2100:"));
+
+	ret = aChain.Alloc(1500, 2100, allocator);
+	if (ret == KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Allocated with false size RMBuf:"));
+		thirdAllocFail = ETrue;
+		aChain.Free();
+		}
+	else
+		INFO_PRINTF1(_L("     Info: Couldn't allocate because no MBuf with size greater than 2100:"));
+	
+	//-------------- substep 9 --------------------
+	INFO_PRINTF1(_L("  09 Allocate 1500-bytes long RMBufChain with RMBuf max. size 100:"));
+
+	ret = aChain.Alloc(1500, 0, 100, allocator);
+	if (ret == KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Allocated with false size RMBuf:"));
+		thirdAllocFail = ETrue;
+		aChain.Free();
+		}
+	else
+		INFO_PRINTF1(_L("     Info: Couldn't allocate because no MBuf with size smaller than 100:"));
+
+	//-------------- substep 10 --------------------
+	INFO_PRINTF1(_L("  10 Exhaust 512-bytes long RMBufChain :"));
+	
+	RMBufChain bChain;
+	
+	while (allocator.BytesAvailable(512) / 512 > 0)
+		{
+		ret = aChain.Alloc(500, allocator);
+		if (ret != KErrNone)
+			{
+			INFO_PRINTF1(_L("Error: Couldn't allocate RMBufChain:"));
+			User::Leave(EFail);
+			}
+	
+		// Now grow the chain
+		bChain.Append(aChain);
+		}
+	
+	//-------------- substep 11 --------------------
+	INFO_PRINTF1(_L("  15 Allocate 500-bytes long RMBufChain with 512-bytes long RMBuf:"));
+
+	ret = aChain.Alloc(500, 512, 512, allocator);
+	if (ret == KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Allocated with false size RMBuf:"));
+		thirdAllocFail = ETrue;
+		aChain.Free();
+		}
+	else
+		INFO_PRINTF1(_L("     Info: Couldn't allocate because no more 512-bytes long RMBuf:"));
+	
+	//-------------- substep 12 --------------------
+	INFO_PRINTF1(_L("  12 Deallocating RMBufChain"));
+	bChain.Free();
+
+	delete aDes1;
+	
+	//-------------- substep 13 --------------------
+	INFO_PRINTF1(_L("  13 Clean up stack:"));
+   	CleanupStack::PopAndDestroy();
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+	
+	if (firstAllocFail || secondAllocFail || thirdAllocFail)
+		{
+        SetTestStepResult(EFail);
+		return TestStepResult();
+		}
+		
+    SetTestStepResult(EPass);
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/test18exhaustmidsizepools.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,409 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 18 for exhausting mid size pools
+// 
+//
+
+
+#include <e32base.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+
+#include "TestStepCTMbufmgr.h"
+
+#include "test18exhaustmidsizepools.h"
+
+// RHeap information
+#include <comms-infras/mbufallocator.h>
+#include <comms-infras/commsbufpond.h>
+
+CTest18ExhaustMidSizePools::CTest18ExhaustMidSizePools()
+	{
+	SetTestStepName( _L("MBufMgrTest18") );	// Store the name of this test case
+	}
+
+CTest18ExhaustMidSizePools::~CTest18ExhaustMidSizePools()
+	{
+	}
+
+void CTest18ExhaustMidSizePools::FillDes(TDes8 &aBuf, TInt aStartPos, TInt anEndPos, TUint aStartChar, TUint anEndChar)
+	{
+	StripeDes(aBuf, aStartPos, anEndPos, aStartChar, anEndChar);
+	}
+
+enum TVerdict CTest18ExhaustMidSizePools::doTestStepL(void)
+	{
+	//-------------- substep 1 --------------------
+	INFO_PRINTF1(_L("  01 Create CMBufManager and install active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+
+
+	// Create some initial pools
+	// AddL(KMBuf_MBufSize, KMBuf_InitialAllocation, KMBuf_MinGrowth, KMBuf_GrowthThreshold)
+	// Background memory allocation (CMBufPoolManager::RunL) is used more frequently if
+	// the KMBuf_MinGrowth and the KMBuf_GrowthThreshold are similar in size
+	// Synchronous allocation (AllocPool(*poolChain, growth, ETrue)) occurs when the
+	// requested size (iChain.CopyIn(size)) is larger than the KMBuf_MinGrowth
+	// Multiple threads attempt to grow different poolchains at the same time when there
+	// are a greater variety of pool sizes to grow.
+	// 16384
+	TInt totalPools = 5;
+	TInt poolSize = (KMBufDefaultHeapSize / 2)/totalPools;	
+
+	RArray<TCommsBufPoolCreateInfo> createInfoArray;
+	
+	TCommsBufPoolCreateInfo createInfo;
+	createInfo.iBufSize = 128;
+	createInfo.iInitialBufs = 128;
+	createInfo.iGrowByBufs = 64;
+	createInfo.iMinFreeBufs = 40;
+	createInfo.iCeiling = poolSize/createInfo.iBufSize;
+
+	TCommsBufPoolCreateInfo createInfo2;
+	createInfo2.iBufSize = 256;
+	createInfo2.iInitialBufs = 64;
+	createInfo2.iGrowByBufs = 7;
+	createInfo2.iMinFreeBufs = 6;
+	createInfo2.iCeiling = poolSize/createInfo.iBufSize;	
+
+	TCommsBufPoolCreateInfo createInfo3;
+	createInfo3.iBufSize = 512;
+	createInfo3.iInitialBufs = 32;
+	createInfo3.iGrowByBufs = 6;
+	createInfo3.iMinFreeBufs = 5;
+	createInfo3.iCeiling = poolSize/createInfo.iBufSize;	
+
+	TCommsBufPoolCreateInfo createInfo4;
+	createInfo4.iBufSize = 1024;
+	createInfo4.iInitialBufs = 16;
+	createInfo4.iGrowByBufs = 5;
+	createInfo4.iMinFreeBufs = 4;
+	createInfo4.iCeiling = poolSize/createInfo.iBufSize;	
+
+	TCommsBufPoolCreateInfo createInfo5;
+	createInfo5.iBufSize = 2048;
+	createInfo5.iInitialBufs = 8;
+	createInfo5.iGrowByBufs = 4;
+	createInfo5.iMinFreeBufs = 3;
+	createInfo5.iCeiling = poolSize/createInfo.iBufSize;	
+
+	createInfoArray.Append(createInfo);
+	createInfoArray.Append(createInfo2);
+	createInfoArray.Append(createInfo3);
+	createInfoArray.Append(createInfo4);
+	createInfoArray.Append(createInfo5);
+
+	// Create 262144
+	CreateInstanceMBufMgrL(createInfoArray);
+	CleanupClosePushL(iBufPond);
+	createInfoArray.Close ();
+	
+	RMBufAllocator allocator;
+	
+	TInt allocTime128 = 0;
+	TInt allocTime256 = 0;
+	TInt allocTime512 = 0;
+	TInt allocTime1024 = 0;
+	TInt allocTime2048 = 0;
+	
+	TInt allocCount128 = 0;
+	TInt allocCount256 = 0;
+	TInt allocCount512 = 0;
+	TInt allocCount1024 = 0;
+	TInt allocCount2048 = 0;
+	
+	TInt allocIndex128 = 0;
+	TInt allocIndex256 = 0;
+	TInt allocIndex512 = 0;
+	TInt allocIndex1024 = 0;
+	TInt allocIndex2048 = 0;
+	
+	TInt failedSizeCount = 0;
+	
+	TInt counter = 0;
+	
+	TUint time;
+	RMBufChain aChain, bChain;
+	RMBufChain mbuf1, mbuf2, mbuf3, mbuf4, mbuf5, mbuf6;
+	
+	//-------------- substep 2 --------------------
+	INFO_PRINTF1(_L("  02 Fill in the Des1 with a pattern:"));
+	TBuf8<2500> *aDes1 = NULL;
+	TRAPD(ret, aDes1 = new(ELeave) TBuf8<2500>);
+	if(ret != KErrNone)
+		{
+        SetTestStepResult(EFail);
+		return TestStepResult();
+		}
+
+	aDes1->SetLength(2500);
+	FillDes(*aDes1, 0, 2500, 1, 1);
+	
+	//-------------- substep 3 --------------------
+	INFO_PRINTF1(_L("  03 Start to allocate 500-bytes long RMBufs:"));
+
+	time = User::FastCounter();
+	ret = aChain.Alloc(500, allocator);
+	time = User::FastCounter() - time;
+	while (ret == KErrNone)
+		{
+		//Copy in Des1 into Chain
+		aChain.CopyIn(aDes1->LeftTPtr(500));
+		if (aChain.Length() != 500)
+			{
+			INFO_PRINTF1(_L("Error: Allocated RMBufChain size does not match requested:"));
+			failedSizeCount++;
+			}
+		
+		switch (aChain.First()->Size())
+			{
+			case 128:
+				if (allocator.BytesAvailable(256) / 256 > 0)
+					{
+					INFO_PRINTF1(_L("Error: 256-bytes long RMBuf available, but allocated 128-bytes long RMBuf:"));
+					}
+				else if (allocIndex128 == 0)
+					{
+					counter++;
+					allocIndex128 = counter;
+					}
+				allocCount128++;
+				allocTime128 += time;
+				break;
+			case 256:
+				if (allocator.BytesAvailable(2048) / 2048 > 0)
+					{
+					INFO_PRINTF1(_L("Error: 2048-bytes long RMBuf available, but allocated 256-bytes long RMBuf:"));
+					}
+				else if (allocIndex256 == 0)
+					{
+					counter++;
+					allocIndex256 = counter;
+					}
+				allocCount256++;
+				allocTime256 += time;
+				break;
+			case 512:
+				if (allocIndex512 == 0)
+					{
+					counter++;
+					allocIndex512 = counter;
+					}
+				allocCount512++;
+				allocTime512 += time;
+				break;
+			case 1024:
+				if (allocator.BytesAvailable(512) / 512 > 0)
+					{
+					INFO_PRINTF1(_L("Error: 512-bytes long RMBuf available, but allocated 1024-bytes long RMBuf:"));
+					}
+				else if (allocIndex1024 == 0)
+					{
+					counter++;
+					allocIndex1024 = counter;
+					}
+				allocCount1024++;
+				allocTime1024 += time;
+				break;
+			case 2048:
+				if (allocator.BytesAvailable(1024) / 1024 > 0)
+					{
+					INFO_PRINTF1(_L("Error: 1024-bytes long RMBuf available, but allocated 2048-bytes long RMBuf:"));
+					}
+				else if (allocIndex2048 == 0)
+					{
+					counter++;
+					allocIndex2048 = counter;
+					}
+				allocCount2048++;
+				allocTime2048 += time;				
+				break;
+			}
+		
+		// Now grow the chain
+		if (allocCount256 == 1)
+			{
+			mbuf1.Append(aChain);
+			}
+		else if (allocCount512 == 1)
+			{
+			mbuf2.Append(aChain);
+			}
+		else if (allocCount512 == 2)
+			{
+			mbuf3.Append(aChain);
+			}
+		else if (allocCount512 == 3)
+			{
+			mbuf4.Append(aChain);
+			}
+		else if (allocCount2048 == 1)
+			{
+			mbuf5.Append(aChain);
+			}
+		else if (allocCount2048 == 2)
+			{
+			mbuf6.Append(aChain);
+			}
+		else
+			{
+			bChain.Append(aChain);
+			}
+		
+		time = User::FastCounter();
+		ret = aChain.Alloc(500, allocator);
+		time = User::FastCounter() - time;
+		}
+
+	if (allocIndex512 == 1)
+		{
+		_LIT(aLog1,"     Info: %d. Time to alloc %d 512-bytes long RMBuf: %d Average: %d");
+		INFO_PRINTF5(aLog1, allocIndex512, allocCount512, allocTime512, allocTime512/allocCount512);
+		}
+	if (allocIndex1024 == 2)
+		{
+		_LIT(aLog2,"     Info: %d. Time to alloc %d 1024-bytes long RMBuf: %d Average: %d");
+		INFO_PRINTF5(aLog2, allocIndex1024, allocCount1024, allocTime1024, allocTime1024/allocCount1024);
+		}
+	if (allocIndex2048 == 3)
+		{
+		_LIT(aLog3,"     Info: %d. Time to alloc %d 2048-bytes long RMBuf: %d Average: %d");
+		INFO_PRINTF5(aLog3, allocIndex2048, allocCount2048, allocTime2048, allocTime2048/allocCount2048);
+		}
+	if (allocIndex256 == 4)
+		{
+		_LIT(aLog4,"     Info: %d. Time to alloc %d 256-bytes long RMBuf: %d Average: %d");
+		INFO_PRINTF5(aLog4, allocIndex256, allocCount256, allocTime256, allocTime256/allocCount256);
+		}
+	if (allocIndex128 == 5)
+		{
+		_LIT(aLog5,"     Info: %d. Time to alloc %d 128-bytes long RMBuf: %d Average: %d");
+		INFO_PRINTF5(aLog5, allocIndex128, allocCount128, allocTime128, allocTime128/allocCount128);
+		}
+	
+	TBool firstSuccess = ETrue;
+	TBool secondSuccess = ETrue;
+	TBool thirdSuccess = ETrue;
+	
+	//-------------------substep 4-----------------------------
+	INFO_PRINTF1(_L("  04 Allocate 750-byte long RMBuf after deallocating 1 256-byte and 2 512-byte long RMBufs:"));	
+	mbuf1.TrimEnd(244);	// 256-byte mbuf
+	mbuf2.Free();		// 512-byte mbuf	
+	mbuf3.Free();		// 512-byte mbuf
+	
+	ret = aChain.Alloc(750, allocator);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't allocate RMBuf:"));
+		firstSuccess = EFalse;
+		}
+	else
+		{
+		//Copy in Des1 into Chain
+		aChain.CopyIn(aDes1->LeftTPtr(750));
+		if (aChain.Length() != 750)
+			{
+			INFO_PRINTF1(_L("Error: Allocated RMBufChain size does not match requested:"));
+			firstSuccess = EFalse;
+			}
+		
+		// 1 512-byte long RMBuf should be free
+		if (allocator.BytesAvailable(512) == 512)
+			{
+			INFO_PRINTF1(_L("     Info: 1 512-byte long RMBuf is free:"));
+			}
+		else
+			{
+			INFO_PRINTF1(_L("Error: 1 512-byte long RMBuf should be free, but not:"));
+			firstSuccess = EFalse;
+			}
+		}
+		
+	bChain.Append(aChain);
+	
+	//-------------------substep 5-----------------------------
+	INFO_PRINTF1(_L("  05 Allocate 750-byte long RMBuf after deallocating 2 512-byte long RMBufs:"));
+	mbuf4.Free();	// 512-byte mbuf
+	
+	ret = aChain.Alloc(750, allocator);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't allocate RMBuf:"));
+		secondSuccess = EFalse;
+		}
+	else
+		{
+		//Copy in Des1 into Chain
+		aChain.CopyIn(aDes1->LeftTPtr(750));
+		if (aChain.Length() != 750)
+			{
+			INFO_PRINTF1(_L("Error: Allocated RMBufChain size does not match requested:"));
+			secondSuccess = EFalse;
+			}
+		}
+		
+	bChain.Append(aChain);
+	
+	//-------------------substep 6-----------------------------
+	INFO_PRINTF1(_L("  06 Allocate 2100-byte long RMBuf after deallocating 2 2048-byte long RMBufs:"));	
+	mbuf5.Free();	// 2048-byte mbuf
+	mbuf6.Free();	// 2048-byte mbuf
+	
+	ret = aChain.Alloc(2100, allocator);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Couldn't allocate RMBuf:"));
+		thirdSuccess = EFalse;
+		}
+	else
+		{
+		//Copy in Des1 into Chain
+		aChain.CopyIn(aDes1->LeftTPtr(2100));
+		if (aChain.Length() != 2100)
+			{
+			INFO_PRINTF1(_L("Error: Allocated RMBufChain size does not match requested:"));
+			thirdSuccess = EFalse;
+			}
+		}
+		
+	bChain.Append(aChain);
+	
+	mbuf1.Free();
+	bChain.Free();
+	
+	delete aDes1;
+		
+	//-------------- substep 7 --------------------
+	INFO_PRINTF1(_L("  07 Clean up stack:"));
+    CleanupStack::PopAndDestroy();
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+	
+	if (ret != KErrNone || failedSizeCount > 0 || !firstSuccess || !secondSuccess || !thirdSuccess)
+		{
+        SetTestStepResult(EFail);
+		return TestStepResult();
+		}
+	
+    SetTestStepResult(EPass);
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/test20poolceilingfull.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,215 @@
+/*
+* 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: 
+*
+*/
+
+#include <ss_std.h>
+
+// Test system includes
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+
+#include "TestStepCTMbufmgr.h"
+
+#include "test20poolceilingfull.h"
+
+
+CTest20PoolCeilingFull::CTest20PoolCeilingFull()
+	{
+	SetTestStepName( _L("MBufMgrTest20") );	// Store the name of this test case
+	}
+
+CTest20PoolCeilingFull::~CTest20PoolCeilingFull()
+	{
+	iChain.Free();
+	}
+
+TVerdict CTest20PoolCeilingFull::doTestStepL()
+	{
+	__UHEAP_MARK;
+	//-------------- substep 1 --------------------
+	INFO_PRINTF1(_L("  01 Create CMBufManager and install active scheduler:"));
+	
+	CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+
+	RArray<TCommsBufPoolCreateInfo> createInfoArray;
+	
+	TCommsBufPoolCreateInfo createInfo;
+	createInfo.iBufSize = 256;
+	createInfo.iInitialBufs = 50;
+	createInfo.iGrowByBufs = 20;
+	createInfo.iMinFreeBufs = 4;
+	createInfo.iCeiling = 100; 
+	createInfoArray.Append(createInfo);
+
+	CreateInstanceMBufMgrL(createInfoArray);
+	CleanupClosePushL(iBufPond);
+	createInfoArray.Close ();
+
+	INFO_PRINTF1(_L("  02 Create and install active object that will do the test:"));
+
+	CMBufAsyncPoolCeilingFull* poolCeilingFull;
+	CleanupStack::PushL(poolCeilingFull = new(ELeave) CMBufAsyncPoolCeilingFull(*this));
+
+	INFO_PRINTF1(_L("  03 Start the test:"));
+	if(poolCeilingFull->DoStartTest() != KErrNone)
+		{
+		INFO_PRINTF1(_L("Error: Async Alloc's failing in test run:"));
+		SetTestStepResult(EFail);
+		return TestStepResult();
+		}
+	//Clean up stack
+	CleanupStack::PopAndDestroy(); // poolCeilingFull
+	CleanupStack::PopAndDestroy(); // bufpond
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+	
+	__UHEAP_MARKEND;
+	
+	SetTestStepResult(EPass);
+	return TestStepResult();
+	}
+
+RCommsBufPond& CTest20PoolCeilingFull::BufPond()
+	{
+	return iBufPond;
+	}
+
+CMBufAsyncPoolCeilingFull::CMBufAsyncPoolCeilingFull(CTest20PoolCeilingFull& aTestObject)
+: CActive(EPriorityStandard),
+	iTestObject(aTestObject)
+	{
+	CActiveScheduler::Add(this);
+	}
+
+
+CMBufAsyncPoolCeilingFull::~CMBufAsyncPoolCeilingFull()
+	{
+	Cancel();
+	iAsyncChain.Free();	
+	}
+
+void CMBufAsyncPoolCeilingFull::CompleteSelf()
+	{
+	TRequestStatus* pStat = &iStatus;
+	User::RequestComplete(pStat, KErrNone);
+	SetActive();
+	}
+
+void CMBufAsyncPoolCeilingFull::RunL()
+	{
+	User::LeaveIfError(iStatus.Int());
+	
+	if((iThread1.ExitType() != EExitPending))
+		{
+		CActiveScheduler::Stop();
+		return;		
+		}
+	if(iAsyncChain.IsEmpty())
+		{
+		iAsyncRequest.Alloc(iAsyncChain, 256 * 8, iStatus);	
+		SetActive();							
+		}
+	else
+		{
+		iAsyncChain.Free();			
+		CompleteSelf();		
+		}	
+	}
+
+void CMBufAsyncPoolCeilingFull::DoCancel()
+	{
+	iAsyncRequest.Cancel();
+	}
+
+
+TInt CMBufAsyncPoolCeilingFull::DoStartTest()
+	{
+	
+	TInt err=iThread1.Create(_L("testThread1Rec"),
+		                       fThread1,
+ 							   KDefaultStackSize,
+							   KDefaultHeapSize,
+							   KMaxHeapSize,
+							   (TAny*)&iTestObject,
+							   EOwnerProcess);
+	if (err!=KErrNone)
+		{
+		User::Leave(EFail);
+		}
+	//iThread1.SetPriority(EPriorityAbsoluteHigh);
+	iThread1.Resume();
+	iAsyncRequest.Alloc(iAsyncChain, 256, iStatus);	
+	SetActive();
+	CActiveScheduler::Start();
+
+	iThread1.Close();
+	iThread2.Close();
+	iThread3.Close();
+
+	return iError;
+	}
+
+
+TInt CMBufAsyncPoolCeilingFull::fThread1(TAny* aInput)
+	{
+	TInt totalAllocation = 90;
+	CTest20PoolCeilingFull* pTestObject = (CTest20PoolCeilingFull*)aInput;
+	// We need to introduce this new client thread to the MBufMgr
+	TCommsBufPondTLSOp tls(pTestObject->BufPond());
+	tls.Set();
+	
+	CTrapCleanup* aCleanup = CTrapCleanup::New();
+	
+	TBool freeMem = EFalse;
+	for(TInt i=0; i < 1000; ++i)
+		{
+        //INFO_PRINTF2(_L("Inside the for loop: %d"),i);
+        RDebug::Printf("inside the for loop: %d", i);
+
+		RMBufChain chain;
+		chain.Alloc(512, 256, 256);
+		if(freeMem)
+			{
+			chain.Free();
+			freeMem = EFalse;	
+			}
+		else
+			{
+			pTestObject->iChain.Append(chain);
+			freeMem = ETrue;
+			}
+		if(pTestObject->iChain.NumBufs() == totalAllocation)
+			{
+			// Free all. Will trigger the AO.
+			pTestObject->iChain.Free();
+			break;
+			}	
+		//Sleep for 5ms
+		User::After(5000);
+		}
+	
+	delete aCleanup;
+	return KErrNone;
+	}
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/TE_mbufmgr/src/test21commsbufs.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,161 @@
+// Copyright (c) 2002-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:
+// Contains MBufMgr Test Step 21 for commsbufs method
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+
+//#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+//#include "networking/log.h"
+//#include "networking/teststep.h"
+//#else
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#endif
+
+#include "TestStepCTMbufmgr.h"
+
+#include "Test21commsbufs.h"
+#include <comms-infras/commsbufpond.h>
+// constructor
+CTest21CommsBufs::CTest21CommsBufs()
+	{
+	SetTestStepName( _L("MBufMgrTest21") );	// Store the name of this test case
+	}
+
+// destructor
+CTest21CommsBufs::~CTest21CommsBufs()
+	{
+	}
+
+//
+enum TVerdict CTest21CommsBufs::doTestStepL(void)
+	{
+	SetTestStepResult(EFail);
+			
+	//-------------- substep 1 --------------------
+	INFO_PRINTF1(_L("  01 Creating CMBufManager and installing active scheduler:"));
+    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
+	CActiveScheduler::Install(iActSch);
+	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
+	CleanupClosePushL(iBufPond);
+	TCommsBufAllocator allocator = iBufPond.Allocator();
+    INFO_PRINTF1(_L("  01 Allocate a RCommsBuf of size 128"));	
+	RCommsBuf* buf = RCommsBuf::Alloc(128, allocator);
+    INFO_PRINTF1(_L("  01 Check the initial offset and length should be 0 & 128"));
+	// Check the initial offset and length. MUST be 0 & 128 as we 
+	// allocated a buffer of size 128
+	if(buf->Offset() != 0 || buf->Length() != buf->RawSize())
+	    {
+	    INFO_PRINTF1(_L("  Error: The offset and length checking failed"));
+	    return EFail;
+	    }
+	
+	INFO_PRINTF1(_L("  02 Write abcdef"));
+	_LIT8(KWriteData, "abcdef");
+	buf->Write(KWriteData, 20); // Write abcdef at offset 20
+	// Check the offset should be 20
+	// Check the length should 6 ie; abcdef
+	INFO_PRINTF1(_L("  02 Check the write offset and length should be 20 & 6"));	
+    if(buf->Offset() != 20 || buf->Length() != KWriteData().Length())
+        {
+        INFO_PRINTF1(_L("  Error 02: The offset and length checking failed"));
+		return TestStepResult();
+        }
+	
+    TBuf8<10> buffer;
+    INFO_PRINTF1(_L("  02 Read the buffer at offset 0"));
+    buf->Read(buffer);
+    INFO_PRINTF1(_L("  02 check the content of the read buffer"));
+    if(buffer.Compare(KWriteData()) != 0)
+        {
+        INFO_PRINTF1(_L("  Error 02 The read buffer content is not same as the write buffer"));
+        return TestStepResult();
+        }
+
+    INFO_PRINTF1(_L("  02 Read the buffer at offset 3"));
+    buf->Read(buffer, 3);
+    INFO_PRINTF1(_L("  02 check the content of the read buffer"));
+    TPtrC8 ptr2 = KWriteData().Right(3); // Should be def
+    if(buffer.Compare(ptr2) != 0)
+        {
+        INFO_PRINTF1(_L("  Error 02 The read buffer content is not same as the write buffer"));
+        return TestStepResult();       
+        }
+
+    INFO_PRINTF1(_L("  03 Allocate a RCommsBuf of size 128"));   
+    RCommsBuf* buf2 = RCommsBuf::Alloc(128, allocator);
+    INFO_PRINTF1(_L("  03 Write abcdef"));
+    buf2->Write(KWriteData, 10); // Write abcdef at offset 20
+    // Append ghijklm
+    INFO_PRINTF1(_L("  03 Append ghijklm"));
+    _LIT8(KAppendData, "ghijklm");
+    buf2->Append(KAppendData);
+    
+    // Compare the data
+    INFO_PRINTF1(_L("  03 Compare the contained data"));
+    _LIT8(KCompareData, "abcdefghijklm");
+    TBuf8<30> buffer2;
+    buf2->Read(buffer2);
+    if(buffer2.Compare(KCompareData()) != 0)
+        {
+        INFO_PRINTF1(_L("  Error 03 The read buffer content is not same as the write buffer"));
+        return TestStepResult();       
+        }
+    
+    // Prepend 123
+    _LIT8(KPrependData, "12345");
+    INFO_PRINTF1(_L("  03 Prepend 12345"));
+    buf2->Prepend(KPrependData);
+    // Now offset would have been 5
+    if(buf2->Offset() != 5)
+        {
+        INFO_PRINTF1(_L("  Error 03 after prepend the offset is not correct"));
+        return TestStepResult(); 
+        }
+    
+    // Read the whole data
+    buf2->Read(buffer2);
+    
+    _LIT8(KCompareData2, "12345abcdefghijklm");
+    if(buffer2.Compare(KCompareData2()) != 0)
+        {
+        INFO_PRINTF1(_L("  Error 03 After prepend the read buffer is not correct."));
+        return EFail;        
+        }
+     
+    for(TInt i = 0; i < buffer2.Length(); ++i)
+         {
+         if(buffer2[i] != (*buf2)[i])
+             {
+             INFO_PRINTF1(_L("  Error 03 Comparison of individual characters failed."));
+             return TestStepResult();
+             }
+         }
+
+    buf->Free();
+	buf2->Free();
+	CleanupStack::PopAndDestroy(); // pond
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(iActSch);
+	
+	SetTestStepResult(EPass);
+	return TestStepResult();
+	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/TS_Mbufmgr.mmp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-// Copyright (c) 2001-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:
-// CTMbufmgr.mmp
-// using relative paths for sourcepath and user includes
-// 
-//
-
-#include        <cflog.mmh>
-
-TARGET        ts_ctmbufmgr.dll
-TARGETTYPE    dll
-UID           0x1000008d 0x101F529F
-VENDORID 0x70000001
-
-SOURCEPATH    ../TS_mbufmgr
-
-SOURCE        TestSuiteCTMbufmgr.cpp        TestStepCTMbufmgr.cpp
-SOURCE        Test01CreateDeleteMBufMgr.cpp Test02AllocDealloc.cpp
-SOURCE        Test03AllocLeave.cpp          Test04CopyInOut.cpp
-SOURCE        Test05CopyInOutOffset.cpp     Test06SplitL.cpp
-SOURCE        Test07TrimStart.cpp           Test08TrimEnd.cpp
-SOURCE        Test09Align.cpp               Test10CopyL.cpp
-SOURCE        Test11AsyncAlloc.cpp          Test12General.cpp
-SOURCE        Test13Performance.cpp         Test14HeapFreeCheck.cpp
-SOURCE        Test15Concurrency.cpp			test16memoryfull.cpp
-SOURCE        test17requestsizelimits.cpp   test18exhaustmidsizepools.cpp
-SOURCE        test19prepend.cpp
-SOURCE		  test20poolceilingfull.cpp test21commsbufs.cpp
-SOURCE        test22append.cpp
-SOURCE        test23rmbufq.cpp
-
-USERINCLUDE   ../TS_mbufmgr
-USERINCLUDE		../inc
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-USERINCLUDE   /epoc32/include/networking
-SYSTEMINCLUDE	/epoc32/include 
-#else
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-#endif
-
-LIBRARY       euser.lib mbufmgr.lib
-LIBRARY	      integrationtestutils.lib
-LIBRARY       netmeta.lib		// for the ABIv2
-LIBRARY			commsbufs.lib
-
-#if !defined(WINS) && !defined(GCC32)
-LIBRARY					commsfw.lib
-#endif
-
-CAPABILITY ALL -Tcb
-
-SMPSAFE
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test01CreateDeleteMBufMgr.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 01 to Create & destroy RMBufManager
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "Test01CreateDeleteMBufMgr.h"
-#include <comms-infras/commsbufpond.h>
-
-// constructor
-CTest01CreateDeleteMBufMgr::CTest01CreateDeleteMBufMgr()
-	{
-	iTestStepName = _L("MBufMgrTest01");// Store the name of this test case
-	}
-
-// destructor
-CTest01CreateDeleteMBufMgr::~CTest01CreateDeleteMBufMgr()
-	{
-	}
-
-//
-enum TVerdict CTest01CreateDeleteMBufMgr::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-	
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager and install active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
-
-	//-------------- substep 2 --------------------
-	Log(_L("  02 Clean up stack:"));
-	iBufPond.Close();
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-
-	__UHEAP_MARKEND;
-	return EPass;
-	}
-
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test01CreateDeleteMBufMgr.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test step 1
-// 
-//
-
-#if (!defined __TEST01CREATEDELETEMBUFMGR_H__)
-#define __TEST01CREATEDELETEMBUFMGR_H__
-
-NONSHARABLE_CLASS(CTest01CreateDeleteMBufMgr) : public CTestStepCTMbufmgr
-{
-public:
-	CTest01CreateDeleteMBufMgr();
-	~CTest01CreateDeleteMBufMgr();
-
-	virtual enum TVerdict doTestStepL( void );
-
-};
-
-#endif //(__TEST01CREATEDELETEMBUFMGR_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test02AllocDealloc.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 02 Allocate/Dealocate RMBuf
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-#include "Test02AllocDealloc.h"
-#include <comms-infras/commsbufpond.h>
-
-// constructor
-CTest02AllocDealloc::CTest02AllocDealloc()
-	{
-	iTestStepName = _L("MBufMgrTest02");// Store the name of this test case
-	}
-
-// destructor
-CTest02AllocDealloc::~CTest02AllocDealloc()
-	{
-	}
-
-//
-enum TVerdict CTest02AllocDealloc::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-	
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-	
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager and install active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
-	CleanupClosePushL(iBufPond);
-
-	TBool firstFail = EFalse;
-	TBool secondFail = EFalse;
-	
-	//-------------- substep 2 --------------------
-	Log(_L("  02 Allocate 5000-bytes long RMBuf:"));
-	RMBuf* buf=static_cast<RMBuf*>(iBufPond.Alloc(5000, 0, KMaxTInt));
-	if (buf == NULL)
-		{
-		Log(_L("Error: Couldn't allocate RMBuf:"));
-		firstFail = ETrue;
-		}
-	else
-		{
-		//-------------- substep 3 --------------------
-		Log(_L("  03 Deallocating RMBuf"));
-		buf->Free();
-		}
-	
-	//-------------- substep 4 --------------------
-	Log(_L("  04 Allocate 0-byte long RMBuf:"));
-	buf = static_cast<RMBuf*>(iBufPond.Alloc(0, 0, KMaxTInt));
-	if (buf == NULL)
-		{
-		Log(_L("Error: Couldn't allocate RMBuf:"));
-		secondFail = ETrue;
-		}
-	else
-		{
-		//-------------- substep 5 --------------------
-		_LIT(aLog1, "  05 Allocated RMBuf size : %d");
-		Log(aLog1, buf->Size());
-		if (buf->Length() != 0)
-			{
-			_LIT(aLog2, "Error: RMBuf length : %d ");
-			Log(aLog2, buf->Length());
-			secondFail = ETrue;
-			}
-		else
-			{
-			_LIT(aLog3, "  Info: RMBuf length : %d ");
-			Log(aLog3, buf->Length());
-			}
-		//-------------- substep 6 --------------------
-		Log(_L("  06 Deallocating RMBuf"));
-		buf->Free();
-		}
-	//-------------- substep 7 --------------------
-	Log(_L("  07 Clean up stack:"));
-    CleanupStack::PopAndDestroy();  // iBufPond
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-    __UHEAP_MARKEND;
-    
-    if (firstFail || secondFail)
-    	{
-    	return EFail;
-    	}
-    
-	return EPass;
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test02AllocDealloc.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test step 02 
-// 
-//
-
-#if (!defined __TEST02ALLOCDEALLOC_H__)
-#define __TEST02ALLOCDEALLOC_H__
-
-NONSHARABLE_CLASS(CTest02AllocDealloc) : public CTestStepCTMbufmgr
-{
-public:
-	CTest02AllocDealloc();
-	~CTest02AllocDealloc();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-
-};
-
-#endif //(__TEST02ALLOCDEALLOC_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test03AllocLeave.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 03
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "Test03AllocLeave.h"
-#include <comms-infras/commsbufpond.h>
-
-// constructor
-CTest03AllocLeave::CTest03AllocLeave()
-	{
-	iTestStepName = _L("MBufMgrTest03");// Store the name of this test case
-	}
-
-// destructor
-CTest03AllocLeave::~CTest03AllocLeave()
-	{
-	}
-
-//
-enum TVerdict CTest03AllocLeave::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-			
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-	
-	TVerdict verdict(EFail);
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager (with 15K alloc memory) and install active scheduler:"));
-	CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-
-	CreateInstanceMBufMgrL(65536);
-	CleanupClosePushL(iBufPond);
-	//-------------- substep 2 --------------------
-	RMBuf* mbufs[14];
-	TInt i;
-	Log(_L("  02 Allocate 42000-bytes long worth of mbufs"));
-	for (i = 0; i < sizeof(mbufs)/sizeof(mbufs[0]); ++i)
-		{
-		mbufs[i] = static_cast<RMBuf*>(iBufPond.Alloc(3000, 0, KMaxTInt));
-//		Log(_L("  Heap Size after %d allocs : %d"),i,iMBMngr->__DbgGetHeapSize());
-		if (mbufs[i] == NULL)
-			{
-			Log(_L("Error: Couldn't allocate RMBuf:"));
-
-#ifdef __CFLOG_ACTIVE
-			__CFLOG_CLOSE;
-			__CFLOG_DELETE;
-#endif
-			User::Leave(EFail);
-			}
-		}
-
-
-	//-------------- substep 3 --------------------
-	Log(_L("  03 Allocate 8192-bytes long RMBuf2:"));
-	RMBuf* aMBuf2 = NULL;
-	RMBufChain chain;
-	TInt ret;
-	TRAP(ret,chain.AllocL(16384);)
-	if (ret != KErrNone)
-		{
-		Log(_L("Info: Couldn't allocate RMBuf as it should be so."));
-		if (ret == KErrNoMBufs)
-			verdict =  EPass;
-		else
-			{
-			Log(_L("Error: The reason AllocL has failed with %d"),KErrNoMBufs);
-			verdict =  EFail;
-			}
-		}
-//	Log(_L("  Heap Size after failed alloc %d"),iMBMngr->__DbgGetHeapSize());
-	// Cleanup .
-	//-------------- substep 4 --------------------
-	Log(_L("  04 Deallocate RMBufs (1, 2 & 3):"));
-	for (i = 0; i < sizeof(mbufs)/sizeof(mbufs[0]); ++i)
-		{
-		mbufs[i]->Free();
-		}
-
-	if (aMBuf2 != NULL)
-		aMBuf2->Free();
-
-	//-------------- substep 5 --------------------
-	Log(_L("  05 Clean up stack:"));
-	CleanupStack::PopAndDestroy();
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-	__UHEAP_MARKEND;
-	return verdict;
-}
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test03AllocLeave.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test step 03 
-// 
-//
-
-#if (!defined __TEST03ALLOCLEAVE_H__)
-#define __TEST03ALLOCLEAVE_H__
-
-NONSHARABLE_CLASS(CTest03AllocLeave) : public CTestStepCTMbufmgr
-{
-public:
-	CTest03AllocLeave();
-	~CTest03AllocLeave();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-
-};
-
-#endif //(__TEST03ALLOCLEAVE_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test04CopyInOut.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 04 for CopyIn() & CopyOut() methods
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "Test04CopyInOut.h"
-#include <comms-infras/commsbufpond.h>
-// constructor
-CTest04CopyInOut::CTest04CopyInOut()
-	{
-	iTestStepName = _L("MBufMgrTest04");// Store the name of this test case
-	}
-
-// destructor
-CTest04CopyInOut::~CTest04CopyInOut()
-	{
-	}
-
-//
-enum TVerdict CTest04CopyInOut::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-	
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-	
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager and install active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
-	CleanupClosePushL(iBufPond);
-
-	//-------------- substep 2 --------------------
-	Log(_L("  02 Allocate two 5000-bytes long descriptors (Des1 & Des2):"));
-	TBuf8<5000> *aDes1, *aDes2;
-    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<5000> );
-    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<5000> );
-	aDes1->SetLength(5000);
-	aDes2->SetLength(5000);
-
-	//-------------- substep 3 --------------------
-	Log(_L("  03 Fill in the Des1 with a pattern:"));
-	StripeDes(*aDes1, 0, 5000, '@', 'Z');
-
-	//-------------- substep 4 --------------------
-	Log(_L("  04 Allocate 5000-bytes long RMBufChain:"));
-	RMBufChain aChain;
-	TRAPD(ret,aChain.AllocL(5000));
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't allocate RMBuf:"));
-
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 5 --------------------
-	Log(_L("  05 Copy in Des1 into Chain:"));
-    aChain.CopyIn(*aDes1);
-
-	//-------------- substep 6 --------------------
-	Log(_L("  06 Fill in Des2 with zeros:"));
-	StripeDes(*aDes2, 0, 5000, 0, 0);
-
-	//-------------- substep 7 --------------------
-	Log(_L("  07 Copy out Chain into Des2:"));
-    aChain.CopyOut(*aDes2);
-
-	//-------------- substep 8 --------------------
-	Log(_L("  08 Compare the contents of Des1 & Des2:"));
-	if(aDes1->Compare(*aDes2))
-		{
-		Log(_L("Error: The content is not the same"));
-		aChain.Free();
-
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 9 --------------------
-	Log(_L("  09 Free chain. Clean up stack:"));
-	aChain.Free();
-    CleanupStack::PopAndDestroy(aDes2);
-    CleanupStack::PopAndDestroy(aDes1);
-    CleanupStack::PopAndDestroy();
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
- 	__UHEAP_MARKEND;
-	return EPass;
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test04CopyInOut.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test step 04 
-// 
-//
-
-#if (!defined __TEST04COPYINOUT_H__)
-#define __TEST04COPYINOUT_H__
-
-NONSHARABLE_CLASS(CTest04CopyInOut) : public CTestStepCTMbufmgr
-{
-public:
-	CTest04CopyInOut();
-	~CTest04CopyInOut();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-
-};
-
-#endif //(__TEST04COPYINOUT_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test05CopyInOutOffset.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,183 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 05 for CopyIn() & CopyOut() methods with offset
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "Test05CopyInOutOffset.h"
-#include <comms-infras/commsbufpond.h>
-// constructor
-CTest05CopyInOutOffset::CTest05CopyInOutOffset()
-	{
-	iTestStepName = _L("MBufMgrTest05");// Store the name of this test case
-	}
-
-// destructor
-CTest05CopyInOutOffset::~CTest05CopyInOutOffset()
-	{
-	}
-
-//
-enum TVerdict CTest05CopyInOutOffset::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-		
-	//-------------- substep 0 --------------------
-	bool aTest;
-	Log(_L("  00 Read from script which test to run:"));
-	TPtrC aPtrResult;
-	TInt bRet = GetStringFromConfig(_L("MBufMgrTest05"), _L("test"), aPtrResult);
-	if (!bRet)
-		{
-		return EFail;
-		}
-
-	if (aPtrResult==_L("CopyIn" ))
-		{
-		aTest = true;
-	 	Log(_L("     ------------ Copy In Test starts ---------------:"));
-		}
-	else if (aPtrResult==_L("CopyOut"))
-		{
-		aTest = false;
-	 	Log(_L("     ------------ Copy Out Test starts --------------:"));
-		}
-	else
-		{
-		Log(_L("Failed to read test case - there should be either CopyIn or CopyOut - case sensitive"));
-		return EFail;
-		}
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager and install active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
-	CleanupClosePushL(iBufPond);
-
-	//-------------- substep 2 --------------------
-	Log(_L("  02 Allocate two 5000-bytes long descriptors (Des1 & Des2):"));
-	TBuf8<5000> *aDes1, *aDes2;
-    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<5000> );
-    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<5000> );
-	aDes1->SetLength(5000);
-	aDes2->SetLength(5000);
-
-	//-------------- substep 3 --------------------
-	Log(_L("  03 Allocate 5000-bytes long RMBufChain:"));
-	RMBufChain aChain;
-	TRAPD(ret,aChain.AllocL(5000));
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't allocate RMBuf:"));
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 4 --------------------
-	Log(_L("  04 Fill in Des1 with a pattern:"));
-	StripeDes(*aDes1, 0, 5000, '@', 'Z');
-
-	//-------------- substep 5 --------------------
-	Log(_L("  05 Fill in Des2 with a patter different then that in Des1:"));
-	StripeDes(*aDes2, 0, 5000, 'a', 'z');
-
-	//-------------- substep 6 --------------------
-	Log(_L("  06 Fill in Chain with zeros:"));
-    aChain.FillZ();
-
-	if (aTest)
-		{
-	//----------- CopyIn() method check only-----------
-		//-------------- substep 7 --------------------
-		Log(_L("  07 Copy in the last 4000 bytes of Des1 into the last 4000 of Chain:"));
-		aChain.CopyIn(aDes1->Mid(1000),1000);
-
-		//-------------- substep 8 --------------------
-		Log(_L("  08 Copy out Chain into Des2:"));
-		aChain.CopyOut(*aDes2);
-
-		//-------------- substep 9 --------------------
-		Log(_L("  09 Fill in the 1st 1000 bytes of Des1 with zeros:"));
-		StripeDes(*aDes1, 0, 1000, '\0', '\0');
-		}
-	else
-		{
-	//----------- CopyOut() method check unly-----------
-		//-------------- substep 7 --------------------
-		Log(_L("  07 Copy in Des1 into Chain:"));
-		aChain.CopyIn(*aDes1);
-
-		//-------------- substep 8 --------------------
-		Log(_L("  08 Fill in the 1st 1000 bytes of Des1 & Des2 with zeros:"));
-		StripeDes(*aDes1, 0, 1000, '\0', '\0');
-		StripeDes(*aDes2, 0, 1000, '\0', '\0');
-
-		//-------------- substep 9 --------------------
-		Log(_L("  09 Copy out the last 4000 bytes of Chain into last 4000 of Des2:"));
-		TPtr8 dest((TUint8*)aDes2->Ptr()+1000,4000,4000);
-		aChain.CopyOut(dest, 1000);
-		}
-
-	//-------------- substep 10 --------------------
-	Log(_L("  10 Compare the content of Des1 & Des2:"));
-	if(aDes1->Compare(*aDes2))
-		{
-		aChain.Free();
-		Log(_L("Error: The content is not the same"));
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 11 --------------------
-	Log(_L("  11 Free the chain. Clean up stack:"));
-	aChain.Free();
-    CleanupStack::PopAndDestroy(aDes2);
-    CleanupStack::PopAndDestroy(aDes1);
-    CleanupStack::PopAndDestroy(); // iBufPond
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-  	__UHEAP_MARKEND;
-	return EPass;
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test05CopyInOutOffset.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test step 05 
-// 
-//
-
-#if (!defined __TEST05COPYINOUTOFFSET_H__)
-#define __TEST05COPYINOUTOFFSET_H__
-
-NONSHARABLE_CLASS(CTest05CopyInOutOffset) : public CTestStepCTMbufmgr
-{
-public:
-	CTest05CopyInOutOffset();
-	~CTest05CopyInOutOffset();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-
-};
-
-#endif //(__TEST05COPYINOUTOFFSET_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test06SplitL.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,272 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 06 for SplitL method
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "Test06SplitL.h"
-#include <comms-infras/commsbufpond.h>
-// constructor
-CTest06Split::CTest06Split()
-	{
-	iTestStepName = _L("MBufMgrTest06");// Store the name of this test case
-	}
-
-// destructor
-CTest06Split::~CTest06Split()
-	{
-	}
-
-//
-enum TVerdict CTest06Split::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-		
-	//-------------- substep 0 --------------------
-	Log(_L("  00 Read parameters from the script:"));
-	TInt aOffset;// Will contain the position in chain where split action will be done
-	TInt aLength;// Will contain the length of desc & chains in the test
-	TInt bRet = GetIntFromConfig(_L("MBufMgrTest06"), _L("Length"), aLength);
-	if (!bRet)
-		{
-		return EFail;
-		}
-	bRet = GetIntFromConfig(_L("MBufMgrTest06"), _L("Offset"), aOffset);
-	if (!bRet)
-		{
-		return EFail;
-		}
-	TBool forceSmallBuf = EFalse;
-    bRet = GetIntFromConfig(_L("MBufMgrTest06"), _L("ForceSmallBuf"), forceSmallBuf);
- 	Log(_L("     ------- Chain & Desc LENGTH   = %d --"), aLength);
- 	Log(_L("     ------- OFFSET where to Split = %d --"), aOffset);
-	if ( (aLength > 1000)    ||(aLength <0) ||
-		 (aOffset > aLength) || (aOffset <0)  )
-		{
-		Log(_L("ERROR: Wrong input parameter(s)"));
-		return EFail;
-		}
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Creating CMBufManager and installing active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-
-	enum { KBigBuf = 256, KSmallBuf = 128 };
-	if(forceSmallBuf)
-	    {
-        RArray<TCommsBufPoolCreateInfo> createInfoArray;
-        
-        TCommsBufPoolCreateInfo createInfo;
-        createInfo.iBufSize = KSmallBuf;
-        createInfo.iInitialBufs = 128;
-        createInfo.iGrowByBufs = 64;
-        createInfo.iMinFreeBufs = 40;
-        createInfo.iCeiling = 410; 
-        createInfoArray.AppendL(createInfo);
-        
-        createInfo.iBufSize = KBigBuf;
-        createInfo.iInitialBufs = 3;
-        createInfo.iGrowByBufs = 1;
-        createInfo.iMinFreeBufs = 1;
-        createInfo.iCeiling = 3;
-        createInfoArray.AppendL(createInfo);
-
-        CreateInstanceMBufMgrL(createInfoArray);
-
-        createInfoArray.Close();
-	    }	
-	else
-	    {
-        CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
-	    }
-	
-	CleanupClosePushL(iBufPond);
-
-	//-------------- substep 2 --------------------
-	Log(_L("  02 Allocating two descriptors (Des1 & Des2):"));
-	TBuf8<1000> *aDes1, *aDes2;
-    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<1000> );
-    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<1000> );
-	aDes1->SetLength(aLength);
-	aDes2->SetLength(aLength);
-
-	//-------------- substep 3 --------------------
-	Log(_L("  03 Fill in Des1 with a pattern:"));
-	StripeDes(*aDes1, 0, aLength, '@', 'Z');
-
-	//-------------- substep 4 --------------------
-	Log(_L("  04 Fill in Des2 with zeros:"));
-	StripeDes(*aDes1, 0, aLength, 0, 0);
-
-	//-------------- substep 5 --------------------
-	Log(_L("  05 Allocate Chain1:"));
-	RMBufChain aChain1;
-	TRAPD(ret,aChain1.AllocL(aLength));
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't allocate Chain1:"));
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-	
-	if(forceSmallBuf)
-	    {
-        for(RMBuf* buf = aChain1.First(); buf; buf = buf->Next())
-            {
-            if(buf->Size() != KBigBuf)
-                {
-                Log(_L("-- initial chain should be composed of %d buf, found %d buf"), KBigBuf, buf->Size());
-                User::Leave(EFail);
-                }
-            }
-	    }
-
-	//-------------- substep 6 --------------------
-	Log(_L("  06 Copy in Des1 into Chain1:"));
-	aChain1.CopyIn(*aDes1);
-
-	//-------------- substep 7 --------------------
-	Log(_L("  07 Split Chain1. The 2nd part goes to Chain2:"));
-	RMBufChain aChain2;
-	TRAP(ret,aChain1.SplitL(aOffset, aChain2));
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't Split"));
-		aChain1.Free();
-		aChain2.Free();
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 8 --------------------
-	Log(_L("  08 Check the length of the chains. They should be OFFSET and (LENGTH - OFFSET):"));
-	TInt temp;
-	if ( (temp = aChain1.Length()) != aOffset)
-		{
-		Log(_L("Error: Chain1 length is %d instead of %d"), temp, aOffset);
-		aChain1.Free();
-		aChain2.Free();
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	if ( (temp = aChain2.Length()) != aLength - aOffset)
-		{
-		Log(_L("Error: Chain2 length is %d instead of %d"), temp, aLength - aOffset);
-		aChain1.Free();
-		aChain2.Free();
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-	
-    if(forceSmallBuf)
-        {
-        if(!aChain2.First() || aChain2.First()->Size() != KSmallBuf ||
-           !aChain2.First()->Next() || aChain2.First()->Next()->Size() != KSmallBuf)
-            {
-            Log(_L("-- split chain should start with two %d buf"), KSmallBuf);
-            User::Leave(EFail);
-            }
-        }
-
-	//-------------- substep 9 --------------------
-	Log(_L("  09 Copy out Chain1 into Des2:"));
-	aChain1.CopyOut(*aDes2);
-
-	//-------------- substep 10 --------------------
-	Log(_L("  10 Check the length of Des2. It should be OFFSET "));
-	if ( (temp = aDes2->Length()) != aOffset)
-		{
-		Log(_L("Error: Des2 length is %d instead of %d"), temp, aOffset);
-		aChain1.Free();
-		aChain2.Free();
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 11 --------------------
-	Log(_L("  11 Set the length of Des2 to LENGTH value"));
-	aDes2->SetLength(aLength);
-
-	//-------------- substep 12 --------------------
-	Log(_L("  12 Copy out the whole Chain2 into Des2 at offset = OFFSET"));
-	TPtr8 dest((TUint8*)aDes2->Ptr() + aOffset, aLength-aOffset, aLength - aOffset);
-	aChain2.CopyOut(dest);
-
-	//-------------- substep 13 --------------------
-	Log(_L("  13 Compare the content of Des1 & Des2:"));
-	if(aDes1->Compare(*aDes2))
-		{
-		aChain1.Free();
-		aChain2.Free();
-		Log(_L("Error: The content is not the same"));
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 14 --------------------
-	Log(_L("  14 Free the chains. Clean up stack:"));
-	aChain1.Free();
-	aChain2.Free();
-    CleanupStack::PopAndDestroy(aDes2);
-    CleanupStack::PopAndDestroy(aDes1);
-    CleanupStack::PopAndDestroy(); // iBufPond
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-	__UHEAP_MARKEND;
-	return EPass;
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test06SplitL.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test step 06 
-// 
-//
-
-#if (!defined __TEST06SPLIT_H__)
-#define __TEST06SPLIT_H__
-
-NONSHARABLE_CLASS(CTest06Split) : public CTestStepCTMbufmgr
-{
-public:
-	CTest06Split();
-	~CTest06Split();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-
-};
-
-#endif //(__TEST06SPLIT_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test07TrimStart.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 07 for TrimStart() method
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "Test07TrimStart.h"
-#include <comms-infras/commsbufpond.h>
-// constructor
-CTest07TrimStart::CTest07TrimStart()
-	{
-	iTestStepName = _L("MBufMgrTest07");// Store the name of this test case
-	}
-
-// destructor
-CTest07TrimStart::~CTest07TrimStart()
-	{
-	}
-
-//
-enum TVerdict CTest07TrimStart::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-	
-	//-------------- substep 0 --------------------
-	Log(_L("  00 Read parameters from the script:"));
-	TInt aOffset;// Will contain the position in chain where split action will be done
-	TInt aLength;// Will contain the length of desc & chains in the test
-	TInt bRet = GetIntFromConfig(_L("MBufMgrTest07"), _L("Length"), aLength);
-	if (!bRet)
-		{
-		return EFail;
-		}
-	bRet = GetIntFromConfig(_L("MBufMgrTest07"), _L("Offset"), aOffset);
-	if (!bRet)
-		{
-		return EFail;
-		}
-   	Log(_L("     ------- Chain LENGTH              = %d --"), aLength);
- 	Log(_L("     ------- OFFSET where to TrimStart = %d --"), aOffset);
-	if ( (aLength > 1000)    ||(aLength <0) ||
-		 (aOffset > aLength) || (aOffset <0)  )
-		{
-		Log(_L("ERROR: Wrong input parameter(s)"));
-		return EFail;
-		}
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-	
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Creating CMBufManager and installing active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
-	CleanupClosePushL(iBufPond);
-
-	//-------------- substep 2 --------------------
-	Log(_L("  02 Allocate two desc. of Length:LENGTH(Des1) & (LENGTH-OFFSET)(Des2):"));
-	TBuf8<1000> *aDes1, *aDes2;
-    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<1000> );
-    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<1000> );
-	aDes1->SetLength(aLength);
-	aDes2->SetLength(aLength-aOffset);
-
-	//-------------- substep 3 --------------------
-	Log(_L("  03 Fill in Des1 with a pattern:"));
-	StripeDes(*aDes1, 0, aLength, '@', 'Z');
-
-	//-------------- substep 4 --------------------
-	Log(_L("  04 Fill in Des2 with zeros:"));
-	StripeDes(*aDes2, 0, aLength-aOffset, 0, 0);
-
-	//-------------- substep 5 --------------------
-	Log(_L("  05 Allocate Chain:"));
-	RMBufChain aChain;
-	TRAPD(ret,aChain.AllocL(aLength));
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't allocate RMBuf:"));
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 6 --------------------
-	Log(_L("  06 Copy in Des1 into Chain1:"));
-	aChain.CopyIn(*aDes1);
-
-	//-------------- substep 7 --------------------
-	Log(_L("  07 TrimStart Chain1 at OFFSET position (actually, remove the 1st OFFSET bytes:"));
-	aChain.TrimStart(aOffset);
-
-	//-------------- substep 8 --------------------
-	Log(_L("  08 Check the length of the chain. It should be (LENGTH - OFFSET):"));
-	TInt temp;
-	if ( (temp = aChain.Length()) != aLength-aOffset)
-		{
-		Log(_L("Error: Chain length is %d instead of %d"), temp, aLength-aOffset);
-		aChain.Free();
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 09 --------------------
-	Log(_L("  09 Copy the last (LENGTH-OFFSET) bytes of Des1 into the start of Des1:"));
-	(void)Mem::Copy((TUint8 *)aDes1->Ptr(), (TUint8 *)aDes1->Ptr()+aOffset, aLength-aOffset);
-
-	//-------------- substep 10 --------------------
-	Log(_L("  10 Set the length of Des1 to value LENGTH-OFFSET"));
-	aDes1->SetLength(aLength-aOffset);
-
-	//-------------- substep 11 --------------------
-	Log(_L("  11 Copy out Chain into Des2:"));
-	aChain.CopyOut(*aDes2);
-
-	//-------------- substep 12 --------------------
-	Log(_L("  12 Compare the content of Des1 & Des2:"));
-	if(aDes1->Compare(*aDes2))
-		{
-		aChain.Free();
-		Log(_L("Error: The content is not the same"));
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 13 --------------------
-	Log(_L("  13 Free the chains. Clean up stack:"));
-	aChain.Free();
-    CleanupStack::PopAndDestroy(aDes2);
-    CleanupStack::PopAndDestroy(aDes1);
-    CleanupStack::PopAndDestroy();
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
- 	__UHEAP_MARKEND;
-	return EPass;
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test07TrimStart.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test step 07
-// 
-//
-
-#if (!defined __TEST07TRIMSTART_H__)
-#define __TEST07TRIMSTART_H__
-
-NONSHARABLE_CLASS(CTest07TrimStart) : public CTestStepCTMbufmgr
-{
-public:
-	CTest07TrimStart();
-	~CTest07TrimStart();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-
-};
-
-#endif //(__TEST07TRIMSTART_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test08TrimEnd.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,173 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 8 for TrimEnd() method
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "Test08TrimEnd.h"
-#include <comms-infras/commsbufpond.h>
-// constructor
-CTest08TrimEnd::CTest08TrimEnd()
-	{
-	iTestStepName = _L("MBufMgrTest08");// Store the name of this test case
-	}
-
-// destructor
-CTest08TrimEnd::~CTest08TrimEnd()
-	{
-	}
-
-//
-enum TVerdict CTest08TrimEnd::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-	
-	//-------------- substep 0 --------------------
-	Log(_L("  00 Read parameters from the script:"));
-	TInt aOffset;// Will contain the position in chain where split action will be done
-	TInt aLength;// Will contain the length of desc & chains in the test
-	TInt bRet = GetIntFromConfig(_L("MBufMgrTest08"), _L("Length"), aLength);
-	if (!bRet)
-		{
-		return EFail;
-		}
-	bRet = GetIntFromConfig(_L("MBufMgrTest08"), _L("Offset"), aOffset);
-	if (!bRet)
-		{
-		return EFail;
-		}
-   	Log(_L("     ------- Chain LENGTH              = %d --"), aLength);
- 	Log(_L("     ------- OFFSET where to TrimStart = %d --"), aOffset);
-	if ( (aLength > 1000)    ||(aLength <0) ||
-		 (aOffset > aLength) || (aOffset <0)  )
-		{
-		Log(_L("ERROR: Wrong input parameter(s)"));
-		return EFail;
-		}
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-	
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Creating CMBufManager and installing active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
-	CleanupClosePushL(iBufPond);
-
-	//-------------- substep 2 --------------------
-	Log(_L("  02 Allocate two desc. of Length:LENGTH(Des1) & OFFSET(Des2):"));
-	TBuf8<1000> *aDes1, *aDes2;
-    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<1000> );
-    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<1000> );
-	aDes1->SetLength(aLength);
-	aDes2->SetLength(aOffset);
-
-	//-------------- substep 3 --------------------
-	Log(_L("  03 Fill in Des1 with a pattern:"));
-	StripeDes(*aDes1, 0, aLength, '@', 'Z');
-
-	//-------------- substep 4 --------------------
-	Log(_L("  04 Fill in Des2 with zeros:"));
-	StripeDes(*aDes2, 0, aOffset, 0, 0);
-
-	//-------------- substep 5 --------------------
-	Log(_L("  05 Allocate Chain:"));
-	RMBufChain aChain;
-	TRAPD(ret,aChain.AllocL(aLength));
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't allocate RMBuf:"));
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 6 --------------------
-	Log(_L("  06 Copy in Des1 into Chain1:"));
-	aChain.CopyIn(*aDes1);
-
-	//-------------- substep 7 --------------------
-	Log(_L("  07 TrimEnd Chain1 at OFFSET position (i.e. remove the bytes after OFFSET position:"));
-	aChain.TrimEnd(aOffset);
-
-	//-------------- substep 8 --------------------
-	Log(_L("  08 Check the length of the chain. It should be OFFSET:"));
-	TInt temp;
-	if ( (temp = aChain.Length()) != aOffset)
-		{
-		Log(_L("Error: Chain length is %d instead of %d"), temp, aOffset);
-		aChain.Free();
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 9 --------------------
-	Log(_L("  09 Set the length of Des1 to value OFFSET"));
-	aDes1->SetLength(aOffset);
-
-	//-------------- substep 10 --------------------
-	Log(_L("  10 Copy out Chain into Des2:"));
-	aChain.CopyOut(*aDes2);
-
-	//-------------- substep 11 --------------------
-	Log(_L("  11 Compare the content of Des1 & Des2:"));
-	if(aDes1->Compare(*aDes2))
-		{
-		aChain.Free();
-		Log(_L("Error: The content is not the same"));
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 12 --------------------
-	Log(_L("  12 Free the chains. Clean up stack:"));
-	aChain.Free();
-    CleanupStack::PopAndDestroy(aDes2);
-    CleanupStack::PopAndDestroy(aDes1);
-    CleanupStack::PopAndDestroy();
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
- 	__UHEAP_MARKEND;
-	return EPass;
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test08TrimEnd.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test step 08
-// 
-//
-
-#if (!defined __TEST08TRIMEND_H__)
-#define __TEST08TRIMEND_H__
-
-NONSHARABLE_CLASS(CTest08TrimEnd) : public CTestStepCTMbufmgr
-{
-public:
-	CTest08TrimEnd();
-	~CTest08TrimEnd();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-
-};
-
-#endif //(__TEST08TRIMEND_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test09Align.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,201 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 09 for Align() methods
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "Test09Align.h"
-#include <comms-infras/commsbufpond.h>
-
-// constructor
-CTest09Align::CTest09Align()
-	{
-	iTestStepName = _L("MBufMgrTest09");// Store the name of this test case
-	}
-
-// destructor
-CTest09Align::~CTest09Align()
-	{
-	}
-
-//
-enum TVerdict CTest09Align::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-	
-	//-------------- substep 0 --------------------
-	Log(_L("  00 Read parameters from the script:"));
-	CScriptInput* aInput;
-	CleanupStack::PushL( aInput= new (ELeave) CScriptInput );
-	TInt i;
-	TBuf<20> aBuf;
-	TInt bRet;
-	aInput->aBufsBefore=0;
-	for (i = 0;i<50;i++)
-		{
-		aBuf.Format(_L("Length%02d"),i+1);
-		bRet = GetIntFromConfig(_L("MBufMgrTest09"), aBuf, aInput->aBuf[i].aLength);
-		if (!bRet)
-			{
-			return EFail;
-			}
-		if (aInput->aBuf[i].aLength == -1) break;
-
-		aBuf.Format(_L("Offset%02d"),i+1);
-		bRet = GetIntFromConfig(_L("MBufMgrTest09"), aBuf, aInput->aBuf[i].aOffset);
-		if (!bRet)
-			{
-			return EFail;
-			}
-		aInput->aBufsBefore++;
-		}
-	bRet = GetIntFromConfig(_L("MBufMgrTest09"),_L("BuffsAfter") , aInput->aBufsAfter);
-
-   	Log(_L("     The following has been read from the script:"));
-   	Log(_L("     Number of RMBufs in chain before align= %2d"),aInput->aBufsBefore);
-   	Log(_L("     Number of RMBufs in chain after align = %2d"),aInput->aBufsAfter);
-
-	for (i = 0; i < aInput->aBufsBefore ; i++ )
-		{
-   		Log(_L("     Chain #%2d: Offset=%3d Length=%3d"),
-					         i+1, aInput->aBuf[i].aOffset, aInput->aBuf[i].aLength);
-		}
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-	
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager and install active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-	
-	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
-	CleanupClosePushL(iBufPond);
-
-	//-------------- substep 2 --------------------
-	Log(_L("  02 Create TestStr structure and fill it with data:"));
-	CTestStr* aTestStr1;
-	CleanupStack::PushL( aTestStr1 = new (ELeave) CTestStr );
-
-	aTestStr1->iSrcAddr = 0x01234567;
-	aTestStr1->iDstAddr = 0x89abcdef;
-	aTestStr1->iSrcPort = 0x0246;
-	aTestStr1->iDstPort = 0x8ace;
-	aTestStr1->iLength  = sizeof(CTestStr);
-	aTestStr1->iOptions = 0x1359;
-	StripeMem(aTestStr1->iData, 0, sizeof(aTestStr1->iData), '@', 'Z');
-
-	//-------------- substep 3 --------------------
-	Log(_L("  03 Create a chain containing RMBufs as specified in the script:"));
-	RMBufChain aChain;
-	RMBuf *buf=0;
-	for (i = aInput->aBufsBefore-1; i >= 0 ; i-- )
-		{
-		buf = static_cast<RMBuf*>(iBufPond.Alloc(KMBufSmallSize, 0, KMaxTInt));
-		if (buf==NULL)
-			{
-			Log(_L("Error:Could not allocate buffer"));
-			aChain.Free();
-
-#ifdef __CFLOG_ACTIVE
-			__CFLOG_CLOSE;
-			__CFLOG_DELETE;
-#endif
-			User::Leave(EFail);
-			}
-		buf->SetData(aInput->aBuf[i].aOffset,aInput->aBuf[i].aLength);
-		aChain.Prepend(buf);
-		}
-
-	//-------------- substep 4 --------------------
-	Log(_L("  04 Copy in TestStr into Chain:"));
-	aChain.CopyIn(TPtrC8((TUint8 *)aTestStr1, sizeof(CTestStr)));
-
-	CTestStr* aTestStr3 = (CTestStr*)(aChain.First()->Ptr());
-
-	//-------------- substep 5 --------------------
-	Log(_L("  05 Allign Chain for the size of TestStr:"));
-	aChain.Align(sizeof(CTestStr));
-
-	//-------------- substep 6 --------------------
-	Log(_L("  06 Check the number of RMBufs in chain after allign:"));
-	if (aChain.NumBufs() != aInput->aBufsAfter)
-		{
-		Log(_L("ERROR: Number of bufs is %d instead of %d"),aChain.NumBufs(),aInput->aBufsAfter);
-		aChain.Free();
-
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 7 --------------------
-	Log(_L("  07 Create the pointer of TestStr type and point to the 1st RMBuf in chain:"));
-	CTestStr* aTestStr2 = (CTestStr*)(aChain.First()->Ptr());
-	
-	//-------------- substep 8 --------------------
-	Log(_L("  08 Compare TestStr1 and TestData2. They should be the same:"));
-	if ( (aTestStr1->iSrcAddr != aTestStr2->iSrcAddr) ||
-		 (aTestStr1->iDstAddr != aTestStr2->iDstAddr) ||
-	     (aTestStr1->iSrcPort != aTestStr2->iSrcPort) ||
-		 (aTestStr1->iDstPort != aTestStr2->iDstPort) ||
-	     (aTestStr1->iLength  != aTestStr2->iLength)  ||
-	     (aTestStr1->iOptions != aTestStr2->iOptions) ||
-	     (Mem::Compare(aTestStr1->iData, sizeof(aTestStr1->iData),
-		      aTestStr2->iData, sizeof(aTestStr2->iData))) )
-		{
-		Log(_L("ERROR: They are not the same"));
-		aChain.Free();
-
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 9 --------------------
-	Log(_L("  09 Free the chain. Clean up stack:"));
-	aChain.Free();
-    CleanupStack::PopAndDestroy(aTestStr1);
-    CleanupStack::PopAndDestroy();
-	CActiveScheduler::Install(NULL);
-    CleanupStack::PopAndDestroy(iActSch);
-    CleanupStack::PopAndDestroy(aInput);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
- 	__UHEAP_MARKEND;
-	return EPass;
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test09Align.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test step 09
-// 
-//
-
-#if (!defined __TEST09ALIGN_H__)
-#define __TEST09ALIGN_H__
-
-NONSHARABLE_CLASS(CTest09Align) : public CTestStepCTMbufmgr
-{
-public:
-	CTest09Align();
-	~CTest09Align();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-	struct RMBufInfo {
-		TInt aOffset;
-		TInt aLength;
-	};
-	struct CScriptInput {  // This str. will be obtained 
-		RMBufInfo aBuf[50];// from the script file
-		TInt aBufsBefore;
-		TInt aBufsAfter;
-	};
-	struct CTestStr		   // This str. will 'simulate' a header
-	{					   // that has to be aligned within chain
-		TUint32 iSrcAddr;
-		TUint32 iDstAddr;
-		TUint16 iSrcPort;
-		TUint16 iDstPort;
-		TUint16 iLength;
-		TUint16 iOptions;
-		TUint8  iData[48];
-	};
-};
-
-#endif //(__TEST09ALIGN_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test10CopyL.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,191 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 10 for CopyL() methods
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "Test10CopyL.h"
-#include <comms-infras/commsbufpond.h>
-
-// constructor
-CTest10Copy::CTest10Copy()
-	{
-	iTestStepName = _L("MBufMgrTest10");// Store the name of this test case
-	}
-
-// destructor
-CTest10Copy::~CTest10Copy()
-	{
-	}
-
-//
-enum TVerdict CTest10Copy::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-	
-	//-------------- substep 0 --------------------
-	Log(_L("  00 Read parameters from the script:"));
-	CScriptInput* aInput;//It will hold input
-	CleanupStack::PushL( aInput= new (ELeave) CScriptInput );
-	TInt i;
-	TBuf<20> aBuf;
-	TInt bRet;
-	aInput->aBufs=0;
-	aInput->aChainLen=0;
-	for (i = 0;i<50;i++)
-		{
-		aBuf.Format(_L("Length%02d"),i+1);
-		bRet = GetIntFromConfig(_L("MBufMgrTest10"), aBuf, aInput->aBuf[i].aLength);
-		if (!bRet) 
-			{
-			return EFail;
-			}
-		if (aInput->aBuf[i].aLength == -1) break;
-
-		aBuf.Format(_L("Offset%02d"),i+1);
-		bRet = GetIntFromConfig(_L("MBufMgrTest10"), aBuf, aInput->aBuf[i].aOffset);
-		if (!bRet)
-			{
-			return EFail;
-			}
-
-		aInput->aBufs++;
-		aInput->aChainLen += aInput->aBuf[i].aLength;
-		}
-	bRet = GetIntFromConfig(_L("MBufMgrTest10"),_L("CopyOffset") , aInput->aCopyOffset);
-	bRet = GetIntFromConfig(_L("MBufMgrTest10"),_L("CopyLen") , aInput->aCopyLen);
-
-   	Log(_L("     The following has been read from the script:"));
-   	Log(_L("     Number of RMBufs in chain = %2d, with overall length CHAINLEN=%d"),aInput->aBufs,aInput->aChainLen);
-
-	for (i = 0; i < aInput->aBufs ; i++ )
-		{
-   		Log(_L("     RMBuf #%2d: Offset=%3d Length=%3d"),
-					         i+1, aInput->aBuf[i].aOffset, aInput->aBuf[i].aLength);
-		}
-   	Log(_L("     CopyL() parameters: COPYOFFSET=%d COPYLEN=%d"),aInput->aCopyOffset, aInput->aCopyLen);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-	
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager and install active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
-	CleanupClosePushL(iBufPond);
-
-	//-------------- substep 2 --------------------
-	Log(_L("  02 Allocate two descriptors (Des1 & Des2) of length = Min(COPYLEN, CHAINLEN - COPYOFFSET):"));
-	TBuf8<5000> *aDes1, *aDes2;
-	TInt aDesLength;
-    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<5000> );
-    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<5000> );
-	aDesLength = Min(aInput->aCopyLen, aInput->aChainLen-aInput->aCopyOffset);
-	aDes1->SetLength(aDesLength);
-	aDes2->SetLength(aDesLength);
-
-	//-------------- substep 3 --------------------
-	Log(_L("  03 Fill in Des1 with a pattern:"));
-	StripeDes(*aDes1, 0, aDesLength, '@', 'Z');
-
-	//-------------- substep 4 --------------------
-	Log(_L("  04 Create Chain1 containing RMBufs as specified in the script:"));
-	RMBufChain aChain1;
-	RMBuf *buf=0;
-	for (i = aInput->aBufs-1; i >= 0 ; i-- )
-		{
-		buf = static_cast<RMBuf*>(iBufPond.Alloc(KMBufSmallSize,0, KMaxTInt));
-		if (buf==NULL)
-			{
-			Log(_L("Error:Could not allocate buffer"));
-			aChain1.Free();
-
-#ifdef __CFLOG_ACTIVE
-			__CFLOG_CLOSE;
-			__CFLOG_DELETE;
-#endif
-			User::Leave(EFail);
-			}
-		buf->SetData(aInput->aBuf[i].aOffset,aInput->aBuf[i].aLength);
-		aChain1.Prepend(buf);
-		}
-
-	//-------------- substep 5 --------------------
-	Log(_L("  05 Copy in Des1 into Chain1 at offset=COPYOFFSET:"));
-	TBuf8<5000> *aDesTemp;
-    CleanupStack::PushL( aDesTemp = new(ELeave) TBuf8<5000> );
-	aDesTemp->SetLength(aDesLength+aInput->aCopyOffset);
-	Mem::Copy ((TAny*)(aDesTemp->Ptr()+aInput->aCopyOffset), aDes1->Ptr(), aDesLength);
-    aChain1.CopyIn(*aDesTemp);
-    CleanupStack::PopAndDestroy(aDesTemp);
-
-	//-------------- substep 6 --------------------
-	Log(_L("  06 Copy Chain1 into Chain2:"));
-    RMBufChain aChain2;
-	aChain1.CopyL(aChain2,aInput->aCopyOffset, aInput->aCopyLen);
-
-	//-------------- substep 7 --------------------
-	Log(_L("  07 Copy out Chain2 into Des2:"));
-    aChain2.CopyOut(*aDes2);
-
-	//-------------- substep 8 --------------------
-	Log(_L("  08 Compare the content of Des1 & Des2:"));
-	if(aDes1->Compare(*aDes2))
-		{
-		Log(_L("Error: The content is not the same"));
-		aChain1.Free();
-		aChain2.Free();
-
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 9 --------------------
-	Log(_L("  09 Free chain. Clean up stack:"));
-	aChain1.Free();
-	aChain2.Free();
-    CleanupStack::PopAndDestroy(aDes2);
-    CleanupStack::PopAndDestroy(aDes1);
-    CleanupStack::PopAndDestroy();
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-    CleanupStack::PopAndDestroy(aInput);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-  	__UHEAP_MARKEND;
-	return EPass;
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test10CopyL.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test step 10
-// 
-//
-
-
-#if (!defined __TEST10COPYL_H__)
-#define __TEST10COPYL_H__
-
-
-NONSHARABLE_CLASS(CTest10Copy) : public CTestStepCTMbufmgr
-{
-public:
-	CTest10Copy();
-	~CTest10Copy();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-	struct RMBufInfo {
-		TInt aOffset;
-		TInt aLength;
-	};
-	struct CScriptInput {   // This str will be obtained 
-		RMBufInfo aBuf[50]; // from the script file
-		TInt aBufs;
-		TInt aChainLen;
-		TInt aCopyOffset;
-		TInt aCopyLen;
-	};
-};
-
-#endif //(__TEST10COPYL_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test11AsyncAlloc.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 11 Async. Allocate
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-#include "Test11AsyncAlloc.h"
-
-#include <comms-infras/commsbufpond.h>
-// constructor
-CTest11AsyncAlloc::CTest11AsyncAlloc()
-	{
-	iTestStepName = _L("MBufMgrTest11");// Store the name of this test case
-	}
-
-// destructor
-CTest11AsyncAlloc::~CTest11AsyncAlloc()
-	{
-	}
-
-class CMBufAsyncReq : public CActive
-{
-public:
-	CMBufAsyncReq(RMBufAsyncRequest &aMBufAsyncReq)
-		:CActive(EPriorityStandard)
-		,iMBufAsyncReq(aMBufAsyncReq) 	{ }
-
-	~CMBufAsyncReq() { Cancel(); }
-
-	void RunL()      { CActiveScheduler::Stop(); }
-
-	void DoCancel()  { iMBufAsyncReq.Cancel(); }
-
-	TInt DoAsyncRequest(RMBufChain& aChain, TInt aSize)
-		{
-		iMBufAsyncReq.Alloc(aChain, aSize, iStatus);
-		SetActive();
-		CActiveScheduler::Start();
-		return iStatus.Int();
-		}
-private:
-	RMBufAsyncRequest& iMBufAsyncReq;
-};
-
-enum TVerdict CTest11AsyncAlloc::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-	
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-	
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager and install active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
-	CleanupClosePushL(iBufPond);
-
-	//-------------- substep 2 --------------------
-	Log(_L("  02 Create and install active object that will do async. alloc on request:"));
-	RMBufAsyncRequest async;
-	CMBufAsyncReq* testAsync;
-	CleanupStack::PushL(testAsync = new(ELeave) CMBufAsyncReq(async));
-	CActiveScheduler::Add(testAsync);
-
-	//-------------- substep 3 --------------------
-	Log(_L("  03 Async. alloce 5000-bytes long RMBuf:"));
-	RMBufChain aChain;
-	TInt ret = testAsync->DoAsyncRequest(aChain, 5000);
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't allocate Chain:"));
-
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 4 --------------------
-	Log(_L("  04 Free the chain. Clean up stack:"));
-	aChain.Free();
-    CleanupStack::PopAndDestroy(testAsync);
-    CleanupStack::PopAndDestroy();
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-   	__UHEAP_MARKEND;
-	return EPass;
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test11AsyncAlloc.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-// Copyright (c) 2002-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:
-// Test11AsyncAlloc.cpp
-// Contains declarations of test step 11 
-// 
-//
-
-
-#if (!defined __TEST11ASYNCALLOC_H__)
-#define __TEST11ASYNCALLOC_H__
-
-
-NONSHARABLE_CLASS(CTest11AsyncAlloc) : public CTestStepCTMbufmgr
-{
-public:
-	CTest11AsyncAlloc();
-	~CTest11AsyncAlloc();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-
-};
-
-
-
-#endif //(__TEST11ASYNCALLOC_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test12General.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,417 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 12 General Test
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-#include "Test12General.h"
-#include <comms-infras/commsbufpond.h>
-
-// constructor
-CTest12General::CTest12General()
-	{
-	iTestStepName = _L("MBufMgrTest12");// Store the name of this test case
-	}
-
-// destructor
-CTest12General::~CTest12General()
-	{
-	}
-
-void CTest12General::LeaveIfErrorL(TInt aErr, RMBufChain& aChain, const TDesC& aMsg)
-	{
-	if(aErr != KErrNone)
-		{
-		TBuf<129> logLine;
-		logLine.Format(_L("Error %d from %S"), aErr, &aMsg);
-		Log(_L("%S"), &logLine);
-		aChain.Free();
-
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-	}
-
-void CTest12General::LeaveIfDifferentL(TInt aLHS, TInt aRHS, RMBufChain& aChain, const TDesC& aMsg)
-	{
-	if(aLHS != aRHS)
-		{
-		TBuf<129> logLine;
-		logLine.Format(_L("%d != %d in %S"), aLHS, aRHS, &aMsg);
-		Log(_L("%S"), &logLine);
-		aChain.Free();
-
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-	}
-//
-enum TVerdict CTest12General::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-	
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-	
-	//-------------- substep 1 --------------------
-	Log(_L("  01 - Create CMBufManager and install active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
-	CleanupClosePushL(iBufPond);
-
-	//-------------- substep 2 --------------------
-	Log(_L("  02 - Allocate two desc. (Des1 & Des2) of length 12345."));
-	Log(_L("     - Fill Des1 with a pattern, and Des2 with zeros:"));
-	TBuf8<12345> *aDes1, *aDes2;
-    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<12345> );
-    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<12345> );
-	aDes1->SetLength(12345);
-	aDes2->SetLength(12345);
-	StripeDes(*aDes1, 0, 12345, '@', 'Z');
-	StripeDes(*aDes2, 0, 12345, 0, 0);
-
-	//-------------- substep 3 --------------------
-	Log(_L("  03 - Copy in Des1 into Chain:"));
-	RMBufChain aChain;
-	TRAPD(ret,aChain.AllocL(12345));
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't allocate RMBufChain:"));
-
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-	aChain.CopyIn(*aDes1);
-
-	//-------------- substep 4 --------------------
-	Log(_L("  04 - Split Chain into  packets of 5000 bytes. Prepend Header1 to each:"));
-	Log(_L("     - Place them into Outq1 packet queue. Print the content of Outq1:"));
-	int len = aChain.Length();
-	RMBufChain aTempChain;
-	Test_str aHeader1;
-	StripeMem((TUint8 *)&aHeader1, 0, sizeof(aHeader1), 'a', 'm');
-	RMBufPktQ aOutq1;
-
-	while (len>5000)
-		{
-		TRAP(ret,aChain.SplitL(5000, aTempChain));
-		if (ret != KErrNone)
-			{
-			Log(_L("Error: Couldn't Split chain:"));
-			aChain.Free();
-
-#ifdef __CFLOG_ACTIVE
-			__CFLOG_CLOSE;
-			__CFLOG_DELETE;
-#endif
-			User::Leave(EFail);
-			}
-		TRAP(ret,aChain.PrependL(sizeof(aHeader1)));
-		if (ret != KErrNone)
-			{
-			Log(_L("Error: Couldn't prepend header to the chain:"));
-			aChain.Free();
-
-#ifdef __CFLOG_ACTIVE
-			__CFLOG_CLOSE;
-			__CFLOG_DELETE;
-#endif
-			User::Leave(EFail);
-			}
-		aChain.CopyIn(TPtrC8((TUint8 *)&aHeader1, sizeof(aHeader1)));
-		aOutq1.Append(aChain);
-		aChain.Append(aTempChain);
-		len -= 5000;
-		}
-	TRAP(ret,aChain.PrependL(sizeof(aHeader1)));
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't prepend header to the chain:"));
-		aChain.Free();
-
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-	aChain.CopyIn(TPtrC8((TUint8 *)&aHeader1, sizeof(aHeader1)));
-	aOutq1.Append(aChain);
-
-	Test_QueueStats(aOutq1, _S("OutQ1"));
-
-	//-------------- substep 5 --------------------
-	Log(_L("  05 - Split packets of Outq1 into 556-byte long packets and prepend another Header2 onto each. Place them all into packet queue Outq2:"));
-	Log(_L("     - Place them all into packet queue Outq2. Print the contents of Outq1 & Outq2"));
-	Test_str aHeader2;
-	StripeMem((TUint8 *)&aHeader2, 0, sizeof(aHeader2), 'n', 'z');
-	RMBufPktQ aOutq2;
-	while (!aOutq1.IsEmpty())
-		{
-		(void)aOutq1.Remove(aChain);
-		len = aChain.Length();
-		while (len>556)
-			{
-			TRAP(ret,aChain.SplitL(556, aTempChain));
-			if (ret != KErrNone)
-				{
-				Log(_L("Error: Couldn't Split chain:"));
-				aChain.Free();
-
-#ifdef __CFLOG_ACTIVE
-				__CFLOG_CLOSE;
-				__CFLOG_DELETE;
-#endif
-				User::Leave(EFail);
-				}
-			TRAP(ret,aChain.PrependL(sizeof(aHeader2)));
-			if (ret != KErrNone)
-				{
-				Log(_L("Error: Couldn't prepend header to the chain:"));
-				aChain.Free();
-
-#ifdef __CFLOG_ACTIVE
-				__CFLOG_CLOSE;
-				__CFLOG_DELETE;
-#endif
-				User::Leave(EFail);
-				}
-			aChain.CopyIn(TPtrC8((TUint8 *)&aHeader2, sizeof(aHeader2)));
-			aOutq2.Append(aChain);
-			aChain.Append(aTempChain);
-			len -= 556;
-			}
-		TRAP(ret,aChain.PrependL(sizeof(aHeader2)));
-		if (ret != KErrNone)
-			{
-			Log(_L("Error: Couldn't prepend header to the chain:"));
-			aChain.Free();
-
-#ifdef __CFLOG_ACTIVE
-			__CFLOG_CLOSE;
-			__CFLOG_DELETE;
-#endif
-			User::Leave(EFail);
-			}
-		aChain.CopyIn(TPtrC8((TUint8 *)&aHeader2, sizeof(aHeader2)));
-		aOutq2.Append(aChain);
-		}
-	Test_QueueStats(aOutq1, _S("OutQ1"));
-	Test_QueueStats(aOutq2, _S("OutQ2"));
-
-	//-------------- substep 6 --------------------
-	Log(_L("  06 - Copy the chains from Outq2 into another packet queue Inq2."));
-	Log(_L("     - Print the contents of Outq2 & Inq1:"));
-	RMBufPktQ aInq2;
-
-	while (!aOutq2.IsEmpty())
-		{
-		(void)aOutq2.Remove(aChain);
-		TRAP(ret,aChain.CopyL(aTempChain));
-		if (ret != KErrNone)
-			{
-			Log(_L("Error: Couldn't copy chain"));
-			aChain.Free();
-
-#ifdef __CFLOG_ACTIVE
-			__CFLOG_CLOSE;
-			__CFLOG_DELETE;
-#endif
-			User::Leave(EFail);
-			}
-		aChain.Free();
-		aChain.Assign(aTempChain);
-		aInq2.Append(aChain);
-		}
-
-	Test_QueueStats(aOutq2, _S("OutQ2"));
-	Test_QueueStats(aInq2, _S("InQ2"));
-
-	//-------------- substep 7 --------------------
-	Log(_L("  07 - Group the chains back to 5000+Header1 long packets (Including removal of Header2)."));
-	Log(_L("     - Check the content of each Header2 that is removed."));
-	Log(_L("     - Place them in packet queue Inq1. Print the contents of Inq2 & Inq1:"));
-	RMBufPktQ aInq1;
-	Test_str aTempHeader;
-	aChain.Init();
-	len = 0;
-	while (!aInq2.IsEmpty())
-		{
-		while (len<5020 && !aInq2.IsEmpty())
-			{
-			(void)aInq2.Remove(aTempChain);
-			TPtr8 dest((TUint8 *)&aTempHeader, sizeof(aTempHeader),sizeof(aTempHeader));
-			aTempChain.CopyOut(dest);
-			aTempChain.TrimStart(sizeof(aTempHeader));
-			len += aTempChain.Length();
-			aChain.Append(aTempChain);
-			if(Mem::Compare((TUint8 *)&aHeader2, sizeof(aHeader2),
-				            (TUint8 *)&aTempHeader, sizeof(aTempHeader))!=0)
-				{
-				Log(_L("Error: The content of header is not the same"));
-				aChain.Free();
-
-#ifdef __CFLOG_ACTIVE
-				__CFLOG_CLOSE;
-				__CFLOG_DELETE;
-#endif
-				User::Leave(EFail);
-				}
-			}
-		aInq1.Append(aChain);
-		aChain.Init();
-		len = 0;
-		}
-	Test_QueueStats(aInq2, _S("InQ2"));
-	Test_QueueStats(aInq1, _S("InQ1"));
-
-	//-------------- substep 8 --------------------
-	Log(_L("  08 - Group the packets into a single packet (Removing Header1, as well)."));
-	Log(_L("     - Check the content of each Header1 that is removed."));
-	Log(_L("     - Place it in Chain. Print the contents of Inq1:"));
-
-	while (!aInq1.IsEmpty())
-		{
-		(void)aInq1.Remove(aTempChain);
-		TPtr8 dest1((TUint8 *)&aTempHeader, sizeof(aTempHeader), sizeof(aTempHeader));
-		aTempChain.CopyOut(dest1);
-		aTempChain.TrimStart(sizeof(aTempHeader));
-		len = aTempChain.Length();
-		len = len;
-		aChain.Append(aTempChain);
-		if(Mem::Compare((TUint8 *)&aHeader1, sizeof(aHeader1),
-				  (TUint8 *)&aTempHeader, sizeof(aTempHeader))!=0)
-			{
-			Log(_L("Error: The content of header is not the same"));
-			aChain.Free();
-
-#ifdef __CFLOG_ACTIVE
-			__CFLOG_CLOSE;
-			__CFLOG_DELETE;
-#endif
-			User::Leave(EFail);
-			}
-		}
-	len = aChain.Length();
-	len = len;
-	Test_QueueStats(aInq1, _S("InQ1"));
-
-	//-------------- substep 9 --------------------
-	Log(_L("  09 - Copy out Chain into Des2.:"));
-	aChain.CopyOut(*aDes2);
-	//-------------- substep 10 --------------------
-	Log(_L("  10 - Compare the content of Des1 & Des2:"));
-	if(aDes1->Compare(*aDes2))
-		{
-		aChain.Free();
-		Log(_L("Error: The content is not the same"));
-
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-	aChain.Free();
-
-	//-------------- substep 11 --------------------
-	Log(_L("  11 - RMBufChain::ReallocL():"));
-	TRAP(ret, aChain.AllocL(32));
-	// ...32 bytes at start
-	LeaveIfErrorL(ret, aChain, _L("AllocL(32)") );
-	TRAP(ret, aChain.ReAllocL(24));
-	// ...24 bytes at start
-	LeaveIfErrorL(ret, aChain, _L("ReAllocL(24)") );
-	LeaveIfDifferentL(24, aChain.Length(), aChain, _L("length check") );
-	aChain.TrimStart(8);
-	// ...16 bytes starting at offset 8
-	LeaveIfDifferentL(16, aChain.Length(), aChain, _L("length check") );
-	TRAP(ret, aChain.ReAllocL(32));
-	// ...32 bytes starting at offset 8
-	LeaveIfErrorL(ret, aChain, _L("ReAllocL(32)") );
-	LeaveIfDifferentL(32, aChain.Length(), aChain, _L("length check") );
-	TRAP(ret, aChain.ReAllocL(120));
-	// ...120 bytes starting at offset 8, only one buffer
-	LeaveIfErrorL(ret, aChain, _L("ReAllocL(120)") );
-	LeaveIfDifferentL(120, aChain.Length(), aChain, _L("length check") );
-	LeaveIfDifferentL((TInt) aChain.First(), (TInt) aChain.Last(), aChain, _L("single buff check") );
-	TRAP(ret, aChain.ReAllocL(121));
-	// ...121 bytes starting at offset 8, two buffers
-	LeaveIfErrorL(ret, aChain, _L("ReAllocL(121)") );
-	LeaveIfDifferentL(121, aChain.Length(), aChain, _L("length check") );
-	TBool sameBuff = aChain.First() == aChain.Last();
-	LeaveIfDifferentL(sameBuff, 0, aChain, _L("two buffs check") );
-	aChain.Free();
-
-	//-------------- substep 12 --------------------
-	Log(_L("  12 - Clean up stack:"));
-    CleanupStack::PopAndDestroy(aDes2);
-    CleanupStack::PopAndDestroy(aDes1);
-    CleanupStack::PopAndDestroy();
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-	
-   	__UHEAP_MARKEND;
-	return EPass;
-	}
-
-void CTest12General::Test_QueueStats(RMBufPktQ &aQueue, const TText *aName)
-	{
-	RMBufChain chain = (RMBufChain)aQueue.First();
-
-	Log(_L("    Queue stats %5s    : "), aName);
-
-	if (chain.IsEmpty())
-		Log(_L("        Empty"));
-	else
-		{
-		TInt n = 0;
-		while (!chain.IsEmpty())
-			{
-			n++;
-			Log(_L("        chain #%2d:%d "), n, chain.Length());
-			chain = chain.Next();
-			}
-		}
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test12General.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2002-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:
-// Test12General.cpp
-// Contains declarations of test step 12 
-// 
-//
-
-
-#if (!defined __TEST12GENERAL_H__)
-#define __TEST12GENERAL_H__
-class RMBufChain;
-class RMBufPktQ;
-NONSHARABLE_CLASS(CTest12General) : public CTestStepCTMbufmgr
-{
-public:
-	CTest12General();
-	~CTest12General();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-
-	void LeaveIfErrorL(TInt aErr, RMBufChain& aChain, const TDesC& aMsg);
-	void LeaveIfDifferentL(TInt aLHS, TInt aRHS, RMBufChain& aChain, const TDesC& aMsg);
-	void Test_QueueStats(RMBufPktQ &aQueue, const TText *aName);
-	typedef struct Test_str //This will be header used in test
-	{
-		TUint8 iHdr[20];
-	} Test_str;
-
-};
-#endif //(__TEST12GENERAL_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test13Performance.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 13 that measures the time spent for alloc/free methods
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "Test13Performance.h"
-
-#include <comms-infras/commsbufpond.h>
-
-// constructor
-CTest13Performance::CTest13Performance()
-	{
-	iTestStepName = _L("MBufMgrTest13");// Store the name of this test case
-	}
-
-// destructor
-CTest13Performance::~CTest13Performance()
-	{
-	}
-
-
-//
-enum TVerdict CTest13Performance::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-	
-	TInt aMBufNo; //Taken from the script;
-	TInt aLoopNo; //Taken from the script;
-	TTime aTimeStart, aTimeStop;
-	//-------------- substep 0 --------------------
-	Log(_L("  00 Read parameters from the script:"));
-	TInt bRet = GetIntFromConfig(_L("MBufMgrTest13"), _L("MBufNo"), aMBufNo);
-	if (!bRet) return EFail;
-	bRet = GetIntFromConfig(_L("MBufMgrTest13"), _L("LoopNo"), aLoopNo);
-	if (!bRet) return EFail;
-	Log(_L("     Info: MBUFNO = %d, LOOPNO= %d"),aMBufNo, aLoopNo);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-	
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager and install active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-
-	CreateInstanceMBufMgrL((TUint)(3*KMBufSmallSize*aMBufNo));
-	CleanupClosePushL(iBufPond);
-
-	TInt i,j,k; //Counters
-	TInt64 us;
-	RMBufQ aBufList1, aBufList2; //Will contain all small buffers;
-	RMBuf* aBuf=0;
-
-	for (i = 0; i<aLoopNo; i++)
-		{
-		Log(_L(" Loop #%d"), i + 1);
-
-		//-------------- substep 2 --------------------
-		Log(_L("  02 Allocate Chain that contains RMBUFNO buffers. Free Chain."));
-		Log(_L("     ...Repeat the same 1000 times.Display the time spent:"));
-		RMBufChain aChain;
-		aTimeStart.UniversalTime();
-		for (j = 0;j < 1000; j++)
-		{
-			TRAPD(ret,aChain.AllocL(KMBufSmallSize*aMBufNo));
-			if (ret != KErrNone)
-				{
-				Log(_L("Error: Couldn't allocate RMBuf:"));
-
-#ifdef __CFLOG_ACTIVE
-				__CFLOG_CLOSE;
-				__CFLOG_DELETE;
-#endif
-				User::Leave(EFail);
-				}
-
-			aChain.Free();
-		}
-	
-		aTimeStop.UniversalTime();
-		us = aTimeStop.MicroSecondsFrom(aTimeStart).Int64()/1000;
-		User::After(100000);
-		Log(_L("     ...Info: The time spent on 1000 alloc and free is %d mS"),us);
-
-		//-------------- substep 3 --------------------
-		Log(_L("  03 Create %d chains, each containing one RMBuf."), 2 * aMBufNo);
-		Log(_L("     ...Then, free all even chains:"));
-		aTimeStart.UniversalTime();
-		TInt attemptCount = 0;
-		for (j = 0;j<2*aMBufNo;j++)
-			{
-			aBuf = static_cast<RMBuf*>(iBufPond.Alloc(KMBufSmallSize, 0, KMaxTInt));
-			if (aBuf == NULL)
-				{
-				++attemptCount;
-				if(attemptCount == 3)
-				    {
-				Log(_L("Error: Couldn't allocate RMBuf number %d:"),j);
-
-#ifdef __CFLOG_ACTIVE
-				__CFLOG_CLOSE;
-				__CFLOG_DELETE;
-#endif
-				User::Leave(EFail);
-				    }
-				else
-				    {
-				    User::After(100000);
-				    }
-				}
-			if(aBuf)
-			    {
-			    aBufList1.Append(aBuf);
-			    }
-			}
-
-		k=0;
-		while (!aBufList1.IsEmpty())
-			{
-			k++;
-			aBuf = aBufList1.Remove();
-			if (k%2)
-				{
-				aBuf->Free();
-				}
-			else
-				{
-				aBufList2.Append(aBuf);
-				}
-			}
-		aTimeStop.UniversalTime();
-		us = aTimeStop.MicroSecondsFrom(aTimeStart).Int64()/1000;
-		Log(_L("     ...Info: The time spent is %d mS"), us);
-
-		//-------------- substep 4 --------------------
-		Log(_L("  04 Allocate Chain that contains RMBUFNO buffers. Free Chain."));
-		Log(_L("     ...Repeat the same 1000 times.Display the time spent:"));
-		aTimeStart.UniversalTime();
-		for (j = 0;j < 1000; j++)
-		{
-			TRAPD(ret,aChain.AllocL(KMBufSmallSize*aMBufNo));
-			if (ret != KErrNone)
-				{
-				Log(_L("Error: Couldn't allocate RMBuf number %d:"),j);
-
-#ifdef __CFLOG_ACTIVE
-				__CFLOG_CLOSE;
-				__CFLOG_DELETE;
-#endif
-				User::Leave(EFail);
-				}
-
-			aChain.Free();
-		}
-		aTimeStop.UniversalTime();
-		us = aTimeStop.MicroSecondsFrom(aTimeStart).Int64()/1000;
-		Log(_L("     ...Info: The time spent on 1000 alloc and free is %d mS"),us);
-
-		//-------------- substep 5 --------------------
-		Log(_L("  05 Free all remaining chains:"));
-		while (!aBufList2.IsEmpty())
-			{
-			aBuf = aBufList2.Remove();
-			aBuf->Free();
-			}
-	}
-
-
-	//-------------- substep 9 --------------------
-	Log(_L("  09 Clean up stack:"));
-    CleanupStack::PopAndDestroy();
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-   	__UHEAP_MARKEND;
-	return EPass;
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test13Performance.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test step 13 
-// 
-//
-
-#if (!defined __TEST13PERFORMANCE_H__)
-#define __TEST13PERFORMANCE_H__
-
-NONSHARABLE_CLASS(CTest13Performance) : public CTestStepCTMbufmgr
-{
-public:
-	CTest13Performance();
-	~CTest13Performance();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-
-};
-
-#endif //(__TEST13PERFORMANCE_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test14HeapFreeCheck.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 14 that check rmbud does not use heap allocation
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-//#include <e32cmn.h>	// maybe this is needed for eka2 ?
-#include <e32std.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "Test14HeapFreeCheck.h"
-#include <comms-infras/commsbufpond.h>
-// constructor
-CTest14HeapFreeCheck::CTest14HeapFreeCheck()
-	{
-	iTestStepName = _L("MBufMgrTest14");// Store the name of this test case
-	}
-
-// destructor
-CTest14HeapFreeCheck::~CTest14HeapFreeCheck()
-	{
-	}
-
-//
-enum TVerdict CTest14HeapFreeCheck::doTestStepL(void)
-	{
-#if defined (_DEBUG)
-	__UHEAP_MARK;
-	
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-	
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Creating CMBufManager and installing active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
-	CleanupClosePushL(iBufPond);
-
-	//-------------- substep 2 --------------------
-	Log(_L("  02 Allocating two descriptors (Des1 & Des2):"));
-	TBuf8<1000> *aDes1, *aDes2;
-    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<1000> );
-    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<1000> );
-	aDes1->SetLength(1000);
-	aDes2->SetLength(1000);
-
-	//-------------- substep 2 --------------------
-	Log(_L("  02 Set User heap to fail at the next alloc.:"));
-	User::__DbgSetAllocFail(RHeap::EUser, RHeap::EFailNext, 0);
-
-	//-------------- substep 3 --------------------
-	Log(_L("  03 Allocate Chain1:"));
-	RMBufChain aChain1;
-	TRAPD(ret,aChain1.AllocL(1000));
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't allocate Chain1:"));
-		User::__DbgSetAllocFail(RHeap::EUser, RHeap::ENone, 0);
-
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 4 --------------------
-	Log(_L("  04 Copy in Des1 into Chain1:"));
-	aChain1.CopyIn(*aDes1);
-
-	//-------------- substep 5 --------------------
-	Log(_L("  05 Split Chain1. The 2nd part goes to Chain2:"));
-	RMBufChain aChain2;
-	TRAP(ret,aChain1.SplitL(300, aChain2));
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't Split"));
-		aChain1.Free();
-		aChain2.Free();
-		User::__DbgSetAllocFail(RHeap::EUser, RHeap::ENone, 0);
-
-#ifdef __CFLOG_ACTIVE
-		__CFLOG_CLOSE;
-		__CFLOG_DELETE;
-#endif
-		User::Leave(EFail);
-		}
-
-	//-------------- substep 6 --------------------
-	Log(_L("  06 Copy out Chain1 into Des2:"));
-	aChain1.CopyOut(*aDes2);
-
-	//-------------- substep 7 --------------------
-	Log(_L("  07 Copy Chain1 into Chain3:"));
-    RMBufChain aChain3;
-	aChain1.CopyL(aChain3,0, 200);
-
-	//-------------- substep 8 --------------------
-	Log(_L("  08 Free the chains. Clean up stack:"));
-	aChain1.Free();
-	aChain2.Free();
-	aChain3.Free();
-	User::__DbgSetAllocFail(RHeap::EUser, RHeap::ENone, 0);
-    CleanupStack::PopAndDestroy(aDes2);
-    CleanupStack::PopAndDestroy(aDes1);
-    CleanupStack::PopAndDestroy();
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-	
-   	__UHEAP_MARKEND;
-	return EPass;
-#else
-	Log(_L("Info: Test Disabled on release build"));
-	return EPass;
-#endif
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test14HeapFreeCheck.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test step 14 
-// 
-//
-
-#if (!defined __TEST14HEAPFREECHECK_H__)
-#define __TEST14HEAPFREECHECK_H__
-
-NONSHARABLE_CLASS(CTest14HeapFreeCheck) : public CTestStepCTMbufmgr
-{
-public:
-	CTest14HeapFreeCheck();
-	~CTest14HeapFreeCheck();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-
-};
-
-#endif //(__TEST14HEAPFREECHECK_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test15Concurrency.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,261 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains IPC Test 15
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <ss_std.h>
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "Test15Concurrency.h"
-#include <comms-infras/commsbufpond.h>
-
-// constructor
-CTest15Concurrency::CTest15Concurrency()
-	{
-	iTestStepName = _L("MBufMgrTest15");// Store the name of this test case
-	iMainThreadTries = 0;
-	iMainThreadFails = 0;
-	iHighThreadTries = 0;
-	iHighThreadFails = 0;
-	}
-
-// destructor
-CTest15Concurrency::~CTest15Concurrency()
-	{
-	}
-
-//
-TInt CTest15Concurrency::fHighPriorityThread(TAny* aInput)
-	{
-	CTest15Concurrency* pTestObject = (CTest15Concurrency*)aInput;
-	// We need to introduce this new client thread to the MBufMgr
-	TCommsBufPondTLSOp tls(pTestObject->iBufPond);
-	tls.Set();
-	
-	CTrapCleanup* aCleanup = CTrapCleanup::New();
-
-	//Install active scheduler
-    CActiveScheduler* aActSch = new CActiveScheduler;
-	if(aActSch==NULL)
-		{
-		return KErrNoMemory;
-		}
-	CActiveScheduler::Install(aActSch);
-
-	RTimer aTimer;
-	TRequestStatus aTimerStatus;	// Request status associated with timer
-	aTimer.CreateLocal();			// Create timer for this thread
-	//-------------- substep 1 --------------------
-
-	// Allocate two 500-bytes long descriptors (Des1 & Des2):"));
-	TBuf8<500> *aDes1 = NULL;
-	TBuf8<500> *aDes2 = NULL;
-
-    TRAPD(ret, aDes1 = new(ELeave) TBuf8<500>);
-	if(ret!=KErrNone)
-		{
-		return ret;
-		}
-
-    TRAP(ret, aDes2 = new(ELeave) TBuf8<500>);
-	if(ret!=KErrNone)
-		{
-		delete aDes1;
-		return ret;
-		}
-
-	aDes1->SetLength(500);
-	aDes2->SetLength(500);
-
-	//Fill in the Des1 with a pattern
-	pTestObject->StripeDes(*aDes1, 0, 500, 'a', 'z');
-
-	#ifdef __CFLOG_ACTIVE
-	__CFLOG_DECLARATION_VARIABLE;
-	TRAP(ret, __CFLOG_CREATEL);
-	if(ret!=KErrNone)
-		{
-		delete aDes1;
-		delete aDes2;
-		return ret;
-		}
-	__CFLOG_OPEN;
-#endif
-	
-	for (TInt i = 0 ; i<1000;i++)
-		{
-		//Allocate 500-bytes long RMBufChain
-		RMBufChain aChain;
-		TRAP(ret,aChain.AllocL(500));
-		if (ret != KErrNone)
-			{
-			break;
-			}
-		//Copy in Des1 into Chain
-		aChain.CopyIn(*aDes1);
-		//Fill in Des2 with zeros
-		pTestObject->StripeDes(*aDes2, 0, 500, 0, 0);
-		//Copy out Chain into Des2;
-		aChain.CopyOut(*aDes2);
-		//Compare the contents of Des1 & Des2
-		if(aDes1->Compare(*aDes2))
-			pTestObject->iHighThreadFails++;
-		pTestObject->iHighThreadTries++;
-		//Free chain
-		aChain.Free();
-		//Sleep for 5ms
-		aTimer.After(aTimerStatus,5000);
-		User::WaitForRequest(aTimerStatus);
-		}
-	delete aDes1;
-	delete aDes2;
-	CActiveScheduler::Install(NULL);
-	delete aActSch;
-	delete aCleanup;
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-	return ret;
-}
-
-
-
-enum TVerdict CTest15Concurrency::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-	
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-	
-	volatile TExitType aExit;
-
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager and install active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
-	CleanupClosePushL(iBufPond);
-
-	//-------------------substep 01-----------------------------
-	Log(_L("  02 Create high priority thread and resume it:"));
-	RThread aThread;
-	
-	TInt err=aThread.Create(_L("testThreadRec"),
-		                       fHighPriorityThread,
- 							   KDefaultStackSize,
-							   KDefaultHeapSize,
-							   KMaxHeapSize,
-							   (TAny*)this,
-							   EOwnerProcess);
-	if (err!=KErrNone)
-		{
-		_LIT(aLog,"Error:Could not create the thread. err = %d"); Log(aLog,err);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-	
-		User::Leave(EFail);
-		}
-	aThread.SetPriority(EPriorityAbsoluteHigh);
-	aThread.Resume();
-
-	//-------------------substep 03-----------------------------
-	Log(_L("  02 Do tests in loop end stop when the other finishes"));
-	Log(_L("     ...It will take a while (about 10 sec.):"));
-
-	// Allocate two 5000-bytes long descriptors (Des1 & Des2):"));
-	TBuf8<5000> *aDes1, *aDes2;
-    CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<5000> );
-    CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<5000> );
-	aDes1->SetLength(5000);
-	aDes2->SetLength(5000);
-	//Fill in the Des1 with a pattern:"));
-	StripeDes(*aDes1, 0, 5000, '@', 'Z');
-
-	do {
-		//Allocate 5000-bytes long RMBufChain
-		RMBufChain aChain;
-		TRAPD(ret,aChain.AllocL(5000));
-		if (ret != KErrNone)
-			{
-			Log(_L("Error: Couldn't allocate RMBuf:"));
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-			User::Leave(EFail);
-			}
-		//Copy in Des1 into Chain
-		aChain.CopyIn(*aDes1);
-		//Fill in Des2 with zeros:"));
-		StripeDes(*aDes2, 0, 5000, 0, 0);
-		//Copy out Chain into Des2:"));
-		aChain.CopyOut(*aDes2);
-		//Compare the contents of Des1 & Des2:
-		if(aDes1->Compare(*aDes2))	iMainThreadFails++;
-		iMainThreadTries++;
-		//Free chain
-		aChain.Free();
-
-		//Check whether the other task has finished
-		aExit = aThread.ExitType();
-		}
-	while (aExit == EExitPending);
-
-	//Clean up stack
-	CleanupStack::PopAndDestroy(aDes2);
-    CleanupStack::PopAndDestroy(aDes1);
-    CleanupStack::PopAndDestroy();
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-
-	//-------------------substep 02-----------------------------
-	Log(_L("     Info: Number of main thread checkings: %d with %d fails"),iMainThreadTries,iMainThreadFails);
-	Log(_L("     Info: Number of high priority thread checkings: %d with %d fails"),iHighThreadTries,iHighThreadFails);
-	aThread.Close();
-	if (iHighThreadTries <1000)
-		{
-		Log(_L("   Error: High priority thread ended before 1000 loops are finished"));
-		return EFail;
-		}
-	if ( iHighThreadFails || iMainThreadFails)
-		return EFail;
-
-	__UHEAP_MARKEND;
-	return EPass;
-  }
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test15Concurrency.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test 15
-// 
-//
-
-#if (!defined __TEST15CONCURRENCY_H__)
-#define __TEST15CONCURRENCY_H__
-
-NONSHARABLE_CLASS(CTest15Concurrency) : public CTestStepCTMbufmgr
-{
-public:
-	CTest15Concurrency();
-	~CTest15Concurrency();
-	virtual enum TVerdict doTestStepL( void );
-private:
-	static TInt fHighPriorityThread(TAny*); //High priority thread in this test
-
-	TInt iMainThreadTries;
-	TInt iMainThreadFails;
-	TInt iHighThreadTries;
-	TInt iHighThreadFails;
-};	
-#endif //(__TEST15CONCURRENCY_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test19Prepend.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,254 +0,0 @@
-// Copyright (c) 2008-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:
-// Test19Prepend.cpp
-// Contains MBufMgr Test Step 19 for Prepend() methods
-//
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "Test19Prepend.h"
-
-// constructor
-CTest19Prepend::CTest19Prepend()
-	{
-	iTestStepName = _L("MBufMgrTest19");// Store the name of this test case
-	}
-
-// destructor
-CTest19Prepend::~CTest19Prepend()
-	{
-	}
-
-//
-enum TVerdict CTest19Prepend::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager and install active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-
-	RArray<TCommsBufPoolCreateInfo> poolInfoArray;
-	TCommsBufPoolCreateInfo createInfo;
-	createInfo.iBufSize = 128;
-	createInfo.iInitialBufs = 128;
-	createInfo.iGrowByBufs = 64;
-	createInfo.iMinFreeBufs = 40;
-	createInfo.iCeiling = (KMBufDefaultHeapSize / 2)/createInfo.iBufSize;
-	poolInfoArray.AppendL(createInfo);
-	CreateInstanceMBufMgrL(poolInfoArray);
-	CleanupClosePushL(iBufPond);
-	poolInfoArray.Close ();
-
-	TBool firstFail = EFalse;
-	TBool secondFail = EFalse;
-	TInt ret;
-	RMBufChain chain,chain2;
-
-	//-------------- substep 2 --------------------
-	Log(_L("  02 Prepend 20 bytes to an empty chain"));
-	ret = chain.Prepend(20);
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't prepend:"));
-		firstFail = ETrue;
-		}
-	else
-		{
-	    if(chain.NumBufs() != 1)
-	        {
-		    Log(_L("Error: Wrong number of MBufs allocated:"));
-			secondFail = ETrue;
-		    }
-		if(chain.Length() != 20)
-			{
-		    Log(_L("Error: Wrong number of bytes prepended:"));
-			secondFail = ETrue;
-			}
-		//-------------- substep 3 --------------------
-		Log(_L("  03 Deallocating RMBufChain"));
-		chain.Free();
-		}
-
-	//-------------- substep 4 --------------------
-	Log(_L("  04 Prepend 200 bytes to an empty chain"));
-    ret = chain.Prepend(200);
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't prepend:"));
-		firstFail = ETrue;
-		}
-	else
-		{
-	    if(chain.NumBufs() != 2)
-	        {
-		    Log(_L("Error: Wrong number of MBufs allocated:"));
-			secondFail = ETrue;
-		    }
-		if(chain.Length() != 200)
-			{
-		    Log(_L("Error: Wrong number of bytes prepended:"));
-			secondFail = ETrue;
-			}
-		//-------------- substep 6 --------------------
-		Log(_L("  05 Deallocating RMBufChain"));
-		chain.Free();
-		}
-	//-------------- substep 6 --------------------
-	Log(_L("  06 Prepend 20 bytes to an existing chain"));
-	ret = chain.Alloc(20);
-	if (ret != KErrNone)
-	    {
-        Log(_L("Error: Couldn't allocate initial chain:"));
-        firstFail = ETrue;
-	    }
-    else
-        {
-		ret = chain.Prepend(20);
-		if (ret != KErrNone)
-			{
-			Log(_L("Error: Couldn't prepend:"));
-			firstFail = ETrue;
-			}
-		else
-			{
-			if(chain.NumBufs() != 2)
-				{
-				Log(_L("Error: Wrong number of MBufs allocated:"));
-				secondFail = ETrue;
-				}
-			if(chain.Length() != 40)
-				{
-				Log(_L("Error: Wrong number of bytes:"));
-				secondFail = ETrue;
-				}
-		    //-------------- substep 7 --------------------
-			Log(_L("  07 Deallocating RMBufChain"));
-			chain.Free();
-			}
-		}
-	//-------------- substep 8 --------------------
-	Log(_L("  08 Prepend 200 bytes to an existing chain"));
-	ret = chain.Alloc(20);
-	if (ret != KErrNone)
-	    {
-        Log(_L("Error: Couldn't allocate initial chain:"));
-        firstFail = ETrue;
-	    }
-    else
-        {
-		ret = chain.Prepend(200);
-		if (ret != KErrNone)
-			{
-			Log(_L("Error: Couldn't prepend:"));
-			firstFail = ETrue;
-			}
-		else
-			{
-			if(chain.NumBufs() != 3)
-				{
-				Log(_L("Error: Wrong number of MBufs allocated:"));
-				secondFail = ETrue;
-				}
-			if(chain.Length() != 220)
-				{
-				Log(_L("Error: Wrong number of bytes:"));
-				secondFail = ETrue;
-				}
-		    //-------------- substep 9 --------------------
-			Log(_L("  09 Deallocating RMBufChain"));
-			chain.Free();
-			}
-		}
-	//-------------- substep 10 --------------------
-	Log(_L("  10 Prepend one chain onto another chain"));
-	ret = chain.Alloc(20);
-	if (ret != KErrNone)
-	    {
-        Log(_L("Error: Couldn't allocate initial chain:"));
-        firstFail = ETrue;
-	    }
-    else
-        {
-		ret = chain2.Alloc(200);
-		if (ret != KErrNone)
-			{
-			Log(_L("Error: Couldn't allocate second chain:"));
-			firstFail = ETrue;
-			}
-		else
-			{
-			RMBuf* first = chain2.First();
-			chain.Prepend(chain2);
-
-			if(chain.NumBufs() != 3)
-				{
-				Log(_L("Error: Wrong number of MBufs in the chain:"));
-				secondFail = ETrue;
-				}
-			if(chain.Length() != 220)
-				{
-				Log(_L("Error: Wrong number of bytes:"));
-				secondFail = ETrue;
-				}
-			if(chain.First() != first)
-			    {
-				Log(_L("Error: chain2 not prepended correctly:"));
-				secondFail = ETrue;
-				}
-		    //-------------- substep 11 --------------------
-			Log(_L("  11 Deallocating RMBufChains"));
-			chain2.Free();
-			}
-		chain.Free();
-		}
-	//-------------- substep 12 --------------------
-	Log(_L("  12 Clean up stack:"));
-    CleanupStack::PopAndDestroy(); // pond
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-    __UHEAP_MARKEND;
-
-    if (firstFail || secondFail)
-    	{
-    	return EFail;
-    	}
-
-	return EPass;
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test19Prepend.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 2008-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:
-// Test19Prepend.h
-// Contains declaration of test step 19
-//
-//
-
-#if (!defined __TEST19PREPEND_H__)
-#define __TEST19PREPEND_H__
-
-NONSHARABLE_CLASS(CTest19Prepend) : public CTestStepCTMbufmgr
-{
-public:
-	CTest19Prepend();
-	~CTest19Prepend();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-};
-
-#endif //(__TEST09ALIGN_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test22Append.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,254 +0,0 @@
-// Copyright (c) 2008-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:
-// Test22Append.cpp
-// Contains MBufMgr Test Step 22 for Append() methods
-//
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "Test22Append.h"
-
-// constructor
-CTest22Append::CTest22Append()
-	{
-	iTestStepName = _L("MBufMgrTest22");// Store the name of this test case
-	}
-
-// destructor
-CTest22Append::~CTest22Append()
-	{
-	}
-
-//
-enum TVerdict CTest22Append::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager and install active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-
-	RArray<TCommsBufPoolCreateInfo> poolInfoArray;
-	TCommsBufPoolCreateInfo createInfo;
-	createInfo.iBufSize = 128;
-	createInfo.iInitialBufs = 128;
-	createInfo.iGrowByBufs = 64;
-	createInfo.iMinFreeBufs = 40;
-	createInfo.iCeiling = (KMBufDefaultHeapSize / 2)/createInfo.iBufSize;
-	poolInfoArray.AppendL(createInfo);
-	CreateInstanceMBufMgrL(poolInfoArray);
-	CleanupClosePushL(iBufPond);
-	poolInfoArray.Close ();
-
-	TBool firstFail = EFalse;
-	TBool secondFail = EFalse;
-	TInt ret;
-	RMBufChain chain,chain2;
-
-	//-------------- substep 2 --------------------
-	Log(_L("  02 Append 20 bytes to an empty chain"));
-	ret = chain.Append(20);
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't append:"));
-		firstFail = ETrue;
-		}
-	else
-		{
-	    if(chain.NumBufs() != 1)
-	        {
-		    Log(_L("Error: Wrong number of MBufs allocated:"));
-			secondFail = ETrue;
-		    }
-		if(chain.Length() != 20)
-			{
-		    Log(_L("Error: Wrong number of bytes appended:"));
-			secondFail = ETrue;
-			}
-		//-------------- substep 3 --------------------
-		Log(_L("  03 Deallocating RMBufChain"));
-		chain.Free();
-		}
-
-	//-------------- substep 4 --------------------
-	Log(_L("  04 Append 200 bytes to an empty chain"));
-    ret = chain.Append(200);
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't append:"));
-		firstFail = ETrue;
-		}
-	else
-		{
-	    if(chain.NumBufs() != 2)
-	        {
-		    Log(_L("Error: Wrong number of MBufs allocated:"));
-			secondFail = ETrue;
-		    }
-		if(chain.Length() != 200)
-			{
-		    Log(_L("Error: Wrong number of bytes appended:"));
-			secondFail = ETrue;
-			}
-		//-------------- substep 6 --------------------
-		Log(_L("  05 Deallocating RMBufChain"));
-		chain.Free();
-		}
-	//-------------- substep 6 --------------------
-	Log(_L("  06 Append 20 bytes to an existing chain"));
-	ret = chain.Alloc(20);
-	if (ret != KErrNone)
-	    {
-        Log(_L("Error: Couldn't allocate initial chain:"));
-        firstFail = ETrue;
-	    }
-    else
-        {
-		ret = chain.Append(20);
-		if (ret != KErrNone)
-			{
-			Log(_L("Error: Couldn't append:"));
-			firstFail = ETrue;
-			}
-		else
-			{
-			if(chain.NumBufs() != 1)
-				{
-				Log(_L("Error: Wrong number of MBufs allocated:"));
-				secondFail = ETrue;
-				}
-			if(chain.Length() != 40)
-				{
-				Log(_L("Error: Wrong number of bytes:"));
-				secondFail = ETrue;
-				}
-		    //-------------- substep 7 --------------------
-			Log(_L("  07 Deallocating RMBufChain"));
-			chain.Free();
-			}
-		}
-	//-------------- substep 8 --------------------
-	Log(_L("  08 Append 200 bytes to an existing chain"));
-	ret = chain.Alloc(20);
-	if (ret != KErrNone)
-	    {
-        Log(_L("Error: Couldn't allocate initial chain:"));
-        firstFail = ETrue;
-	    }
-    else
-        {
-		ret = chain.Append(200);
-		if (ret != KErrNone)
-			{
-			Log(_L("Error: Couldn't append:"));
-			firstFail = ETrue;
-			}
-		else
-			{
-			if(chain.NumBufs() != 2)
-				{
-				Log(_L("Error: Wrong number of MBufs allocated:"));
-				secondFail = ETrue;
-				}
-			if(chain.Length() != 220)
-				{
-				Log(_L("Error: Wrong number of bytes:"));
-				secondFail = ETrue;
-				}
-		    //-------------- substep 9 --------------------
-			Log(_L("  09 Deallocating RMBufChain"));
-			chain.Free();
-			}
-		}
-	//-------------- substep 10 --------------------
-	Log(_L("  10 Append one chain onto another chain"));
-	ret = chain.Alloc(20);
-	if (ret != KErrNone)
-	    {
-        Log(_L("Error: Couldn't allocate initial chain:"));
-        firstFail = ETrue;
-	    }
-    else
-        {
-		ret = chain2.Alloc(200);
-		if (ret != KErrNone)
-			{
-			Log(_L("Error: Couldn't allocate second chain:"));
-			firstFail = ETrue;
-			}
-		else
-			{
-			RMBuf* first = chain.First();
-			chain.Append(chain2);
-
-			if(chain.NumBufs() != 3)
-				{
-				Log(_L("Error: Wrong number of MBufs in the chain:"));
-				secondFail = ETrue;
-				}
-			if(chain.Length() != 220)
-				{
-				Log(_L("Error: Wrong number of bytes:"));
-				secondFail = ETrue;
-				}
-			if(chain.First() != first)
-			    {
-				Log(_L("Error: chain2 not appended correctly:"));
-				secondFail = ETrue;
-				}
-		    //-------------- substep 11 --------------------
-			Log(_L("  11 Deallocating RMBufChains"));
-			chain2.Free();
-			}
-		chain.Free();
-		}
-	//-------------- substep 12 --------------------
-	Log(_L("  12 Clean up stack:"));
-    CleanupStack::PopAndDestroy(); // pond
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-    __UHEAP_MARKEND;
-
-    if (firstFail || secondFail)
-    	{
-    	return EFail;
-    	}
-
-	return EPass;
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test22Append.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 2008-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:
-// Test22Append.h
-// Contains declaration of test step 22
-//
-//
-
-#if (!defined __TEST22APPEND_H__)
-#define __TEST22APPEND_H__
-
-NONSHARABLE_CLASS(CTest22Append) : public CTestStepCTMbufmgr
-{
-public:
-	CTest22Append();
-	~CTest22Append();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-};
-
-#endif //(__TEST09ALIGN_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test23RMBufQ.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,183 +0,0 @@
-// Copyright (c) 2008-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:
-// Test23RMBufQ.cpp
-// Contains MBufMgr Test Step 22 for Append() methods
-//
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "Test23RMBufQ.h"
-
-// constructor
-CTest23RMBufQ::CTest23RMBufQ()
-	{
-	iTestStepName = _L("MBufMgrTest23");// Store the name of this test case
-	}
-
-// destructor
-CTest23RMBufQ::~CTest23RMBufQ()
-	{
-	}
-
-//
-enum TVerdict CTest23RMBufQ::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager and install active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-
-	RArray<TCommsBufPoolCreateInfo> poolInfoArray;
-	TCommsBufPoolCreateInfo createInfo;
-	createInfo.iBufSize = 128;
-	createInfo.iInitialBufs = 128;
-	createInfo.iGrowByBufs = 64;
-	createInfo.iMinFreeBufs = 40;
-	createInfo.iCeiling = (KMBufDefaultHeapSize / 2)/createInfo.iBufSize;
-	poolInfoArray.AppendL(createInfo);
-	CreateInstanceMBufMgrL(poolInfoArray);
-	CleanupClosePushL(iBufPond);
-	poolInfoArray.Close ();
-
-	TBool firstFail = EFalse;
-	TBool secondFail = EFalse;
-	TInt ret;
-	RMBufChain chain,chain2;
-
-	//-------------- substep 2 --------------------
-	Log(_L("  2 Append a chain onto an RMBuqQ"));
-	ret = chain.Alloc(20);
-	if (ret != KErrNone)
-	    {
-        Log(_L("Error: Couldn't allocate initial chain:"));
-        firstFail = ETrue;
-	    }
-    else
-        {
-		ret = chain2.Alloc(20);
-		if (ret != KErrNone)
-			{
-			Log(_L("Error: Couldn't allocate second chain:"));
-			firstFail = ETrue;
-			}
-		else
-			{
-			RMBuf* first2 = chain2.First();
-			RMBuf* first = chain.First();
-
-			RMBufQ aBufList;
-			aBufList.Assign(chain);
-
-			aBufList.Append(chain2);
-
-			// Check that the buffers come back out of the queue in the right order
-			if(aBufList.Remove() != first)
-				{
-				Log(_L("Error: chain not appended to RMBufQ correctly:"));
-				secondFail = ETrue;
-				}
-			if(aBufList.Remove() != first2)
-				{
-				Log(_L("Error: chain not appended to RMBufQ correctly:"));
-				secondFail = ETrue;
-				}
-			//-------------- substep 3 --------------------
-			Log(_L("  3 Deallocating RMBufChains"));
-			chain2.Free();
-		    }
-		chain.Free();
-		}
-	//-------------- substep 4 --------------------
-	Log(_L("  4 Prepend a chain onto an RMBuqQ"));
-	ret = chain.Alloc(20);
-	if (ret != KErrNone)
-	    {
-        Log(_L("Error: Couldn't allocate initial chain:"));
-        firstFail = ETrue;
-	    }
-    else
-        {
-		ret = chain2.Alloc(20);
-		if (ret != KErrNone)
-			{
-			Log(_L("Error: Couldn't allocate second chain:"));
-			firstFail = ETrue;
-			}
-		else
-			{
-			RMBuf* first2 = chain2.First();
-			RMBuf* first = chain.First();
-
-			RMBufQ aBufList;
-			aBufList.Assign(chain);
-
-			aBufList.Prepend(chain2);
-
-			// Check that the buffers come back out of the queue in the right order
-			if(aBufList.Remove() != first2)
-				{
-				Log(_L("Error: chain not prepended to RMBufQ correctly:"));
-				secondFail = ETrue;
-				}
-			if(aBufList.Remove() != first)
-				{
-				Log(_L("Error: chain not prepended to RMBufQ correctly:"));
-				secondFail = ETrue;
-				}
-			//-------------- substep 5 --------------------
-			Log(_L("  5 Deallocating RMBufChains"));
-			chain2.Free();
-		    }
-		chain.Free();
-		}
-	//-------------- substep 6 ---------------------
-	Log(_L("  6 Clean up stack:"));
-    CleanupStack::PopAndDestroy(); // pond
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-    __UHEAP_MARKEND;
-
-    if (firstFail || secondFail)
-    	{
-    	return EFail;
-    	}
-
-	return EPass;
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/Test23RMBufQ.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 2008-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:
-// Test22Append.h
-// Contains declaration of test step 22
-//
-//
-
-#if (!defined __TEST23RMBUFQ_H__)
-#define __TEST23RMBUFQ_H__
-
-NONSHARABLE_CLASS(CTest23RMBufQ) : public CTestStepCTMbufmgr
-{
-public:
-	CTest23RMBufQ();
-	~CTest23RMBufQ();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-};
-
-#endif //(__TEST09ALIGN_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/TestStepCTMbufmgr.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-// Copyright (c) 2001-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:
-// Contains definition of CTestStepCTMbufmgr which is the base class
-// for all the Mbufmgr Test Step classes
-// 
-//
-
-// EPOC includes
-//#include <e32base.h>
-//#include <es_sock.h>
-
-// Test system includes
-#include <es_mbuf.h>
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#include "networking/testsuite.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include <networking/testsuite.h>
-#endif
-
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-#include <comms-infras/commsbufpond.h>
-#include <comms-infras/commsbufpondop.h>
-
-// constructor
-CTestStepCTMbufmgr::CTestStepCTMbufmgr()
-	{
-	}
-
-// destructor
-CTestStepCTMbufmgr::~CTestStepCTMbufmgr()
-	{
-	}
-
-void CTestStepCTMbufmgr::StripeMem(TUint8 *aBuf,
-								   TInt aStartPos,
-								   TInt anEndPos,
-								   TUint aStartChar,
-								   TUint anEndChar)
-	{
-	TUint character=aStartChar;
-	for (TInt i=aStartPos;i<anEndPos;i++)
-		{
-		aBuf[i]=(TText8)character;
-		if(++character>anEndChar) character=aStartChar;
-		}
-	}
-
-void CTestStepCTMbufmgr::StripeDes(TDes8 &aBuf,
-								   TInt aStartPos,
-								   TInt anEndPos,
-								   TUint aStartChar,
-								   TUint anEndChar)
-// Mark a buffer with repeating byte pattern
-	{
-	__ASSERT_ALWAYS(aStartChar<=anEndChar, User::Panic(_L("MBufTest"),0));
-	__ASSERT_ALWAYS(aStartPos<=anEndPos, User::Panic(_L("MBufTest"),0));
-	__ASSERT_ALWAYS(anEndPos<=aBuf.Length(), User::Panic(_L("MBufTest"),0));
-
-	StripeMem((TUint8 *)aBuf.Ptr(), aStartPos, anEndPos, aStartChar, anEndChar);
-	}
-
-// create an mbuf manager instance with some arbitrary default mbuf size alloc info
-// - refer CMBufManager::NewL notes regarding explaination of why this is deliberately not done within the mbuf manager
-static const TInt KMBuf_MBufSize = 128;
-static const TInt KMBuf_MinGrowth = 64;
-static const TInt KMBuf_GrowthThreshold = 40;
-#define SYMBIAN_MBUFMGR_BACKGROUND_ALLOCATION
-#ifndef SYMBIAN_MBUFMGR_BACKGROUND_ALLOCATION
-static const TInt KMBuf_InitialAllocation = 128;
-#endif
-void CTestStepCTMbufmgr::CreateInstanceMBufMgrL(TInt aMaxHeapSize)
-	{
-
-	RArray<TCommsBufPoolCreateInfo> poolInfoArray;
-	TCommsBufPoolCreateInfo createInfo;
-#ifdef SYMBIAN_MBUFMGR_BACKGROUND_ALLOCATION
-	
-	// this method used for tests that dont do background allocation so make the 
-	// pool big enough to fill the heap
-	createInfo.iBufSize = KMBuf_MBufSize;
-	createInfo.iInitialBufs = (aMaxHeapSize/(KMBuf_MBufSize+sizeof(RMBuf)))-1;
-	createInfo.iGrowByBufs = KMBuf_MinGrowth;
-	createInfo.iMinFreeBufs = KMBuf_GrowthThreshold;
-	createInfo.iCeiling = aMaxHeapSize/KMBuf_MBufSize;
-#else
-	createInfo.iBufSize = KMBuf_MBufSize;
-	createInfo.iInitialBufs = KMBuf_InitialAllocation;
-	createInfo.iGrowByBufs = KMBuf_MinGrowth;
-	createInfo.iMinFreeBufs = KMBuf_GrowthThreshold;
-	createInfo.iCeiling = aMaxHeapSize/KMBuf_MBufSize;	
-#endif
-	poolInfoArray.Append ( createInfo );		
-
-	User::LeaveIfError(iBufPond.Open(poolInfoArray));
-	poolInfoArray.Close ();
-	}
-
-void CTestStepCTMbufmgr::CreateInstanceMBufMgrL(RArray<TCommsBufPoolCreateInfo>& aPoolCreateInfo)
-	{
-	User::LeaveIfError(iBufPond.Open(aPoolCreateInfo));
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/TestStepCTMbufmgr.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of CTestStepCTMbufmgr class that is
-// base class for all test step classes in this test.
-// 
-//
-
-#if (!defined __TESTSTEPSCTMBUFMGR_H__)
-#define __TESTSTEPSCTMBUFMGR_H__
-
-#include <cflog.h>
-#include <comms-infras/commsbufpondop.h>
-#include <es_mbuf.h>
-
-#include <networking/teststep.h>
-
-
-const TUint KMBufMinHeapSize        = 4 * 1024;
-
-const TUint KMBufDefaultHeapSize    = 256 * 1024;
-
-class CCommsBufManager;
-class CTestSuiteCTMbufmgr;
-class TCommsBufPoolCreateInfo;
-NONSHARABLE_CLASS(CTestStepCTMbufmgr) : public CTestStep
-{
-public:
-	CTestStepCTMbufmgr();
-	~CTestStepCTMbufmgr();
-
-	CTestSuiteCTMbufmgr * iEsockSuite;// Pointer to the suite which owns this test
-protected:
-	void StripeMem(TUint8 *aBuf, TInt aStartPos, TInt anEndPos, TUint aStartChar, TUint anEndChar);
-	void StripeDes(TDes8 &aBuf, TInt aStartPos, TInt anEndPos, TUint aStartChar, TUint anEndChar);
-	void CreateInstanceMBufMgrL(TInt aMaxHeapSize);
-	void CreateInstanceMBufMgrL(RArray<TCommsBufPoolCreateInfo>& aPoolCreateInfo);
-
-	CActiveScheduler* 				iActSch;
-	RCommsBufPondOp 				iBufPond;
-	
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_DECLARATION_MEMBER;
-#endif
-};
-
-#endif /* __TESTSTEPSCTMBUFMGR_H__ */
--- a/commsfwutils/commsbufs/TS_mbufmgr/TestSuiteCTMbufmgr.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains main DLL entry point for dll and definition of test suite class.
-//
-//
-
-// Test system includes
-#include <es_mbuf.h>
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#include "networking/testsuite.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include <networking/testsuite.h>
-#endif
-
-#include "Test01CreateDeleteMBufMgr.h"
-#include "Test02AllocDealloc.h"
-#include "Test03AllocLeave.h"
-#include "Test04CopyInOut.h"
-#include "Test05CopyInOutOffset.h"
-#include "Test06SplitL.h"
-#include "Test07TrimStart.h"
-#include "Test08TrimEnd.h"
-#include "Test09Align.h"
-#include "Test10CopyL.h"
-#include "Test11AsyncAlloc.h"
-#include "Test12General.h"
-#include "Test13Performance.h"
-#include "Test14HeapFreeCheck.h"
-#include "Test15Concurrency.h"
-#include "test16memoryfull.h"
-#include "test17requestsizelimits.h"
-#include "test18exhaustmidsizepools.h"
-#include "test19prepend.h"
-#include "test20poolceilingfull.h"
-#include "test21commsbufs.h"
-#include "test22append.h"
-#include "test23rmbufq.h"
-
-
-EXPORT_C CTestSuiteCTMbufmgr* NewTestSuiteCTMbufmgr( void )
-	{
-	return new (ELeave) CTestSuiteCTMbufmgr;
-	}
-
-CTestSuiteCTMbufmgr::~CTestSuiteCTMbufmgr()
-	{
-	}
-
-// Add a test step into the suite
-void CTestSuiteCTMbufmgr::AddTestStepL( CTestStepCTMbufmgr* ptrTestStep )
-	{
-	// Test steps contain a pointer back to the suite which owns them
-	ptrTestStep->iEsockSuite = this;
-
-	// Add the step using the base class method
-	CTestSuite::AddTestStepL(ptrTestStep);
-	}
-
-
-// Make a version string available for test system
-TPtrC CTestSuiteCTMbufmgr::GetVersion( void )
-	{
-#ifdef _DEBUG
-	_LIT(KTxtVersion,"1.007 (udeb)");
-#else
-	_LIT(KTxtVersion,"1.007");
-#endif
-
-	return KTxtVersion();
-	}
-
-// Second phase constructor for MBufMgr test suite
-// This creates all the MBufMgr test steps and
-// stores them inside CTestSuiteCTMbufmgr
-void CTestSuiteCTMbufmgr::InitialiseL( void )
-	{
-
-	// Add test steps
-	AddTestStepL( new(ELeave) CTest01CreateDeleteMBufMgr );
-	AddTestStepL( new(ELeave) CTest02AllocDealloc );
-	AddTestStepL( new(ELeave) CTest03AllocLeave );
-	AddTestStepL( new(ELeave) CTest04CopyInOut );
-	AddTestStepL( new(ELeave) CTest05CopyInOutOffset );
-	AddTestStepL( new(ELeave) CTest06Split );
-	AddTestStepL( new(ELeave) CTest07TrimStart );
-	AddTestStepL( new(ELeave) CTest08TrimEnd );
-	AddTestStepL( new(ELeave) CTest09Align );
-	AddTestStepL( new(ELeave) CTest10Copy );
-	AddTestStepL( new(ELeave) CTest11AsyncAlloc );
-	AddTestStepL( new(ELeave) CTest12General );
-	AddTestStepL( new(ELeave) CTest13Performance );
-	AddTestStepL( new(ELeave) CTest14HeapFreeCheck );
-	AddTestStepL( new(ELeave) CTest15Concurrency );
-	AddTestStepL( new(ELeave) CTest16MemoryFull );
-	AddTestStepL( new(ELeave) CTest17RequestSizeLimits );
-	AddTestStepL( new(ELeave) CTest19Prepend );
-	AddTestStepL( new(ELeave) CTest20PoolCeilingFull );
-    AddTestStepL( new(ELeave) CTest21CommsBufs );
-	AddTestStepL( new(ELeave) CTest22Append );
-	AddTestStepL( new(ELeave) CTest23RMBufQ );
-	return;
-	}
-
--- a/commsfwutils/commsbufs/TS_mbufmgr/TestSuiteCTMbufmgr.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of CTestSuiteCTMbufmgr that is
-// container class for all Mbufmgr test steps
-// 
-//
-
-#if (!defined __TESTSUITECTMBUFMGR_H__)
-#define __TESTSUITECTMBUFMGR_H__
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/testsuite.h"
-#else
-#include <networking/testsuite.h>
-#endif
-
-class CMBufManager;
-
-NONSHARABLE_CLASS(CTestSuiteCTMbufmgr) : public CTestSuite
-{
-public:
-	void InitialiseL( void );
-	~CTestSuiteCTMbufmgr();
-	void AddTestStepL( CTestStepCTMbufmgr * ptrTestStep );
-	TPtrC GetVersion( void );
-
-	CActiveScheduler* as;
-	CMBufManager* MBMngr;
-private:
-};
-
-#endif /* __TESTSUITECTMBUFMGR_H__ */
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest05-CopyIn.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-[MBufMgrTest05]
-test=CopyIn
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest05-CopyOut.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-[MBufMgrTest05]
-test=CopyOut
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest06-1st.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-[MBufMgrTest06]
-Length=100
-Offset=60
-ForceSmallBuf=0
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest06-2nd.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-[MBufMgrTest06]
-Length=200
-Offset=129
-ForceSmallBuf=0
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest06-3rd.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-[MBufMgrTest06]
-Length=300
-Offset=160
-ForceSmallBuf=0
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest06-4th.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-[MBufMgrTest06]
-Length=700
-Offset=260
-ForceSmallBuf=1
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest07-1st.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-[MBufMgrTest07]
-Length=100
-Offset=60
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest07-2nd.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-[MBufMgrTest07]
-Length=200
-Offset=128
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest07-3rd.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-[MBufMgrTest07]
-Length=300
-Offset=160
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest08-1st.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-[MBufMgrTest08]
-Length=100
-Offset=60
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest08-2nd.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-[MBufMgrTest08]
-Length=200
-Offset=128
\ No newline at end of file
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest08-3rd.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-[MBufMgrTest08]
-Length=300
-Offset=160
\ No newline at end of file
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest09-1st.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-[MBufMgrTest09]
-
-Length01= 100
-Offset01= 20
-
-Length02= 20
-Offset02= 40
-
-
-Length03= -1
-
-BuffsAfter=2
\ No newline at end of file
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest09-2nd.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-[MBufMgrTest09]
-
-Length01= 100
-Offset01= 21
-
-Length02= 20
-Offset02= 40
-
-
-Length03= -1
-
-BuffsAfter=2
\ No newline at end of file
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest09-3rd.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-[MBufMgrTest09]
-
-Length01= 40
-Offset01= 20
-
-Length02= 40
-Offset02= 40
-
-
-Length03= -1
-
-BuffsAfter=2
\ No newline at end of file
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest09-4th.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-[MBufMgrTest09]
-
-Length01= 40
-Offset01= 21
-
-Length02= 40
-Offset02= 40
-
-
-Length03= -1
-
-BuffsAfter=2
\ No newline at end of file
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest09-5th.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-[MBufMgrTest09]
-
-Length01= 40
-Offset01= 21
-
-Length02= 24
-Offset02= 40
-
-Length03= 40
-Offset03= 40
-
-Length04= -1
-
-BuffsAfter=2
\ No newline at end of file
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest10-1st.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-[MBufMgrTest10]
-
-Length01= 20
-Offset01= 21
-
-Length02= 20
-Offset02= 40
-
-Length03= 50
-Offset03= 40
-
-Length04= -1
-
-CopyOffset=2
-CopyLen = 90
\ No newline at end of file
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/MBufTest13-1st.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-[MBufMgrTest13]
-MBufNo= 200
-LoopNo= 10
--- a/commsfwutils/commsbufs/TS_mbufmgr/scriptfiles/mbuftest.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,407 +0,0 @@
-//
-// 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: 
-//
-//! @file
-//! @SYMTestSuiteName COMMS-MBUFMGR
-//! @SYMScriptTestEnvironment Standard Symbian HRP or emulator environment
-
-//RUN_SCRIPT 102.script
-PRINT TS_CTMBufMgr: Group test 
-PRINT ------------------------------
-PRINT
-
-LOAD_SUITE TS_CTMBufMgr.dll
-PRINT ------------------------------
-PRINT
-
-START_TESTCASE			COMINF-MBUFMGR-0100
-//! @SYMTestCaseID		COMINF-MBUFMGR-0100
-PRINT Test 01: Create/Delete MBufMgr
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest01
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0100
-
-START_TESTCASE			COMINF-MBUFMGR-0200
-//! @SYMTestCaseID		COMINF-MBUFMGR-0200
-PRINT Test 02: Alloc/Dealloc RMBuf
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest02
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0200
-
-START_TESTCASE			COMINF-MBUFMGR-0300
-//! @SYMTestCaseID		COMINF-MBUFMGR-0300
-PRINT Test 03: Alloc/Dealloc RMBuf
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest03
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0300
-
-START_TESTCASE			COMINF-MBUFMGR-0400
-//! @SYMTestCaseID		COMINF-MBUFMGR-0400
-PRINT Test 04: CopyIn/Out 
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest04
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0400
-
-START_TESTCASE			COMINF-MBUFMGR-0500
-//! @SYMTestCaseID		COMINF-MBUFMGR-0500
-PRINT Test 05: CopyIn/Out with Offset 
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest05 ,z:\testdata\configs\MBufTest05-CopyIn.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0500
-
-START_TESTCASE			COMINF-MBUFMGR-0501
-//! @SYMTestCaseID		COMINF-MBUFMGR-0501
-PRINT Test 05: CopyIn/Out with Offset 
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest05 ,z:\testdata\configs\MBufTest05-CopyOut.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0501
-
-START_TESTCASE			COMINF-MBUFMGR-0600
-//! @SYMTestCaseID		COMINF-MBUFMGR-0600
-PRINT Test 06: Split the chain on the first and only RMBuf
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest06 ,z:\testdata\configs\MBufTest06-1st.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0600
-
-START_TESTCASE			COMINF-MBUFMGR-0601
-//! @SYMTestCaseID		COMINF-MBUFMGR-0601
-PRINT Test 06: Split the chain on the boundary of the 1st & 2nd RMBuf
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest06 ,z:\testdata\configs\MBufTest06-2nd.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0601
-
-START_TESTCASE			COMINF-MBUFMGR-0602
-//! @SYMTestCaseID		COMINF-MBUFMGR-0602
-PRINT Test 06: Split the chain (containing 3 RMBufs) on the 2nd RMBuf
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest06 ,z:\testdata\configs\MBufTest06-3rd.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0602
-
-START_TESTCASE			COMINF-MBUFMGR-0603
-//! @SYMTestCaseID		COMINF-MBUFMGR-0603
-PRINT Test 06: Split a chain of big bufs when only small reamaining
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest06 ,z:\testdata\configs\MBufTest06-4th.ini
-TEST_COMPLETE
-HANDLES_CHECK
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0603
-
-START_TESTCASE			COMINF-MBUFMGR-0700
-//! @SYMTestCaseID		COMINF-MBUFMGR-0700
-PRINT Test 07: TrimStart the chain on the first and only RMBuf
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest07 ,z:\testdata\configs\MBufTest07-1st.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0700
-
-START_TESTCASE			COMINF-MBUFMGR-0701
-//! @SYMTestCaseID		COMINF-MBUFMGR-0701
-PRINT Test 07: TrimStart the chain on the boundary of the 1st & 2nd RMBuf
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest07 ,z:\testdata\configs\MBufTest07-2nd.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0701
-
-START_TESTCASE			COMINF-MBUFMGR-0702
-//! @SYMTestCaseID		COMINF-MBUFMGR-0702
-PRINT Test 07: TrimStart the chain (containing 3 RMBufs) on the 2nd RMBuf
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest07 ,z:\testdata\configs\MBufTest07-3rd.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0702
-
-START_TESTCASE			COMINF-MBUFMGR-0800
-//! @SYMTestCaseID		COMINF-MBUFMGR-0800
-PRINT Test 08: TrimEnd the chain on the first and only RMBuf
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest08 ,z:\testdata\configs\MBufTest08-1st.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0800
-
-START_TESTCASE			COMINF-MBUFMGR-0801
-//! @SYMTestCaseID		COMINF-MBUFMGR-0801
-PRINT Test 08: TrimEnd the chain on the boundary of the 1st & 2nd RMBuf
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest08 ,z:\testdata\configs\MBufTest08-2nd.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0801
-
-START_TESTCASE			COMINF-MBUFMGR-0802
-//! @SYMTestCaseID		COMINF-MBUFMGR-0802
-PRINT Test 08: TrimEnd the chain (containing 3 RMBufs) on the 2nd RMBuf
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest08 ,z:\testdata\configs\MBufTest08-3rd.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0802
-
-START_TESTCASE			COMINF-MBUFMGR-0900
-//! @SYMTestCaseID		COMINF-MBUFMGR-0900
-PRINT Test 09: Align - already aligned and fits
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest09 ,z:\testdata\configs\MBufTest09-1st.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0900
-
-START_TESTCASE			COMINF-MBUFMGR-0901
-//! @SYMTestCaseID		COMINF-MBUFMGR-0901
-PRINT Test 09: Align - not aligned but fits
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest09 ,z:\testdata\configs\MBufTest09-2nd.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0901
-
-START_TESTCASE			COMINF-MBUFMGR-0902
-//! @SYMTestCaseID		COMINF-MBUFMGR-0902
-PRINT Test 09: Align - already aligned but does not fit
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest09 ,z:\testdata\configs\MBufTest09-3rd.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0902
-
-START_TESTCASE			COMINF-MBUFMGR-0903
-//! @SYMTestCaseID		COMINF-MBUFMGR-0903
-PRINT Test 09: Align - not aligned, does not fit
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest09 ,z:\testdata\configs\MBufTest09-4th.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-0903
-
-START_TESTCASE			COMINF-MBUFMGR-1000
-//! @SYMTestCaseID		COMINF-MBUFMGR-1000
-PRINT Test 09: Align - not aligned, does not fit and it should free a RMBuf
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest09 ,z:\testdata\configs\MBufTest09-5th.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-1000
-
-START_TESTCASE			COMINF-MBUFMGR-1001
-//! @SYMTestCaseID		COMINF-MBUFMGR-1001
-PRINT Test 10: CopyL 
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest10 ,z:\testdata\configs\MBufTest10-1st.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-1001
-
-START_TESTCASE			COMINF-MBUFMGR-1100
-//! @SYMTestCaseID		COMINF-MBUFMGR-1100
-PRINT Test 11: Async alloc 
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest11
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-1100
-
-START_TESTCASE			COMINF-MBUFMGR-1200
-//! @SYMTestCaseID		COMINF-MBUFMGR-1200
-PRINT Test 12: General test 
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest12
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-1200
-
-START_TESTCASE			COMINF-MBUFMGR-1300
-//! @SYMTestCaseID		COMINF-MBUFMGR-1300
-PRINT Test 13: Performance test 
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest13 ,z:\testdata\configs\MBufTest13-1st.ini
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-1300
-
-START_TESTCASE			COMINF-MBUFMGR-1400
-//! @SYMTestCaseID		COMINF-MBUFMGR-1400
-PRINT Test 14: Heap Free Check 
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest14
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-1400
-
-START_TESTCASE			COMINF-MBUFMGR-1500
-//! @SYMTestCaseID		COMINF-MBUFMGR-1500
-PRINT Test 15: Concurency
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest15
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-1500
-
-START_TESTCASE			COMINF-MBUFMGR-1600
-//! @SYMTestCaseID		COMINF-MBUFMGR-1600
-PRINT Test 16: MemoryFull
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest16
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-1600
-
-START_TESTCASE			COMINF-MBUFMGR-1700
-//! @SYMTestCaseID		COMINF-MBUFMGR-1700
-PRINT Test 17: Request Size Limit test
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest17
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-1700
-
-// The COMINF-MBUFMGR-1800 test has been removed as part of PREQ2106 and
-// shared buffer implementation. Note COMINF-MBUFMGR-1800 tries to do a 
-// best fit allocation which is not really neccassary and the algorithm has
-// been relaxed.
-
-START_TESTCASE			COMINF-MBUFMGR-1900
-//! @SYMTestCaseID		COMINF-MBUFMGR-1900
-PRINT Test 19: Prepend
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest19
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-1900
-
-START_TESTCASE			COMINF-MBUFMGR-2000
-//! @SYMTestCaseID		COMINF-MBUFMGR-2000
-PRINT Test 20: PoolCeilingMemoryFull
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest20
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-2000
-
-START_TESTCASE			COMINF-MBUFMGR-2100
-//! @SYMTestCaseID		COMINF-MBUFMGR-2100
-PRINT Test 21: commsbufsmiscellaneous
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest21
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-2100
-
-START_TESTCASE			COMINF-MBUFMGR-2200
-//! @SYMTestCaseID		COMINF-MBUFMGR-2200
-PRINT Test 22: Append
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest22
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-2200
-
-START_TESTCASE			COMINF-MBUFMGR-2300
-//! @SYMTestCaseID		COMINF-MBUFMGR-2300
-PRINT Test 23: RMBufQ
-HANDLES_MARK
-RUN_TEST_STEP 10000, TS_CTMBufMgr, MBufMgrTest23
-HANDLES_CHECK
-TEST_COMPLETE
-PRINT ------------------------------
-PRINT
-END_TESTCASE			COMINF-MBUFMGR-2300
-
--- a/commsfwutils/commsbufs/TS_mbufmgr/test16memoryfull.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,758 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 16 - Memory Full
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <ss_std.h>
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "test16memoryfull.h"
-
-#include <comms-infras/mbufallocator.h>
-#include <comms-infras/commsbufpond.h>
-// constructor
-CTest16MemoryFull::CTest16MemoryFull()
-	{
-	iTestStepName = _L("MBufMgrTest16");// Store the name of this test case
-	}
-
-// destructor
-CTest16MemoryFull::~CTest16MemoryFull()
-	{
-	}
-
-//
-void CTest16MemoryFull::FillDes(TDes8 &aBuf, TInt aStartPos, TInt anEndPos, TUint aStartChar, TUint anEndChar)
-	{
-	StripeDes(aBuf, aStartPos, anEndPos, aStartChar, anEndChar);
-	}
-
-RCommsBufPond& CTest16MemoryFull::BufPond()
-	{
-	return iBufPond;
-	}
-
-
-
-enum TVerdict CTest16MemoryFull::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-	
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-	
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager and install active scheduler:"));
-	CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-
-	// Create some initial pools
-	// AddL(KMBuf_MBufSize, KMBuf_InitialAllocation, KMBuf_MinGrowth, KMBuf_GrowthThreshold)
-	// Background memory allocation (CMBufPoolManager::RunL) is used more frequently if
-	// the KMBuf_MinGrowth and the KMBuf_GrowthThreshold are similar in size
-	// Synchronous allocation (AllocPool(*poolChain, growth, ETrue)) occurs when the
-	// requested size (iChain.CopyIn(size)) is larger than the KMBuf_MinGrowth
-	// Multiple threads attempt to grow different poolchains at the same time when there
-	// are a greater variety of pool sizes to grow.
-	// 16384
-
-	RArray<TCommsBufPoolCreateInfo> createInfoArray;
-	
-	TCommsBufPoolCreateInfo createInfo;
-	createInfo.iBufSize = 128;
-	createInfo.iInitialBufs = 128;
-	createInfo.iGrowByBufs = 64;
-	createInfo.iMinFreeBufs = 40;
-	createInfo.iCeiling = 410; 
-
-	TCommsBufPoolCreateInfo createInfo2;
-	createInfo2.iBufSize = 256;
-	createInfo2.iInitialBufs = 64;
-	createInfo2.iGrowByBufs = 7;
-	createInfo2.iMinFreeBufs = 6;
-	createInfo2.iCeiling = 204;
-
-	TCommsBufPoolCreateInfo createInfo3;
-	createInfo3.iBufSize = 512;
-	createInfo3.iInitialBufs = 32;
-	createInfo3.iGrowByBufs = 6;
-	createInfo3.iMinFreeBufs = 5;
-	createInfo3.iCeiling = 125;
-
-	TCommsBufPoolCreateInfo createInfo4;
-	createInfo4.iBufSize = 1024;
-	createInfo4.iInitialBufs = 16;
-	createInfo4.iGrowByBufs = 5;
-	createInfo4.iMinFreeBufs = 4;
-	createInfo4.iCeiling = 51; 
-
-	TCommsBufPoolCreateInfo createInfo5;
-	createInfo5.iBufSize = 2048;
-	createInfo5.iInitialBufs = 8;
-	createInfo5.iGrowByBufs = 4;
-	createInfo5.iMinFreeBufs = 3;
-	createInfo5.iCeiling = 15; 
-
-	createInfoArray.Append(createInfo);
-	createInfoArray.Append(createInfo2);
-	createInfoArray.Append(createInfo3);
-	createInfoArray.Append(createInfo4);
-	createInfoArray.Append(createInfo5);
-	// Create 262144
-	CreateInstanceMBufMgrL(createInfoArray);
-	CleanupClosePushL(iBufPond);
-	createInfoArray.Close ();
-
-	TBuf8<KFactor*KFactor*KFactor*KFactor> *aDes1, *aDes2;
-	CleanupStack::PushL( aDes1 = new(ELeave) TBuf8<KFactor*KFactor*KFactor*KFactor> );
-	CleanupStack::PushL( aDes2 = new(ELeave) TBuf8<KFactor*KFactor*KFactor*KFactor> );
-	
-	//-------------------substep 02-----------------------------
-	Log(_L("  02 Create and install active object that will do the test:"));
-	RMBufAsyncRequest async;
-	CMBufAsyncMemFull* memoryfull;
-	CleanupStack::PushL(memoryfull = new(ELeave) CMBufAsyncMemFull(this, async, aDes1, aDes2));
-	CActiveScheduler::Add(memoryfull);
-
-	//-------------------substep 03-----------------------------
-	Log(_L("  03 Start the test:"));
-
-	TInt ret = memoryfull->DoStartTest();
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Async Alloc's failing in test run:"));
-		User::Leave(EFail);
-		}
-
-	// If allocation less than expected then there may be a problem.
-	// So get the allocated memory for each pool chain
-	RMBufAllocator allocator;
-
-	TInt size = allocator.NextMBufSize(0);
-	_LIT(aLogD,"     Info: Available MBufs in %d Pool Chain: %d"); 
-	while (size != KErrNotFound)
-		{
-		Log(aLogD, size, allocator.BytesAvailable(size) / size);
-		size = allocator.NextMBufSize(size);
-		}
-	
-//	TInt heapSize = iMBMngr->__DbgGetHeapSize();
-	
-	//Clean up stack
-	CleanupStack::PopAndDestroy(memoryfull);
-	CleanupStack::PopAndDestroy(aDes2);
-	CleanupStack::PopAndDestroy(aDes1);
-	CleanupStack::PopAndDestroy();
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-	
-	//-------------------substep 04-----------------------------
-	_LIT(aLog1,"     Info: Number of main thread checkings: %d with %d fails last failure on %d"); Log(aLog1,iMainThreadTries,iMainThreadFails,iMainThreadLastFailure);
-	_LIT(aLog2,"     Info: Number of main thread allocate size failures: %d"); Log(aLog2,iMainThreadSizeFails);
-	_LIT(aLog3,"     Info: Number of high priority thread checkings: %d with %d fails"); Log(aLog3,iThread3Tries,iThread3Fails);
-	_LIT(aLog4,"     Info: Number of high priority thread allocation failures: %d"); Log(aLog4,iThread3AllocFails);
-	_LIT(aLog5,"     Info: Number of memory gobbler allocate tries and failures: %d with %d memory full last memory full on %d"); Log(aLog5,iThread1AllocTries,iThread1MemoryFull,iThread1LastMemoryFull);
-	_LIT(aLog6,"     Info: Number of memory gobbler allocate size failures: %d"); Log(aLog6,iThread1SizeFails);
-	_LIT(aLog7,"     Info: Number of memory gobbler allocate tries and failures: %d with %d memory full last memory full on %d"); Log(aLog7,iThread2AllocTries,iThread2MemoryFull,iThread2LastMemoryFull);
-	_LIT(aLog8,"     Info: Number of memory gobbler allocate size failures: %d"); Log(aLog8,iThread2SizeFails);
-	_LIT(aLog9,"     Info: Max chain length for memory gobbler allocation: %d ; %d"); Log(aLog9,iThread1MaxLen,iThread2MaxLen);
-//	_LIT(aLogA,"     Info: Max allocated memory: %d"); Log(aLogA,heapSize);
-	_LIT(aLogB,"     Info: Basic API (uses TLS) - Average time to allocate mbufs: %d ; Average time to free mbufs %d"); 
-			Log(aLogB,iThread1AllocTime/iThread1AllocTries,iThread1FreeTime/(1000 - iThread1AllocTries));
-	_LIT(aLogC,"     Info: Higher Speed API (no TLS) - Average time to allocate mbufs: %d ; Average time to free mbufs %d"); 
-			Log(aLogC,iThread2AllocTime/iThread2AllocTries,iThread2FreeTime/(1000 - iThread2AllocTries));
-	
-	if (iThread3Tries <1000)
-		{
-		Log(_L("   Error: High priority thread ended before 1000 loops are finished"));
-
-		return EFail;
-		}
-
-	// test to see if the byte by byte comparisons failed
-	if ( iThread3Fails || iMainThreadFails || iThread1SizeFails || iThread2SizeFails)
-		{
-		Log(_L("   Error: MBuf allocation failure"));
-
-		return EFail;
-		}
-
-	// Test the maximum allocated memory
-	// Some of the possible problems include failing to background allocate new memory
-/*	if ( KMBufDefaultHeapSize > (heapSize + KMBufDefaultHeapSize/100) )
-		{
-		Log(_L("   Error: Background allocation may have failed"));
-
-		return EFail;
-		}
-*/   async.Close();
-	__UHEAP_MARKEND;
-	return EPass;
-
-  }
-
-  // Async request
-CMBufAsyncMemFull::CMBufAsyncMemFull(CTest16MemoryFull* aTestObject,
-		RMBufAsyncRequest& aMBufAsyncReq,
-		TDes8 *aDes1,
-		TDes8 *aDes2)
-		:CActive(EPriorityStandard)
-		,iTestObject(aTestObject)
-		,iDes1(aDes1)
-		,iDes2(aDes2)
-		,iMBufAsyncReq(aMBufAsyncReq)
-	{
-	}
-
-TInt CMBufAsyncMemFull::DoStartTest()
-	{
-
-	// Create some random sizes for allocation later
-	for (TInt i=1; i<(KFactor+1); i++)
-		{
-		iRequested_size[i-1] = i * i * i * KFactor;
-		}
-
-	// Allocate two 5000-bytes long descriptors (Des1 & Des2):"));
-	iDes1->SetLength(iRequested_size[KFactor-1]);
-	iDes2->SetLength(iRequested_size[KFactor-1]);
-	//Fill in the Des1 with a pattern:"));
-	iTestObject->FillDes(*iDes1, 0, iRequested_size[KFactor-1], '@', 'Z');
-	
-	//-------------------substep 01-----------------------------
-
-	TInt err=iThread1.Create(_L("testThread1Rec"),
-		                       fThread1,
- 							   KDefaultStackSize,
-							   KDefaultHeapSize,
-							   KMaxHeapSize,
-							   (TAny*)iTestObject,
-							   EOwnerProcess);
-	if (err!=KErrNone)
-		{
-		User::Leave(EFail);
-		}
-	iThread1.SetPriority(EPriorityAbsoluteHigh);
-	iThread1.Resume();
-
-	//-------------------substep 02-----------------------------
-	RThread aThread2;
-
-	err=iThread2.Create(_L("testThread2Rec"),
-		                       fThread2,
- 							   KDefaultStackSize,
-							   KDefaultHeapSize,
- 							   KMaxHeapSize,
-							   (TAny*)iTestObject,
-							   EOwnerProcess);
-	if (err!=KErrNone)
-		{
-		User::Leave(EFail);
-		}
-	iThread2.SetPriority(EPriorityAbsoluteHigh);
-	iThread2.Resume();
-
-	//-------------------substep 03-----------------------------
-	RThread aThread3;
-
-	err=iThread3.Create(_L("testThread3Rec"),
-		                       fThread3,
- 							   KDefaultStackSize,
-							   KDefaultHeapSize,
-							   KMaxHeapSize,
-							   (TAny*)iTestObject,
-							   EOwnerProcess);
-	if (err!=KErrNone)
-		{
-		User::Leave(EFail);
-		}
-	iThread3.SetPriority(EPriorityAbsoluteHigh);
-	iThread3.Resume();
-
-	//-------------------substep 04-----------------------------
-
-	iMBufAsyncReq.Alloc(iChain, iRequested_size[iRequestloop], iStatus);
-	SetActive();
-	CActiveScheduler::Start();
-
-	iThread1.Close();
-	iThread2.Close();
-	iThread3.Close();
-
-	return iStatus.Int();
-	}
-
-
-void CMBufAsyncMemFull::RunL()
-	{
-	if (iStatus.Int() == KErrNone)
-		{
-
-		//Copy in Des1 into Chain
-		iChain.CopyIn(iDes1->LeftTPtr(iRequested_size[iRequestloop]));
-		//Fill left most part of Des2 with zeros:"));
-		iDes2->SetLength(iRequested_size[KFactor-1]);
-		iTestObject->FillDes(*iDes2, 0, iRequested_size[iRequestloop], 0, 0);
-		//Copy out Chain into Des2:"));
-		iChain.CopyOut(*iDes2);
-		//Compare the contents of Des1 & Des2:
-		if((iDes1->LeftTPtr(iRequested_size[iRequestloop])).
-				Compare(iDes2->Left(iRequested_size[iRequestloop])))
-			{
-			iTestObject->iMainThreadFails++;
-			iTestObject->iMainThreadLastFailure = iTestObject->iMainThreadTries;
-			if (iChain.Length() != iRequested_size[iRequestloop])
-				{
-				iTestObject->iMainThreadSizeFails++;
-				}
-			}
-		iTestObject->iMainThreadTries++;
-		//Free chain
-		iChain.Free();
-
-		//Check whether the other task has finished
-		TBool isRunning1 = ETrue;
-		TBool isRunning2 = ETrue;
-		TBool isRunning3 = ETrue;
-		volatile TExitType aExit;
-		aExit = iThread1.ExitType();
-		if (aExit != EExitPending)
-			{
-			isRunning1 = EFalse;
-			}
-		aExit = iThread2.ExitType();
-		if (aExit != EExitPending)
-			{
-			isRunning2 = EFalse;
-			}
-		aExit = iThread3.ExitType();
-		if (aExit != EExitPending)
-			{
-			isRunning3 = EFalse;
-			}
-
-		iRequestloop++;
-		if (iRequestloop>9)
-			{
-			iRequestloop = 0;
-			}
-
-		if (isRunning1 || isRunning2 || isRunning3)
-			{
-
-			iMBufAsyncReq.Alloc(iChain, iRequested_size[iRequestloop], iStatus);
-
-			SetActive();
-
-			return;
-			}
-		}
-	
-	CActiveScheduler::Stop();
-
-	}
-
-// The memory gobbler thread
-TInt CMBufAsyncMemFull::fThread1(TAny* aInput)
-	{
-	CTest16MemoryFull* pTestObject = (CTest16MemoryFull*)aInput;
-	// We need to introduce this new client thread to the MBufMgr
-	TCommsBufPondTLSOp tls(pTestObject->BufPond());
-	tls.Set();
-	
-	CTrapCleanup* aCleanup = CTrapCleanup::New();
-	
-	//Install active scheduler
-    CActiveScheduler* aActSch = new CActiveScheduler;
-	if(aActSch==NULL)
-		{
-		return KErrNoMemory;
-		}
-	CActiveScheduler::Install(aActSch);
-
-	RTimer aTimer;
-	TRequestStatus aTimerStatus;	// Request status associated with timer
-	aTimer.CreateLocal();			// Create timer for this thread
-	//-------------- substep 1 --------------------
-
-	// Create some random sizes for allocation later
-	TInt requested_size[KFactor1];
-	for (TInt i=1; i<(KFactor1+1); i++)
-		{
-		requested_size[i-1] = i * i * KFactor1;
-		}
-
-	// Allocate two 5000-bytes long descriptors (Des1 & Des2):"));
-	TBuf8<KFactor1*KFactor1*KFactor1> *aDes1=NULL;
-	TRAPD(ret, aDes1 = new(ELeave) TBuf8<KFactor1*KFactor1*KFactor1> );
-	if(ret!=KErrNone)
-		{
-		return ret;
-		}
-
-	aDes1->SetLength(requested_size[KFactor1-1]);
-
-	//Fill in the Des1 with a pattern:"));
-	pTestObject->FillDes(*aDes1, 0, requested_size[KFactor1-1], 1, 1);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_DECLARATION_VARIABLE;
-	TRAP(ret, __CFLOG_CREATEL);
-	if(ret!=KErrNone)
-		{
-		delete aDes1;
-		return ret;
-		}
-	__CFLOG_OPEN;
-#endif
-	
-	TUint time;
-	RMBufChain aChain;
-	RMBufChain bChain;
-	TInt requestloop = 0;
-	TBool isFillMe = ETrue;
-	for (TInt i = 0 ; i<1000;i++)
-		{
-		if (isFillMe)
-			{
-			pTestObject->iThread1AllocTries++;
-			//Use up mbuf memory by appending to a chain
-			time = User::FastCounter();
-			TRAP(ret,aChain.AllocL(requested_size[requestloop]));
-			time = User::FastCounter() - time;
-			if (ret != KErrNone)
-				{
-				isFillMe = EFalse;
-				pTestObject->iThread1MemoryFull++;
-				pTestObject->iThread1LastMemoryFull = pTestObject->iThread1AllocTries - 1;
-				}
-			else
-				{
-				pTestObject->iThread1AllocTime += time;
-				//Copy in Des1 into Chain
-				aChain.CopyIn(aDes1->LeftTPtr(requested_size[requestloop]));
-				if (aChain.Length() != requested_size[requestloop])
-					{
-					pTestObject->iThread1SizeFails++;
-					}
-				// Now grow the chain
-				bChain.Append(aChain);
-				}
-			}
-		else
-			{
-			//Free some memory
-			TInt length = bChain.Length();
-			if (length > pTestObject->iThread1MaxLen)
-				{
-				pTestObject->iThread1MaxLen = length;
-				}
-			TInt trimOffset = length - requested_size[requestloop];
-			if (trimOffset > 0)
-				{
-				time = User::FastCounter();
-				bChain.TrimEnd(trimOffset);
-				time = User::FastCounter() - time;
-				pTestObject->iThread1FreeTime += time;
-				}
-			else
-				{
-				isFillMe = ETrue;
-				}
-			}
-
-		//Sleep for 5ms
-		aTimer.After(aTimerStatus,5000);
-		User::WaitForRequest(aTimerStatus);
-
-		requestloop++;
-		if (requestloop>(KFactor1-1))
-			{
-			requestloop = 0;
-			}
-		}
-	// Free the memory
-	bChain.Free();
-
-	delete aDes1;
-	CActiveScheduler::Install(NULL);
-	delete aActSch;
-	delete aCleanup;
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-	
-	return ret;
-}
-
-// The memory gobbler thread
-TInt CMBufAsyncMemFull::fThread2(TAny* aInput)
-	{
-	CTest16MemoryFull* pTestObject = (CTest16MemoryFull*)aInput;
-	// We need to introduce this new client thread to the MBufMgr
-	TCommsBufPondTLSOp tls(pTestObject->BufPond());
-	tls.Set();
-
-	CTrapCleanup* aCleanup = CTrapCleanup::New();
-	
-	//Install active scheduler
-	CActiveScheduler* aActSch = new CActiveScheduler;
-	if(aActSch==NULL)
-		{
-		return KErrNoMemory;
-		}
-	CActiveScheduler::Install(aActSch);
-
-	RTimer aTimer;
-	TRequestStatus aTimerStatus;	// Request status associated with timer
-	aTimer.CreateLocal();			// Create timer for this thread
-	//-------------- substep 1 --------------------
-
-	// Create some random sizes for allocation later
-	TInt requested_size[KFactor2];
-	for (TInt i=1; i<(KFactor2+1); i++)
-		{
-		requested_size[i-1] = i * i * KFactor2;
-		}
-
-	// Allocate two 5000-bytes long descriptors (Des1 & Des2):"));
-	TBuf8<KFactor2*KFactor2*KFactor2> *aDes1=NULL;
-	TRAPD(ret, aDes1 = new(ELeave) TBuf8<KFactor2*KFactor2*KFactor2> );
-	if(ret!=KErrNone)
-		{
-		return ret;
-		}
-
-	aDes1->SetLength(requested_size[KFactor2-1]);
-
-	//Fill in the Des1 with a pattern:"));
-	pTestObject->FillDes(*aDes1, 0, requested_size[KFactor2-1], 2, 2);
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_DECLARATION_VARIABLE;
-	TRAP(ret, __CFLOG_CREATEL);
-	if(ret!=KErrNone)
-		{
-		delete aDes1;
-		return ret;
-		}
-	__CFLOG_OPEN;
-#endif
-	
-	RMBufAllocator allocator;
-	TUint time;
-	
-	RMBufChain aChain;
-	RMBufChain bChain;
-	TInt requestloop = 0;
-	TBool isFillMe = ETrue;
-	for (TInt i = 0 ; i<1000;i++)
-		{
-
-		if (isFillMe)
-			{
-			pTestObject->iThread2AllocTries++;
-			//Use up mbuf memory by appending to a chain
-			time = User::FastCounter();
-			TRAP(ret,aChain.AllocL(requested_size[requestloop], allocator));
-			time = User::FastCounter() - time;
-			if (ret != KErrNone)
-				{
-				isFillMe = EFalse;
-				pTestObject->iThread2MemoryFull++;
-				pTestObject->iThread2LastMemoryFull = pTestObject->iThread2AllocTries - 1;
-				}
-			else
-				{
-				pTestObject->iThread2AllocTime += time;
-				//Copy in Des1 into Chain
-				aChain.CopyIn(aDes1->LeftTPtr(requested_size[requestloop]));
-				if (aChain.Length() != requested_size[requestloop])
-					{
-					pTestObject->iThread2SizeFails++;
-					}
-				// Now grow the chain
-				bChain.Append(aChain);
-				}
-			}
-		else
-			{
-			//Free some memory
-			TInt length = bChain.Length();
-			if (length > pTestObject->iThread2MaxLen)
-				{
-				pTestObject->iThread2MaxLen = length;
-				}
-			TInt trimOffset = length - requested_size[requestloop];
-			if (trimOffset > 0)
-				{
-				time = User::FastCounter();
-				bChain.TrimEnd(trimOffset);
-				time = User::FastCounter() - time;
-				pTestObject->iThread2FreeTime += time;
-				}
-			else
-				{
-				isFillMe = ETrue;
-				}
-			}
-
-		//Sleep for 5ms
-		aTimer.After(aTimerStatus,5000);
-		User::WaitForRequest(aTimerStatus);
-
-		requestloop++;
-		if (requestloop>(KFactor2-1))
-			{
-			requestloop = 0;
-			}
-		}
-	// Free the memory
-	bChain.Free();
-
-	delete aDes1;
-
-	CActiveScheduler::Install(NULL);
-	delete aActSch;
-	delete aCleanup;
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-	
-	return ret;
-}
-
-//
-TInt CMBufAsyncMemFull::fThread3(TAny* aInput)
-	{
-	CTest16MemoryFull* pTestObject = (CTest16MemoryFull*)aInput;
-	// We need to introduce this new client thread to the MBufMgr
-	TCommsBufPondTLSOp tls(pTestObject->BufPond());
-	tls.Set();
-
-	CTrapCleanup* aCleanup = CTrapCleanup::New();
-
-	//Install active scheduler
-	CActiveScheduler* aActSch = new CActiveScheduler;
-	if(aActSch==NULL)
-		{
-		return KErrNoMemory;
-		}
-	CActiveScheduler::Install(aActSch);
-
-	RTimer aTimer;
-	TRequestStatus aTimerStatus;	// Request status associated with timer
-	aTimer.CreateLocal();			// Create timer for this thread
-	//-------------- substep 1 --------------------
-
-	// Allocate two 500-bytes long descriptors (Des1 & Des2):"));
-	TBuf8<500> *aDes1 = NULL;
-	TBuf8<500> *aDes2 = NULL;
-
-	TRAPD(ret, aDes1 = new(ELeave) TBuf8<500>);
-	if(ret!=KErrNone)
-		{
-		return ret;
-		}
-
-	TRAP(ret, aDes2 = new(ELeave) TBuf8<500>);
-	if(ret!=KErrNone)
-		{
-		delete aDes1;
-		return ret;
-		}
-
-	aDes1->SetLength(500);
-	aDes2->SetLength(500);
-
-	//Fill in the Des1 with a pattern
-	pTestObject->FillDes(*aDes1, 0, 500, 'a', 'z');
-	
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_DECLARATION_VARIABLE;
-	TRAP(ret, __CFLOG_CREATEL);
-	if(ret!=KErrNone)
-		{
-		delete aDes1;
-		delete aDes2;
-		return ret;
-		}
-	__CFLOG_OPEN;
-#endif
-	
-	for (TInt i = 0 ; i<1000;i++)
-		{
-		//Allocate 500-bytes long RMBufChain
-		RMBufChain aChain;
-		TRAP(ret,aChain.AllocL(500));
-		if (ret == KErrNone)
-			{
-			//Copy in Des1 into Chain
-			aChain.CopyIn(*aDes1);
-			//Fill in Des2 with zeros
-			pTestObject->FillDes(*aDes2, 0, 500, 0, 0);
-			//Copy out Chain into Des2;
-			aChain.CopyOut(*aDes2);
-			//Compare the contents of Des1 & Des2
-			if(aDes1->Compare(*aDes2))
-				pTestObject->iThread3Fails++;
-			//Free chain
-			aChain.Free();
-			}
-		else
-			{
-			pTestObject->iThread3AllocFails++;
-			}
-		pTestObject->iThread3Tries++;
-		//Sleep for 5ms
-		aTimer.After(aTimerStatus,5000);
-		User::WaitForRequest(aTimerStatus);
-		}
-	delete aDes1;
-	delete aDes2;
-	CActiveScheduler::Install(NULL);
-	delete aActSch;
-	delete aCleanup;
-
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-	
-	return ret;
-}
-
--- a/commsfwutils/commsbufs/TS_mbufmgr/test16memoryfull.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test 16
-// 
-//
-
-#if (!defined __TEST16MEMORYFULL_H__)
-#define __TEST16MEMORYFULL_H__
-
-#include <cflog.h>
-#include <es_mbuf.h>
-
-static const TInt KFactor = 10;
-static const TInt KFactor1 = 9;
-static const TInt KFactor2 = 8;
-static const TInt KFactor3 = 7;
-
-class RCommsBufPond;
-class RMBufAsyncRequest;
-
-
-NONSHARABLE_CLASS(CTest16MemoryFull) : public CTestStepCTMbufmgr
-{
-public:
-	CTest16MemoryFull();
-	~CTest16MemoryFull();
-	virtual enum TVerdict doTestStepL( void );
-	TInt iMainThreadTries;
-	TInt iMainThreadFails;
-	TInt iMainThreadSizeFails;
-	TInt iMainThreadLastFailure;
-	TInt iThread1AllocTries, iThread2AllocTries, iThread3Tries;
-	TInt iThread1MemoryFull, iThread2MemoryFull, iThread3AllocFails;
-	TInt iThread1SizeFails, iThread2SizeFails, iThread3Fails;
-	TInt iThread1LastMemoryFull, iThread2LastMemoryFull;
-	TInt iThread1MaxLen, iThread2MaxLen, iThread3MaxLen;
-	TUint iThread1AllocTime, iThread1FreeTime;
-	TUint iThread2AllocTime, iThread2FreeTime;
-	TInt iAllocatedMemory;
-	TAny* iNotifierAllocator;
-
-	void FillDes(TDes8 &aBuf, TInt aStartPos, TInt anEndPos, TUint aStartChar, TUint anEndChar);
-	RCommsBufPond& BufPond(); 
-
-};	
-
-NONSHARABLE_CLASS(CMBufAsyncMemFull) : public CActive
-{
-public:
-	CMBufAsyncMemFull(CTest16MemoryFull* aTestObject,
-				RMBufAsyncRequest& aMBufAsyncReq, 
-				TDes8 *aDes1, 
-				TDes8 *aDes2);
-
-	~CMBufAsyncMemFull() { Cancel(); }
-
-	void RunL();
-
-	void DoCancel()  { iMBufAsyncReq.Cancel(); }
-
-	TInt DoStartTest();
-
-private:
-
-static TInt fThread1(TAny*); //High priority thread in this test
-static TInt fThread2(TAny*); //High priority thread in this test
-static TInt fThread3(TAny*); //High priority thread in this test
-
-	CTest16MemoryFull* iTestObject;
-	TInt iRequested_size[KFactor];
-	TDes8 *iDes1;
-	TDes8 *iDes2;
-	RThread iThread1;
-	RThread iThread2;
-	RThread iThread3;
-	
-	TInt iRequestloop;
-	
-	RMBufAsyncRequest& iMBufAsyncReq;
-	RMBufChain iChain;
-};
-
-#endif //(__TEST16MEMORYFULL_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/test17requestsizelimits.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,325 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 17 for getting mbufs within request size limits
-// 
-//
-
-
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "test17requestsizelimits.h"
-
-// RHeap information
-#include <comms-infras/mbufallocator.h>
-#include <comms-infras/commsbufpond.h>
-
-
-CTest17RequestSizeLimits::CTest17RequestSizeLimits()
-	{
-	iTestStepName = _L("MBufMgrTest17");// Store the name of this test case
-	}
-
-CTest17RequestSizeLimits::~CTest17RequestSizeLimits()
-	{
-	}
-
-void CTest17RequestSizeLimits::FillDes(TDes8 &aBuf, TInt aStartPos, TInt anEndPos, TUint aStartChar, TUint anEndChar)
-	{
-	StripeDes(aBuf, aStartPos, anEndPos, aStartChar, anEndChar);
-	}
-
-enum TVerdict CTest17RequestSizeLimits::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-	
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-	
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager and install active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-
-	// Create some initial pools
-	// AddL(KMBuf_MBufSize, KMBuf_InitialAllocation, KMBuf_MinGrowth, KMBuf_GrowthThreshold)
-	// Background memory allocation (CMBufPoolManager::RunL) is used more frequently if
-	// the KMBuf_MinGrowth and the KMBuf_GrowthThreshold are similar in size
-	// Synchronous allocation (AllocPool(*poolChain, growth, ETrue)) occurs when the
-	// requested size (iChain.CopyIn(size)) is larger than the KMBuf_MinGrowth
-	// Multiple threads attempt to grow different poolchains at the same time when there
-	// are a greater variety of pool sizes to grow.
-	// 16384
-	TInt totalPools = 5;
-	TInt poolSize = KMBufDefaultHeapSize/totalPools;	
-	RArray<TCommsBufPoolCreateInfo> createInfoArray;
-	
-	TCommsBufPoolCreateInfo createInfo;
-	createInfo.iBufSize = 128;
-	createInfo.iInitialBufs = 128;
-	createInfo.iGrowByBufs = 64;
-	createInfo.iMinFreeBufs = 40;
-	createInfo.iCeiling = poolSize/createInfo.iBufSize;
-
-	TCommsBufPoolCreateInfo createInfo2;
-	createInfo2.iBufSize = 256;
-	createInfo2.iInitialBufs = 64;
-	createInfo2.iGrowByBufs = 7;
-	createInfo2.iMinFreeBufs = 6;
-	createInfo2.iCeiling = poolSize/createInfo.iBufSize;	
-
-	TCommsBufPoolCreateInfo createInfo3;
-	createInfo3.iBufSize = 512;
-	createInfo3.iInitialBufs = 32;
-	createInfo3.iGrowByBufs = 6;
-	createInfo3.iMinFreeBufs = 5;
-	createInfo3.iCeiling = poolSize/createInfo.iBufSize;	
-
-	TCommsBufPoolCreateInfo createInfo4;
-	createInfo4.iBufSize = 1024;
-	createInfo4.iInitialBufs = 16;
-	createInfo4.iGrowByBufs = 5;
-	createInfo4.iMinFreeBufs = 4;
-	createInfo4.iCeiling = poolSize/createInfo.iBufSize;	
-
-	TCommsBufPoolCreateInfo createInfo5;
-	createInfo5.iBufSize = 2048;
-	createInfo5.iInitialBufs = 8;
-	createInfo5.iGrowByBufs = 4;
-	createInfo5.iMinFreeBufs = 3;
-	createInfo5.iCeiling = poolSize/createInfo.iBufSize;	
-
-	createInfoArray.Append(createInfo);
-	createInfoArray.Append(createInfo2);
-	createInfoArray.Append(createInfo3);
-	createInfoArray.Append(createInfo4);
-	createInfoArray.Append(createInfo5);
-	// Create 262144
-	CreateInstanceMBufMgrL(createInfoArray);
-	CleanupClosePushL(iBufPond);
-	createInfoArray.Close ();
-	RMBufAllocator allocator;
-	
-	//-------------- substep 2 --------------------
-	Log(_L("  02 Fill in the Des1 with a pattern:"));
-	TBuf8<5000> *aDes1 = NULL;
-	TRAPD(ret, aDes1 = new(ELeave) TBuf8<5000>);
-	if(ret != KErrNone)
-		return EFail;
-
-	aDes1->SetLength(5000);
-	FillDes(*aDes1, 0, 5000, 1, 1);
-	
-	TBool firstAllocFail = EFalse;
-	TBool secondAllocFail = EFalse;
-	TBool thirdAllocFail = EFalse;
-	
-	TUint time;
-	RMBufChain aChain;
-		
-	//-------------- substep 3 --------------------
-	Log(_L("  03 Allocate 5000-bytes long RMBufChain with 128-bytes long RMBuf:"));
-
-	time = User::FastCounter();
-	ret = aChain.Alloc(5000, 128, 128, allocator);
-	time = User::FastCounter() - time;
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't allocate RMBufChain:"));
-		User::Leave(EFail);
-		}
-	
-	//Copy in Des1 into Chain
-	aChain.CopyIn(aDes1->LeftTPtr(5000));
-	if (aChain.Length() != 5000)
-		{
-		Log(_L("Error: Allocated RMBufChain size does not match requested:"));
-		firstAllocFail = ETrue;
-		}
-	
-	TInt count = 0;
-	//Check RMBuf size is really 128
-	RMBuf* mBuf = aChain.First();
-	while (mBuf != NULL)
-		{
-		count++;
-		if (mBuf->Size() != 128)
-			{
-			Log(_L("Error: RMBuf size does not match requested:"));
-			firstAllocFail = ETrue;
-			break;
-			}
-		mBuf = mBuf->Next();
-		}
-	
-	if (firstAllocFail == EFalse)
-		{
-		_LIT(aLog1, "     Info: Time to allocate 5000-bytes long RMBufChain with %d 128-bytes long RMBuf: %d"); 
-		Log(aLog1, count, time);
-		}
-	
-	//-------------- substep 4 --------------------
-	Log(_L("  04 Deallocating RMBufChain"));
-	aChain.Free();
-
-	//-------------- substep 5 --------------------
-	Log(_L("  05 Allocate 50-bytes long RMBufChain with 1024-bytes long RMBuf:"));
-
-	time = User::FastCounter();
-	ret = aChain.Alloc(50, 1024, 1024, allocator);
-	time = User::FastCounter() - time;
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't allocate RMBufChain:"));
-		User::Leave(EFail);
-		}
-	
-	//Copy in Des1 into Chain
-	aChain.CopyIn(aDes1->LeftTPtr(50));
-	if (aChain.Length() != 50)
-		{
-		Log(_L("Error: Allocated RMBufChain size does not match requested:"));
-		secondAllocFail = ETrue;
-		}
-	
-	count = 0;
-	//Check RMBuf size is really 1024
-	mBuf = aChain.First();
-	while (mBuf != NULL)
-		{
-		count++;
-		if (mBuf->Size() != 1024)
-			{
-			Log(_L("Error: RMBuf size does not match requested:"));
-			secondAllocFail = ETrue;
-			break;
-			}
-		mBuf = mBuf->Next();
-		}
-	
-	if (secondAllocFail == EFalse)
-		{
-		_LIT(aLog2, "     Info: Time to allocate 50-bytes long RMBufChain with %d 1024-bytes long RMBuf: %d"); 
-		Log(aLog2, count, time);
-		}
-	
-	//-------------- substep 6 --------------------
-	Log(_L("  06 Deallocating RMBufChain"));
-	aChain.Free();
-	
-	//-------------- substep 7 --------------------
-	Log(_L("  07 Allocate 1500-bytes long RMBufChain with RMBuf size between 1100 and 2000:"));
-
-	ret = aChain.Alloc(1500, 1100, 2000, allocator);
-	if (ret == KErrNone)
-		{
-		Log(_L("Error: Allocated with false size RMBuf:"));
-		thirdAllocFail = ETrue;
-		aChain.Free();
-		}
-	else
-		Log(_L("     Info: Couldn't allocate because no MBuf with size between 1100 and 2000:"));
-
-	//-------------- substep 8 --------------------
-	Log(_L("  08 Allocate 1500-bytes long RMBufChain with RMBuf min. size 2100:"));
-
-	ret = aChain.Alloc(1500, 2100, allocator);
-	if (ret == KErrNone)
-		{
-		Log(_L("Error: Allocated with false size RMBuf:"));
-		thirdAllocFail = ETrue;
-		aChain.Free();
-		}
-	else
-		Log(_L("     Info: Couldn't allocate because no MBuf with size greater than 2100:"));
-	
-	//-------------- substep 9 --------------------
-	Log(_L("  09 Allocate 1500-bytes long RMBufChain with RMBuf max. size 100:"));
-
-	ret = aChain.Alloc(1500, 0, 100, allocator);
-	if (ret == KErrNone)
-		{
-		Log(_L("Error: Allocated with false size RMBuf:"));
-		thirdAllocFail = ETrue;
-		aChain.Free();
-		}
-	else
-		Log(_L("     Info: Couldn't allocate because no MBuf with size smaller than 100:"));
-
-	//-------------- substep 10 --------------------
-	Log(_L("  10 Exhaust 512-bytes long RMBufChain :"));
-	
-	RMBufChain bChain;
-	
-	while (allocator.BytesAvailable(512) / 512 > 0)
-		{
-		ret = aChain.Alloc(500, allocator);
-		if (ret != KErrNone)
-			{
-			Log(_L("Error: Couldn't allocate RMBufChain:"));
-			User::Leave(EFail);
-			}
-	
-		// Now grow the chain
-		bChain.Append(aChain);
-		}
-	
-	//-------------- substep 11 --------------------
-	Log(_L("  15 Allocate 500-bytes long RMBufChain with 512-bytes long RMBuf:"));
-
-	ret = aChain.Alloc(500, 512, 512, allocator);
-	if (ret == KErrNone)
-		{
-		Log(_L("Error: Allocated with false size RMBuf:"));
-		thirdAllocFail = ETrue;
-		aChain.Free();
-		}
-	else
-		Log(_L("     Info: Couldn't allocate because no more 512-bytes long RMBuf:"));
-	
-	//-------------- substep 12 --------------------
-	Log(_L("  12 Deallocating RMBufChain"));
-	bChain.Free();
-
-	delete aDes1;
-	
-	//-------------- substep 13 --------------------
-	Log(_L("  13 Clean up stack:"));
-    CleanupStack::PopAndDestroy();
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-	
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-
-	if (firstAllocFail || secondAllocFail || thirdAllocFail)
-		return EFail;
-	
-	__UHEAP_MARKEND;
-	return EPass;
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/test17requestsizelimits.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test 17
-// 
-//
-
-
-#if (!defined __TEST17REQUESTSIZELIMITS_H__)
-#define __TEST17REQUESTSIZELIMITS_H__
-
-NONSHARABLE_CLASS(CTest17RequestSizeLimits) : public CTestStepCTMbufmgr
-{
-public:
-	CTest17RequestSizeLimits();
-	~CTest17RequestSizeLimits();
-	
-	virtual enum TVerdict doTestStepL( void );
-	
-	void FillDes(TDes8 &aBuf, TInt aStartPos, TInt anEndPos, TUint aStartChar, TUint anEndChar);
-};
-
-#endif //(__TEST17REQUESTSIZELIMITS_H__)
--- a/commsfwutils/commsbufs/TS_mbufmgr/test18exhaustmidsizepools.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,410 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 18 for exhausting mid size pools
-// 
-//
-
-
-#include <e32base.h>
-
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "test18exhaustmidsizepools.h"
-
-// RHeap information
-#include <comms-infras/mbufallocator.h>
-#include <comms-infras/commsbufpond.h>
-
-CTest18ExhaustMidSizePools::CTest18ExhaustMidSizePools()
-	{
-	iTestStepName = _L("MBufMgrTest18");// Store the name of this test case
-	}
-
-CTest18ExhaustMidSizePools::~CTest18ExhaustMidSizePools()
-	{
-	}
-
-void CTest18ExhaustMidSizePools::FillDes(TDes8 &aBuf, TInt aStartPos, TInt anEndPos, TUint aStartChar, TUint anEndChar)
-	{
-	StripeDes(aBuf, aStartPos, anEndPos, aStartChar, anEndChar);
-	}
-
-enum TVerdict CTest18ExhaustMidSizePools::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-	
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CREATEL;
-	__CFLOG_OPEN;
-#endif
-	
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager and install active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-
-
-	// Create some initial pools
-	// AddL(KMBuf_MBufSize, KMBuf_InitialAllocation, KMBuf_MinGrowth, KMBuf_GrowthThreshold)
-	// Background memory allocation (CMBufPoolManager::RunL) is used more frequently if
-	// the KMBuf_MinGrowth and the KMBuf_GrowthThreshold are similar in size
-	// Synchronous allocation (AllocPool(*poolChain, growth, ETrue)) occurs when the
-	// requested size (iChain.CopyIn(size)) is larger than the KMBuf_MinGrowth
-	// Multiple threads attempt to grow different poolchains at the same time when there
-	// are a greater variety of pool sizes to grow.
-	// 16384
-	TInt totalPools = 5;
-	TInt poolSize = (KMBufDefaultHeapSize / 2)/totalPools;	
-
-	RArray<TCommsBufPoolCreateInfo> createInfoArray;
-	
-	TCommsBufPoolCreateInfo createInfo;
-	createInfo.iBufSize = 128;
-	createInfo.iInitialBufs = 128;
-	createInfo.iGrowByBufs = 64;
-	createInfo.iMinFreeBufs = 40;
-	createInfo.iCeiling = poolSize/createInfo.iBufSize;
-
-	TCommsBufPoolCreateInfo createInfo2;
-	createInfo2.iBufSize = 256;
-	createInfo2.iInitialBufs = 64;
-	createInfo2.iGrowByBufs = 7;
-	createInfo2.iMinFreeBufs = 6;
-	createInfo2.iCeiling = poolSize/createInfo.iBufSize;	
-
-	TCommsBufPoolCreateInfo createInfo3;
-	createInfo3.iBufSize = 512;
-	createInfo3.iInitialBufs = 32;
-	createInfo3.iGrowByBufs = 6;
-	createInfo3.iMinFreeBufs = 5;
-	createInfo3.iCeiling = poolSize/createInfo.iBufSize;	
-
-	TCommsBufPoolCreateInfo createInfo4;
-	createInfo4.iBufSize = 1024;
-	createInfo4.iInitialBufs = 16;
-	createInfo4.iGrowByBufs = 5;
-	createInfo4.iMinFreeBufs = 4;
-	createInfo4.iCeiling = poolSize/createInfo.iBufSize;	
-
-	TCommsBufPoolCreateInfo createInfo5;
-	createInfo5.iBufSize = 2048;
-	createInfo5.iInitialBufs = 8;
-	createInfo5.iGrowByBufs = 4;
-	createInfo5.iMinFreeBufs = 3;
-	createInfo5.iCeiling = poolSize/createInfo.iBufSize;	
-
-	createInfoArray.Append(createInfo);
-	createInfoArray.Append(createInfo2);
-	createInfoArray.Append(createInfo3);
-	createInfoArray.Append(createInfo4);
-	createInfoArray.Append(createInfo5);
-
-	// Create 262144
-	CreateInstanceMBufMgrL(createInfoArray);
-	CleanupClosePushL(iBufPond);
-	createInfoArray.Close ();
-	
-	RMBufAllocator allocator;
-	
-	TInt allocTime128 = 0;
-	TInt allocTime256 = 0;
-	TInt allocTime512 = 0;
-	TInt allocTime1024 = 0;
-	TInt allocTime2048 = 0;
-	
-	TInt allocCount128 = 0;
-	TInt allocCount256 = 0;
-	TInt allocCount512 = 0;
-	TInt allocCount1024 = 0;
-	TInt allocCount2048 = 0;
-	
-	TInt allocIndex128 = 0;
-	TInt allocIndex256 = 0;
-	TInt allocIndex512 = 0;
-	TInt allocIndex1024 = 0;
-	TInt allocIndex2048 = 0;
-	
-	TInt failedSizeCount = 0;
-	
-	TInt counter = 0;
-	
-	TUint time;
-	RMBufChain aChain, bChain;
-	RMBufChain mbuf1, mbuf2, mbuf3, mbuf4, mbuf5, mbuf6;
-	
-	//-------------- substep 2 --------------------
-	Log(_L("  02 Fill in the Des1 with a pattern:"));
-	TBuf8<2500> *aDes1 = NULL;
-	TRAPD(ret, aDes1 = new(ELeave) TBuf8<2500>);
-	if(ret != KErrNone)
-		return EFail;
-
-	aDes1->SetLength(2500);
-	FillDes(*aDes1, 0, 2500, 1, 1);
-	
-	//-------------- substep 3 --------------------
-	Log(_L("  03 Start to allocate 500-bytes long RMBufs:"));
-
-	time = User::FastCounter();
-	ret = aChain.Alloc(500, allocator);
-	time = User::FastCounter() - time;
-	while (ret == KErrNone)
-		{
-		//Copy in Des1 into Chain
-		aChain.CopyIn(aDes1->LeftTPtr(500));
-		if (aChain.Length() != 500)
-			{
-			Log(_L("Error: Allocated RMBufChain size does not match requested:"));
-			failedSizeCount++;
-			}
-		
-		switch (aChain.First()->Size())
-			{
-			case 128:
-				if (allocator.BytesAvailable(256) / 256 > 0)
-					Log(_L("Error: 256-bytes long RMBuf available, but allocated 128-bytes long RMBuf:"));
-				else if (allocIndex128 == 0)
-					{
-					counter++;
-					allocIndex128 = counter;
-					}
-				allocCount128++;
-				allocTime128 += time;
-				break;
-			case 256:
-				if (allocator.BytesAvailable(2048) / 2048 > 0)
-					Log(_L("Error: 2048-bytes long RMBuf available, but allocated 256-bytes long RMBuf:"));
-				else if (allocIndex256 == 0)
-					{
-					counter++;
-					allocIndex256 = counter;
-					}
-				allocCount256++;
-				allocTime256 += time;
-				break;
-			case 512:
-				if (allocIndex512 == 0)
-					{
-					counter++;
-					allocIndex512 = counter;
-					}
-				allocCount512++;
-				allocTime512 += time;
-				break;
-			case 1024:
-				if (allocator.BytesAvailable(512) / 512 > 0)
-					Log(_L("Error: 512-bytes long RMBuf available, but allocated 1024-bytes long RMBuf:"));
-				else if (allocIndex1024 == 0)
-					{
-					counter++;
-					allocIndex1024 = counter;
-					}
-				allocCount1024++;
-				allocTime1024 += time;
-				break;
-			case 2048:
-				if (allocator.BytesAvailable(1024) / 1024 > 0)
-					Log(_L("Error: 1024-bytes long RMBuf available, but allocated 2048-bytes long RMBuf:"));
-				else if (allocIndex2048 == 0)
-					{
-					counter++;
-					allocIndex2048 = counter;
-					}
-				allocCount2048++;
-				allocTime2048 += time;				
-				break;
-			}
-		
-		// Now grow the chain
-		if (allocCount256 == 1)
-			{
-			mbuf1.Append(aChain);
-			}
-		else if (allocCount512 == 1)
-			{
-			mbuf2.Append(aChain);
-			}
-		else if (allocCount512 == 2)
-			{
-			mbuf3.Append(aChain);
-			}
-		else if (allocCount512 == 3)
-			{
-			mbuf4.Append(aChain);
-			}
-		else if (allocCount2048 == 1)
-			{
-			mbuf5.Append(aChain);
-			}
-		else if (allocCount2048 == 2)
-			{
-			mbuf6.Append(aChain);
-			}
-		else
-			{
-			bChain.Append(aChain);
-			}
-		
-		time = User::FastCounter();
-		ret = aChain.Alloc(500, allocator);
-		time = User::FastCounter() - time;
-		}
-
-	if (allocIndex512 == 1)
-		{
-		_LIT(aLog1,"     Info: %d. Time to alloc %d 512-bytes long RMBuf: %d Average: %d");
-		Log(aLog1, allocIndex512, allocCount512, allocTime512, allocTime512/allocCount512);
-		}
-	if (allocIndex1024 == 2)
-		{
-		_LIT(aLog2,"     Info: %d. Time to alloc %d 1024-bytes long RMBuf: %d Average: %d");
-		Log(aLog2, allocIndex1024, allocCount1024, allocTime1024, allocTime1024/allocCount1024);
-		}
-	if (allocIndex2048 == 3)
-		{
-		_LIT(aLog3,"     Info: %d. Time to alloc %d 2048-bytes long RMBuf: %d Average: %d");
-		Log(aLog3, allocIndex2048, allocCount2048, allocTime2048, allocTime2048/allocCount2048);
-		}
-	if (allocIndex256 == 4)
-		{
-		_LIT(aLog4,"     Info: %d. Time to alloc %d 256-bytes long RMBuf: %d Average: %d");
-		Log(aLog4, allocIndex256, allocCount256, allocTime256, allocTime256/allocCount256);
-		}
-	if (allocIndex128 == 5)
-		{
-		_LIT(aLog5,"     Info: %d. Time to alloc %d 128-bytes long RMBuf: %d Average: %d");
-		Log(aLog5, allocIndex128, allocCount128, allocTime128, allocTime128/allocCount128);
-		}
-	
-	TBool firstSuccess = ETrue;
-	TBool secondSuccess = ETrue;
-	TBool thirdSuccess = ETrue;
-	
-	//-------------------substep 4-----------------------------
-	Log(_L("  04 Allocate 750-byte long RMBuf after deallocating 1 256-byte and 2 512-byte long RMBufs:"));	
-	mbuf1.TrimEnd(244);	// 256-byte mbuf
-	mbuf2.Free();		// 512-byte mbuf	
-	mbuf3.Free();		// 512-byte mbuf
-	
-	ret = aChain.Alloc(750, allocator);
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't allocate RMBuf:"));
-		firstSuccess = EFalse;
-		}
-	else
-		{
-		//Copy in Des1 into Chain
-		aChain.CopyIn(aDes1->LeftTPtr(750));
-		if (aChain.Length() != 750)
-			{
-			Log(_L("Error: Allocated RMBufChain size does not match requested:"));
-			firstSuccess = EFalse;
-			}
-		
-		// 1 512-byte long RMBuf should be free
-		if (allocator.BytesAvailable(512) == 512)
-			{
-			Log(_L("     Info: 1 512-byte long RMBuf is free:"));
-			}
-		else
-			{
-			Log(_L("Error: 1 512-byte long RMBuf should be free, but not:"));
-			firstSuccess = EFalse;
-			}
-		}
-		
-	bChain.Append(aChain);
-	
-	//-------------------substep 5-----------------------------
-	Log(_L("  05 Allocate 750-byte long RMBuf after deallocating 2 512-byte long RMBufs:"));
-	mbuf4.Free();	// 512-byte mbuf
-	
-	ret = aChain.Alloc(750, allocator);
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't allocate RMBuf:"));
-		secondSuccess = EFalse;
-		}
-	else
-		{
-		//Copy in Des1 into Chain
-		aChain.CopyIn(aDes1->LeftTPtr(750));
-		if (aChain.Length() != 750)
-			{
-			Log(_L("Error: Allocated RMBufChain size does not match requested:"));
-			secondSuccess = EFalse;
-			}
-		}
-		
-	bChain.Append(aChain);
-	
-	//-------------------substep 6-----------------------------
-	Log(_L("  06 Allocate 2100-byte long RMBuf after deallocating 2 2048-byte long RMBufs:"));	
-	mbuf5.Free();	// 2048-byte mbuf
-	mbuf6.Free();	// 2048-byte mbuf
-	
-	ret = aChain.Alloc(2100, allocator);
-	if (ret != KErrNone)
-		{
-		Log(_L("Error: Couldn't allocate RMBuf:"));
-		thirdSuccess = EFalse;
-		}
-	else
-		{
-		//Copy in Des1 into Chain
-		aChain.CopyIn(aDes1->LeftTPtr(2100));
-		if (aChain.Length() != 2100)
-			{
-			Log(_L("Error: Allocated RMBufChain size does not match requested:"));
-			thirdSuccess = EFalse;
-			}
-		}
-		
-	bChain.Append(aChain);
-	
-	mbuf1.Free();
-	bChain.Free();
-	
-	delete aDes1;
-		
-	//-------------- substep 7 --------------------
-	Log(_L("  07 Clean up stack:"));
-    CleanupStack::PopAndDestroy();
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-	
-#ifdef __CFLOG_ACTIVE
-	__CFLOG_CLOSE;
-	__CFLOG_DELETE;
-#endif
-	
-	if (ret != KErrNone || failedSizeCount > 0 || !firstSuccess || !secondSuccess || !thirdSuccess)
-		{
-		return EFail;
-		}
-
-	__UHEAP_MARKEND;
-	return EPass;
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/test18exhaustmidsizepools.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test 18
-// 
-//
-
-
-#if (!defined __TEST18EXHAUSTMIDSIZEPOOLS_H__)
-#define __TEST18EXHAUSTMIDSIZEPOOLS_H__
-
-NONSHARABLE_CLASS(CTest18ExhaustMidSizePools) : public CTestStepCTMbufmgr
-{
-public:
-	CTest18ExhaustMidSizePools();
-	~CTest18ExhaustMidSizePools();
-	
-	virtual enum TVerdict doTestStepL( void );
-	
-	void FillDes(TDes8 &aBuf, TInt aStartPos, TInt anEndPos, TUint aStartChar, TUint anEndChar);
-};
-
-#endif /*__TEST18EXHAUSTMIDSIZEPOOLS_H__*/
--- a/commsfwutils/commsbufs/TS_mbufmgr/test20poolceilingfull.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-/*
-* 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: 
-*
-*/
-
-#include <ss_std.h>
-// Test system includes
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "test20poolceilingfull.h"
-
-
-CTest20PoolCeilingFull::CTest20PoolCeilingFull()
-	{
-	iTestStepName = _L("MBufMgrTest20");// Store the name of this test case
-	}
-
-CTest20PoolCeilingFull::~CTest20PoolCeilingFull()
-	{
-	iChain.Free();
-	}
-
-TVerdict CTest20PoolCeilingFull::doTestStepL()
-	{
-	__UHEAP_MARK;
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Create CMBufManager and install active scheduler:"));
-	CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-
-	RArray<TCommsBufPoolCreateInfo> createInfoArray;
-	
-	TCommsBufPoolCreateInfo createInfo;
-	createInfo.iBufSize = 256;
-	createInfo.iInitialBufs = 50;
-	createInfo.iGrowByBufs = 20;
-	createInfo.iMinFreeBufs = 4;
-	createInfo.iCeiling = 100; 
-	createInfoArray.Append(createInfo);
-
-	CreateInstanceMBufMgrL(createInfoArray);
-	CleanupClosePushL(iBufPond);
-	createInfoArray.Close ();
-
-	Log(_L("  02 Create and install active object that will do the test:"));
-
-	CMBufAsyncPoolCeilingFull* poolCeilingFull;
-	CleanupStack::PushL(poolCeilingFull = new(ELeave) CMBufAsyncPoolCeilingFull(*this));
-
-	Log(_L("  03 Start the test:"));
-	if(poolCeilingFull->DoStartTest() != KErrNone)
-		{
-		Log(_L("Error: Async Alloc's failing in test run:"));
-		User::Leave(EFail);
-		}
-	//Clean up stack
-	CleanupStack::PopAndDestroy(); // poolCeilingFull
-	CleanupStack::PopAndDestroy(); // bufpond
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-
-	__UHEAP_MARKEND;
-	return EPass;
-	}
-
-RCommsBufPond& CTest20PoolCeilingFull::BufPond()
-	{
-	return iBufPond;
-	}
-
-CMBufAsyncPoolCeilingFull::CMBufAsyncPoolCeilingFull(CTest20PoolCeilingFull& aTestObject)
-: CActive(EPriorityStandard),
-	iTestObject(aTestObject)
-	{
-	CActiveScheduler::Add(this);
-	}
-
-
-CMBufAsyncPoolCeilingFull::~CMBufAsyncPoolCeilingFull()
-	{
-	Cancel();
-	iAsyncChain.Free();	
-	}
-
-void CMBufAsyncPoolCeilingFull::CompleteSelf()
-	{
-	TRequestStatus* pStat = &iStatus;
-	User::RequestComplete(pStat, KErrNone);
-	SetActive();
-	}
-
-void CMBufAsyncPoolCeilingFull::RunL()
-	{
-	User::LeaveIfError(iStatus.Int());
-	
-	if((iThread1.ExitType() != EExitPending))
-		{
-		CActiveScheduler::Stop();
-		return;		
-		}
-	if(iAsyncChain.IsEmpty())
-		{
-		iAsyncRequest.Alloc(iAsyncChain, 256 * 8, iStatus);	
-		SetActive();							
-		}
-	else
-		{
-		iAsyncChain.Free();			
-		CompleteSelf();		
-		}	
-	}
-
-void CMBufAsyncPoolCeilingFull::DoCancel()
-	{
-	iAsyncRequest.Cancel();
-	}
-
-
-TInt CMBufAsyncPoolCeilingFull::DoStartTest()
-	{
-	
-	TInt err=iThread1.Create(_L("testThread1Rec"),
-		                       fThread1,
- 							   KDefaultStackSize,
-							   KDefaultHeapSize,
-							   KMaxHeapSize,
-							   (TAny*)&iTestObject,
-							   EOwnerProcess);
-	if (err!=KErrNone)
-		{
-		User::Leave(EFail);
-		}
-	iThread1.SetPriority(EPriorityAbsoluteHigh);
-	iThread1.Resume();
-	iAsyncRequest.Alloc(iAsyncChain, 256, iStatus);	
-	SetActive();
-	CActiveScheduler::Start();
-
-	iThread1.Close();
-	iThread2.Close();
-	iThread3.Close();
-
-	return iError;
-	}
-
-
-TInt CMBufAsyncPoolCeilingFull::fThread1(TAny* aInput)
-	{
-	TInt totalAllocation = 100;
-	CTest20PoolCeilingFull* pTestObject = (CTest20PoolCeilingFull*)aInput;
-	// We need to introduce this new client thread to the MBufMgr
-	TCommsBufPondTLSOp tls(pTestObject->BufPond());
-	tls.Set();
-	
-	CTrapCleanup* aCleanup = CTrapCleanup::New();
-	
-	//Install active scheduler
-    CActiveScheduler* aActSch = new CActiveScheduler;
-	if(aActSch==NULL)
-		{
-		return KErrNoMemory;
-		}
-	CActiveScheduler::Install(aActSch);
-
-	RTimer aTimer;
-	TRequestStatus aTimerStatus;	// Request status associated with timer
-	aTimer.CreateLocal();			// Create timer for this thread
-	TBool freeMem = EFalse;
-	for(TInt i=0; i < 1000; ++i)
-		{
-		RMBufChain chain;
-		chain.Alloc(512, 256, 256);
-		if(freeMem)
-			{
-			chain.Free();
-			freeMem = EFalse;	
-			}
-		else
-			{
-			pTestObject->iChain.Append(chain);
-			freeMem = ETrue;
-			}
-		if(pTestObject->iChain.NumBufs() == totalAllocation)
-			{
-			// Free all. Will trigger the AO.
-			pTestObject->iChain.Free();
-			break;
-			}	
-		//Sleep for 5ms
-		aTimer.After(aTimerStatus,5000);
-		User::WaitForRequest(aTimerStatus);
-		}	
-	CActiveScheduler::Install(NULL);
-	delete aActSch;
-	delete aCleanup;
-	return KErrNone;
-	}
-
-
-
--- a/commsfwutils/commsbufs/TS_mbufmgr/test20poolceilingfull.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* 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: 
-*
-*/
-#ifndef __TEST20POOLCEILINGFULL_H__
-#define __TEST20POOLCEILINGFULL_H__
-
-#include <cflog.h>
-#include <es_mbuf.h>
-
-NONSHARABLE_CLASS(CTest20PoolCeilingFull) : public CTestStepCTMbufmgr
-	{
-	public:
-	CTest20PoolCeilingFull();
-	~CTest20PoolCeilingFull();
-	virtual enum TVerdict doTestStepL( void );
-	RCommsBufPond& BufPond(); 
-
-	RMBufChain iChain;
-	};
-
-NONSHARABLE_CLASS(CMBufAsyncPoolCeilingFull) : public CActive
-	{
-	public:
-	CMBufAsyncPoolCeilingFull(CTest20PoolCeilingFull& aTestObject);
-
-	~CMBufAsyncPoolCeilingFull();
-
-	void RunL();
-
-	void DoCancel();
-
-	TInt DoStartTest();
-	
-	private:
-	void CompleteSelf();
-	static TInt fThread1(TAny*); //High priority thread in this test
-	static TInt fThread2(TAny*); //High priority thread in this test
-	static TInt fThread3(TAny*); //High priority thread in this test
-
-	CTest20PoolCeilingFull& iTestObject;
-
-	RThread iThread1;
-	RThread iThread2;
-	RThread iThread3;
-	TInt iIteration;
-	TInt iError;
-	
-	RMBufAsyncRequest 	iAsyncRequest;
-	RMBufChain			iAsyncChain;
-	};
-
-#endif // __TEST20POOLCEILINGFULL_H__
--- a/commsfwutils/commsbufs/TS_mbufmgr/test21commsbufs.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains MBufMgr Test Step 21 for commsbufs method
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#include "networking/log.h"
-#include "networking/teststep.h"
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-#include "networking/log.h"
-#include "networking/teststep.h"
-#else
-#include <networking/log.h>
-#include <networking/teststep.h>
-#endif
-
-#include "TestStepCTMbufmgr.h"
-#include "TestSuiteCTMbufmgr.h"
-
-#include "Test21commsbufs.h"
-#include <comms-infras/commsbufpond.h>
-// constructor
-CTest21CommsBufs::CTest21CommsBufs()
-	{
-	iTestStepName = _L("MBufMgrTest21");// Store the name of this test case
-	}
-
-// destructor
-CTest21CommsBufs::~CTest21CommsBufs()
-	{
-	}
-
-//
-enum TVerdict CTest21CommsBufs::doTestStepL(void)
-	{
-	__UHEAP_MARK;
-		
-	//-------------- substep 1 --------------------
-	Log(_L("  01 Creating CMBufManager and installing active scheduler:"));
-    CleanupStack::PushL( iActSch = new(ELeave) CActiveScheduler );
-	CActiveScheduler::Install(iActSch);
-	CreateInstanceMBufMgrL(KMBufDefaultHeapSize);
-	CleanupClosePushL(iBufPond);
-	TCommsBufAllocator allocator = iBufPond.Allocator();
-    Log(_L("  01 Allocate a RCommsBuf of size 128"));	
-	RCommsBuf* buf = RCommsBuf::Alloc(128, allocator);
-    Log(_L("  01 Check the initial offset and length should be 0 & 128"));
-	// Check the initial offset and length. MUST be 0 & 128 as we 
-	// allocated a buffer of size 128
-	if(buf->Offset() != 0 || buf->Length() != buf->RawSize())
-	    {
-	    Log(_L("  Error: The offset and length checking failed"));
-	    return EFail;
-	    }
-	
-	Log(_L("  02 Write abcdef"));
-	_LIT8(KWriteData, "abcdef");
-	buf->Write(KWriteData, 20); // Write abcdef at offset 20
-	// Check the offset should be 20
-	// Check the length should 6 ie; abcdef
-	Log(_L("  02 Check the write offset and length should be 20 & 6"));	
-    if(buf->Offset() != 20 || buf->Length() != KWriteData().Length())
-        {
-        Log(_L("  Error 02: The offset and length checking failed"));        
-        return EFail;
-        }
-	
-    TBuf8<10> buffer;
-    Log(_L("  02 Read the buffer at offset 0"));
-    buf->Read(buffer);
-    Log(_L("  02 check the content of the read buffer"));
-    if(buffer.Compare(KWriteData()) != 0)
-        {
-        Log(_L("  Error 02 The read buffer content is not same as the write buffer"));
-        return EFail;
-        }
-
-    Log(_L("  02 Read the buffer at offset 3"));
-    buf->Read(buffer, 3);
-    Log(_L("  02 check the content of the read buffer"));
-    TPtrC8 ptr2 = KWriteData().Right(3); // Should be def
-    if(buffer.Compare(ptr2) != 0)
-        {
-        Log(_L("  Error 02 The read buffer content is not same as the write buffer"));
-        return EFail;        
-        }
-
-    Log(_L("  03 Allocate a RCommsBuf of size 128"));   
-    RCommsBuf* buf2 = RCommsBuf::Alloc(128, allocator);
-    Log(_L("  03 Write abcdef"));
-    buf2->Write(KWriteData, 10); // Write abcdef at offset 20
-    // Append ghijklm
-    Log(_L("  03 Append ghijklm"));
-    _LIT8(KAppendData, "ghijklm");
-    buf2->Append(KAppendData);
-    
-    // Compare the data
-    Log(_L("  03 Compare the contained data"));
-    _LIT8(KCompareData, "abcdefghijklm");
-    TBuf8<30> buffer2;
-    buf2->Read(buffer2);
-    if(buffer2.Compare(KCompareData()) != 0)
-        {
-        Log(_L("  Error 03 The read buffer content is not same as the write buffer"));
-        return EFail;        
-        }
-    
-    // Prepend 123
-    _LIT8(KPrependData, "12345");
-    Log(_L("  03 Prepend 12345"));
-    buf2->Prepend(KPrependData);
-    // Now offset would have been 5
-    if(buf2->Offset() != 5)
-        {
-        Log(_L("  Error 03 after prepend the offset is not correct"));
-        return EFail;
-        }
-    
-    // Read the whole data
-    buf2->Read(buffer2);
-    
-    _LIT8(KCompareData2, "12345abcdefghijklm");
-    if(buffer2.Compare(KCompareData2()) != 0)
-        {
-        Log(_L("  Error 03 After prepend the read buffer is not correct."));
-        return EFail;        
-        }
-     
-    for(TInt i = 0; i < buffer2.Length(); ++i)
-         {
-         if(buffer2[i] != (*buf2)[i])
-             {
-             Log(_L("  Error 03 Comparison of individual characters failed."));
-             return EFail;
-             }
-         }
-
-    buf->Free();
-	buf2->Free();
-	CleanupStack::PopAndDestroy(); // pond
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(iActSch);
-	__UHEAP_MARKEND;
-	return EPass;
-	}
--- a/commsfwutils/commsbufs/TS_mbufmgr/test21commsbufs.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 2002-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:
-// Contains declaration of test step 21
-// 
-//
-
-#ifndef __TEST21COMMSBUFS_H__
-#define __TEST21COMMSBUFS_H__
-
-NONSHARABLE_CLASS(CTest21CommsBufs) : public CTestStepCTMbufmgr
-{
-public:
-	CTest21CommsBufs();
-	~CTest21CommsBufs();
-
-	virtual enum TVerdict doTestStepL( void );
-private:
-
-};
-
-#endif // __TEST21COMMSBUFS_H__
--- a/commsfwutils/commsbufs/group/bld.inf	Thu Sep 02 21:44:45 2010 +0300
+++ b/commsfwutils/commsbufs/group/bld.inf	Fri Sep 17 08:36:26 2010 +0300
@@ -59,27 +59,28 @@
 
 PRJ_TESTEXPORTS
 //MBuf ComponentTest scripts & configs
-../TS_mbufmgr/scriptfiles/mbuftest.script z:/testdata/scripts/mbuftest.script
-../TS_mbufmgr/scriptfiles/MBufTest05-CopyIn.ini z:/testdata/configs/mbuftest05-copyin.ini
-../TS_mbufmgr/scriptfiles/MBufTest05-CopyOut.ini z:/testdata/configs/mbuftest05-copyout.ini
-../TS_mbufmgr/scriptfiles/MBufTest06-1st.ini z:/testdata/configs/mbuftest06-1st.ini
-../TS_mbufmgr/scriptfiles/MBufTest06-2nd.ini z:/testdata/configs/mbuftest06-2nd.ini
-../TS_mbufmgr/scriptfiles/MBufTest06-3rd.ini z:/testdata/configs/mbuftest06-3rd.ini
-../TS_mbufmgr/scriptfiles/MBufTest06-4th.ini z:/testdata/configs/mbuftest06-4th.ini
-../TS_mbufmgr/scriptfiles/MBufTest07-1st.ini z:/testdata/configs/mbuftest07-1st.ini
-../TS_mbufmgr/scriptfiles/MBufTest07-2nd.ini z:/testdata/configs/mbuftest07-2nd.ini
-../TS_mbufmgr/scriptfiles/MBufTest07-3rd.ini z:/testdata/configs/mbuftest07-3rd.ini
-../TS_mbufmgr/scriptfiles/MBufTest08-1st.ini z:/testdata/configs/mbuftest08-1st.ini
-../TS_mbufmgr/scriptfiles/MBufTest08-2nd.ini z:/testdata/configs/mbuftest08-2nd.ini
-../TS_mbufmgr/scriptfiles/MBufTest08-3rd.ini z:/testdata/configs/mbuftest08-3rd.ini
-../TS_mbufmgr/scriptfiles/MBufTest09-1st.ini z:/testdata/configs/mbuftest09-1st.ini
-../TS_mbufmgr/scriptfiles/MBufTest09-2nd.ini z:/testdata/configs/mbuftest09-2nd.ini
-../TS_mbufmgr/scriptfiles/MBufTest09-3rd.ini z:/testdata/configs/mbuftest09-3rd.ini
-../TS_mbufmgr/scriptfiles/MBufTest09-4th.ini z:/testdata/configs/mbuftest09-4th.ini
-../TS_mbufmgr/scriptfiles/MBufTest09-5th.ini z:/testdata/configs/mbuftest09-5th.ini
-../TS_mbufmgr/scriptfiles/MBufTest10-1st.ini z:/testdata/configs/mbuftest10-1st.ini
-../TS_mbufmgr/scriptfiles/MBufTest13-1st.ini z:/testdata/configs/mbuftest13-1st.ini
-testmbuf.iby /epoc32/rom/include/testmbuf.iby
+../TE_mbufmgr/scripts/te_mbuftest.script 		/epoc32/release/winscw/udeb/z/testdata/scripts/te_mbuftest.script
+../TE_mbufmgr/scripts/MBufTest05-CopyIn.ini 	/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest05-copyin.ini
+../TE_mbufmgr/scripts/MBufTest05-CopyOut.ini 	/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest05-copyout.ini
+../TE_mbufmgr/scripts/MBufTest06-1st.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest06-1st.ini
+../TE_mbufmgr/scripts/MBufTest06-2nd.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest06-2nd.ini
+../TE_mbufmgr/scripts/MBufTest06-3rd.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest06-3rd.ini
+../TE_mbufmgr/scripts/MBufTest06-4th.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest06-4th.ini
+../TE_mbufmgr/scripts/MBufTest07-1st.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest07-1st.ini
+../TE_mbufmgr/scripts/MBufTest07-2nd.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest07-2nd.ini
+../TE_mbufmgr/scripts/MBufTest07-3rd.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest07-3rd.ini
+../TE_mbufmgr/scripts/MBufTest08-1st.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest08-1st.ini
+../TE_mbufmgr/scripts/MBufTest08-2nd.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest08-2nd.ini
+../TE_mbufmgr/scripts/MBufTest08-3rd.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest08-3rd.ini
+../TE_mbufmgr/scripts/MBufTest09-1st.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest09-1st.ini
+../TE_mbufmgr/scripts/MBufTest09-2nd.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest09-2nd.ini
+../TE_mbufmgr/scripts/MBufTest09-3rd.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest09-3rd.ini
+../TE_mbufmgr/scripts/MBufTest09-4th.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest09-4th.ini
+../TE_mbufmgr/scripts/MBufTest09-5th.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest09-5th.ini
+../TE_mbufmgr/scripts/MBufTest10-1st.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest10-1st.ini
+../TE_mbufmgr/scripts/MBufTest13-1st.ini 		/epoc32/release/winscw/udeb/z/testdata/configs/mbuftest13-1st.ini
+
+../group/te_testmbuf.iby /epoc32/rom/include/te_testmbuf.iby
 
 PRJ_MMPFILES
 commsbufs.mmp
@@ -88,7 +89,7 @@
 commsbufskern.mmp
 
 PRJ_TESTMMPFILES
-../TS_mbufmgr/TS_Mbufmgr.mmp
+../TE_mbufmgr/group/TE_Mbufmgr.mmp
 
 #include "../reference/loopback_bearer/group/bld.inf"
 #include "../reference/loopback_bearer/test/bld.inf"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwutils/commsbufs/group/te_testmbuf.iby	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,46 @@
+/*
+* 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: 
+*
+*/
+
+#ifndef __TE_TESTMBUF_IBY__
+#define __TE_TESTMBUF_IBY__
+
+#include <integrationtest.iby>
+#include <commsbufs.iby>
+
+file=ABI_DIR\DEBUG_DIR\TE_CTMBUFMGR.EXE						\System\libs\TE_CTMBUFMGR.EXE
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\te_mbuftest.script		\testdata\scripts\te_mbuftest.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\scripts\te_mbuftest.script		\testdata\scripts\mbuftest_zc.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest05-CopyIn.ini	\testdata\configs\MBufTest05-CopyIn.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest05-CopyOut.ini	\testdata\configs\MBufTest05-CopyOut.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest06-1st.ini		\testdata\configs\MBufTest06-1st.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest06-2nd.ini		\testdata\configs\MBufTest06-2nd.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest06-3rd.ini		\testdata\configs\MBufTest06-3rd.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest07-1st.ini		\testdata\configs\MBufTest07-1st.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest07-2nd.ini		\testdata\configs\MBufTest07-2nd.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest07-3rd.ini		\testdata\configs\MBufTest07-3rd.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest08-1st.ini		\testdata\configs\MBufTest08-1st.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest08-2nd.ini		\testdata\configs\MBufTest08-2nd.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest08-3rd.ini		\testdata\configs\MBufTest08-3rd.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest09-1st.ini		\testdata\configs\MBufTest09-1st.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest09-2nd.ini		\testdata\configs\MBufTest09-2nd.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest09-3rd.ini		\testdata\configs\MBufTest09-3rd.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest09-4th.ini		\testdata\configs\MBufTest09-4th.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest09-5th.ini		\testdata\configs\MBufTest09-5th.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest10-1st.ini		\testdata\configs\MBufTest10-1st.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\configs\MBufTest13-1st.ini		\testdata\configs\MBufTest13-1st.ini
+
+#endif
--- a/commsfwutils/commsbufs/group/testmbuf.iby	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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: 
-*
-*/
-
-#ifndef __TESTMBUF_IBY__
-#define __TESTMBUF_IBY__
-
-#include <integrationtest.iby>
-#include <commsbufs.iby>
-
-file=ABI_DIR\DEBUG_DIR\TS_CTMBUFMGR.DLL						\System\libs\TS_CTMBUFMGR.DLL
-data=EPOCROOT##epoc32\data\z\TestData\scripts\mbuftest.script		\testdata\scripts\mbuftest.script
-data=EPOCROOT##epoc32\data\z\TestData\scripts\mbuftest.script		\testdata\scripts\mbuftest_zc.script
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest05-CopyIn.ini		\testdata\configs\MBufTest05-CopyIn.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest05-CopyOut.ini	\testdata\configs\MBufTest05-CopyOut.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest06-1st.ini		\testdata\configs\MBufTest06-1st.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest06-2nd.ini		\testdata\configs\MBufTest06-2nd.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest06-3rd.ini		\testdata\configs\MBufTest06-3rd.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest06-4th.ini		\testdata\configs\MBufTest06-4th.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest07-1st.ini		\testdata\configs\MBufTest07-1st.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest07-2nd.ini		\testdata\configs\MBufTest07-2nd.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest07-3rd.ini		\testdata\configs\MBufTest07-3rd.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest08-1st.ini		\testdata\configs\MBufTest08-1st.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest08-2nd.ini		\testdata\configs\MBufTest08-2nd.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest08-3rd.ini		\testdata\configs\MBufTest08-3rd.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest09-1st.ini		\testdata\configs\MBufTest09-1st.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest09-2nd.ini		\testdata\configs\MBufTest09-2nd.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest09-3rd.ini		\testdata\configs\MBufTest09-3rd.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest09-4th.ini		\testdata\configs\MBufTest09-4th.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest09-5th.ini		\testdata\configs\MBufTest09-5th.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest10-1st.ini		\testdata\configs\MBufTest10-1st.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\MBufTest13-1st.ini		\testdata\configs\MBufTest13-1st.ini
-
-#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/group/TE_rootserver.mmp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,50 @@
+// Copyright (c) 2003-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:
+
+// using relative paths for sourcepath and user includes
+
+TARGET        	te_rootserver.exe
+TARGETTYPE    	EXE
+UID           	0x1000008d 0x101F529F
+VENDORID 0x70000001
+
+
+SOURCEPATH      ../src
+SOURCE        TE_RootServerServer.cpp
+SOURCE        TestStepRootServer.cpp
+SOURCE        TestAsynchHandler.cpp
+SOURCE        RootServerTestSection1.cpp
+SOURCE        RootServerTestSection2.cpp
+SOURCE        RootServerTestSection3.cpp
+SOURCE        RootServerTestSection4.cpp
+SOURCE        RootServerTestSection5.cpp
+SOURCE        RootServerTestSection6.cpp
+SOURCE        RootServerTestSection7.cpp
+SOURCE        RootServerTestSection8.cpp
+
+SOURCEPATH      ../../configurator/src
+SOURCE        c32cmiutils.cpp
+
+USERINCLUDE     ../inc
+USERINCLUDE     ../../inc
+USERINCLUDE   	../../configurator/src
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+
+LIBRARY		euser.lib c32root.lib commsfw.lib
+LIBRARY		TestExecuteUtils.lib
+
+
+CAPABILITY ALL -Tcb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTest.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,49 @@
+// Copyright (c) 2003-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:
+// This is the header file for ROOTSERVER common defs
+// 
+//
+
+
+#if (!defined __ROOTSERVERTEST_H__)
+#define __ROOTSERVERTEST_H__
+
+// special values for InitDelay
+#define EXIT_BEFORE_RENDEZVOUS  (-1)
+#define PANIC_BEFORE_RENDEZVOUS (-2)
+#define PANIC_AFTER_RENDEZVOUS  (-3)
+
+#define NO_PREMATURE_DEATH (-1)
+
+
+typedef struct t_TestModuleIniData
+	{
+	TInt iInitDelay;
+	TInt iDeathDelay;
+	TInt iDiscoveryDelay;
+	TInt iBindDelay;
+	TInt iUnbindDelay;
+	TInt iShutdownDelay;
+	} TTestModuleIniDataContainer;
+
+class TTestModuleIniData : public TPckg<TTestModuleIniDataContainer>
+	{
+public:
+	TTestModuleIniData():TPckg<TTestModuleIniDataContainer>(iParams) {};
+public:
+	TTestModuleIniDataContainer iParams;
+	};
+
+
+#endif //(__ROOTSERVERTEST_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTestSection1.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,39 @@
+// Copyright (c) 2003-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:
+// This is the header file for ROOTSERVER test section 1
+// 
+//
+
+
+#if (!defined __ROOTSERVERTEST_1_H__)
+#define __ROOTSERVERTEST_1_H__
+
+
+class CRootServerTest1_1 : public CTestStepRootServer
+    {
+public:
+	CRootServerTest1_1(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+    };
+
+class CRootServerTest1_2 : public CTestStepRootServer
+    {
+public:
+	CRootServerTest1_2(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+    };
+
+#endif //(__ROOTSERVERTEST_1_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTestSection2.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,47 @@
+// Copyright (c) 2003-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:
+// This is the header file for ROOTSERVER test section 2
+// 
+//
+
+
+#if (!defined __ROOTSERVERTEST_2_H__)
+#define __ROOTSERVERTEST_2_H__
+
+
+class CRootServerTest2_1 : public CTestStepRootServer
+{
+public:
+	CRootServerTest2_1(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest2_2 : public CTestStepRootServer
+{
+public:
+	CRootServerTest2_2(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest2_3 : public CTestStepRootServer
+{
+public:
+	CRootServerTest2_3(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+#endif //(__ROOTSERVERTEST_2_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTestSection3.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,169 @@
+// Copyright (c) 2003-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:
+// This is the header file for ROOTSERVER test section 1
+// 
+//
+
+
+#if (!defined __ROOTSERVERTEST_3_H__)
+#define __ROOTSERVERTEST_3_H__
+
+
+class CRootServerTest3_2 : public CTestStepRootServer
+{
+public:
+	CRootServerTest3_2(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+
+class CRootServerTest3_DblLoad : public CTestStepRootServer
+	{
+public:
+	CRootServerTest3_DblLoad(CTE_RootServerServer *aSuite);
+protected:
+	TVerdict LoadSameModuleTwiceL(TThreadPriority aPriority);
+	};
+
+class CRootServerTest3_3 : public CRootServerTest3_DblLoad
+{
+public:
+	CRootServerTest3_3(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest3_4 : public CRootServerTest3_DblLoad
+{
+public:
+	CRootServerTest3_4(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest3_5 : public CTestStepRootServer
+{
+public:
+	CRootServerTest3_5(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest3_6 : public CTestStepRootServer
+{
+public:
+	CRootServerTest3_6(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest3_7 : public CTestStepRootServer
+{
+public:
+	CRootServerTest3_7(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest3_8 : public CTestStepRootServer
+{
+public:
+	CRootServerTest3_8(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest3_9 : public CTestStepRootServer
+{
+public:
+	CRootServerTest3_9(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest3_10 : public CTestStepRootServer
+{
+public:
+	CRootServerTest3_10(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest3_11 : public CTestStepRootServer
+{
+public:
+	CRootServerTest3_11(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest3_12 : public CTestStepRootServer
+{
+public:
+	CRootServerTest3_12(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest3_13 : public CTestStepRootServer
+{
+public:
+	CRootServerTest3_13(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest3_14 : public CTestStepRootServer
+{
+public:
+	CRootServerTest3_14(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest3_15 : public CTestStepRootServer
+{
+public:
+	CRootServerTest3_15(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest3_16 : public CTestStepRootServer
+{
+public:
+	CRootServerTest3_16(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest3_17 : public CTestStepRootServer
+{
+public:
+	CRootServerTest3_17(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest3_18 : public CTestStepRootServer
+{
+public:
+	CRootServerTest3_18(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+
+#endif //(__ROOTSERVERTEST_3_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTestSection4.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,31 @@
+// Copyright (c) 2003-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:
+// This is the header file for ROOTSERVER test section 4
+// 
+//
+
+
+#if (!defined __ROOTSERVERTEST_4_H__)
+#define __ROOTSERVERTEST_4_H__
+
+
+class CRootServerTest4_1 : public CTestStepRootServer
+{
+public:
+	CRootServerTest4_1(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+#endif //(__ROOTSERVERTEST_4_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTestSection5.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,103 @@
+// Copyright (c) 2003-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:
+// This is the header file for ROOTSERVER test section 1
+// 
+//
+
+
+#if (!defined __ROOTSERVERTEST_5_H__)
+#define __ROOTSERVERTEST_5_H__
+
+class CRootServerTest_GracefulUnload : public CTestStepRootServer
+{
+public:
+	CRootServerTest_GracefulUnload(CTE_RootServerServer *aSuite);
+protected:
+	TVerdict UnloadGracefullyL(TThreadPriority aPriority);
+};
+
+class CRootServerTest5_1 : public CRootServerTest_GracefulUnload
+{
+public:
+	CRootServerTest5_1(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest5_2 : public CRootServerTest_GracefulUnload
+{
+public:
+	CRootServerTest5_2(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest5_3 : public CTestStepRootServer
+{
+public:
+	CRootServerTest5_3(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest_UngracefulUnload: public CTestStepRootServer
+	{
+public:
+	CRootServerTest_UngracefulUnload(CTE_RootServerServer *aSuite);
+protected:
+	TVerdict UnloadNonGracefullyL(TThreadPriority aPriority);
+	};
+
+class CRootServerTest5_4 : public CRootServerTest_UngracefulUnload
+{
+public:
+	CRootServerTest5_4(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest5_5 : public CRootServerTest_UngracefulUnload
+{
+public:
+	CRootServerTest5_5(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest5_6 : public CTestStepRootServer
+{
+public:
+	CRootServerTest5_6(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest5_7 : public CTestStepRootServer
+{
+public:
+	CRootServerTest5_7(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest5_8 : public CTestStepRootServer
+{
+public:
+	CRootServerTest5_8(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+
+#endif //(__ROOTSERVERTEST_1_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTestSection6.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,167 @@
+// Copyright (c) 2003-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:
+// // Root Server Test Section 6 - Loading modules in Root Server
+// 
+//
+
+
+#if (!defined __ROOTSERVERTEST_6_H__)
+#define __ROOTSERVERTEST_6_H__
+
+
+class CRootServerTest6_1 : public CTestStepRootServer
+{
+public:
+	CRootServerTest6_1(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest6_2 : public CTestStepRootServer
+{
+public:
+	CRootServerTest6_2(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest6_BindWithinModule : public CTestStepRootServer
+{
+public:
+	CRootServerTest6_BindWithinModule(CTE_RootServerServer *aSuite);
+protected:
+	TVerdict BindWithinModuleL(TThreadPriority aPriority);
+};
+
+class CRootServerTest6_3 : public CRootServerTest6_BindWithinModule
+{
+public:
+	CRootServerTest6_3(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest6_4 : public CRootServerTest6_BindWithinModule
+{
+public:
+	CRootServerTest6_4(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest6_5 : public CTestStepRootServer
+{
+public:
+	CRootServerTest6_5(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest6_6 : public CTestStepRootServer
+{
+public:
+	CRootServerTest6_6(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest6_7 : public CTestStepRootServer
+{
+public:
+	CRootServerTest6_7(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest6_UnbindWithinModule : public CTestStepRootServer
+{
+public:
+	CRootServerTest6_UnbindWithinModule(CTE_RootServerServer *aSuite);
+protected:
+	TVerdict UnbindWithinModuleL(TThreadPriority aPriority);
+};
+
+class CRootServerTest6_8 : public CRootServerTest6_UnbindWithinModule
+{
+public:
+	CRootServerTest6_8(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest6_9 : public CRootServerTest6_UnbindWithinModule
+{
+public:
+	CRootServerTest6_9(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest6_10 : public CTestStepRootServer
+{
+public:
+	CRootServerTest6_10(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest6_11 : public CTestStepRootServer
+{
+public:
+	CRootServerTest6_11(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest6_12 : public CTestStepRootServer
+{
+public:
+	CRootServerTest6_12(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest6_13 : public CTestStepRootServer
+{
+public:
+	CRootServerTest6_13(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest6_14 : public CTestStepRootServer
+{
+public:
+	CRootServerTest6_14(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest6_15 : public CTestStepRootServer
+{
+public:
+	CRootServerTest6_15(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest6_16 : public CTestStepRootServer
+{
+public:
+	CRootServerTest6_16(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+#endif //(__ROOTSERVERTEST_6_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTestSection7.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,55 @@
+// Copyright (c) 2003-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:
+// // Root Server Test Section 7 - configure Root Server
+// 
+//
+
+
+#if (!defined __ROOTSERVERTEST_7_H__)
+#define __ROOTSERVERTEST_7_H__
+
+class CRootServerTest7_1 : public CTestStepRootServer
+{
+public:
+	CRootServerTest7_1(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest7_2 : public CTestStepRootServer
+{
+public:
+	CRootServerTest7_2(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest7_3 : public CTestStepRootServer
+{
+public:
+	CRootServerTest7_3(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+class CRootServerTest7_4 : public CTestStepRootServer
+{
+public:
+	CRootServerTest7_4(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+};
+
+
+#endif //(__ROOTSERVERTEST_7_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/inc/RootServerTestSection8.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,34 @@
+// Copyright (c) 2006-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:
+// // Root Server Test Section 8 - configure Root Server
+// 
+//
+
+
+#if (!defined __ROOTSERVERTEST_8_H__)
+#define __ROOTSERVERTEST_8_H__
+
+class CRootServerTest8_1 : public CTestStepRootServer
+{
+public:
+	CRootServerTest8_1(CTE_RootServerServer *aSuite);
+
+	virtual TVerdict doTestStepL( void );
+
+private:
+	void TestConvertPriorityValidL(const TDesC8& aPriorityName, TThreadPriority aExpectedPriority, TVerdict& aVerdict);
+	void TestConvertPriorityInvalidL(const TDesC8& aPriorityName, TVerdict& aVerdict);
+};
+
+#endif //(__ROOTSERVERTEST_8_H__)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/inc/TE_RootServerServer.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,66 @@
+// Copyright (c) 2003-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:
+/**
+  *
+ * Header for TE_RootServerSuite class. This is the container
+ * class for all the RConnection multihoming test steps
+ *
+ */
+#if (!defined __TE_RootServerSUITE_H__)
+#define __TE_RootServerSUITE_H__
+
+#include <test/TestExecuteServerBase.h>
+#include "c32root.h"
+
+class CTestStepRootServer;
+
+class CTE_RootServerServer : public CTestServer
+	{
+public:
+	static CTE_RootServerServer* NewL();
+	virtual CTestStep* CreateTestStep(const TDesC& aStepName);
+	
+	
+	TInt StartRootServer();
+	TBool ShutdownRootServer();
+
+	RRootServ& RootSess()
+		{
+		return iRootServer;
+		}
+	TInt NextServerNumber()
+		{
+		return iNextServerNumber++;
+		}
+	// this should be a pure virtual so every test ddl
+	// has to provide a version but for now defaults to ?.?
+	virtual TPtrC GetVersion( void );
+	
+private:
+	RRootServ iRootServer;
+	TInt iNextServerNumber;
+	
+	};
+
+// CSelfPopScheduler - thin extension of CActiveScheduler to give useful installation & removal cleanup-stack behaviour
+class CSelfPopScheduler : public CActiveScheduler
+	{
+public:
+	static CSelfPopScheduler* CreateLC();
+	operator TCleanupItem();
+private:
+	static void Cleanup(TAny* aItem);
+	};
+	
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/inc/TestAsynchHandler.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,67 @@
+// Copyright (c) 2003-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:
+//
+// This contains CTestAsynchHandler which is an active object to
+// handle the asynch calls from the RootServer during testing
+
+#if (!defined __TESTASYNCHHANDLER_H__)
+#define __TESTASYNCHHANDLER_H__
+
+#include "c32root.h"
+#include <e32property.h>
+
+class CTestAsynchHandler: public CActive
+    {
+public:
+	// construct/destruct
+	static CTestAsynchHandler* NewLC(RRootServ* aRootServer);
+	~CTestAsynchHandler();
+
+	// requests
+    void TryLoad( const TRSStartModuleParams& aParams, const TDesC8& aIniData );
+	void TryUnLoad( const TCFModuleName& aName, TRSUnLoadType aType );
+	void TryBind( TRSBindingInfo& aBindInfo ); 
+	void TryUnBind( TRSUnBindingInfo& aUnbindInfo );
+    void TryWaitForDeath(void);
+	void TryCancelDeath();
+	void WaitForTimer(TInt aTimeout_ms);
+
+	typedef enum 
+		{
+		EIdle,
+		ELoading,
+		EUnLoading,
+		EBinding,
+		EUnBinding,
+		EListeningforDeath,
+		EWaitingforTimer
+	} TAsynchHandlerStates;
+	TAsynchHandlerStates GetiState(void) const { return iState; }
+
+private:
+	// construct/destruct
+	CTestAsynchHandler();
+	void ConstructL(RRootServ* aRootServer);
+
+	// from CActive
+    void RunL();
+	void DoCancel();
+
+    RRootServ* iRootServer;
+	RTimer iTimer;
+    TAsynchHandlerStates iState;
+	RProperty iPropertyDeath;
+    };
+
+#endif /* __TESTASYNCHHANDLER_H__ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/inc/TestStepRootServer.h	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,96 @@
+// Copyright (c) 2003-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:
+//
+// This contains CTestCaseRootServer which is the base class for all 
+// the ROOTSERVER suite test cases
+
+#if (!defined __ROOTSERVERTESTSTEP_H__)
+#define __ROOTSERVERTESTSTEP_H__
+
+// EPOC includes
+#include <e32base.h>
+
+// RootServer includes
+#include <es_mbman.h>
+
+#include "RootServerTest.h"
+#include "TestAsynchHandler.h"
+#include <comms-infras/commsdebugutility.h>
+#include "rsshared.h"
+#include "cfshared.h"
+#include "c32cmiutils.h"
+#include "TE_RootServerServer.h"
+
+_LIT8(KModule1, "module1");
+_LIT8(KModule2, "module2");
+_LIT8(KSubModule1, "Test Protocol1");
+_LIT8(KSubModule2, "Test Protocol2");
+
+class CTE_RootServerServer;
+class CTestAsynchHandler;
+
+class CTestStepRootServer : public CTestStep
+{
+public:
+	CTestStepRootServer(CTE_RootServerServer *aSuite);
+	~CTestStepRootServer();
+
+	// config file access - RootServer specific
+
+
+	// override pre and post ambles
+	TVerdict doTestStepPreambleL( void );
+	TVerdict doTestStepPostambleL( void );
+
+	// global methods
+	void GetTestStepServerName(const TDesC &aNamePostFix, TDes &aServerName);
+
+
+	// pointer to suite which owns this test 
+	CTE_RootServerServer * iRootServerSuite;
+
+	// expected test server lifetime in microsecs
+	static const TInt isTestServerLifeTime;
+
+	// time to wait for all test servers to die
+	static const TInt isTestServerWaitTime;
+
+	// time to delay testserver statrup rendezvous when required
+	static const TInt isRendezvousDelayTime;
+
+	// Narrow-char overloads; would be better in base class
+	enum { EMaxLogLength = 256 };
+	void Log( TRefByValue<const TDesC8> aFormat, ... );
+	void Log( TInt aSeverity, TRefByValue<const TDesC8> aFormat, ... );
+	void LogExtra(const TText8* aFile, TInt aLine, TInt aSeverity,
+		TRefByValue<const TDesC8> aFmt,...);
+
+	// And forwards to the base class, since the narrow overloads mask the usual ones
+	void Log( TRefByValue<const TDesC16> aFormat, ... );
+	void Log( TInt aSeverity, TRefByValue<const TDesC16> aFormat, ... );
+	void LogExtra(const TText8* aFile, TInt aLine, TInt aSeverity,
+		TRefByValue<const TDesC> aFmt,...);
+
+protected:
+	void DefaultStartParams(RootServer::TRSStartModuleParams& aStartParams, TTestModuleIniData& iIniData);
+	void LoadNormalModuleL(CTestAsynchHandler* aHandler, const TDesC8& aModule, TThreadPriority aPriority = EPriorityNormal);
+	TInt TryHierachicalBind(CTestAsynchHandler* aHandler, 
+							const TDesC8& aTopModule, const TDesC8& aTopSubModule, 
+							const TDesC8& aBottomModule, const TDesC8& aBottomSubModule);
+
+private:
+
+};
+
+#endif /* __ROOTSERVERTESTSTEP_H__ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/scripts/te_rootserver.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,3 @@
+[Test_Common]
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/scripts/te_rootserver_full.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,340 @@
+//
+// 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:
+//
+//MULTITHREAD
+//
+PRINT TE_RootServer: Section 1 tests
+//
+LOAD_SUITE te_rootserver
+
+// run test 1.1
+START_TESTCASE			COMINF-rootserver-0901
+//! @SYMTestCaseID		COMINF-rootserver-0901
+RUN_TEST_STEP 100 te_rootserver Test1.1 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0901
+
+// run test 2.1
+START_TESTCASE			COMINF-rootserver-0902
+//! @SYMTestCaseID		COMINF-rootserver-0902
+RUN_TEST_STEP 10000 te_rootserver Test2.1 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0902
+
+// run test 2.2
+START_TESTCASE			COMINF-rootserver-0903
+//! @SYMTestCaseID		COMINF-rootserver-0903
+RUN_TEST_STEP 10000 te_rootserver Test2.2 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0903
+
+// run test 2.3
+START_TESTCASE			COMINF-rootserver-0904
+//! @SYMTestCaseID		COMINF-rootserver-0904
+RUN_TEST_STEP 10000 te_rootserver Test2.3 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0904
+
+// run test 3.2
+START_TESTCASE			COMINF-rootserver-0905
+//! @SYMTestCaseID		COMINF-rootserver-0905
+RUN_TEST_STEP 500 te_rootserver Test3.2 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0905
+
+// run test 3.3
+START_TESTCASE			COMINF-rootserver-0906
+//! @SYMTestCaseID		COMINF-rootserver-0906
+RUN_TEST_STEP 500 te_rootserver Test3.3 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0906
+
+// run test 3.4
+START_TESTCASE			COMINF-rootserver-0907
+//! @SYMTestCaseID		COMINF-rootserver-0907
+RUN_TEST_STEP 500 te_rootserver Test3.4 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0907
+
+// run test 3.5
+START_TESTCASE			COMINF-rootserver-0908
+//! @SYMTestCaseID		COMINF-rootserver-0908
+RUN_TEST_STEP 500 te_rootserver Test3.5 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0908
+
+// run test 3.6
+START_TESTCASE			COMINF-rootserver-0909
+//! @SYMTestCaseID		COMINF-rootserver-0909
+RUN_TEST_STEP 500 te_rootserver Test3.6 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0909
+
+// run test 3.7
+START_TESTCASE			COMINF-rootserver-0910
+//! @SYMTestCaseID		COMINF-rootserver-0910
+RUN_TEST_STEP 500 te_rootserver Test3.7 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0910
+
+// run test 3.8
+START_TESTCASE			COMINF-rootserver-0911
+//! @SYMTestCaseID		COMINF-rootserver-0911
+RUN_TEST_STEP 500 te_rootserver Test3.8 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0911
+
+// run test 3.9
+START_TESTCASE			COMINF-rootserver-0912
+//! @SYMTestCaseID		COMINF-rootserver-0912
+RUN_TEST_STEP 500 te_rootserver Test3.9 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0912
+
+// run test 3.10
+START_TESTCASE			COMINF-rootserver-0913
+//! @SYMTestCaseID		COMINF-rootserver-0913
+RUN_TEST_STEP 500 te_rootserver Test3.10 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0913
+
+// run test 3.11
+START_TESTCASE			COMINF-rootserver-0914
+//! @SYMTestCaseID		COMINF-rootserver-0914
+RUN_TEST_STEP 500 te_rootserver Test3.11 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0914
+
+// run test 3.12
+START_TESTCASE			COMINF-rootserver-0915
+//! @SYMTestCaseID		COMINF-rootserver-0915
+RUN_TEST_STEP 500 te_rootserver Test3.12 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0915
+
+// run test 3.13
+START_TESTCASE			COMINF-rootserver-0916
+//! @SYMTestCaseID		COMINF-rootserver-0916
+RUN_TEST_STEP 500 te_rootserver Test3.13 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0916
+
+// run test 3.14
+START_TESTCASE			COMINF-rootserver-0917
+//! @SYMTestCaseID		COMINF-rootserver-0917
+RUN_TEST_STEP 500 te_rootserver Test3.14 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0917
+
+// run test 3.15
+START_TESTCASE			COMINF-rootserver-0918
+//! @SYMTestCaseID		COMINF-rootserver-0918
+RUN_TEST_STEP 500 te_rootserver Test3.15 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0918
+
+// run test 3.16
+START_TESTCASE			COMINF-rootserver-0919
+//! @SYMTestCaseID		COMINF-rootserver-0919
+RUN_TEST_STEP 500 te_rootserver Test3.16 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0919
+
+// run test 3.17
+START_TESTCASE			COMINF-rootserver-0920
+//! @SYMTestCaseID		COMINF-rootserver-0920
+RUN_TEST_STEP 500 te_rootserver Test3.17 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0920
+
+// run test 3.18
+START_TESTCASE			COMINF-rootserver-0921
+//! @SYMTestCaseID		COMINF-rootserver-0921
+RUN_TEST_STEP 500 te_rootserver Test3.18 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0921
+
+// run test 4.1
+START_TESTCASE			COMINF-rootserver-0922
+//! @SYMTestCaseID		COMINF-rootserver-0922
+RUN_TEST_STEP 18000 te_rootserver Test4.1 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0922
+
+// run test 5.1
+START_TESTCASE			COMINF-rootserver-0923
+//! @SYMTestCaseID		COMINF-rootserver-0923
+RUN_TEST_STEP 12500 te_rootserver Test5.1 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0923
+
+// run test 5.2
+START_TESTCASE			COMINF-rootserver-0924
+//! @SYMTestCaseID		COMINF-rootserver-0924
+RUN_TEST_STEP 12500 te_rootserver Test5.2 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0924
+
+// run test 5.3
+START_TESTCASE			COMINF-rootserver-0925
+//! @SYMTestCaseID		COMINF-rootserver-0925
+RUN_TEST_STEP 12500 te_rootserver Test5.3 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0925
+
+// run test 5.4
+START_TESTCASE			COMINF-rootserver-0926
+//! @SYMTestCaseID		COMINF-rootserver-0926
+RUN_TEST_STEP 12500 te_rootserver Test5.4 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0926
+
+// run test 5.5
+START_TESTCASE			COMINF-rootserver-0927
+//! @SYMTestCaseID		COMINF-rootserver-0927
+RUN_TEST_STEP 12500 te_rootserver Test5.5 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0927
+
+// run test 5.6
+START_TESTCASE			COMINF-rootserver-0928
+//! @SYMTestCaseID		COMINF-rootserver-0928
+RUN_TEST_STEP 12500 te_rootserver Test5.6 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0928
+
+// run test 5.7
+START_TESTCASE			COMINF-rootserver-0929
+//! @SYMTestCaseID		COMINF-rootserver-0929
+RUN_TEST_STEP 12500 te_rootserver Test5.7 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0929
+
+// run test 5.8
+START_TESTCASE			COMINF-rootserver-0930
+//! @SYMTestCaseID		COMINF-rootserver-0930
+RUN_TEST_STEP 12500 te_rootserver Test5.8 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0930
+
+// run test 6.1
+START_TESTCASE			COMINF-rootserver-0931
+//! @SYMTestCaseID		COMINF-rootserver-0931
+RUN_TEST_STEP 12500 te_rootserver Test6.1 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0931
+
+// run test 6.2
+START_TESTCASE			COMINF-rootserver-0932
+//! @SYMTestCaseID		COMINF-rootserver-0932
+RUN_TEST_STEP 12500 te_rootserver Test6.2 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0932
+
+// run test 6.3
+START_TESTCASE			COMINF-rootserver-0933
+//! @SYMTestCaseID		COMINF-rootserver-0933
+RUN_TEST_STEP 12500 te_rootserver Test6.3 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0933
+
+// run test 6.4
+START_TESTCASE			COMINF-rootserver-0934
+//! @SYMTestCaseID		COMINF-rootserver-0934
+RUN_TEST_STEP 12500 te_rootserver Test6.4 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0934
+
+// run test 6.5
+START_TESTCASE			COMINF-rootserver-0935
+//! @SYMTestCaseID		COMINF-rootserver-0935
+RUN_TEST_STEP 12500 te_rootserver Test6.5 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0935
+
+// run test 6.6
+START_TESTCASE			COMINF-rootserver-0936
+//! @SYMTestCaseID		COMINF-rootserver-0936
+RUN_TEST_STEP 12500 te_rootserver Test6.6 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0936
+
+// run test 6.7
+START_TESTCASE			COMINF-rootserver-0937
+//! @SYMTestCaseID		COMINF-rootserver-0937
+RUN_TEST_STEP 12500 te_rootserver Test6.7 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0937
+
+// run test 6.8
+START_TESTCASE			COMINF-rootserver-0938
+//! @SYMTestCaseID		COMINF-rootserver-0938
+RUN_TEST_STEP 12500 te_rootserver Test6.8 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0938
+
+// run test 6.9
+START_TESTCASE			COMINF-rootserver-0939
+//! @SYMTestCaseID		COMINF-rootserver-0939
+RUN_TEST_STEP 12500 te_rootserver Test6.9 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0939
+
+// run test 6.10
+START_TESTCASE			COMINF-rootserver-0940
+//! @SYMTestCaseID		COMINF-rootserver-0940
+RUN_TEST_STEP 12500 te_rootserver Test6.10 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0940
+
+// run test 6.11
+START_TESTCASE			COMINF-rootserver-0941
+//! @SYMTestCaseID		COMINF-rootserver-0941
+RUN_TEST_STEP 12500 te_rootserver Test6.11 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0941
+
+// run test 6.12
+START_TESTCASE			COMINF-rootserver-0942
+//! @SYMTestCaseID		COMINF-rootserver-0942
+RUN_TEST_STEP 12500 te_rootserver Test6.12 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0942
+
+// run test 6.13
+START_TESTCASE			COMINF-rootserver-0943
+//! @SYMTestCaseID		COMINF-rootserver-0943
+RUN_TEST_STEP 12500 te_rootserver Test6.13 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0943
+
+// run test 6.14
+START_TESTCASE			COMINF-rootserver-0944
+//! @SYMTestCaseID		COMINF-rootserver-0944
+RUN_TEST_STEP 12500 te_rootserver Test6.14 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0944
+
+// run test 6.15
+START_TESTCASE			COMINF-rootserver-0945
+//! @SYMTestCaseID		COMINF-rootserver-0945
+RUN_TEST_STEP 12500 te_rootserver Test6.15 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0945
+
+// run test 6.16
+START_TESTCASE			COMINF-rootserver-0946
+//! @SYMTestCaseID		COMINF-rootserver-0946
+RUN_TEST_STEP 12500 te_rootserver Test6.16 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0946
+
+// run test 7.1
+START_TESTCASE			COMINF-rootserver-0947
+//! @SYMTestCaseID		COMINF-rootserver-0947
+RUN_TEST_STEP 12500 te_rootserver Test7.1 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0947
+
+// run test 7.2
+START_TESTCASE			COMINF-rootserver-0948
+//! @SYMTestCaseID		COMINF-rootserver-0948
+RUN_TEST_STEP 12500 te_rootserver Test7.2 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0948
+
+// run test 7.3
+START_TESTCASE			COMINF-rootserver-0949
+//! @SYMTestCaseID		COMINF-rootserver-0949
+RUN_TEST_STEP 12500 te_rootserver Test7.3 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0949
+
+// run test 7.4
+START_TESTCASE			COMINF-rootserver-0950
+//! @SYMTestCaseID		COMINF-rootserver-0950
+RUN_TEST_STEP 12500 te_rootserver Test7.4 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0950
+
+//run test 1.2
+START_TESTCASE			COMINF-rootserver-0951
+//! @SYMTestCaseID		COMINF-rootserver-0951
+RUN_TEST_STEP 100 te_rootserver Test1.2 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0951
+
+// run test 8.1
+START_TESTCASE			COMINF-rootserver-0952
+//! @SYMTestCaseID		COMINF-rootserver-0952
+//!@SYMREQ REQ5026 PREQ955
+//!@SYMTestCaseDesc Unit testing conversion of thread priority names to enums
+//!@SYMTestPriority High
+//!@SYMTestActions Pass a series of valid and invalid priority names to function
+//!@SYMTestExpectedResults Pass, if all valid names converted correctly, and invalid names fail to convert
+//!@SYMTestType UT
+RUN_TEST_STEP 100 te_rootserver Test8.1 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-0952
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/scripts/te_rootserver_light.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,207 @@
+//
+// 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:
+//
+//MULTITHREAD
+//
+PRINT TE_RootServer: Section 1 tests
+//
+LOAD_SUITE te_rootserver
+
+// run test 1.1
+START_TESTCASE			COMINF-rootserver-1001
+//! @SYMTestCaseID		COMINF-rootserver-1001
+RUN_TEST_STEP 100 te_rootserver Test1.1 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1001
+
+// run test 2.1
+START_TESTCASE			COMINF-rootserver-1002
+//! @SYMTestCaseID		COMINF-rootserver-1002
+RUN_TEST_STEP 10000 te_rootserver Test2.1 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1002
+
+// run test 2.2
+START_TESTCASE			COMINF-rootserver-1003
+//! @SYMTestCaseID		COMINF-rootserver-1003
+RUN_TEST_STEP 10000 te_rootserver Test2.2 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1003
+
+// run test 2.3
+START_TESTCASE			COMINF-rootserver-1004
+//! @SYMTestCaseID		COMINF-rootserver-1004
+RUN_TEST_STEP 10000 te_rootserver Test2.3 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1004
+
+// run test 3.2
+START_TESTCASE			COMINF-rootserver-1005
+//! @SYMTestCaseID		COMINF-rootserver-1005
+RUN_TEST_STEP 500 te_rootserver Test3.2 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1005
+
+// run test 3.3
+START_TESTCASE			COMINF-rootserver-1006
+//! @SYMTestCaseID		COMINF-rootserver-1006
+RUN_TEST_STEP 500 te_rootserver Test3.3 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1006
+
+// run test 3.4
+START_TESTCASE			COMINF-rootserver-1007
+//! @SYMTestCaseID		COMINF-rootserver-1007
+RUN_TEST_STEP 500 te_rootserver Test3.4 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1007
+
+// run test 3.5
+START_TESTCASE			COMINF-rootserver-1008
+//! @SYMTestCaseID		COMINF-rootserver-1008
+RUN_TEST_STEP 500 te_rootserver Test3.5 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1008
+
+// run test 3.6
+START_TESTCASE			COMINF-rootserver-1009
+//! @SYMTestCaseID		COMINF-rootserver-1009
+RUN_TEST_STEP 500 te_rootserver Test3.6 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1009
+
+// run test 3.7
+START_TESTCASE			COMINF-rootserver-1010
+//! @SYMTestCaseID		COMINF-rootserver-1010
+RUN_TEST_STEP 500 te_rootserver Test3.7 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1010
+
+// run test 3.8
+START_TESTCASE			COMINF-rootserver-1011
+//! @SYMTestCaseID		COMINF-rootserver-1011
+RUN_TEST_STEP 500 te_rootserver Test3.8 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1011
+
+// run test 3.9
+START_TESTCASE			COMINF-rootserver-1012
+//! @SYMTestCaseID		COMINF-rootserver-1012
+RUN_TEST_STEP 500 te_rootserver Test3.9 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1012
+
+// run test 3.10
+START_TESTCASE			COMINF-rootserver-1013
+//! @SYMTestCaseID		COMINF-rootserver-1013
+RUN_TEST_STEP 500 te_rootserver Test3.10 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1013
+
+// run test 3.11
+START_TESTCASE			COMINF-rootserver-1014
+//! @SYMTestCaseID		COMINF-rootserver-1014
+RUN_TEST_STEP 500 te_rootserver Test3.11 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1014
+
+// run test 3.12
+START_TESTCASE			COMINF-rootserver-1015
+//! @SYMTestCaseID		COMINF-rootserver-1015
+RUN_TEST_STEP 500 te_rootserver Test3.12 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1015
+
+// run test 3.13
+START_TESTCASE			COMINF-rootserver-1016
+//! @SYMTestCaseID		COMINF-rootserver-1016
+RUN_TEST_STEP 500 te_rootserver Test3.13 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1016
+
+// run test 3.14
+START_TESTCASE			COMINF-rootserver-1017
+//! @SYMTestCaseID		COMINF-rootserver-1017
+RUN_TEST_STEP 500 te_rootserver Test3.14 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1017
+
+// run test 3.15
+START_TESTCASE			COMINF-rootserver-1018
+//! @SYMTestCaseID		COMINF-rootserver-1018
+RUN_TEST_STEP 500 te_rootserver Test3.15 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1018
+
+// run test 3.16
+START_TESTCASE			COMINF-rootserver-1019
+//! @SYMTestCaseID		COMINF-rootserver-1019
+RUN_TEST_STEP 500 te_rootserver Test3.16 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1019
+
+// run test 3.17
+START_TESTCASE			COMINF-rootserver-1020
+//! @SYMTestCaseID		COMINF-rootserver-1020
+RUN_TEST_STEP 500 te_rootserver Test3.17 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1020
+
+// run test 3.18
+START_TESTCASE			COMINF-rootserver-1021
+//! @SYMTestCaseID		COMINF-rootserver-1021
+RUN_TEST_STEP 500 te_rootserver Test3.18 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1021
+
+// run test 4.1
+START_TESTCASE			COMINF-rootserver-1022
+//! @SYMTestCaseID		COMINF-rootserver-1022
+RUN_TEST_STEP 18000 te_rootserver Test4.1 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1022
+
+// run test 5.1
+START_TESTCASE			COMINF-rootserver-1023
+//! @SYMTestCaseID		COMINF-rootserver-1023
+RUN_TEST_STEP 12500 te_rootserver Test5.1 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1023
+
+// run test 5.2
+START_TESTCASE			COMINF-rootserver-1024
+//! @SYMTestCaseID		COMINF-rootserver-1024
+RUN_TEST_STEP 12500 te_rootserver Test5.2 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1024
+
+// run test 5.3
+START_TESTCASE			COMINF-rootserver-1025
+//! @SYMTestCaseID		COMINF-rootserver-1025
+RUN_TEST_STEP 12500 te_rootserver Test5.3 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1025
+
+// run test 5.4
+START_TESTCASE			COMINF-rootserver-1026
+//! @SYMTestCaseID		COMINF-rootserver-1026
+RUN_TEST_STEP 12500 te_rootserver Test5.4 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1026
+
+// run test 5.5
+START_TESTCASE			COMINF-rootserver-1027
+//! @SYMTestCaseID		COMINF-rootserver-1027
+RUN_TEST_STEP 12500 te_rootserver Test5.5 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1027
+
+// run test 5.6
+START_TESTCASE			COMINF-rootserver-1028
+//! @SYMTestCaseID		COMINF-rootserver-1028
+RUN_TEST_STEP 12500 te_rootserver Test5.6 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1028
+
+// run test 5.7
+START_TESTCASE			COMINF-rootserver-1029
+//! @SYMTestCaseID		COMINF-rootserver-1029
+RUN_TEST_STEP 12500 te_rootserver Test5.7 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1029
+
+// run test 5.8
+START_TESTCASE			COMINF-rootserver-1030
+//! @SYMTestCaseID		COMINF-rootserver-1030
+RUN_TEST_STEP 12500 te_rootserver Test5.8 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1030
+
+// run test 1.2
+START_TESTCASE			COMINF-rootserver-1031
+//! @SYMTestCaseID		COMINF-rootserver-1031
+RUN_TEST_STEP 100 te_rootserver Test1.2 z:\testdata\configs\te_rootserver.ini
+END_TESTCASE			COMINF-rootserver-1031
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/scripts/te_rootserver_main.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,20 @@
+//
+// 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:
+//
+// RootServer Main Script
+// Non-Platsec Version
+
+RUN_PROGRAM -1 testexecute.exe Z:\TestData\Scripts\te_rootserver_light.script
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/scripts/te_rootserver_main_platsec.script	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,26 @@
+//
+// 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:
+//
+// RootServer Main Script
+// Platsec Version
+
+
+// --------------------
+// Use Setcap to create a version of scheduletest.exe with required caps - 00000000, SID=101F7988, VID=70000001
+RUN_PROGRAM -1 setcap scheduletest.exe 00000000  -SID 101F7988 -VID 70000001 C:\scheduletest_c32.exe
+RUN_PROGRAM -1 testexecute.exe Z:\TestData\Scripts\te_rootserver_light.script
+
+
+RUN_SCRIPT Z:\TestData\Scripts\RootServerPlatSecSuite.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/src/RootServerTestSection1.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,106 @@
+// Copyright (c) 2003-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:
+// This contains ESock Test cases from section 1
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+#include <es_mbman.h>
+
+// Test system includes
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#include <networking/testsuite.h>
+
+#include "TestStepRootServer.h"
+#include "RootServerTestSection1.h"
+
+
+// Test step 1.1 - Set MBufPoolSize
+CRootServerTest1_1::CRootServerTest1_1(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test1.1"));
+	}
+
+TVerdict CRootServerTest1_1::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Set MBufPoolSize"));
+	INFO_PRINTF1(_L("Depreciated by PREQ1248."));
+
+    SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
+
+// Test step 1.2 - Test that StartC32() doesnt leak handles.
+CRootServerTest1_2::CRootServerTest1_2(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+    {
+	// store the name of this test case
+	SetTestStepName(_L("Test1.2"));
+    }
+
+TVerdict CRootServerTest1_2::doTestStepL( void )
+    {
+	SetTestStepResult(EFail);
+	INFO_PRINTF1(_L("Test Purpose: Test that StartC32() doesnt leak handles"));
+
+    TAutoClose<RThread> thisThread;
+
+	//*****************step 1*************************
+	// Open handle on current thread
+	INFO_PRINTF1(_L("01 Open handle on current thread"));
+    TInt result=thisThread.iObj.Open(RThread().Id());
+	if (KErrNone != result) 
+		{
+         SetTestStepResult(EFail);
+
+		return TestStepResult();
+		}
+
+	//*****************step 2*************************
+	// Get handlecount of thread
+	INFO_PRINTF1(_L("02 Get handlecount of thread"));
+    TInt threadhandlecount, processhandlecount;
+    thisThread.iObj.HandleCount(processhandlecount, threadhandlecount);
+
+	//*****************step 3*************************
+	// Start comms process
+	INFO_PRINTF1(_L("03 Start comms process"));
+ 	_LIT(KPhbkSyncCMI, "phbsync.cmi, c32.cmi, etel.cmi, esock.cmi, esock_main.cmi, esock_codealer1.cmi, esock_codealer2.cmi, esock_ip.cmi, esock_mip.cmi, esock_dip.cmi, esock_tr.cmi, esock_ir.cmi, esock_bt.cmi, esock_smswap.cmi, esock_pdummy1.cmi, esock_pdummy2.cmi, esock_ipc.cmi, esock_sip.cmi");
+    result = StartC32WithCMISuppressions(KPhbkSyncCMI);
+	if (KErrNone != result)
+		{
+        SetTestStepResult(EFail);
+		return TestStepResult();
+		}
+
+	//*****************step 4*************************
+	// Get handlecount of thread
+	INFO_PRINTF1(_L("04 Get handlecount of thread"));
+    TInt threadhandlecount2, processhandlecount2;
+    thisThread.iObj.HandleCount(processhandlecount2, threadhandlecount2);
+    
+	if (threadhandlecount2!=threadhandlecount) 
+		{
+        SetTestStepResult(EFail);
+		return TestStepResult();
+		}
+
+    SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/src/RootServerTestSection2.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,246 @@
+// Copyright (c) 2003-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:
+// This contains ESock Test cases from section 2
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// RootServer includes
+#include <es_mbman.h>
+
+// Test system includes
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#include <networking/testsuite.h>
+
+#include "TestStepRootServer.h"
+#include "TestAsynchHandler.h"
+
+#include "RootServerTestSection2.h"
+#include "RootServerTest.h"
+
+// Test step 2.1 - Enumerate with No Servers
+CRootServerTest2_1::CRootServerTest2_1(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test2.1"));
+	}
+
+TVerdict CRootServerTest2_1::doTestStepL( void )
+	{
+	SetTestStepResult(EPass);
+
+	INFO_PRINTF1(_L("Test Purpose: Enumerate with No Servers"));
+
+	// enumerate servers
+	INFO_PRINTF1(_L("02 Enumerating servers"));
+
+	TCFModuleName moduleName;
+	TRSIter position;
+	TInt ret = iRootServerSuite->RootSess().EnumerateModules(position, moduleName);
+	INFO_PRINTF2(_L("Enumerate returned %d"), ret);
+
+	if (KErrEof != ret)
+		{
+		SetTestStepResult(EFail);
+		}
+
+	return TestStepResult();
+	}
+
+
+// Test step 2.2 - Enumerate
+CRootServerTest2_2::CRootServerTest2_2(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test2.2"));
+	}
+
+TVerdict CRootServerTest2_2::doTestStepL( void )
+	{	
+	SetTestStepResult(EPass);
+
+	INFO_PRINTF1(_L("Test Purpose: EnumerateModules"));
+
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	
+	
+	
+	INFO_PRINTF2(_L("01 Loading first cpm: %S"), &KModule1());
+	
+	
+	
+	LoadNormalModuleL(asynchHandler, KModule1);
+
+	INFO_PRINTF2(_L("02 Loading second cpm: %S"), &KModule2());
+	LoadNormalModuleL(asynchHandler, KModule2);
+
+	// uninstall active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+
+	// now enumerate
+	INFO_PRINTF1(_L("03 Enumerating once to get first servername"));
+
+	TCFModuleName moduleName;
+	TPtrC8 expectedModule2;
+	TRSIter position;
+	TInt ret = iRootServerSuite->RootSess().EnumerateModules(position, moduleName);
+
+	INFO_PRINTF2(_L("Enumerate returned %d"), ret);
+
+	if (KErrNone != ret)
+		{
+		SetTestStepResult(EFail);
+		}
+	else
+		{
+		if (moduleName == KModule1)
+			{
+			expectedModule2.Set(KModule2);
+			}
+		else if(moduleName == KModule2)
+			{
+			expectedModule2.Set(KModule1);
+			}
+		else
+			{
+			INFO_PRINTF2(_L("%S not found in serverlist"), &moduleName);
+			SetTestStepResult(EFail);
+			}
+		if(expectedModule2.Length())
+			{
+			INFO_PRINTF1(_L("Found first so enumerating again to get second servername"));
+			ret = iRootServerSuite->RootSess().EnumerateModules(position, moduleName);
+
+			INFO_PRINTF2(_L("Enumerate returned %d"), ret);
+
+			if (KErrNone != ret)
+				{
+				SetTestStepResult(EFail);
+				}
+			else if (moduleName != expectedModule2)
+				{
+				INFO_PRINTF2(_L("%S not found in serverlist"), &moduleName);
+				SetTestStepResult(EFail);
+				}
+			else
+				{
+				INFO_PRINTF1(_L("Found second so enumerating again to get EOF"));
+				ret = iRootServerSuite->RootSess().EnumerateModules(position, moduleName);
+				INFO_PRINTF2(_L("Enumerate returned %d"), ret);
+				if(ret != KErrEof)
+					{
+					SetTestStepResult(EFail);
+					}
+				else
+					{
+					INFO_PRINTF1(_L("Found end of enumeration; enumerating again to check stability"));
+					ret = iRootServerSuite->RootSess().EnumerateModules(position, moduleName);
+					INFO_PRINTF2(_L("Enumerate returned %d"), ret);
+					if(ret != KErrEof)
+						{
+						SetTestStepResult(EFail);
+						}
+					}
+				}
+			}
+		}
+
+	return TestStepResult();
+	}
+
+// Test step 2.3 - Enumerate submodules
+CRootServerTest2_3::CRootServerTest2_3(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test2.3"));
+	}
+
+TVerdict CRootServerTest2_3::doTestStepL( void )
+	{	
+	SetTestStepResult(EPass);
+
+	INFO_PRINTF1(_L("Test Purpose: EnumerateSubModules"));
+
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	INFO_PRINTF2(_L("01 Loading test module: %S"), &KModule1());
+	LoadNormalModuleL(asynchHandler, KModule1);
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	
+	TCFSubModuleName subModule;
+	TCFModuleName module(KModule1());
+	TBuf<0x40> str;
+	TCFSubModuleName expected1(_L8("Test Protocol1"));
+	TCFSubModuleName expected2(_L8("Test Protocol2"));
+	TCFSubModuleName expected3(_L8("Test Protocol3"));
+	TCFSubModuleName* expected[] = { &expected1, &expected2, &expected3 };
+	const TInt cntExpected = sizeof(expected) / sizeof(expected[0]);
+	TInt idx;
+	TRSIter position;
+	TInt ret;
+	while((ret = iRootServerSuite->RootSess().EnumerateSubModules(module, position, subModule)) == KErrNone)
+		{
+		str.Copy(subModule);
+
+		INFO_PRINTF2(_L("Got %S"), &str);
+		for(idx = 0; idx < cntExpected; ++idx)
+			{
+			if ((expected[idx] && subModule == *expected[idx]))
+				{
+				expected[idx] = NULL;
+				break;
+				}
+			}
+		if(idx == cntExpected)
+			{
+			INFO_PRINTF1(_L("not an expected sub-module"));
+			SetTestStepResult(EFail);
+			}
+		}
+											
+		if(EPass == TestStepResult() && KErrEof != ret)
+		{
+		INFO_PRINTF1(_L("Enumeration didn't end with expected KErrEof"));
+		SetTestStepResult(EFail);
+		}
+	else if((ret = iRootServerSuite->RootSess().EnumerateSubModules(module, position, subModule)) != KErrEof)
+		{
+		INFO_PRINTF1(_L("Further enumeration didn't return expected KErrEof"));
+		SetTestStepResult(EFail);
+		}
+
+	for(idx = 0; idx < cntExpected; ++idx)
+		{
+		if (expected[idx])
+			{
+			INFO_PRINTF2(_L("Expected sub-module %S wasn't enumerated"), expected[idx]);
+			SetTestStepResult(EFail);
+			break;
+			}
+		}
+
+	return TestStepResult();
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/src/RootServerTestSection3.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,829 @@
+// Copyright (c) 2003-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:
+// This contains ESock Test cases from section 3
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+#include <es_mbman.h>
+
+// Test system includes
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#include <networking/testsuite.h>
+
+#include "TestStepRootServer.h"
+#include "TestAsynchHandler.h"
+
+#include "RootServerTest.h"
+#include "RootServerTestSection3.h"
+#include <es_mbman.h>
+
+
+// Note: Test step 3.1 was a RRootServ::Connect() test; this is now obsolete
+
+// Test step 3.2 - SetMBufPoolSize After LoadServer
+CRootServerTest3_2::CRootServerTest3_2(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.2"));
+	}
+
+
+TVerdict CRootServerTest3_2::doTestStepL( void )
+	{
+	SetTestStepResult(EPass);	
+	INFO_PRINTF1(_L("Test Purpose: SetMBufPoolSize After LoadServer"));
+	
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	
+	INFO_PRINTF2(_L("01 Loading test module: %S"), &KModule1());
+	LoadNormalModuleL(asynchHandler, KModule1);
+	
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	
+	// now try to set the buffer pool size
+	INFO_PRINTF1(_L("03 Setting MBufPoolSize"));
+	TInt ret = iRootServerSuite->RootSess().SetMBufPoolSize(0,KMBufDefaultHeapSize);
+	INFO_PRINTF2(_L("SetMBufPoolSize returned %d"), ret);
+	if (KErrInUse != ret) 
+		{
+		SetTestStepResult(EFail);	
+		}
+	
+	return TestStepResult();
+	}
+
+// Test step 3.5 - Retrieve Module Information
+CRootServerTest3_DblLoad::CRootServerTest3_DblLoad(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	}
+
+
+TVerdict CRootServerTest3_DblLoad::LoadSameModuleTwiceL(TThreadPriority aPriority)
+	{
+	SetTestStepResult(EPass);	
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+	startParams.iParams.iPriority = aPriority;
+	
+	INFO_PRINTF2(_L("02 Loading module: %S"), &startParams.iParams.iName);
+	asynchHandler->TryLoad(startParams, iniData);
+	
+	CActiveScheduler::Start();
+	
+    if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		User::Leave(asynchHandler->iStatus.Int());
+		}
+	
+	// try to load same module again
+	INFO_PRINTF1(_L("03 Trying to load same module again"));
+	asynchHandler->TryLoad(startParams, iniData);
+	CActiveScheduler::Start();
+	
+	INFO_PRINTF2(_L("LoadServer returned %d"), asynchHandler->iStatus.Int());
+    if (asynchHandler->iStatus != KErrRSModuleAlreadyExist)
+		{
+		SetTestStepResult(EFail);	
+		}
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	
+	return TestStepResult();
+	}
+
+// Test step 3.3 - Load Same Module Twice
+CRootServerTest3_3::CRootServerTest3_3(CTE_RootServerServer *aSuite) : CRootServerTest3_DblLoad(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.3"));
+	}
+
+TVerdict CRootServerTest3_3::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Load Same Module Twice (normal priority)"));
+	return LoadSameModuleTwiceL(EPriorityNormal);
+	}
+
+// Test step 3.4 - Load Same Module Twice with elevated priority
+CRootServerTest3_4::CRootServerTest3_4(CTE_RootServerServer *aSuite) : CRootServerTest3_DblLoad(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.4"));
+	}
+
+TVerdict CRootServerTest3_4::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Load Same Module Twice (elevated priority)"));
+	return LoadSameModuleTwiceL(EPriorityRealTime);
+	}
+
+
+// Test step 3.5 - Retrieve Module Information
+CRootServerTest3_5::CRootServerTest3_5(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.5"));
+	}
+
+TVerdict CRootServerTest3_5::doTestStepL( void )
+	{
+	SetTestStepResult(EPass);	
+	INFO_PRINTF1(_L("Test Purpose: Retrieve Module Information"));
+	
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+	
+	INFO_PRINTF2(_L("02 Loading module: %S"), &startParams.iParams.iName);
+	asynchHandler->TryLoad(startParams, iniData);
+	CActiveScheduler::Start();
+	
+    if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		User::Leave(asynchHandler->iStatus.Int());
+		}
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	
+	// now try to retrieve information about the module
+	INFO_PRINTF1(_L("03 Getting module information"));
+	TRSModuleInfo info;
+	TCFModuleName moduleName = KModule1();
+	TInt ret = iRootServerSuite->RootSess().GetModuleInfo(moduleName, info);
+	INFO_PRINTF3(_L("GetModuleInfo for %S returned %d"), &moduleName, ret);
+	
+	if(KErrNone != ret)
+		{
+        SetTestStepResult(EFail);		return TestStepResult();
+		}
+	
+	Log(_L("Filename %S, State %d, NumSubmodules %d"), 
+		&info.iParams.iDll, info.iParams.iState, info.iParams.iNumSubModules);
+	
+	if (startParams.iParams.iFilename != info.iParams.iDll ||
+		ERunning != info.iParams.iState ||
+		3 != info.iParams.iNumSubModules)
+		{
+        SetTestStepResult(EFail);
+        return TestStepResult();
+		}
+	
+	// now ask for info about a non-existent module
+	INFO_PRINTF1(_L("04 Getting module information for non-existent module"));
+	
+	moduleName = KModule2;
+	ret = iRootServerSuite->RootSess().GetModuleInfo(moduleName, info);
+	INFO_PRINTF3(_L("GetModuleInfo for %S returned %d"), &moduleName, ret);
+	
+	if(KErrRSModuleUnknown != ret)
+		{
+        SetTestStepResult(EFail);	
+        return TestStepResult();
+		}
+	
+	return TestStepResult();
+	}
+
+
+// Test step 3.6 - CancelLoadModule Before Thread Starts
+CRootServerTest3_6::CRootServerTest3_6(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.6"));
+	}
+
+TVerdict CRootServerTest3_6::doTestStepL( void )
+	{
+	SetTestStepResult(EPass);	
+	INFO_PRINTF1(_L("Test Purpose: CancelLoadModule Before Thread Starts"));
+	
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+	iniData.iParams.iInitDelay = isRendezvousDelayTime;
+	
+	INFO_PRINTF2(_L("02 Loading module: %S"), &startParams.iParams.iName);
+	asynchHandler->TryLoad(startParams, iniData);
+	
+//	User::After(5000000);
+
+	INFO_PRINTF2(_L("03 Cancelling Loading module: %S"), &startParams.iParams.iName);
+	iRootServerSuite->RootSess().CancelLoadCpm(startParams.iParams.iName);
+	
+	CActiveScheduler::Start();
+	
+    INFO_PRINTF2(_L("LoadServer status was: <%d> "), asynchHandler->iStatus.Int());
+	
+    if ((KErrCancel != asynchHandler->iStatus.Int()) && (KErrNone != asynchHandler->iStatus.Int()))
+		{
+		SetTestStepResult(EFail);	
+		}
+    // Unload the CPM anyway in case we were too late to cancel the load.
+    TRequestStatus status;
+    iRootServerSuite->RootSess().UnloadCpm(status, startParams.iParams.iName, EImmediate);
+    User::WaitForRequest(status);
+	
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+
+
+// Test step 3.7 - CancelLoadServer After Rendezvous
+CRootServerTest3_7::CRootServerTest3_7(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.7"));
+	}
+
+TVerdict CRootServerTest3_7::doTestStepL( void )
+	{
+	SetTestStepResult(EPass);	
+	INFO_PRINTF1(_L("Test Purpose: CancelLoadServer After Rendezvous"));
+	
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+	INFO_PRINTF2(_L("02 Loading module: %S"), &startParams.iParams.iName);
+	asynchHandler->TryLoad(startParams, iniData);
+	
+	// now wait for testserver to meet rendezvous before cancelling load (give it 
+	User::After(1000000);
+	INFO_PRINTF2(_L("03 Cancelling Loading module: %S"), &startParams.iParams.iName);
+	iRootServerSuite->RootSess().CancelLoadCpm(startParams.iParams.iName);
+	
+	CActiveScheduler::Start();
+	
+    INFO_PRINTF2(_L("LoadServer status was: <%d> "), asynchHandler->iStatus.Int());
+	
+    if (KErrNone != asynchHandler->iStatus.Int())
+		{
+		SetTestStepResult(EFail);	
+		}
+	
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	
+	return TestStepResult();
+	}
+
+// Test step 3.8 - Close Session with Pending LoadServer
+CRootServerTest3_8::CRootServerTest3_8(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.8"));
+	}
+
+TVerdict CRootServerTest3_8::doTestStepL( void )
+	{
+	SetTestStepResult(EPass);	
+	INFO_PRINTF1(_L("Test Purpose: Close Session with Pending LoadServer"));
+	
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+	iniData.iParams.iInitDelay = isRendezvousDelayTime;
+	
+	INFO_PRINTF2(_L("02 Loading module: %S"), &startParams.iParams.iName);
+	asynchHandler->TryLoad(startParams, iniData);
+	
+	INFO_PRINTF1(_L("03 Closing Session"));
+	iRootServerSuite->RootSess().Close();
+	INFO_PRINTF1(_L("RRootServ.Close() completed"));
+	
+	CActiveScheduler::Start();
+
+	// note that if the session was closed before the module's thread started,
+	// the handler should have been KErrCancelled
+    INFO_PRINTF2(_L("LoadServer status was: <%d> "), asynchHandler->iStatus.Int());
+    if ((KErrCancel != asynchHandler->iStatus.Int()) && (KErrNone != asynchHandler->iStatus.Int()))
+		{
+		SetTestStepResult(EFail);	
+		}
+	
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	
+	return TestStepResult();
+	}
+
+
+// Test step 3.9 - Module Exits Before Rendezvous
+CRootServerTest3_9::CRootServerTest3_9(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.9"));
+	}
+
+TVerdict CRootServerTest3_9::doTestStepL( void )
+	{
+	SetTestStepResult(EFail);	
+	INFO_PRINTF1(_L("Test Purpose: Module Exits Before Rendezvous"));
+	
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+	iniData.iParams.iInitDelay = EXIT_BEFORE_RENDEZVOUS;
+	
+	INFO_PRINTF2(_L("03 Loading module: %S"), &startParams.iParams.iName);
+	asynchHandler->TryLoad(startParams, iniData);
+	
+	CActiveScheduler::Start();
+	
+    INFO_PRINTF2(_L("LoadServer status was: <%d>"), asynchHandler->iStatus.Int());
+	
+    if (KErrNone != asynchHandler->iStatus.Int())
+		{
+		SetTestStepResult(EPass);	
+		}
+	
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	
+	return TestStepResult();
+	}
+
+// Test step 3.10 - Module Panics Before Meeting Rendezvous
+CRootServerTest3_10::CRootServerTest3_10(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.10"));
+	}
+
+TVerdict CRootServerTest3_10::doTestStepL( void )
+	{
+	SetTestStepResult(EFail);	
+	INFO_PRINTF1(_L("Test Purpose: Module Panics Before Meeting Rendezvous"));
+	
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+#ifdef SYMBIAN_C32ROOT_API_V3
+	startParams.iParams.iControlFlags = TRSStartModuleParamContainer::KCF_UnstableModule;
+#endif
+	iniData.iParams.iInitDelay = PANIC_BEFORE_RENDEZVOUS;
+	
+	// make sure WINS doesn't stop at panic
+	TBool jitDbg = User::JustInTime();
+	User::SetJustInTime(EFalse);
+	INFO_PRINTF2(_L("03 Loading module: %S"), &startParams.iParams.iName);
+	asynchHandler->TryLoad(startParams, iniData);
+	
+	CActiveScheduler::Start();
+	
+    INFO_PRINTF2(_L("LoadServer status was: <%d> "), asynchHandler->iStatus.Int());
+	
+    if (KErrNone != asynchHandler->iStatus.Int())
+		{
+		SetTestStepResult(EPass);	
+		}
+	
+	// Restore enclosing JIT status
+	User::SetJustInTime(jitDbg);
+	
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	
+	return TestStepResult();
+	}
+
+// Test step 3.11 - Module Panics After Meeting Rendezvous
+CRootServerTest3_11::CRootServerTest3_11(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.11"));
+	}
+
+TVerdict CRootServerTest3_11::doTestStepL( void )
+	{
+										SetTestStepResult(EFail);	
+	INFO_PRINTF1(_L("Test Purpose: Module Panics After Meeting Rendezvous"));
+	
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+#ifdef SYMBIAN_C32ROOT_API_V3
+	startParams.iParams.iControlFlags = TRSStartModuleParamContainer::KCF_UnstableModule;
+#endif
+	iniData.iParams.iInitDelay = PANIC_AFTER_RENDEZVOUS;
+	
+	// make sure WINS doesn't stop at panic
+	TBool jitDbg = User::JustInTime();
+	User::SetJustInTime(EFalse);
+	INFO_PRINTF2(_L("03 Loading module: %S"), &startParams.iParams.iName);
+	asynchHandler->TryLoad(startParams, iniData);
+	
+	CActiveScheduler::Start();
+	
+    INFO_PRINTF2(_L("LoadServer status was: <%d> "), asynchHandler->iStatus.Int());
+	
+    if (KErrServerTerminated == asynchHandler->iStatus.Int())
+		{
+		SetTestStepResult(EPass);	
+		}
+	
+	// Restore enclosing JIT status
+	User::SetJustInTime(jitDbg);
+	
+	// destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	
+	return TestStepResult();
+	}
+
+
+// Test step 3.12 - Load 2 modules sharing the same heap
+CRootServerTest3_12::CRootServerTest3_12(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.12"));
+	}
+
+TVerdict CRootServerTest3_12::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Load 2 modules sharing the same heap"));
+	
+	SetTestStepResult(EPass);	
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	_LIT8(KShareModule1, "Test ModuleShare1");
+	_LIT8(KShareModule2, "Test ModuleShare2");
+	startParams.iParams.iName = KShareModule1;
+	
+	asynchHandler->TryLoad(startParams, iniData);
+    CActiveScheduler::Start();
+   	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		User::Leave(asynchHandler->iStatus.Int());
+		}
+	
+	//*****************step 3************************
+	INFO_PRINTF1(_L("03 Load Test Module"));
+	startParams.iParams.iName = KShareModule2;
+	startParams.iParams.iHeapType = EShareHeap;
+	startParams.iParams.iShareHeapWith = KShareModule1;
+	
+	asynchHandler->TryLoad(startParams, iniData);
+	CActiveScheduler::Start();
+	
+	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		SetTestStepResult(EFail);	
+		}
+	
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+
+// Test step 3.13 - Load 2 modules with private heaps
+CRootServerTest3_13::CRootServerTest3_13(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.13"));
+	}
+
+TVerdict CRootServerTest3_13::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Load 2 modules with private heaps"));
+	
+	SetTestStepResult(EPass);	
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+	startParams.iParams.iHeapType = ENewHeap;
+	
+	asynchHandler->TryLoad(startParams, iniData);
+    CActiveScheduler::Start();
+   	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		User::Leave(asynchHandler->iStatus.Int());
+		}
+	
+	//*****************step 3************************
+	INFO_PRINTF1(_L("03 Load Test Module"));
+	startParams.iParams.iName = KModule2;
+	startParams.iParams.iHeapType = ENewHeap;
+	
+	asynchHandler->TryLoad(startParams, iniData);
+	CActiveScheduler::Start();
+	
+	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		SetTestStepResult(EFail);
+		}
+	
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+
+// Test step 3.14 - Load sluggish module
+CRootServerTest3_14::CRootServerTest3_14(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.14"));
+	}
+
+TVerdict CRootServerTest3_14::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Load sluggish module"));
+	SetTestStepResult(EPass);	
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+	iniData.iParams.iDiscoveryDelay = 500;
+	iniData.iParams.iBindDelay = 1000;
+	iniData.iParams.iUnbindDelay = 1000;
+	iniData.iParams.iShutdownDelay = 1000;
+	asynchHandler->TryLoad(startParams, iniData);
+	
+    CActiveScheduler::Start();
+   	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		SetTestStepResult(EFail);	
+		}
+	
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	
+	}
+
+// Test step 3.14 - Load dormant module
+CRootServerTest3_15::CRootServerTest3_15(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.15"));
+	}
+
+TVerdict CRootServerTest3_15::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Load Dormant module"));
+	//*****************step 1*************************//
+										SetTestStepResult(EFail);	
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	
+	//*****************step 3************************
+	INFO_PRINTF1(_L("03 Load Dormant Module"));
+	
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+	startParams.iParams.iHeapType = ENewHeap;	// when zombie is killed memory will leak
+	iniData.iParams.iDiscoveryDelay = 30000;
+	
+	asynchHandler->TryLoad(startParams, iniData);
+    CActiveScheduler::Start();
+   	if (asynchHandler->iStatus != KErrRSZombie)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		SetTestStepResult(EFail);	
+		}
+	else
+		{
+		//*****************step 4***********************
+		INFO_PRINTF1(_L("04 Unload Dormant Module"));
+		asynchHandler->TryUnLoad(startParams.iParams.iName, EUnGraceful);
+		CActiveScheduler::Start();
+		
+		if (asynchHandler->iStatus != KErrNone)
+			{
+			INFO_PRINTF2(_L("Unload returned error: <%d> "), asynchHandler->iStatus.Int());
+			SetTestStepResult(EInconclusive);
+			}
+		else
+			SetTestStepResult(EPass);	
+		}
+	
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	
+	}
+
+// Test step 3.16 - Load test module and wait for death
+CRootServerTest3_16::CRootServerTest3_16(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.16"));
+	}
+
+TVerdict CRootServerTest3_16::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Load test module, wait for death and check heap"));
+	//*****************step 1*************************//
+										SetTestStepResult(EFail);	
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	
+	//*****************step 3************************
+	INFO_PRINTF1(_L("03 Load Test Module"));
+	
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+#ifdef SYMBIAN_C32ROOT_API_V3
+	startParams.iParams.iControlFlags = TRSStartModuleParamContainer::KCF_UnstableModule;
+#endif
+	iniData.iParams.iDeathDelay = 5000;
+    
+	asynchHandler->TryLoad(startParams, iniData);
+    CActiveScheduler::Start();
+   	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		SetTestStepResult(EInconclusive);
+		}
+	else
+		{
+		//*****************step 4***********************
+		INFO_PRINTF1(_L("04 Waiting for module to die"));
+		
+		User::After(6000000);
+		
+		TRSModuleInfo info;
+		TInt ret = iRootServerSuite->RootSess().GetModuleInfo(KModule1(), info);
+		INFO_PRINTF3(_L("GetModuleInfo for %S returned %d"), &KModule1(), ret);
+		
+		if(KErrRSModuleUnknown == ret)
+			{
+			SetTestStepResult(EPass);
+			}
+		}
+	
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	
+	}
+
+// Test step 3.17 - Load unknown module and cancel
+CRootServerTest3_17::CRootServerTest3_17(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.17"));
+	}
+
+TVerdict CRootServerTest3_17::doTestStepL( void )
+	{
+	SetTestStepResult(EPass);	
+	INFO_PRINTF1(_L("Test Purpose: Load unknown module and cancel"));
+	
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iFilename = _L("unknown_module.cpm");
+	startParams.iParams.iName = KModule1;
+	
+	INFO_PRINTF2(_L("02 Loading module: %S"), &startParams.iParams.iName);
+	asynchHandler->TryLoad(startParams, iniData);
+
+	User::After(1000000);
+	INFO_PRINTF2(_L("03 Cancelling Loading module: %S"), &startParams.iParams.iName);
+	iRootServerSuite->RootSess().CancelLoadCpm(startParams.iParams.iName);
+
+	CActiveScheduler::Start();
+	
+    INFO_PRINTF2(_L("LoadServer status was: <%d> "), asynchHandler->iStatus.Int());
+	
+    if (KErrNotFound != asynchHandler->iStatus.Int())
+		{
+		SetTestStepResult(EFail);		}
+	
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+
+
+// Test step 3.18 - UnLoad unknown module and cancel
+CRootServerTest3_18::CRootServerTest3_18(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test3.18"));
+	}
+
+TVerdict CRootServerTest3_18::doTestStepL( void )
+	{
+	SetTestStepResult(EPass);	
+	INFO_PRINTF1(_L("Test Purpose: UnLoad unknown module and cancel"));
+	
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	_LIT8(KUnknownModule, "unknown_module.cpm");
+	INFO_PRINTF2(_L("02 UnLoading module: %S"), &KUnknownModule());
+	asynchHandler->TryUnLoad(KUnknownModule(), EUnGraceful);
+
+	User::After(1000000);
+	INFO_PRINTF2(_L("03 Cancelling Unloading module: %S"), &KUnknownModule());
+	iRootServerSuite->RootSess().CancelUnloadCpm(KUnknownModule());
+
+	CActiveScheduler::Start();
+	
+    INFO_PRINTF2(_L("UnLoadServer status was: <%d> "), asynchHandler->iStatus.Int());
+	
+    if (KErrRSModuleNotLoaded != asynchHandler->iStatus.Int())
+		{
+		SetTestStepResult(EFail);
+		}
+	
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/src/RootServerTestSection4.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,116 @@
+// Copyright (c) 2003-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:
+// This contains ESock Test cases from section 4
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+#include <es_mbman.h>
+
+// Test system includes
+#include <comms-infras/commsdebugutility.h>
+//#include <networking/teststep.h>
+//#include <networking/testsuite.h>
+
+#include "TestStepRootServer.h"
+#include "TestAsynchHandler.h"
+
+#include "RootServerTest.h"
+#include "RootServerTestSection4.h"
+
+// Test step 4.1 - SuddenDeathListener
+CRootServerTest4_1::CRootServerTest4_1(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test4.1"));
+	}
+
+
+TVerdict CRootServerTest4_1::doTestStepL( void )
+	{
+										SetTestStepResult(EPass);
+	INFO_PRINTF1(_L("Test Purpose: SuddenDeathListener"));
+
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+#if defined(SYMBIAN_C32ROOT_API_V3)
+	startParams.iParams.iControlFlags = TRSStartModuleParamContainer::KCF_UnstableModule;
+#endif
+	iniData.iParams.iDeathDelay = isTestServerLifeTime;
+
+	INFO_PRINTF2(_L("02 Loading module: %S"), &startParams.iParams.iName);
+	asynchHandler->TryLoad(startParams, iniData);
+
+	CActiveScheduler::Start();
+    if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		User::Leave(asynchHandler->iStatus.Int());
+		}
+
+	// create a new active object for the sudden death handler
+	CTestAsynchHandler* suddenDeathHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	// wait for either sudden death indication or timeout
+	INFO_PRINTF2(_L("03 Waiting for sudden death for up to %1.3f seconds"), isTestServerWaitTime / 1000.0);
+	asynchHandler->WaitForTimer(isTestServerWaitTime);
+	suddenDeathHandler->TryWaitForDeath();
+	CActiveScheduler::Start();
+
+	// uninstall active scheduler
+	asynchHandler->Cancel();
+	suddenDeathHandler->Cancel();
+
+	// see which events have occurred 
+	// if root server worked then timer should not have expired
+	// and sudden death handler AO should have returned to idle
+	if (CTestAsynchHandler::EWaitingforTimer != asynchHandler->GetiState())
+		{
+		INFO_PRINTF1(_L("Timer expired"));
+		SetTestStepResult(EFail);	
+		}
+	
+	if (CTestAsynchHandler::EIdle != suddenDeathHandler->GetiState())
+		{
+		INFO_PRINTF1(_L("SuddenDeathHandler was not triggered"));
+		SetTestStepResult(EFail);	
+		}
+
+	// enumerate servers
+	INFO_PRINTF1(_L("04 Enumerating modules"));
+
+	TCFModuleName moduleName;
+	TRSIter position;
+	TInt ret = iRootServerSuite->RootSess().EnumerateModules(position, moduleName);
+	INFO_PRINTF2(_L("Enumerate returned %d"), ret);
+	if (KErrEof != ret)
+		{
+		INFO_PRINTF1(_L("Module left alive"));
+		SetTestStepResult(EFail);	
+		}
+	// destroy active objects and scheduler
+	CleanupStack::PopAndDestroy(suddenDeathHandler);
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/src/RootServerTestSection5.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,483 @@
+// Copyright (c) 2003-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:
+// This contains RootServer Test cases from section 6
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+#include <es_mbman.h>
+
+// Test system includes
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#include <networking/testsuite.h>
+
+#include "TestStepRootServer.h"
+#include "TestAsynchHandler.h"
+#include "RootServerTestSection5.h"
+#include "RootServerTest.h"
+// Test step 3.5 - Retrieve Module Information
+CRootServerTest_GracefulUnload::CRootServerTest_GracefulUnload(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	}
+
+
+TVerdict CRootServerTest_GracefulUnload::UnloadGracefullyL(TThreadPriority aPriority)
+	{
+										SetTestStepResult(EFail);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+    //*****************step 2************************
+	INFO_PRINTF1(_L("02 Load test module"));
+
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+	startParams.iParams.iPriority = aPriority;
+
+	asynchHandler->TryLoad(startParams, iniData);
+    CActiveScheduler::Start();
+   	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+								SetTestStepResult(EInconclusive);
+		}
+	else
+		{
+		//*****************step 4***********************
+		INFO_PRINTF1(_L("04 Unload Test Module"));
+
+		asynchHandler->TryUnLoad(startParams.iParams.iName, EGraceful);
+		
+		CActiveScheduler::Start();
+
+   		if (asynchHandler->iStatus != KErrNone)
+			{
+			INFO_PRINTF2(_L("Unload returned error: <%d> "), asynchHandler->iStatus.Int());
+												SetTestStepResult(EInconclusive);
+			}
+		else
+			{
+			SetTestStepResult(EPass);			}
+		}
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+
+
+// Test step 5.1 - UnLoad Gracefully (normal priority)
+CRootServerTest5_1::CRootServerTest5_1(CTE_RootServerServer *aSuite) : CRootServerTest_GracefulUnload(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test5.1"));
+}
+
+TVerdict CRootServerTest5_1::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: UnLoad Comms Provider Module gracefully (normal priority)"));
+	return UnloadGracefullyL(EPriorityNormal);
+	}
+
+
+// Test step 5.2 - UnLoad Gracefully (elevated priority)
+CRootServerTest5_2::CRootServerTest5_2(CTE_RootServerServer *aSuite) : CRootServerTest_GracefulUnload(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test5.2"));
+}
+
+TVerdict CRootServerTest5_2::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: UnLoad Comms Provider Module gracefully (elevated priority)"));
+	return UnloadGracefullyL(EPriorityRealTime);
+	}
+
+
+// Test step 5.3 -  Cancel UnLoad Gracefully
+CRootServerTest5_3::CRootServerTest5_3(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test5.3"));
+}
+
+TVerdict CRootServerTest5_3::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Cancel UnLoad Comms Provider Module gracefully"));
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	//*****************step 2************************
+	INFO_PRINTF1(_L("02 Load Test Module"));
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+
+	asynchHandler->TryLoad(startParams, iniData);
+    CActiveScheduler::Start();
+   	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+								SetTestStepResult(EInconclusive);
+		}
+	else
+		{
+		//*****************step 3***********************
+		INFO_PRINTF1(_L("03 Unload Test Module"));
+		asynchHandler->TryUnLoad(startParams.iParams.iName, EGraceful);
+		
+		//*****************step 4***********************
+		INFO_PRINTF2(_L("04 Cancelling UnLoad: %S"), &startParams.iParams.iName);
+		iRootServerSuite->RootSess().CancelUnloadCpm(startParams.iParams.iName);
+		
+		CActiveScheduler::Start();
+
+   		if ((asynchHandler->iStatus != KErrNone) && (asynchHandler->iStatus != KErrCancel))
+			{
+			INFO_PRINTF2(_L("Unload returned error: <%d> "), asynchHandler->iStatus.Int());
+			SetTestStepResult(EFail);			}
+
+		}
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+
+// Test step 3.5 - Retrieve Module Information
+CRootServerTest_UngracefulUnload::CRootServerTest_UngracefulUnload(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	}
+
+
+TVerdict CRootServerTest_UngracefulUnload::UnloadNonGracefullyL(TThreadPriority aPriority)
+	{
+										SetTestStepResult(EFail);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	//*****************step 3************************
+	INFO_PRINTF1(_L("03 Load Test Module"));
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+	startParams.iParams.iPriority = aPriority;
+
+	asynchHandler->TryLoad(startParams, iniData);
+    CActiveScheduler::Start();
+   	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		SetTestStepResult(EInconclusive);
+		}
+	else
+		{
+		//*****************step 4***********************
+		INFO_PRINTF1(_L("04 Unload Test Module"));
+		asynchHandler->TryUnLoad(startParams.iParams.iName, EUnGraceful);
+		
+		CActiveScheduler::Start();
+
+   		if (asynchHandler->iStatus != KErrNone)
+			{
+			INFO_PRINTF2(_L("Unload returned error: <%d> "), asynchHandler->iStatus.Int());
+			SetTestStepResult(EInconclusive);
+			}
+		else
+			{
+			SetTestStepResult(EPass);	
+			}
+		}
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+	
+
+// Test step 5.4 - UnLoad Ungracefully - normal priority
+CRootServerTest5_4::CRootServerTest5_4(CTE_RootServerServer *aSuite) : CRootServerTest_UngracefulUnload(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test5.4"));
+	}
+
+TVerdict CRootServerTest5_4::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: UnLoad Comms Provider Module Ungracefully (normal priority)"));
+	return UnloadNonGracefullyL(EPriorityNormal);
+	}
+
+// Test step 5.5 - UnLoad Ungracefully - elevated priority
+CRootServerTest5_5::CRootServerTest5_5(CTE_RootServerServer *aSuite) : CRootServerTest_UngracefulUnload(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test5.5"));
+}
+
+TVerdict CRootServerTest5_5::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: UnLoad Comms Provider Module Ungracefully (elevated priority)"));
+	return UnloadNonGracefullyL(EPriorityRealTime);
+	}
+
+
+// Test step 5.6 - Cancel UnLoad Ungracefully
+CRootServerTest5_6::CRootServerTest5_6(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test5.6"));
+}
+
+TVerdict CRootServerTest5_6::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Cancel UnLoad Comms Provider Module Ungracefully"));
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	//*****************step 2************************
+	INFO_PRINTF1(_L("02 Load Test Module"));
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+
+	asynchHandler->TryLoad(startParams, iniData);
+    CActiveScheduler::Start();
+   	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("Load returned error: <%d> "), asynchHandler->iStatus.Int());
+								SetTestStepResult(EInconclusive);
+		}
+	else
+		{
+		//*****************step 3***********************
+		INFO_PRINTF1(_L("03 Unload Test Module"));
+		asynchHandler->TryUnLoad(startParams.iParams.iName, EUnGraceful);
+		
+		//*****************step 4***********************
+		INFO_PRINTF2(_L("04 Cancelling UnLoad: %S"), &startParams.iParams.iName);
+		iRootServerSuite->RootSess().CancelUnloadCpm(startParams.iParams.iName);
+		
+		CActiveScheduler::Start();
+		
+	    // Unload the CPM anyway in case we were too late to cancel the load.
+	    TRequestStatus status;
+	    iRootServerSuite->RootSess().UnloadCpm(status, startParams.iParams.iName, EImmediate);
+	    User::WaitForRequest(status);
+
+   		if (asynchHandler->iStatus != KErrNone)
+			{
+			INFO_PRINTF2(_L("Unload returned error: <%d> "), asynchHandler->iStatus.Int());
+			SetTestStepResult(EFail);	
+			}
+		}
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+	
+	
+// Test step 5.7 - UnLoad 2 modules sharing the same heap
+CRootServerTest5_7::CRootServerTest5_7(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test5.7"));
+}
+
+TVerdict CRootServerTest5_7::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: UnLoad 2 modules sharing the same heap"));
+										SetTestStepResult(EFail);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+    
+	//*****************step 3************************
+	INFO_PRINTF1(_L("03 Load Test Module_Share1"));
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	_LIT8(KShareModule1, "Test ModuleShare1");
+	_LIT8(KShareModule2, "Test ModuleShare2");
+	startParams.iParams.iName = KShareModule1;
+
+	asynchHandler->TryLoad(startParams, iniData);
+    CActiveScheduler::Start();
+   	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		User::Leave(asynchHandler->iStatus.Int());
+		}
+
+	//*****************step 3************************
+	INFO_PRINTF1(_L("03 Load Test Module"));
+	startParams.iParams.iName = KShareModule2;
+	startParams.iParams.iHeapType = EShareHeap;
+	startParams.iParams.iShareHeapWith = KShareModule1;
+
+	asynchHandler->TryLoad(startParams, iniData);
+	CActiveScheduler::Start();
+
+	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		User::Leave(asynchHandler->iStatus.Int());
+		}
+
+    //*****************step 5***********************
+	INFO_PRINTF1(_L("05 Unload Test Module_Share1"));
+	startParams.iParams.iName = KShareModule1;
+	asynchHandler->TryUnLoad(startParams.iParams.iName, EGraceful);
+	CActiveScheduler::Start();
+
+	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("Unload returned error: <%d> "), asynchHandler->iStatus.Int());
+		User::Leave(asynchHandler->iStatus.Int());
+		}
+
+	//*****************step 6***********************
+	INFO_PRINTF1(_L("06 Unload Test Module_Share2"));
+	startParams.iParams.iName = KShareModule2;
+	asynchHandler->TryUnLoad(startParams.iParams.iName, EGraceful);
+	
+	CActiveScheduler::Start();
+
+	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("Unload returned error: <%d> "), asynchHandler->iStatus.Int());
+		SetTestStepResult(EInconclusive);
+		}
+	else
+		{
+		SetTestStepResult(EPass);	
+		}
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+    
+    
+// Test step 5.8 - Unload Sluggish CPM Gracefully with intervening Close of Session
+CRootServerTest5_8::CRootServerTest5_8(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	// store the name of this test case
+	SetTestStepName(_L("Test5.8"));
+	}
+
+TVerdict CRootServerTest5_8::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Unload Sluggish CPM Gracefully with intervening Close of Session"));
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+    
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+	iniData.iParams.iShutdownDelay = isTestServerLifeTime;
+	INFO_PRINTF2(_L("01 Loading sluggish module: %S"), &startParams.iParams.iName);
+	asynchHandler->TryLoad(startParams, iniData);
+
+	CActiveScheduler::Start();
+    if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		User::Leave(asynchHandler->iStatus.Int());
+		}
+
+	INFO_PRINTF1(_L("02 Unload sluggish Module"));
+	asynchHandler->TryUnLoad(startParams.iParams.iName, EGraceful);
+
+	// Brief wait to give unload chance to start
+	User::After(250 * 1000);
+
+	// Close the session
+	INFO_PRINTF1(_L("03 Closing RRootServ"));
+	iRootServerSuite->RootSess().Close();
+	// Brief wait for any fireworks
+	User::After(250 * 1000);
+	
+	// Let the request complete
+	CActiveScheduler::Start();
+
+	// Reconnect the session
+	INFO_PRINTF1(_L("04 Reconnecting RRootServ"));
+	TInt ret = iRootServerSuite->RootSess().Connect();
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF2(_L("Reconnect of RRootServ failed with error: <%d> "), ret);
+		User::Leave(ret);
+		}
+	// Brief wait for any fireworks
+	User::After(250 * 1000);
+
+	// now try to retrieve information about the module; should be ERunning after session close
+	// causes unload handler to be canceled
+	INFO_PRINTF1(_L("05 Getting module information"));
+	TRSModuleInfo info;
+	TCFModuleName moduleName = startParams.iParams.iName;
+	ret = iRootServerSuite->RootSess().GetModuleInfo(moduleName, info);
+	INFO_PRINTF4(_L("GetModuleInfo for %S returned %d, state %c= ERunning"), &moduleName, ret, info.iParams.iState == EStopping? '=': '!');
+	
+	if(KErrNone != ret || info.iParams.iState != ERunning)
+		{
+		CleanupStack::PopAndDestroy(asynchHandler);
+		CleanupStack::PopAndDestroy(scheduler);
+        SetTestStepResult(EFail);	
+        return TestStepResult();
+		}
+
+	// Wait for it to finish stopping, query again
+	INFO_PRINTF1(_L("06 Getting module information after waiting for stop"));
+	User::After((iniData.iParams.iShutdownDelay + 500) * 1000);
+	moduleName = startParams.iParams.iName;
+	ret = iRootServerSuite->RootSess().GetModuleInfo(moduleName, info);
+	INFO_PRINTF3(_L("GetModuleInfo for %S returned %d"), &moduleName, ret);
+	
+	if(KErrRSModuleUnknown != ret)
+		{
+		CleanupStack::PopAndDestroy(asynchHandler);
+		CleanupStack::PopAndDestroy(scheduler);
+        SetTestStepResult(EFail);	
+        return TestStepResult();
+		}
+
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/src/RootServerTestSection6.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,792 @@
+// Copyright (c) 2003-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:
+// This contains RootServer Test cases from section 6
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+#include <es_mbman.h>
+
+// Test system includes
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#include <networking/testsuite.h>
+
+#include "TestStepRootServer.h"
+#include "TestAsynchHandler.h"
+#include "RootServerTestSection6.h"
+#include <cfshared.h>
+#include "RootServerTest.h"
+
+
+// Test step 6.1 - Bind without loading
+CRootServerTest6_1::CRootServerTest6_1(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test6.1"));
+}
+
+TVerdict CRootServerTest6_1::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Bind without loading"));
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	//*****************step 2************************
+	INFO_PRINTF1(_L("02 Attempting bind"));
+	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
+	if (ret != KErrRSModuleNotLoaded)
+		{
+		INFO_PRINTF2(_L("LoadProvider returned error: <%d> "), asynchHandler->iStatus.Int());
+		SetTestStepResult(EFail);		}
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+
+	}
+	
+	// Test step 6.2 - Bind loaded to unloaded
+CRootServerTest6_2::CRootServerTest6_2(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test6.2"));
+}
+
+TVerdict CRootServerTest6_2::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Bind loaded to unloaded"));
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	//*****************step 02*************************//
+	INFO_PRINTF1(_L("02 Load Test Module"));
+	LoadNormalModuleL(asynchHandler, KModule1);
+
+	//*****************step 3************************
+	INFO_PRINTF1(_L("03 Attempting bind"));
+	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule2, KSubModule1);
+	if (ret != KErrRSModuleNotLoaded)
+		{
+		INFO_PRINTF2(_L("Bind returned error: <%d> "), ret);
+		SetTestStepResult(EFail);		}
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+
+	}
+
+CRootServerTest6_BindWithinModule::CRootServerTest6_BindWithinModule(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	}
+
+TVerdict CRootServerTest6_BindWithinModule::BindWithinModuleL(TThreadPriority aPriority)
+	{
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	//*****************step 01*************************//
+	INFO_PRINTF1(_L("01 Load Test Module"));
+	LoadNormalModuleL(asynchHandler, KModule1, aPriority);
+
+	//*****************step 2***********************
+	INFO_PRINTF1(_L("02 Attempting Bind"));
+	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF2(_L("Bind returned error: <%d> "), ret);
+		SetTestStepResult(EFail);		}
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+
+// Test step 6.3 - Bind within a module (normal priority)
+CRootServerTest6_3::CRootServerTest6_3(CTE_RootServerServer *aSuite) : CRootServerTest6_BindWithinModule(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test6.3"));
+}
+
+TVerdict CRootServerTest6_3::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Bind within module (normal priority)"));
+	return BindWithinModuleL(EPriorityNormal);
+	}
+	
+// Test step 6.4 - Bind within a module (elevated priority)
+CRootServerTest6_4::CRootServerTest6_4(CTE_RootServerServer *aSuite) : CRootServerTest6_BindWithinModule(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test6.4"));
+}
+
+TVerdict CRootServerTest6_4::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Bind within module (elevated priority)"));
+	return BindWithinModuleL(EPriorityRealTime);
+	}
+
+// Test step 6.5 - Bind submodule to itself
+CRootServerTest6_5::CRootServerTest6_5(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test6.5"));
+}
+
+TVerdict CRootServerTest6_5::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Bind submodule to itself"));
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	//*****************step 01*************************//
+	INFO_PRINTF1(_L("01 Load Test Module"));
+	LoadNormalModuleL(asynchHandler, KModule1);
+
+	//*****************step 2***********************
+	INFO_PRINTF1(_L("02 Attempting Bind"));
+	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule1);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF2(_L("Bind returned error: <%d> "), ret);
+		SetTestStepResult(EFail);		}
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+
+// Test step 6.6 - Bind already bound
+CRootServerTest6_6::CRootServerTest6_6(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test6.6"));
+}
+
+TVerdict CRootServerTest6_6::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Bind again"));
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	//*****************step 01*************************//
+	INFO_PRINTF1(_L("01 Load Test Module"));
+	LoadNormalModuleL(asynchHandler, KModule1);
+
+	//*****************step 2************************
+	INFO_PRINTF1(_L("02 Bind internally"));
+	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF2(_L("Bind returned error: <%d> "), ret);
+		User::Leave(ret);
+		}
+
+	//*****************step 3************************
+	INFO_PRINTF1(_L("03 Bind Again"));
+	ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
+	if (ret != KErrRSAlreadyBound)
+		{
+		INFO_PRINTF2(_L("Bind returned error: <%d> "), ret);
+		User::Leave(KErrGeneral);
+		}
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+
+	}
+	
+// Test step 6.7 - Enumerate BindInfo
+CRootServerTest6_7::CRootServerTest6_7(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test6.7"));
+}
+
+TVerdict CRootServerTest6_7::doTestStepL( void )
+	{
+	TCFSubModuleAddress fullName1;
+	fullName1.SetModule(KModule1());
+	fullName1.SetSubModule(KSubModule1());
+	TCFSubModuleAddress fullName2;
+	fullName2.SetModule(KModule1());
+	fullName2.SetSubModule(KSubModule2());	
+	
+	INFO_PRINTF1(_L("Test Purpose: Enumerate BindInfo"));
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+	//*****************step 01*************************//
+	INFO_PRINTF1(_L("01 Load Test Module"));
+	LoadNormalModuleL(asynchHandler, KModule1);
+
+	//*****************step 2************************
+	INFO_PRINTF1(_L("02 Bind internally"));
+	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF2(_L("Bind returned error: <%d> "), ret);
+		User::Leave(ret);
+		}
+
+	TRSBindingInfo bindInfo;
+	TRSIter position;
+	
+	//*****************step 2************************
+	INFO_PRINTF1(_L("02 Enumerate bindings"));
+	ret = iRootServerSuite->RootSess().EnumerateBindings(fullName1, position, bindInfo);
+
+	INFO_PRINTF2(_L("Enumerate returned %d"), ret);
+
+	if (KErrNone != ret)
+		{
+		SetTestStepResult(EFail);		}
+	else
+		{		
+		if ( (bindInfo.iParams.iAddress1 == fullName1) && (bindInfo.iParams.iAddress2 == fullName2) )
+			{
+			INFO_PRINTF1(_L("Binding Found") );
+			}
+		else if ( (bindInfo.iParams.iAddress1 == fullName2) && (bindInfo.iParams.iAddress2 == fullName1) )
+			{
+			INFO_PRINTF1(_L("Binding Found") );
+			}
+		else
+			{
+			INFO_PRINTF1(_L("Binding not found"));
+			SetTestStepResult(EFail);			}
+		ret = iRootServerSuite->RootSess().EnumerateBindings(fullName1, position, bindInfo);
+		INFO_PRINTF2(_L("Follow-up Enumerate returned %d"), ret);
+		if(KErrEof != ret)
+			{
+			INFO_PRINTF1(_L("(should have returned KErrEof"));
+			SetTestStepResult(EFail);			}
+		ret = iRootServerSuite->RootSess().EnumerateBindings(fullName1, position, bindInfo);
+		INFO_PRINTF2(_L("Further Enumerate returned %d"), ret);
+		if(KErrEof != ret)
+			{
+			INFO_PRINTF1(_L("(should have returned KErrEof"));
+			SetTestStepResult(EFail);			}
+		}
+	
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+
+	return TestStepResult();
+	}
+
+CRootServerTest6_UnbindWithinModule::CRootServerTest6_UnbindWithinModule(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+	{
+	}
+
+TVerdict CRootServerTest6_UnbindWithinModule::UnbindWithinModuleL(TThreadPriority aPriority)
+	{
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	//*****************step 01*************************//
+	INFO_PRINTF1(_L("01 Load Test Module"));
+	LoadNormalModuleL(asynchHandler, KModule1, aPriority);
+
+	//*****************step 2************************
+	INFO_PRINTF1(_L("02 Bind internally"));
+	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF2(_L("Bind returned error: <%d> "), ret);
+		User::Leave(ret);
+		}
+	//*****************step 3************************
+	INFO_PRINTF1(_L("03 Unbind"));
+	TRSUnBindingInfo unbindInfo;
+	unbindInfo.iParams.iAddress1.SetModule(KModule1());
+	unbindInfo.iParams.iAddress1.SetSubModule(KSubModule1());
+	unbindInfo.iParams.iAddress2.SetModule(KModule1());
+	unbindInfo.iParams.iAddress2.SetSubModule(KSubModule2());
+
+    asynchHandler->TryUnBind( unbindInfo );
+	
+	CActiveScheduler::Start();
+	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("Unbind returned error: <%d> "), asynchHandler->iStatus.Int());
+		SetTestStepResult(EFail);		}
+	
+	INFO_PRINTF1(_L("04 Duplicate Unbind"));
+    asynchHandler->TryUnBind( unbindInfo );
+	
+	CActiveScheduler::Start();
+	if (asynchHandler->iStatus != KErrRSBindingUnknown)
+		{
+		INFO_PRINTF2(_L("Duplicate Unbind returned error: <%d> "), asynchHandler->iStatus.Int());
+		SetTestStepResult(EFail);		}
+	
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+
+// Test step 6.8 - Unbind within Module (normal priority)
+CRootServerTest6_8::CRootServerTest6_8(CTE_RootServerServer *aSuite) : CRootServerTest6_UnbindWithinModule(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test6.8"));
+}
+
+TVerdict CRootServerTest6_8::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: UnBind within Module (elevated priority)"));
+	return UnbindWithinModuleL(EPriorityNormal);
+	}
+	
+// Test step 6.9 - Unbind within Module (normal priority)
+CRootServerTest6_9::CRootServerTest6_9(CTE_RootServerServer *aSuite) : CRootServerTest6_UnbindWithinModule(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test6.9"));
+}
+
+TVerdict CRootServerTest6_9::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: UnBind within Module (elevated priority)"));
+	return UnbindWithinModuleL(EPriorityRealTime);
+	}
+	
+
+	
+// Test step 6.10 - Cancel Bind
+CRootServerTest6_10::CRootServerTest6_10(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test6.10"));
+}
+
+TVerdict CRootServerTest6_10::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Cancel bind"));
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	//*****************step 01*************************//
+	INFO_PRINTF1(_L("01 Load Test Module"));
+	LoadNormalModuleL(asynchHandler, KModule1);
+
+	//*****************step 2************************
+	INFO_PRINTF1(_L("02 Attempting bind"));
+	TRSBindingInfo bindInfo;
+	bindInfo.iParams.iType = EHierarchical;
+	bindInfo.iParams.iAddress1.SetModule(KModule1());
+	bindInfo.iParams.iAddress1.SetSubModule(KSubModule1());
+	bindInfo.iParams.iAddress2.SetModule(KModule1());
+	bindInfo.iParams.iAddress2.SetSubModule(KSubModule2());
+	bindInfo.iParams.iState1 = KErrNone;
+	bindInfo.iParams.iState2 = KErrNone;
+	bindInfo.iParams.iForwardQLength = TRSBindingInfo::EMinQueueLength;	
+	bindInfo.iParams.iReverseQLength = TRSBindingInfo::EMinQueueLength;	
+	
+	TRSSubModuleAddress name1(bindInfo.iParams.iAddress1);
+	TRSSubModuleAddress name2(bindInfo.iParams.iAddress2);
+		
+	asynchHandler->TryBind( bindInfo );
+	
+	//*****************step 3************************
+	INFO_PRINTF1(_L("04 Wait for bind to be completed"));
+	User::After(1000000);
+	//*****************step 4************************
+	INFO_PRINTF1(_L("04 Cancelling Bind"));
+	iRootServerSuite->RootSess().CancelBind(name1, name2);
+	
+	CActiveScheduler::Start();
+
+	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("Bind returned error: <%d> "), asynchHandler->iStatus.Int());
+		SetTestStepResult(EFail);		}
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+
+	}
+	
+// Test step 6.11 - Cancel UnBind
+CRootServerTest6_11::CRootServerTest6_11(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test6.11"));
+}
+
+TVerdict CRootServerTest6_11::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Cancel Unbind"));
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	//*****************step 01*************************//
+	INFO_PRINTF1(_L("01 Load Test Module"));
+	LoadNormalModuleL(asynchHandler, KModule1);
+
+	//*****************step 2************************
+	INFO_PRINTF1(_L("02 Bind internally"));
+	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF2(_L("Bind returned error: <%d> "), ret);
+		User::Leave(ret);
+		}
+
+	//*****************step 3************************
+	INFO_PRINTF1(_L("03 Unbind"));
+	TRSUnBindingInfo unbindInfo;
+	unbindInfo.iParams.iAddress1.SetModule(KModule1());
+	unbindInfo.iParams.iAddress1.SetSubModule(KSubModule1());
+	unbindInfo.iParams.iAddress2.SetModule(KModule1());
+	unbindInfo.iParams.iAddress2.SetSubModule(KSubModule2());
+	
+	TRSSubModuleAddress name1(unbindInfo.iParams.iAddress1);
+	TRSSubModuleAddress name2(unbindInfo.iParams.iAddress2);
+
+    asynchHandler->TryUnBind( unbindInfo );
+    
+    //*****************step 4************************
+	INFO_PRINTF1(_L("04 Wait for unbind to be completed"));
+ 	User::After(1000000);
+	//*****************step 5************************
+   INFO_PRINTF1(_L("05 Cancelling UnBind"));
+	iRootServerSuite->RootSess().CancelUnbind(name1, name2);
+	
+	CActiveScheduler::Start();
+
+	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("Unbind returned error: <%d> "), asynchHandler->iStatus.Int());
+		SetTestStepResult(EFail);		}
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+
+	}
+	
+// Test step 6.12 - Bind sluggish cpm
+CRootServerTest6_12::CRootServerTest6_12(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test6.12"));
+}
+
+TVerdict CRootServerTest6_12::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Bind sluggish cpm"));
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+    
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+	iniData.iParams.iDiscoveryDelay = 500;
+	iniData.iParams.iBindDelay = 500;
+	iniData.iParams.iUnbindDelay = 500;
+	iniData.iParams.iShutdownDelay = 500;
+	asynchHandler->TryLoad(startParams, iniData);
+
+    CActiveScheduler::Start();
+   	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		User::Leave(asynchHandler->iStatus.Int());
+		}
+    //*****************step 02*************************//
+	INFO_PRINTF1(_L("02 Attempting bind"));
+	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF2(_L("Bind returned error: <%d> "), ret);
+		SetTestStepResult(EFail);		}
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+
+	}
+	
+// Test step 6.13 - Bind dormant cpm
+CRootServerTest6_13::CRootServerTest6_13(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test6.13"));
+}
+
+TVerdict CRootServerTest6_13::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Bind dormant cpm"));
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+    
+       //*****************step 02*************************//
+	INFO_PRINTF1(_L("02 Load Dormant Test CPM"));
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+	iniData.iParams.iDiscoveryDelay = 500;
+	iniData.iParams.iBindDelay = 30000;
+	iniData.iParams.iUnbindDelay = 30000;
+	iniData.iParams.iShutdownDelay = 1000;
+	asynchHandler->TryLoad(startParams, iniData);
+
+    CActiveScheduler::Start();
+   	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		User::Leave(asynchHandler->iStatus.Int());
+		}
+    //*****************step 02*************************//
+	INFO_PRINTF1(_L("02 Attempting bind"));
+	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
+	if (ret != KErrRSRequestTimedOut)
+		{
+		INFO_PRINTF2(_L("Bind returned error: <%d> "), ret);
+		SetTestStepResult(EFail);		}
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+
+	}
+	
+// Test step 6.14 - UnBind sluggish test cpm
+CRootServerTest6_14::CRootServerTest6_14(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test6.14"));
+}
+
+TVerdict CRootServerTest6_14::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Unbind sluggish test cpm"));
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+	iniData.iParams.iDiscoveryDelay = 500;
+	iniData.iParams.iBindDelay = 500;
+	iniData.iParams.iUnbindDelay = 500;
+	iniData.iParams.iShutdownDelay = 500;
+	asynchHandler->TryLoad(startParams, iniData);
+
+    CActiveScheduler::Start();
+   	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		User::Leave(asynchHandler->iStatus.Int());
+		}
+    //*****************step 02*************************//
+	INFO_PRINTF1(_L("02 Attempting bind"));
+	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF2(_L("Bind returned error: <%d> "), ret);
+		User::Leave(asynchHandler->iStatus.Int());
+		}
+
+	INFO_PRINTF1(_L("03 Unbind"));
+	TRSUnBindingInfo unbindInfo;
+	unbindInfo.iParams.iAddress1.SetModule(KModule1());
+	unbindInfo.iParams.iAddress1.SetSubModule(KSubModule1());
+	unbindInfo.iParams.iAddress2.SetModule(KModule1());
+	unbindInfo.iParams.iAddress2.SetSubModule(KSubModule2());
+
+    asynchHandler->TryUnBind( unbindInfo );
+	
+	CActiveScheduler::Start();
+	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("Unbind returned error: <%d> "), asynchHandler->iStatus.Int());
+		SetTestStepResult(EFail);		}
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+
+	}
+	
+	
+// Test step 6.15 - UnBind dormant test cpm
+CRootServerTest6_15::CRootServerTest6_15(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test6.15"));
+}
+
+TVerdict CRootServerTest6_15::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Unbind dormant test cpm"));
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KModule1;
+	iniData.iParams.iDiscoveryDelay = 500;
+	iniData.iParams.iBindDelay = 500;
+	iniData.iParams.iUnbindDelay = 30000;
+	iniData.iParams.iShutdownDelay = 500;
+	asynchHandler->TryLoad(startParams, iniData);
+
+    CActiveScheduler::Start();
+   	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		User::Leave(asynchHandler->iStatus.Int());
+		}
+    //*****************step 02*************************//
+	INFO_PRINTF1(_L("02 Attempting bind"));
+	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF2(_L("Bind returned error: <%d> "), ret);
+		User::Leave(asynchHandler->iStatus.Int());
+		}
+
+	INFO_PRINTF1(_L("03 Unbind"));
+	TRSUnBindingInfo unbindInfo;
+	unbindInfo.iParams.iAddress1.SetModule(KModule1());
+	unbindInfo.iParams.iAddress1.SetSubModule(KSubModule1());
+	unbindInfo.iParams.iAddress2.SetModule(KModule1());
+	unbindInfo.iParams.iAddress2.SetSubModule(KSubModule2());
+
+    asynchHandler->TryUnBind( unbindInfo );
+	CActiveScheduler::Start();
+
+	if (asynchHandler->iStatus != KErrRSRequestTimedOut)
+		{
+		INFO_PRINTF2(_L("Unbind returned error: <%d> "), asynchHandler->iStatus.Int());
+		SetTestStepResult(EFail);		}
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+
+
+// Test step 6.16 - Bind between a server and a module
+CRootServerTest6_16::CRootServerTest6_16(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test6.16"));
+}
+
+TVerdict CRootServerTest6_16::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Bind between a server and a module"));
+										SetTestStepResult(EPass);
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	_LIT8(KPlainModule, "PlainCPM");
+	_LIT8(KServerModule, "ServerCPM");
+
+	//*****************step 01*************************//
+	INFO_PRINTF1(_L("01 Load Plain Module"));
+	LoadNormalModuleL(asynchHandler, KPlainModule);
+
+	//*****************step 02*************************//
+	INFO_PRINTF1(_L("02 Load Server Module"));
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = KServerModule;
+	startParams.iParams.iIsServer = ETrue;
+	asynchHandler->TryLoad(startParams, iniData);
+
+    CActiveScheduler::Start();
+   	if (asynchHandler->iStatus != KErrNone)
+		{
+		INFO_PRINTF2(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
+		User::Leave(asynchHandler->iStatus.Int());
+		}
+
+    //*****************step 03*************************//
+	INFO_PRINTF1(_L("03 Attempting bind of plain above server"));
+	TInt ret = TryHierachicalBind(asynchHandler, KPlainModule, KSubModule1, KServerModule, KSubModule1);
+	if (ret != KErrRSInvalidBinding)
+		{
+		INFO_PRINTF2(_L("Bind returned error: <%d> "), ret);
+		User::Leave(ret);
+		}
+
+	//*****************step 04***********************
+	INFO_PRINTF1(_L("04 Attempting bind of server above plain"));
+	ret = TryHierachicalBind(asynchHandler, KServerModule, KSubModule1, KPlainModule, KSubModule1);
+	if (ret != KErrNone)
+		{
+		INFO_PRINTF2(_L("Bind returned error: <%d> "), ret);
+		User::Leave(ret);
+		}
+
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/src/RootServerTestSection7.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,313 @@
+// Copyright (c) 2003-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:
+// This contains RootServer Test cases from section 8
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+#include <es_mbman.h>
+
+// Test system includes
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#include <networking/testsuite.h>
+
+#include "TestStepRootServer.h"
+#include "TestAsynchHandler.h"
+#include "RootServerTestSection7.h"
+#include "RootServerTest.h"
+
+// Test step 7.1 - OOM loop Test1 - Load, Enumerate, GetInfo
+CRootServerTest7_1::CRootServerTest7_1(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test7.1"));
+}
+
+TVerdict CRootServerTest7_1::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: OOM loop test 1: Load, Enumerate, GetInfo"));
+										SetTestStepResult(EPass);
+
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+
+	TInt failure = 1000;
+							
+		while(TestStepResult() == EPass)
+		{
+		iRootServerSuite->RootSess().__DbgFailNext(failure);
+		failure++;
+
+		TRSStartModuleParams startParams;
+		TTestModuleIniData iniData;
+		DefaultStartParams(startParams, iniData);
+		startParams.iParams.iName = KModule1;
+		
+		asynchHandler->TryLoad(startParams, iniData);
+    	CActiveScheduler::Start();
+
+		if (asynchHandler->iStatus != KErrNone)
+			{
+			INFO_PRINTF3(_L("TryLoad: %d with FailNext(%d)"), asynchHandler->iStatus.Int(), failure);
+if(asynchHandler->iStatus == KErrRSModuleAlreadyExist)
+	User::Leave(KErrRSModuleAlreadyExist);
+			continue;
+			}
+
+		TCFModuleName moduleName;
+		TRSIter position;
+		TInt ret = iRootServerSuite->RootSess().EnumerateModules(position, moduleName);
+		if(ret != KErrNone)
+			{
+			INFO_PRINTF3(_L("EnumerateModules: %d with FailNext(%d)"), asynchHandler->iStatus.Int(), failure);
+			continue;
+			}
+
+		if(moduleName != KModule1)
+			{
+			INFO_PRINTF2(_L("EnumerateModules() returned KErrNone but wrong name: %S"), &moduleName);
+			SetTestStepResult(EFail);
+
+			break;
+			}
+
+		TRSModuleInfo info;
+		ret = iRootServerSuite->RootSess().GetModuleInfo(KModule1(), info);
+		if(ret != KErrNone)
+			{
+			INFO_PRINTF3(_L("GetModuleInfo: %d with FailNext(%d)"), asynchHandler->iStatus.Int(), failure);
+			continue;
+			}
+
+		if(info.iParams.iState != ERunning)
+			{
+			INFO_PRINTF2(_L("GetModuleInfo() returned KErrNone but wrong state: %d"), info.iParams.iState);
+			SetTestStepResult(EFail);
+
+			}
+		// everything worked;
+		INFO_PRINTF1(_L("OOM loop complete"));
+		break;
+		}
+
+
+	INFO_PRINTF1(_L("Resetting heap"));
+	iRootServerSuite->RootSess().__DbgFailNext(-1);
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+
+// Test step 7.2 - OOM loop Test2 - Unload, GetInfo
+CRootServerTest7_2::CRootServerTest7_2(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test7.2"));
+}
+
+TVerdict CRootServerTest7_2::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Heap loop Test2 - Unload, GetInfo"));
+										SetTestStepResult(EPass);
+
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	INFO_PRINTF2(_L("01 Loading cpm: %S"), &KModule1());
+	LoadNormalModuleL(asynchHandler, KModule1);
+
+	TInt failure = 1;
+						
+	while(TestStepResult() == EPass)
+		{
+		iRootServerSuite->RootSess().__DbgFailNext(failure);
+		failure++;
+
+		asynchHandler->TryUnLoad(KModule1(), EUnGraceful);
+    	CActiveScheduler::Start();
+
+		if (asynchHandler->iStatus != KErrNone)
+			{
+			INFO_PRINTF3(_L("TryUnload: %d with FailNext(%d)"), asynchHandler->iStatus.Int(), failure);
+			if(asynchHandler->iStatus != KErrRSModuleNotLoaded)
+				{
+				continue;
+				}
+			}
+
+		TRSModuleInfo info;
+		TInt ret = iRootServerSuite->RootSess().GetModuleInfo(KModule1(), info);
+		if(ret == KErrRSModuleUnknown)
+			{
+			// everything worked;
+			INFO_PRINTF1(_L("OOM loop complete"));
+			break;
+			}
+		else if(ret == KErrNone)
+			{
+			INFO_PRINTF1(_L("GetModuleInfo() returned KErrNone for unloaded module"));
+			SetTestStepResult(EFail);
+
+			}
+		else 
+			{
+			INFO_PRINTF3(_L("GetModuleInfo: %d with FailNext(%d)"), ret, failure);
+			continue;
+			}
+		}
+
+	INFO_PRINTF1(_L("Resetting heap"));
+	iRootServerSuite->RootSess().__DbgFailNext(-1);
+	// uninstall and destroy active scheduler
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+	
+
+// Test step 7.3 - OOM loop Test 3 - Bind
+CRootServerTest7_3::CRootServerTest7_3(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test7.3"));
+}
+
+TVerdict CRootServerTest7_3::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Heap loop Test3 - Bind, EnumerateBindings"));
+										SetTestStepResult(EPass);
+
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	INFO_PRINTF2(_L("01 Loading cpm: %S"), &KModule1());
+	LoadNormalModuleL(asynchHandler, KModule1);
+
+	TCFSubModuleAddress fullName1;
+	fullName1.SetModule(KModule1());
+	fullName1.SetSubModule(KSubModule1());
+	TInt failure = 1;
+						
+	while(TestStepResult() == EPass)
+		{
+		INFO_PRINTF2(_L("Failing after %d Allocs"), failure);
+		iRootServerSuite->RootSess().__DbgFailNext(failure);
+		failure++;
+
+		TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
+		if(ret != KErrNone)
+			continue;
+
+		INFO_PRINTF1(_L("02 Enumerate bindings"));
+		TRSBindingInfo bindInfo;
+		TRSIter position;
+		ret = iRootServerSuite->RootSess().EnumerateBindings(fullName1, position, bindInfo);
+		if(ret != KErrNone)
+			continue;
+
+		// everything worked;
+		INFO_PRINTF1(_L("OOM loop complete"));
+		break;
+		}		
+
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+
+// Test step 7.4 - OOM loop Test 4 - Unbind
+CRootServerTest7_4::CRootServerTest7_4(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test7.4"));
+}
+
+TVerdict CRootServerTest7_4::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Heap loop Test4 - Unbind, EnumerateBindings"));
+										SetTestStepResult(EPass);
+
+	// Create scheduler/active object framework 
+	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
+    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
+
+	INFO_PRINTF2(_L("01 Loading and binding cpm: %S"), &KModule1());
+	LoadNormalModuleL(asynchHandler, KModule1);
+	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
+	if(ret != KErrNone)
+		{
+		INFO_PRINTF2(_L("Binding CPM failed with %d"), ret);
+		User::Leave(ret);
+		}
+
+	TCFSubModuleAddress fullName1;
+	fullName1.SetModule(KModule1());
+	fullName1.SetSubModule(KSubModule1());
+	TInt failure = 1;
+							
+	while(TestStepResult() == EPass)
+		{
+		iRootServerSuite->RootSess().__DbgFailNext(failure);
+		failure++;
+
+		TRSUnBindingInfo unbindInfo;
+		unbindInfo.iParams.iAddress1.SetModule(KModule1());
+		unbindInfo.iParams.iAddress1.SetSubModule(KSubModule1());
+		unbindInfo.iParams.iAddress2.SetModule(KModule1());
+		unbindInfo.iParams.iAddress2.SetSubModule(KSubModule2());
+		asynchHandler->TryUnBind( unbindInfo );
+		
+		CActiveScheduler::Start();
+
+		if (asynchHandler->iStatus != KErrNone)
+			{
+			INFO_PRINTF3(_L("TryUnload: %d with FailNext(%d)"), asynchHandler->iStatus.Int(), failure);
+			continue;
+			}
+
+		INFO_PRINTF1(_L("03 Enumerate bindings"));
+		TRSBindingInfo bindInfo;
+		TRSIter position;
+		ret = iRootServerSuite->RootSess().EnumerateBindings(fullName1, position, bindInfo);
+		if(ret == KErrEof)
+			{
+			INFO_PRINTF1(_L("OOM loop complete"));
+			break;
+			}
+		else if(ret == KErrNone)
+			{
+			INFO_PRINTF1(_L("EnumerateBindings returned KErrNone for unbound submodules"));
+			SetTestStepResult(EFail);
+
+			}
+		else 
+			{
+			INFO_PRINTF3(_L("EnumerateBindings: %d with FailNext(%d)"), ret, failure);
+			continue;
+			}
+		}		
+
+	CleanupStack::PopAndDestroy(asynchHandler);
+	CleanupStack::PopAndDestroy(scheduler);
+	return TestStepResult();
+	}
+	
+	
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/src/RootServerTestSection8.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,120 @@
+// Copyright (c) 2006-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:
+// This contains RootServer Test cases from section 8
+// 
+//
+
+// EPOC includes
+#include <e32base.h>
+
+// Test system includes
+//#include <networking/log.h>
+//#include <networking/teststep.h>
+//#include <networking/testsuite.h>
+
+#include "TestStepRootServer.h"
+#include "RootServerTestSection8.h"
+#include "c32cmiutils.h"
+
+/** Calls utility function to convert aPriorityName to a TThreadPriority enumerator.
+If either the conversion fails or the resulting priority does not match aExpectedPriority
+then it sets aTestStepResult() to EFail.
+*/
+void CRootServerTest8_1::TestConvertPriorityValidL(const TDesC8& aPriorityName, TThreadPriority aExpectedPriority, TVerdict& aVerdict)
+	{
+	TThreadPriority priority;
+	TInt result = C32CmiUtils::ThreadPriorityNameToEnum(aPriorityName, priority);
+	if ((result != KErrNone) || (priority != aExpectedPriority))
+		{
+		INFO_PRINTF3(_L("TestConvertPriorityValid: %S failed to convert to %d"), &aPriorityName, aExpectedPriority);
+		aVerdict = EFail;
+		}
+	}
+
+/** Calls utility function to convert aPriorityName to a TThreadPriority enumerator.
+Assumes aPriorityName is an invalid priority name: if the conversion unexpectedly succeeds,
+then it sets aTestStepResult() to EFail.
+*/
+void CRootServerTest8_1::TestConvertPriorityInvalidL(const TDesC8& aPriorityName, TVerdict& aVerdict)
+	{
+	TThreadPriority priority;
+	TInt result = C32CmiUtils::ThreadPriorityNameToEnum(aPriorityName, priority);
+	if (result != KErrCorrupt)
+		{
+		INFO_PRINTF3(_L("TestConvertPriorityInvalid: %S converted to %d when it should have been invalid"), &aPriorityName, priority);
+		aVerdict = EFail;
+		}
+	}
+
+// Test step 8.1 - Unit testing conversion of thread priority names to enums
+CRootServerTest8_1::CRootServerTest8_1(CTE_RootServerServer *aSuite) : CTestStepRootServer(aSuite)
+{
+	// store the name of this test case
+	SetTestStepName(_L("Test8.1"));
+}
+
+TVerdict CRootServerTest8_1::doTestStepL( void )
+	{
+	INFO_PRINTF1(_L("Test Purpose: Unit testing conversion of thread priority names to enums"));
+	TVerdict verdict = EPass;
+
+	// test relative thread priorities
+	TestConvertPriorityValidL(_L8("EPriorityMuchLess"),	EPriorityMuchLess,	verdict);
+	TestConvertPriorityValidL(_L8("EPriorityLess"),		EPriorityLess,		verdict);
+	TestConvertPriorityValidL(_L8("EPriorityNormal"),	EPriorityNormal,	verdict);
+	TestConvertPriorityValidL(_L8("EPriorityMore"),		EPriorityMore,		verdict);
+	TestConvertPriorityValidL(_L8("EPriorityMuchMore"),	EPriorityMuchMore,	verdict);
+	TestConvertPriorityValidL(_L8("EPriorityRealTime"),	EPriorityRealTime,	verdict);
+	// test absolute thread priorities
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteVeryLow"),			EPriorityAbsoluteVeryLow,			verdict);
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteLowNormal"),		EPriorityAbsoluteLowNormal,			verdict);
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteLow"),				EPriorityAbsoluteLow,				verdict);
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteBackgroundNormal"),	EPriorityAbsoluteBackgroundNormal,	verdict);
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteBackground"),		EPriorityAbsoluteBackground,		verdict);
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteForegroundNormal"),	EPriorityAbsoluteForegroundNormal,	verdict);
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteForeground"),		EPriorityAbsoluteForeground,		verdict);
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteHighNormal"),		EPriorityAbsoluteHighNormal,		verdict);
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteRealTime1"),		EPriorityAbsoluteRealTime1,			verdict);
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteRealTime2"),		EPriorityAbsoluteRealTime2,			verdict);
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteHigh"),				EPriorityAbsoluteHigh,				verdict);
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteRealTime3"),		EPriorityAbsoluteRealTime3,			verdict);
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteRealTime4"),		EPriorityAbsoluteRealTime4,			verdict);
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteRealTime5"),		EPriorityAbsoluteRealTime5,			verdict);
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteRealTime6"),		EPriorityAbsoluteRealTime6,			verdict);
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteRealTime7"),		EPriorityAbsoluteRealTime7,			verdict);
+	TestConvertPriorityValidL(_L8("EPriorityAbsoluteRealTime8"),		EPriorityAbsoluteRealTime8,			verdict);
+	// test a handful of valid names that differ in case
+	TestConvertPriorityValidL(_L8("EPrIOritymORE"),					EPriorityMore,				verdict);
+	TestConvertPriorityValidL(_L8("EPRIORITYMUCHMORE"),				EPriorityMuchMore,			verdict);
+	TestConvertPriorityValidL(_L8("epriorityabsoluterealtime2"),	EPriorityAbsoluteRealTime2,	verdict);
+
+	// test a handful of valid numerical values
+	TestConvertPriorityValidL(_L8("10"),	EPriorityMore,				verdict);
+	TestConvertPriorityValidL(_L8("500"),	EPriorityAbsoluteHigh,		verdict);
+	TestConvertPriorityValidL(_L8("820"),	EPriorityAbsoluteRealTime2,	verdict);
+	// confirm any old number is returned as an integer, unchecked:
+	TestConvertPriorityValidL(_L8("666"),	(TThreadPriority)666,		verdict);
+
+	// test a handful of invalid enumerations
+	TestConvertPriorityInvalidL(_L8("EPriorityNormal0"),	verdict);
+	TestConvertPriorityInvalidL(_L8("0EPriorityNormal"),	verdict);
+	TestConvertPriorityInvalidL(_L8("EPriorityNormal "),	verdict);
+	TestConvertPriorityInvalidL(_L8(" EPriorityNormal"),	verdict);
+	TestConvertPriorityInvalidL(_L8("EPriorityStandard"),	verdict);
+	TestConvertPriorityInvalidL(_L8("Nonsense"), 			verdict);
+	TestConvertPriorityInvalidL(_L8(" 810 "),	 			verdict);
+
+	return verdict;
+
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/src/TE_RootServerServer.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,478 @@
+// Copyright (c) 2003-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:
+//
+// This main DLL entry point for the TE_ConServer.dll
+
+// EPOC includes
+#include <e32base.h>
+
+// RootServer includes
+#include <rsshared.h>
+
+// Test system includes
+#include <comms-infras/commsdebugutility.h>
+#include "TestStepRootServer.h"
+#include "TestAsynchHandler.h"
+#include "RootServerTestSection1.h"
+#include "RootServerTestSection2.h"
+#include "RootServerTestSection3.h"
+#include "RootServerTestSection4.h"
+#include "RootServerTestSection5.h"
+#include "RootServerTestSection6.h"
+#include "RootServerTestSection7.h"
+#include "RootServerTestSection8.h"
+
+_LIT(KRootServerExe, "c32exe.exe");
+_LIT(KRootServerProcessPattern, "c32exe*");
+
+EXPORT_C CTE_RootServerServer* NewRootServerServer( void ) 
+//
+// NewTestSuiteRootServerL is exported at ordinal 1
+// this provides the interface to allow schedule test
+// to create instances of this test suite
+//
+	{
+
+	return new(ELeave) CTE_RootServerServer();
+    }
+
+	
+	
+// __EDIT_ME__ - Substitute the name of your test server 
+_LIT(KServerName,"te_rootserver");
+// __EDIT_ME__ - Use your own server class name
+CTE_RootServerServer* CTE_RootServerServer::NewL()
+/**
+ * @return - Instance of the test server
+ * Called inside the MainL() function to create and start the
+ * CTestServer derived server.
+ */
+	{
+	// __EDIT_ME__ new your server class here
+	CTE_RootServerServer * server = new (ELeave) CTE_RootServerServer();
+	CleanupStack::PushL(server);
+	
+	// Either use a StartL or ConstructL, the latter will permit
+	// Server Logging.
+
+	//server->StartL(KServerName); 
+	server-> ConstructL(KServerName);
+	CleanupStack::Pop(server);
+	return server;
+	}
+
+// EKA2 much simpler
+// Just an E32Main and a MainL()
+LOCAL_C void MainL()
+/**
+ * Much simpler, uses the new Rendezvous() call to sync with the client
+ */
+	{
+	// Leave the hooks in for platform security
+#if (defined __DATA_CAGING__)
+	RProcess().DataCaging(RProcess::EDataCagingOn);
+	RProcess().SecureApi(RProcess::ESecureApiOn);
+#endif
+	CActiveScheduler* sched=NULL;
+	sched=new(ELeave) CActiveScheduler;
+	CActiveScheduler::Install(sched);
+	// __EDIT_ME__ Your server name
+	CTE_RootServerServer* server = NULL;
+	// Create the CTestServer derived server
+	// __EDIT_ME__ Your server name
+	TRAPD(err,server = CTE_RootServerServer::NewL());
+	if(!err)
+		{
+		// Sync with the client and enter the active scheduler
+		RProcess::Rendezvous(KErrNone);
+		sched->Start();
+		}
+	delete server;
+	delete sched;
+	}
+
+// Only a DLL on emulator for typhoon and earlier
+
+GLDEF_C TInt E32Main()
+/**
+ * @return - Standard Epoc error code on exit
+ */
+	{
+	CTrapCleanup* cleanup = CTrapCleanup::New();
+	if(cleanup == NULL)
+		{
+		return KErrNoMemory;
+		}
+	TRAP_IGNORE(MainL());
+	delete cleanup;
+	return KErrNone;
+    }
+
+// Create a thread in the calling process
+// Emulator typhoon and earlier
+
+// __EDIT_ME__ - Use your own server class name
+CTestStep* CTE_RootServerServer::CreateTestStep(const TDesC& aStepName)
+/**
+ * @return - A CTestStep derived instance
+ * Implementation of CTestServer pure virtual
+ */
+	{
+	
+	CTestStep* testStep = NULL;
+	// __EDIT_ME__ - Create your own test steps here
+	// This server creates just one step but create as many as you want
+	// They are created "just in time" when the worker thread is created
+	
+	
+	if(aStepName.Compare(_L("Test1.1")) == 0 )
+		testStep = new(ELeave) CRootServerTest1_1(this);
+	else if(aStepName.Compare(_L("Test1.2")) == 0 )
+	    testStep = new(ELeave) CRootServerTest1_2(this);
+	else if(aStepName.Compare(_L("Test2.1")) == 0 )
+	    testStep = new(ELeave) CRootServerTest2_1(this);
+	else if(aStepName.Compare(_L("Test2.2")) == 0 )
+	    testStep = new(ELeave) CRootServerTest2_2(this);
+	else if(aStepName.Compare(_L("Test2.3")) == 0 )
+	    testStep = new(ELeave) CRootServerTest2_3(this);
+	//else if(aStepName.Compare(_L("Test3.1")) == 0 )
+	//    testStep = new(ELeave) CRootServerTest3_1(this);
+	else if(aStepName.Compare(_L("Test3.2")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_2(this);
+	else if(aStepName.Compare(_L("Test3.3")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_3(this);
+	else if(aStepName.Compare(_L("Test3.4")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_4(this);
+	else if(aStepName.Compare(_L("Test3.5")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_5(this);
+	else if(aStepName.Compare(_L("Test3.6")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_6(this);
+	else if(aStepName.Compare(_L("Test3.7")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_7(this);
+	else if(aStepName.Compare(_L("Test3.8")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_8(this);
+	else if(aStepName.Compare(_L("Test3.9")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_9(this);
+	else if(aStepName.Compare(_L("Test3.10")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_10(this);
+	else if(aStepName.Compare(_L("Test3.11")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_11(this);
+	else if(aStepName.Compare(_L("Test3.12")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_12(this);
+	else if(aStepName.Compare(_L("Test3.13")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_13(this);
+	else if(aStepName.Compare(_L("Test3.14")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_14(this);
+	else if(aStepName.Compare(_L("Test3.15")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_15(this);
+	else if(aStepName.Compare(_L("Test3.16")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_16(this);
+	else if(aStepName.Compare(_L("Test3.17")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_17(this);
+	else if(aStepName.Compare(_L("Test3.18")) == 0 )
+	    testStep = new(ELeave) CRootServerTest3_18(this);
+	else if(aStepName.Compare(_L("Test4.1")) == 0 )
+	    testStep = new(ELeave) CRootServerTest4_1(this);
+	else if(aStepName.Compare(_L("Test5.1")) == 0 )
+	    testStep = new(ELeave) CRootServerTest5_1(this);
+	else if(aStepName.Compare(_L("Test5.2")) == 0 )
+	    testStep = new(ELeave) CRootServerTest5_2(this);
+	else if(aStepName.Compare(_L("Test5.3")) == 0 )
+	    testStep = new(ELeave) CRootServerTest5_3(this);
+	else if(aStepName.Compare(_L("Test5.4")) == 0 )
+	    testStep = new(ELeave) CRootServerTest5_4(this);
+	else if(aStepName.Compare(_L("Test5.5")) == 0 )
+	    testStep = new(ELeave) CRootServerTest5_5(this);
+	else if(aStepName.Compare(_L("Test5.6")) == 0 )
+	    testStep = new(ELeave) CRootServerTest5_6(this);
+	else if(aStepName.Compare(_L("Test5.7")) == 0 )
+	    testStep = new(ELeave) CRootServerTest5_7(this);
+	else if(aStepName.Compare(_L("Test5.8")) == 0 )
+	    testStep = new(ELeave) CRootServerTest5_8(this);
+	else if(aStepName.Compare(_L("Test6.1")) == 0 )
+	    testStep = new(ELeave) CRootServerTest6_1(this);
+	else if(aStepName.Compare(_L("Test6.2")) == 0 )
+	    testStep = new(ELeave) CRootServerTest6_2(this);
+	else if(aStepName.Compare(_L("Test6.3")) == 0 )
+	    testStep = new(ELeave) CRootServerTest6_3(this);
+	else if(aStepName.Compare(_L("Test6.4")) == 0 )
+	    testStep = new(ELeave) CRootServerTest6_4(this);
+	else if(aStepName.Compare(_L("Test6.5")) == 0 )
+	    testStep = new(ELeave) CRootServerTest6_5(this);
+	else if(aStepName.Compare(_L("Test6.6")) == 0 )
+	    testStep = new(ELeave) CRootServerTest6_6(this);
+	else if(aStepName.Compare(_L("Test6.7")) == 0 )
+	    testStep = new(ELeave) CRootServerTest6_7(this);
+	else if(aStepName.Compare(_L("Test6.8")) == 0 )
+	    testStep = new(ELeave) CRootServerTest6_8(this);
+	else if(aStepName.Compare(_L("Test6.9")) == 0 )
+	    testStep = new(ELeave) CRootServerTest6_9(this);
+	else if(aStepName.Compare(_L("Test6.10")) == 0 )
+	    testStep = new(ELeave) CRootServerTest6_10(this);
+	else if(aStepName.Compare(_L("Test6.11")) == 0 )
+	    testStep = new(ELeave) CRootServerTest6_11(this);
+	else if(aStepName.Compare(_L("Test6.12")) == 0 )
+	    testStep = new(ELeave) CRootServerTest6_12(this);
+	else if(aStepName.Compare(_L("Test6.13")) == 0 )
+	    testStep = new(ELeave) CRootServerTest6_13(this);
+	else if(aStepName.Compare(_L("Test6.14")) == 0 )
+	    testStep = new(ELeave) CRootServerTest6_14(this);
+	else if(aStepName.Compare(_L("Test6.15")) == 0 )
+	    testStep = new(ELeave) CRootServerTest6_15(this);
+	else if(aStepName.Compare(_L("Test6.16")) == 0 )
+	    testStep = new(ELeave) CRootServerTest6_16(this);
+	else if(aStepName.Compare(_L("Test7.1")) == 0 )
+	    testStep = new(ELeave) CRootServerTest7_1(this);
+	else if(aStepName.Compare(_L("Test7.2")) == 0 )
+	    testStep = new(ELeave) CRootServerTest7_2(this);
+	else if(aStepName.Compare(_L("Test7.3")) == 0 )
+	    testStep = new(ELeave) CRootServerTest7_3(this);
+	else if(aStepName.Compare(_L("Test7.4")) == 0 )
+	    testStep = new(ELeave) CRootServerTest7_4(this);
+	else if(aStepName.Compare(_L("Test8.1")) == 0 )
+	    testStep = new(ELeave) CRootServerTest8_1(this);
+
+		
+	return testStep;
+	}
+
+TInt CTE_RootServerServer::StartRootServer()
+/**
+ * Start the Root Server and connect the standard session to it
+ *
+ * @return TInt - An error code
+ */
+    {    
+    TInt err = KErrNone;
+    TFindServer findCS(KRootServerName);
+    TFullName name;
+    RProcess rootServer;
+
+    if (findCS.Next(name) == KErrNone)
+		{
+		INFO_PRINTF1(_L("Shutting down existing RootServer"));
+
+		// Try to shutdown any existing instance of the rootserver so we can
+		// safely change the MBuf pool size before any modules are loaded.
+		// A sticky module such as ETel may prevent complete shutdown so we
+		// kill the process if necessary.
+		if(!ShutdownRootServer())
+			{
+			INFO_PRINTF1(_L("Killing existing RootServer"));
+
+			// Kill the rootserver process if normal shutdown fails.
+			TFindProcess findPS(KRootServerProcessPattern);
+			err = findPS.Next(name);
+			if(err == KErrNone)
+				{
+	 			err = rootServer.Open(findPS);
+	 			if(err == KErrNone)
+	 				{
+		 			TRequestStatus status;
+					rootServer.Logon(status);
+					rootServer.Kill(KErrNone);
+					User::WaitForRequest(status);
+					
+					// Create a timer in case some other entity holds an open handle on the
+					// configurator which prevents the kernel from destroying it.  We timeout
+					// after one second.
+					TAutoClose<RTimer> timer;
+					if(timer.iObj.CreateLocal() == KErrNone)
+						{
+						// Request destruction notification so we know when it is safe to start
+						// the process again.
+						TRequestStatus destructionStatus;
+						rootServer.NotifyDestruction(destructionStatus);
+						rootServer.Close();
+					
+						enum{ KProcessDestructionTimeout = 1000000 };
+				  					
+						TRequestStatus timerStatus;
+						timer.iObj.After(timerStatus, KProcessDestructionTimeout);
+						
+						// Wait for the process to be destroyed or for the timeout.
+						User::WaitForRequest(destructionStatus, timerStatus);
+						if(timerStatus.Int() == KRequestPending)
+							{
+							timer.iObj.Cancel();
+							User::WaitForRequest(timerStatus);
+							}
+						else
+							{
+							User::CancelMiscNotifier(destructionStatus);
+							User::WaitForRequest(destructionStatus);
+							
+							INFO_PRINTF2(_L("CTestSuiteRootServer::StartRootServer - existing RootServer process has still not been destroyed after %f.0s"), KProcessDestructionTimeout / 1000000.0);
+							}
+						}
+	 				}
+				}
+			}
+		}
+	else
+		{
+	    err = rootServer.Create(KRootServerExe, KNullDesC);
+		TRequestStatus status;
+	    if (err == KErrNone)
+			{
+			rootServer.Rendezvous(status);
+			rootServer.Resume();
+			User::WaitForRequest(status);
+			rootServer.Close();
+			err = status.Int();
+			}
+		if(err == KErrNone)
+			{
+			err = RootSess().Connect();
+			}
+		}
+
+    return err;
+    }
+
+
+TBool CTE_RootServerServer::ShutdownRootServer()
+/**
+ * Tell the Root Server to shutdown via its standard session, and validate that it did so.
+ *
+ * @return TBool - True if shutdown was successful
+ */
+    {
+	TInt err;
+	// Some tests close the session
+	if(RootSess().Handle() == 0)
+		{
+		err = RootSess().Connect();
+		if(err != KErrNone)
+			{
+			INFO_PRINTF2(_L("Failed to reconnect session (err %d) - maybe dead already?"), err);
+			return EFalse;
+			}
+		}
+
+	TRSIter position;
+	while((err = RootSess().Shutdown()) == KErrRSModulesStillRunning)
+		{
+		TCFModuleName moduleName;
+		err = RootSess().EnumerateModules(position, moduleName);
+		if(err == KErrEof)
+			{
+			INFO_PRINTF1(_L("RRootServ::Shutdown failed, reporting spurious modules"));
+			return EFalse;
+			}
+		TRSModuleInfo moduleInfo;
+		err = RootSess().GetModuleInfo(moduleName, moduleInfo);
+		if(err == KErrRSModuleUnknown)
+			continue;	// an unload probably just completed
+		else if(err != KErrNone)
+			{
+			INFO_PRINTF1(_L("RRootServ::GetModuleInfo failed during shutdown"));
+			return EFalse;
+			}
+		TBuf<KCFMaxModuleName> wideModuleName;
+		wideModuleName.Copy(moduleName);
+		INFO_PRINTF3(_L("RRootServ::Shutdown in progress; need to unload %S (state %d)"), &wideModuleName, moduleInfo().iState);
+		TRequestStatus status;
+		switch(moduleInfo().iState)
+			{
+			case EStarting:		// treat a starting module as a zombie coz we're in a hurry, and who knows how long that rendezvous could take?
+			case EZombie:
+				{
+				RootSess().UnloadCpm(status, moduleName, EUnGraceful);
+				User::WaitForRequest(status);
+				if(status != KErrNone && status != KErrRSSuddenDeath && status != KErrRSModuleUnknown)
+					{
+					INFO_PRINTF1(_L("RRootServ::Shutdown failed, zombie could not be killed"));
+					return EFalse;
+					}
+				break;
+				}
+			case ERunning:
+				{
+				RootSess().UnloadCpm(status, moduleName, EGraceful);
+				User::WaitForRequest(status);
+				if(status.Int() == KErrLocked)
+					{
+					INFO_PRINTF1(_L("Module is sticky and cannot be unloaded"));
+					
+					// Move to the next module.
+					continue;
+					}
+				else
+					{
+				INFO_PRINTF2(_L("UnloadCPM returned  %d"), status.Int());
+					}
+				break;	// either it worked or it should have become a zombie
+				}
+			case EStopping:
+				{
+				// transition states; snooze and try again
+				User::After(1000000);
+				break;
+				}
+			default:
+				{
+				INFO_PRINTF1(_L("RRootServ::Shutdown failed, module in improper states"));
+				return EFalse;
+				}
+			}
+			
+			// Try to unload this module again.
+			position.Reset();
+		}
+	RootSess().Close();
+	RRootServ probeSess;
+	TBool res = (probeSess.Connect() != KErrNone);
+	if(!res)
+		{
+		probeSess.Close();
+		}
+
+    return res;
+    }
+
+
+
+// make a version string available for test system 
+TPtrC CTE_RootServerServer::GetVersion( void )
+	{
+
+#ifdef _DEBUG
+	_LIT(KTxtVersion,"1.00 (udeb)");
+#else
+	_LIT(KTxtVersion,"1.00");
+#endif
+
+	return KTxtVersion();
+	}
+
+
+CSelfPopScheduler* CSelfPopScheduler::CreateLC()
+	{
+	CSelfPopScheduler* self = new(ELeave)CSelfPopScheduler;
+	CleanupStack::PushL(self);
+	CActiveScheduler::Install(self);
+	return self;
+	}
+
+CSelfPopScheduler::operator TCleanupItem()
+	{
+	return TCleanupItem(Cleanup, this);
+	}
+
+void CSelfPopScheduler::Cleanup(TAny* aItem)
+	{
+	CActiveScheduler::Install(NULL);
+	delete reinterpret_cast<CSelfPopScheduler*>(aItem);
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/src/TestAsynchHandler.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,156 @@
+// Copyright (c) 2003-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:
+//
+// This contains CTestAsynchHandler which is an active object to
+// handle the asynch calls from the RootServer during testing
+
+
+
+// EPOC includes
+#include <e32base.h>
+
+// RootServer includes
+#include "rsshared.h"
+
+// Test system includes
+#include "TestAsynchHandler.h"
+
+
+CTestAsynchHandler* CTestAsynchHandler::NewLC(RRootServ* aRootServer)
+	{
+	CTestAsynchHandler* self = new(ELeave) CTestAsynchHandler;
+	CleanupStack::PushL(self);
+	self->ConstructL(aRootServer);
+	return self;
+	}
+
+CTestAsynchHandler::CTestAsynchHandler() : CActive(0)
+	{
+	}
+
+void CTestAsynchHandler::ConstructL(RRootServ* aRootServer)
+	{
+	iState = EIdle;
+	iRootServer = aRootServer;
+	User::LeaveIfError(iTimer.CreateLocal());
+	CActiveScheduler::Add(this);
+	}
+
+CTestAsynchHandler::~CTestAsynchHandler()  
+	{
+	Cancel();
+	iTimer.Close();
+	}
+
+// from CActive
+void CTestAsynchHandler::RunL()     
+	{ 
+	switch(iState)
+		{
+		case ELoading:
+		case EUnLoading:
+		case EBinding:
+		case EUnBinding:
+		case EListeningforDeath:
+		case EWaitingforTimer:
+		case EIdle:
+		default:
+			CActiveScheduler::Stop();
+			break;
+		}
+	iState = EIdle;
+	}
+
+void CTestAsynchHandler::DoCancel() 
+	{
+	switch (iState)
+		{
+		case EListeningforDeath:
+			iPropertyDeath.Cancel();
+			break;
+
+		case EWaitingforTimer:
+			iTimer.Cancel();
+			break;
+
+		case ELoading:
+		case EIdle:
+		default:
+			break;
+		}
+	}
+
+
+// requests
+void CTestAsynchHandler::TryLoad(const TRSStartModuleParams& aParams, 
+									   const TDesC8& aIniData)
+	{
+    iState = ELoading;
+	iRootServer->LoadCpm(iStatus, aParams, aIniData);
+	SetActive();
+	}
+
+void CTestAsynchHandler::TryUnLoad(const TCFModuleName& aName, TRSUnLoadType aType)
+	{
+  	iState = EUnLoading;
+	iRootServer->UnloadCpm(iStatus, aName, aType);
+	SetActive();
+	}
+
+void CTestAsynchHandler::TryBind( TRSBindingInfo& aBindInfo )
+	{
+	iState = EBinding;
+	iRootServer->Bind( iStatus, aBindInfo );
+	SetActive();
+	}
+	
+void CTestAsynchHandler::TryUnBind( TRSUnBindingInfo& aUnbindInfo )
+	{
+	iState = EUnBinding;
+	iRootServer->Unbind( iStatus, aUnbindInfo );
+	SetActive();
+	}
+
+void CTestAsynchHandler::TryWaitForDeath(void)
+	{
+	iState = EListeningforDeath;
+	TInt result = iPropertyDeath.Attach( KUidSystemCategory,KUidC32RootModuleDeathKey.iUid );
+	if(result != KErrNone)
+		{
+		_LIT( KAsynch, "Asynch" );
+		User::Panic( KAsynch, result );
+		}
+	iPropertyDeath.Subscribe( iStatus );
+	SetActive();
+	}
+
+void CTestAsynchHandler::TryCancelDeath()
+	{
+
+	// we are already active cos we are waiting on our subscription
+	// therefore we will simply cancel the property subscription
+	iState=EIdle;
+	DoCancel();	
+	}
+
+void CTestAsynchHandler::WaitForTimer(TInt aTimeout_ms)
+	{
+	iState = EWaitingforTimer;
+
+	DoCancel(); // in case timer already running
+	iTimer.After(iStatus, aTimeout_ms * 1000);
+	SetActive();
+	}
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/src/TestStepRootServer.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,220 @@
+// Copyright (c) 2003-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:
+//
+// This contains CTestCaseRootServer 
+
+
+// Test system includes
+#include "TestStepRootServer.h"
+
+// const (times in ms)
+const TInt CTestStepRootServer::isTestServerLifeTime = 3000;
+const TInt CTestStepRootServer::isTestServerWaitTime = 
+					2 * CTestStepRootServer::isTestServerLifeTime;
+const TInt CTestStepRootServer::isRendezvousDelayTime = 1000;
+
+
+
+// constructor
+CTestStepRootServer::CTestStepRootServer(CTE_RootServerServer *aSuite) 
+{
+	iRootServerSuite = aSuite;
+}
+
+// destructor
+CTestStepRootServer::~CTestStepRootServer()
+{
+}
+
+
+//------------------------
+TVerdict CTestStepRootServer::doTestStepPreambleL( void )
+	{
+	TInt ret;
+
+	// kick off the RootServer thread
+	INFO_PRINTF1(_L("Attempting to start RootServer"));
+	ret = iRootServerSuite->StartRootServer();
+	if (KErrNone != ret)
+		{
+		INFO_PRINTF2(_L("Failed to start RootServer: err %d"), ret);
+		return EInconclusive;
+		}
+
+        SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
+
+
+//------------------------
+TVerdict CTestStepRootServer::doTestStepPostambleL( void )
+	{
+	INFO_PRINTF1(_L("Attempting to shutdown RootServer"));
+	if (!iRootServerSuite->ShutdownRootServer())
+		{
+		INFO_PRINTF1(_L("Failed to shutdown RootServer"));
+		return EInconclusive;
+		}
+        SetTestStepResult(EPass);
+
+	return TestStepResult();
+	}
+
+
+//------------------------
+void CTestStepRootServer::GetTestStepServerName(const TDesC &aNamePostFix, 
+												TDes &aServerName)
+	{
+	aServerName.Copy(_L("TS_"));
+	aServerName.Append(TestStepName());
+	aServerName.Append(_L("_"));
+	aServerName.AppendNum(iRootServerSuite->NextServerNumber());
+	if (aNamePostFix.Length() > 0)
+		{
+		aServerName.Append(_L("_"));
+		aServerName.Append(aNamePostFix);															  
+		}
+	}
+
+
+void CTestStepRootServer::DefaultStartParams(TRSStartModuleParams& aStartParams, TTestModuleIniData& aIniData)
+	{
+	aStartParams.iParams.iFilename = _L("testcpm.cpm");
+	aStartParams.iParams.iPriority = EPriorityNormal;
+	aStartParams.iParams.iStackSize = 8192;
+	aStartParams.iParams.iHeapType = ENewHeap;
+	aStartParams.iParams.iMinHeapSize = 65536;
+	aStartParams.iParams.iMaxHeapSize = 262144;
+	aStartParams.iParams.iShareHeapWith = KNullDesC8;
+	aStartParams.iParams.iThreadFunctionOrdinal = 1;
+	aStartParams.iParams.iIsSticky = EFalse;
+	aStartParams.iParams.iIsServer = EFalse;
+
+	aIniData.iParams.iInitDelay = 0;
+	aIniData.iParams.iDeathDelay = NO_PREMATURE_DEATH;
+	aIniData.iParams.iDiscoveryDelay = 0;
+	aIniData.iParams.iBindDelay = 0;
+	aIniData.iParams.iUnbindDelay = 0;
+	aIniData.iParams.iShutdownDelay = 0;
+	}
+
+void CTestStepRootServer::LoadNormalModuleL(CTestAsynchHandler* aHandler, const TDesC8& aModule, TThreadPriority aPriority)
+	{
+	TRSStartModuleParams startParams;
+	TTestModuleIniData iniData;
+	DefaultStartParams(startParams, iniData);
+	startParams.iParams.iName = aModule;
+	startParams.iParams.iPriority = aPriority;
+
+    aHandler->TryLoad( startParams, iniData);
+	
+	CActiveScheduler::Start();
+	if (aHandler->iStatus != KErrNone) 
+		{
+		INFO_PRINTF2(_L("Error: load returned %d"), aHandler->iStatus.Int());
+		User::Leave(aHandler->iStatus.Int());
+		}
+	}
+
+TInt CTestStepRootServer::TryHierachicalBind(CTestAsynchHandler* aHandler, 
+											 const TDesC8& aTopModule, const TDesC8& aTopSubModule, 
+											 const TDesC8& aBottomModule, const TDesC8& aBottomSubModule)
+	{
+	TRSBindingInfo bindInfo;
+	bindInfo.iParams.iType = EHierarchical;
+	bindInfo.iParams.iAddress1.SetModule(aTopModule);
+	bindInfo.iParams.iAddress1.SetSubModule(aTopSubModule);
+	bindInfo.iParams.iAddress2.SetModule(aBottomModule);
+	bindInfo.iParams.iAddress2.SetSubModule(aBottomSubModule);
+	bindInfo.iParams.iState1 = KErrNone;
+	bindInfo.iParams.iState2 = KErrNone;
+	bindInfo.iParams.iForwardQLength = TRSBindingInfo::EMinQueueLength;	
+	bindInfo.iParams.iReverseQLength = TRSBindingInfo::EMinQueueLength;	
+	
+	aHandler->TryBind( bindInfo );
+	CActiveScheduler::Start();
+	return aHandler->iStatus.Int();
+	}
+
+_LIT(KSingleDesFmt1, "%S");
+_LIT(KSingleDesFmt2, "%d %S");
+_LIT(KSingleDesFmt4, "%S %d %d %S");
+
+void CTestStepRootServer::Log( TRefByValue<const TDesC8> aFormat, ... )
+	{
+	// Although a memory-spendthrift approach it's ok for the case of TS_ROOTSERVER
+	TBuf8<EMaxLogLength> buf8;
+	VA_LIST list;
+	VA_START(list, aFormat);
+	buf8.FormatList(aFormat, list);
+	TBuf16<EMaxLogLength> buf16;
+	buf16.Copy(buf8);
+	INFO_PRINTF2(KSingleDesFmt1, &buf16);
+	}
+
+void CTestStepRootServer::Log( TInt aSeverity, TRefByValue<const TDesC8> aFormat, ... )
+	{
+	// Although a memory-spendthrift approach it's ok for the case of TS_ROOTSERVER
+	TBuf8<EMaxLogLength> buf8;
+	VA_LIST list;
+	VA_START(list, aFormat);
+	buf8.FormatList(aFormat, list);
+	TBuf16<EMaxLogLength> buf16;
+	buf16.Copy(buf8);
+	INFO_PRINTF3(KSingleDesFmt2, aSeverity, &buf16);
+	}
+
+void CTestStepRootServer::LogExtra(const TText8* aFile, TInt aLine, TInt aSeverity, TRefByValue<const TDesC8> aFormat,...)
+	{
+	// Although a memory-spendthrift approach it's ok for the case of TS_ROOTSERVER
+	TBuf8<EMaxLogLength> buf8;
+	VA_LIST list;
+	VA_START(list, aFormat);
+	buf8.FormatList(aFormat, list);
+	TBuf16<EMaxLogLength> buf16;
+	buf16.Copy(buf8);
+	INFO_PRINTF5(KSingleDesFmt4, aFile, aLine, aSeverity, &buf16);
+	}
+
+void CTestStepRootServer::Log( TRefByValue<const TDesC16> aFormat, ... )
+	{
+	// Although a memory-spendthrift approach it's ok for the case of TS_ROOTSERVER
+	TBuf16<EMaxLogLength> buf16;
+	VA_LIST list;
+	VA_START(list, aFormat);
+	buf16.FormatList(aFormat, list);
+	INFO_PRINTF2(KSingleDesFmt1, &buf16);
+	}
+
+void CTestStepRootServer::Log( TInt aSeverity, TRefByValue<const TDesC16> aFormat, ... )
+	{
+	// Although a memory-spendthrift approach it's ok for the case of TS_ROOTSERVER
+	TBuf16<EMaxLogLength> buf16;
+	VA_LIST list;
+	VA_START(list, aFormat);
+	buf16.FormatList(aFormat, list);
+	INFO_PRINTF3(KSingleDesFmt2, aSeverity, &buf16);
+	}
+
+void CTestStepRootServer::LogExtra(const TText8* aFile, TInt aLine, TInt aSeverity,
+	TRefByValue<const TDesC> aFormat,...)
+	{
+	// Although a memory-spendthrift approach it's ok for the case of TS_ROOTSERVER
+	TBuf16<EMaxLogLength> buf16;
+	VA_LIST list;
+	VA_START(list, aFormat);
+	buf16.FormatList(aFormat, list);
+	INFO_PRINTF5(KSingleDesFmt4, aFile, aLine, aSeverity, &buf16);
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/TE_rootserver/testcpm/testcpm.cpp	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,374 @@
+// Copyright (c) 2003-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:
+//
+#include <cflog.h>
+#include <cfshared.h>
+using namespace CommsFW;
+#include <cfmsgs.h>
+#include <rsshared.h>
+#include "RootServerTest.h"
+
+__CFLOG_STMT(_LIT8(KLogTestCPM, "TestCPM");) // subsystem name
+_LIT( KTestCpmPanic, "TestCpm" );
+const TText8* const KSubModules[] = { _S8("Test Protocol1"), _S8("Test Protocol2"), _S8("Test Protocol3") };
+
+
+class CDeathTimer : public CTimer
+	{
+public:
+	static CDeathTimer* NewL(TInt aAfter)
+		{
+		CDeathTimer* self = new(ELeave) CDeathTimer;
+		CleanupStack::PushL(self);
+		self->ConstructL();
+		CleanupStack::Pop(self);
+		CActiveScheduler::Add(self);
+		self->After(aAfter);
+		return self;
+		}
+protected:
+	CDeathTimer() : CTimer(EPriorityStandard)
+		{
+		}
+	void RunL()
+		{
+		// Go not gracefully into that good night
+		User::Invariant();
+		}
+	};
+
+class CChannelHandler;
+class CTestModule : public CBase
+	{
+public:
+	enum {EPriority=1000}; ///< priority of this Active Object
+public:
+	~CTestModule();
+	void CFMessageReceived(TCFMessage& aMsg);
+	static CTestModule* NewL(TCFModuleInfo* aStartupArgs);
+	void ConstructL(TCFModuleInfo* aStartupArgs);
+	void LoggedAfter(TInt aAfterMS, const TDesC8& aDescription);
+private:
+	CChannelHandler* iChannelHandler;
+	TTestModuleIniDataContainer iDelayTimes;
+	TInt iDiscoverPos;
+	CDeathTimer* iDeathTimer;
+	};
+
+class CChannelHandler:public CActive
+	{
+public:
+	static CChannelHandler* NewL(RCFChannel::TMsgQueues aRxQueues, 
+									RCFChannel::TMsgQueues aTxQueues, CTestModule* aModule);
+	void RunL();
+	TInt Send(TCFMessage);
+	~CChannelHandler();
+protected:
+	virtual void DoCancel();
+private:
+	void ConstructL(RCFChannel::TMsgQueues aRxQueues, 
+					RCFChannel::TMsgQueues aTxQueues, CTestModule* aModule);
+	CChannelHandler();
+private:
+	CTestModule* iModule;
+	RCFChannelPair iChannelPair;
+	};
+
+
+//
+// CChannelHandler class definitions
+//
+
+CChannelHandler::CChannelHandler():CActive(CActive::EPriorityStandard)
+	{
+	CActiveScheduler::Add(this);
+	}
+
+CChannelHandler* CChannelHandler::NewL(RCFChannel::TMsgQueues aRxQueues, 
+									RCFChannel::TMsgQueues aTxQueues, CTestModule* aModule)
+	{
+	CChannelHandler* pHandler = new (ELeave) CChannelHandler;
+	pHandler->ConstructL(aRxQueues, aTxQueues, aModule);
+	return pHandler;
+	}
+
+void CChannelHandler::ConstructL(RCFChannel::TMsgQueues aRxQueues, 
+									RCFChannel::TMsgQueues aTxQueues, CTestModule* aModule)
+	{
+	iModule = aModule;
+	iChannelPair.CreateSend(aTxQueues);
+	iChannelPair.CreateRecv(aRxQueues);
+	SetActive();
+	iChannelPair.NotifyDataAvailable(*this);
+	}
+
+void CChannelHandler::DoCancel(void)
+	{
+	iChannelPair.CancelDataAvailable();
+	}
+
+TInt CChannelHandler::Send(TCFMessage aMsg)
+	{
+	TRequestStatus status;
+	iChannelPair.NotifySpaceAvailable(*this);
+	User::WaitForRequest(status);
+	return iChannelPair.Send(aMsg);
+	}
+
+void CChannelHandler::RunL()
+	{
+
+	if (iStatus != KErrNone)
+		{
+		User::Invariant();
+		}
+
+	// No error. Take the message from the channel.
+	TCFMessage msg;
+	TInt err = iChannelPair.Receive(msg);
+	if (KErrNone == err)
+		{
+		//Pass the message
+		iModule->CFMessageReceived(msg);
+		//Pend again
+		SetActive();
+		iChannelPair.NotifyDataAvailable(*this);
+		}
+	else
+		{
+		User::Invariant();
+		}
+	}
+
+CChannelHandler::~CChannelHandler()
+	{
+	if(IsActive())
+		Cancel();
+	iChannelPair.CloseNonGracefully();
+	}	
+
+
+//
+// implementation of CTestServer
+//
+
+CTestModule* CTestModule::NewL(TCFModuleInfo* aStartupArgs)
+/**
+ * Create a new CCommServer.
+ *
+ * This is not a normal 2 phase contruction. If the allocation of the object
+ * fails we will panic with -4 which means that something is very wrong.
+ */
+	{
+	CTestModule* pS;
+	CleanupStack::PushL(pS = new CTestModule);
+	__ASSERT_ALWAYS(pS!=NULL, User::Panic( KTestCpmPanic, KErrNoMemory));
+#ifdef SYMBIAN_C32ROOT_API_V3
+	pS->ConstructL(aStartupArgs);
+#else
+	TRAPD(r, pS->ConstructL(aStartupArgs));
+	__ASSERT_ALWAYS(r==KErrNone, User::Panic( KTestCpmPanic, KErrNoMemory));
+#endif
+	CleanupStack::Pop(pS);
+	return pS;
+	}
+
+
+void CTestModule::ConstructL(TCFModuleInfo* aStartupArgs)
+	{
+	if (aStartupArgs->iIniData != NULL)
+		{
+		if (aStartupArgs->iIniData->Length() == sizeof(iDelayTimes))
+			{
+			TTestModuleIniData pkg;
+			pkg.Copy(*(aStartupArgs->iIniData));
+#if defined(SYMBIAN_C32ROOT_API_V3)
+			delete aStartupArgs->iIniData;
+#endif
+
+			iDelayTimes = pkg.iParams;
+
+			if(iDelayTimes.iInitDelay == EXIT_BEFORE_RENDEZVOUS)
+				User::Leave(KErrGeneral);
+			else if(iDelayTimes.iInitDelay > 0)
+				LoggedAfter(iDelayTimes.iInitDelay, _L8("Init"));
+			else if(iDelayTimes.iInitDelay == PANIC_BEFORE_RENDEZVOUS)
+				User::Panic(_L("TESTCPM"), 1);
+
+			__CFLOG_5( KLogTestCPM, KLogCode, 
+				_L8("TestCpm[%LU] - iIniData delays (msec): discoveryDelay %d bindDelay %d unbindDelay %d shutdownDelay %d"), 
+						 RThread().Id().Id(), iDelayTimes.iDiscoveryDelay, iDelayTimes.iBindDelay,
+						 iDelayTimes.iUnbindDelay, iDelayTimes.iShutdownDelay);
+
+			iChannelHandler = CChannelHandler::NewL(aStartupArgs->iRxQueues, aStartupArgs->iTxQueues, this);
+
+			RThread::Rendezvous(KErrNone);
+
+			if(iDelayTimes.iInitDelay == PANIC_AFTER_RENDEZVOUS)
+				User::Panic(_L("TESTCPM"), 1);
+
+			}
+		else
+			{
+			__CFLOG_1( KLogTestCPM, KLogCode, _L("TestCpm[%LU] - iIniData mismatched"), RThread().Id().Id() );
+#if defined(SYMBIAN_C32ROOT_API_V3)
+			delete aStartupArgs->iIniData;
+#endif
+			ASSERT(0);
+			}
+		}
+	else
+		{
+		__CFLOG_1( KLogTestCPM, KLogCode, _L("TestCpm[%LU] - No iIniData"), RThread().Id().Id() );
+		ASSERT(0);
+		}
+	}
+
+void CTestModule::CFMessageReceived(TCFMessage& aMsg)
+	{
+	
+	//It is called when a new message arrives from incomming channel
+	switch (aMsg.Code())
+		{
+		case TCFCommsMessage::ECodeDiscover:
+			{
+			// now wait for delay
+			__CFLOG(KLogTestCPM, KLogCode, _L("TestCpm Discover message received"));
+
+			LoggedAfter(iDelayTimes.iDiscoveryDelay, _L8("Discovery"));
+			const TCFDiscoverMsg& msg = reinterpret_cast<const TCFDiscoverMsg&>(aMsg);
+			// we return our sub-modules one at a time to make sure the RootServer copes with iterative discovery
+			const TInt numSubModules = sizeof(KSubModules) / sizeof(KSubModules[0]);
+			ASSERT(msg.Size() > 0);
+			ASSERT(iDiscoverPos < numSubModules);
+			if(msg.Reset())
+				iDiscoverPos = 0;
+			TCFSubModuleName name;
+			const TText8* subMod = KSubModules[iDiscoverPos++];
+			name.Copy(subMod);
+			msg.SubModuleNames()[0] = name;
+			TBool discoveryEnded = (iDiscoverPos == numSubModules);
+			TCFDiscoverRespMsg diskresp(msg.Identifier(), 1, !discoveryEnded);
+			TInt err = iChannelHandler->Send(diskresp);
+			if(KErrNone != err)
+				{
+       		    User::Invariant();
+				}
+			if(discoveryEnded && iDelayTimes.iDeathDelay != NO_PREMATURE_DEATH)
+				{
+				TRAP(err, iDeathTimer = CDeathTimer::NewL(iDelayTimes.iDeathDelay * 1000));
+				ASSERT(iDeathTimer);
+				}
+				
+			}
+			break;
+
+		case TCFCommsMessage::ECodeBind:
+			{
+			__CFLOG(KLogTestCPM, KLogCode, _L("TestCpm Bind message received"));
+			// now wait for delay
+			LoggedAfter(iDelayTimes.iBindDelay, _L8("Bind"));
+			const TCFBindMsg& msg = reinterpret_cast<const TCFBindMsg&>(aMsg);
+			TCFBindCompleteMsg resp(msg.Identifier(), KErrNone);
+			TInt err = iChannelHandler->Send(resp);
+			if(KErrNone != err)
+				{
+				User::Invariant();
+				}
+			}
+			break;
+
+		case TCFCommsMessage::ECodeUnbind: 
+			{
+			__CFLOG(KLogTestCPM, KLogCode, _L("TestCpm UnBind message received"));
+			// now wait for delay
+			LoggedAfter(iDelayTimes.iUnbindDelay, _L8("Unbind"));
+			const TCFUnbindMsg& msg = reinterpret_cast<const TCFUnbindMsg&>(aMsg);
+			TCFUnbindCompleteMsg resp(msg.Identifier(), KErrNone);
+			TInt err = iChannelHandler->Send(resp);
+			if(KErrNone != err)
+				{
+				User::Invariant();
+				}
+			}
+			break;
+
+		case TCFCommsMessage::ECodeShutdown:
+			// now wait for delay
+			__CFLOG(KLogTestCPM, KLogCode, _L("TestCpm Shutdown message received"));
+			LoggedAfter(iDelayTimes.iShutdownDelay, _L8("Shutdown"));
+
+			CActiveScheduler::Stop();
+			break;
+		default:;
+			User::Invariant();
+		}
+	}
+
+	
+CTestModule::~CTestModule()
+	{
+	delete iChannelHandler;
+	delete iDeathTimer;
+	}
+
+void CTestModule::LoggedAfter(TInt aAfterMS, const TDesC8& aDescription)
+	{ 
+	(void) aDescription;
+	__CFLOG_2(KLogTestCPM, KLogCode, _L8("TestCpm: %d ms %S pause"), aAfterMS, &aDescription);
+	User::After(aAfterMS * 1000);
+	__CFLOG_1(KLogTestCPM, KLogCode, _L8("TestCpm: %S pause complete"), &aDescription);
+	}
+
+
+//---------------
+
+void DoModuleThreadL(TAny * aArg)
+	{
+	TCFModuleInfo* args = reinterpret_cast<TCFModuleInfo*>(aArg);
+	
+	CActiveScheduler*  scheduler = new (ELeave) CActiveScheduler;
+	CleanupStack::PushL(scheduler);
+	CActiveScheduler::Install(scheduler); 
+
+	CTestModule *pTm = CTestModule::NewL(args);
+
+    __CFLOG_1( KLogTestCPM, KLogCode, _L("TestCpm[%LU] - Completed rendezvous."), RThread().Id().Id() );
+
+	CActiveScheduler::Start();
+
+	__CFLOG_1( KLogTestCPM, KLogCode, _L("TestCpm[%LU] - Exiting thread function"), RThread().Id().Id() );
+
+	delete pTm;
+	CActiveScheduler::Install(NULL);
+	CleanupStack::PopAndDestroy(scheduler);
+	}
+
+EXPORT_C TInt ModuleThread(TAny * aArg)
+	{
+	CTrapCleanup* cleanup = CTrapCleanup::New();
+	if(!cleanup)
+		return KErrNoMemory;	
+
+	TRAPD(ret, DoModuleThreadL(aArg))
+	if (ret!=KErrNone)
+		{
+		__CFLOG(KLogTestCPM, KLogCode, _L("ModuleThread failed to create TestCpm"));
+		}
+
+	delete cleanup;
+	return ret;
+	}
+
+
--- a/commsprocess/commsrootserverconfig/group/TS_rootserver.mmp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-// Copyright (c) 2003-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:
-// using relative paths for sourcepath and user includes
-// 
-//
-
-TARGET        	ts_rootserver.dll
-TARGETTYPE    	dll
-UID           	0x1000008d 0x101F529F
-VENDORID 0x70000001
-
-SOURCEPATH      ../ts_rootserver
-SOURCE        TestSuiteRootServer.cpp
-SOURCE        TestStepRootServer.cpp
-SOURCE        TestAsynchHandler.cpp
-SOURCE        RootServerTestSection1.cpp
-SOURCE        RootServerTestSection2.cpp
-SOURCE        RootServerTestSection3.cpp
-SOURCE        RootServerTestSection4.cpp
-SOURCE        RootServerTestSection5.cpp
-SOURCE        RootServerTestSection6.cpp
-SOURCE        RootServerTestSection7.cpp
-SOURCE        RootServerTestSection8.cpp
-SOURCEPATH      ../configurator/src
-SOURCE        c32cmiutils.cpp
-
-USERINCLUDE   ../ts_rootserver
-USERINCLUDE   ../configurator/src
-USERINCLUDE   /epoc32/include/networking
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/comms-infras
-#else
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-#endif
-LIBRARY   euser.lib c32root.lib commsfw.lib
-LIBRARY	  integrationtestutils.lib
-
-
-CAPABILITY ALL -Tcb
-
-SMPSAFE
-
--- a/commsprocess/commsrootserverconfig/group/bld.inf	Thu Sep 02 21:44:45 2010 +0300
+++ b/commsprocess/commsrootserverconfig/group/bld.inf	Fri Sep 17 08:36:26 2010 +0300
@@ -44,20 +44,6 @@
 
 PRJ_TESTEXPORTS
 
-../group/ts_rootserver.iby	/epoc32/rom/include/ts_rootserver.iby
-
-../ts_rootserver/scriptfiles/ts_rootserver_full.script /epoc32/release/wins/udeb/z/testdata/scripts/ts_rootserver.script
-../ts_rootserver/scriptfiles/ts_rootserver_full.script /epoc32/release/winscw/udeb/z/testdata/scripts/ts_rootserver.script
-../ts_rootserver/scriptfiles/ts_rootserver_full.script /epoc32/data/z/testdata/scripts/ts_rootserver.script
-
-../ts_rootserver/scriptfiles/ts_rootserver.ini	/epoc32/release/wins/udeb/z/testdata/configs/ts_rootserver.ini
-../ts_rootserver/scriptfiles/ts_rootserver.ini	/epoc32/release/winscw/udeb/z/testdata/configs/ts_rootserver.ini
-../ts_rootserver/scriptfiles/ts_rootserver.ini	/epoc32/data/z/testdata/configs/ts_rootserver.ini
-
-../ts_rootserver/scriptfiles/te_rootserver_main_platsec.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_rootserver_main.script
-../ts_rootserver/scriptfiles/te_rootserver_main_platsec.script /epoc32/release/winscw/urel/z/testdata/scripts/te_rootserver_main.script
-../ts_rootserver/scriptfiles/te_rootserver_main_platsec.script /epoc32/data/z/testdata/scripts/te_rootserver_main.script
-
 ../te_cap_rootserver/Te_Cap_RootServer.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_cap_rootserver.script
 ../te_cap_rootserver/Te_Cap_RootServer.script /epoc32/release/wins/udeb/z/testdata/scripts/te_cap_rootserver.script
 ../te_cap_rootserver/Te_Cap_RootServer.script /epoc32/release/winscw/urel/z/testdata/scripts/te_cap_rootserver.script
@@ -90,7 +76,12 @@
 
 ../te_cap_rootserver/Te_Cap_RootServer.iby /epoc32/rom/include/te_cap_rootserver.iby
 
+../group/te_rootserver.iby	/epoc32/rom/include/te_rootserver.iby
 
+../TE_rootserver/scripts/te_rootserver_full.script 	z:/testdata/scripts/te_rootserver.script
+../TE_rootserver/scripts/te_rootserver_light.script 	z:/testdata/scripts/te_rootserver_light.script
+../TE_rootserver/scripts/te_rootserver.ini	z:/testdata/configs/te_rootserver.ini
+../TE_rootserver/scripts/te_rootserver_main_platsec.script z:/testdata/scripts/te_rootserver_main.script
 ../Te_Configurator/scripts/te_ConfiguratorSuite.script   /epoc32/release/winscw/udeb/z/testdata/scripts/te_configuratorsuite.script  
 
 ../Te_Configurator/scripts/te_ConfiguratorSuite.script   /epoc32/data/z/testdata/scripts/te_configuratorsuite.script  
@@ -111,10 +102,10 @@
 
 PRJ_TESTMMPFILES
 
-../group/TS_rootserver.mmp
 ../group/testcpm.mmp
 ../group/Te_Cap_RootServer.mmp
 ../group/Te_Cap_RootServer_Connect.mmp
+../TE_rootserver/group/TE_rootserver.mmp
 
 ../group/dummycpm.mmp
 ../group/Te_Configuratorsuite.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commsprocess/commsrootserverconfig/group/te_rootserver.iby	Fri Sep 17 08:36:26 2010 +0300
@@ -0,0 +1,19 @@
+#ifndef __TE_ROOTSERVER_IBY__
+#define __TE_ROOTSERVER_IBY__
+
+REM Comms Framework FLogger extension
+#include <commsdebugutility.iby>
+
+#include <commsrootserver.iby>
+
+// copy the dll, scripts and ini files to rom
+file=ABI_DIR\DEBUG_DIR\te_rootserver.exe     System\libs\te_rootserver.exe
+file=ABI_DIR\DEBUG_DIR\testcpm.cpm           System\libs\testcpm.cpm
+
+data=EPOCROOT##epoc32\data\z\TestData\Scripts\te_rootserver.script \TestData\Scripts\te_rootserver.script
+
+
+data=EPOCROOT##epoc32\data\z\TestData\configs\te_rootserver.ini 			\TestData\configs\te_rootserver.ini
+
+#endif
+
--- a/commsprocess/commsrootserverconfig/group/testcpm.mmp	Thu Sep 02 21:44:45 2010 +0300
+++ b/commsprocess/commsrootserverconfig/group/testcpm.mmp	Fri Sep 17 08:36:26 2010 +0300
@@ -20,10 +20,10 @@
 #include 	"comms-infras/commsdebugutility.mmh"
 #include        <cflog.mmh>
 
-SOURCEPATH      ../ts_rootserver/testcpm
+SOURCEPATH      ../te_rootserver/testcpm
 SOURCE          testcpm.cpp
 
-USERINCLUDE	    ../ts_rootserver
+USERINCLUDE	    ../te_rootserver/inc
 
 SYSTEMINCLUDE	../inc
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
--- a/commsprocess/commsrootserverconfig/group/ts_rootserver.iby	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* 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:
-*
-*/
-#ifndef __TS_ROOTSERVER_IBY__
-#define __TS_ROOTSERVER_IBY__
-
-REM Comms Framework FLogger extension
-#include <commsdebugutility.iby>
-
-#include <commsrootserver.iby>
-
-// copy the dll, scripts and ini files to rom
-file=ABI_DIR\DEBUG_DIR\ts_rootserver.dll     System\libs\ts_rootserver.dll
-file=ABI_DIR\DEBUG_DIR\testcpm.cpm           System\libs\testcpm.cpm
-
-data=EPOCROOT##epoc32\data\z\TestData\Scripts\ts_rootserver.script \TestData\Scripts\ts_rootserver.script
-
-
-data=EPOCROOT##epoc32\data\z\TestData\configs\ts_rootserver.ini 			\TestData\configs\ts_rootserver.ini
-
-#endif
-
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTest.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-// Copyright (c) 2003-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:
-// This is the header file for ROOTSERVER common defs
-// 
-//
-
-
-#if (!defined __ROOTSERVERTEST_H__)
-#define __ROOTSERVERTEST_H__
-
-// special values for InitDelay
-#define EXIT_BEFORE_RENDEZVOUS  (-1)
-#define PANIC_BEFORE_RENDEZVOUS (-2)
-#define PANIC_AFTER_RENDEZVOUS  (-3)
-
-#define NO_PREMATURE_DEATH (-1)
-
-
-typedef struct t_TestModuleIniData
-	{
-	TInt iInitDelay;
-	TInt iDeathDelay;
-	TInt iDiscoveryDelay;
-	TInt iBindDelay;
-	TInt iUnbindDelay;
-	TInt iShutdownDelay;
-	} TTestModuleIniDataContainer;
-
-class TTestModuleIniData : public TPckg<TTestModuleIniDataContainer>
-	{
-public:
-	TTestModuleIniData():TPckg<TTestModuleIniDataContainer>(iParams) {};
-public:
-	TTestModuleIniDataContainer iParams;
-	};
-
-
-#endif //(__ROOTSERVERTEST_H__)
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection1.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-// Copyright (c) 2003-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:
-// This contains ESock Test cases from section 1
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <es_mbman.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include <networking/testsuite.h>
-
-#include "TestStepRootServer.h"
-#include "TestSuiteRootServer.h"
-#include "RootServerTestSection1.h"
-
-
-// Test step 1.1 - Set MBufPoolSize
-CRootServerTest1_1::CRootServerTest1_1()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test1.1");
-}
-
-TVerdict CRootServerTest1_1::doTestStepL( void )
-{
-	Log(_L("Test Purpose: Set MBufPoolSize"));
-	Log(_L("Depreciated by PREQ1248."));
-	return EPass;
-
-	}
-
-// Test step 1.2 - Test that StartC32() doesnt leak handles.
-CRootServerTest1_2::CRootServerTest1_2()
-    {
-	// store the name of this test case
-	iTestStepName = _L("Test1.2");
-    }
-
-TVerdict CRootServerTest1_2::doTestStepL( void )
-    {
-	Log(_L("Test Purpose: Test that StartC32() doesnt leak handles"));
-
-    TAutoClose<RThread> thisThread;
-
-	//*****************step 1*************************
-	// Open handle on current thread
-	Log(_L("01 Open handle on current thread"));
-    TInt result=thisThread.iObj.Open(RThread().Id());
-	if (KErrNone != result)
-		{
-		return EFail;
-		}
-
-	//*****************step 2*************************
-	// Get handlecount of thread
-	Log(_L("02 Get handlecount of thread"));
-    TInt threadhandlecount, processhandlecount;
-    thisThread.iObj.HandleCount(processhandlecount, threadhandlecount);
-
-	//*****************step 3*************************
-	// Start comms process
-	Log(_L("03 Start comms process"));
- 	_LIT(KPhbkSyncCMI, "phbsync.cmi, c32.cmi, etel.cmi, esock.cmi, esock_main.cmi, esock_codealer1.cmi, esock_codealer2.cmi, esock_ip.cmi, esock_mip.cmi, esock_dip.cmi, esock_tr.cmi, esock_ir.cmi, esock_bt.cmi, esock_smswap.cmi, esock_pdummy1.cmi, esock_pdummy2.cmi, esock_ipc.cmi, esock_sip.cmi");
-    result = StartC32WithCMISuppressions(KPhbkSyncCMI);
-	if (KErrNone != result)
-		{
-		return EFail;
-		}
-
-	//*****************step 4*************************
-	// Get handlecount of thread
-	Log(_L("04 Get handlecount of thread"));
-    TInt threadhandlecount2, processhandlecount2;
-    thisThread.iObj.HandleCount(processhandlecount2, threadhandlecount2);
-
-	if (threadhandlecount2!=threadhandlecount)
-		{
-		return EFail;
-		}
-
-	return EPass;
-	}
-
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection1.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-// Copyright (c) 2003-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:
-// This is the header file for ROOTSERVER test section 1
-// 
-//
-
-
-#if (!defined __ROOTSERVERTEST_1_H__)
-#define __ROOTSERVERTEST_1_H__
-
-
-class CRootServerTest1_1 : public CTestStepRootServer
-    {
-public:
-	CRootServerTest1_1();
-
-	virtual TVerdict doTestStepL( void );
-    };
-
-class CRootServerTest1_2 : public CTestStepRootServer
-    {
-public:
-	CRootServerTest1_2();
-
-	virtual TVerdict doTestStepL( void );
-    };
-
-#endif //(__ROOTSERVERTEST_1_H__)
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection2.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,242 +0,0 @@
-// Copyright (c) 2003-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:
-// This contains ESock Test cases from section 2
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// RootServer includes
-#include <es_mbman.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include <networking/testsuite.h>
-
-#include "TestStepRootServer.h"
-#include "TestSuiteRootServer.h"
-#include "TestAsynchHandler.h"
-
-#include "RootServerTestSection2.h"
-#include "RootServerTest.h"
-
-// Test step 2.1 - Enumerate with No Servers
-CRootServerTest2_1::CRootServerTest2_1()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test2.1");
-}
-
-TVerdict CRootServerTest2_1::doTestStepL( void )
-	{
-	TVerdict verdict = EPass;
-
-	Log(_L("Test Purpose: Enumerate with No Servers"));
-
-	// enumerate servers
-	Log(_L("02 Enumerating servers"));
-
-	TCFModuleName moduleName;
-	TRSIter position;
-	TInt ret = iRootServerSuite->RootSess().EnumerateModules(position, moduleName);
-	Log(_L("Enumerate returned %d"), ret);
-
-	if (KErrEof != ret)
-		{
-		verdict = EFail;
-		}
-
-	return verdict;
-	}
-
-
-// Test step 2.2 - Enumerate
-CRootServerTest2_2::CRootServerTest2_2()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test2.2");
-	}
-
-TVerdict CRootServerTest2_2::doTestStepL( void )
-	{	
-	TVerdict verdict = EPass;
-
-	Log(_L("Test Purpose: EnumerateModules"));
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	Log(_L8("01 Loading first cpm: %S"), &KModule1());
-	LoadNormalModuleL(asynchHandler, KModule1);
-
-	Log(_L8("02 Loading second cpm: %S"), &KModule2());
-	LoadNormalModuleL(asynchHandler, KModule2);
-
-	// uninstall active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-
-	// now enumerate
-	Log(_L("03 Enumerating once to get first servername"));
-
-	TCFModuleName moduleName;
-	TPtrC8 expectedModule2;
-	TRSIter position;
-	TInt ret = iRootServerSuite->RootSess().EnumerateModules(position, moduleName);
-
-	Log(_L("Enumerate returned %d"), ret);
-
-	if (KErrNone != ret)
-		{
-		verdict = EFail;
-		}
-	else
-		{
-		if (moduleName == KModule1)
-			{
-			expectedModule2.Set(KModule2);
-			}
-		else if(moduleName == KModule2)
-			{
-			expectedModule2.Set(KModule1);
-			}
-		else
-			{
-			Log(_L8("%S not found in serverlist"), &moduleName);
-			verdict = EFail;
-			}
-		if(expectedModule2.Length())
-			{
-			Log(_L("Found first so enumerating again to get second servername"));
-			ret = iRootServerSuite->RootSess().EnumerateModules(position, moduleName);
-
-			Log(_L("Enumerate returned %d"), ret);
-
-			if (KErrNone != ret)
-				{
-				verdict = EFail;
-				}
-			else if (moduleName != expectedModule2)
-				{
-				Log(_L8("%S not found in serverlist"), &moduleName);
-				verdict = EFail;
-				}
-			else
-				{
-				Log(_L("Found second so enumerating again to get EOF"));
-				ret = iRootServerSuite->RootSess().EnumerateModules(position, moduleName);
-				Log(_L("Enumerate returned %d"), ret);
-				if(ret != KErrEof)
-					{
-					verdict = EFail;
-					}
-				else
-					{
-					Log(_L("Found end of enumeration; enumerating again to check stability"));
-					ret = iRootServerSuite->RootSess().EnumerateModules(position, moduleName);
-					Log(_L("Enumerate returned %d"), ret);
-					if(ret != KErrEof)
-						{
-						verdict = EFail;
-						}
-					}
-				}
-			}
-			
-		}
-
-	return verdict;
-	}
-
-// Test step 2.3 - Enumerate submodules
-CRootServerTest2_3::CRootServerTest2_3()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test2.3");
-	}
-
-TVerdict CRootServerTest2_3::doTestStepL( void )
-	{	
-	TVerdict verdict = EPass;
-
-	Log(_L("Test Purpose: EnumerateSubModules"));
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	Log(_L8("01 Loading test module: %S"), &KModule1());
-	LoadNormalModuleL(asynchHandler, KModule1);
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	
-	TCFSubModuleName subModule;
-	TCFModuleName module(KModule1());
-	TBuf<0x40> str;
-	TCFSubModuleName expected1(_L8("Test Protocol1"));
-	TCFSubModuleName expected2(_L8("Test Protocol2"));
-	TCFSubModuleName expected3(_L8("Test Protocol3"));
-	TCFSubModuleName* expected[] = { &expected1, &expected2, &expected3 };
-	const TInt cntExpected = sizeof(expected) / sizeof(expected[0]);
-	TInt idx;
-	TRSIter position;
-	TInt ret;
-	while((ret = iRootServerSuite->RootSess().EnumerateSubModules(module, position, subModule)) == KErrNone)
-		{
-		str.Copy(subModule);
-
-		Log(_L("Got %S"), &str);
-		for(idx = 0; idx < cntExpected; ++idx)
-			{
-			if ((expected[idx] && subModule == *expected[idx]))
-				{
-				expected[idx] = NULL;
-				break;
-				}
-			}
-		if(idx == cntExpected)
-			{
-			Log(_L("not an expected sub-module"));
-			verdict = EFail;
-			}
-		}
-	if(EPass == verdict && KErrEof != ret)
-		{
-		Log(_L("Enumeration didn't end with expected KErrEof"));
-		verdict = EFail;
-		}
-	else if((ret = iRootServerSuite->RootSess().EnumerateSubModules(module, position, subModule)) != KErrEof)
-		{
-		Log(_L("Further enumeration didn't return expected KErrEof"));
-		verdict = EFail;
-		}
-
-	for(idx = 0; idx < cntExpected; ++idx)
-		{
-		if (expected[idx])
-			{
-			Log(_L8("Expected sub-module %S wasn't enumerated"), expected[idx]);
-			verdict = EFail;
-			break;
-			}
-		}
-
-	return verdict;
-	}
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection2.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-// Copyright (c) 2003-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:
-// This is the header file for ROOTSERVER test section 2
-// 
-//
-
-
-#if (!defined __ROOTSERVERTEST_2_H__)
-#define __ROOTSERVERTEST_2_H__
-
-
-class CRootServerTest2_1 : public CTestStepRootServer
-{
-public:
-	CRootServerTest2_1();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest2_2 : public CTestStepRootServer
-{
-public:
-	CRootServerTest2_2();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest2_3 : public CTestStepRootServer
-{
-public:
-	CRootServerTest2_3();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-#endif //(__ROOTSERVERTEST_2_H__)
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection3.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,843 +0,0 @@
-// Copyright (c) 2003-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:
-// This contains ESock Test cases from section 3
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <es_mbman.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include <networking/testsuite.h>
-
-#include "TestStepRootServer.h"
-#include "TestSuiteRootServer.h"
-#include "TestAsynchHandler.h"
-
-#include "RootServerTest.h"
-#include "RootServerTestSection3.h"
-
-
-// Note: Test step 3.1 was a RRootServ::Connect() test; this is now obsolete
-
-// Test step 3.2 - SetMBufPoolSize After LoadServer
-CRootServerTest3_2::CRootServerTest3_2()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.2");
-	}
-
-
-TVerdict CRootServerTest3_2::doTestStepL( void )
-	{
-	TVerdict verdict = EPass;
-
-	Log(_L("Test Purpose: SetMBufPoolSize After LoadServer"));
-
-	// Create scheduler/active object framework
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	Log(_L8("01 Loading test module: %S"), &KModule1());
-	LoadNormalModuleL(asynchHandler, KModule1);
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-
-	// now try to set the buffer pool size
-	Log(_L("03 Setting MBufPoolSize"));
-	TInt ret = iRootServerSuite->RootSess().SetMBufPoolSize(0,KMBufDefaultHeapSize);
-
-	Log(_L("SetMBufPoolSize returned %d"), ret);
-	if (KErrInUse != ret)
-		{
-		verdict = EFail;
-		}
-
-	return verdict;
-	}
-
-
-TVerdict CRootServerTest3_DblLoad::LoadSameModuleTwiceL(TThreadPriority aPriority)
-	{
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-	startParams.iParams.iPriority = aPriority;
-
-	Log(_L8("02 Loading module: %S"), &startParams.iParams.iName);
-	asynchHandler->TryLoad(startParams, iniData);
-
-	CActiveScheduler::Start();
-
-    if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		User::Leave(asynchHandler->iStatus.Int());
-		}
-
-	// try to load same module again
-	Log(_L("03 Trying to load same module again"));
-	asynchHandler->TryLoad(startParams, iniData);
-	CActiveScheduler::Start();
-
-	Log(_L("LoadServer returned %d"), asynchHandler->iStatus.Int());
-    if (asynchHandler->iStatus != KErrRSModuleAlreadyExist)
-		{
-		verdict = EFail;
-		}
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-
-	return verdict;
-	}
-
-// Test step 3.3 - Load Same Module Twice
-CRootServerTest3_3::CRootServerTest3_3()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.3");
-	}
-
-TVerdict CRootServerTest3_3::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Load Same Module Twice (normal priority)"));
-	return LoadSameModuleTwiceL(EPriorityNormal);
-	}
-
-// Test step 3.4 - Load Same Module Twice with elevated priority
-CRootServerTest3_4::CRootServerTest3_4()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.4");
-	}
-
-TVerdict CRootServerTest3_4::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Load Same Module Twice (elevated priority)"));
-	return LoadSameModuleTwiceL(EPriorityRealTime);
-	}
-
-
-// Test step 3.5 - Retrieve Module Information
-CRootServerTest3_5::CRootServerTest3_5()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.5");
-	}
-
-TVerdict CRootServerTest3_5::doTestStepL( void )
-	{
-	TVerdict verdict = EPass;
-
-	Log(_L("Test Purpose: Retrieve Module Information"));
-
-	// Create scheduler/active object framework
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-
-	Log(_L8("02 Loading module: %S"), &startParams.iParams.iName);
-	asynchHandler->TryLoad(startParams, iniData);
-	CActiveScheduler::Start();
-
-    if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		User::Leave(asynchHandler->iStatus.Int());
-		}
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-
-	// now try to retrieve information about the module
-	Log(_L("03 Getting module information"));
-	TRSModuleInfo info;
-	TCFModuleName moduleName = KModule1();
-	TInt ret = iRootServerSuite->RootSess().GetModuleInfo(moduleName, info);
-	Log(_L8("GetModuleInfo for %S returned %d"), &moduleName, ret);
-
-	if(KErrNone != ret)
-		{
-		return EFail;
-		}
-
-	Log(_L("Filename %S, State %d, NumSubmodules %d"),
-		&info.iParams.iDll, info.iParams.iState, info.iParams.iNumSubModules);
-
-	if (startParams.iParams.iFilename != info.iParams.iDll ||
-		ERunning != info.iParams.iState ||
-		3 != info.iParams.iNumSubModules)
-		{
-		return EFail;
-		}
-
-	// now ask for info about a non-existent module
-	Log(_L("04 Getting module information for non-existent module"));
-
-	moduleName = KModule2;
-	ret = iRootServerSuite->RootSess().GetModuleInfo(moduleName, info);
-	Log(_L8("GetModuleInfo for %S returned %d"), &moduleName, ret);
-
-	if(KErrRSModuleUnknown != ret)
-		{
-		return EFail;
-		}
-
-	return verdict;
-	}
-
-
-// Test step 3.6 - CancelLoadModule Before Thread Starts
-CRootServerTest3_6::CRootServerTest3_6()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.6");
-	}
-
-TVerdict CRootServerTest3_6::doTestStepL( void )
-	{
-	TVerdict verdict = EPass;
-
-	Log(_L("Test Purpose: CancelLoadModule Before Thread Starts"));
-
-	// Create scheduler/active object framework
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-	iniData.iParams.iInitDelay = isRendezvousDelayTime;
-
-	Log(_L8("02 Loading module: %S"), &startParams.iParams.iName);
-	asynchHandler->TryLoad(startParams, iniData);
-
-//	User::After(5000000);
-
-	Log(_L8("03 Cancelling Loading module: %S"), &startParams.iParams.iName);
-	iRootServerSuite->RootSess().CancelLoadCpm(startParams.iParams.iName);
-
-	CActiveScheduler::Start();
-
-    Log(_L("LoadServer status was: <%d> "), asynchHandler->iStatus.Int());
-
-    if ((KErrCancel != asynchHandler->iStatus.Int()) && (KErrNone != asynchHandler->iStatus.Int()))
-		{
-		verdict = EFail;
-		}
-    
-    // Unload the CPM anyway in case we were too late to cancel the load.
-    TRequestStatus status;
-    iRootServerSuite->RootSess().UnloadCpm(status, startParams.iParams.iName, EImmediate);
-    User::WaitForRequest(status);
-
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-
-
-// Test step 3.7 - CancelLoadServer After Rendezvous
-CRootServerTest3_7::CRootServerTest3_7()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.7");
-	}
-
-TVerdict CRootServerTest3_7::doTestStepL( void )
-	{
-	TVerdict verdict = EPass;
-
-	Log(_L("Test Purpose: CancelLoadServer After Rendezvous"));
-
-	// Create scheduler/active object framework
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-	Log(_L8("02 Loading module: %S"), &startParams.iParams.iName);
-	asynchHandler->TryLoad(startParams, iniData);
-
-	// now wait for testserver to meet rendezvous before cancelling load (give it
-	User::After(1000000);
-	Log(_L8("03 Cancelling Loading module: %S"), &startParams.iParams.iName);
-	iRootServerSuite->RootSess().CancelLoadCpm(startParams.iParams.iName);
-
-	CActiveScheduler::Start();
-
-    Log(_L("LoadServer status was: <%d> "), asynchHandler->iStatus.Int());
-
-    if (KErrNone != asynchHandler->iStatus.Int())
-		{
-		verdict = EFail;
-		}
-
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-
-	return verdict;
-	}
-
-// Test step 3.8 - Close Session with Pending LoadServer
-CRootServerTest3_8::CRootServerTest3_8()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.8");
-	}
-
-TVerdict CRootServerTest3_8::doTestStepL( void )
-	{
-	TVerdict verdict = EPass;
-
-	Log(_L("Test Purpose: Close Session with Pending LoadServer"));
-
-	// Create scheduler/active object framework
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-	iniData.iParams.iInitDelay = isRendezvousDelayTime;
-
-	Log(_L8("02 Loading module: %S"), &startParams.iParams.iName);
-	asynchHandler->TryLoad(startParams, iniData);
-
-	Log(_L("03 Closing Session"));
-	iRootServerSuite->RootSess().Close();
-	Log(_L("RRootServ.Close() completed"));
-
-	CActiveScheduler::Start();
-
-	// note that if the session was closed before the module's thread started,
-	// the handler should have been KErrCancelled
-    Log(_L("LoadServer status was: <%d> "), asynchHandler->iStatus.Int());
-    if ((KErrCancel != asynchHandler->iStatus.Int()) && (KErrNone != asynchHandler->iStatus.Int()))
-		{
-		verdict = EFail;
-		}
-
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-
-	return verdict;
-	}
-
-
-// Test step 3.9 - Module Exits Before Rendezvous
-CRootServerTest3_9::CRootServerTest3_9()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.9");
-	}
-
-TVerdict CRootServerTest3_9::doTestStepL( void )
-	{
-	TVerdict verdict = EFail;
-
-	Log(_L("Test Purpose: Module Exits Before Rendezvous"));
-
-	// Create scheduler/active object framework
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-	iniData.iParams.iInitDelay = EXIT_BEFORE_RENDEZVOUS;
-
-	Log(_L8("03 Loading module: %S"), &startParams.iParams.iName);
-	asynchHandler->TryLoad(startParams, iniData);
-
-	CActiveScheduler::Start();
-
-    Log(_L("LoadServer status was: <%d>"), asynchHandler->iStatus.Int());
-
-    if (KErrNone != asynchHandler->iStatus.Int())
-		{
-		verdict = EPass;
-		}
-
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-
-	return verdict;
-	}
-
-// Test step 3.10 - Module Panics Before Meeting Rendezvous
-CRootServerTest3_10::CRootServerTest3_10()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.10");
-	}
-
-TVerdict CRootServerTest3_10::doTestStepL( void )
-	{
-	TVerdict verdict = EFail;
-
-	Log(_L("Test Purpose: Module Panics Before Meeting Rendezvous"));
-
-	// Create scheduler/active object framework
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-#ifdef SYMBIAN_C32ROOT_API_V3
-	startParams.iParams.iControlFlags = TRSStartModuleParamContainer::KCF_UnstableModule;
-#endif
-	iniData.iParams.iInitDelay = PANIC_BEFORE_RENDEZVOUS;
-
-	// make sure WINS doesn't stop at panic
-	TBool jitDbg = User::JustInTime();
-	User::SetJustInTime(EFalse);
-	Log(_L8("03 Loading module: %S"), &startParams.iParams.iName);
-	asynchHandler->TryLoad(startParams, iniData);
-
-	CActiveScheduler::Start();
-
-    Log(_L("LoadServer status was: <%d> "), asynchHandler->iStatus.Int());
-
-    if (KErrNone != asynchHandler->iStatus.Int())
-		{
-		verdict = EPass;
-		}
-
-	// Restore enclosing JIT status
-	User::SetJustInTime(jitDbg);
-
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-
-	return verdict;
-	}
-
-// Test step 3.11 - Module Panics After Meeting Rendezvous
-CRootServerTest3_11::CRootServerTest3_11()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.11");
-	}
-
-TVerdict CRootServerTest3_11::doTestStepL( void )
-	{
-	TVerdict verdict = EFail;
-
-	Log(_L("Test Purpose: Module Panics After Meeting Rendezvous"));
-
-	// Create scheduler/active object framework
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-#ifdef SYMBIAN_C32ROOT_API_V3
-	startParams.iParams.iControlFlags = TRSStartModuleParamContainer::KCF_UnstableModule;
-#endif
-	iniData.iParams.iInitDelay = PANIC_AFTER_RENDEZVOUS;
-
-	// make sure WINS doesn't stop at panic
-	TBool jitDbg = User::JustInTime();
-	User::SetJustInTime(EFalse);
-	Log(_L8("03 Loading module: %S"), &startParams.iParams.iName);
-	asynchHandler->TryLoad(startParams, iniData);
-
-	CActiveScheduler::Start();
-
-    Log(_L("LoadServer status was: <%d> "), asynchHandler->iStatus.Int());
-
-    if (KErrServerTerminated == asynchHandler->iStatus.Int())
-		{
-		verdict = EPass;
-		}
-
-	// Restore enclosing JIT status
-	User::SetJustInTime(jitDbg);
-
-	// destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-
-	return verdict;
-	}
-
-
-// Test step 3.12 - Load 2 modules sharing the same heap
-CRootServerTest3_12::CRootServerTest3_12()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.12");
-	}
-
-TVerdict CRootServerTest3_12::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Load 2 modules sharing the same heap"));
-
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	_LIT8(KShareModule1, "Test ModuleShare1");
-	_LIT8(KShareModule2, "Test ModuleShare2");
-	startParams.iParams.iName = KShareModule1;
-
-	asynchHandler->TryLoad(startParams, iniData);
-    CActiveScheduler::Start();
-   	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		User::Leave(asynchHandler->iStatus.Int());
-		}
-
-	//*****************step 3************************
-	Log(_L("03 Load Test Module"));
-	startParams.iParams.iName = KShareModule2;
-	startParams.iParams.iHeapType = EShareHeap;
-	startParams.iParams.iShareHeapWith = KShareModule1;
-
-	asynchHandler->TryLoad(startParams, iniData);
-	CActiveScheduler::Start();
-
-	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EFail;
-		}
-
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-
-// Test step 3.13 - Load 2 modules with private heaps
-CRootServerTest3_13::CRootServerTest3_13()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.13");
-	}
-
-TVerdict CRootServerTest3_13::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Load 2 modules with private heaps"));
-
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-	startParams.iParams.iHeapType = ENewHeap;
-
-	asynchHandler->TryLoad(startParams, iniData);
-    CActiveScheduler::Start();
-   	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		User::Leave(asynchHandler->iStatus.Int());
-		}
-
-	//*****************step 3************************
-	Log(_L("03 Load Test Module"));
-	startParams.iParams.iName = KModule2;
-	startParams.iParams.iHeapType = ENewHeap;
-
-	asynchHandler->TryLoad(startParams, iniData);
-	CActiveScheduler::Start();
-
-	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EFail;
-		}
-
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-
-// Test step 3.14 - Load sluggish module
-CRootServerTest3_14::CRootServerTest3_14()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.14");
-	}
-
-TVerdict CRootServerTest3_14::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Load sluggish module"));
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-	iniData.iParams.iDiscoveryDelay = 500;
-	iniData.iParams.iBindDelay = 1000;
-	iniData.iParams.iUnbindDelay = 1000;
-	iniData.iParams.iShutdownDelay = 1000;
-	asynchHandler->TryLoad(startParams, iniData);
-
-    CActiveScheduler::Start();
-   	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EFail;
-		}
-
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-
-	}
-
-// Test step 3.14 - Load dormant module
-CRootServerTest3_15::CRootServerTest3_15()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.15");
-	}
-
-TVerdict CRootServerTest3_15::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Load Dormant module"));
-	//*****************step 1*************************//
-	TVerdict verdict = EFail;
-
-	// Create scheduler/active object framework
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	//*****************step 3************************
-	Log(_L("03 Load Dormant Module"));
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-	startParams.iParams.iHeapType = ENewHeap;	// when zombie is killed memory will leak
-	iniData.iParams.iDiscoveryDelay = 30000;
-
-	asynchHandler->TryLoad(startParams, iniData);
-    CActiveScheduler::Start();
-   	if (asynchHandler->iStatus != KErrRSZombie)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EFail;
-		}
-	else
-		{
-		//*****************step 4***********************
-		Log(_L("04 Unload Dormant Module"));
-		asynchHandler->TryUnLoad(startParams.iParams.iName, EUnGraceful);
-		CActiveScheduler::Start();
-
-		if (asynchHandler->iStatus != KErrNone)
-			{
-			Log(_L("Unload returned error: <%d> "), asynchHandler->iStatus.Int());
-			verdict = EInconclusive;
-			}
-		else
-			verdict = EPass;
-		}
-
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-
-	}
-
-// Test step 3.16 - Load test module and wait for death
-CRootServerTest3_16::CRootServerTest3_16()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.16");
-	}
-
-TVerdict CRootServerTest3_16::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Load test module, wait for death and check heap"));
-	//*****************step 1*************************//
-	TVerdict verdict = EFail;
-
-	// Create scheduler/active object framework
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	//*****************step 3************************
-	Log(_L("03 Load Test Module"));
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-#ifdef SYMBIAN_C32ROOT_API_V3
-	startParams.iParams.iControlFlags = TRSStartModuleParamContainer::KCF_UnstableModule;
-#endif
-	iniData.iParams.iDeathDelay = 5000;
-
-	asynchHandler->TryLoad(startParams, iniData);
-    CActiveScheduler::Start();
-   	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EInconclusive;
-		}
-	else
-		{
-		//*****************step 4***********************
-		Log(_L("04 Waiting for module to die"));
-
-		User::After(6000000);
-
-		TRSModuleInfo info;
-		TInt ret = iRootServerSuite->RootSess().GetModuleInfo(KModule1(), info);
-		Log(_L8("GetModuleInfo for %S returned %d"), &KModule1(), ret);
-
-		if(KErrRSModuleUnknown == ret)
-			{
-			verdict = EPass;
-			}
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-
-	}
-
-// Test step 3.17 - Load unknown module and cancel
-CRootServerTest3_17::CRootServerTest3_17()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.17");
-	}
-
-TVerdict CRootServerTest3_17::doTestStepL( void )
-	{
-	TVerdict verdict = EPass;
-
-	Log(_L("Test Purpose: Load unknown module and cancel"));
-
-	// Create scheduler/active object framework
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iFilename = _L("unknown_module.cpm");
-	startParams.iParams.iName = KModule1;
-
-	Log(_L8("02 Loading module: %S"), &startParams.iParams.iName);
-	asynchHandler->TryLoad(startParams, iniData);
-
-	User::After(1000000);
-	Log(_L8("03 Cancelling Loading module: %S"), &startParams.iParams.iName);
-	iRootServerSuite->RootSess().CancelLoadCpm(startParams.iParams.iName);
-
-	CActiveScheduler::Start();
-
-    Log(_L("LoadServer status was: <%d> "), asynchHandler->iStatus.Int());
-
-    if (KErrNotFound != asynchHandler->iStatus.Int())
-		{
-		verdict = EFail;
-		}
-
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-
-
-// Test step 3.18 - UnLoad unknown module and cancel
-CRootServerTest3_18::CRootServerTest3_18()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test3.18");
-	}
-
-TVerdict CRootServerTest3_18::doTestStepL( void )
-	{
-	TVerdict verdict = EPass;
-
-	Log(_L("Test Purpose: UnLoad unknown module and cancel"));
-
-	// Create scheduler/active object framework
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-	_LIT8(KUnknownModule, "unknown_module.cpm");
-	Log(_L8("02 UnLoading module: %S"), &KUnknownModule());
-	asynchHandler->TryUnLoad(KUnknownModule(), EUnGraceful);
-
-	User::After(1000000);
-	Log(_L8("03 Cancelling Unloading module: %S"), &KUnknownModule());
-	iRootServerSuite->RootSess().CancelUnloadCpm(KUnknownModule());
-
-	CActiveScheduler::Start();
-
-    Log(_L("UnLoadServer status was: <%d> "), asynchHandler->iStatus.Int());
-
-    if (KErrRSModuleNotLoaded != asynchHandler->iStatus.Int())
-		{
-		verdict = EFail;
-		}
-
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-
-
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection3.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-// Copyright (c) 2003-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:
-// This is the header file for ROOTSERVER test section 1
-// 
-//
-
-
-#if (!defined __ROOTSERVERTEST_3_H__)
-#define __ROOTSERVERTEST_3_H__
-
-
-class CRootServerTest3_2 : public CTestStepRootServer
-{
-public:
-	CRootServerTest3_2();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-
-class CRootServerTest3_DblLoad : public CTestStepRootServer
-	{
-protected:
-	TVerdict LoadSameModuleTwiceL(TThreadPriority aPriority);
-	};
-
-class CRootServerTest3_3 : public CRootServerTest3_DblLoad
-{
-public:
-	CRootServerTest3_3();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest3_4 : public CRootServerTest3_DblLoad
-{
-public:
-	CRootServerTest3_4();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest3_5 : public CTestStepRootServer
-{
-public:
-	CRootServerTest3_5();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest3_6 : public CTestStepRootServer
-{
-public:
-	CRootServerTest3_6();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest3_7 : public CTestStepRootServer
-{
-public:
-	CRootServerTest3_7();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest3_8 : public CTestStepRootServer
-{
-public:
-	CRootServerTest3_8();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest3_9 : public CTestStepRootServer
-{
-public:
-	CRootServerTest3_9();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest3_10 : public CTestStepRootServer
-{
-public:
-	CRootServerTest3_10();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest3_11 : public CTestStepRootServer
-{
-public:
-	CRootServerTest3_11();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest3_12 : public CTestStepRootServer
-{
-public:
-	CRootServerTest3_12();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest3_13 : public CTestStepRootServer
-{
-public:
-	CRootServerTest3_13();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest3_14 : public CTestStepRootServer
-{
-public:
-	CRootServerTest3_14();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest3_15 : public CTestStepRootServer
-{
-public:
-	CRootServerTest3_15();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest3_16 : public CTestStepRootServer
-{
-public:
-	CRootServerTest3_16();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest3_17 : public CTestStepRootServer
-{
-public:
-	CRootServerTest3_17();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest3_18 : public CTestStepRootServer
-{
-public:
-	CRootServerTest3_18();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-
-#endif //(__ROOTSERVERTEST_3_H__)
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection4.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-// Copyright (c) 2003-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:
-// This contains ESock Test cases from section 4
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <es_mbman.h>
-
-// Test system includes
-#include <comms-infras/commsdebugutility.h>
-#include <networking/teststep.h>
-#include <networking/testsuite.h>
-
-#include "TestStepRootServer.h"
-#include "TestSuiteRootServer.h"
-#include "TestAsynchHandler.h"
-
-#include "RootServerTest.h"
-#include "RootServerTestSection4.h"
-
-// Test step 4.1 - SuddenDeathListener
-CRootServerTest4_1::CRootServerTest4_1()
-	{
-	// store the name of this test case
-	iTestStepName = _L("Test4.1");
-	}
-
-
-TVerdict CRootServerTest4_1::doTestStepL( void )
-	{
-	TVerdict verdict = EPass;
-
-	Log(_L("Test Purpose: SuddenDeathListener"));
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-#if defined(SYMBIAN_C32ROOT_API_V3)
-	startParams.iParams.iControlFlags = TRSStartModuleParamContainer::KCF_UnstableModule;
-#endif
-	iniData.iParams.iDeathDelay = isTestServerLifeTime;
-
-	Log(_L8("02 Loading module: %S"), &startParams.iParams.iName);
-	asynchHandler->TryLoad(startParams, iniData);
-
-	CActiveScheduler::Start();
-    if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		User::Leave(asynchHandler->iStatus.Int());
-		}
-
-	// create a new active object for the sudden death handler
-	CTestAsynchHandler* suddenDeathHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	// wait for either sudden death indication or timeout
-	Log(_L("03 Waiting for sudden death for up to %1.3f seconds"), isTestServerWaitTime / 1000.0);
-	asynchHandler->WaitForTimer(isTestServerWaitTime);
-	suddenDeathHandler->TryWaitForDeath();
-	CActiveScheduler::Start();
-
-	// uninstall active scheduler
-	asynchHandler->Cancel();
-	suddenDeathHandler->Cancel();
-
-	// see which events have occurred 
-	// if root server worked then timer should not have expired
-	// and sudden death handler AO should have returned to idle
-	if (CTestAsynchHandler::EWaitingforTimer != asynchHandler->GetiState())
-		{
-		Log(_L("Timer expired"));
-		verdict = EFail;
-		}
-	
-	if (CTestAsynchHandler::EIdle != suddenDeathHandler->GetiState())
-		{
-		Log(_L("SuddenDeathHandler was not triggered"));
-		verdict = EFail;
-		}
-
-	// enumerate servers
-	Log(_L("04 Enumerating modules"));
-
-	TCFModuleName moduleName;
-	TRSIter position;
-	TInt ret = iRootServerSuite->RootSess().EnumerateModules(position, moduleName);
-	Log(_L("Enumerate returned %d"), ret);
-	if (KErrEof != ret)
-		{
-		Log(_L("Module left alive"));
-		verdict = EFail;
-		}
-
-
-	// destroy active objects and scheduler
-	CleanupStack::PopAndDestroy(suddenDeathHandler);
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-
-	return verdict;
-	}
-
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection4.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 2003-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:
-// This is the header file for ROOTSERVER test section 4
-// 
-//
-
-
-#if (!defined __ROOTSERVERTEST_4_H__)
-#define __ROOTSERVERTEST_4_H__
-
-
-class CRootServerTest4_1 : public CTestStepRootServer
-{
-public:
-	CRootServerTest4_1();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-#endif //(__ROOTSERVERTEST_4_H__)
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection5.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,484 +0,0 @@
-// Copyright (c) 2003-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:
-// This contains RootServer Test cases from section 6
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <es_mbman.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include <networking/testsuite.h>
-
-#include "TestStepRootServer.h"
-#include "TestSuiteRootServer.h"
-#include "TestAsynchHandler.h"
-#include "RootServerTestSection5.h"
-#include "RootServerTest.h"
-
-
-TVerdict CRootServerTest_GracefulUnload::UnloadGracefullyL(TThreadPriority aPriority)
-	{
-	TVerdict verdict = EFail;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-    //*****************step 2************************
-	Log(_L("02 Load test module"));
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-	startParams.iParams.iPriority = aPriority;
-
-	asynchHandler->TryLoad(startParams, iniData);
-    CActiveScheduler::Start();
-   	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EInconclusive;
-		}
-	else
-		{
-		//*****************step 4***********************
-		Log(_L("04 Unload Test Module"));
-
-		asynchHandler->TryUnLoad(startParams.iParams.iName, EGraceful);
-		
-		CActiveScheduler::Start();
-
-   		if (asynchHandler->iStatus != KErrNone)
-			{
-			Log(_L("Unload returned error: <%d> "), asynchHandler->iStatus.Int());
-			verdict = EInconclusive;
-			}
-		else
-			{
-			verdict = EPass;			
-			}
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-
-
-// Test step 5.1 - UnLoad Gracefully (normal priority)
-CRootServerTest5_1::CRootServerTest5_1()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test5.1");
-}
-
-TVerdict CRootServerTest5_1::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: UnLoad Comms Provider Module gracefully (normal priority)"));
-	return UnloadGracefullyL(EPriorityNormal);
-	}
-
-
-// Test step 5.2 - UnLoad Gracefully (elevated priority)
-CRootServerTest5_2::CRootServerTest5_2()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test5.2");
-}
-
-TVerdict CRootServerTest5_2::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: UnLoad Comms Provider Module gracefully (elevated priority)"));
-	return UnloadGracefullyL(EPriorityRealTime);
-	}
-
-
-// Test step 5.3 -  Cancel UnLoad Gracefully
-CRootServerTest5_3::CRootServerTest5_3()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test5.3");
-}
-
-TVerdict CRootServerTest5_3::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Cancel UnLoad Comms Provider Module gracefully"));
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	//*****************step 2************************
-	Log(_L("02 Load Test Module"));
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-
-	asynchHandler->TryLoad(startParams, iniData);
-    CActiveScheduler::Start();
-   	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EInconclusive;
-		}
-	else
-		{
-		//*****************step 3***********************
-		Log(_L("03 Unload Test Module"));
-		asynchHandler->TryUnLoad(startParams.iParams.iName, EGraceful);
-		
-		//*****************step 4***********************
-		Log(_L8("04 Cancelling UnLoad: %S"), &startParams.iParams.iName);
-		iRootServerSuite->RootSess().CancelUnloadCpm(startParams.iParams.iName);
-		
-		CActiveScheduler::Start();
-
-   		if ((asynchHandler->iStatus != KErrNone) && (asynchHandler->iStatus != KErrCancel))
-			{
-			Log(_L("Unload returned error: <%d> "), asynchHandler->iStatus.Int());
-			verdict = EFail;
-			}
-
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-
-
-TVerdict CRootServerTest_UngracefulUnload::UnloadNonGracefullyL(TThreadPriority aPriority)
-	{
-	TVerdict verdict = EFail;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	//*****************step 3************************
-	Log(_L("03 Load Test Module"));
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-	startParams.iParams.iPriority = aPriority;
-
-	asynchHandler->TryLoad(startParams, iniData);
-    CActiveScheduler::Start();
-   	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EInconclusive;
-		}
-	else
-		{
-		//*****************step 4***********************
-		Log(_L("04 Unload Test Module"));
-		asynchHandler->TryUnLoad(startParams.iParams.iName, EUnGraceful);
-		
-		CActiveScheduler::Start();
-
-   		if (asynchHandler->iStatus != KErrNone)
-			{
-			Log(_L("Unload returned error: <%d> "), asynchHandler->iStatus.Int());
-			verdict = EInconclusive;
-			}
-		else
-			{
-			verdict = EPass;			
-			}
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-	
-
-// Test step 5.4 - UnLoad Ungracefully - normal priority
-CRootServerTest5_4::CRootServerTest5_4()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test5.4");
-}
-
-TVerdict CRootServerTest5_4::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: UnLoad Comms Provider Module Ungracefully (normal priority)"));
-	return UnloadNonGracefullyL(EPriorityNormal);
-	}
-
-// Test step 5.5 - UnLoad Ungracefully - elevated priority
-CRootServerTest5_5::CRootServerTest5_5()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test5.5");
-}
-
-TVerdict CRootServerTest5_5::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: UnLoad Comms Provider Module Ungracefully (elevated priority)"));
-	return UnloadNonGracefullyL(EPriorityRealTime);
-	}
-
-
-// Test step 5.6 - Cancel UnLoad Ungracefully
-CRootServerTest5_6::CRootServerTest5_6()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test5.6");
-}
-
-TVerdict CRootServerTest5_6::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Cancel UnLoad Comms Provider Module Ungracefully"));
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	//*****************step 2************************
-	Log(_L("02 Load Test Module"));
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-
-	asynchHandler->TryLoad(startParams, iniData);
-    CActiveScheduler::Start();
-   	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("Load returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EInconclusive;
-		}
-	else
-		{
-		//*****************step 3***********************
-		Log(_L("03 Unload Test Module"));
-		asynchHandler->TryUnLoad(startParams.iParams.iName, EUnGraceful);
-		
-		//*****************step 4***********************
-		Log(_L8("04 Cancelling UnLoad: %S"), &startParams.iParams.iName);
-		iRootServerSuite->RootSess().CancelUnloadCpm(startParams.iParams.iName);
-		
-		CActiveScheduler::Start();
-    
-	    // Unload the CPM anyway in case we were too late to cancel the load.
-	    TRequestStatus status;
-	    iRootServerSuite->RootSess().UnloadCpm(status, startParams.iParams.iName, EImmediate);
-	    User::WaitForRequest(status);
-
-   		if (asynchHandler->iStatus != KErrNone)
-			{
-			Log(_L("Unload returned error: <%d> "), asynchHandler->iStatus.Int());
-			verdict = EFail;
-			}
-
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-	
-	
-// Test step 5.7 - UnLoad 2 modules sharing the same heap
-CRootServerTest5_7::CRootServerTest5_7()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test5.7");
-}
-
-TVerdict CRootServerTest5_7::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: UnLoad 2 modules sharing the same heap"));
-	TVerdict verdict = EFail;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-    
-	//*****************step 3************************
-	Log(_L("03 Load Test Module_Share1"));
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	_LIT8(KShareModule1, "Test ModuleShare1");
-	_LIT8(KShareModule2, "Test ModuleShare2");
-	startParams.iParams.iName = KShareModule1;
-
-	asynchHandler->TryLoad(startParams, iniData);
-    CActiveScheduler::Start();
-   	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		User::Leave(asynchHandler->iStatus.Int());
-		}
-
-	//*****************step 3************************
-	Log(_L("03 Load Test Module"));
-	startParams.iParams.iName = KShareModule2;
-	startParams.iParams.iHeapType = EShareHeap;
-	startParams.iParams.iShareHeapWith = KShareModule1;
-
-	asynchHandler->TryLoad(startParams, iniData);
-	CActiveScheduler::Start();
-
-	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		User::Leave(asynchHandler->iStatus.Int());
-		}
-
-    //*****************step 5***********************
-	Log(_L("05 Unload Test Module_Share1"));
-	startParams.iParams.iName = KShareModule1;
-	asynchHandler->TryUnLoad(startParams.iParams.iName, EGraceful);
-	CActiveScheduler::Start();
-
-	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("Unload returned error: <%d> "), asynchHandler->iStatus.Int());
-		User::Leave(asynchHandler->iStatus.Int());
-		}
-
-	//*****************step 6***********************
-	Log(_L("06 Unload Test Module_Share2"));
-	startParams.iParams.iName = KShareModule2;
-	asynchHandler->TryUnLoad(startParams.iParams.iName, EGraceful);
-	
-	CActiveScheduler::Start();
-
-	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("Unload returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EInconclusive;
-		}
-	else
-		{
-		verdict = EPass;			
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-    
-    
-// Test step 5.8 - Unload Sluggish CPM Gracefully with intervening Close of Session
-CRootServerTest5_8::CRootServerTest5_8()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test5.8");
-}
-
-TVerdict CRootServerTest5_8::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Unload Sluggish CPM Gracefully with intervening Close of Session"));
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-    
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-	iniData.iParams.iShutdownDelay = isTestServerLifeTime;
-	Log(_L8("01 Loading sluggish module: %S"), &startParams.iParams.iName);
-	asynchHandler->TryLoad(startParams, iniData);
-
-	CActiveScheduler::Start();
-    if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		User::Leave(asynchHandler->iStatus.Int());
-		}
-
-	Log(_L("02 Unload sluggish Module"));
-	asynchHandler->TryUnLoad(startParams.iParams.iName, EGraceful);
-
-	// Brief wait to give unload chance to start
-	User::After(250 * 1000);
-
-	// Close the session
-	Log(_L("03 Closing RRootServ"));
-	iRootServerSuite->RootSess().Close();
-	// Brief wait for any fireworks
-	User::After(250 * 1000);
-	
-	// Let the request complete
-	CActiveScheduler::Start();
-
-	// Reconnect the session
-	Log(_L("04 Reconnecting RRootServ"));
-	TInt ret = iRootServerSuite->RootSess().Connect();
-	if (ret != KErrNone)
-		{
-		Log(_L("Reconnect of RRootServ failed with error: <%d> "), ret);
-		User::Leave(ret);
-		}
-	// Brief wait for any fireworks
-	User::After(250 * 1000);
-
-	// now try to retrieve information about the module; should be ERunning after session close
-	// causes unload handler to be canceled
-	Log(_L("05 Getting module information"));
-	TRSModuleInfo info;
-	TCFModuleName moduleName = startParams.iParams.iName;
-	ret = iRootServerSuite->RootSess().GetModuleInfo(moduleName, info);
-	Log(_L8("GetModuleInfo for %S returned %d, state %c= ERunning"), &moduleName, ret, info.iParams.iState == ERunning ? '=': '!');
-	
-	if(KErrNone != ret || info.iParams.iState != ERunning)
-		{
-		CleanupStack::PopAndDestroy(asynchHandler);
-		CleanupStack::PopAndDestroy(scheduler);
-		return EFail;
-		}
-
-	// Wait for it to finish stopping when its thread terminates, query again
-	Log(_L("06 Getting module information after waiting for stop"));
-	User::After((iniData.iParams.iShutdownDelay + 500) * 1000);
-	moduleName = startParams.iParams.iName;
-	ret = iRootServerSuite->RootSess().GetModuleInfo(moduleName, info);
-	Log(_L8("GetModuleInfo for %S returned %d"), &moduleName, ret);
-	
-	if(KErrRSModuleUnknown != ret)
-		{
-		CleanupStack::PopAndDestroy(asynchHandler);
-		CleanupStack::PopAndDestroy(scheduler);
-		return EFail;
-		}
-
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-    
-    
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection5.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-// Copyright (c) 2003-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:
-// This is the header file for ROOTSERVER test section 1
-// 
-//
-
-
-#if (!defined __ROOTSERVERTEST_5_H__)
-#define __ROOTSERVERTEST_5_H__
-
-class CRootServerTest_GracefulUnload : public CTestStepRootServer
-{
-protected:
-	TVerdict UnloadGracefullyL(TThreadPriority aPriority);
-};
-
-class CRootServerTest5_1 : public CRootServerTest_GracefulUnload
-{
-public:
-	CRootServerTest5_1();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest5_2 : public CRootServerTest_GracefulUnload
-{
-public:
-	CRootServerTest5_2();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest5_3 : public CTestStepRootServer
-{
-public:
-	CRootServerTest5_3();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest_UngracefulUnload: public CTestStepRootServer
-	{
-protected:
-	TVerdict UnloadNonGracefullyL(TThreadPriority aPriority);
-	};
-
-class CRootServerTest5_4 : public CRootServerTest_UngracefulUnload
-{
-public:
-	CRootServerTest5_4();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest5_5 : public CRootServerTest_UngracefulUnload
-{
-public:
-	CRootServerTest5_5();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest5_6 : public CTestStepRootServer
-{
-public:
-	CRootServerTest5_6();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest5_7 : public CTestStepRootServer
-{
-public:
-	CRootServerTest5_7();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest5_8 : public CTestStepRootServer
-{
-public:
-	CRootServerTest5_8();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-
-#endif //(__ROOTSERVERTEST_1_H__)
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection6.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,818 +0,0 @@
-// Copyright (c) 2003-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:
-// This contains RootServer Test cases from section 6
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <es_mbman.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include <networking/testsuite.h>
-
-#include "TestStepRootServer.h"
-#include "TestSuiteRootServer.h"
-#include "TestAsynchHandler.h"
-#include "RootServerTestSection6.h"
-#include <cfshared.h>
-#include "RootServerTest.h"
-
-
-// Test step 6.1 - Bind without loading
-CRootServerTest6_1::CRootServerTest6_1()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test6.1");
-}
-
-TVerdict CRootServerTest6_1::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Bind without loading"));
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	//*****************step 2************************
-	Log(_L("02 Attempting bind"));
-	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
-	if (ret != KErrRSModuleNotLoaded)
-		{
-		Log(_L("LoadProvider returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EFail;
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-
-	}
-	
-	// Test step 6.2 - Bind loaded to unloaded
-CRootServerTest6_2::CRootServerTest6_2()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test6.2");
-}
-
-TVerdict CRootServerTest6_2::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Bind loaded to unloaded"));
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	//*****************step 02*************************//
-	Log(_L("02 Load Test Module"));
-	LoadNormalModuleL(asynchHandler, KModule1);
-
-	//*****************step 3************************
-	Log(_L("03 Attempting bind"));
-	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule2, KSubModule1);
-	if (ret != KErrRSModuleNotLoaded)
-		{
-		Log(_L("Bind returned error: <%d> "), ret);
-		verdict = EFail;
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-
-	}
-
-
-TVerdict CRootServerTest6_BindWithinModule::BindWithinModuleL(TThreadPriority aPriority)
-	{
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	//*****************step 01*************************//
-	Log(_L("01 Load Test Module"));
-	LoadNormalModuleL(asynchHandler, KModule1, aPriority);
-
-	//*****************step 2***********************
-	Log(_L("02 Attempting Bind"));
-	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
-	if (ret != KErrNone)
-		{
-		Log(_L("Bind returned error: <%d> "), ret);
-		verdict = EFail;
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-
-// Test step 6.3 - Bind within a module (normal priority)
-CRootServerTest6_3::CRootServerTest6_3()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test6.3");
-}
-
-TVerdict CRootServerTest6_3::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Bind within module (normal priority)"));
-	return BindWithinModuleL(EPriorityNormal);
-	}
-	
-// Test step 6.4 - Bind within a module (elevated priority)
-CRootServerTest6_4::CRootServerTest6_4()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test6.4");
-}
-
-TVerdict CRootServerTest6_4::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Bind within module (elevated priority)"));
-	return BindWithinModuleL(EPriorityRealTime);
-	}
-
-// Test step 6.5 - Bind submodule to itself
-CRootServerTest6_5::CRootServerTest6_5()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test6.5");
-}
-
-TVerdict CRootServerTest6_5::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Bind submodule to itself"));
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	//*****************step 01*************************//
-	Log(_L("01 Load Test Module"));
-	LoadNormalModuleL(asynchHandler, KModule1);
-
-	//*****************step 2***********************
-	Log(_L("02 Attempting Bind"));
-	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule1);
-	if (ret != KErrNone)
-		{
-		Log(_L("Bind returned error: <%d> "), ret);
-		verdict = EFail;
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-
-// Test step 6.6 - Bind already bound
-CRootServerTest6_6::CRootServerTest6_6()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test6.6");
-}
-
-TVerdict CRootServerTest6_6::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Bind again"));
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	//*****************step 01*************************//
-	Log(_L("01 Load Test Module"));
-	LoadNormalModuleL(asynchHandler, KModule1);
-
-	//*****************step 2************************
-	Log(_L("02 Bind internally"));
-	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
-	if (ret != KErrNone)
-		{
-		Log(_L("Bind returned error: <%d> "), ret);
-		User::Leave(ret);
-		}
-
-	//*****************step 3************************
-	Log(_L("03 Bind Again"));
-	ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
-	if (ret != KErrRSAlreadyBound)
-		{
-		Log(_L("Bind returned error: <%d> "), ret);
-		User::Leave(KErrGeneral);
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-
-	}
-	
-// Test step 6.7 - Enumerate BindInfo
-CRootServerTest6_7::CRootServerTest6_7()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test6.7");
-}
-
-TVerdict CRootServerTest6_7::doTestStepL( void )
-	{
-	TCFSubModuleAddress fullName1;
-	fullName1.SetModule(KModule1());
-	fullName1.SetSubModule(KSubModule1());
-	TCFSubModuleAddress fullName2;
-	fullName2.SetModule(KModule1());
-	fullName2.SetSubModule(KSubModule2());	
-	
-	Log(_L("Test Purpose: Enumerate BindInfo"));
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-	//*****************step 01*************************//
-	Log(_L("01 Load Test Module"));
-	LoadNormalModuleL(asynchHandler, KModule1);
-
-	//*****************step 2************************
-	Log(_L("02 Bind internally"));
-	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
-	if (ret != KErrNone)
-		{
-		Log(_L("Bind returned error: <%d> "), ret);
-		User::Leave(ret);
-		}
-
-	TRSBindingInfo bindInfo;
-	TRSIter position;
-	
-	//*****************step 2************************
-	Log(_L("02 Enumerate bindings"));
-	ret = iRootServerSuite->RootSess().EnumerateBindings(fullName1, position, bindInfo);
-
-	Log(_L("Enumerate returned %d"), ret);
-
-	if (KErrNone != ret)
-		{
-		verdict = EFail;
-		}
-	else
-		{		
-		if ( (bindInfo.iParams.iAddress1 == fullName1) && (bindInfo.iParams.iAddress2 == fullName2) )
-			{
-			Log(_L("Binding Found") );
-			}
-		else if ( (bindInfo.iParams.iAddress1 == fullName2) && (bindInfo.iParams.iAddress2 == fullName1) )
-			{
-			Log(_L("Binding Found") );
-			}
-		else
-			{
-			Log(_L("Binding not found"));
-			verdict = EFail;
-			}
-		ret = iRootServerSuite->RootSess().EnumerateBindings(fullName1, position, bindInfo);
-		Log(_L("Follow-up Enumerate returned %d"), ret);
-		if(KErrEof != ret)
-			{
-			Log(_L("(should have returned KErrEof"));
-			verdict = EFail;
-			}
-		ret = iRootServerSuite->RootSess().EnumerateBindings(fullName1, position, bindInfo);
-		Log(_L("Further Enumerate returned %d"), ret);
-		if(KErrEof != ret)
-			{
-			Log(_L("(should have returned KErrEof"));
-			verdict = EFail;
-			}
-		}
-	
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-
-	return verdict;
-	}
-
-
-TVerdict CRootServerTest6_UnbindWithinModule::UnbindWithinModuleL(TThreadPriority aPriority)
-	{
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	//*****************step 01*************************//
-	Log(_L("01 Load Test Module"));
-	LoadNormalModuleL(asynchHandler, KModule1, aPriority);
-
-	//*****************step 2************************
-	Log(_L("02 Bind internally"));
-	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
-	if (ret != KErrNone)
-		{
-		Log(_L("Bind returned error: <%d> "), ret);
-		User::Leave(ret);
-		}
-	//*****************step 3************************
-	Log(_L("03 Unbind"));
-	TRSUnBindingInfo unbindInfo;
-	unbindInfo.iParams.iAddress1.SetModule(KModule1());
-	unbindInfo.iParams.iAddress1.SetSubModule(KSubModule1());
-	unbindInfo.iParams.iAddress2.SetModule(KModule1());
-	unbindInfo.iParams.iAddress2.SetSubModule(KSubModule2());
-
-    asynchHandler->TryUnBind( unbindInfo );
-	
-	CActiveScheduler::Start();
-	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("Unbind returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EFail;
-		}
-	
-	Log(_L("04 Duplicate Unbind"));
-    asynchHandler->TryUnBind( unbindInfo );
-	
-	CActiveScheduler::Start();
-	if (asynchHandler->iStatus != KErrRSBindingUnknown)
-		{
-		Log(_L("Duplicate Unbind returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EFail;
-		}
-	
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-
-// Test step 6.8 - Unbind within Module (normal priority)
-CRootServerTest6_8::CRootServerTest6_8()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test6.8");
-}
-
-TVerdict CRootServerTest6_8::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: UnBind within Module (elevated priority)"));
-	return UnbindWithinModuleL(EPriorityNormal);
-	}
-	
-// Test step 6.9 - Unbind within Module (normal priority)
-CRootServerTest6_9::CRootServerTest6_9()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test6.9");
-}
-
-TVerdict CRootServerTest6_9::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: UnBind within Module (elevated priority)"));
-	return UnbindWithinModuleL(EPriorityRealTime);
-	}
-	
-
-	
-// Test step 6.10 - Cancel Bind
-CRootServerTest6_10::CRootServerTest6_10()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test6.10");
-}
-
-TVerdict CRootServerTest6_10::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Cancel bind"));
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	//*****************step 01*************************//
-	Log(_L("01 Load Test Module"));
-	LoadNormalModuleL(asynchHandler, KModule1);
-
-	//*****************step 2************************
-	Log(_L("02 Attempting bind"));
-	TRSBindingInfo bindInfo;
-	bindInfo.iParams.iType = EHierarchical;
-	bindInfo.iParams.iAddress1.SetModule(KModule1());
-	bindInfo.iParams.iAddress1.SetSubModule(KSubModule1());
-	bindInfo.iParams.iAddress2.SetModule(KModule1());
-	bindInfo.iParams.iAddress2.SetSubModule(KSubModule2());
-	bindInfo.iParams.iState1 = KErrNone;
-	bindInfo.iParams.iState2 = KErrNone;
-	bindInfo.iParams.iForwardQLength = TRSBindingInfo::EMinQueueLength;	
-	bindInfo.iParams.iReverseQLength = TRSBindingInfo::EMinQueueLength;	
-	
-	TRSSubModuleAddress name1(bindInfo.iParams.iAddress1);
-	TRSSubModuleAddress name2(bindInfo.iParams.iAddress2);
-		
-	asynchHandler->TryBind( bindInfo );
-	
-	//*****************step 3************************
-	Log(_L("04 Wait for bind to be completed"));
-	User::After(1000000);
-	//*****************step 4************************
-	Log(_L("04 Cancelling Bind"));
-	iRootServerSuite->RootSess().CancelBind(name1, name2);
-	
-	CActiveScheduler::Start();
-
-	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("Bind returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EFail;
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-
-	}
-	
-// Test step 6.11 - Cancel UnBind
-CRootServerTest6_11::CRootServerTest6_11()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test6.11");
-}
-
-TVerdict CRootServerTest6_11::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Cancel Unbind"));
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	//*****************step 01*************************//
-	Log(_L("01 Load Test Module"));
-	LoadNormalModuleL(asynchHandler, KModule1);
-
-	//*****************step 2************************
-	Log(_L("02 Bind internally"));
-	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
-	if (ret != KErrNone)
-		{
-		Log(_L("Bind returned error: <%d> "), ret);
-		User::Leave(ret);
-		}
-
-	//*****************step 3************************
-	Log(_L("03 Unbind"));
-	TRSUnBindingInfo unbindInfo;
-	unbindInfo.iParams.iAddress1.SetModule(KModule1());
-	unbindInfo.iParams.iAddress1.SetSubModule(KSubModule1());
-	unbindInfo.iParams.iAddress2.SetModule(KModule1());
-	unbindInfo.iParams.iAddress2.SetSubModule(KSubModule2());
-	
-	TRSSubModuleAddress name1(unbindInfo.iParams.iAddress1);
-	TRSSubModuleAddress name2(unbindInfo.iParams.iAddress2);
-
-    asynchHandler->TryUnBind( unbindInfo );
-    
-    //*****************step 4************************
-	Log(_L("04 Wait for unbind to be completed"));
- 	User::After(1000000);
-	//*****************step 5************************
-   Log(_L("05 Cancelling UnBind"));
-	iRootServerSuite->RootSess().CancelUnbind(name1, name2);
-	
-	CActiveScheduler::Start();
-
-	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("Unbind returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EFail;
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-
-	}
-	
-// Test step 6.12 - Bind sluggish cpm
-CRootServerTest6_12::CRootServerTest6_12()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test6.12");
-}
-
-TVerdict CRootServerTest6_12::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Bind sluggish cpm"));
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-    
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-	iniData.iParams.iDiscoveryDelay = 500;
-	iniData.iParams.iBindDelay = 500;
-	iniData.iParams.iUnbindDelay = 500;
-	iniData.iParams.iShutdownDelay = 500;
-	asynchHandler->TryLoad(startParams, iniData);
-
-    CActiveScheduler::Start();
-   	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		User::Leave(asynchHandler->iStatus.Int());
-		}
-    //*****************step 02*************************//
-	Log(_L("02 Attempting bind"));
-	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
-	if (ret != KErrNone)
-		{
-		Log(_L("Bind returned error: <%d> "), ret);
-		verdict = EFail;
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-
-	}
-	
-// Test step 6.13 - Bind dormant cpm
-CRootServerTest6_13::CRootServerTest6_13()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test6.13");
-}
-
-TVerdict CRootServerTest6_13::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Bind dormant cpm"));
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-    
-       //*****************step 02*************************//
-	Log(_L("02 Load Dormant Test CPM"));
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-	iniData.iParams.iDiscoveryDelay = 500;
-	iniData.iParams.iBindDelay = 30000;
-	iniData.iParams.iUnbindDelay = 30000;
-	iniData.iParams.iShutdownDelay = 1000;
-	asynchHandler->TryLoad(startParams, iniData);
-
-    CActiveScheduler::Start();
-   	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		User::Leave(asynchHandler->iStatus.Int());
-		}
-    //*****************step 02*************************//
-	Log(_L("02 Attempting bind"));
-	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
-	if (ret != KErrRSRequestTimedOut)
-		{
-		Log(_L("Bind returned error: <%d> "), ret);
-		verdict = EFail;
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-
-	}
-	
-// Test step 6.14 - UnBind sluggish test cpm
-CRootServerTest6_14::CRootServerTest6_14()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test6.14");
-}
-
-TVerdict CRootServerTest6_14::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Unbind sluggish test cpm"));
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-	iniData.iParams.iDiscoveryDelay = 500;
-	iniData.iParams.iBindDelay = 500;
-	iniData.iParams.iUnbindDelay = 500;
-	iniData.iParams.iShutdownDelay = 500;
-	asynchHandler->TryLoad(startParams, iniData);
-
-    CActiveScheduler::Start();
-   	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		User::Leave(asynchHandler->iStatus.Int());
-		}
-    //*****************step 02*************************//
-	Log(_L("02 Attempting bind"));
-	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
-	if (ret != KErrNone)
-		{
-		Log(_L("Bind returned error: <%d> "), ret);
-		User::Leave(asynchHandler->iStatus.Int());
-		}
-
-	Log(_L("03 Unbind"));
-	TRSUnBindingInfo unbindInfo;
-	unbindInfo.iParams.iAddress1.SetModule(KModule1());
-	unbindInfo.iParams.iAddress1.SetSubModule(KSubModule1());
-	unbindInfo.iParams.iAddress2.SetModule(KModule1());
-	unbindInfo.iParams.iAddress2.SetSubModule(KSubModule2());
-
-    asynchHandler->TryUnBind( unbindInfo );
-	
-	CActiveScheduler::Start();
-	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("Unbind returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EFail;
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-
-	}
-	
-	
-// Test step 6.15 - UnBind dormant test cpm
-CRootServerTest6_15::CRootServerTest6_15()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test6.15");
-}
-
-TVerdict CRootServerTest6_15::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Unbind dormant test cpm"));
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KModule1;
-	iniData.iParams.iDiscoveryDelay = 500;
-	iniData.iParams.iBindDelay = 500;
-	iniData.iParams.iUnbindDelay = 30000;
-	iniData.iParams.iShutdownDelay = 500;
-	asynchHandler->TryLoad(startParams, iniData);
-
-    CActiveScheduler::Start();
-   	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		User::Leave(asynchHandler->iStatus.Int());
-		}
-    //*****************step 02*************************//
-	Log(_L("02 Attempting bind"));
-	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
-	if (ret != KErrNone)
-		{
-		Log(_L("Bind returned error: <%d> "), ret);
-		User::Leave(asynchHandler->iStatus.Int());
-		}
-
-	Log(_L("03 Unbind"));
-	TRSUnBindingInfo unbindInfo;
-	unbindInfo.iParams.iAddress1.SetModule(KModule1());
-	unbindInfo.iParams.iAddress1.SetSubModule(KSubModule1());
-	unbindInfo.iParams.iAddress2.SetModule(KModule1());
-	unbindInfo.iParams.iAddress2.SetSubModule(KSubModule2());
-
-    asynchHandler->TryUnBind( unbindInfo );
-	CActiveScheduler::Start();
-
-	if (asynchHandler->iStatus != KErrRSRequestTimedOut)
-		{
-		Log(_L("Unbind returned error: <%d> "), asynchHandler->iStatus.Int());
-		verdict = EFail;
-		}
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-
-
-// Test step 6.16 - Bind between a server and a module
-CRootServerTest6_16::CRootServerTest6_16()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test6.16");
-}
-
-TVerdict CRootServerTest6_16::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Bind between a server and a module"));
-	TVerdict verdict = EPass;
-
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	_LIT8(KPlainModule, "PlainCPM");
-	_LIT8(KServerModule, "ServerCPM");
-
-	//*****************step 01*************************//
-	Log(_L("01 Load Plain Module"));
-	LoadNormalModuleL(asynchHandler, KPlainModule);
-
-	//*****************step 02*************************//
-	Log(_L("02 Load Server Module"));
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = KServerModule;
-	startParams.iParams.iIsServer = ETrue;
-	asynchHandler->TryLoad(startParams, iniData);
-
-    CActiveScheduler::Start();
-   	if (asynchHandler->iStatus != KErrNone)
-		{
-		Log(_L("LoadServer returned error: <%d> "), asynchHandler->iStatus.Int());
-		User::Leave(asynchHandler->iStatus.Int());
-		}
-
-    //*****************step 03*************************//
-	Log(_L("03 Attempting bind of plain above server"));
-	TInt ret = TryHierachicalBind(asynchHandler, KPlainModule, KSubModule1, KServerModule, KSubModule1);
-	if (ret != KErrRSInvalidBinding)
-		{
-		Log(_L("Bind returned error: <%d> "), ret);
-		User::Leave(ret);
-		}
-
-	//*****************step 04***********************
-	Log(_L("04 Attempting bind of server above plain"));
-	ret = TryHierachicalBind(asynchHandler, KServerModule, KSubModule1, KPlainModule, KSubModule1);
-	if (ret != KErrNone)
-		{
-		Log(_L("Bind returned error: <%d> "), ret);
-		User::Leave(ret);
-		}
-
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-
-	}
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection6.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-// Copyright (c) 2003-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:
-// // Root Server Test Section 6 - Loading modules in Root Server
-// 
-//
-
-
-#if (!defined __ROOTSERVERTEST_6_H__)
-#define __ROOTSERVERTEST_6_H__
-
-
-class CRootServerTest6_1 : public CTestStepRootServer
-{
-public:
-	CRootServerTest6_1();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest6_2 : public CTestStepRootServer
-{
-public:
-	CRootServerTest6_2();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest6_BindWithinModule : public CTestStepRootServer
-{
-protected:
-	TVerdict BindWithinModuleL(TThreadPriority aPriority);
-};
-
-class CRootServerTest6_3 : public CRootServerTest6_BindWithinModule
-{
-public:
-	CRootServerTest6_3();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest6_4 : public CRootServerTest6_BindWithinModule
-{
-public:
-	CRootServerTest6_4();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest6_5 : public CTestStepRootServer
-{
-public:
-	CRootServerTest6_5();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest6_6 : public CTestStepRootServer
-{
-public:
-	CRootServerTest6_6();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest6_7 : public CTestStepRootServer
-{
-public:
-	CRootServerTest6_7();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest6_UnbindWithinModule : public CTestStepRootServer
-{
-protected:
-	TVerdict UnbindWithinModuleL(TThreadPriority aPriority);
-};
-
-class CRootServerTest6_8 : public CRootServerTest6_UnbindWithinModule
-{
-public:
-	CRootServerTest6_8();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest6_9 : public CRootServerTest6_UnbindWithinModule
-{
-public:
-	CRootServerTest6_9();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest6_10 : public CTestStepRootServer
-{
-public:
-	CRootServerTest6_10();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest6_11 : public CTestStepRootServer
-{
-public:
-	CRootServerTest6_11();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest6_12 : public CTestStepRootServer
-{
-public:
-	CRootServerTest6_12();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest6_13 : public CTestStepRootServer
-{
-public:
-	CRootServerTest6_13();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest6_14 : public CTestStepRootServer
-{
-public:
-	CRootServerTest6_14();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest6_15 : public CTestStepRootServer
-{
-public:
-	CRootServerTest6_15();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest6_16 : public CTestStepRootServer
-{
-public:
-	CRootServerTest6_16();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-#endif //(__ROOTSERVERTEST_6_H__)
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection7.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,303 +0,0 @@
-// Copyright (c) 2003-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:
-// This contains RootServer Test cases from section 8
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-#include <es_mbman.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include <networking/testsuite.h>
-
-#include "TestStepRootServer.h"
-#include "TestSuiteRootServer.h"
-#include "TestAsynchHandler.h"
-#include "RootServerTestSection7.h"
-#include "RootServerTest.h"
-
-// Test step 7.1 - OOM loop Test1 - Load, Enumerate, GetInfo
-CRootServerTest7_1::CRootServerTest7_1()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test7.1");
-}
-
-TVerdict CRootServerTest7_1::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: OOM loop test 1: Load, Enumerate, GetInfo"));
-	TVerdict verdict = EPass;
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-
-	TInt failure = 1000;
-	while(verdict == EPass)
-		{
-		iRootServerSuite->RootSess().__DbgFailNext(failure);
-		failure++;
-
-		TRSStartModuleParams startParams;
-		TTestModuleIniData iniData;
-		DefaultStartParams(startParams, iniData);
-		startParams.iParams.iName = KModule1;
-		
-		asynchHandler->TryLoad(startParams, iniData);
-    	CActiveScheduler::Start();
-
-		if (asynchHandler->iStatus != KErrNone)
-			{
-			Log(_L("TryLoad: %d with FailNext(%d)"), asynchHandler->iStatus.Int(), failure);
-if(asynchHandler->iStatus == KErrRSModuleAlreadyExist)
-	User::Leave(KErrRSModuleAlreadyExist);
-			continue;
-			}
-
-		TCFModuleName moduleName;
-		TRSIter position;
-		TInt ret = iRootServerSuite->RootSess().EnumerateModules(position, moduleName);
-		if(ret != KErrNone)
-			{
-			Log(_L("EnumerateModules: %d with FailNext(%d)"), asynchHandler->iStatus.Int(), failure);
-			continue;
-			}
-
-		if(moduleName != KModule1)
-			{
-			Log(_L8("EnumerateModules() returned KErrNone but wrong name: %S"), &moduleName);
-			verdict = EFail;
-			break;
-			}
-
-		TRSModuleInfo info;
-		ret = iRootServerSuite->RootSess().GetModuleInfo(KModule1(), info);
-		if(ret != KErrNone)
-			{
-			Log(_L("GetModuleInfo: %d with FailNext(%d)"), asynchHandler->iStatus.Int(), failure);
-			continue;
-			}
-
-		if(info.iParams.iState != ERunning)
-			{
-			Log(_L("GetModuleInfo() returned KErrNone but wrong state: %d"), info.iParams.iState);
-			verdict = EFail;
-			}
-		// everything worked;
-		Log(_L("OOM loop complete"));
-		break;
-		}
-
-
-	Log(_L("Resetting heap"));
-	iRootServerSuite->RootSess().__DbgFailNext(-1);
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-
-// Test step 7.2 - OOM loop Test2 - Unload, GetInfo
-CRootServerTest7_2::CRootServerTest7_2()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test7.2");
-}
-
-TVerdict CRootServerTest7_2::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Heap loop Test2 - Unload, GetInfo"));
-	TVerdict verdict = EPass;
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	Log(_L8("01 Loading cpm: %S"), &KModule1());
-	LoadNormalModuleL(asynchHandler, KModule1);
-
-	TInt failure = 1;
-	while(verdict == EPass)
-		{
-		iRootServerSuite->RootSess().__DbgFailNext(failure);
-		failure++;
-
-		asynchHandler->TryUnLoad(KModule1(), EUnGraceful);
-    	CActiveScheduler::Start();
-
-		if (asynchHandler->iStatus != KErrNone)
-			{
-			Log(_L("TryUnload: %d with FailNext(%d)"), asynchHandler->iStatus.Int(), failure);
-			if(asynchHandler->iStatus != KErrRSModuleNotLoaded)
-				{
-				continue;
-				}
-			}
-
-		TRSModuleInfo info;
-		TInt ret = iRootServerSuite->RootSess().GetModuleInfo(KModule1(), info);
-		if(ret == KErrRSModuleUnknown)
-			{
-			// everything worked;
-			Log(_L("OOM loop complete"));
-			break;
-			}
-		else if(ret == KErrNone)
-			{
-			Log(_L("GetModuleInfo() returned KErrNone for unloaded module"));
-			verdict = EFail;
-			}
-		else 
-			{
-			Log(_L("GetModuleInfo: %d with FailNext(%d)"), ret, failure);
-			continue;
-			}
-		}
-
-	Log(_L("Resetting heap"));
-	iRootServerSuite->RootSess().__DbgFailNext(-1);
-	// uninstall and destroy active scheduler
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-	
-
-// Test step 7.3 - OOM loop Test 3 - Bind
-CRootServerTest7_3::CRootServerTest7_3()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test7.3");
-}
-
-TVerdict CRootServerTest7_3::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Heap loop Test3 - Bind, EnumerateBindings"));
-	TVerdict verdict = EPass;
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	Log(_L8("01 Loading cpm: %S"), &KModule1());
-	LoadNormalModuleL(asynchHandler, KModule1);
-
-	TCFSubModuleAddress fullName1;
-	fullName1.SetModule(KModule1());
-	fullName1.SetSubModule(KSubModule1());
-	TInt failure = 1;
-	while(verdict == EPass)
-		{
-		Log(_L("Failing after %d Allocs"), failure);
-		iRootServerSuite->RootSess().__DbgFailNext(failure);
-		failure++;
-
-		TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
-		if(ret != KErrNone)
-			continue;
-
-		Log(_L("02 Enumerate bindings"));
-		TRSBindingInfo bindInfo;
-		TRSIter position;
-		ret = iRootServerSuite->RootSess().EnumerateBindings(fullName1, position, bindInfo);
-		if(ret != KErrNone)
-			continue;
-
-		// everything worked;
-		Log(_L("OOM loop complete"));
-		break;
-		}		
-
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-
-// Test step 7.4 - OOM loop Test 4 - Unbind
-CRootServerTest7_4::CRootServerTest7_4()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test7.4");
-}
-
-TVerdict CRootServerTest7_4::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Heap loop Test4 - Unbind, EnumerateBindings"));
-	TVerdict verdict = EPass;
-	// Create scheduler/active object framework 
-	CSelfPopScheduler* scheduler = CSelfPopScheduler::CreateLC();
-    CTestAsynchHandler* asynchHandler = CTestAsynchHandler::NewLC(&iRootServerSuite->RootSess());
-
-	Log(_L8("01 Loading and binding cpm: %S"), &KModule1());
-	LoadNormalModuleL(asynchHandler, KModule1);
-	TInt ret = TryHierachicalBind(asynchHandler, KModule1, KSubModule1, KModule1, KSubModule2);
-	if(ret != KErrNone)
-		{
-		Log(_L("Binding CPM failed with %d"), ret);
-		User::Leave(ret);
-		}
-
-	TCFSubModuleAddress fullName1;
-	fullName1.SetModule(KModule1());
-	fullName1.SetSubModule(KSubModule1());
-	TInt failure = 1;
-	while(verdict == EPass)
-		{
-		iRootServerSuite->RootSess().__DbgFailNext(failure);
-		failure++;
-
-		TRSUnBindingInfo unbindInfo;
-		unbindInfo.iParams.iAddress1.SetModule(KModule1());
-		unbindInfo.iParams.iAddress1.SetSubModule(KSubModule1());
-		unbindInfo.iParams.iAddress2.SetModule(KModule1());
-		unbindInfo.iParams.iAddress2.SetSubModule(KSubModule2());
-		asynchHandler->TryUnBind( unbindInfo );
-		
-		CActiveScheduler::Start();
-
-		if (asynchHandler->iStatus != KErrNone)
-			{
-			Log(_L("TryUnload: %d with FailNext(%d)"), asynchHandler->iStatus.Int(), failure);
-			continue;
-			}
-
-		Log(_L("03 Enumerate bindings"));
-		TRSBindingInfo bindInfo;
-		TRSIter position;
-		ret = iRootServerSuite->RootSess().EnumerateBindings(fullName1, position, bindInfo);
-		if(ret == KErrEof)
-			{
-			Log(_L("OOM loop complete"));
-			break;
-			}
-		else if(ret == KErrNone)
-			{
-			Log(_L("EnumerateBindings returned KErrNone for unbound submodules"));
-			verdict = EFail;
-			}
-		else 
-			{
-			Log(_L("EnumerateBindings: %d with FailNext(%d)"), ret, failure);
-			continue;
-			}
-		}		
-
-	CleanupStack::PopAndDestroy(asynchHandler);
-	CleanupStack::PopAndDestroy(scheduler);
-	return verdict;
-	}
-	
-	
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection7.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-// Copyright (c) 2003-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:
-// // Root Server Test Section 7 - configure Root Server
-// 
-//
-
-
-#if (!defined __ROOTSERVERTEST_7_H__)
-#define __ROOTSERVERTEST_7_H__
-
-class CRootServerTest7_1 : public CTestStepRootServer
-{
-public:
-	CRootServerTest7_1();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest7_2 : public CTestStepRootServer
-{
-public:
-	CRootServerTest7_2();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest7_3 : public CTestStepRootServer
-{
-public:
-	CRootServerTest7_3();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-class CRootServerTest7_4 : public CTestStepRootServer
-{
-public:
-	CRootServerTest7_4();
-
-	virtual TVerdict doTestStepL( void );
-};
-
-
-#endif //(__ROOTSERVERTEST_7_H__)
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection8.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-// Copyright (c) 2006-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:
-// This contains RootServer Test cases from section 8
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include <networking/testsuite.h>
-
-#include "TestStepRootServer.h"
-#include "TestSuiteRootServer.h"
-#include "RootServerTestSection8.h"
-#include "c32cmiutils.h"
-
-/** Calls utility function to convert aPriorityName to a TThreadPriority enumerator.
-If either the conversion fails or the resulting priority does not match aExpectedPriority
-then it sets aVerdict to EFail.
-*/
-void CRootServerTest8_1::TestConvertPriorityValidL(const TDesC8& aPriorityName, TThreadPriority aExpectedPriority, TVerdict& aVerdict)
-	{
-	TThreadPriority priority;
-	TInt result = C32CmiUtils::ThreadPriorityNameToEnum(aPriorityName, priority);
-	if ((result != KErrNone) || (priority != aExpectedPriority))
-		{
-		Log(_L8("TestConvertPriorityValid: %S failed to convert to %d"), &aPriorityName, aExpectedPriority);
-		aVerdict = EFail;
-		}
-	}
-
-/** Calls utility function to convert aPriorityName to a TThreadPriority enumerator.
-Assumes aPriorityName is an invalid priority name: if the conversion unexpectedly succeeds,
-then it sets aVerdict to EFail.
-*/
-void CRootServerTest8_1::TestConvertPriorityInvalidL(const TDesC8& aPriorityName, TVerdict& aVerdict)
-	{
-	TThreadPriority priority;
-	TInt result = C32CmiUtils::ThreadPriorityNameToEnum(aPriorityName, priority);
-	if (result != KErrCorrupt)
-		{
-		Log(_L8("TestConvertPriorityInvalid: %S converted to %d when it should have been invalid"), &aPriorityName, priority);
-		aVerdict = EFail;
-		}
-	}
-
-// Test step 8.1 - Unit testing conversion of thread priority names to enums
-CRootServerTest8_1::CRootServerTest8_1()
-{
-	// store the name of this test case
-	iTestStepName = _L("Test8.1");
-}
-
-TVerdict CRootServerTest8_1::doTestStepL( void )
-	{
-	Log(_L("Test Purpose: Unit testing conversion of thread priority names to enums"));
-	TVerdict verdict = EPass;
-
-	// test relative thread priorities
-	TestConvertPriorityValidL(_L8("EPriorityMuchLess"),	EPriorityMuchLess,	verdict);
-	TestConvertPriorityValidL(_L8("EPriorityLess"),		EPriorityLess,		verdict);
-	TestConvertPriorityValidL(_L8("EPriorityNormal"),	EPriorityNormal,	verdict);
-	TestConvertPriorityValidL(_L8("EPriorityMore"),		EPriorityMore,		verdict);
-	TestConvertPriorityValidL(_L8("EPriorityMuchMore"),	EPriorityMuchMore,	verdict);
-	TestConvertPriorityValidL(_L8("EPriorityRealTime"),	EPriorityRealTime,	verdict);
-	// test absolute thread priorities
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteVeryLow"),			EPriorityAbsoluteVeryLow,			verdict);
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteLowNormal"),		EPriorityAbsoluteLowNormal,			verdict);
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteLow"),				EPriorityAbsoluteLow,				verdict);
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteBackgroundNormal"),	EPriorityAbsoluteBackgroundNormal,	verdict);
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteBackground"),		EPriorityAbsoluteBackground,		verdict);
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteForegroundNormal"),	EPriorityAbsoluteForegroundNormal,	verdict);
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteForeground"),		EPriorityAbsoluteForeground,		verdict);
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteHighNormal"),		EPriorityAbsoluteHighNormal,		verdict);
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteRealTime1"),		EPriorityAbsoluteRealTime1,			verdict);
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteRealTime2"),		EPriorityAbsoluteRealTime2,			verdict);
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteHigh"),				EPriorityAbsoluteHigh,				verdict);
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteRealTime3"),		EPriorityAbsoluteRealTime3,			verdict);
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteRealTime4"),		EPriorityAbsoluteRealTime4,			verdict);
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteRealTime5"),		EPriorityAbsoluteRealTime5,			verdict);
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteRealTime6"),		EPriorityAbsoluteRealTime6,			verdict);
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteRealTime7"),		EPriorityAbsoluteRealTime7,			verdict);
-	TestConvertPriorityValidL(_L8("EPriorityAbsoluteRealTime8"),		EPriorityAbsoluteRealTime8,			verdict);
-	// test a handful of valid names that differ in case
-	TestConvertPriorityValidL(_L8("EPrIOritymORE"),					EPriorityMore,				verdict);
-	TestConvertPriorityValidL(_L8("EPRIORITYMUCHMORE"),				EPriorityMuchMore,			verdict);
-	TestConvertPriorityValidL(_L8("epriorityabsoluterealtime2"),	EPriorityAbsoluteRealTime2,	verdict);
-
-	// test a handful of valid numerical values
-	TestConvertPriorityValidL(_L8("10"),	EPriorityMore,				verdict);
-	TestConvertPriorityValidL(_L8("500"),	EPriorityAbsoluteHigh,		verdict);
-	TestConvertPriorityValidL(_L8("820"),	EPriorityAbsoluteRealTime2,	verdict);
-	// confirm any old number is returned as an integer, unchecked:
-	TestConvertPriorityValidL(_L8("666"),	(TThreadPriority)666,		verdict);
-
-	// test a handful of invalid enumerations
-	TestConvertPriorityInvalidL(_L8("EPriorityNormal0"),	verdict);
-	TestConvertPriorityInvalidL(_L8("0EPriorityNormal"),	verdict);
-	TestConvertPriorityInvalidL(_L8("EPriorityNormal "),	verdict);
-	TestConvertPriorityInvalidL(_L8(" EPriorityNormal"),	verdict);
-	TestConvertPriorityInvalidL(_L8("EPriorityStandard"),	verdict);
-	TestConvertPriorityInvalidL(_L8("Nonsense"), 			verdict);
-	TestConvertPriorityInvalidL(_L8(" 810 "),	 			verdict);
-
-	return verdict;
-	}
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/RootServerTestSection8.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-// Copyright (c) 2006-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:
-// // Root Server Test Section 8 - configure Root Server
-// 
-//
-
-
-#if (!defined __ROOTSERVERTEST_8_H__)
-#define __ROOTSERVERTEST_8_H__
-
-class CRootServerTest8_1 : public CTestStepRootServer
-{
-public:
-	CRootServerTest8_1();
-
-	virtual TVerdict doTestStepL( void );
-
-private:
-	void TestConvertPriorityValidL(const TDesC8& aPriorityName, TThreadPriority aExpectedPriority, TVerdict& aVerdict);
-	void TestConvertPriorityInvalidL(const TDesC8& aPriorityName, TVerdict& aVerdict);
-};
-
-#endif //(__ROOTSERVERTEST_8_H__)
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/TestAsynchHandler.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-// Copyright (c) 2003-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:
-// This contains CTestAsynchHandler which is an active object to
-// handle the asynch calls from the RootServer during testing
-// 
-//
-
-
-
-// EPOC includes
-#include <e32base.h>
-
-// RootServer includes
-#include <rsshared.h>
-
-// Test system includes
-#include "TestAsynchHandler.h"
-
-
-CTestAsynchHandler* CTestAsynchHandler::NewLC(RRootServ* aRootServer)
-	{
-	CTestAsynchHandler* self = new(ELeave) CTestAsynchHandler;
-	CleanupStack::PushL(self);
-	self->ConstructL(aRootServer);
-	return self;
-	}
-
-CTestAsynchHandler::CTestAsynchHandler() : CActive(0)
-	{
-	}
-
-void CTestAsynchHandler::ConstructL(RRootServ* aRootServer)
-	{
-	iState = EIdle;
-	iRootServer = aRootServer;
-	User::LeaveIfError(iTimer.CreateLocal());
-	CActiveScheduler::Add(this);
-	}
-
-CTestAsynchHandler::~CTestAsynchHandler()  
-	{
-	Cancel();
-	iTimer.Close();
-	}
-
-// from CActive
-void CTestAsynchHandler::RunL()     
-	{ 
-	switch(iState)
-		{
-		case ELoading:
-		case EUnLoading:
-		case EBinding:
-		case EUnBinding:
-		case EListeningforDeath:
-		case EWaitingforTimer:
-		case EIdle:
-		default:
-			CActiveScheduler::Stop();
-			break;
-		}
-	iState = EIdle;
-	}
-
-void CTestAsynchHandler::DoCancel() 
-	{
-	switch (iState)
-		{
-		case EListeningforDeath:
-			iPropertyDeath.Cancel();
-			break;
-
-		case EWaitingforTimer:
-			iTimer.Cancel();
-			break;
-
-		case ELoading:
-		case EIdle:
-		default:
-			break;
-		}
-	}
-
-
-// requests
-void CTestAsynchHandler::TryLoad(const TRSStartModuleParams& aParams, 
-									   const TDesC8& aIniData)
-	{
-    iState = ELoading;
-	iRootServer->LoadCpm(iStatus, aParams, aIniData);
-	SetActive();
-	}
-
-void CTestAsynchHandler::TryUnLoad(const TCFModuleName& aName, TRSUnLoadType aType)
-	{
-  	iState = EUnLoading;
-	iRootServer->UnloadCpm(iStatus, aName, aType);
-	SetActive();
-	}
-
-void CTestAsynchHandler::TryBind( TRSBindingInfo& aBindInfo )
-	{
-	iState = EBinding;
-	iRootServer->Bind( iStatus, aBindInfo );
-	SetActive();
-	}
-	
-void CTestAsynchHandler::TryUnBind( TRSUnBindingInfo& aUnbindInfo )
-	{
-	iState = EUnBinding;
-	iRootServer->Unbind( iStatus, aUnbindInfo );
-	SetActive();
-	}
-
-void CTestAsynchHandler::TryWaitForDeath(void)
-	{
-	iState = EListeningforDeath;
-	TInt result = iPropertyDeath.Attach( KUidSystemCategory,KUidC32RootModuleDeathKey.iUid );
-	if(result != KErrNone)
-		{
-		_LIT( KAsynch, "Asynch" );
-		User::Panic( KAsynch, result );
-		}
-	iPropertyDeath.Subscribe( iStatus );
-	SetActive();
-	}
-
-void CTestAsynchHandler::TryCancelDeath()
-	{
-
-	// we are already active cos we are waiting on our subscription
-	// therefore we will simply cancel the property subscription
-	iState=EIdle;
-	DoCancel();	
-	}
-
-void CTestAsynchHandler::WaitForTimer(TInt aTimeout_ms)
-	{
-	iState = EWaitingforTimer;
-
-	DoCancel(); // in case timer already running
-	iTimer.After(iStatus, aTimeout_ms * 1000);
-	SetActive();
-	}
-
-
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/TestAsynchHandler.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-// Copyright (c) 2003-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:
-// This contains CTestAsynchHandler which is an active object to
-// handle the asynch calls from the RootServer during testing
-// 
-//
-
-#if (!defined __TESTASYNCHHANDLER_H__)
-#define __TESTASYNCHHANDLER_H__
-
-#include <c32root.h>
-#include <e32property.h>
-
-class CTestAsynchHandler: public CActive
-    {
-public:
-	// construct/destruct
-	static CTestAsynchHandler* NewLC(RRootServ* aRootServer);
-	~CTestAsynchHandler();
-
-	// requests
-    void TryLoad( const TRSStartModuleParams& aParams, const TDesC8& aIniData );
-	void TryUnLoad( const TCFModuleName& aName, TRSUnLoadType aType );
-	void TryBind( TRSBindingInfo& aBindInfo ); 
-	void TryUnBind( TRSUnBindingInfo& aUnbindInfo );
-    void TryWaitForDeath(void);
-	void TryCancelDeath();
-	void WaitForTimer(TInt aTimeout_ms);
-
-	typedef enum 
-		{
-		EIdle,
-		ELoading,
-		EUnLoading,
-		EBinding,
-		EUnBinding,
-		EListeningforDeath,
-		EWaitingforTimer
-	} TAsynchHandlerStates;
-	TAsynchHandlerStates GetiState(void) const { return iState; }
-
-private:
-	// construct/destruct
-	CTestAsynchHandler();
-	void ConstructL(RRootServ* aRootServer);
-
-	// from CActive
-    void RunL();
-	void DoCancel();
-
-    RRootServ* iRootServer;
-	RTimer iTimer;
-    TAsynchHandlerStates iState;
-	RProperty iPropertyDeath;
-    };
-
-#endif /* __TESTASYNCHHANDLER_H__ */
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/TestStepRootServer.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,223 +0,0 @@
-// Copyright (c) 2003-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:
-// This contains CTestCaseRootServer 
-// 
-//
-
-// EPOC includes
-#include <e32base.h>
-
-// Test system includes
-#include <networking/log.h>
-#include <networking/teststep.h>
-#include <networking/testsuite.h>
-
-#include "TestStepRootServer.h"
-#include "TestSuiteRootServer.h"
-#include "TestAsynchHandler.h"
-
-// const (times in ms)
-const TInt CTestStepRootServer::isTestServerLifeTime = 3000;
-const TInt CTestStepRootServer::isTestServerWaitTime = 
-					2 * CTestStepRootServer::isTestServerLifeTime;
-const TInt CTestStepRootServer::isRendezvousDelayTime = 1000;
-
-
-
-// constructor
-CTestStepRootServer::CTestStepRootServer() 
-{
-}
-
-// destructor
-CTestStepRootServer::~CTestStepRootServer()
-{
-}
-
-
-//------------------------
-TVerdict CTestStepRootServer::doTestStepPreambleL( void )
-	{
-	TInt ret;
-
-	// kick off the RootServer thread
-	Log(_L("Attempting to start RootServer"));
-	ret = iRootServerSuite->StartRootServer();
-	if (KErrNone != ret)
-		{
-		Log(_L("Failed to start RootServer: err %d"), ret);
-		return EInconclusive;
-		}
-
-	return EPass;
-	}
-
-
-//------------------------
-TVerdict CTestStepRootServer::doTestStepPostambleL( void )
-	{
-	Log(_L("Attempting to shutdown RootServer"));
-	if (!iRootServerSuite->ShutdownRootServer())
-		{
-		Log(_L("Failed to shutdown RootServer"));
-		return EInconclusive;
-		}
-	return EPass;
-	}
-
-
-//------------------------
-void CTestStepRootServer::GetTestStepServerName(const TDesC &aNamePostFix, 
-												TDes &aServerName)
-	{
-	aServerName.Copy(_L("TS_"));
-	aServerName.Append(iTestStepName);
-	aServerName.Append(_L("_"));
-	aServerName.AppendNum(iRootServerSuite->NextServerNumber());
-	if (aNamePostFix.Length() > 0)
-		{
-		aServerName.Append(_L("_"));
-		aServerName.Append(aNamePostFix);															  
-		}
-	}
-
-
-void CTestStepRootServer::DefaultStartParams(TRSStartModuleParams& aStartParams, TTestModuleIniData& aIniData)
-	{
-	aStartParams.iParams.iFilename = _L("testcpm.cpm");
-	aStartParams.iParams.iPriority = EPriorityNormal;
-	aStartParams.iParams.iStackSize = 8192;
-	aStartParams.iParams.iHeapType = ENewHeap;
-	aStartParams.iParams.iMinHeapSize = 65536;
-	aStartParams.iParams.iMaxHeapSize = 262144;
-	aStartParams.iParams.iShareHeapWith = KNullDesC8;
-	aStartParams.iParams.iThreadFunctionOrdinal = 1;
-	aStartParams.iParams.iIsSticky = EFalse;
-	aStartParams.iParams.iIsServer = EFalse;
-
-	aIniData.iParams.iInitDelay = 0;
-	aIniData.iParams.iDeathDelay = NO_PREMATURE_DEATH;
-	aIniData.iParams.iDiscoveryDelay = 0;
-	aIniData.iParams.iBindDelay = 0;
-	aIniData.iParams.iUnbindDelay = 0;
-	aIniData.iParams.iShutdownDelay = 0;
-	}
-
-void CTestStepRootServer::LoadNormalModuleL(CTestAsynchHandler* aHandler, const TDesC8& aModule, TThreadPriority aPriority)
-	{
-	TRSStartModuleParams startParams;
-	TTestModuleIniData iniData;
-	DefaultStartParams(startParams, iniData);
-	startParams.iParams.iName = aModule;
-	startParams.iParams.iPriority = aPriority;
-
-    aHandler->TryLoad( startParams, iniData);
-	
-	CActiveScheduler::Start();
-	if (aHandler->iStatus != KErrNone) 
-		{
-		Log(_L("Error: load returned %d"), aHandler->iStatus.Int());
-		User::Leave(aHandler->iStatus.Int());
-		}
-	}
-
-TInt CTestStepRootServer::TryHierachicalBind(CTestAsynchHandler* aHandler, 
-											 const TDesC8& aTopModule, const TDesC8& aTopSubModule, 
-											 const TDesC8& aBottomModule, const TDesC8& aBottomSubModule)
-	{
-	TRSBindingInfo bindInfo;
-	bindInfo.iParams.iType = EHierarchical;
-	bindInfo.iParams.iAddress1.SetModule(aTopModule);
-	bindInfo.iParams.iAddress1.SetSubModule(aTopSubModule);
-	bindInfo.iParams.iAddress2.SetModule(aBottomModule);
-	bindInfo.iParams.iAddress2.SetSubModule(aBottomSubModule);
-	bindInfo.iParams.iState1 = KErrNone;
-	bindInfo.iParams.iState2 = KErrNone;
-	bindInfo.iParams.iForwardQLength = TRSBindingInfo::EMinQueueLength;	
-	bindInfo.iParams.iReverseQLength = TRSBindingInfo::EMinQueueLength;	
-	
-	aHandler->TryBind( bindInfo );
-	CActiveScheduler::Start();
-	return aHandler->iStatus.Int();
-	}
-
-_LIT(KSingleDesFmt, "%S");
-
-void CTestStepRootServer::Log( TRefByValue<const TDesC8> aFormat, ... )
-	{
-	// Although a memory-spendthrift approach it's ok for the case of TS_ROOTSERVER
-	TBuf8<EMaxLogLength> buf8;
-	VA_LIST list;
-	VA_START(list, aFormat);
-	buf8.FormatList(aFormat, list);
-	TBuf16<EMaxLogLength> buf16;
-	buf16.Copy(buf8);
-	CTestStep::Log(KSingleDesFmt, &buf16);
-	}
-
-void CTestStepRootServer::Log( TInt aSeverity, TRefByValue<const TDesC8> aFormat, ... )
-	{
-	// Although a memory-spendthrift approach it's ok for the case of TS_ROOTSERVER
-	TBuf8<EMaxLogLength> buf8;
-	VA_LIST list;
-	VA_START(list, aFormat);
-	buf8.FormatList(aFormat, list);
-	TBuf16<EMaxLogLength> buf16;
-	buf16.Copy(buf8);
-	CTestStep::Log(aSeverity, KSingleDesFmt, &buf16);
-	}
-
-void CTestStepRootServer::LogExtra(const TText8* aFile, TInt aLine, TInt aSeverity, TRefByValue<const TDesC8> aFormat,...)
-	{
-	// Although a memory-spendthrift approach it's ok for the case of TS_ROOTSERVER
-	TBuf8<EMaxLogLength> buf8;
-	VA_LIST list;
-	VA_START(list, aFormat);
-	buf8.FormatList(aFormat, list);
-	TBuf16<EMaxLogLength> buf16;
-	buf16.Copy(buf8);
-	CTestStep::LogExtra(aFile, aLine, aSeverity, KSingleDesFmt, &buf16);
-	}
-
-void CTestStepRootServer::Log( TRefByValue<const TDesC16> aFormat, ... )
-	{
-	// Although a memory-spendthrift approach it's ok for the case of TS_ROOTSERVER
-	TBuf16<EMaxLogLength> buf16;
-	VA_LIST list;
-	VA_START(list, aFormat);
-	buf16.FormatList(aFormat, list);
-	CTestStep::Log(KSingleDesFmt, &buf16);
-	}
-
-void CTestStepRootServer::Log( TInt aSeverity, TRefByValue<const TDesC16> aFormat, ... )
-	{
-	// Although a memory-spendthrift approach it's ok for the case of TS_ROOTSERVER
-	TBuf16<EMaxLogLength> buf16;
-	VA_LIST list;
-	VA_START(list, aFormat);
-	buf16.FormatList(aFormat, list);
-	CTestStep::Log(aSeverity, KSingleDesFmt, &buf16);
-	}
-
-void CTestStepRootServer::LogExtra(const TText8* aFile, TInt aLine, TInt aSeverity,
-	TRefByValue<const TDesC> aFormat,...)
-	{
-	// Although a memory-spendthrift approach it's ok for the case of TS_ROOTSERVER
-	TBuf16<EMaxLogLength> buf16;
-	VA_LIST list;
-	VA_START(list, aFormat);
-	buf16.FormatList(aFormat, list);
-	CTestStep::LogExtra(aFile, aLine, aSeverity, KSingleDesFmt, &buf16);
-	}
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/TestStepRootServer.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-// Copyright (c) 2003-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:
-// This contains CTestCaseRootServer which is the base class for all 
-// the ROOTSERVER suite test cases
-// 
-//
-
-#if (!defined __ROOTSERVERTESTSTEP_H__)
-#define __ROOTSERVERTESTSTEP_H__
-
-#include "RootServerTest.h"
-#include <rsshared.h>
-
-_LIT8(KModule1, "module1");
-_LIT8(KModule2, "module2");
-_LIT8(KSubModule1, "Test Protocol1");
-_LIT8(KSubModule2, "Test Protocol2");
-
-class CTestSuiteRootServer;
-class CTestAsynchHandler;
-
-class CTestStepRootServer : public CTestStep
-{
-public:
-	CTestStepRootServer();
-	~CTestStepRootServer();
-
-	// config file access - RootServer specific
-
-
-	// override pre and post ambles
-	TVerdict doTestStepPreambleL( void );
-	TVerdict doTestStepPostambleL( void );
-
-	// global methods
-	void GetTestStepServerName(const TDesC &aNamePostFix, TDes &aServerName);
-
-
-	// pointer to suite which owns this test 
-	CTestSuiteRootServer * iRootServerSuite;
-
-	// expected test server lifetime in microsecs
-	static const TInt isTestServerLifeTime;
-
-	// time to wait for all test servers to die
-	static const TInt isTestServerWaitTime;
-
-	// time to delay testserver statrup rendezvous when required
-	static const TInt isRendezvousDelayTime;
-
-	// Narrow-char overloads; would be better in base class
-	enum { EMaxLogLength = 256 };
-	void Log( TRefByValue<const TDesC8> aFormat, ... );
-	void Log( TInt aSeverity, TRefByValue<const TDesC8> aFormat, ... );
-	void LogExtra(const TText8* aFile, TInt aLine, TInt aSeverity,
-		TRefByValue<const TDesC8> aFmt,...);
-
-	// And forwards to the base class, since the narrow overloads mask the usual ones
-	void Log( TRefByValue<const TDesC16> aFormat, ... );
-	void Log( TInt aSeverity, TRefByValue<const TDesC16> aFormat, ... );
-	void LogExtra(const TText8* aFile, TInt aLine, TInt aSeverity,
-		TRefByValue<const TDesC> aFmt,...);
-
-protected:
-	void DefaultStartParams(RootServer::TRSStartModuleParams& aStartParams, TTestModuleIniData& iIniData);
-	void LoadNormalModuleL(CTestAsynchHandler* aHandler, const TDesC8& aModule, TThreadPriority aPriority = EPriorityNormal);
-	TInt TryHierachicalBind(CTestAsynchHandler* aHandler, 
-							const TDesC8& aTopModule, const TDesC8& aTopSubModule, 
-							const TDesC8& aBottomModule, const TDesC8& aBottomSubModule);
-
-private:
-
-};
-
-#endif /* __ROOTSERVERTESTSTEP_H__ */
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/TestSuiteRootServer.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,361 +0,0 @@
-// Copyright (c) 2003-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:
-// This main DLL entry point for the TS_RootServer.dll
-// 
-//
-
-
-// EPOC includes
-#include <e32base.h>
-
-// RootServer includes
-#include <rsshared.h>
-
-// Test system includes
-#include <comms-infras/commsdebugutility.h>
-#include <networking/teststep.h>
-#include "TestStepRootServer.h"
-#include "TestSuiteRootServer.h"
-#include "TestAsynchHandler.h"
-#include "RootServerTestSection1.h"
-#include "RootServerTestSection2.h"
-#include "RootServerTestSection3.h"
-#include "RootServerTestSection4.h"
-#include "RootServerTestSection5.h"
-#include "RootServerTestSection6.h"
-#include "RootServerTestSection7.h"
-#include "RootServerTestSection8.h"
-
-_LIT(KRootServerExe, "c32exe.exe");
-_LIT(KRootServerProcessPattern, "c32exe*");
-
-EXPORT_C CTestSuiteRootServer* NewTestSuiteRootServer( void ) 
-    {
-	return new (ELeave) CTestSuiteRootServer;
-    }
-
-CTestSuiteRootServer::CTestSuiteRootServer()
-	{
-	}
-
-// destructor
-CTestSuiteRootServer::~CTestSuiteRootServer()
-	{
-	}
-
-
-// Add a test step into the suite
-void CTestSuiteRootServer::AddTestStepL( CTestStepRootServer * ptrTestStep )
-{
-	// test steps contain a pointer back to the suite which owns them
-	ptrTestStep->iRootServerSuite = this; 
-
-	// add the step using the base class method
-	CTestSuite::AddTestStepL(ptrTestStep);
-}
-
-// make a version string available for test system 
-TPtrC CTestSuiteRootServer::GetVersion( void )
-	{
-
-#ifdef _DEBUG
-	_LIT(KTxtVersion,"1.00 (udeb)");
-#else
-	_LIT(KTxtVersion,"1.00");
-#endif
-
-	return KTxtVersion();
-	}
-
-
-// second phase constructor for RootServer test suite
-// this creates all the ESOCK test steps and
-// stores them inside CTestSuiteRootServer
-void CTestSuiteRootServer::InitialiseL( void )
-	{
-	// add test steps
-	AddTestStepL( new(ELeave) CRootServerTest1_1 );
-	AddTestStepL( new(ELeave) CRootServerTest1_2 );
-	AddTestStepL( new(ELeave) CRootServerTest2_1 );
-	AddTestStepL( new(ELeave) CRootServerTest2_2 );
-	AddTestStepL( new(ELeave) CRootServerTest2_3 );	
-//	AddTestStepL( new(ELeave) CRootServerTest3_1 );
-	AddTestStepL( new(ELeave) CRootServerTest3_2 );
-	AddTestStepL( new(ELeave) CRootServerTest3_3 );
-	AddTestStepL( new(ELeave) CRootServerTest3_4 );
-	AddTestStepL( new(ELeave) CRootServerTest3_5 );
-	AddTestStepL( new(ELeave) CRootServerTest3_6 );
-	AddTestStepL( new(ELeave) CRootServerTest3_7 );
-	AddTestStepL( new(ELeave) CRootServerTest3_8 );
-	AddTestStepL( new(ELeave) CRootServerTest3_9 );
-	AddTestStepL( new(ELeave) CRootServerTest3_10 );
-	AddTestStepL( new(ELeave) CRootServerTest3_11 );
-	AddTestStepL( new(ELeave) CRootServerTest3_12 );
-	AddTestStepL( new(ELeave) CRootServerTest3_13 );
-	AddTestStepL( new(ELeave) CRootServerTest3_14 );
-	AddTestStepL( new(ELeave) CRootServerTest3_15 );
-	AddTestStepL( new(ELeave) CRootServerTest3_16 );
-	AddTestStepL( new(ELeave) CRootServerTest3_17 );
-	AddTestStepL( new(ELeave) CRootServerTest3_18 );
-	AddTestStepL( new(ELeave) CRootServerTest4_1 );
-	AddTestStepL( new(ELeave) CRootServerTest5_1 );
-	AddTestStepL( new(ELeave) CRootServerTest5_2 );
-	AddTestStepL( new(ELeave) CRootServerTest5_3 );
-	AddTestStepL( new(ELeave) CRootServerTest5_4 );
-	AddTestStepL( new(ELeave) CRootServerTest5_5 );
-	AddTestStepL( new(ELeave) CRootServerTest5_6 );
-	AddTestStepL( new(ELeave) CRootServerTest5_7 );
-	AddTestStepL( new(ELeave) CRootServerTest5_8 );
-	AddTestStepL( new(ELeave) CRootServerTest6_1 );
-	AddTestStepL( new(ELeave) CRootServerTest6_2 );
-	AddTestStepL( new(ELeave) CRootServerTest6_3 );
-	AddTestStepL( new(ELeave) CRootServerTest6_4 );
-	AddTestStepL( new(ELeave) CRootServerTest6_5 );
-	AddTestStepL( new(ELeave) CRootServerTest6_6 );
-	AddTestStepL( new(ELeave) CRootServerTest6_7 );
-	AddTestStepL( new(ELeave) CRootServerTest6_8 );
-	AddTestStepL( new(ELeave) CRootServerTest6_9 );
-	AddTestStepL( new(ELeave) CRootServerTest6_10 );
-	AddTestStepL( new(ELeave) CRootServerTest6_11 );
-	AddTestStepL( new(ELeave) CRootServerTest6_12 );
-	AddTestStepL( new(ELeave) CRootServerTest6_13 );
-	AddTestStepL( new(ELeave) CRootServerTest6_14 );
-	AddTestStepL( new(ELeave) CRootServerTest6_15 );
-	AddTestStepL( new(ELeave) CRootServerTest6_16 );
-	AddTestStepL( new(ELeave) CRootServerTest7_1 );
-	AddTestStepL( new(ELeave) CRootServerTest7_2 );
-	AddTestStepL( new(ELeave) CRootServerTest7_3 );
-	AddTestStepL( new(ELeave) CRootServerTest7_4 );
-	AddTestStepL( new(ELeave) CRootServerTest8_1 );
-
-	iNextServerNumber = 0;
-	}
-
-TInt CTestSuiteRootServer::StartRootServer()
-/**
- * Start the Root Server and connect the standard session to it
- *
- * @return TInt - An error code
- */
-    {    
-    TInt err = KErrNone;
-    TFindServer findCS(KRootServerName);
-    TFullName name;
-    RProcess rootServer;
-
-    if (findCS.Next(name) == KErrNone)
-		{
-		Log(_L("Shutting down existing RootServer"));
-
-		// Try to shutdown any existing instance of the rootserver so we can
-		// safely change the MBuf pool size before any modules are loaded.
-		// A sticky module such as ETel may prevent complete shutdown so we
-		// kill the process if necessary.
-		if(!ShutdownRootServer())
-			{
-			Log(_L("Killing existing RootServer"));
-
-			// Kill the rootserver process if normal shutdown fails.
-			TFindProcess findPS(KRootServerProcessPattern);
-			err = findPS.Next(name);
-			if(err == KErrNone)
-				{
-	 			err = rootServer.Open(findPS);
-	 			if(err == KErrNone)
-	 				{
-		 			TRequestStatus status;
-					rootServer.Logon(status);
-					rootServer.Kill(KErrNone);
-					User::WaitForRequest(status);
-					
-					// Create a timer in case some other entity holds an open handle on the
-					// configurator which prevents the kernel from destroying it.  We timeout
-					// after one second.
-					TAutoClose<RTimer> timer;
-					if(timer.iObj.CreateLocal() == KErrNone)
-						{
-						// Request destruction notification so we know when it is safe to start
-						// the process again.
-						TRequestStatus destructionStatus;
-						rootServer.NotifyDestruction(destructionStatus);
-						rootServer.Close();
-					
-						enum{ KProcessDestructionTimeout = 1000000 };
-				  					
-						TRequestStatus timerStatus;
-						timer.iObj.After(timerStatus, KProcessDestructionTimeout);
-						
-						// Wait for the process to be destroyed or for the timeout.
-						User::WaitForRequest(destructionStatus, timerStatus);
-						if(timerStatus.Int() == KRequestPending)
-							{
-							timer.iObj.Cancel();
-							User::WaitForRequest(timerStatus);
-							}
-						else
-							{
-							User::CancelMiscNotifier(destructionStatus);
-							User::WaitForRequest(destructionStatus);
-							
-							Log(_L("CTestSuiteRootServer::StartRootServer - existing RootServer process has still not been destroyed after %f.0s"), KProcessDestructionTimeout / 1000000.0);
-							}
-						}
-	 				}
-				}
-			}
-		}
-	else
-		{
-	    err = rootServer.Create(KRootServerExe, KNullDesC);
-		TRequestStatus status;
-	    if (err == KErrNone)
-			{
-			rootServer.Rendezvous(status);
-			rootServer.Resume();
-			User::WaitForRequest(status);
-			rootServer.Close();
-			err = status.Int();
-			}
-		if(err == KErrNone)
-			{
-			err = RootSess().Connect();
-			}
-		}
-
-    return err;
-    }
-
-
-TBool CTestSuiteRootServer::ShutdownRootServer()
-/**
- * Tell the Root Server to shutdown via its standard session, and validate that it did so.
- *
- * @return TBool - True if shutdown was successful
- */
-    {
-	TInt err;
-	// Some tests close the session
-	if(RootSess().Handle() == 0)
-		{
-		err = RootSess().Connect();
-		if(err != KErrNone)
-			{
-			Log(_L("Failed to reconnect session (err %d) - maybe dead already?"), err);
-			return EFalse;
-			}
-		}
-
-	TRSIter position;
-	while((err = RootSess().Shutdown()) == KErrRSModulesStillRunning)
-		{
-		TCFModuleName moduleName;
-		err = RootSess().EnumerateModules(position, moduleName);
-		if(err == KErrEof)
-			{
-			Log(_L("RRootServ::Shutdown could not be completed, probably due to the presence of sticky modules"));
-			return EFalse;
-			}
-		TRSModuleInfo moduleInfo;
-		err = RootSess().GetModuleInfo(moduleName, moduleInfo);
-		if(err == KErrRSModuleUnknown)
-			continue;	// an unload probably just completed
-		else if(err != KErrNone)
-			{
-			Log(_L("RRootServ::GetModuleInfo failed during shutdown"));
-			return EFalse;
-			}
-		TBuf<KCFMaxModuleName> wideModuleName;
-		wideModuleName.Copy(moduleName);
-		Log(_L("RRootServ::Shutdown in progress; need to unload %S (state %d)"), &wideModuleName, moduleInfo().iState);
-		TRequestStatus status;
-		switch(moduleInfo().iState)
-			{
-			case EStarting:		// treat a starting module as a zombie coz we're in a hurry, and who knows how long that rendezvous could take?
-			case EZombie:
-				{
-				RootSess().UnloadCpm(status, moduleName, EUnGraceful);
-				User::WaitForRequest(status);
-				if(status != KErrNone && status != KErrRSSuddenDeath && status != KErrRSModuleUnknown)
-					{
-					Log(_L("RRootServ::Shutdown failed, zombie could not be killed"));
-					return EFalse;
-					}
-				break;
-				}
-			case ERunning:
-				{
-				RootSess().UnloadCpm(status, moduleName, EGraceful);
-				User::WaitForRequest(status);
-				if(status.Int() == KErrLocked)
-					{
-					Log(_L("Module is sticky and cannot be unloaded"));
-					
-					// Move to the next module.
-					continue;
-					}
-				else
-					{
-					Log(_L("UnloadCPM returned %d"), status.Int());
-					}
-				break;	// either it worked or it should have become a zombie
-				}
-			case EStopping:
-				{
-				// transition states; snooze and try again
-				User::After(1000000);
-				break;
-				}
-			default:
-				{
-				Log(_L("RRootServ::Shutdown failed, module in improper states"));
-				return EFalse;
-				}
-			}
-			
-			// Try to unload this module again.
-			position.Reset();
-		}
-	RootSess().Close();
-	RRootServ probeSess;
-	TBool res = (probeSess.Connect() != KErrNone);
-	if(!res)
-		{
-		probeSess.Close();
-		}
-
-    return res;
-    }
-
-
-
-CSelfPopScheduler* CSelfPopScheduler::CreateLC()
-	{
-	CSelfPopScheduler* self = new(ELeave)CSelfPopScheduler;
-	CleanupStack::PushL(self);
-	CActiveScheduler::Install(self);
-	return self;
-	}
-
-CSelfPopScheduler::operator TCleanupItem()
-	{
-	return TCleanupItem(Cleanup, this);
-	}
-
-void CSelfPopScheduler::Cleanup(TAny* aItem)
-	{
-	CActiveScheduler::Install(NULL);
-	delete reinterpret_cast<CSelfPopScheduler*>(aItem);
-	}
-
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/TestSuiteRootServer.h	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-// Copyright (c) 2003-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:
-// This contains CTestSuiteRootServer 
-// This is the container class for all the RootServer test steps
-// 
-//
-
-#if (!defined __TESTSUITROOTSERVER_H__)
-#define __TESTSUITROOTSERVER_H__
-
-#include <networking/testsuite.h>
-#include <c32root.h>
-
-class  CTestSuiteRootServer : public CTestSuite
-{
-public:
-	void InitialiseL( void );
-	CTestSuiteRootServer();
-	~CTestSuiteRootServer();
-	
-	void AddTestStepL( CTestStepRootServer * ptrTestStep );
-	TPtrC GetVersion( void );
-
-	TInt StartRootServer();
-	TBool ShutdownRootServer();
-
-	RRootServ& RootSess()
-		{
-		return iRootServer;
-		}
-	TInt NextServerNumber()
-		{
-		return iNextServerNumber++;
-		}
-
-//	RRootServ iRootServer;
-
-
-private:
-	RRootServ iRootServer;
-	TInt iNextServerNumber;
-};
-
-
-
-// CSelfPopScheduler - thin extension of CActiveScheduler to give useful installation & removal cleanup-stack behaviour
-class CSelfPopScheduler : public CActiveScheduler
-	{
-public:
-	static CSelfPopScheduler* CreateLC();
-	operator TCleanupItem();
-private:
-	static void Cleanup(TAny* aItem);
-	};
-#endif /* __TESTSUITROOTSERVER_H__ */
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/scriptfiles/te_rootserver_main.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-//
-// 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:
-//
-// RootServer Main Script
-// Non-Platsec Version
-
-RUN_PROGRAM -1 scheduletest.exe Z:\TestData\Scripts\ts_rootserver_light.script
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/scriptfiles/te_rootserver_main_platsec.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-//
-// 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:
-//
-// RootServer Main Script
-// Platsec Version
-
-
-// --------------------
-// Use Setcap to create a version of scheduletest.exe with required caps - 00000000, SID=101F7988, VID=70000001
-RUN_PROGRAM -1 setcap scheduletest.exe 00000000  -SID 101F7988 -VID 70000001 C:\scheduletest_c32.exe
-RUN_PROGRAM -1 C:\scheduletest_c32.exe Z:\TestData\Scripts\ts_rootserver_light.script
-
-
-RUN_SCRIPT Z:\TestData\Scripts\RootServerPlatSecSuite.script
--- a/commsprocess/commsrootserverconfig/ts_rootserver/scriptfiles/ts_rootserver.ini	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-[Test_Common]
-
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/scriptfiles/ts_rootserver_full.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,288 +0,0 @@
-//
-// 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:
-//
-//MULTITHREAD
-//
-PRINT TS_RootServer: Section 1 tests
-//
-LOAD_SUITE TS_rootserver.dll
-
-// run test 1.1
-PRINT
-RUN_TEST_STEP 100, TS_rootserver, Test1.1 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 2.1
-PRINT
-RUN_TEST_STEP 10000, TS_rootserver, Test2.1 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 2.2
-PRINT
-RUN_TEST_STEP 10000, TS_rootserver, Test2.2 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 2.3
-PRINT
-RUN_TEST_STEP 10000, TS_rootserver, Test2.3 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.2
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.2 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.3
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.3 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.4
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.4 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.5
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.5 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.6
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.6 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.7
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.7 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.8
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.8 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.9
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.9 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.10
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.10 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.11
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.11 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.12
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.12 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.13
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.13 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.14
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.14 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.15
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.15 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.16
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.16 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.17
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.17 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.18
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.18 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 4.1
-PRINT
-RUN_TEST_STEP 18000, TS_rootserver, Test4.1 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 5.1
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test5.1 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 5.2
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test5.2 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 5.3
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test5.3 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 5.4
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test5.4 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 5.5
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test5.5 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 5.6
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test5.6 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 5.7
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test5.7 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 5.8
-PRINT
-RUN_TEST_STEP 12500, TS_RootServer, Test5.8 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 6.1
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test6.1 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 6.2
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test6.2 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 6.3
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test6.3 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 6.4
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test6.4 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 6.5
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test6.5 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 6.6
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test6.6 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 6.7
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test6.7 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 6.8
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test6.8 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 6.9
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test6.9 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 6.10
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test6.10 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 6.11
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test6.11 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 6.12
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test6.12 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 6.13
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test6.13 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 6.14
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test6.14 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 6.15
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test6.15 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 6.16
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test6.16 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 7.1
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test7.1 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 7.2
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test7.2 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 7.3
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test7.3 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 7.4
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test7.4 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-//run test 1.2
-PRINT
-RUN_TEST_STEP 100, TS_rootserver, Test1.2 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 8.1
-//!@SYMTestCaseID COMINF-FWORK-U-250001
-//!@SYMREQ REQ5026 PREQ955
-//!@SYMTestCaseDesc Unit testing conversion of thread priority names to enums
-//!@SYMTestPriority High
-//!@SYMTestActions Pass a series of valid and invalid priority names to function
-//!@SYMTestExpectedResults Pass, if all valid names converted correctly, and invalid names fail to convert
-//!@SYMTestType UT
-PRINT
-RUN_TEST_STEP 100, TS_rootserver, Test8.1 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/scriptfiles/ts_rootserver_light.script	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +0,0 @@
-//
-// 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:
-//
-//MULTITHREAD
-//
-PRINT TS_RootServer: Section 1 tests
-//
-LOAD_SUITE TS_rootserver.dll
-
-// run test 1.1
-PRINT
-RUN_TEST_STEP 100, TS_rootserver, Test1.1 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 2.1
-PRINT
-RUN_TEST_STEP 10000, TS_rootserver, Test2.1 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 2.2
-PRINT
-RUN_TEST_STEP 10000, TS_rootserver, Test2.2 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 2.3
-PRINT
-RUN_TEST_STEP 10000, TS_rootserver, Test2.3 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.2
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.2 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.3
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.3 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.4
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.4 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.5
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.5 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.6
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.6 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.7
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.7 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.8
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.8 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.9
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.9 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.10
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.10 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.11
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.11 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.12
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.12 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.13
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.13 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.14
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.14 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.15
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.15 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.16
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.16 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.17
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.17 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 3.18
-PRINT
-RUN_TEST_STEP 500, TS_rootserver, Test3.18 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 4.1
-PRINT
-RUN_TEST_STEP 18000, TS_rootserver, Test4.1 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 5.1
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test5.1 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 5.2
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test5.2 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 5.3
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test5.3 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 5.4
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test5.4 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 5.5
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test5.5 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 5.6
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test5.6 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 5.7
-PRINT
-RUN_TEST_STEP 12500, TS_rootserver, Test5.7 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 5.8
-PRINT
-RUN_TEST_STEP 12500, TS_RootServer, Test5.8 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
-// run test 1.2
-PRINT
-RUN_TEST_STEP 100, TS_rootserver, Test1.2 z:\testdata\configs\ts_rootserver.ini
-TEST_COMPLETE
-
--- a/commsprocess/commsrootserverconfig/ts_rootserver/testcpm/testcpm.cpp	Thu Sep 02 21:44:45 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,376 +0,0 @@
-// Copyright (c) 2003-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:
-//
-
-#include <cflog.h>
-#include <cfshared.h>
-using namespace CommsFW;
-#include <cfmsgs.h>
-#include <rsshared.h>
-#include "../RootServerTest.h"
-
-__CFLOG_STMT(_LIT8(KLogTestCPM, "TestCPM");) // subsystem name
-_LIT( KTestCpmPanic, "TestCpm" );
-const TText8* const KSubModules[] = { _S8("Test Protocol1"), _S8("Test Protocol2"), _S8("Test Protocol3") };
-
-
-class CDeathTimer : public CTimer
-	{
-public:
-	static CDeathTimer* NewL(TInt aAfter)
-		{
-		CDeathTimer* self = new(ELeave) CDeathTimer;
-		CleanupStack::PushL(self);
-		self->ConstructL();
-		CleanupStack::Pop(self);
-		CActiveScheduler::Add(self);
-		self->After(aAfter);
-		return self;
-		}
-protected:
-	CDeathTimer() : CTimer(EPriorityStandard)
-		{
-		}
-	void RunL()
-		{
-		// Go not gracefully into that good night
-		User::Invariant();
-		}
-	};
-
-class CChannelHandler;
-class CTestModule : public CBase
-	{
-public:
-	enum {EPriority=1000}; //< priority of this Active Object
-public:
-	~CTestModule();
-	void CFMessageReceived(TCFMessage& aMsg);
-	static CTestModule* NewL(TCFModuleInfo* aStartupArgs);
-	void ConstructL(TCFModuleInfo* aStartupArgs);
-	void LoggedAfter(TInt aAfterMS, const TDesC8& aDescription);
-private:
-	CChannelHandler* iChannelHandler;
-	TTestModuleIniDataContainer iDelayTimes;
-	TInt iDiscoverPos;
-	CDeathTimer* iDeathTimer;
-	};
-
-class CChannelHandler:public CActive
-	{
-public:
-	static CChannelHandler* NewL(RCFChannel::TMsgQueues aRxQueues, 
-									RCFChannel::TMsgQueues aTxQueues, CTestModule* aModule);
-	void RunL();
-	TInt Send(TCFMessage);
-	~CChannelHandler();
-protected:
-	virtual void DoCancel();
-private:
-	void ConstructL(RCFChannel::TMsgQueues aRxQueues, 
-					RCFChannel::TMsgQueues aTxQueues, CTestModule* aModule);
-	CChannelHandler();
-private:
-	CTestModule* iModule;
-	RCFChannelPair iChannelPair;
-	};
-
-
-//
-// CChannelHandler class definitions
-//
-
-CChannelHandler::CChannelHandler():CActive(CActive::EPriorityStandard)
-	{
-	CActiveScheduler::Add(this);
-	}
-
-CChannelHandler* CChannelHandler::NewL(RCFChannel::TMsgQueues aRxQueues, 
-									RCFChannel::TMsgQueues aTxQueues, CTestModule* aModule)
-	{
-	CChannelHandler* pHandler = new (ELeave) CChannelHandler;
-	pHandler->ConstructL(aRxQueues, aTxQueues, aModule);
-	return pHandler;
-	}
-
-void CChannelHandler::ConstructL(RCFChannel::TMsgQueues aRxQueues, 
-									RCFChannel::TMsgQueues aTxQueues, CTestModule* aModule)
-	{
-	iModule = aModule;
-	iChannelPair.CreateSend(aTxQueues);
-	iChannelPair.CreateRecv(aRxQueues);
-	SetActive();
-	iChannelPair.NotifyDataAvailable(*this);
-	}
-
-void CChannelHandler::DoCancel(void)
-	{
-	iChannelPair.CancelDataAvailable();
-	}
-
-TInt CChannelHandler::Send(TCFMessage aMsg)
-	{
-	TRequestStatus status;
-	iChannelPair.NotifySpaceAvailable(*this);
-	User::WaitForRequest(status);
-	return iChannelPair.Send(aMsg);
-	}
-
-void CChannelHandler::RunL()
-	{
-
-	if (iStatus != KErrNone)
-		{
-		User::Invariant();
-		}
-
-	// No error. Take the message from the channel.
-	TCFMessage msg;
-	TInt err = iChannelPair.Receive(msg);
-	if (KErrNone == err)
-		{
-		//Pass the message
-		iModule->CFMessageReceived(msg);
-		//Pend again
-		SetActive();
-		iChannelPair.NotifyDataAvailable(*this);
-		}
-	else
-		{
-		User::Invariant();
-		}
-	}
-
-CChannelHandler::~CChannelHandler()
-	{
-	if(IsActive())
-		Cancel();
-	iChannelPair.CloseNonGracefully();
-	}	
-
-
-//
-// implementation of CTestServer
-//
-
-CTestModule* CTestModule::NewL(TCFModuleInfo* aStartupArgs)
-/**
- * Create a new CCommServer.
- *
- * This is not a normal 2 phase contruction. If the allocation of the object
- * fails we will panic with -4 which means that something is very wrong.
- */
-	{
-	CTestModule* pS;
-	CleanupStack::PushL(pS = new CTestModule);
-	__ASSERT_ALWAYS(pS!=NULL, User::Panic( KTestCpmPanic, KErrNoMemory));
-#ifdef SYMBIAN_C32ROOT_API_V3
-	pS->ConstructL(aStartupArgs);
-#else
-	TRAPD(r, pS->ConstructL(aStartupArgs));
-	__ASSERT_ALWAYS(r==KErrNone, User::Panic( KTestCpmPanic, KErrNoMemory));
-#endif
-	CleanupStack::Pop(pS);
-	return pS;
-	}
-
-
-void CTestModule::ConstructL(TCFModuleInfo* aStartupArgs)
-	{
-	if (aStartupArgs->iIniData != NULL)
-		{
-		if (aStartupArgs->iIniData->Length() == sizeof(iDelayTimes))
-			{
-			TTestModuleIniData pkg;
-			pkg.Copy(*(aStartupArgs->iIniData));
-#if defined(SYMBIAN_C32ROOT_API_V3)
-			delete aStartupArgs->iIniData;
-#endif
-
-			iDelayTimes = pkg.iParams;
-
-			if(iDelayTimes.iInitDelay == EXIT_BEFORE_RENDEZVOUS)
-				User::Leave(KErrGeneral);
-			else if(iDelayTimes.iInitDelay > 0)
-				LoggedAfter(iDelayTimes.iInitDelay, _L8("Init"));
-			else if(iDelayTimes.iInitDelay == PANIC_BEFORE_RENDEZVOUS)
-				User::Panic(_L("TESTCPM"), 1);
-
-			__CFLOG_5( KLogTestCPM, KLogCode, 
-				_L8("TestCpm[%LU] - iIniData delays (msec): discoveryDelay %d bindDelay %d unbindDelay %d shutdownDelay %d"), 
-						 RThread().Id().Id(), iDelayTimes.iDiscoveryDelay, iDelayTimes.iBindDelay,
-						 iDelayTimes.iUnbindDelay, iDelayTimes.iShutdownDelay);
-
-			iChannelHandler = CChannelHandler::NewL(aStartupArgs->iRxQueues, aStartupArgs->iTxQueues, this);
-
-			RThread::Rendezvous(KErrNone);
-
-			if(iDelayTimes.iInitDelay == PANIC_AFTER_RENDEZVOUS)
-				User::Panic(_L("TESTCPM"), 1);
-
-			}
-		else
-			{
-			__CFLOG_1( KLogTestCPM, KLogCode, _L("TestCpm[%LU] - iIniData mismatched"), RThread().Id().Id() );
-#if defined(SYMBIAN_C32ROOT_API_V3)
-			delete aStartupArgs->iIniData;
-#endif
-			ASSERT(0);
-			}
-		}
-	else
-		{
-		__CFLOG_1( KLogTestCPM, KLogCode, _L("TestCpm[%LU] - No iIniData"), RThread().Id().Id() );
-		ASSERT(0);
-		}
-	}
-
-void CTestModule::CFMessageReceived(TCFMessage& aMsg)
-	{
-	
-	//It is called when a new message arrives from incomming channel
-	switch (aMsg.Code())
-		{
-		case TCFCommsMessage::ECodeDiscover:
-			{
-			// now wait for delay
-			__CFLOG(KLogTestCPM, KLogCode, _L("TestCpm Discover message received"));
-
-			LoggedAfter(iDelayTimes.iDiscoveryDelay, _L8("Discovery"));
-			const TCFDiscoverMsg& msg = reinterpret_cast<const TCFDiscoverMsg&>(aMsg);
-			// we return our sub-modules one at a time to make sure the RootServer copes with iterative discovery
-			const TInt numSubModules = sizeof(KSubModules) / sizeof(KSubModules[0]);
-			ASSERT(msg.Size() > 0);
-			ASSERT(iDiscoverPos < numSubModules);
-			if(msg.Reset())
-				iDiscoverPos = 0;
-			TCFSubModuleName name;
-			const TText8* subMod = KSubModules[iDiscoverPos++];
-			name.Copy(subMod);
-			msg.SubModuleNames()[0] = name;
-			TBool discoveryEnded = (iDiscoverPos == numSubModules);
-			TCFDiscoverRespMsg diskresp(msg.Identifier(), 1, !discoveryEnded);
-			TInt err = iChannelHandler->Send(diskresp);
-			if(KErrNone != err)
-				{
-       		    User::Invariant();
-				}
-			if(discoveryEnded && iDelayTimes.iDeathDelay != NO_PREMATURE_DEATH)
-				{
-				TRAP(err, iDeathTimer = CDeathTimer::NewL(iDelayTimes.iDeathDelay * 1000));
-				ASSERT(iDeathTimer);
-				}
-				
-			}
-			break;
-
-		case TCFCommsMessage::ECodeBind:
-			{
-			__CFLOG(KLogTestCPM, KLogCode, _L("TestCpm Bind message received"));
-			// now wait for delay
-			LoggedAfter(iDelayTimes.iBindDelay, _L8("Bind"));
-			const TCFBindMsg& msg = reinterpret_cast<const TCFBindMsg&>(aMsg);
-			TCFBindCompleteMsg resp(msg.Identifier(), KErrNone);
-			TInt err = iChannelHandler->Send(resp);
-			if(KErrNone != err)
-				{
-				User::Invariant();
-				}
-			}
-			break;
-
-		case TCFCommsMessage::ECodeUnbind: 
-			{
-			__CFLOG(KLogTestCPM, KLogCode, _L("TestCpm UnBind message received"));
-			// now wait for delay
-			LoggedAfter(iDelayTimes.iUnbindDelay, _L8("Unbind"));
-			const TCFUnbindMsg& msg = reinterpret_cast<const TCFUnbindMsg&>(aMsg);
-			TCFUnbindCompleteMsg resp(msg.Identifier(), KErrNone);
-			TInt err = iChannelHandler->Send(resp);
-			if(KErrNone != err)
-				{
-				User::Invariant();
-				}
-			}
-			break;
-
-		case TCFCommsMessage::ECodeShutdown:
-			// now wait for delay
-			__CFLOG(KLogTestCPM, KLogCode, _L("TestCpm Shutdown message received"));
-			LoggedAfter(iDelayTimes.iShutdownDelay, _L8("Shutdown"));
-
-			CActiveScheduler::Stop();
-			break;
-		default:;
-			User::Invariant();
-		}
-	}
-
-	
-CTestModule::~CTestModule()
-	{
-	delete iChannelHandler;
-	delete iDeathTimer;
-	}
-
-void CTestModule::LoggedAfter(TInt aAfterMS, const TDesC8& aDescription)
-	{ 
-	(void) aDescription;
-	__CFLOG_2(KLogTestCPM, KLogCode, _L8("TestCpm: %d ms %S pause"), aAfterMS, &aDescription);
-	User::After(aAfterMS * 1000);
-	__CFLOG_1(KLogTestCPM, KLogCode, _L8("TestCpm: %S pause complete"), &aDescription);
-	}
-
-
-//---------------
-
-void DoModuleThreadL(TAny * aArg)
-	{
-	TCFModuleInfo* args = reinterpret_cast<TCFModuleInfo*>(aArg);
-	
-	CActiveScheduler*  scheduler = new (ELeave) CActiveScheduler;
-	CleanupStack::PushL(scheduler);
-	CActiveScheduler::Install(scheduler); 
-
-	CTestModule *pTm = CTestModule::NewL(args);
-
-    __CFLOG_1( KLogTestCPM, KLogCode, _L("TestCpm[%LU] - Completed rendezvous."), RThread().Id().Id() );
-
-	CActiveScheduler::Start();
-
-	__CFLOG_1( KLogTestCPM, KLogCode, _L("TestCpm[%LU] - Exiting thread function"), RThread().Id().Id() );
-
-	delete pTm;
-	CActiveScheduler::Install(NULL);
-	CleanupStack::PopAndDestroy(scheduler);
-	}
-
-EXPORT_C TInt ModuleThread(TAny * aArg)
-	{
-	CTrapCleanup* cleanup = CTrapCleanup::New();
-	if(!cleanup)
-		return KErrNoMemory;	
-
-	TRAPD(ret, DoModuleThreadL(aArg))
-	if (ret!=KErrNone)
-		{
-		__CFLOG(KLogTestCPM, KLogCode, _L("ModuleThread failed to create TestCpm"));
-		}
-
-	delete cleanup;
-	return ret;
-	}
-
-
-
--- a/datacommsserver/esockserver/test/CapTests/RConnServ/Common/Te_Cap_RConnServ.MMP	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/CapTests/RConnServ/Common/Te_Cap_RConnServ.MMP	Fri Sep 17 08:36:26 2010 +0300
@@ -35,6 +35,7 @@
 //For TEF 
 LIBRARY		testexecuteutils.lib 
 LIBRARY		testexecutelogclient.lib 
+LIBRARY		netmeta.lib
 
 MACRO __DATA_CAGING__
 MACRO __SECURE_API__
--- a/datacommsserver/esockserver/test/TE_ESock/group/TE_Esock.iby	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_ESock/group/TE_Esock.iby	Fri Sep 17 08:36:26 2010 +0300
@@ -48,7 +48,7 @@
 data=EPOCROOT##epoc32\data\z\TestData\scripts\te_Test_All_Esock_ip4_NonConnection.script TestData\Scripts\te_Test_All_Esock_ip4_NonConnection.script
 data=EPOCROOT##epoc32\data\z\TestData\scripts\te_Test_All_Esock_ip6_NonConnection.script TestData\Scripts\te_Test_All_Esock_ip6_NonConnection.script
 
-data=EPOCROOT##epoc32\data\z\TestData\configs\te_esock.xml                               TestData\configs\te_esock.xml
+data=EPOCROOT##epoc32\data\z\TestData\configs\te_esock_wlan.xml                          TestData\configs\te_esock.xml
 data=EPOCROOT##epoc32\data\z\TestData\configs\te_esock_ethernet_MOMAP16xx.xml            TestData\configs\te_esock_ethernet.xml
 
 data=EPOCROOT##epoc32\data\z\TestData\configs\test_esock.ini                             TestData\configs\test_esock.ini
--- a/datacommsserver/esockserver/test/TE_ESock/scriptfiles/te_esock.xml	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_ESock/scriptfiles/te_esock.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -83,6 +83,14 @@
         <IAPNetworkWeighting>0</IAPNetworkWeighting>
         <LocationRef>Location.Office</LocationRef>
     </IAP>
+    <IAP operation="add">
+		<Name>WlanConnectivity</Name>
+		<IAPService>LANService.WlanConnectivity</IAPService>
+       <IAPBearer>LANBearer.WLANBearer</IAPBearer>
+		<IAPNetwork>Network.Intranet</IAPNetwork>
+		<IAPNetworkWeighting>0</IAPNetworkWeighting>
+		<LocationRef>Location.Office Direct Dial</LocationRef>
+    </IAP>
 </IAPTable>
 
 <ModemBearerTable>
@@ -706,10 +714,37 @@
         <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
         <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
     </LANBearer>
+    <LANBearer operation="add">
+		<Name>WLANBearer</Name>
+		<IfName>wlannif</IfName>
+		<LDDName>not used</LDDName>
+		<PDDName>not used</PDDName>
+		<LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+		<LastSessionClosedTimeout>1</LastSessionClosedTimeout>
+		<LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+		<Agent>wlanagt.agt</Agent>
+    </LANBearer>
 </LANBearerTable>
 
 <LANServiceTable>
     <LANService operation="add">
+		<Name>WlanConnectivity</Name>
+		<IfNetworks>ip</IfNetworks>
+		<IpNetMask>255.255.255.0</IpNetMask>
+		<IpGateway>0.0.0.0</IpGateway>
+		<IpAddrFromServer>TRUE</IpAddrFromServer>
+		<IpAddr>0.0.0.0</IpAddr>
+		<IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+		<IpNameServer1>10.29.23.7</IpNameServer1>
+		<IpNameServer2>0.0.0.0</IpNameServer2>
+		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
+		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
+		<Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
+		<IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
+		<ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+		<ConfigDaemonName>!DhcpServ</ConfigDaemonName>
+    </LANService>
+    <LANService operation="add">
         <Name>Ethernet</Name>
         <IfNetworks>ip,ip6</IfNetworks>
         <IpNetMask>255.255.255.0</IpNetMask>
@@ -897,8 +932,8 @@
         <Ranking>1</Ranking>
         <Direction>OUTGOING</Direction>
         <DialogPref>DONOTPROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.NT RAS</IAPRef>
+        <BearerSet>LAN</BearerSet>
+        <IAPRef>IAP.WlanConnectivity</IAPRef>
     </ConnectionPreferences>
 </ConnectionPreferencesTable>
 
--- a/datacommsserver/esockserver/test/TE_ESock/scriptfiles/te_esock_wlan.xml	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_ESock/scriptfiles/te_esock_wlan.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -734,8 +734,8 @@
 		<IpGateway>0.0.0.0</IpGateway>
 		<IpAddrFromServer>TRUE</IpAddrFromServer>
 		<IpAddr>0.0.0.0</IpAddr>
-		<IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-		<IpNameServer1>0.0.0.0</IpNameServer1>
+		<IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+		<IpNameServer1>10.29.23.7</IpNameServer1>
 		<IpNameServer2>0.0.0.0</IpNameServer2>
 		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
 		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
--- a/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765428.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765428.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -44,7 +44,7 @@
 Protocol=UDP
 SrcAddr=0.0.0.0
 SrcPort=0
-DstAddr=192.168.20.11
+DstAddr=10.29.23.103
 DstPort=7
 
 
--- a/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765429.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765429.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -44,7 +44,7 @@
 Protocol=UDP
 SrcAddr=0.0.0.0
 SrcPort=0
-DstAddr=192.168.20.11
+DstAddr=10.29.23.103
 DstPort=7
 
 [CreateSocket2]
--- a/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765430.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765430.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -44,7 +44,7 @@
 Protocol=UDP
 SrcAddr=0.0.0.0
 SrcPort=0
-DstAddr=192.168.20.11
+DstAddr=10.29.23.103
 DstPort=7
 
 [CreateSocket2]
--- a/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765431.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765431.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -33,7 +33,7 @@
 SocketName=Socket1
 SrcAddr=0.0.0.0
 SrcPort=0
-DstAddr=192.168.20.11
+DstAddr=10.29.23.103
 DstPort=7
 Protocol=UDP
 
--- a/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765432.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765432.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -45,7 +45,7 @@
 Protocol=UDP
 SrcAddr=0.0.0.0
 SrcPort=0
-DstAddr=192.168.20.11
+DstAddr=10.29.23.103
 DstPort=7
 
 [SendReceiveSocket1]
--- a/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765433.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765433.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -29,7 +29,7 @@
 SocketName=Socket1
 SrcAddr=0.0.0.0
 SrcPort=0
-DstAddr=192.168.20.11
+DstAddr=10.29.23.103
 DstPort=7
 Protocol=UDP
 
--- a/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765434.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765434.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -38,7 +38,7 @@
 SocketName=Socket1
 SrcAddr=0.0.0.0
 SrcPort=0
-DstAddr=192.168.20.11
+DstAddr=10.29.23.103
 DstPort=7
 Protocol=UDP
 
--- a/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765435.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765435.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -30,7 +30,7 @@
 Protocol=UDP
 SrcAddr=0.0.0.0
 SrcPort=0
-DstAddr=192.168.20.11
+DstAddr=10.29.23.103
 DstPort=7
 
 [OpenDataMonitor1]
--- a/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765436.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765436.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -39,7 +39,7 @@
 Protocol=UDP
 SrcAddr=0.0.0.0
 SrcPort=0
-DstAddr=192.168.20.11
+DstAddr=10.29.23.103
 DstPort=7
 
 [OpenDataMonitor1]
--- a/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765437.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765437.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -29,7 +29,7 @@
 SocketName=Socket1
 SrcAddr=0.0.0.0
 SrcPort=0
-DstAddr=192.168.20.11
+DstAddr=10.29.23.103
 DstPort=7
 Protocol=UDP
 
--- a/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765438.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765438.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -38,7 +38,7 @@
 SocketName=Socket1
 SrcAddr=0.0.0.0
 SrcPort=0
-DstAddr=192.168.20.11
+DstAddr=10.29.23.103
 DstPort=7
 Protocol=UDP
 
--- a/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765439.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765439.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -30,7 +30,7 @@
 Protocol=UDP
 SrcAddr=0.0.0.0
 SrcPort=0
-DstAddr=192.168.20.11
+DstAddr=10.29.23.103
 DstPort=7
 
 [OpenDataMonitor1]
--- a/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765440.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/765440.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -39,7 +39,7 @@
 Protocol=UDP
 SrcAddr=0.0.0.0
 SrcPort=0
-DstAddr=192.168.20.11
+DstAddr=10.29.23.103
 DstPort=7
 
 [OpenDataMonitor1]
--- a/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/DataMonitoring.ced.cfg	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnection/configs/DataMonitoring/DataMonitoring.ced.cfg	Fri Sep 17 08:36:26 2010 +0300
@@ -25,9 +25,9 @@
 	PortName=COMM::0
 	TSYName=MM
 	CSYName=ECUART
-	LastSocketActivityTimeout=90
+	LastSocketActivityTimeout=30
 	LastSessionClosedTimeout=30
-	LastSocketClosedTimeout=60
+	LastSocketClosedTimeout=30
 	DataBits=8
 	StopBits=1
 	Parity=NONE
@@ -317,18 +317,15 @@
 [LANBearer]
 ADD_SECTION
 # COMMDB_ID = 1
-	Name=Ethernet
-	IfName=ethint
-	LDDFilename=enet
-	LDDName=Ethernet
-	PDDFilename=ethernet
-	PDDName=Ethernet.Wins
-	PacketDriverName=EtherPkt.drv
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=not used
+	PDDName=not used
 	LastSocketActivityTimeout=-1
 	LastSessionClosedTimeout=-1
 	LastSocketClosedTimeout=-1
-	Agent=nullagt.agt
-	FIELD_COUNT=11
+	Agent=wlanagt.agt
+	FIELD_COUNT=8
 END_ADD
 
 
@@ -524,18 +521,21 @@
 [LANService]
 ADD_SECTION
 # COMMDB_ID = 1
-	Name=Ethernet
+	Name=WlanConnectivity
 	IfNetworks=ip
-	IpNetMask=0.0.0.0
+	IpNetMask=255.255.255.0
 	IpGateway=0.0.0.0
 	IpAddrFromServer=TRUE
 	IpAddr=0.0.0.0
 	IpDNSAddrFromServer=TRUE
 	IpNameServer1=0.0.0.0
 	IpNameServer2=0.0.0.0
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
 	ConfigDaemonManagerName=NetCfgExtnDhcp
 	ConfigDaemonName=!DhcpServ
-	FIELD_COUNT=11
+	FIELD_COUNT=14
 END_ADD
 
 ############################################################
@@ -545,14 +545,14 @@
 ADD_SECTION
 # COMMDB_ID = 1
 	Id=1
-	Name=pppMappedFromIAP1
+	Name=dummynifMappedFromIAP1
 	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
+	MCpr=MCprTable.8
 	AccessPointSelectionPolicy=0
 	Cpr=CprTable.3
-	CprConfig=1
+	CprConfig=3
 	SCpr=SCprTable.3
-	Protocol=ProtocolTable.3
+	Protocol=ProtocolTable.8
 	AppSID=0
 	FIELD_COUNT=10
 END_ADD
@@ -560,12 +560,12 @@
 ADD_SECTION
 # COMMDB_ID = 2
 	Id=2
-	Name=ethintMappedFromIAP2
+	Name=wlannifMappedFromIAP2
 	Tier=Link.TierTable.271064565
 	MCpr=MCprTable.4
 	AccessPointSelectionPolicy=0
 	Cpr=CprTable.3
-	CprConfig=2
+	CprConfig=0
 	SCpr=SCprTable.3
 	Protocol=ProtocolTable.4
 	AppSID=0
@@ -718,11 +718,11 @@
 [IAP]
 ADD_SECTION
 # COMMDB_ID = 1
-	Name=cdgppp
+	Name=cdgdummynif3
 	IAPServiceType=DialOutISP
 	IAPService=2
 	IAPBearerType=ModemBearer
-	IAPBearer=1
+	IAPBearer=2
 	IAPNetwork=1
 	IAPNetworkWeighting=0
 	Location=2
@@ -731,7 +731,7 @@
 
 ADD_SECTION
 # COMMDB_ID = 2
-	Name=cdgethernet
+	Name=cdgwifi
 	IAPServiceType=LANService
 	IAPService=1
 	IAPBearerType=LANBearer
@@ -873,10 +873,9 @@
 
 ADD_SECTION
 # COMMDB_ID = 4
-	Id=4
-	Name=ethmcpr
-	MCprUid=271064572
-	FIELD_COUNT=3
+	Name=wlanmcpr
+	MCprUid=536982226
+	FIELD_COUNT=2
 END_ADD
 
 ADD_SECTION
@@ -1056,10 +1055,9 @@
 
 ADD_SECTION
 # COMMDB_ID = 4
-	Id=4
-	Name=ethernet
-	ProtocolUid=271064539
-	FIELD_COUNT=3
+	Name=wlan
+	ProtocolUid=536982227
+	FIELD_COUNT=2
 END_ADD
 
 ADD_SECTION
--- a/datacommsserver/esockserver/test/TE_RConnectionServ/configs/RConnectionServ.cfg	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnectionServ/configs/RConnectionServ.cfg	Fri Sep 17 08:36:26 2010 +0300
@@ -179,18 +179,15 @@
 [LANBearer]
 ADD_SECTION
 # COMMDB_ID = 1
-	Name=Ethernet
-	IfName=ethint
-	LDDFilename=enet
-	LDDName=Ethernet
-	PDDFilename=ethernet
-	PDDName=Ethernet.Wins
-	PacketDriverName=EtherPkt.drv
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=not used
+	PDDName=not used
 	LastSocketActivityTimeout=-1
 	LastSessionClosedTimeout=-1
 	LastSocketClosedTimeout=-1
-	Agent=nullagt.agt
-	FIELD_COUNT=11
+	Agent=wlanagt.agt
+	FIELD_COUNT=8
 END_ADD
 
 
@@ -271,6 +268,11 @@
 ## GlobalSettings
 ## 
 [GlobalSettings]
+ADD_TEMPLATE
+	DefaultTier=Link.TierTable.2048
+	FIELD_COUNT=1
+END_TEMPLATE
+
 ADD_SECTION
 # COMMDB_ID = 1
 	Name=DefaultRecordName-1
@@ -288,8 +290,7 @@
 	MaxMBufHeap=2
 	DefaultNetwork=1
 	BearerAvailabilityCheckTSY=mm
-	DefaultTier=Link.TierTable.2048
-	FIELD_COUNT=16
+	FIELD_COUNT=15
 END_ADD
 
 
@@ -382,18 +383,21 @@
 [LANService]
 ADD_SECTION
 # COMMDB_ID = 1
-	Name=Ethernet
+	Name=WlanConnectivity
 	IfNetworks=ip
-	IpNetMask=0.0.0.0
+	IpNetMask=255.255.255.0
 	IpGateway=0.0.0.0
 	IpAddrFromServer=TRUE
 	IpAddr=0.0.0.0
 	IpDNSAddrFromServer=TRUE
 	IpNameServer1=0.0.0.0
 	IpNameServer2=0.0.0.0
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
 	ConfigDaemonManagerName=NetCfgExtnDhcp
 	ConfigDaemonName=!DhcpServ
-	FIELD_COUNT=11
+	FIELD_COUNT=14
 END_ADD
 
 ############################################################
@@ -408,7 +412,7 @@
 	MCpr=MCprTable.8
 	AccessPointSelectionPolicy=0
 	Cpr=CprTable.3
-	CprConfig=1
+	CprConfig=3
 	SCpr=SCprTable.3
 	Protocol=ProtocolTable.8
 	AppSID=0
@@ -418,14 +422,14 @@
 ADD_SECTION
 # COMMDB_ID = 2
 	Id=2
-	Name=dummynif2MappedFromIAP2
+	Name=wlannifMappedFromIAP2
 	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.8
+	MCpr=MCprTable.4
 	AccessPointSelectionPolicy=0
 	Cpr=CprTable.3
-	CprConfig=2
+	CprConfig=0
 	SCpr=SCprTable.3
-	Protocol=ProtocolTable.8
+	Protocol=ProtocolTable.4
 	AppSID=0
 	FIELD_COUNT=10
 END_ADD
@@ -599,7 +603,7 @@
 ADD_SECTION
 # COMMDB_ID = 2
 	Id=2
-	Name=ethint
+	Name=wlannif
 	Tier=Link.TierTable.271064565
 	MCpr=MCprTable.4
 	Cpr=CprTable.3
@@ -716,7 +720,7 @@
 	IAPServiceType=DialOutISP
 	IAPService=2
 	IAPBearerType=ModemBearer
-	IAPBearer=5
+	IAPBearer=8
 	IAPNetwork=1
 	IAPNetworkWeighting=0
 	Location=2
@@ -725,11 +729,11 @@
 
 ADD_SECTION
 # COMMDB_ID = 2
-	Name=cdgdummy2
-	IAPServiceType=DialOutISP
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=6
+	Name=cdgwifi
+	IAPServiceType=LANService
+	IAPService=1
+	IAPBearerType=LANBearer
+	IAPBearer=1
 	IAPNetwork=1
 	IAPNetworkWeighting=0
 	Location=2
@@ -762,13 +766,14 @@
 	FIELD_COUNT=8
 END_ADD
 
+
 ############################################################
 ## APPrioritySelectionPolicyTable
 ## 
 [APPrioritySelectionPolicyTable]
 ADD_SECTION
 # COMMDB_ID = 1
-  	Id=1
+    Id=1
 	Name=SelectionPolicy1
 	AP1=Link.AccessPointTable.22
 	AP2=Link.AccessPointTable.24
@@ -778,7 +783,7 @@
 
 ADD_SECTION
 # COMMDB_ID = 2
-  	Id=2
+    Id=2
 	Name=SelectionPolicy2
 	AP1=Link.AccessPointTable.24
 	AP2=Link.AccessPointTable.26
@@ -788,7 +793,7 @@
 
 ADD_SECTION
 # COMMDB_ID = 3
-  	Id=3
+    Id=3
 	Name=SelectionPolicy3
 	AP1=Link.AccessPointTable.28
 	APCOUNT=1
@@ -869,10 +874,9 @@
 
 ADD_SECTION
 # COMMDB_ID = 4
-	Id=4
-	Name=ethmcpr
-	MCprUid=271064572
-	FIELD_COUNT=3
+	Name=wlanmcpr
+	MCprUid=536982226
+	FIELD_COUNT=2
 END_ADD
 
 ADD_SECTION
@@ -993,7 +997,7 @@
 # COMMDB_ID = 5
 	Id=5
 	Name=pppscpr
-	SCprUid=271065852
+	SCprUid=0x102822FC
 	FIELD_COUNT=3
 END_ADD
 
@@ -1001,7 +1005,7 @@
 # COMMDB_ID = 6
 	Id=6
 	Name=vanillascpr
-	SCprUid=271065844
+	SCprUid=0x102822F4
 	FIELD_COUNT=3
 END_ADD
 
@@ -1009,7 +1013,7 @@
 # COMMDB_ID = 7
 	Id=7
 	Name=qosscpr
-	SCprUid=271065811
+	SCprUid=0x102822D3
 	FIELD_COUNT=3
 END_ADD
 
@@ -1017,7 +1021,7 @@
 # COMMDB_ID = 8
 	Id=8
 	Name=ipqosprotoscpr
-	SCprUid=271065816
+	SCprUid=271010839
 	FIELD_COUNT=3
 END_ADD
 
@@ -1051,10 +1055,9 @@
 
 ADD_SECTION
 # COMMDB_ID = 4
-	Id=4
-	Name=ethernet
-	ProtocolUid=271064539
-	FIELD_COUNT=3
+	Name=wlan
+	ProtocolUid=536982227
+	FIELD_COUNT=2
 END_ADD
 
 ADD_SECTION
--- a/datacommsserver/esockserver/test/TE_RConnectionServ/configs/RConnectionServ_01_050.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnectionServ/configs/RConnectionServ_01_050.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -28,7 +28,7 @@
 SocketName=Socket1
 SrcAddr=0.0.0.0
 SrcPort=0
-DstAddr=192.168.20.11
+DstAddr=10.29.23.103
 DstPort=7
 Protocol=UDP
 
--- a/datacommsserver/esockserver/test/TE_RConnectionServ/configs/RConnectionServ_11_070.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnectionServ/configs/RConnectionServ_11_070.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -66,7 +66,7 @@
 SocketName=Socket1
 SrcAddr=0.0.0.0
 SrcPort=0
-DstAddr=192.168.20.11
+DstAddr=10.29.23.103
 DstPort=7
 Protocol=UDP
 
--- a/datacommsserver/esockserver/test/TE_RConnectionServ/configs/RConnectionServ_MixedAPTypes.cfg	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnectionServ/configs/RConnectionServ_MixedAPTypes.cfg	Fri Sep 17 08:36:26 2010 +0300
@@ -14,7 +14,6 @@
 	FIELD_COUNT=1
 END_ADD
 
-
 ############################################################
 ## ModemBearer
 ## 
@@ -180,18 +179,15 @@
 [LANBearer]
 ADD_SECTION
 # COMMDB_ID = 1
-	Name=Ethernet
-	IfName=ethint
-	LDDFilename=enet
-	LDDName=Ethernet
-	PDDFilename=ethernet
-	PDDName=Ethernet.Wins
-	PacketDriverName=EtherPkt.drv
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=not used
+	PDDName=not used
 	LastSocketActivityTimeout=-1
 	LastSessionClosedTimeout=-1
 	LastSocketClosedTimeout=-1
-	Agent=nullagt.agt
-	FIELD_COUNT=11
+	Agent=wlanagt.agt
+	FIELD_COUNT=8
 END_ADD
 
 
@@ -387,18 +383,21 @@
 [LANService]
 ADD_SECTION
 # COMMDB_ID = 1
-	Name=Ethernet
+	Name=WlanConnectivity
 	IfNetworks=ip
-	IpNetMask=0.0.0.0
+	IpNetMask=255.255.255.0
 	IpGateway=0.0.0.0
 	IpAddrFromServer=TRUE
 	IpAddr=0.0.0.0
 	IpDNSAddrFromServer=TRUE
 	IpNameServer1=0.0.0.0
 	IpNameServer2=0.0.0.0
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
 	ConfigDaemonManagerName=NetCfgExtnDhcp
 	ConfigDaemonName=!DhcpServ
-	FIELD_COUNT=11
+	FIELD_COUNT=14
 END_ADD
 
 ############################################################
@@ -408,14 +407,14 @@
 ADD_SECTION
 # COMMDB_ID = 1
 	Id=1
-	Name=pppMappedFromIAP1
+	Name=dummynif1MappedFromIAP1
 	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
+	MCpr=MCprTable.8
 	AccessPointSelectionPolicy=0
 	Cpr=CprTable.3
-	CprConfig=1
+	CprConfig=3
 	SCpr=SCprTable.3
-	Protocol=ProtocolTable.3
+	Protocol=ProtocolTable.8
 	AppSID=0
 	FIELD_COUNT=10
 END_ADD
@@ -423,12 +422,12 @@
 ADD_SECTION
 # COMMDB_ID = 2
 	Id=2
-	Name=ethintMappedFromIAP2
+	Name=wlannifMappedFromIAP2
 	Tier=Link.TierTable.271064565
 	MCpr=MCprTable.4
 	AccessPointSelectionPolicy=0
 	Cpr=CprTable.3
-	CprConfig=2
+	CprConfig=0
 	SCpr=SCprTable.3
 	Protocol=ProtocolTable.4
 	AppSID=0
@@ -604,7 +603,7 @@
 ADD_SECTION
 # COMMDB_ID = 2
 	Id=2
-	Name=ethint
+	Name=wlannif
 	Tier=Link.TierTable.271064565
 	MCpr=MCprTable.4
 	Cpr=CprTable.3
@@ -717,11 +716,11 @@
 [IAP]
 ADD_SECTION
 # COMMDB_ID = 1
-	Name=cdgppp
+	Name=cdgdummy1
 	IAPServiceType=DialOutISP
 	IAPService=2
 	IAPBearerType=ModemBearer
-	IAPBearer=1
+	IAPBearer=8
 	IAPNetwork=1
 	IAPNetworkWeighting=0
 	Location=2
@@ -730,7 +729,7 @@
 
 ADD_SECTION
 # COMMDB_ID = 2
-	Name=cdgethernet
+	Name=cdgwifi
 	IAPServiceType=LANService
 	IAPService=1
 	IAPBearerType=LANBearer
@@ -839,7 +838,7 @@
 	##NB defaultAccessPoint not present in this layer. This is only needed here to satisfy the check
 	##on the link layer. However important that once this field has a value it has to be linked to a
 	##correct accesspoint record in the accesspoint table because this will be checked either.
-	DefaultAccessPoint=AccessPointTable.1
+	DefaultAccessPoint=Link.AccessPointTable.1
 	PromptUser=0
 	FIELD_COUNT=7
 END_ADD
@@ -875,10 +874,9 @@
 
 ADD_SECTION
 # COMMDB_ID = 4
-	Id=4
-	Name=ethmcpr
-	MCprUid=271064572
-	FIELD_COUNT=3
+	Name=wlanmcpr
+	MCprUid=536982226
+	FIELD_COUNT=2
 END_ADD
 
 ADD_SECTION
@@ -1057,10 +1055,9 @@
 
 ADD_SECTION
 # COMMDB_ID = 4
-	Id=4
-	Name=ethernet
-	ProtocolUid=271064539
-	FIELD_COUNT=3
+	Name=wlan
+	ProtocolUid=536982227
+	FIELD_COUNT=2
 END_ADD
 
 ADD_SECTION
--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/RConnectionNTRAS_Bad.xml	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/RConnectionNTRAS_Bad.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -32,6 +32,9 @@
         <Name>NT RAS</Name>
     </Network>
     <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+    <Network operation="add">
         <Name>Linux</Name>
     </Network>
     <Network operation="add">
@@ -98,12 +101,12 @@
         <LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
-        <Name>Actual NT RAS</Name>
-        <IAPService>DialOutISP.NT RAS</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.NT RAS</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
+		<Name>WlanConnectivity</Name>
+		<IAPService>LANService.WlanConnectivity</IAPService>
+       <IAPBearer>LANBearer.WLANBearer</IAPBearer>
+		<IAPNetwork>Network.Intranet</IAPNetwork>
+		<IAPNetworkWeighting>0</IAPNetworkWeighting>
+		<LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
         <Name>Virtual Comm port</Name>
@@ -622,19 +625,35 @@
         <LDDName>Dummy LDD</LDDName>
         <PDDName>Dummy PDD</PDDName>
     </LANBearer>
+    <LANBearer operation="add">
+		<Name>WLANBearer</Name>
+		<IfName>wlannif</IfName>
+		<LDDName>not used</LDDName>
+		<PDDName>not used</PDDName>
+		<LastSocketActivityTimeout>10</LastSocketActivityTimeout>
+		<LastSessionClosedTimeout>10</LastSessionClosedTimeout>
+		<LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+		<Agent>wlanagt.agt</Agent>
+    </LANBearer>
 </LANBearerTable>
 
 <LANServiceTable>
     <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip,ip6</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>194.72.6.1</IpGateway>
-        <IpAddr>192.168.0.100</IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.52</IpNameServer2>
+		<Name>WlanConnectivity</Name>
+		<IfNetworks>ip</IfNetworks>
+		<IpNetMask>255.255.255.0</IpNetMask>
+		<IpGateway>0.0.0.0</IpGateway>
+		<IpAddrFromServer>TRUE</IpAddrFromServer>
+		<IpAddr>0.0.0.0</IpAddr>
+		<IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+		<IpNameServer1>0.0.0.0</IpNameServer1>
+		<IpNameServer2>0.0.0.0</IpNameServer2>
+		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
+		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
+		<Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
+		<IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
+		<ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+		<ConfigDaemonName>!DhcpServ</ConfigDaemonName>
     </LANService>
 </LANServiceTable>
 
@@ -912,8 +931,8 @@
         <Ranking>1</Ranking>
         <Direction>OUTGOING</Direction>
         <DialogPref>DONOTPROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Bad NT RAS</IAPRef>
+        <BearerSet>LAN</BearerSet>
+        <IAPRef>IAP.WlanConnectivity</IAPRef>
     </ConnectionPreferences>
 </ConnectionPreferencesTable>
 
@@ -931,7 +950,7 @@
         <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
         <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
         <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.NT RAS</DefaultNetwork>
+        <DefaultNetwork>Network.Intranet</DefaultNetwork>
         <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
     </GlobalSettings>
 </GlobalSettingsTable>
--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/ainntras.xml	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/ainntras.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -30,6 +30,9 @@
 
 <NetworkTable>
     <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+    <Network operation="add">
         <Name>NT RAS</Name>
     </Network>
     <Network operation="add">
@@ -93,12 +96,12 @@
         <LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
-        <Name>Actual NT RAS</Name>
-        <IAPService>DialOutISP.NT RAS</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.NT RAS</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
+		<Name>WlanConnectivity</Name>
+		<IAPService>LANService.WlanConnectivity</IAPService>
+       <IAPBearer>LANBearer.WLANBearer</IAPBearer>
+		<IAPNetwork>Network.Intranet</IAPNetwork>
+		<IAPNetworkWeighting>0</IAPNetworkWeighting>
+		<LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
         <Name>Virtual Comm port</Name>
@@ -635,25 +638,34 @@
 
 <LANBearerTable>
     <LANBearer operation="add">
-        <Name>Dummy LAN Bearer</Name>
-        <Agent>PSD.agt</Agent>
-        <IfName>ppp</IfName>
-        <LDDName>Dummy LDD</LDDName>
-        <PDDName>Dummy PDD</PDDName>
+		<Name>WLANBearer</Name>
+		<IfName>wlannif</IfName>
+		<LDDName>not used</LDDName>
+		<PDDName>not used</PDDName>
+		<LastSocketActivityTimeout>10</LastSocketActivityTimeout>
+		<LastSessionClosedTimeout>10</LastSessionClosedTimeout>
+		<LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+		<Agent>wlanagt.agt</Agent>
     </LANBearer>
 </LANBearerTable>
 
 <LANServiceTable>
     <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip,ip6</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>194.72.6.1</IpGateway>
-        <IpAddr>192.168.0.100</IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.52</IpNameServer2>
+		<Name>WlanConnectivity</Name>
+		<IfNetworks>ip</IfNetworks>
+		<IpNetMask>255.255.255.0</IpNetMask>
+		<IpGateway>0.0.0.0</IpGateway>
+		<IpAddrFromServer>TRUE</IpAddrFromServer>
+		<IpAddr>0.0.0.0</IpAddr>
+		<IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+		<IpNameServer1>0.0.0.0</IpNameServer1>
+		<IpNameServer2>0.0.0.0</IpNameServer2>
+		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
+		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
+		<Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
+		<IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
+		<ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+		<ConfigDaemonName>!DhcpServ</ConfigDaemonName>
     </LANService>
 </LANServiceTable>
 
@@ -885,8 +897,8 @@
         <Ranking>1</Ranking>
         <Direction>OUTGOING</Direction>
         <DialogPref>DONOTPROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Actual NT RAS</IAPRef>
+        <BearerSet>LAN</BearerSet>
+        <IAPRef>IAP.WlanConnectivity</IAPRef>
     </ConnectionPreferences>
 </ConnectionPreferencesTable>
 
@@ -904,7 +916,7 @@
         <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
         <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
         <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.NT RAS</DefaultNetwork>
+        <DefaultNetwork>Network.Intranet</DefaultNetwork>
         <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
     </GlobalSettings>
 </GlobalSettingsTable>
--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionntras.xml	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionntras.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -33,6 +33,9 @@
         <Name>NT RAS</Name>
     </Network>
     <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+    <Network operation="add">
         <Name>Linux</Name>
     </Network>
     <Network operation="add">
@@ -99,12 +102,12 @@
         <LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
-        <Name>Actual NT RAS</Name>
-        <IAPService>DialOutISP.NT RAS</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.NT RAS</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
+		<Name>WlanConnectivity</Name>
+		<IAPService>LANService.WlanConnectivity</IAPService>
+       <IAPBearer>LANBearer.WLANBearer</IAPBearer>
+		<IAPNetwork>Network.Intranet</IAPNetwork>
+		<IAPNetworkWeighting>0</IAPNetworkWeighting>
+		<LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
         <Name>Virtual Comm port</Name>
@@ -138,15 +141,6 @@
         <IAPNetworkWeighting>0</IAPNetworkWeighting>
         <LocationRef>Location.Office</LocationRef>
     </IAP>
-    <IAP operation="add">
-        <Name>NT RAS Static Dns</Name>
-        <IAPService>DialOutISP.NT RAS Static Dns</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.NT RAS</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-
 </IAPTable>
 
 <ModemBearerTable>
@@ -626,25 +620,34 @@
 
 <LANBearerTable>
     <LANBearer operation="add">
-        <Name>Dummy LAN Bearer</Name>
-        <Agent>PSD.agt</Agent>
-        <IfName>ppp</IfName>
-        <LDDName>Dummy LDD</LDDName>
-        <PDDName>Dummy PDD</PDDName>
+		<Name>WLANBearer</Name>
+		<IfName>wlannif</IfName>
+		<LDDName>not used</LDDName>
+		<PDDName>not used</PDDName>
+		<LastSocketActivityTimeout>10</LastSocketActivityTimeout>
+		<LastSessionClosedTimeout>10</LastSessionClosedTimeout>
+		<LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+		<Agent>wlanagt.agt</Agent>
     </LANBearer>
 </LANBearerTable>
 
 <LANServiceTable>
     <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip,ip6</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>194.72.6.1</IpGateway>
-        <IpAddr>192.168.0.100</IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.52</IpNameServer2>
+		<Name>WlanConnectivity</Name>
+		<IfNetworks>ip</IfNetworks>
+		<IpNetMask>255.255.255.0</IpNetMask>
+		<IpGateway>0.0.0.0</IpGateway>
+		<IpAddrFromServer>TRUE</IpAddrFromServer>
+		<IpAddr>0.0.0.0</IpAddr>
+		<IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+		<IpNameServer1>0.0.0.0</IpNameServer1>
+		<IpNameServer2>0.0.0.0</IpNameServer2>
+		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
+		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
+		<Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
+		<IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
+		<ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+		<ConfigDaemonName>!DhcpServ</ConfigDaemonName>
     </LANService>
 </LANServiceTable>
 
@@ -750,52 +753,6 @@
         <UseEdge>FALSE</UseEdge>
     </DialOutISP>
     <DialOutISP operation="add">
-        <Name>NT RAS Static Dns</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>TRUE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Type>INTERNETONLY</Type>
-        <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND &quot;CLIENT&quot;+&lt;0x0d&gt;\nWAIT 3\n{\n&quot;SERVER&quot; OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>192.168.20.2</IpNameServer1>
-        <IpNameServer2>192.168.20.2</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>9600</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
         <Name>Linux</Name>
         <DialResolution>TRUE</DialResolution>
         <UseLoginScript>FALSE</UseLoginScript>
@@ -968,8 +925,8 @@
         <Ranking>1</Ranking>
         <Direction>OUTGOING</Direction>
         <DialogPref>DONOTPROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Actual NT RAS</IAPRef>
+        <BearerSet>LAN</BearerSet>
+        <IAPRef>IAP.WlanConnectivity</IAPRef>
     </ConnectionPreferences>
 </ConnectionPreferencesTable>
 
@@ -987,7 +944,7 @@
         <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
         <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
         <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.NT RAS</DefaultNetwork>
+        <DefaultNetwork>Network.Intranet</DefaultNetwork>
         <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
     </GlobalSettings>
 </GlobalSettingsTable>
--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -24,9 +24,11 @@
 LongTimeout = 6100000
 
 [TCP Config]
-TcpSendAddress = 192.168.20.11
-TestName = httpsmtp.test.intra
+TcpSendAddress = 10.29.23.104
+TestName = httpsmtp02.closedtest.intra
 
 [General]
+Interface = eth
+NameServerAddr = 10.29.23.7
 EchoPort = 7
-LookupAddress = 192.168.20.11
\ No newline at end of file
+LookupAddress = 10.29.23.103
--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest_vlan2.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest_vlan2.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -26,11 +26,11 @@
 LongTimeout = 6100000
 
 [TCP Config]
-TcpSendAddress = 10.29.23.103
+TcpSendAddress = 10.29.23.104
 TestName = httpsmtp02.closedtest.intra
 
 [General]
 Interface = eth
-NameServerAddr = 10.29.23.10
+NameServerAddr = 10.29.23.7
 EchoPort = 7
 LookupAddress = 10.29.23.103
--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest_vlan7.ini	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest_vlan7.ini	Fri Sep 17 08:36:26 2010 +0300
@@ -26,11 +26,11 @@
 LongTimeout = 6100000
 
 [TCP Config]
-TcpSendAddress = 10.29.23.103
+TcpSendAddress = 10.29.23.104
 TestName = httpsmtp02.closedtest.intra
 
 [General]
 Interface = eth
-NameServerAddr = 10.29.23.10
+NameServerAddr = 10.29.23.7
 EchoPort = 7
 LookupAddress = 10.29.23.103
\ No newline at end of file
--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionudp.xml	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionudp.xml	Fri Sep 17 08:36:26 2010 +0300
@@ -30,6 +30,9 @@
 
 <NetworkTable>
     <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+    <Network operation="add">
         <Name>NT RAS</Name>
     </Network>
     <Network operation="add">
@@ -105,12 +108,12 @@
         <LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
-        <Name>Actual NT RAS</Name>
-        <IAPService>DialOutISP.NT RAS</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.NT RAS</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
+		<Name>WlanConnectivity</Name>
+		<IAPService>LANService.WlanConnectivity</IAPService>
+       <IAPBearer>LANBearer.WLANBearer</IAPBearer>
+		<IAPNetwork>Network.Intranet</IAPNetwork>
+		<IAPNetworkWeighting>0</IAPNetworkWeighting>
+		<LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
         <Name>Virtual Comm port</Name>
@@ -171,7 +174,7 @@
     <IAP operation="add">
         <Name>VPN Test Ethernet</Name>
 	<IAPService>LANService.VPN Tests Ethernet Service</IAPService>
-	<IAPBearer>LANBearer.VPN Tests Ethernet Bearer</IAPBearer>
+	<IAPBearer>LANBearer.WLANBearer</IAPBearer>
 	<IAPNetwork>Network.Intranet</IAPNetwork>
 	<IAPNetworkWeighting>0</IAPNetworkWeighting>
 	<LocationRef>Location.Office</LocationRef>
@@ -808,31 +811,34 @@
         <PDDName>Dummy PDD</PDDName>
     </LANBearer>
     <LANBearer operation="add">
-		<Name>VPN Tests Ethernet Bearer</Name>
-		<Agent>nullagt.agt</Agent>
-		<IfName>ethint</IfName>
-		<LDDFilename>enet</LDDFilename>
-		<LDDName>=Ethernet</LDDName>
-		<PDDFilename>ethernet</PDDFilename>
-		<PDDName>Ethernet.Wins</PDDName>
-		<PacketDriverName>EtherPkt.drv</PacketDriverName>
-		<LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-		<LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-		<LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+		<Name>WLANBearer</Name>
+		<IfName>wlannif</IfName>
+		<LDDName>not used</LDDName>
+		<PDDName>not used</PDDName>
+		<LastSocketActivityTimeout>10</LastSocketActivityTimeout>
+		<LastSessionClosedTimeout>10</LastSessionClosedTimeout>
+		<LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+		<Agent>wlanagt.agt</Agent>
     </LANBearer>
 </LANBearerTable>
 
 <LANServiceTable>
     <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip,ip6</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>194.72.6.1</IpGateway>
-        <IpAddr>192.168.0.100</IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.52</IpNameServer2>
+		<Name>WlanConnectivity</Name>
+		<IfNetworks>ip</IfNetworks>
+		<IpNetMask>255.255.255.0</IpNetMask>
+		<IpGateway>0.0.0.0</IpGateway>
+		<IpAddrFromServer>TRUE</IpAddrFromServer>
+		<IpAddr>0.0.0.0</IpAddr>
+		<IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+		<IpNameServer1>0.0.0.0</IpNameServer1>
+		<IpNameServer2>0.0.0.0</IpNameServer2>
+		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
+		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
+		<Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
+		<IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
+		<ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+		<ConfigDaemonName>!DhcpServ</ConfigDaemonName>
     </LANService>
 	<LANService operation="add">
         <Name>VPN Tests Ethernet Service</Name>
@@ -1163,8 +1169,8 @@
         <Ranking>1</Ranking>
         <Direction>OUTGOING</Direction>
         <DialogPref>DONOTPROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Dummy</IAPRef>
+        <BearerSet>LAN</BearerSet>
+        <IAPRef>IAP.WlanConnectivity</IAPRef>
     </ConnectionPreferences>
 </ConnectionPreferencesTable>
 
@@ -1182,7 +1188,7 @@
         <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
         <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
         <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.NT RAS</DefaultNetwork>
+        <DefaultNetwork>Network.Intranet</DefaultNetwork>
         <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
     </GlobalSettings>
 </GlobalSettingsTable>
--- a/datacommsserver/esockserver/test/TE_Socket/scriptfiles/te_socket_tests.script	Thu Sep 02 21:44:45 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_Socket/scriptfiles/te_socket_tests.script	Fri Sep 17 08:36:26 2010 +0300
@@ -68,7 +68,7 @@
 START_TESTCASE			COMINF-ESOCK-Socket-0107
 //! @SYMTestCaseID		COMINF-ESOCK-Socket-0107
 
-RUN_TEST_STEP 500 TE_Socket Test1.7 z:\TestData\configs\te_socket.ini
+//RUN_TEST_STEP 500 TE_Socket Test1.7 z:\TestData\configs\te_socket.ini		// enable after Tanzim submits fix. 
 END_TESTCASE			COMINF-ESOCK-Socket-0107
 
 
--- a/general/commsframeworktest.iby	Thu Sep 02 21:44:45 2010 +0300
+++ b/general/commsframeworktest.iby	Fri Sep 17 08:36:26 2010 +0300
@@ -133,7 +133,7 @@
 
 // CommDB Tests
 #if defined(CI_TEST_ROM_1) || defined(CI_TEST_ROM_4)
-#include <tcommdb.iby>
+#include <te_tcommdb.iby>
 #endif
 
 #ifdef CI_TEST_ROM_1
@@ -159,7 +159,8 @@
 
 // MBufMgr Tests
 #if defined(CI_TEST_ROM_1) || defined(CI_TEST_ROM_2) || defined(CI_TEST_ROM_4)
-#include <testmbuf.iby>
+REM #include <testmbuf.iby>
+#include <te_testmbuf.iby>
 #endif
 
 #ifdef CI_TEST_ROM_2
@@ -191,7 +192,8 @@
 
 // RootServer Tests
 #ifdef CI_TEST_ROM_3
-#include <ts_rootserver.iby>
+//#include <ts_rootserver.iby>
+#include <te_rootserver.iby>
 #endif
 
 //COMMSELEMENTSTESTS