--- a/genericpositioningplugins/group/bld.inf Thu Sep 02 20:51:33 2010 +0300
+++ b/genericpositioningplugins/group/bld.inf Mon Oct 04 00:45:15 2010 +0300
@@ -18,8 +18,6 @@
PRJ_PLATFORMS
WINSCW ARMV5 GCCE
-#include "../rom/bld.inf"
-
#include "../locationnpppsy/group/bld.inf"
#include "../locationsuplpsy/group/bld.inf"
--- a/genericpositioningplugins/rom/bld.inf Thu Sep 02 20:51:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: The common build file.
-*
-*/
-
-
-#include <platform_paths.hrh>
-PRJ_PLATFORMS
-DEFAULT GCCE
-
-PRJ_EXPORTS
-../cenrep/1028224B_s60.cre z:/private/10202be9/1028224B_s60.cre
-prifw_cenrep.iby CORE_MW_LAYER_IBY_EXPORT_PATH(prifw_cenrep.iby)
-
-// End of File
--- a/genericpositioningplugins/rom/prifw_cenrep.iby Thu Sep 02 20:51:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +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 __PRIFW_CENREP_IBY__
-#define __PRIFW_CENREP_IBY__
-
-//ROM_IMAGE[0] data-override=EPOCROOT##epoc32\data\z\private\10202BE9\1028224B_s60.cre private\10202BE9\1028224B.cre
-//ROM_IMAGE[0] data-override=EPOCROOT##epoc32\data\z\private\10202BE9\10282266_s60.cre private\10202BE9\10282266.cre
-
-
-//data-override=EPOCROOT##epoc32\data\z\private\10202BE9\1028224B_s60.cre private\10202BE9\1028224B.cre
-//data-override=EPOCROOT##epoc32\data\z\private\10202BE9\10282266_s60.cre private\10202BE9\10282266.cre
-
-data=EPOCROOT##epoc32\data\z\private\10202BE9\1028224B_s60.cre private\10202BE9\1028224B.cre
-
-#endif // __PRIFW_CENREP_IBY__
--- a/landmarks/locationlandmarks/converter/src/EPos_PosLmUnzipUtil.cpp Thu Sep 02 20:51:33 2010 +0300
+++ b/landmarks/locationlandmarks/converter/src/EPos_PosLmUnzipUtil.cpp Mon Oct 04 00:45:15 2010 +0300
@@ -48,13 +48,15 @@
User::LeaveIfError(zipFile->OpenL());
fileMembers = zipFile->GetMembersL();
CleanupStack::PushL(fileMembers);
- while (member = fileMembers->NextL())
+ member = fileMembers->NextL();
+ while (member)
{
//You must take ownership of the member object created for you by NextL()!
CleanupStack::PushL(member);
ExtractFileL(aFs, member, zipFile, aFileName);
CleanupStack::PopAndDestroy(); //member
+ member = fileMembers->NextL();
}
zipFile->Close();
CleanupStack::PopAndDestroy(2); //fileMembers, zipFile
--- a/landmarks/locationlandmarks/tsrc/LandmarkTestModule/group/LandmarkTests_gnumakefile.mk Thu Sep 02 20:51:33 2010 +0300
+++ b/landmarks/locationlandmarks/tsrc/LandmarkTestModule/group/LandmarkTests_gnumakefile.mk Mon Oct 04 00:45:15 2010 +0300
@@ -64,7 +64,8 @@
# ???
RELEASABLES:
- @echo *** DEBUG: RELEASABLES ${PLATFORM} ${CFG} ${TO_ROOT}
+# @echo *** DEBUG: RELEASABLES ${PLATFORM} ${CFG} ${TO_ROOT}
+ @echo
# runs after clean operations
CLEAN:
@@ -84,6 +85,6 @@
# Generic target. Catches everything else (unknown targets etc.)
%:
- @echo *** DEBUG: GENERIC $@ ${PLATFORM} ${CFG} ${TO_ROOT}
-
+# @echo *** DEBUG: GENERIC $@ ${PLATFORM} ${CFG} ${TO_ROOT}
+ @echo
# End of File
\ No newline at end of file
--- a/landmarks/locationlandmarks/tsrc/LandmarkTestModule/group/bld.inf Thu Sep 02 20:51:33 2010 +0300
+++ b/landmarks/locationlandmarks/tsrc/LandmarkTestModule/group/bld.inf Mon Oct 04 00:45:15 2010 +0300
@@ -31,7 +31,7 @@
../Testprovider/ServerClientLib/group/FT_LmServerClientLibrary.mmp
../Testprovider/group/FT_DbManPluginsTest.mmp
LandMarksTestModule.mmp
-gnumakefile LandmarkTests_gnumakefile.mk
+//gnumakefile LandmarkTests_gnumakefile.mk
PRJ_MMPFILES
Binary file locationsystemui/locationsysui/posindicator/data/posindicator_stub.sis has changed
--- a/locationsystemui/locationsysui/posindicator/posindhelperclientlib/inc/posindicatorhelperserver.h Thu Sep 02 20:51:33 2010 +0300
+++ b/locationsystemui/locationsysui/posindicator/posindhelperclientlib/inc/posindicatorhelperserver.h Mon Oct 04 00:45:15 2010 +0300
@@ -71,6 +71,11 @@
* @return The client side version number.
*/
TVersion Version() const;
+
+ /**
+ * Start pos indicator helper server.
+ */
+ TInt StartServer();
#if defined(__WINSCW__)
TInt StartLbsRootProcess();
--- a/locationsystemui/locationsysui/posindicator/posindhelperclientlib/src/posindicatorhelperserver.cpp Thu Sep 02 20:51:33 2010 +0300
+++ b/locationsystemui/locationsysui/posindicator/posindhelperclientlib/src/posindicatorhelperserver.cpp Mon Oct 04 00:45:15 2010 +0300
@@ -50,45 +50,16 @@
if( ret == KErrNotFound )
{
-#if defined(__WINSCW__)
- StartLbsRootProcess();
-#endif
- RProcess posIndHelperServerProcess;
- ret = posIndHelperServerProcess.Create(KPosIndHelperSrvName, KNullDesC);
-
- if( ret != KErrNone )
- {
- posIndHelperServerProcess.Close();
- return KErrNotFound;
- }
-
- TRequestStatus status;
- posIndHelperServerProcess.Rendezvous(status);
-
- if( status != KRequestPending )
+ ret = StartServer();
+ if( !( ret == KErrNone || ret == KErrAlreadyExists ) )
{
- User::WaitForRequest(status);
- posIndHelperServerProcess.Kill(KErrNone);
- posIndHelperServerProcess.Close();
- return status.Int();
- }
- else
- {
- posIndHelperServerProcess.Resume();
- }
-
- User::WaitForRequest(status);
- posIndHelperServerProcess.Close();
-
- if( status != KErrNone )
- {
- return (status.Int());
+ return ret;
}
ret = CreateSession(KPosIndHelperSrvName, Version(), KDefaultMessageSlots);
}
return ret;
- }
+ }
// ---------------------------------------------------------
// RPosIndicatorHelperServer::Close
@@ -117,6 +88,51 @@
KBuildVersionNumber);
}
+// ---------------------------------------------------------
+// RPosIndicatorHelperServer::StartServer
+//
+// (other items were commented in a header).
+// ---------------------------------------------------------
+//
+TInt RPosIndicatorHelperServer::StartServer()
+ {
+ FUNC("+ RPosIndicatorHelperServer::StartServer");
+
+#if defined(__WINSCW__)
+ StartLbsRootProcess();
+#endif
+
+ RProcess posIndHelperServerProcess;
+ TInt ret = posIndHelperServerProcess.Create(KPosIndHelperSrvName, KNullDesC);
+
+ if( ret != KErrNone )
+ {
+ posIndHelperServerProcess.Close();
+ return ret;
+ }
+
+ TRequestStatus status;
+ posIndHelperServerProcess.Rendezvous(status);
+
+ if( status != KRequestPending )
+ {
+ User::WaitForRequest(status);
+ posIndHelperServerProcess.Kill(KErrNone);
+ posIndHelperServerProcess.Close();
+ return status.Int();
+ }
+ else
+ {
+ posIndHelperServerProcess.Resume();
+ }
+
+ User::WaitForRequest(status);
+ posIndHelperServerProcess.Close();
+
+ FUNC("- RPosIndicatorHelperServer::StartServer");
+ return status.Int();
+ }
+
#if defined(__WINSCW__)
// ---------------------------------------------------------
// RPosIndicatorHelperServer::Version
--- a/locationsystemui/locationsysui/posindicator/posindicator.pro Thu Sep 02 20:51:33 2010 +0300
+++ b/locationsystemui/locationsysui/posindicator/posindicator.pro Mon Oct 04 00:45:15 2010 +0300
@@ -25,6 +25,8 @@
DEFINES += BUILD_POSINDICATOR
BLD_INF_RULES.prj_exports += "rom/posindicator.iby CORE_MW_LAYER_IBY_EXPORT_PATH(posindicator.iby)" \
+ "rom/posindicatorstub.iby CORE_MW_LAYER_IBY_EXPORT_PATH(posindicatorstub.iby)" \
+ "data/posindicator_stub.sis /epoc32/data/z/system/install/posindicator_stub.sis" \
"posindhelperclientlib/inc/posgeoaddress.h ./inc/posgeoaddress.h" \
"posindhelperclientlib/inc/posindicatorglobal.h ./inc/posindicatorglobal.h" \
"posindhelperclientlib/inc/posindicatorinfo.h ./inc/posindicatorinfo.h" \
--- a/locationsystemui/locationsysui/posindicator/posreversegeocodeplugin/group/posreversegeocodeplugin.mmp Thu Sep 02 20:51:33 2010 +0300
+++ b/locationsystemui/locationsysui/posindicator/posreversegeocodeplugin/group/posreversegeocodeplugin.mmp Mon Oct 04 00:45:15 2010 +0300
@@ -64,7 +64,6 @@
LIBRARY charconv.lib
LIBRARY extendedconnpref.lib
LIBRARY eposlandmarks.lib
-LIBRARY extendedconnpref.lib
LIBRARY netmeta.lib
LIBRARY flogger.lib
PAGED
--- a/locationsystemui/locationsysui/posindicator/rom/posindicator.iby Thu Sep 02 20:51:33 2010 +0300
+++ b/locationsystemui/locationsysui/posindicator/rom/posindicator.iby Mon Oct 04 00:45:15 2010 +0300
@@ -40,7 +40,7 @@
// Position indicator plugin
data=\epoc32\data\z\resource\plugins\indicators\posindicator.qtplugin \resource\plugins\indicators\posindicator.qtplugin
-// stub sis
-data=DATAZ_\system\install\posindicator_stub.sis system\install\posindicator_stub.sis
+// stub sis will be added from posindicatorstub.iby
+//data=DATAZ_\system\install\posindicator_stub.sis system\install\posindicator_stub.sis
#endif // POSITIONINDICATOR_IBY
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/locationsystemui/locationsysui/posindicator/rom/posindicatorstub.iby Mon Oct 04 00:45:15 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: Image description file for Posindicator to include stub
+* sis file
+*
+*/
+#ifndef __Posindicatorstub_IBY__
+#define __Posindicatorstub_IBY__
+
+#include <bldvariant.hrh>
+
+///////////////////////
+// *** Posindicator *** //
+///////////////////////
+
+// Posindicator
+// Posindicator Stub SIS package
+data=ZSYSTEM\install\Posindicator_stub.sis system\install\Posindicator_stub.sis
+
+#endif // __Posindicatorstub_IBY__
--- a/locationsystemui/locationsysui/possettings/possettingsplugin/src/possettingsplugin.cpp Thu Sep 02 20:51:33 2010 +0300
+++ b/locationsystemui/locationsysui/possettings/possettingsplugin/src/possettingsplugin.cpp Mon Oct 04 00:45:15 2010 +0300
@@ -82,9 +82,9 @@
if (!helper.isFeatureFlagEnabled() && helper.isPositionPsyAvailable())
{
CpSettingFormItemData *itemData = new CpSettingFormEntryItemDataImpl<
- PosSettingsView> (itemDataHelper, hbTrId(
+ PosSettingsView> (CpSettingFormEntryItemData::ListEntryItem, itemDataHelper, hbTrId(
"txt_cp_dblist_positioning"), hbTrId(
- "txt_cp_dblist_positioning_val_change_positioning_s"));
+ "txt_cp_dblist_positioning_val_change_positioning_s"), "qtg_large_maps");
formItemDataList.append(itemData);
}
qDebug() << "- PosSettingsPluginHelper::createSettingFormItemData()";
--- a/locationsystemui/locationsysui/possettings/possuplsettingsplugin/src/possuplsettings.cpp Thu Sep 02 20:51:33 2010 +0300
+++ b/locationsystemui/locationsysui/possettings/possuplsettingsplugin/src/possuplsettings.cpp Mon Oct 04 00:45:15 2010 +0300
@@ -416,22 +416,8 @@
mDeleteQuery->setTimeout(HbDialog::NoTimeout);
- //set the proper layout for the mDeleteQuery dialog
- qreal lMargin = 0;
- qreal rMargin = 0;
- qreal tMargin = 0;
-
- if (mDeleteQuery->style()->parameter("hb-param-margin-gene-left",
- lMargin) && mDeleteQuery->style()->parameter(
- "hb-param-margin-gene-right", rMargin)
- && mDeleteQuery->style()->parameter(
- "hb-param-margin-gene-top", tMargin))
- {
- HbLabel * heading = new HbLabel(QString(hbTrId(
- "txt_loe_info_select_server_to_delete")));
- heading->setContentsMargins(lMargin, tMargin, rMargin, 0);
- mDeleteQuery->setHeadingWidget(heading);
- }
+ mDeleteQuery->setHeadingText(QString(hbTrId(
+ "txt_loe_info_select_server_to_delete")));
// delete the mPrimaryAction before creating it,each time the delete
// query needs to be popped up
--- a/locationsystemui/locationsysui/privacyverifiernotifierui/contactresolversession/src/contactresolversession.cpp Thu Sep 02 20:51:33 2010 +0300
+++ b/locationsystemui/locationsysui/privacyverifiernotifierui/contactresolversession/src/contactresolversession.cpp Mon Oct 04 00:45:15 2010 +0300
@@ -140,7 +140,7 @@
TInt error = StartServer();
- if (KErrNone == error)
+ if (KErrNone == error || KErrAlreadyExists == error )
{
error = CreateSession(KLocPrivacyServerName, Version(),
KDefaultMessageSlots);
@@ -200,7 +200,7 @@
if (result != KErrNone)
{
server.Close();
- return KErrNotFound;
+ return result;
}
server.Rendezvous(status);
--- a/locationtriggering/ltclientlib/src/lbtcelloperation.cpp Thu Sep 02 20:51:33 2010 +0300
+++ b/locationtriggering/ltclientlib/src/lbtcelloperation.cpp Mon Oct 04 00:45:15 2010 +0300
@@ -60,6 +60,7 @@
//
CLbtCellOperation::~CLbtCellOperation()
{
+ Cancel();
iMmApi.Close();
iMPhone.Close();
iTelServer.Close();
--- a/locationtriggering/ltclientlib/src/lbtgeogsmcell.cpp Thu Sep 02 20:51:33 2010 +0300
+++ b/locationtriggering/ltclientlib/src/lbtgeogsmcell.cpp Mon Oct 04 00:45:15 2010 +0300
@@ -31,7 +31,7 @@
EXPORT_C CLbtGeoGsmCell* CLbtGeoGsmCell::NewLC()
{
CLbtGeoGsmCell* self = CLbtGeoGsmCell::NewL();
- CleanupStack::Pop( self );
+ CleanupStack::PushL( self );
return self;
}
--- a/locationtriggering/ltclientlib/src/lbtgeowcdmacell.cpp Thu Sep 02 20:51:33 2010 +0300
+++ b/locationtriggering/ltclientlib/src/lbtgeowcdmacell.cpp Mon Oct 04 00:45:15 2010 +0300
@@ -36,7 +36,7 @@
EXPORT_C CLbtGeoWcdmaCell* CLbtGeoWcdmaCell::NewLC()
{
CLbtGeoWcdmaCell* self = CLbtGeoWcdmaCell::NewL();
- CleanupStack::Pop( self );
+ CleanupStack::PushL( self );
return self;
}
--- a/locationtriggering/ltclientlib/src/lbtserver.cpp Thu Sep 02 20:51:33 2010 +0300
+++ b/locationtriggering/ltclientlib/src/lbtserver.cpp Mon Oct 04 00:45:15 2010 +0300
@@ -70,7 +70,7 @@
if( ret != KErrNone )
{
lbtServer.Close();
- return KErrNotFound;
+ return ret;
}
TRequestStatus status;
@@ -90,11 +90,13 @@
User::WaitForRequest(status);
lbtServer.Close();
+ ret = status.Int();
- if( status != KErrNone )
+ if( !( ret == KErrNone || ret == KErrAlreadyExists ) )
{
- return (status.Int());
+ return ret;
}
+
ret = CreateSession(KLbtServerCoreName, Version(), KDefaultMessageSlots);
}
}
--- a/locationtriggering/ltcontainer/src/lbtdbtriggersmanager.cpp Thu Sep 02 20:51:33 2010 +0300
+++ b/locationtriggering/ltcontainer/src/lbtdbtriggersmanager.cpp Mon Oct 04 00:45:15 2010 +0300
@@ -366,7 +366,7 @@
{
// check if view is empty, return KErrNotFound
- if( iView.IsEmptyL() || !iView.AtRow() || !iView.FirstL() )
+ if( !iView.FirstL() || iView.IsEmptyL() || !iView.AtRow() )
{
CompleteClientRequest( KErrNotFound );
break;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/locationtriggering/tsrc/lbtengine_test/LbtUnitTestModule/bwins/LbtUnitTestModuleu.def Mon Oct 04 00:45:15 2010 +0300
@@ -0,0 +1,43 @@
+EXPORTS
+ ?NewL@CLbtGeoWcdmaCell@@SAPAV1@W4TMobilePhoneNetworkMode@RMobilePhone@@V?$TBuf@$03@@V?$TBuf@$07@@II@Z @ 1 NONAME ; class CLbtGeoWcdmaCell * CLbtGeoWcdmaCell::NewL(enum RMobilePhone::TMobilePhoneNetworkMode, class TBuf<4>, class TBuf<8>, unsigned int, unsigned int)
+ ?LocationAreaCode@CLbtGeoCell@@QBEIXZ @ 2 NONAME ; unsigned int CLbtGeoCell::LocationAreaCode(void) const
+ ?SetCellId@CLbtGeoCell@@QAEXI@Z @ 3 NONAME ; void CLbtGeoCell::SetCellId(unsigned int)
+ ?InternalizeL@CLbtGeoAreaBase@@QAEXAAVRReadStream@@@Z @ 4 NONAME ; void CLbtGeoAreaBase::InternalizeL(class RReadStream &)
+ ?WcdmaCellInfo@CLbtGeoWcdmaCell@@QAEABVTLbtWcdmaCellInfo@@XZ @ 5 NONAME ; class TLbtWcdmaCellInfo const & CLbtGeoWcdmaCell::WcdmaCellInfo(void)
+ ?NewLC@CLbtGeoGsmCell@@SAPAV1@W4TMobilePhoneNetworkMode@RMobilePhone@@V?$TBuf@$03@@V?$TBuf@$07@@II@Z @ 6 NONAME ; class CLbtGeoGsmCell * CLbtGeoGsmCell::NewLC(enum RMobilePhone::TMobilePhoneNetworkMode, class TBuf<4>, class TBuf<8>, unsigned int, unsigned int)
+ ?NewLC@CLbtGeoCell@@SAPAV1@W4TMobilePhoneNetworkMode@RMobilePhone@@V?$TBuf@$03@@V?$TBuf@$07@@II@Z @ 7 NONAME ; class CLbtGeoCell * CLbtGeoCell::NewLC(enum RMobilePhone::TMobilePhoneNetworkMode, class TBuf<4>, class TBuf<8>, unsigned int, unsigned int)
+ ?NewL@CLbtGeoGsmCell@@SAPAV1@XZ @ 8 NONAME ; class CLbtGeoGsmCell * CLbtGeoGsmCell::NewL(void)
+ ?CreateLogger@CLbtLoggerImpl@@SAPAV1@XZ @ 9 NONAME ; class CLbtLoggerImpl * CLbtLoggerImpl::CreateLogger(void)
+ ?SetBsic@CLbtGeoGsmCell@@QAEXAAV?$RArray@H@@@Z @ 10 NONAME ; void CLbtGeoGsmCell::SetBsic(class RArray<int> &)
+ ?SetLocationAreaCode@CLbtGeoCell@@QAEXI@Z @ 11 NONAME ; void CLbtGeoCell::SetLocationAreaCode(unsigned int)
+ ?ExternalizeL@CLbtGeoAreaBase@@QBEXAAVRWriteStream@@@Z @ 12 NONAME ; void CLbtGeoAreaBase::ExternalizeL(class RWriteStream &) const
+ ?NewLC@CLbtGeoCell@@SAPAV1@XZ @ 13 NONAME ; class CLbtGeoCell * CLbtGeoCell::NewLC(void)
+ ?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 14 NONAME ; class CScriptBase * LibEntryL(class CTestModuleIf &)
+ ?Destroy@CLbtLoggerImpl@@SAXXZ @ 15 NONAME ; void CLbtLoggerImpl::Destroy(void)
+ ?CellId@CLbtGeoCell@@QBEIXZ @ 16 NONAME ; unsigned int CLbtGeoCell::CellId(void) const
+ ?NewL@CLbtGeoGsmCell@@SAPAV1@W4TMobilePhoneNetworkMode@RMobilePhone@@V?$TBuf@$03@@V?$TBuf@$07@@II@Z @ 17 NONAME ; class CLbtGeoGsmCell * CLbtGeoGsmCell::NewL(enum RMobilePhone::TMobilePhoneNetworkMode, class TBuf<4>, class TBuf<8>, unsigned int, unsigned int)
+ ?Bsic@CLbtGeoGsmCell@@QAEAAV?$RArray@H@@XZ @ 18 NONAME ; class RArray<int> & CLbtGeoGsmCell::Bsic(void)
+ ??1CLbtGeoGsmCell@@UAE@XZ @ 19 NONAME ; CLbtGeoGsmCell::~CLbtGeoGsmCell(void)
+ ?NewLC@CLbtGeoWcdmaCell@@SAPAV1@W4TMobilePhoneNetworkMode@RMobilePhone@@V?$TBuf@$03@@V?$TBuf@$07@@II@Z @ 20 NONAME ; class CLbtGeoWcdmaCell * CLbtGeoWcdmaCell::NewLC(enum RMobilePhone::TMobilePhoneNetworkMode, class TBuf<4>, class TBuf<8>, unsigned int, unsigned int)
+ ?SetNetworkCountryCode@CLbtGeoCell@@QAEXV?$TBuf@$03@@@Z @ 21 NONAME ; void CLbtGeoCell::SetNetworkCountryCode(class TBuf<4>)
+ ?NetworkType@CLbtGeoCell@@QBE?AW4TMobilePhoneNetworkMode@RMobilePhone@@XZ @ 22 NONAME ; enum RMobilePhone::TMobilePhoneNetworkMode CLbtGeoCell::NetworkType(void) const
+ ?NetworkIdentityCode@CLbtGeoCell@@QBE?AV?$TBuf@$07@@XZ @ 23 NONAME ; class TBuf<8> CLbtGeoCell::NetworkIdentityCode(void) const
+ ??1CLBTOperation@@UAE@XZ @ 24 NONAME ; CLBTOperation::~CLBTOperation(void)
+ ?NewL@CLbtGeoCell@@SAPAV1@W4TMobilePhoneNetworkMode@RMobilePhone@@V?$TBuf@$03@@V?$TBuf@$07@@II@Z @ 25 NONAME ; class CLbtGeoCell * CLbtGeoCell::NewL(enum RMobilePhone::TMobilePhoneNetworkMode, class TBuf<4>, class TBuf<8>, unsigned int, unsigned int)
+ ?CGISpecifiedDuringCreation@CLbtGeoGsmCell@@UBEHXZ @ 26 NONAME ; int CLbtGeoGsmCell::CGISpecifiedDuringCreation(void) const
+ ?SetNetworkIdentityCode@CLbtGeoCell@@QAEXV?$TBuf@$07@@@Z @ 27 NONAME ; void CLbtGeoCell::SetNetworkIdentityCode(class TBuf<8>)
+ ?NewL@CLbtGeoWcdmaCell@@SAPAV1@XZ @ 28 NONAME ; class CLbtGeoWcdmaCell * CLbtGeoWcdmaCell::NewL(void)
+ ??1CLbtGeoCell@@UAE@XZ @ 29 NONAME ; CLbtGeoCell::~CLbtGeoCell(void)
+ ?GetFileLogger@CLbtLoggerImpl@@QAEAAVRFileLogger@@XZ @ 30 NONAME ; class RFileLogger & CLbtLoggerImpl::GetFileLogger(void)
+ ??1CLbtGeoAreaBase@@UAE@XZ @ 31 NONAME ; CLbtGeoAreaBase::~CLbtGeoAreaBase(void)
+ ?NetworkCountryCode@CLbtGeoCell@@QBE?AV?$TBuf@$03@@XZ @ 32 NONAME ; class TBuf<4> CLbtGeoCell::NetworkCountryCode(void) const
+ ?NewL@CLbtGeoCell@@SAPAV1@XZ @ 33 NONAME ; class CLbtGeoCell * CLbtGeoCell::NewL(void)
+ ?NewLC@CLbtGeoWcdmaCell@@SAPAV1@XZ @ 34 NONAME ; class CLbtGeoWcdmaCell * CLbtGeoWcdmaCell::NewLC(void)
+ ?CreateGeoAreaForCurrentLocationL@CLBTOperation@@SAPAV1@AAVTRequestStatus@@W4TGeoAreaType@CLbtGeoAreaBase@@PAPAV4@@Z @ 35 NONAME ; class CLBTOperation * CLBTOperation::CreateGeoAreaForCurrentLocationL(class TRequestStatus &, enum CLbtGeoAreaBase::TGeoAreaType, class CLbtGeoAreaBase * *)
+ ?NewLC@CLbtGeoGsmCell@@SAPAV1@XZ @ 36 NONAME ; class CLbtGeoGsmCell * CLbtGeoGsmCell::NewLC(void)
+ ?SetNetworkType@CLbtGeoCell@@QAEXW4TMobilePhoneNetworkMode@RMobilePhone@@@Z @ 37 NONAME ; void CLbtGeoCell::SetNetworkType(enum RMobilePhone::TMobilePhoneNetworkMode)
+ ??1CLbtGeoWcdmaCell@@UAE@XZ @ 38 NONAME ; CLbtGeoWcdmaCell::~CLbtGeoWcdmaCell(void)
+ ?SetWcdmaCellInfo@CLbtGeoWcdmaCell@@QAEXABVTLbtWcdmaCellInfo@@@Z @ 39 NONAME ; void CLbtGeoWcdmaCell::SetWcdmaCellInfo(class TLbtWcdmaCellInfo const &)
+ ?CGISpecifiedDuringCreation@CLbtGeoWcdmaCell@@UBEHXZ @ 40 NONAME ; int CLbtGeoWcdmaCell::CGISpecifiedDuringCreation(void) const
+ ??1TLbtWcdmaCellInfo@@QAE@XZ @ 41 NONAME ; TLbtWcdmaCellInfo::~TLbtWcdmaCellInfo(void)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/locationtriggering/tsrc/lbtengine_test/LbtUnitTestModule/conf/LbtUnitTestModule.cfg Mon Oct 04 00:45:15 2010 +0300
@@ -0,0 +1,212 @@
+[Test]
+title TestCLbtGeoGsmCellNewL
+create LbtUnitTestModule foobar
+foobar TestCLbtGeoGsmCellNewL
+delete foobar
+[Endtest]
+
+[Test]
+title TestCLbtGeoGsmCellNewLC
+create LbtUnitTestModule foobar
+foobar TestCLbtGeoGsmCellNewLC
+delete foobar
+[Endtest]
+
+
+[Test]
+title TestCLbtGeoGsmCellNew1L
+create LbtUnitTestModule foobar
+foobar TestCLbtGeoGsmCellNew1L
+delete foobar
+[Endtest]
+
+
+[Test]
+title TestCLbtGeoGsmCellNew1LC
+create LbtUnitTestModule foobar
+foobar TestCLbtGeoGsmCellNew1LC
+delete foobar
+[Endtest]
+
+
+[Test]
+title TestSetAndGetBsicL
+create LbtUnitTestModule foobar
+foobar TestSetAndGetBsicL
+delete foobar
+[Endtest]
+
+
+[Test]
+title TestGsmCGISpecifiedDuringCreationL
+create LbtUnitTestModule foobar
+foobar TestGsmCGISpecifiedDuringCreationL
+delete foobar
+[Endtest]
+
+
+[Test]
+title TestGsmCellInternalizeExternalizeL
+create LbtUnitTestModule foobar
+foobar TestGsmCellInternalizeExternalizeL
+delete foobar
+[Endtest]
+
+
+[Test]
+title TestCLbtGeoWcdmaCellL
+create LbtUnitTestModule foobar
+foobar TestCLbtGeoWcdmaCellL
+delete foobar
+[Endtest]
+
+
+[Test]
+title TestCLbtGeoWcdmaCellLC
+create LbtUnitTestModule foobar
+foobar TestCLbtGeoWcdmaCellLC
+delete foobar
+[Endtest]
+
+
+[Test]
+title TestCLbtGeoWcdmaCell1L
+create LbtUnitTestModule foobar
+foobar TestCLbtGeoWcdmaCell1L
+delete foobar
+[Endtest]
+
+
+
+[Test]
+title TestCLbtGeoWcdmaCell1LC
+create LbtUnitTestModule foobar
+foobar TestCLbtGeoWcdmaCell1LC
+delete foobar
+[Endtest]
+
+
+[Test]
+title TestSetAndGetWcdmaInfoL
+create LbtUnitTestModule foobar
+foobar TestSetAndGetWcdmaInfoL
+delete foobar
+[Endtest]
+
+
+
+[Test]
+title TestWcdmaCGISpecifiedDuringCreationL
+create LbtUnitTestModule foobar
+foobar TestWcdmaCGISpecifiedDuringCreationL
+delete foobar
+[Endtest]
+
+
+
+[Test]
+title TestWcdmaCellInternalizeExternalizeL
+create LbtUnitTestModule foobar
+foobar TestWcdmaCellInternalizeExternalizeL
+delete foobar
+[Endtest]
+
+
+
+[Test]
+title TestSetAndGetOptimisationLevelL
+create LbtUnitTestModule foobar
+foobar TestSetAndGetOptimisationLevelL
+delete foobar
+[Endtest]
+
+
+
+[Test]
+title TestSetAndGetNppModuleIdL
+create LbtUnitTestModule foobar
+foobar TestSetAndGetNppModuleIdL
+delete foobar
+[Endtest]
+
+
+
+[Test]
+title TestSetAndGetMinUpdateIntOnGpsFailureL
+create LbtUnitTestModule foobar
+foobar TestSetAndGetMinUpdateIntOnGpsFailureL
+delete foobar
+[Endtest]
+
+
+
+[Test]
+title TestSetAndGetMaximumUserSpeedL
+create LbtUnitTestModule foobar
+foobar TestSetAndGetMaximumUserSpeedL
+delete foobar
+[Endtest]
+
+
+
+[Test]
+title TestSetAndGetTrigMechStateL
+create LbtUnitTestModule foobar
+foobar TestSetAndGetTrigMechStateL
+delete foobar
+[Endtest]
+
+
+
+[Test]
+title TestTriggerConfigParamsL
+create LbtUnitTestModule foobar
+foobar TestTriggerConfigParamsL
+delete foobar
+[Endtest]
+
+
+
+[Test]
+title TestCLbtDiskSpaceListnerStartToListenL
+create LbtUnitTestModule foobar
+foobar TestCLbtDiskSpaceListnerStartToListenL
+delete foobar
+[Endtest]
+
+[Test]
+title TestCLbtDiskSpaceListnerCancelL
+create LbtUnitTestModule foobar
+foobar TestCLbtDiskSpaceListnerCancelL
+delete foobar
+[Endtest]
+
+[Test]
+title TestTriggerNodeMethodsL
+create LbtUnitTestModule foobar
+foobar TestTriggerNodeMethodsL
+delete foobar
+[Endtest]
+
+
+[Test]
+title TestGsmCellInfoMethodsL
+create LbtUnitTestModule foobar
+foobar TestGsmCellInfoMethodsL
+delete foobar
+[Endtest]
+
+
+[Test]
+title TestWcdmaCellInfoMethodsL
+create LbtUnitTestModule foobar
+foobar TestWcdmaCellInfoMethodsL
+delete foobar
+[Endtest]
+
+[Test]
+title TestLbtOperationsMethodL
+create LbtUnitTestModule foobar
+foobar TestLbtOperationsMethodL
+delete foobar
+[Endtest]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/locationtriggering/tsrc/lbtengine_test/LbtUnitTestModule/eabi/LbtUnitTestModuleu.def Mon Oct 04 00:45:15 2010 +0300
@@ -0,0 +1,64 @@
+EXPORTS
+ _Z9LibEntryLR13CTestModuleIf @ 1 NONAME
+ _ZN11CLbtGeoCell14SetNetworkTypeEN12RMobilePhone23TMobilePhoneNetworkModeE @ 2 NONAME
+ _ZN11CLbtGeoCell19SetLocationAreaCodeEj @ 3 NONAME
+ _ZN11CLbtGeoCell21SetNetworkCountryCodeE4TBufILi4EE @ 4 NONAME
+ _ZN11CLbtGeoCell22SetNetworkIdentityCodeE4TBufILi8EE @ 5 NONAME
+ _ZN11CLbtGeoCell4NewLEN12RMobilePhone23TMobilePhoneNetworkModeE4TBufILi4EES2_ILi8EEjj @ 6 NONAME
+ _ZN11CLbtGeoCell4NewLEv @ 7 NONAME
+ _ZN11CLbtGeoCell5NewLCEN12RMobilePhone23TMobilePhoneNetworkModeE4TBufILi4EES2_ILi8EEjj @ 8 NONAME
+ _ZN11CLbtGeoCell5NewLCEv @ 9 NONAME
+ _ZN11CLbtGeoCell9SetCellIdEj @ 10 NONAME
+ _ZN11CLbtGeoCellD0Ev @ 11 NONAME
+ _ZN11CLbtGeoCellD1Ev @ 12 NONAME
+ _ZN11CLbtGeoCellD2Ev @ 13 NONAME
+ _ZN13CLBTOperation32CreateGeoAreaForCurrentLocationLER14TRequestStatusN15CLbtGeoAreaBase12TGeoAreaTypeEPPS2_ @ 14 NONAME
+ _ZN14CLbtGeoGsmCell4BsicEv @ 15 NONAME
+ _ZN14CLbtGeoGsmCell4NewLEN12RMobilePhone23TMobilePhoneNetworkModeE4TBufILi4EES2_ILi8EEjj @ 16 NONAME
+ _ZN14CLbtGeoGsmCell4NewLEv @ 17 NONAME
+ _ZN14CLbtGeoGsmCell5NewLCEN12RMobilePhone23TMobilePhoneNetworkModeE4TBufILi4EES2_ILi8EEjj @ 18 NONAME
+ _ZN14CLbtGeoGsmCell5NewLCEv @ 19 NONAME
+ _ZN14CLbtGeoGsmCell7SetBsicER6RArrayIiE @ 20 NONAME
+ _ZN14CLbtGeoGsmCellD0Ev @ 21 NONAME
+ _ZN14CLbtGeoGsmCellD1Ev @ 22 NONAME
+ _ZN14CLbtGeoGsmCellD2Ev @ 23 NONAME
+ _ZN14CLbtLoggerImpl12CreateLoggerEv @ 24 NONAME
+ _ZN14CLbtLoggerImpl13GetFileLoggerEv @ 25 NONAME
+ _ZN14CLbtLoggerImpl7DestroyEv @ 26 NONAME
+ _ZN15CLbtGeoAreaBase12InternalizeLER11RReadStream @ 27 NONAME
+ _ZN16CLbtGeoWcdmaCell13WcdmaCellInfoEv @ 28 NONAME
+ _ZN16CLbtGeoWcdmaCell16SetWcdmaCellInfoERK17TLbtWcdmaCellInfo @ 29 NONAME
+ _ZN16CLbtGeoWcdmaCell4NewLEN12RMobilePhone23TMobilePhoneNetworkModeE4TBufILi4EES2_ILi8EEjj @ 30 NONAME
+ _ZN16CLbtGeoWcdmaCell4NewLEv @ 31 NONAME
+ _ZN16CLbtGeoWcdmaCell5NewLCEN12RMobilePhone23TMobilePhoneNetworkModeE4TBufILi4EES2_ILi8EEjj @ 32 NONAME
+ _ZN16CLbtGeoWcdmaCell5NewLCEv @ 33 NONAME
+ _ZN16CLbtGeoWcdmaCellD0Ev @ 34 NONAME
+ _ZN16CLbtGeoWcdmaCellD1Ev @ 35 NONAME
+ _ZN16CLbtGeoWcdmaCellD2Ev @ 36 NONAME
+ _ZN17TLbtWcdmaCellInfoD1Ev @ 37 NONAME
+ _ZN17TLbtWcdmaCellInfoD2Ev @ 38 NONAME
+ _ZNK11CLbtGeoCell11NetworkTypeEv @ 39 NONAME
+ _ZNK11CLbtGeoCell16LocationAreaCodeEv @ 40 NONAME
+ _ZNK11CLbtGeoCell18NetworkCountryCodeEv @ 41 NONAME
+ _ZNK11CLbtGeoCell19NetworkIdentityCodeEv @ 42 NONAME
+ _ZNK11CLbtGeoCell6CellIdEv @ 43 NONAME
+ _ZNK14CLbtGeoGsmCell26CGISpecifiedDuringCreationEv @ 44 NONAME
+ _ZNK15CLbtGeoAreaBase12ExternalizeLER12RWriteStream @ 45 NONAME
+ _ZNK16CLbtGeoWcdmaCell26CGISpecifiedDuringCreationEv @ 46 NONAME
+ _ZTI11CLbtGeoCell @ 47 NONAME
+ _ZTI13CLBTOperation @ 48 NONAME
+ _ZTI14CLbtGeoGsmCell @ 49 NONAME
+ _ZTI15CLbtGeoAreaBase @ 50 NONAME
+ _ZTI16CLbtGeoWcdmaCell @ 51 NONAME
+ _ZTI17CLbtCellOperation @ 52 NONAME
+ _ZTI19CLbtSettingsManager @ 53 NONAME
+ _ZTI20CLbtDiskSpaceListner @ 54 NONAME
+ _ZTV11CLbtGeoCell @ 55 NONAME
+ _ZTV13CLBTOperation @ 56 NONAME
+ _ZTV14CLbtGeoGsmCell @ 57 NONAME
+ _ZTV15CLbtGeoAreaBase @ 58 NONAME
+ _ZTV16CLbtGeoWcdmaCell @ 59 NONAME
+ _ZTV17CLbtCellOperation @ 60 NONAME
+ _ZTV19CLbtSettingsManager @ 61 NONAME
+ _ZTV20CLbtDiskSpaceListner @ 62 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/locationtriggering/tsrc/lbtengine_test/LbtUnitTestModule/group/LbtUnitTestModule.mmp Mon Oct 04 00:45:15 2010 +0300
@@ -0,0 +1,77 @@
+/*
+* 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: MMP file for STIF Test Framework's TestScripter
+* testclass test module.
+*
+*/
+
+#include <platform_paths.hrh>
+
+
+TARGET LbtUnitTestModule.dll
+TARGETTYPE dll
+UID 0x1000008D 0x101FB3E3
+
+CAPABILITY ALL -TCB
+// VENDORID 0x00000000
+// SECUREID 0x00000000
+
+DEFFILE LbtUnitTestModule.def
+
+USERINCLUDE ../inc
+USERINCLUDE ../../../../ltclientlib/inc
+USERINCLUDE ../../../../inc
+USERINCLUDE ../../../../ltserver/ltserverlogic/inc
+USERINCLUDE ../../../../ltserver/ltservercore/inc
+USERINCLUDE ../../../../ltcontextsourceplugin/inc
+USERINCLUDE ../../../../ltcellidmovementdetector/inc
+USERINCLUDE ../../../../ltlogger.h/inc
+
+OS_LAYER_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE
+
+SOURCEPATH ../src
+
+
+SOURCE LbtUnitTestModule.cpp
+SOURCE LbtUnitTestModuleBlocks.cpp
+SOURCE ../../../../ltclientlib/src/lbtgeoareabase.cpp
+SOURCE ../../../../ltclientlib/src/lbtgeocell.cpp
+SOURCE ../../../../ltclientlib/src/lbtgeogsmcell.cpp
+SOURCE ../../../../ltclientlib/src/lbtgeowcdmacell.cpp
+SOURCE ../../../../ltclientlib/src/lbtoperation.cpp
+SOURCE ../../../../ltclientlib/src/lbtcelloperation.cpp
+SOURCE ../../../../ltserver/ltserverlogic/src/lbtsettingsmanager.cpp
+SOURCE ../../../../ltserver/ltservercore/src/lbtdiskspacelistner.cpp
+SOURCE ../../../../ltcontextsourceplugin/src/lbttriggernode.cpp
+SOURCE ../../../../ltcellidmovementdetector/src/lbtcellinfo.cpp
+SOURCE ../../../../ltlogger/src/lbtloggerimpl.cpp
+
+
+LIBRARY stiftestinterface.lib
+LIBRARY stiftestengine.lib
+LIBRARY euser.lib estor.lib lbs.lib
+LIBRARY etel.lib
+LIBRARY etelmm.lib // etel multimode library
+LIBRARY customapi.lib // etel mm custom api
+LIBRARY commdb.lib
+LIBRARY flogger.lib
+//LIBRARY lbt.lib
+LIBRARY centralrepository.lib
+LIBRARY efsrv.lib
+LANG SC
+
+
+ EPOCALLOWDLLDATA
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/locationtriggering/tsrc/lbtengine_test/LbtUnitTestModule/group/LbtUnitTestModule.pkg Mon Oct 04 00:45:15 2010 +0300
@@ -0,0 +1,62 @@
+;
+; 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:
+;
+; Installation file for STIF
+;
+
+; Languages
+&EN
+
+; Provide value for uid
+#{"STIF"},(0x00000000),1,1,0,TYPE=SA
+
+; Series60 product id for S60 3.0
+[0x101F7961], 0, 0, 0, {"Series60ProductID"}
+
+; Localised Vendor name
+%{"Nokia"}
+
+; Unique Vendor name
+:"Nokia"
+
+; Logo
+; None
+
+; Package signature - Optional
+; None
+
+; Start of Package body
+
+; Condition blocks
+; None
+
+; Options list
+; None
+
+; Install files
+"\epoc32\release\armv5\urel\LbtUnitTestModule.dll" - "!:\Sys\Bin\LbtUnitTestModule.dll"
+"..\conf\LbtUnitTestModule.cfg" - "!:\TestFramework\LbtUnitTestModule.cfg"
+"..\init\testframework.ini" - "!:\TestFramework\testframework.ini"
+
+; Embedded SIS
+; None
+
+; End of Package body
+
+; PKG dependencies
+; None
+
+; PKG capabilities
+; None
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/locationtriggering/tsrc/lbtengine_test/LbtUnitTestModule/group/bld.inf Mon Oct 04 00:45:15 2010 +0300
@@ -0,0 +1,27 @@
+/*
+* 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_PLATFORMS
+ DEFAULT
+
+PRJ_TESTEXPORTS
+
+
+PRJ_TESTMMPFILES
+ LbtUnitTestModule.mmp
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/locationtriggering/tsrc/lbtengine_test/LbtUnitTestModule/inc/LbtUnitTestModule.h Mon Oct 04 00:45:15 2010 +0300
@@ -0,0 +1,150 @@
+/*
+* 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: STIF testclass declaration
+*
+*/
+
+#ifndef LBTUNITTESTMODULE_H
+#define LBTUNITTESTMODULE_H
+
+// INCLUDES
+#include <StifLogger.h>
+#include <TestScripterInternal.h>
+#include <StifTestModule.h>
+#include <TestclassAssert.h>
+#include "lbtdiskspaceobserver.h"
+
+// Logging path
+_LIT( KLbtUnitTestModuleLogPath, "\\logs\\testframework\\LbtUnitTestModule\\" );
+// Log file
+_LIT( KLbtUnitTestModuleLogFile, "LbtUnitTestModule.txt" );
+_LIT( KLbtUnitTestModuleLogFileWithTitle, "LbtUnitTestModule_[%S].txt" );
+
+class CLbtUnitTestModule;
+class MLbtDiskSpaceObserver;
+
+
+/**
+ * CLbtUnitTestModule test class for STIF Test Framework TestScripter.
+ */
+NONSHARABLE_CLASS(CLbtUnitTestModule) : public CScriptBase,
+ public MLbtDiskSpaceObserver
+ {
+ public: // Constructors and destructor
+
+ /**
+ * Two-phased constructor.
+ */
+ static CLbtUnitTestModule* NewL( CTestModuleIf& aTestModuleIf );
+
+ /**
+ * Destructor.
+ */
+ virtual ~CLbtUnitTestModule();
+
+ public: // Functions from base classes
+
+ /**
+ * From CScriptBase Runs a script line.
+ * @since ?Series60_version
+ * @param aItem Script line containing method name and parameters
+ * @return Symbian OS error code
+ */
+ virtual TInt RunMethodL( CStifItemParser& aItem );
+
+ public:
+ virtual void HandleDiskSpaceChange();
+
+ private:
+
+ /**
+ * C++ default constructor.
+ */
+ CLbtUnitTestModule( CTestModuleIf& aTestModuleIf );
+
+ /**
+ * By default Symbian 2nd phase constructor is private.
+ */
+ void ConstructL();
+
+ /**
+ * Frees all resources allocated from test methods.
+ */
+ void Delete();
+
+ /**
+ * Test methods are listed below.
+ */
+ TInt TestCLbtGeoGsmCellNewL( CStifItemParser& aItem );
+
+ TInt TestCLbtGeoGsmCellNewLC( CStifItemParser& aItem );
+
+ TInt TestCLbtGeoGsmCellNew1L( CStifItemParser& aItem );
+
+ TInt TestCLbtGeoGsmCellNew1LC( CStifItemParser& aItem );
+
+ TInt TestSetAndGetBsicL( CStifItemParser& aItem );
+
+ TInt TestGsmCGISpecifiedDuringCreationL( CStifItemParser& aItem );
+
+ TInt TestGsmCellInternalizeExternalizeL( CStifItemParser& aItem );
+
+ TInt TestCLbtGeoWcdmaCellL( CStifItemParser& aItem );
+
+ TInt TestCLbtGeoWcdmaCellLC( CStifItemParser& aItem );
+
+ TInt TestCLbtGeoWcdmaCell1L( CStifItemParser& aItem );
+
+ TInt TestCLbtGeoWcdmaCell1LC( CStifItemParser& aItem );
+
+ TInt TestSetAndGetWcdmaInfoL( CStifItemParser& aItem );
+
+ TInt TestWcdmaCGISpecifiedDuringCreationL( CStifItemParser& aItem );
+
+ TInt TestWcdmaCellInternalizeExternalizeL( CStifItemParser& aItem );
+
+ TInt TestSetAndGetOptimisationLevelL( CStifItemParser& aItem );
+
+ TInt TestSetAndGetModuleIdL( CStifItemParser& aItem );
+
+ TInt TestSetAndGetNppModuleIdL( CStifItemParser& aItem );
+
+ TInt TestSetAndGetMinUpdateIntOnGpsFailureL( CStifItemParser& aItem );
+
+ TInt TestSetAndGetMaximumUserSpeedL( CStifItemParser& aItem );
+
+ TInt TestSetAndGetTrigMechStateL( CStifItemParser& aItem );
+
+ TInt TestTriggerConfigParamsL( CStifItemParser& aItem );
+
+ TInt TestCLbtDiskSpaceListnerStartToListenL( CStifItemParser& aItem );
+
+ TInt TestCLbtDiskSpaceListnerCancelL( CStifItemParser& aItem );
+
+ TInt TestTriggerNodeMethodsL( CStifItemParser& aItem );
+
+ TInt TestGsmCellInfoMethodsL( CStifItemParser& aItem );
+
+ TInt TestWcdmaCellInfoMethodsL( CStifItemParser& aItem );
+
+ TInt TestLbtOperationsMethodL( CStifItemParser& aItem );
+
+private:
+ CActiveSchedulerWait* iWait;
+
+ };
+
+#endif // LBTUNITTESTMODULE_H
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/locationtriggering/tsrc/lbtengine_test/LbtUnitTestModule/init/TestFramework.ini Mon Oct 04 00:45:15 2010 +0300
@@ -0,0 +1,200 @@
+#
+# This is STIF initialization file
+# Comment lines start with '#'-character.
+# See STIF TestFramework users guide.doc for instructions
+
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+# Set following test engine settings:
+# - Set Test Reporting mode. TestReportMode's possible values are:
+# + 'Summary': Summary of the tested test cases.
+# + 'Environment': Hardware and software info.
+# + 'TestCases': Test case report.
+# + 'FullReport': Set of all above ones.
+# + Example 'TestReportMode= Summary TestCases'
+#
+# - CreateTestReport setting controls report creation mode
+# + YES, Test report will created.
+# + NO, No Test report.
+#
+# - File path indicates the base path of the test report.
+# - File name indicates the name of the test report.
+#
+# - File format indicates the type of the test report.
+# + TXT, Test report file will be txt type, for example 'TestReport.txt'.
+# + HTML, Test report will be html type, for example 'TestReport.html'.
+# + XML, Test report will be xml type, for example 'TestReport.xml'.
+# Note, that xml format is available only when output is set to FILE.
+#
+# - File output indicates output source of the test report.
+# + FILE, Test report logging to file.
+# + RDEBUG, Test report logging to using rdebug.
+#
+# - File Creation Mode indicates test report overwriting if file exist.
+# + OVERWRITE, Overwrites if the Test report file exist.
+# + APPEND, Continue logging after the old Test report information if
+# report exist.
+# - Sets a device reset module's dll name(Reboot).
+# + If Nokia specific reset module is not available or it is not correct one
+# StifHWResetStub module may use as a template for user specific reset
+# module.
+# - Sets STIF test measurement disable options. e.g. pluging1 and pluging2 disablation
+# DisableMeasurement= stifmeasurementplugin01 stifmeasurementplugin02
+#
+
+[Engine_Defaults]
+
+TestReportMode= FullReport # Possible values are: 'Empty', 'Summary', 'Environment',
+ 'TestCases' or 'FullReport'
+
+CreateTestReport= YES # Possible values: YES or NO
+
+TestReportFilePath= C:\LOGS\TestFramework\
+TestReportFileName= TestReport
+
+TestReportFormat= TXT # Possible values: TXT, HTML or XML
+TestReportOutput= FILE # Possible values: FILE or RDEBUG
+TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
+
+DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
+
+DisableMeasurement= stifmeasurementdisablenone # Possible values are:
+ # 'stifmeasurementdisablenone', 'stifmeasurementdisableall'
+ # 'stifmeasurementplugin01', 'stifmeasurementplugin02',
+ # 'stifmeasurementplugin03', 'stifmeasurementplugin04',
+ # 'stifmeasurementplugin05' or 'stifbappeaprofiler'
+
+Timeout= 0 # Default timeout value for each test case. In milliseconds
+UITestingSupport= YES # Possible values: YES or NO
+SeparateProcesses= YES # Possible values: YES or NO (default: NO)
+[End_Defaults]
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+
+
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+# Module configurations start
+# Modules are added between module tags
+# tags. Module name is specified after ModuleName= tag, like
+# ModuleName= XXXXXXXXX
+# Modules might have initialisation file, specified as
+# IniFile= c:\testframework\YYYYYY
+# Modules might have several configuration files, like
+# TestCaseFile= c:\testframework\NormalCases.txt
+# TestCaseFile= c:\testframework\SmokeCases.txt
+# TestCaseFile= c:\testframework\ManualCases.txt
+
+# (TestCaseFile is synonym for old term ConfigFile)
+
+# Following case specifies demo module settings. Demo module
+# does not read any settings from file, so tags
+# IniFile and TestCaseFile are not used.
+# In the simplest case it is enough to specify only the
+# name of the test module when adding new test module
+
+[New_Module]
+ModuleName= testscripter
+TestCaseFile= c:\testframework\LbtUnitTestModule.cfg
+[End_Module]
+
+
+# Load testmoduleXXX, optionally with initialization file and/or test case files
+#[New_Module]
+#ModuleName= testmodulexxx
+
+#TestModuleXXX used initialization file
+#IniFile= c:\testframework\init.txt
+
+#TestModuleXXX used configuration file(s)
+#TestCaseFile= c:\testframework\testcases1.cfg
+#TestCaseFile= c:\testframework\testcases2.cfg
+#TestCaseFile= c:\testframework\manualtestcases.cfg
+
+#[End_Module]
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+
+
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+# Set STIF logging overwrite parameters for Logger.
+# Hardware and emulator environment logging path and styles can
+# be configured from here to overwrite the Logger's implemented values.
+#
+# Settings description:
+# - Indicates option for creation log directory/directories. If log directory/directories
+# is/are not created by user they will make by software.
+# + YES, Create log directory/directories if not allready exist.
+# + NO, Log directory/directories not created. Only created one is used.
+#
+# - Overwrite emulator path setting.
+# + Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined
+# Logger's path 'D:\\LOGS\\Module\\' with those definition the path
+# will be 'C:\LOGS\TestFramework\LOGS\Module\'
+#
+# - Overwrite emulator's logging format.
+# + TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
+# + HTML, Log file(s) will be html type(s), for example 'Module.html'.
+#
+# - Overwrited emulator logging output source.
+# + FILE, Logging to file(s).
+# + RDEBUG, Logging to using rdebug(s).
+#
+# - Overwrite hardware path setting (Same description as above in emulator path).
+# - Overwrite hardware's logging format(Same description as above in emulator format).
+# - Overwrite hardware's logging output source(Same description as above in emulator output).
+#
+# - File Creation Mode indicates file overwriting if file exist.
+# + OVERWRITE, Overwrites if file(s) exist.
+# + APPEND, Continue logging after the old logging information if file(s) exist.
+#
+# - Will thread id include to the log filename.
+# + YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
+# + NO, No thread id to log file(s), Example filename 'Module.txt'.
+#
+# - Will time stamps include the to log file.
+# + YES, Time stamp added to each line in log file(s). Time stamp is
+# for example'12.Nov.2003 115958 LOGGING INFO'
+# + NO, No time stamp(s).
+#
+# - Will line breaks include to the log file.
+# + YES, Each logging event includes line break and next log event is in own line.
+# + NO, No line break(s).
+#
+# - Will event ranking include to the log file.
+# + YES, Event ranking number added to each line in log file(s). Ranking number
+# depends on environment's tics, for example(includes time stamp also)
+# '012 12.Nov.2003 115958 LOGGING INFO'
+# + NO, No event ranking.
+#
+# - Will write log file in unicode format.
+# + YES, Log file will be written in unicode format
+# + NO, Log will be written as normal, not unicode, file.
+#
+
+[Logger_Defaults]
+
+#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#'
+#NOTE: TestEngine and TestServer logging settings cannot change here
+
+#CreateLogDirectories= YES # Possible values: YES or NO
+
+#EmulatorBasePath= C:\LOGS\TestFramework\
+#EmulatorFormat= HTML # Possible values: TXT or HTML
+#EmulatorOutput= FILE # Possible values: FILE or RDEBUG
+
+#HardwareBasePath= D:\LOGS\TestFramework\
+#HardwareFormat= HTML # Possible values: TXT or HTML
+#HardwareOutput= FILE # Possible values: FILE or RDEBUG
+
+#FileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
+
+#ThreadIdToLogFile= YES # Possible values: YES or NO
+#WithTimeStamp= YES # Possible values: YES or NO
+#WithLineBreak= YES # Possible values: YES or NO
+#WithEventRanking= YES # Possible values: YES or NO
+
+#FileUnicode= YES # Possible values: YES or NO
+#AddTestCaseTitle= YES # Possible values: YES or NO
+[End_Logger_Defaults]
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+# End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/locationtriggering/tsrc/lbtengine_test/LbtUnitTestModule/src/LbtUnitTestModule.cpp Mon Oct 04 00:45:15 2010 +0300
@@ -0,0 +1,182 @@
+/*
+* 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 file contains testclass implementation.
+*
+*/
+
+// INCLUDE FILES
+#include <StifTestInterface.h>
+#include "LbtUnitTestModule.h"
+#include <SettingServerClient.h>
+
+// EXTERNAL DATA STRUCTURES
+//extern ?external_data;
+
+// EXTERNAL FUNCTION PROTOTYPES
+//extern ?external_function( ?arg_type,?arg_type );
+
+// CONSTANTS
+//const ?type ?constant_var = ?constant;
+
+// MACROS
+//#define ?macro ?macro_def
+
+// LOCAL CONSTANTS AND MACROS
+//const ?type ?constant_var = ?constant;
+//#define ?macro_name ?macro_def
+
+// MODULE DATA STRUCTURES
+//enum ?declaration
+//typedef ?declaration
+
+// LOCAL FUNCTION PROTOTYPES
+//?type ?function_name( ?arg_type, ?arg_type );
+
+// FORWARD DECLARATIONS
+//class ?FORWARD_CLASSNAME;
+
+// ============================= LOCAL FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// ?function_name ?description.
+// ?description
+// Returns: ?value_1: ?description
+// ?value_n: ?description_line1
+// ?description_line2
+// -----------------------------------------------------------------------------
+//
+/*
+?type ?function_name(
+ ?arg_type arg, // ?description
+ ?arg_type arg) // ?description
+ {
+
+ ?code // ?comment
+
+ // ?comment
+ ?code
+ }
+*/
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::CLbtUnitTestModule
+// C++ default constructor can NOT contain any code, that
+// might leave.
+// -----------------------------------------------------------------------------
+//
+CLbtUnitTestModule::CLbtUnitTestModule(
+ CTestModuleIf& aTestModuleIf ):
+ CScriptBase( aTestModuleIf )
+ {
+ }
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::ConstructL
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CLbtUnitTestModule::ConstructL()
+ {
+ //Read logger settings to check whether test case name is to be
+ //appended to log file name.
+ RSettingServer settingServer;
+ TInt ret = settingServer.Connect();
+ if(ret != KErrNone)
+ {
+ User::Leave(ret);
+ }
+ // Struct to StifLogger settigs.
+ TLoggerSettings loggerSettings;
+ // Parse StifLogger defaults from STIF initialization file.
+ ret = settingServer.GetLoggerSettings(loggerSettings);
+ if(ret != KErrNone)
+ {
+ User::Leave(ret);
+ }
+ // Close Setting server session
+ settingServer.Close();
+
+ TFileName logFileName;
+
+ if(loggerSettings.iAddTestCaseTitle)
+ {
+ TName title;
+ TestModuleIf().GetTestCaseTitleL(title);
+ logFileName.Format(KLbtUnitTestModuleLogFileWithTitle, &title);
+ }
+ else
+ {
+ logFileName.Copy(KLbtUnitTestModuleLogFile);
+ }
+
+ iLog = CStifLogger::NewL( KLbtUnitTestModuleLogPath,
+ logFileName,
+ CStifLogger::ETxt,
+ CStifLogger::EFile,
+ EFalse );
+
+ iWait = new ( ELeave ) CActiveSchedulerWait;
+ }
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::NewL
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CLbtUnitTestModule* CLbtUnitTestModule::NewL(
+ CTestModuleIf& aTestModuleIf )
+ {
+ CLbtUnitTestModule* self = new (ELeave) CLbtUnitTestModule( aTestModuleIf );
+
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop();
+
+ return self;
+
+ }
+
+// Destructor
+CLbtUnitTestModule::~CLbtUnitTestModule()
+ {
+
+ // Delete resources allocated from test methods
+ Delete();
+
+ // Delete logger
+ delete iLog;
+
+ delete iWait;
+ }
+
+
+// ========================== OTHER EXPORTED FUNCTIONS =========================
+
+// -----------------------------------------------------------------------------
+// LibEntryL is a polymorphic Dll entry point.
+// Returns: CScriptBase: New CScriptBase derived object
+// -----------------------------------------------------------------------------
+//
+EXPORT_C CScriptBase* LibEntryL(
+ CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
+ {
+
+ return ( CScriptBase* ) CLbtUnitTestModule::NewL( aTestModuleIf );
+
+ }
+
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/locationtriggering/tsrc/lbtengine_test/LbtUnitTestModule/src/LbtUnitTestModuleBlocks.cpp Mon Oct 04 00:45:15 2010 +0300
@@ -0,0 +1,923 @@
+/*
+* 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 file contains testclass implementation.
+*
+*/
+
+// [INCLUDE FILES] - do not remove
+#include <e32svr.h>
+#include <StifParser.h>
+#include <StifTestInterface.h>
+#include <etelmm.h>
+#include <centralrepository.h>
+#include "LbtUnitTestModule.h"
+#include "lbtgeogsmcell.h"
+#include "lbtgeowcdmacell.h"
+#include "lbtsettingsmanager.h"
+#include "lbtdiskspacelistner.h"
+#include "lbttriggernode.h"
+#include "lbtcontextsourceplugincommon.h"
+#include "lbtcellinfo.h"
+#include "lbtoperation.h"
+#include "lbtlogger.h"
+
+
+static const TInt KArrayIndex = 5;
+const TInt KCRUidLocationTriggeringSettings(0x1028312F);
+
+const TBuf<236> testFileName(_L("C:\\data\\testdata.log"));
+
+TInt ThreadFunction( TAny* aParam );
+
+enum TCenRepKeys
+ {
+ ELbtMinimumTriggerArea = 0x00000007,
+ ELbtTrackModeInterval = 0x00000008,
+ ELbtLocRequestTimeOut = 0x00000009,
+ ELbtMinHysteresisArea = 0x0000000A,
+ ELbtDaysForCleanup = 0x0000000B,
+ ELbtSleepTime = 0x0000000C,
+ ELbtMaxActiveTriggers = 0x0000000D,
+ };
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::Delete
+// Delete here all resources allocated and opened from test methods.
+// Called from destructor.
+// -----------------------------------------------------------------------------
+//
+void CLbtUnitTestModule::Delete()
+ {
+ // Lbt logger is created by the first LOG call, it is destroyed
+ // only during termination. This has to be explicitly destroyed.
+ STOPLOGGING
+ }
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::RunMethodL
+// Run specified method. Contains also table of test mothods and their names.
+// -----------------------------------------------------------------------------
+//
+TInt CLbtUnitTestModule::RunMethodL(
+ CStifItemParser& aItem )
+ {
+
+ static TStifFunctionInfo const KFunctions[] =
+ {
+ // Copy this line for every implemented function.
+ // First string is the function name used in TestScripter script file.
+ // Second is the actual implementation member function.
+ ENTRY( "TestCLbtGeoGsmCellNewL", CLbtUnitTestModule::TestCLbtGeoGsmCellNewL ),
+ ENTRY( "TestCLbtGeoGsmCellNewLC", CLbtUnitTestModule::TestCLbtGeoGsmCellNewLC ),
+ ENTRY( "TestCLbtGeoGsmCellNew1L", CLbtUnitTestModule::TestCLbtGeoGsmCellNew1L ),
+ ENTRY( "TestCLbtGeoGsmCellNew1LC", CLbtUnitTestModule::TestCLbtGeoGsmCellNew1LC ),
+ ENTRY( "TestSetAndGetBsicL", CLbtUnitTestModule::TestSetAndGetBsicL ),
+ ENTRY( "TestGsmCGISpecifiedDuringCreationL", CLbtUnitTestModule::TestGsmCGISpecifiedDuringCreationL ),
+ ENTRY( "TestGsmCellInternalizeExternalizeL", CLbtUnitTestModule::TestGsmCellInternalizeExternalizeL ),
+ ENTRY( "TestCLbtGeoWcdmaCellL", CLbtUnitTestModule::TestCLbtGeoWcdmaCellL ),
+ ENTRY( "TestCLbtGeoWcdmaCellLC", CLbtUnitTestModule::TestCLbtGeoWcdmaCellLC ),
+ ENTRY( "TestCLbtGeoWcdmaCell1L", CLbtUnitTestModule::TestCLbtGeoWcdmaCell1L ),
+ ENTRY( "TestCLbtGeoWcdmaCell1LC", CLbtUnitTestModule::TestCLbtGeoWcdmaCell1LC ),
+ ENTRY( "TestSetAndGetWcdmaInfoL", CLbtUnitTestModule::TestSetAndGetWcdmaInfoL ),
+ ENTRY( "TestWcdmaCGISpecifiedDuringCreationL", CLbtUnitTestModule::TestWcdmaCGISpecifiedDuringCreationL ),
+ ENTRY( "TestWcdmaCellInternalizeExternalizeL", CLbtUnitTestModule::TestWcdmaCellInternalizeExternalizeL ),
+ ENTRY( "TestSetAndGetOptimisationLevelL", CLbtUnitTestModule::TestSetAndGetOptimisationLevelL ),
+ ENTRY( "TestSetAndGetNppModuleIdL", CLbtUnitTestModule::TestSetAndGetNppModuleIdL ),
+ ENTRY( "TestSetAndGetMinUpdateIntOnGpsFailureL", CLbtUnitTestModule::TestSetAndGetMinUpdateIntOnGpsFailureL ),
+ ENTRY( "TestSetAndGetMaximumUserSpeedL", CLbtUnitTestModule::TestSetAndGetMaximumUserSpeedL ),
+ ENTRY( "TestSetAndGetTrigMechStateL", CLbtUnitTestModule::TestSetAndGetTrigMechStateL ),
+ ENTRY( "TestTriggerConfigParamsL", CLbtUnitTestModule::TestTriggerConfigParamsL ),
+ ENTRY( "TestCLbtDiskSpaceListnerStartToListenL", CLbtUnitTestModule::TestCLbtDiskSpaceListnerStartToListenL ),
+ ENTRY( "TestCLbtDiskSpaceListnerCancelL", CLbtUnitTestModule::TestCLbtDiskSpaceListnerCancelL ),
+ ENTRY( "TestTriggerNodeMethodsL", CLbtUnitTestModule::TestTriggerNodeMethodsL ),
+ ENTRY( "TestGsmCellInfoMethodsL", CLbtUnitTestModule::TestGsmCellInfoMethodsL ),
+ ENTRY( "TestWcdmaCellInfoMethodsL", CLbtUnitTestModule::TestWcdmaCellInfoMethodsL ),
+ ENTRY( "TestLbtOperationsMethodL", CLbtUnitTestModule::TestLbtOperationsMethodL )
+ //ADD NEW ENTRY HERE
+ // [test cases entries] - Do not remove
+
+ };
+
+ const TInt count = sizeof( KFunctions ) /
+ sizeof( TStifFunctionInfo );
+
+ return RunInternalL( KFunctions, count, aItem );
+
+ }
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestCLbtGeoGsmCellNewL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestCLbtGeoGsmCellNewL( CStifItemParser& /*aItem*/ )
+ {
+ CLbtGeoGsmCell* gsmCell = CLbtGeoGsmCell::NewL();
+ delete gsmCell;
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestCLbtGeoGsmCellNewLC
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestCLbtGeoGsmCellNewLC( CStifItemParser& /*aItem*/ )
+ {
+ CLbtGeoGsmCell* gsmCell = CLbtGeoGsmCell::NewLC();
+ CleanupStack::PopAndDestroy( gsmCell );
+ return KErrNone;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestCLbtGeoGsmCellNew1L
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestCLbtGeoGsmCellNew1L( CStifItemParser& /*aItem*/ )
+ {
+ TBuf<4> Networkcountrycode = _L("1000");
+ TBuf<8> Networkidentitycode = _L("10000000");
+ TUint Locationareacode = 100;
+ TUint CellId = 100;
+ CLbtGeoGsmCell* gsmCell = CLbtGeoGsmCell::NewL(
+ RMobilePhone::ENetworkModeGsm,
+ Networkcountrycode,
+ Networkidentitycode,
+ Locationareacode,
+ CellId);
+ delete gsmCell;
+ return KErrNone;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestCLbtGeoGsmCellNew1LC
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestCLbtGeoGsmCellNew1LC( CStifItemParser& /*aItem*/ )
+ {
+ TBuf<4> Networkcountrycode = _L("1000");
+ TBuf<8> Networkidentitycode = _L("10000000");
+ TUint Locationareacode = 100;
+ TUint CellId = 100;
+ CLbtGeoGsmCell* gsmCell = CLbtGeoGsmCell::NewLC(
+ RMobilePhone::ENetworkModeGsm,
+ Networkcountrycode,
+ Networkidentitycode,
+ Locationareacode,
+ CellId);
+ CleanupStack::PopAndDestroy( gsmCell );
+ return KErrNone;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestSetAndGetBsicL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestSetAndGetBsicL( CStifItemParser& /*aItem*/ )
+ {
+ CLbtGeoGsmCell* gsmCell = CLbtGeoGsmCell::NewLC();
+ RArray<TInt> bsicArray;
+ CleanupClosePushL( bsicArray );
+ for( TInt i=0;i<KArrayIndex;i++ )
+ {
+ bsicArray.AppendL( i+1 );
+ }
+ gsmCell->SetBsic( bsicArray );
+
+ RArray<TInt> retBsicArray = gsmCell->Bsic();
+ for( TInt i=0;i<bsicArray.Count();i++ )
+ {
+ if( bsicArray[i] != retBsicArray[i] )
+ {
+ User::Leave( KErrArgument );
+ }
+ }
+ CleanupStack::PopAndDestroy( 2 );
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestGsmCGISpecifiedDuringCreationL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestGsmCGISpecifiedDuringCreationL( CStifItemParser& /*aItem*/ )
+ {
+ CLbtGeoGsmCell* gsmCell = CLbtGeoGsmCell::NewL();
+ CleanupStack::PushL( gsmCell );
+ TBool cgiSpecified = gsmCell->CGISpecifiedDuringCreation();
+ if( cgiSpecified )
+ {
+ User::Leave( KErrArgument );
+ }
+ CleanupStack::PopAndDestroy( gsmCell );
+ return KErrNone;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestGsmCellInternalizeExternalizeL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestGsmCellInternalizeExternalizeL( CStifItemParser& /*aItem*/ )
+ {
+ TBuf<4> Networkcountrycode = _L("1000");
+ TBuf<8> Networkidentitycode = _L("10000000");
+ TUint Locationareacode = 100;
+ TUint CellId = 100;
+
+ CLbtGeoGsmCell* gsmCell = CLbtGeoGsmCell::NewL(
+ RMobilePhone::ENetworkModeGsm,
+ Networkcountrycode,
+ Networkidentitycode,
+ Locationareacode,
+ CellId);
+ CleanupStack::PushL( gsmCell );
+
+ CBufFlat* buffer= CBufFlat::NewL(256);
+ CleanupStack::PushL( buffer );
+
+ // Externalize
+ RBufWriteStream wr;
+ CleanupClosePushL( wr );
+ wr.Open(*buffer);
+ gsmCell->ExternalizeL( wr );
+ wr.CommitL();
+ CleanupStack::PopAndDestroy( &wr );
+
+ // Internalize
+
+ RBufReadStream rd;
+ rd.Open(*buffer);
+ CleanupClosePushL(rd);
+
+ CLbtGeoGsmCell* newGsmCell = CLbtGeoGsmCell::NewLC();
+ newGsmCell->InternalizeL(rd);
+
+ if( newGsmCell->NetworkType() != RMobilePhone::ENetworkModeGsm ||
+ newGsmCell->NetworkCountryCode() != Networkcountrycode ||
+ newGsmCell->NetworkIdentityCode() != Networkidentitycode ||
+ newGsmCell->LocationAreaCode() != Locationareacode ||
+ newGsmCell->CellId() != CellId )
+ {
+ User::Leave( KErrArgument );
+ }
+ CleanupStack::PopAndDestroy( 4 );
+ return KErrNone;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestCLbtGeoWcdmaCellL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestCLbtGeoWcdmaCellL( CStifItemParser& /*aItem*/ )
+ {
+ CLbtGeoWcdmaCell* wcdmaCell = CLbtGeoWcdmaCell::NewL();
+ delete wcdmaCell;
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestCLbtGeoWcdmaCellLC
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestCLbtGeoWcdmaCellLC( CStifItemParser& /*aItem*/ )
+ {
+ CLbtGeoWcdmaCell* wcdmaCell = CLbtGeoWcdmaCell::NewLC();
+ CleanupStack::PopAndDestroy( wcdmaCell );
+ return KErrNone;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestCLbtGeoWcdmaCell1L
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestCLbtGeoWcdmaCell1L( CStifItemParser& /*aItem*/ )
+ {
+ TBuf<4> Networkcountrycode = _L("1000");
+ TBuf<8> Networkidentitycode = _L("10000000");
+ TUint Locationareacode = 100;
+ TUint CellId = 100;
+ CLbtGeoWcdmaCell* wcdmaCell = CLbtGeoWcdmaCell::NewL(
+ RMobilePhone::ENetworkModeWcdma,
+ Networkcountrycode,
+ Networkidentitycode,
+ Locationareacode,
+ CellId);
+ delete wcdmaCell;
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestCLbtGeoWcdmaCell1LC
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestCLbtGeoWcdmaCell1LC( CStifItemParser& /*aItem*/ )
+ {
+ TBuf<4> Networkcountrycode = _L("1000");
+ TBuf<8> Networkidentitycode = _L("10000000");
+ TUint Locationareacode = 100;
+ TUint CellId = 100;
+
+ CLbtGeoWcdmaCell* wcdmaCell = CLbtGeoWcdmaCell::NewLC(
+ RMobilePhone::ENetworkModeWcdma,
+ Networkcountrycode,
+ Networkidentitycode,
+ Locationareacode,
+ CellId );
+ CleanupStack::PopAndDestroy( wcdmaCell );
+ return KErrNone;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestSetAndGetWcdmaInfoL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestSetAndGetWcdmaInfoL( CStifItemParser& /*aItem*/ )
+ {
+ CLbtGeoWcdmaCell* wcdmaCell = CLbtGeoWcdmaCell::NewLC();
+
+ TLbtWcdmaCellInfo wcdmaCellInfo;
+ wcdmaCellInfo.iCell.iCarrierRssi = 10;
+ wcdmaCellInfo.iCell.iEcNo = 20;
+ wcdmaCellInfo.iCell.iPathLoss = 30;
+ wcdmaCellInfo.iCell.iRscp = 40;
+ wcdmaCell->SetWcdmaCellInfo( wcdmaCellInfo );
+
+ TLbtWcdmaCellInfo retWcdmaCellInfo = wcdmaCell->WcdmaCellInfo();
+
+ if( wcdmaCellInfo.iCell.iCarrierRssi != retWcdmaCellInfo.iCell.iCarrierRssi ||
+ wcdmaCellInfo.iCell.iEcNo != retWcdmaCellInfo.iCell.iEcNo ||
+ wcdmaCellInfo.iCell.iPathLoss != retWcdmaCellInfo.iCell.iPathLoss ||
+ wcdmaCellInfo.iCell.iRscp != retWcdmaCellInfo.iCell.iRscp )
+ {
+ User::Leave( KErrArgument );
+ }
+ CleanupStack::PopAndDestroy( wcdmaCell );
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestWcdmaCGISpecifiedDuringCreationL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestWcdmaCGISpecifiedDuringCreationL( CStifItemParser& /*aItem*/ )
+ {
+ CLbtGeoWcdmaCell* wcdmaCell = CLbtGeoWcdmaCell::NewL();
+ CleanupStack::PushL( wcdmaCell );
+ TBool cgiSpecified = wcdmaCell->CGISpecifiedDuringCreation();
+ if( cgiSpecified )
+ {
+ User::Leave( KErrArgument );
+ }
+ CleanupStack::PopAndDestroy( wcdmaCell );
+ return KErrNone;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestWcdmaCellInternalizeExternalizeL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestWcdmaCellInternalizeExternalizeL( CStifItemParser& /*aItem*/ )
+ {
+ TBuf<4> Networkcountrycode = _L("1000");
+ TBuf<8> Networkidentitycode = _L("10000000");
+ TUint Locationareacode = 100;
+ TUint CellId = 100;
+
+ CLbtGeoWcdmaCell* wcdmaCell = CLbtGeoWcdmaCell::NewL(
+ RMobilePhone::ENetworkModeWcdma,
+ Networkcountrycode,
+ Networkidentitycode,
+ Locationareacode,
+ CellId);
+ CleanupStack::PushL( wcdmaCell );
+
+ CBufFlat* buffer= CBufFlat::NewL(256);
+ CleanupStack::PushL( buffer );
+
+ // Externalize
+ RBufWriteStream wr;
+ CleanupClosePushL( wr );
+ wr.Open(*buffer);
+ wcdmaCell->ExternalizeL( wr );
+ wr.CommitL();
+ CleanupStack::PopAndDestroy( &wr );
+
+ // Internalize
+
+ RBufReadStream rd;
+ rd.Open(*buffer);
+ CleanupClosePushL(rd);
+
+ CLbtGeoWcdmaCell* newWcdmaCell = CLbtGeoWcdmaCell::NewLC();
+ newWcdmaCell->InternalizeL(rd);
+
+ if( newWcdmaCell->NetworkType() != RMobilePhone::ENetworkModeWcdma ||
+ newWcdmaCell->NetworkCountryCode() != Networkcountrycode ||
+ newWcdmaCell->NetworkIdentityCode() != Networkidentitycode ||
+ newWcdmaCell->LocationAreaCode() != Locationareacode ||
+ newWcdmaCell->CellId() != CellId )
+ {
+ User::Leave( KErrArgument );
+ }
+ CleanupStack::PopAndDestroy( 4 );
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestSetAndGetOptimisationLevelL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestSetAndGetOptimisationLevelL( CStifItemParser& /*aItem*/ )
+ {
+ CLbtSettingsManager* settingsManager = CLbtSettingsManager::NewL();
+ CleanupStack::PushL( settingsManager );
+ settingsManager->SetOptimizationLevel( 10 );
+ if( settingsManager->GetOptimizationLevel() != 10 )
+ {
+ User::Leave( KErrArgument );
+ }
+ CleanupStack::PopAndDestroy( settingsManager );
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestSetAndGetModuleIdL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestSetAndGetModuleIdL( CStifItemParser& /*aItem*/ )
+ {
+ CLbtSettingsManager* settingsManager = CLbtSettingsManager::NewL();
+ CleanupStack::PushL( settingsManager );
+ TUid moduleId = TUid::Uid( 270526860 );
+ settingsManager->SetModuleId( moduleId );
+ if( settingsManager->GetModuleId() != moduleId )
+ {
+ User::Leave( KErrArgument );
+ }
+ CleanupStack::PopAndDestroy( settingsManager );
+ return KErrNone;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestSetAndGetNppModuleIdL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestSetAndGetNppModuleIdL( CStifItemParser& /*aItem*/ )
+ {
+ CLbtSettingsManager* settingsManager = CLbtSettingsManager::NewL();
+ CleanupStack::PushL( settingsManager );
+ TUid moduleId = TUid::Uid( 16777216 );
+ settingsManager->SetModuleId( moduleId );
+ if( settingsManager->GetModuleId() != moduleId )
+ {
+ User::Leave( KErrArgument );
+ }
+ CleanupStack::PopAndDestroy( settingsManager );
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestSetAndGetMinUpdateIntOnGpsFailureL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestSetAndGetMinUpdateIntOnGpsFailureL( CStifItemParser& /*aItem*/ )
+ {
+ CLbtSettingsManager* settingsManager = CLbtSettingsManager::NewL();
+ CleanupStack::PushL( settingsManager );
+
+ settingsManager->SetMinimumUpdateIntervalOnGpsFailure( 10000000 );
+ if( settingsManager->GetMinimumUpdateIntervalOnGpsFailure() != 10000000 )
+ {
+ User::Leave( KErrArgument );
+ }
+ CleanupStack::PopAndDestroy( settingsManager );
+ return KErrNone;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestSetAndGetMaximumUserSpeedL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestSetAndGetMaximumUserSpeedL( CStifItemParser& /*aItem*/ )
+ {
+ CLbtSettingsManager* settingsManager = CLbtSettingsManager::NewL();
+ CleanupStack::PushL( settingsManager );
+
+ settingsManager->SetMaximumUserSpeed( 42 );
+ if( settingsManager->GetMaximumUserSpeed() != 42 )
+ {
+ User::Leave( KErrArgument );
+ }
+ CleanupStack::PopAndDestroy( settingsManager );
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestSetAndGetTrigMechStateL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestSetAndGetTrigMechStateL( CStifItemParser& /*aItem*/ )
+ {
+ CLbtSettingsManager* settingsManager = CLbtSettingsManager::NewL();
+ CleanupStack::PushL( settingsManager );
+
+ settingsManager->SetTriggeringMechanismState( ETriggeringMechanismOn );
+ if( settingsManager->GetTriggeringMechanismState() != ETriggeringMechanismOn )
+ {
+ User::Leave( KErrArgument );
+ }
+ CleanupStack::PopAndDestroy( settingsManager );
+ return KErrNone;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestTriggerConfigParamsL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestTriggerConfigParamsL( CStifItemParser& /*aItem*/ )
+ {
+ // Read values from cenrep.
+
+ CRepository* repository = CRepository::NewL(TUid::Uid(KCRUidLocationTriggeringSettings));
+ CleanupStack::PushL( repository );
+ // Get all the values and store it in RAM
+ TInt minTriggerArea;
+ repository->Get(ELbtMinimumTriggerArea, minTriggerArea);
+ TInt trackModeInt;
+ repository->Get(ELbtTrackModeInterval, trackModeInt);
+ TInt locRequestTimeOut;
+ repository->Get(ELbtLocRequestTimeOut, locRequestTimeOut);
+ TInt minHysteresisArea;
+ repository->Get(ELbtMinHysteresisArea, minHysteresisArea);
+ TInt daysForCleanup;
+ repository->Get(ELbtDaysForCleanup, daysForCleanup);
+ TInt enabledValidTriggerCount;
+ repository->Get(ELbtMaxActiveTriggers, enabledValidTriggerCount);
+ CLbtSettingsManager* settingsManager = CLbtSettingsManager::NewL();
+ CleanupStack::PushL( settingsManager );
+
+ if( settingsManager->MinimumTriggeringArea() != minTriggerArea )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ if( settingsManager->TrackingModeInterval() != trackModeInt )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ if( settingsManager->GetLocationRequestTimeOut() != locRequestTimeOut )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ if( settingsManager->MinimumHysteresisArea() != minHysteresisArea )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ if( settingsManager->NumberOfDaysForCleanup() != daysForCleanup )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ if( settingsManager->EnabledValidTriggerCount() != enabledValidTriggerCount )
+ {
+ User::Leave( KErrArgument );
+ }
+ CleanupStack::PopAndDestroy( 2 );
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestCLbtDiskSpaceListnerStartToListenL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestCLbtDiskSpaceListnerStartToListenL( CStifItemParser& /*aItem*/ )
+ {
+ CLbtDiskSpaceListner* diskSpaceListner = CLbtDiskSpaceListner::NewL( *this );
+ CleanupStack::PushL( diskSpaceListner );
+
+ diskSpaceListner->StartToListen();
+
+ RThread thread;
+ TThreadFunction funcPtr = ThreadFunction;
+ thread.Create(_L("TestLbtThread"),funcPtr,KDefaultStackSize,NULL,NULL);
+ thread.Resume();
+
+ iWait->Start();
+ thread.Kill( 0 );
+ thread.Close();
+ CleanupStack::PopAndDestroy( diskSpaceListner );
+ return KErrNone;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestCLbtDiskSpaceListnerCancelL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestCLbtDiskSpaceListnerCancelL( CStifItemParser& /*aItem*/ )
+ {
+ CLbtDiskSpaceListner* diskSpaceListner = CLbtDiskSpaceListner::NewL( *this );
+ CleanupStack::PushL( diskSpaceListner );
+
+ diskSpaceListner->StartToListen();
+
+ // Cancel is called in the destructor.
+ CleanupStack::PopAndDestroy( diskSpaceListner );
+ return KErrNone;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestTriggerNodeMethodsL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestTriggerNodeMethodsL( CStifItemParser& /*aItem*/ )
+ {
+ TTriggerNode triggerNode;
+
+ HBufC* buffer = HBufC::NewLC( 10 );
+ TPtr ptr =buffer->Des();
+ TPtrC retPtr;
+ TReal value;
+
+ // Test set and get trigger name.
+ ptr.Copy(_L("Test"));
+ triggerNode.SetTriggerNameL( ptr );
+ triggerNode.GetTriggerName( retPtr );
+ if( ptr != retPtr )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ // Test set and get latitude.
+ ptr.Copy(_L("12.7"));
+ triggerNode.SetLatitudeL( ptr );
+ triggerNode.GetLatitude( value );
+ if( value != 12.7 )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ // Test set and get longitude.
+ ptr.Copy(_L("72.7"));
+ triggerNode.SetLongitudeL( ptr );
+ triggerNode.GetLongitude( value );
+ if( value != 72.7 )
+ {
+ User::Leave( KErrArgument );
+ }
+
+
+ // Test set and get region.
+ ptr.Copy(KRegionValue);
+ triggerNode.SetRegionL( ptr );
+ triggerNode.GetRegion( retPtr );
+ if( ptr != retPtr )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ // Test set and get radius.
+ ptr.Copy(_L("10"));
+ triggerNode.SetRadiusL( ptr );
+ triggerNode.GetRadius( value );
+ if( value != KMinRadius )
+ {
+ User::Leave( KErrArgument );
+ }
+
+
+ // Test set and get direction.
+ ptr.Copy(KNullDesC);
+ triggerNode.SetDirectionL( ptr );
+ if( triggerNode.GetDirection() != CLbtTriggerConditionArea::EFireOnEnter )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ // Test set and get context source.
+ ptr.Copy(KDefaultContextSourceName);
+ triggerNode.SetContextSource( ptr );
+ if( triggerNode.GetContextSource() != KDefaultContextSourceName )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ // Test set and get current state.
+ triggerNode.SetCurrentStateL( ptr );
+ if( triggerNode.GetCurrentState() != CLbtTriggerEntry::EStateEnabled )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ CleanupStack::PopAndDestroy( buffer );
+ return KErrNone;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestGsmCellInfoMethodsL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestGsmCellInfoMethodsL( CStifItemParser& /*aItem*/ )
+ {
+ // Test GSM cell info methods.
+ RMmCustomAPI::TMmCellInfo info;
+
+ //Construct dummy cell info with GSM params.
+ info.iMode = RMmCustomAPI::TMmCellInfo::EGSM;
+
+ info.iGsmCellInfo.iTA = 10;
+
+ CLbtCellInfo* cellInfo = CLbtCellInfo::NewL( info );
+ CleanupStack::PushL( cellInfo );
+
+ // Get the GSM NMR array.
+ RArray<TGsmNMR> gsmArray = cellInfo->GetNMR();
+ if( gsmArray.Count() != 0 )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ // Check the count of cell info.
+ if( cellInfo->Count() != 0 )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ // Read the TA from the cell info.
+ if( cellInfo->GetTA() != 10 )
+ {
+ User::Leave( KErrArgument );
+ }
+ //Get the cell id count for GSM network. It is not
+ // supported for GSM. Hence it should return 0.
+ if( cellInfo->CellChangeCount() != 0 )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ // Attempt to find GSM cell info at 0th index should fail.
+ TGsmNMR gsmNmr;
+ TInt index = 0;
+ if( cellInfo->Find( index, gsmNmr ) )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ // Add same cell info again
+ cellInfo->AddNMRData( info );
+
+ // Start the iterator
+ CLbtCellInfo::TCellInfoArrayIterator itr = cellInfo->Begin();
+
+ if( itr.Next( gsmNmr ) )
+ {
+ User::Leave( KErrArgument );
+ }
+ itr.Reset();
+
+ // Reset the info
+ cellInfo->Reset();
+
+ CleanupStack::PopAndDestroy( cellInfo );
+ return KErrNone;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestWcdmaCellInfoMethodsL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestWcdmaCellInfoMethodsL( CStifItemParser& /*aItem*/ )
+ {
+ // Test WCDMA cell info methods.
+ RMmCustomAPI::TMmCellInfo info;
+
+ //Construct dummy cell info with WCDMA params.
+ info.iMode = RMmCustomAPI::TMmCellInfo::EWCDMA;
+
+ //Set scrambling code and cell id.
+ info.iWcdmaCellInfo.iPrimaryScrambilingCode = 10;
+ info.iWcdmaCellInfo.iNwkMeasureReport[0].iCellMeasuredResult[0].iCID = 100;
+
+ CLbtCellInfo* cellInfo = CLbtCellInfo::NewL( info );
+ CleanupStack::PushL( cellInfo );
+
+ // Get the WCDMA NMR array.
+ RArray<TWcdmaNMR> wcdmaArray = cellInfo->GetWcdmaNMR();
+ if( wcdmaArray.Count() == 0 )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ // Check the count of cell info.
+ if( cellInfo->Count() == 0 )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ //Get the cell id count for WCDMA network. It is not
+ // supported for GSM. Hence it should return 0.
+ if( cellInfo->CellChangeCount() == 0 )
+ {
+ User::Leave( KErrArgument );
+ }
+
+
+ // Add same cell info again
+ cellInfo->AddNMRData( info );
+
+ // Start the iterator
+ CLbtCellInfo::TCellInfoArrayIterator itr = cellInfo->Begin();
+
+ TWcdmaNMR wcdmaNmr;
+ if( !itr.Next( wcdmaNmr ) )
+ {
+ User::Leave( KErrArgument );
+ }
+ itr.Reset();
+
+ // Reset the info
+ cellInfo->Reset();
+
+ CleanupStack::PopAndDestroy( cellInfo );
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::TestLbtOperationsMethodL
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt CLbtUnitTestModule::TestLbtOperationsMethodL( CStifItemParser& /*aItem*/ )
+ {
+ CLbtGeoAreaBase* areaBase = NULL;
+ TRequestStatus status;
+
+ CLBTOperation* lbtOperation = CLBTOperation::CreateGeoAreaForCurrentLocationL(
+ status,
+ CLbtGeoAreaBase::ECellular,
+ &areaBase );
+ delete lbtOperation;
+ delete areaBase;
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// CLbtUnitTestModule::HandleDiskSpaceChange
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+void CLbtUnitTestModule::HandleDiskSpaceChange()
+ {
+ iWait->AsyncStop();
+ }
+
+
+// -----------------------------------------------------------------------------
+// ThreadFunction
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+TInt ThreadFunction( TAny* /*aParam*/)
+ {
+ TInt error;
+ RFs fs;
+ fs.Connect();
+ RFile file;
+ error = file.Create( fs,testFileName,EFileWrite);
+ if(error == KErrAlreadyExists )
+ {
+ fs.Delete( testFileName );
+ }
+ file.Close();
+ fs.Close();
+ return KErrNone;
+ }
+
+
+
+// [End of File]
--- a/locationtriggering/tsrc/lbtengine_test/group/bld.inf Thu Sep 02 20:51:33 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/group/bld.inf Mon Oct 04 00:45:15 2010 +0300
@@ -56,6 +56,7 @@
#include "../UpdateTrigger/group/bld.inf"
#include "../lbtbctest/group/bld.inf"
#include "../TestHybridTriggers/group/bld.inf"
+#include "../LbtUnitTestModule/group/bld.inf"
PRJ_MMPFILES
// Specify the .mmp files required for building the important component
--- a/locsrv_plat/supl_settings_api/tsrc/group/bld.inf Thu Sep 02 20:51:33 2010 +0300
+++ b/locsrv_plat/supl_settings_api/tsrc/group/bld.inf Mon Oct 04 00:45:15 2010 +0300
@@ -42,7 +42,7 @@
settingsapi_test.mmp
PRJ_MMPFILES
-settingsapi_test.mmp
+
// Specify the .mmp files required for building the important component
// releasables.
//
--- a/locsrv_plat/supl_settings_api/tsrc/inc/settingsapi.h Thu Sep 02 20:51:33 2010 +0300
+++ b/locsrv_plat/supl_settings_api/tsrc/inc/settingsapi.h Mon Oct 04 00:45:15 2010 +0300
@@ -327,6 +327,11 @@
TInt GetSuplTriggerServiceStatusOFF();
+
+ TInt ProductConfiguredServer1();
+ TInt ProductConfiguredServer2();
+ TInt ProductConfiguredServer3();
+ TInt ProductConfiguredServer4();
// TInt CSettingsApi::SetstatusOtherThanAppropriate();
public : // from MSuplSettingsObserver
@@ -363,6 +368,7 @@
TInt iTestid;
TInt iErrCode;
TInt iSlpId;
+ CStifLogger* iLog;
};
--- a/locsrv_plat/supl_settings_api/tsrc/src/settingsapiblocks.cpp Thu Sep 02 20:51:33 2010 +0300
+++ b/locsrv_plat/supl_settings_api/tsrc/src/settingsapiblocks.cpp Mon Oct 04 00:45:15 2010 +0300
@@ -240,32 +240,16 @@
ENTRY( "GetFallBack",CSettingsApi::GetFallBack),
ENTRY( "SetGetTriggerParams",CSettingsApi::SetGetTriggerParamsL),
- /*ENTRY( "AddTriggerSession",CSettingsApi::AddTriggerSessionL),
- ENTRY( "DeleteTriggerSession",CSettingsApi::DeleteTriggerSessionL),
- ENTRY( "GetAllSessionSetApi",CSettingsApi::GetAllSessionSetApiL),
- ENTRY( "SetNotStatusSetApi",CSettingsApi::SetNotStatusSetApiL),
- ENTRY( "AddTriggerSessionTwice",CSettingsApi::AddTriggerSessionTwiceL),
- ENTRY( "DeleteTriggerSessionInvalid",CSettingsApi::DeleteTriggerSessionInvalidL),
- ENTRY( "SetNotStatusSetApiInvalid",CSettingsApi::SetNotStatusSetApiInvalidL),
- */ENTRY( "SetSessionObserver",CSettingsApi::SetSessionObserverL),
+ ENTRY( "SetSessionObserver",CSettingsApi::SetSessionObserverL),
ENTRY( "SetSessionObserverTwice",CSettingsApi::SetSessionObserverTwiceL),
ENTRY( "RemoveSessionObserver",CSettingsApi::RemoveSessionObserverL),
ENTRY( "RemoveSessionObserverWithoutSet",CSettingsApi::RemoveSessionObserverWithoutSetL),
-/* ENTRY( "CheckSessionChangeEvents",CSettingsApi::CheckSessionChangeEventsL),
- ENTRY( "GetASessionParam",CSettingsApi::GetASessionParamL),
- ENTRY( "GetASessionParamNull",CSettingsApi::GetASessionParamNullL),
- ENTRY( "GetASessionParamInValid",CSettingsApi::GetASessionParamInValidL),
- ENTRY( "CancelTriggerSession",CSettingsApi::CancelTriggerSessionL),
- ENTRY( "SetOutstandingTriggers",CSettingsApi::SetOutstandingTriggersL),
- ENTRY( "SetOutstandingTriggersInvalid",CSettingsApi::SetOutstandingTriggersInvalidL),
- ENTRY( "DeleteAllSessions",CSettingsApi::DeleteAllSessionsL),*/
ENTRY( "SetTriggerEmptySessionName",CSettingsApi::SetTriggerEmptySessionNameL),
ENTRY( "SetTriggerLongSessionName",CSettingsApi::SetTriggerLongSessionNameL),
ENTRY( "ChangeSuplTriggerServiceStatusON", CSettingsApi::ChangeSuplTriggerServiceStatusON),
ENTRY( "ChangeSuplTriggerServiceStatusOFF", CSettingsApi::ChangeSuplTriggerServiceStatusOFF),
ENTRY( "GetSuplTriggerServiceStatusON", CSettingsApi::GetSuplTriggerServiceStatusON),
ENTRY( "GetSuplTriggerServiceStatusOFF", CSettingsApi::GetSuplTriggerServiceStatusOFF),
- //ENTRY( "SetstatusOtherThanAppropriate", CSettingsApi::SetstatusOtherThanAppropriate),
ENTRY( "ProductConfiguredServer1", CSettingsApi::ProductConfiguredServer1),
ENTRY( "ProductConfiguredServer2", CSettingsApi::ProductConfiguredServer2),
ENTRY( "ProductConfiguredServer3", CSettingsApi::ProductConfiguredServer3),
--- a/package_definition.xml Thu Sep 02 20:51:33 2010 +0300
+++ b/package_definition.xml Mon Oct 04 00:45:15 2010 +0300
@@ -84,9 +84,6 @@
<component id="locationsuplpsy" filter="s60" name="Location SUPL PSY" class="plugin" introduced="^3">
<unit bldFile="genericpositioningplugins/locationsuplpsy/group"/>
</component>
- <component id="genericpositioningplugins_rom" filter="s60" name="Generic Positioning Plugins ROM" class="config">
- <unit bldFile="genericpositioningplugins/rom"/>
- </component>
</collection>
<collection id="landmarks" name="Landmarks" level="server">
<component id="locationlandmarks" filter="s60" name="Location Landmarks">
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/group/omasuplprotocolhandler1.mmp Thu Sep 02 20:51:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/group/omasuplprotocolhandler1.mmp Mon Oct 04 00:45:15 2010 +0300
@@ -51,7 +51,6 @@
SOURCE epos_comasuplinitstate.cpp
SOURCE epos_comasuplposrequestor.cpp
SOURCE epos_comasuplecomeventwatcher.cpp
-//SOURCE epos_comasuplsettingslauncher.cpp
SOURCE epos_comasupltrace.cpp
SOURCE epos_comasupldialogtimer.cpp
SOURCE epos_comasuplfallbackhandler.cpp
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplprotocolmanager1.h Thu Sep 02 20:51:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplprotocolmanager1.h Mon Oct 04 00:45:15 2010 +0300
@@ -31,7 +31,7 @@
#include "epos_msuplpacketnotifier.h"
#include "epos_momasuplecomeventobserver.h"
-#include "epos_comasuplsettingslauncher.h"
+
#include "epos_csuplsettingsinternal.h"
#include "epos_comasuplasnbase.h"
@@ -81,7 +81,6 @@
public MSuplEcomEventObserver,
public MSuplSettingsObserver,
public MOMASuplTimeOutNotifier,
- public MOMASuplUISettingsObserver,
public MOMASuplETelNotifierObserver
{
@@ -565,8 +564,6 @@
//Pos Handler
COMASuplPosHandlerBase *iPosHandler;
- // Settings UI Handle
- COMASuplSettingsLauncher* iSettingsLauncher;
COMASuplETelNotifier* iNotifier;
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplsession.h Thu Sep 02 20:51:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplsession.h Mon Oct 04 00:45:15 2010 +0300
@@ -44,7 +44,7 @@
#include "epos_comasuplcompleteselfrequestor.h"
#include "epos_comasuplstate.h"
#include "epos_omasuplconstants.h"
-#include "epos_comasuplsettingslauncher.h"
+
#include "epos_momasupltimeoutnotifier.h"
#include "epos_tomasuplposmethod.h"
#include "epos_momasupldialogtimeoutnotifier.h"
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplsettingslauncher.h Thu Sep 02 20:51:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,210 +0,0 @@
-/*
-* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Active object wrapper for launching Settings UI
-*
-*/
-
-
-
-#ifndef C_COMASUPLSETTINGSLAUNCHER_H
-#define C_COMASUPLSETTINGSLAUNCHER_H
-
-// INCLUDES
-#include <e32std.h>
-//#include <agentdialog.h> // for RGenConAgentDialogServer
-
-const TUid KNotifier1Uid = { 0x10009C00 };
-const TUid KNotifier2Uid = { 0x10009C01 };
-const TUid KNotifier3Uid = { 0x10009C02 };
-// FORWARD DECLARATIONS
-class MOMASuplUISettingsObserver;
-class CLocSettingsUiClient;
-class COMASuplTrace;
-/**
-* Active object wrapper for launching Supl Settings UI.
-* User of this class needs to implement relevant MOMASuplUISettingsObserver interface
-* methods to receive notifications.
-*/
-class COMASuplSettingsLauncher : public CActive
- {
- public:
-
- enum TSuplDialogType
- {
- ESUPLYesNoDialog = 0,
- ESUPLIAPDialog,
- ESUPLUsageDialog,
- ESUPLTimeoutDialog
- };
- /**
- * This is a two-phase constructor method that is used to
- * create a new instance for launching settings UI
- *
- * @param aCallback Reference to a callback instance.
- * @return A pointer to a new instance of the COMASuplSettingsLauncher class.
- */
- static COMASuplSettingsLauncher* NewL(MOMASuplUISettingsObserver& aCallback);
-
- /**
- * This is a two-phase constructor method that is used to create a new
- * instance for launching settings UI
- * Leaves the constructed instance to cleanup stack.
- *
- * @param aCallback Reference to a callback instance.
- * @return A pointer to a new instance of the COMASuplSettingsLauncher class.
- */
- static COMASuplSettingsLauncher* NewLC(MOMASuplUISettingsObserver& aCallback);
- /**
- * When this method is called, the COMASuplSettingsLauncher launches the
- * settings UI
- *
- * @throws error code depending on whether launch was successful or failed
- */
- TInt LaunchSettings();
-
- /**
- * When this method is called, the COMASuplSettingsLauncher cancels the
- * launch if it has not been already launched
- */
- void CancelLaunch();
-
- /**
- * When this method is called, the COMASuplSettingsLauncher launches the
- * settings UI
- *
- * @throws error code depending on whether launch was successful or failed
- */
- TInt LaunchSuplUsageSettingsUI(TBool aRoaming);
- /* Launches the Dialog saying one or more location requests were cancelled
- */
-
- TInt LaunchSessionTimeOutDialog();
-
- /**
- * Destructor.
- */
- virtual ~COMASuplSettingsLauncher();
-
- TInt GetIAPName(TDes& aIAPName,TUint32& aIAPId);
-
- protected:
-
- /**
- * Implements CActive
- * @param none
- * @return none
- */
- void RunL();
-
- /**
- * Implements CActive
- * @param aError the error returned
- * @return error
- */
- TInt RunError(TInt aError);
-
- /**
- * Implements CActive
- * @param none
- * @return none
- */
- void DoCancel();
-
- private:
-
- /**
- * Default Constructor
- * @param aCallback Reference to a callback instance.
- * @return None
- */
- COMASuplSettingsLauncher(MOMASuplUISettingsObserver& aCallback);
-
- void ConstructL();
- private:
-
- TInt LaunchIAPDialog();
-
- void ConvertIAPIdtoNameL( const TUint aIAPId,TDes& aIAPName );
- private:
- // not owned by this class
- MOMASuplUISettingsObserver& iCallback;
- // Settings Launcher
- CLocSettingsUiClient* iSettingsLauncher;
-
- //Trace Utility
- COMASuplTrace* iTrace;
-
- TSuplDialogType iDialogType;
-
- RNotifier iNotifier;
- TBuf8<256> buffer1;
- TBuf8<256> buffer2;
- TBool iRoaming;
-
- /**
- * IAP Selector Handle
- */
- // RGenConAgentDialogServer iIapSelector;
-
- /**
- * Selected IAP ID
- */
- TUint32 iSelectedIap;
-
-
- };
-
-
-/**
-* This class provides a callback interface for handling the
-* completion of settings. The Client derives a
-* class from this interface and implements the SettingsUICompleted-methods
-* that interest it.
-*/
-class MOMASuplUISettingsObserver
- {
-
- public:
-
- /**
- * This callback method is used to notify the client about
- * completion of settingsUi Launch
- * @param aError error encountered while launching change
- * @return None
- */
- virtual void SettingsUICompletedL(TInt aError) = 0;
-
- /**
- * This callback method is used to notify the client about
- * completion of settingsUi Launch for SUPL state
- * @param aError error encountered while launching change
- * @return None
- */
-
- virtual void SettingsUsageUICompletedL(TInt aError) = 0;
-
- /**
- * This callback method is used to notify the client about
- * completion of Timeout UI
- * @param aError error encountered while launching change
- * @return None
- */
-
- virtual void SettingsTimeOutUICompletedL(TInt aError) = 0;
-
- };
-
-#endif // C_COMASUPLSETTINGSLAUNCHER_H
-
-// End of File
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplsettingslauncher.cpp Thu Sep 02 20:51:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,344 +0,0 @@
-/*
-* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Active object wrapper for launching Settings UI
-*
-*/
-
-
-
-
-// INCLUDE FILES
-
-#include <e32std.h>
-#include <e32svr.h>
-#include <e32base.h>
-#include <AknNotifierWrapper.h>
-#include <commdb.h> // CommsDatabase
-#include <cmapplicationsettingsui.h>// Access Point Configurator
-#include <cmplugincsddef.h> // For UID of CSD BearerType
-#include <cmpluginpacketdatadef.h> // For UID of Packet data BearerType
-#include <cmmanager.h> // For Conversion from UID to Name and Name to UID
-#include <cmconnectionmethod.h> // For Conversion from UID to Name and Name to UID
-
-#include <locsettingsuiclient.h>
-
-#include "epos_comasupltrace.h"
-#include "epos_comasuplsettingslauncher.h"
-
-_LIT(KTraceFileName,"SUPL_OMA_SESSION::EPos_COMASuplSettingsLauncher.cpp");
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::COMASuplSettingsLauncher
-// C++ constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-COMASuplSettingsLauncher::COMASuplSettingsLauncher(MOMASuplUISettingsObserver& aCallback)
- : CActive(EPriorityStandard),
- iCallback(aCallback)
- {
- CActiveScheduler::Add(this);
- }
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::NewL
-// Two-phased constructor for single key listening.
-// -----------------------------------------------------------------------------
-//
-COMASuplSettingsLauncher* COMASuplSettingsLauncher::NewL(MOMASuplUISettingsObserver& aCallback)
- {
- COMASuplSettingsLauncher* newInstance = NewLC(aCallback);
- CleanupStack::Pop();
- return newInstance;
- }
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::NewLC
-// Two-phased constructor for single key listening. Leaves instance to cleanup stack
-// -----------------------------------------------------------------------------
-//
-COMASuplSettingsLauncher* COMASuplSettingsLauncher::NewLC(MOMASuplUISettingsObserver& aCallback)
- {
- // check for NULL references.
-
- if ( !&aCallback)
- {
- User::Leave(KErrArgument);
- }
-
- COMASuplSettingsLauncher* newInstance = new (ELeave) COMASuplSettingsLauncher( aCallback);
- CleanupStack::PushL( newInstance );
- newInstance->ConstructL();
-
- return newInstance;
- }
-
-// Destructor
-COMASuplSettingsLauncher::~COMASuplSettingsLauncher()
- {
- Cancel();
- delete iSettingsLauncher;
- iNotifier.Close();
- delete iTrace;
- iIapSelector.Close();
- }
-
-
-void COMASuplSettingsLauncher::ConstructL()
- {
- iTrace = COMASuplTrace::NewL();
- iTrace->Trace(_L("COMASuplSettingsLauncher::ConstructL"), KTraceFileName, __LINE__);
- iSettingsLauncher = CLocSettingsUiClient::NewL();
- User::LeaveIfError(iNotifier.Connect());
- // Establish a connection to the RGenConAgentDialogServer
- User::LeaveIfError( iIapSelector.Connect());
-
- }
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::LaunchSettings
-// If already active, just return. Order notification otherwise and set active.
-// -----------------------------------------------------------------------------
-//
-TInt COMASuplSettingsLauncher::LaunchSettings()
- {
- if(IsActive() && iDialogType == ESUPLTimeoutDialog)
- {
- Cancel();
- }
- else if( IsActive() && iDialogType != ESUPLTimeoutDialog)
- {
- return KErrInUse;
- }
-
- TRAPD(error,iSettingsLauncher->LaunchSettingsUiL( TUid::Uid( KLocSUPLSettingsUID ),
- ELocSUPLIAPSelection,
- iStatus ));
-
- iDialogType = ESUPLYesNoDialog;
- SetActive();
-
- return error;
- }
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::CancelLaunch
-// If active, cancel.
-// -----------------------------------------------------------------------------
-//
-void COMASuplSettingsLauncher::CancelLaunch()
- {
- if(IsActive())
- {
- Cancel();
- }
- }
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::RunL
-// Handle notification from CenRep session.
-// -----------------------------------------------------------------------------
-//
-void COMASuplSettingsLauncher::RunL()
- {
- // Handle notification
-
- if(iDialogType == ESUPLYesNoDialog )
- {
- if(iStatus.Int() == KErrNone)
- {
- LaunchIAPDialog();//Launch IAP Dialog
- }
- else
- {
- iCallback.SettingsUICompletedL(iStatus.Int()); // Handle notification
- }
- }
- else if(iDialogType == ESUPLIAPDialog)
- {
- iCallback.SettingsUICompletedL(iStatus.Int()); // Handle notification
- }
-
- else
- if(iDialogType == ESUPLUsageDialog)
- iCallback.SettingsUsageUICompletedL(iStatus.Int()); // Handle notification
- else
- if(iDialogType == ESUPLTimeoutDialog)
- iCallback.SettingsTimeOutUICompletedL(iStatus.Int()); // Handle notification
- }
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::RunError
-// Handle error from CenRep session.
-// -----------------------------------------------------------------------------
-//
-TInt COMASuplSettingsLauncher::RunError(TInt aError)
- {
- if(iDialogType == ESUPLIAPDialog)
- {
- TRAP_IGNORE(iCallback.SettingsUICompletedL(aError));
- }
- else
- if(iDialogType == ESUPLUsageDialog)
- {
- TRAP_IGNORE(iCallback.SettingsUsageUICompletedL(aError));
- }
- if(iDialogType == ESUPLTimeoutDialog)
- {
- TRAP_IGNORE(iCallback.SettingsTimeOutUICompletedL(aError));
- }
- return KErrNone;
- }
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::DoCancel
-// Handle cancel order on this active object.
-// -----------------------------------------------------------------------------
-//
-void COMASuplSettingsLauncher::DoCancel()
- {
- if(IsActive())
- {
- if(iDialogType == ESUPLIAPDialog)
- {
- iSettingsLauncher->CancelLaunchedSettingsUi();
- }
- else
- if(iDialogType == ESUPLTimeoutDialog)
- {
- iNotifier.CancelNotifier(KNotifier3Uid);
- }
- else
- {
- if (iRoaming)
- iNotifier.CancelNotifier(KNotifier2Uid);
- else
- iNotifier.CancelNotifier(KNotifier1Uid);
- }
- }
- }
-
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::LaunchSettings
-// If already active, just return. Order notification otherwise and set active.
-// -----------------------------------------------------------------------------
-//
-TInt COMASuplSettingsLauncher::LaunchSuplUsageSettingsUI(TBool aRoaming)
- {
- if(IsActive())
- {
- return KErrInUse;
- }
-
- iDialogType = ESUPLUsageDialog;
-
- if (aRoaming)
- {
- iTrace->Trace(_L("COMASuplSettingsLauncher::LaunchSuplUsage, user is roaming"),KTraceFileName, __LINE__);
- //SMP Changes
- iRoaming = ETrue;
- iNotifier.StartNotifierAndGetResponse( iStatus, KNotifier2Uid, buffer1, buffer2 );
- }
- else
- {
- iTrace->Trace(_L("COMASuplSettingsLauncher::LaunchSuplUsage, user is not roaming"),KTraceFileName, __LINE__);
- //SMP Changes
- iNotifier.StartNotifierAndGetResponse( iStatus, KNotifier1Uid, buffer1, buffer2 );
- iRoaming = EFalse;
- }
- SetActive();
-
- return KErrNone;
- }
-
-TInt COMASuplSettingsLauncher::LaunchSessionTimeOutDialog()
- {
- if(IsActive())
- {
- Cancel();
- }
- iDialogType = ESUPLTimeoutDialog;
- iTrace->Trace(_L("COMASuplSettingsLauncher::LaunchSessionTimeOutDialog"),KTraceFileName, __LINE__);
- iNotifier.StartNotifierAndGetResponse( iStatus, KNotifier3Uid, buffer1, buffer2 );
- SetActive();
- return KErrNone;
- }
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::LaunchIAPDialog
-// If already active, just return. Order notification otherwise and set active.
-// -----------------------------------------------------------------------------
-//
-
-TInt COMASuplSettingsLauncher::LaunchIAPDialog()
- {
- if(IsActive())
- {
- return KErrInUse;
- }
-
- iDialogType = ESUPLIAPDialog;
-
- TConnectionPrefs prefs; // filtering conditions for the access points list
- prefs.iRank = 1;
- prefs.iDirection = ECommDbConnectionDirectionOutgoing;
- prefs.iBearerSet = KUidCSDBearerType | KUidPacketDataBearerType;
-
- // Launch the IAP Selector
- iStatus = KRequestPending;
- iIapSelector.IapConnection( iSelectedIap, prefs, iStatus );
- SetActive();
- return KErrNone;
- }
-
-
-TInt COMASuplSettingsLauncher::GetIAPName(TDes& aIAPName,TUint32& aIAPId)
- {
- TRAPD( error, ConvertIAPIdtoNameL( iSelectedIap,aIAPName ));
- aIAPId = iSelectedIap;
- return error;
- }
-
-// ---------------------------------------------------------------------------
-// TUint CLocSUPLSettingsUiEngine::ConvertIAPIdtoNameL()
-// Convert IAP ID to IAP Name. If a valid name exists for the IAP Id
-// then the name would be copied into the aIAPName field
-//
-// @param aIAPId The IAP Id of the Access point
-// @param aIAPName The name field corresponding to the Access
-// point.
-// ---------------------------------------------------------------------------
-//
-void COMASuplSettingsLauncher::ConvertIAPIdtoNameL( const TUint aIAPId,
- TDes& aIAPName )
- {
- // Create the ApSelect handle
- CCommsDatabase* commdb = CCommsDatabase::NewL();
- CleanupStack::PushL( commdb );
-
- // Open the IAP table on the IAP Field
- CCommsDbTableView* table = commdb->OpenViewMatchingUintLC( TPtrC( IAP ),
- TPtrC( COMMDB_ID ),
- aIAPId );
- User::LeaveIfError( table->GotoFirstRecord() );
- table->ReadTextL( TPtrC( COMMDB_NAME ), aIAPName );
-
- // Pop and Destroy all the local objects
- CleanupStack::PopAndDestroy( table );
- CleanupStack::PopAndDestroy( commdb );
- }
-
-// End of File
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/group/omasuplprotocolhandler2.mmp Thu Sep 02 20:51:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/group/omasuplprotocolhandler2.mmp Mon Oct 04 00:45:15 2010 +0300
@@ -52,7 +52,6 @@
SOURCE epos_comasuplinitstate.cpp
SOURCE epos_comasuplposrequestor.cpp
SOURCE epos_comasuplecomeventwatcher.cpp
-//SOURCE epos_comasuplsettingslauncher.cpp
SOURCE epos_comasupltrace.cpp
SOURCE epos_comasupldialogtimer.cpp
SOURCE epos_comasuplfallbackhandler.cpp
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplprotocolmanager2.h Thu Sep 02 20:51:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplprotocolmanager2.h Mon Oct 04 00:45:15 2010 +0300
@@ -31,7 +31,7 @@
#include "epos_msuplpacketnotifier.h"
#include "epos_momasuplecomeventobserver.h"
-#include "epos_comasuplsettingslauncher.h"
+
#include "epos_csuplsettingsinternal.h"
#include "epos_comasuplsession2.h"
#include "epos_comasuplasnbase.h"
@@ -81,7 +81,6 @@
public MOMASuplSessionObserver,
public MSuplSettingsObserver,
public MOMASuplTimeOutNotifier,
- public MOMASuplUISettingsObserver,
public MOMASuplETelNotifierObserver,
public MSuplSessionObserver
{
@@ -593,8 +592,6 @@
TRequestStatus* iInitilizationRequestStatus;
- // Settings UI Handle
- COMASuplSettingsLauncher* iSettingsLauncher;
COMASuplETelNotifier* iNotifier;
// Session Observer for UI completion
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplsession2.h Thu Sep 02 20:51:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplsession2.h Mon Oct 04 00:45:15 2010 +0300
@@ -45,7 +45,6 @@
#include "epos_comasuplcompleteselfrequestor.h"
#include "epos_comasuplstate.h"
#include "epos_omasuplconstants.h"
-#include "epos_comasuplsettingslauncher.h"
#include "epos_momasupltimeoutnotifier.h"
#include "epos_tomasuplposmethod.h"
#include "epos_momasupldialogtimeoutnotifier.h"
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplsettingslauncher.h Thu Sep 02 20:51:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,210 +0,0 @@
-/*
-* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Active object wrapper for launching Settings UI
-*
-*/
-
-
-
-#ifndef C_COMASUPLSETTINGSLAUNCHER_H
-#define C_COMASUPLSETTINGSLAUNCHER_H
-
-// INCLUDES
-#include <e32std.h>
-//#include <agentdialog.h> // for RGenConAgentDialogServer
-
-const TUid KNotifier1Uid = { 0x10009C00 };
-const TUid KNotifier2Uid = { 0x10009C01 };
-const TUid KNotifier3Uid = { 0x10009C02 };
-// FORWARD DECLARATIONS
-class MOMASuplUISettingsObserver;
-class CLocSettingsUiClient;
-class COMASuplTrace;
-/**
-* Active object wrapper for launching Supl Settings UI.
-* User of this class needs to implement relevant MOMASuplUISettingsObserver interface
-* methods to receive notifications.
-*/
-class COMASuplSettingsLauncher : public CActive
- {
- public:
-
- enum TSuplDialogType
- {
- ESUPLYesNoDialog = 0,
- ESUPLIAPDialog,
- ESUPLUsageDialog,
- ESUPLTimeoutDialog
- };
- /**
- * This is a two-phase constructor method that is used to
- * create a new instance for launching settings UI
- *
- * @param aCallback Reference to a callback instance.
- * @return A pointer to a new instance of the COMASuplSettingsLauncher class.
- */
- static COMASuplSettingsLauncher* NewL(MOMASuplUISettingsObserver& aCallback);
-
- /**
- * This is a two-phase constructor method that is used to create a new
- * instance for launching settings UI
- * Leaves the constructed instance to cleanup stack.
- *
- * @param aCallback Reference to a callback instance.
- * @return A pointer to a new instance of the COMASuplSettingsLauncher class.
- */
- static COMASuplSettingsLauncher* NewLC(MOMASuplUISettingsObserver& aCallback);
- /**
- * When this method is called, the COMASuplSettingsLauncher launches the
- * settings UI
- *
- * @throws error code depending on whether launch was successful or failed
- */
- TInt LaunchSettings();
-
- /**
- * When this method is called, the COMASuplSettingsLauncher cancels the
- * launch if it has not been already launched
- */
- void CancelLaunch();
-
- /**
- * When this method is called, the COMASuplSettingsLauncher launches the
- * settings UI
- *
- * @throws error code depending on whether launch was successful or failed
- */
- TInt LaunchSuplUsageSettingsUI(TBool aRoaming);
- /* Launches the Dialog saying one or more location requests were cancelled
- */
-
- TInt LaunchSessionTimeOutDialog();
-
- /**
- * Destructor.
- */
- virtual ~COMASuplSettingsLauncher();
-
- TInt GetIAPName(TDes& aIAPName,TUint32& aIAPId);
-
- protected:
-
- /**
- * Implements CActive
- * @param none
- * @return none
- */
- void RunL();
-
- /**
- * Implements CActive
- * @param aError the error returned
- * @return error
- */
- TInt RunError(TInt aError);
-
- /**
- * Implements CActive
- * @param none
- * @return none
- */
- void DoCancel();
-
- private:
-
- /**
- * Default Constructor
- * @param aCallback Reference to a callback instance.
- * @return None
- */
- COMASuplSettingsLauncher(MOMASuplUISettingsObserver& aCallback);
-
- void ConstructL();
- private:
-
- TInt LaunchIAPDialog();
-
- void ConvertIAPIdtoNameL( const TUint aIAPId,TDes& aIAPName );
- private:
- // not owned by this class
- MOMASuplUISettingsObserver& iCallback;
- // Settings Launcher
- CLocSettingsUiClient* iSettingsLauncher;
-
- //Trace Utility
- COMASuplTrace* iTrace;
-
- TSuplDialogType iDialogType;
-
- RNotifier iNotifier;
- TBuf8<256> buffer1;
- TBuf8<256> buffer2;
- TBool iRoaming;
-
- /**
- * IAP Selector Handle
- */
- // RGenConAgentDialogServer iIapSelector;
-
- /**
- * Selected IAP ID
- */
- TUint32 iSelectedIap;
-
-
- };
-
-
-/**
-* This class provides a callback interface for handling the
-* completion of settings. The Client derives a
-* class from this interface and implements the SettingsUICompleted-methods
-* that interest it.
-*/
-class MOMASuplUISettingsObserver
- {
-
- public:
-
- /**
- * This callback method is used to notify the client about
- * completion of settingsUi Launch
- * @param aError error encountered while launching change
- * @return None
- */
- virtual void SettingsUICompletedL(TInt aError) = 0;
-
- /**
- * This callback method is used to notify the client about
- * completion of settingsUi Launch for SUPL state
- * @param aError error encountered while launching change
- * @return None
- */
-
- virtual void SettingsUsageUICompletedL(TInt aError) = 0;
-
- /**
- * This callback method is used to notify the client about
- * completion of Timeout UI
- * @param aError error encountered while launching change
- * @return None
- */
-
- virtual void SettingsTimeOutUICompletedL(TInt aError) = 0;
-
- };
-
-#endif // C_COMASUPLSETTINGSLAUNCHER_H
-
-// End of File
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplsettingslauncher.cpp Thu Sep 02 20:51:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,343 +0,0 @@
-/*
-* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Active object wrapper for launching Settings UI
-*
-*/
-
-
-
-
-// INCLUDE FILES
-
-#include <e32std.h>
-#include <e32svr.h>
-#include <e32base.h>
-#include <AknNotifierWrapper.h>
-#include <commdb.h> // CommsDatabase
-#include <cmapplicationsettingsui.h>// Access Point Configurator
-#include <cmplugincsddef.h> // For UID of CSD BearerType
-#include <cmpluginpacketdatadef.h> // For UID of Packet data BearerType
-#include <cmmanager.h> // For Conversion from UID to Name and Name to UID
-#include <cmconnectionmethod.h> // For Conversion from UID to Name and Name to UID
-
-#include <locsettingsuiclient.h>
-
-#include "epos_comasupltrace.h"
-#include "epos_comasuplsettingslauncher.h"
-
-_LIT(KTraceFileName,"SUPL_OMA_SESSION::EPos_COMASuplSettingsLauncher.cpp");
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::COMASuplSettingsLauncher
-// C++ constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-COMASuplSettingsLauncher::COMASuplSettingsLauncher(MOMASuplUISettingsObserver& aCallback)
- : CActive(EPriorityStandard),
- iCallback(aCallback)
- {
- CActiveScheduler::Add(this);
- }
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::NewL
-// Two-phased constructor for single key listening.
-// -----------------------------------------------------------------------------
-//
-COMASuplSettingsLauncher* COMASuplSettingsLauncher::NewL(MOMASuplUISettingsObserver& aCallback)
- {
- COMASuplSettingsLauncher* newInstance = NewLC(aCallback);
- CleanupStack::Pop();
- return newInstance;
- }
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::NewLC
-// Two-phased constructor for single key listening. Leaves instance to cleanup stack
-// -----------------------------------------------------------------------------
-//
-COMASuplSettingsLauncher* COMASuplSettingsLauncher::NewLC(MOMASuplUISettingsObserver& aCallback)
- {
- // check for NULL references.
-
- if ( !&aCallback)
- {
- User::Leave(KErrArgument);
- }
-
- COMASuplSettingsLauncher* newInstance = new (ELeave) COMASuplSettingsLauncher( aCallback);
- CleanupStack::PushL( newInstance );
- newInstance->ConstructL();
-
- return newInstance;
- }
-
-// Destructor
-COMASuplSettingsLauncher::~COMASuplSettingsLauncher()
- {
- Cancel();
- delete iSettingsLauncher;
- iNotifier.Close();
- delete iTrace;
- iIapSelector.Close();
- }
-
-
-void COMASuplSettingsLauncher::ConstructL()
- {
- iTrace = COMASuplTrace::NewL();
- iTrace->Trace(_L("COMASuplSettingsLauncher::ConstructL"), KTraceFileName, __LINE__);
- iSettingsLauncher = CLocSettingsUiClient::NewL();
- User::LeaveIfError(iNotifier.Connect());
- // Establish a connection to the RGenConAgentDialogServer
- User::LeaveIfError( iIapSelector.Connect());
-
- }
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::LaunchSettings
-// If already active, just return. Order notification otherwise and set active.
-// -----------------------------------------------------------------------------
-//
-TInt COMASuplSettingsLauncher::LaunchSettings()
- {
- if(IsActive() && iDialogType == ESUPLTimeoutDialog)
- {
- Cancel();
- }
- else if( IsActive() && iDialogType != ESUPLTimeoutDialog)
- {
- return KErrInUse;
- }
-
- TRAPD(error,iSettingsLauncher->LaunchSettingsUiL( TUid::Uid( KLocSUPLSettingsUID ),
- ELocSUPLIAPSelection,
- iStatus ));
-
- iDialogType = ESUPLYesNoDialog;
- SetActive();
-
- return error;
- }
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::CancelLaunch
-// If active, cancel.
-// -----------------------------------------------------------------------------
-//
-void COMASuplSettingsLauncher::CancelLaunch()
- {
- if(IsActive())
- {
- Cancel();
- }
- }
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::RunL
-// Handle notification from CenRep session.
-// -----------------------------------------------------------------------------
-//
-void COMASuplSettingsLauncher::RunL()
- {
- // Handle notification
-
- if(iDialogType == ESUPLYesNoDialog )
- {
- if(iStatus.Int() == KErrNone)
- {
- LaunchIAPDialog();//Launch IAP Dialog
- }
- else
- {
- iCallback.SettingsUICompletedL(iStatus.Int()); // Handle notification
- }
- }
- else if(iDialogType == ESUPLIAPDialog)
- {
- iCallback.SettingsUICompletedL(iStatus.Int()); // Handle notification
- }
-
- else
- if(iDialogType == ESUPLUsageDialog)
- iCallback.SettingsUsageUICompletedL(iStatus.Int()); // Handle notification
- else
- if(iDialogType == ESUPLTimeoutDialog)
- iCallback.SettingsTimeOutUICompletedL(iStatus.Int()); // Handle notification
- }
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::RunError
-// Handle error from CenRep session.
-// -----------------------------------------------------------------------------
-//
-TInt COMASuplSettingsLauncher::RunError(TInt aError)
- {
- if(iDialogType == ESUPLIAPDialog)
- {
- TRAP_IGNORE(iCallback.SettingsUICompletedL(aError));
- }
- else
- if(iDialogType == ESUPLUsageDialog)
- {
- TRAP_IGNORE(iCallback.SettingsUsageUICompletedL(aError));
- }
- if(iDialogType == ESUPLTimeoutDialog)
- {
- TRAP_IGNORE(iCallback.SettingsTimeOutUICompletedL(aError));
- }
- return KErrNone;
- }
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::DoCancel
-// Handle cancel order on this active object.
-// -----------------------------------------------------------------------------
-//
-void COMASuplSettingsLauncher::DoCancel()
- {
- if(IsActive())
- {
- if(iDialogType == ESUPLIAPDialog)
- {
- iSettingsLauncher->CancelLaunchedSettingsUi();
- }
- else
- if(iDialogType == ESUPLTimeoutDialog)
- {
- iNotifier.CancelNotifier(KNotifier3Uid);
- }
- else
- {
- if (iRoaming)
- iNotifier.CancelNotifier(KNotifier2Uid);
- else
- iNotifier.CancelNotifier(KNotifier1Uid);
- }
- }
- }
-
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::LaunchSettings
-// If already active, just return. Order notification otherwise and set active.
-// -----------------------------------------------------------------------------
-//
-TInt COMASuplSettingsLauncher::LaunchSuplUsageSettingsUI(TBool aRoaming)
- {
- if(IsActive())
- {
- return KErrInUse;
- }
-
- iDialogType = ESUPLUsageDialog;
-
-
- if (aRoaming)
- {
- iTrace->Trace(_L("COMASuplSettingsLauncher::LaunchSuplUsage, user is roaming"),KTraceFileName, __LINE__);
- iNotifier.StartNotifierAndGetResponse( iStatus, KNotifier2Uid, buffer1, buffer2 );
- iRoaming = ETrue;
- }
- else
- {
- iTrace->Trace(_L("COMASuplSettingsLauncher::LaunchSuplUsage, user is not roaming"),KTraceFileName, __LINE__);
- iNotifier.StartNotifierAndGetResponse( iStatus, KNotifier1Uid, buffer1, buffer2 );
- iRoaming = EFalse;
- }
- SetActive();
-
- return KErrNone;
- }
-
-TInt COMASuplSettingsLauncher::LaunchSessionTimeOutDialog()
- {
- if(IsActive())
- {
- Cancel();
- }
- iDialogType = ESUPLTimeoutDialog;
- iTrace->Trace(_L("COMASuplSettingsLauncher::LaunchSessionTimeOutDialog"),KTraceFileName, __LINE__);
- iNotifier.StartNotifierAndGetResponse( iStatus, KNotifier3Uid, buffer1, buffer2 );
- SetActive();
- return KErrNone;
- }
-
-// -----------------------------------------------------------------------------
-// COMASuplSettingsLauncher::LaunchIAPDialog
-// If already active, just return. Order notification otherwise and set active.
-// -----------------------------------------------------------------------------
-//
-
-TInt COMASuplSettingsLauncher::LaunchIAPDialog()
- {
- if(IsActive())
- {
- return KErrInUse;
- }
-
- iDialogType = ESUPLIAPDialog;
-
- TConnectionPrefs prefs; // filtering conditions for the access points list
- prefs.iRank = 1;
- prefs.iDirection = ECommDbConnectionDirectionOutgoing;
- prefs.iBearerSet = KUidCSDBearerType | KUidPacketDataBearerType;
-
- // Launch the IAP Selector
- iStatus = KRequestPending;
- iIapSelector.IapConnection( iSelectedIap, prefs, iStatus );
- SetActive();
- return KErrNone;
- }
-
-
-TInt COMASuplSettingsLauncher::GetIAPName(TDes& aIAPName,TUint32& aIAPId)
- {
- TRAPD( error, ConvertIAPIdtoNameL( iSelectedIap,aIAPName ));
- aIAPId = iSelectedIap;
- return error;
- }
-
-// ---------------------------------------------------------------------------
-// TUint CLocSUPLSettingsUiEngine::ConvertIAPIdtoNameL()
-// Convert IAP ID to IAP Name. If a valid name exists for the IAP Id
-// then the name would be copied into the aIAPName field
-//
-// @param aIAPId The IAP Id of the Access point
-// @param aIAPName The name field corresponding to the Access
-// point.
-// ---------------------------------------------------------------------------
-//
-void COMASuplSettingsLauncher::ConvertIAPIdtoNameL( const TUint aIAPId,
- TDes& aIAPName )
- {
- // Create the ApSelect handle
- CCommsDatabase* commdb = CCommsDatabase::NewL();
- CleanupStack::PushL( commdb );
-
- // Open the IAP table on the IAP Field
- CCommsDbTableView* table = commdb->OpenViewMatchingUintLC( TPtrC( IAP ),
- TPtrC( COMMDB_ID ),
- aIAPId );
- User::LeaveIfError( table->GotoFirstRecord() );
- table->ReadTextL( TPtrC( COMMDB_NAME ), aIAPName );
-
- // Pop and Destroy all the local objects
- CleanupStack::PopAndDestroy( table );
- CleanupStack::PopAndDestroy( commdb );
- }
-
-// End of File