--- a/phoneengine/phoneservices/tsrc/ut_phoneservices/unit_tests.cpp Wed Jun 23 18:12:20 2010 +0300
+++ b/phoneengine/phoneservices/tsrc/ut_phoneservices/unit_tests.cpp Tue Jul 06 14:15:47 2010 +0300
@@ -16,18 +16,22 @@
*/
#include <QtTest/QtTest>
-
-//#include <hbglobal_p.h>
#include "phoneservices.h"
#include "dialservice.h"
#include "dtmfservice.h"
+#include "urischemehandlerservice.h"
-bool m_dialServiceConstructed;
-bool m_dtmfServiceConstructed;
-MPECallControlIF* m_dialServiceCallPointer;
-MPECallSettersIF* m_dialServiceParameterPointer;
-MPECallControlIF* m_dtmfServiceCallPointer;
-MPECallSettersIF* m_dtmfServiceParameterPointer;
+bool g_dialServiceConstructed;
+MPECallControlIF* g_dialServiceCallPointer;
+MPECallSettersIF* g_dialServiceParameterPointer;
+
+bool g_dtmfServiceConstructed;
+MPECallControlIF* g_dtmfServiceCallPointer;
+MPECallSettersIF* g_dtmfServiceParameterPointer;
+
+bool g_uriSchemeHandlerServiceConstructed;
+MPECallControlIF* g_uriSchemeServiceCallPointer;
+MPECallSettersIF* g_uriSchemeServiceParameterPointer;
class TestPhoneServices
:
@@ -78,9 +82,9 @@
DialService::DialService(MPECallControlIF &call, MPECallSettersIF ¶meters, QObject* parent) :
XQServiceProvider(QLatin1String("com.nokia.symbian.ICallDial"), parent), m_call (call), m_parameters (parameters)
{
- m_dialServiceConstructed = true;
- m_dialServiceCallPointer = &call;
- m_dialServiceParameterPointer = ¶meters;
+ g_dialServiceConstructed = true;
+ g_dialServiceCallPointer = &call;
+ g_dialServiceParameterPointer = ¶meters;
}
DialService::~DialService()
@@ -89,59 +93,59 @@
int DialService::dial(const QString& number)
{
- Q_UNUSED(number);
+ Q_UNUSED(number)
return 0;
}
int DialService::dial(const QString& number, int contactId)
{
- Q_UNUSED(number);
- Q_UNUSED (contactId);
+ Q_UNUSED(number)
+ Q_UNUSED (contactId)
return 0;
}
void DialService::dialVideo(const QString& number)
{
- Q_UNUSED(number);
+ Q_UNUSED(number)
}
void DialService::dialVideo(const QString& number, int contactId)
{
- Q_UNUSED(number);
- Q_UNUSED(contactId);
+ Q_UNUSED(number)
+ Q_UNUSED(contactId)
}
void DialService::dialVoip(const QString& address)
{
-Q_UNUSED(address);
+ Q_UNUSED(address)
}
void DialService::dialVoip(const QString& address, int contactId)
{
-Q_UNUSED(address);
-Q_UNUSED(contactId);
+ Q_UNUSED(address)
+ Q_UNUSED(contactId)
}
void DialService::dialVoipService(const QString& address, int serviceId)
{
-Q_UNUSED(address);
-Q_UNUSED(serviceId);
+ Q_UNUSED(address)
+ Q_UNUSED(serviceId)
}
void DialService::dialVoipService(
const QString& address, int serviceId, int contactId)
{
-Q_UNUSED(address);
-Q_UNUSED(serviceId);
-Q_UNUSED(contactId);
+ Q_UNUSED(address)
+ Q_UNUSED(serviceId)
+ Q_UNUSED(contactId)
}
DTMFService::DTMFService(MPECallControlIF &call, MPECallSettersIF ¶meters, QObject* parent) :
XQServiceProvider(QLatin1String("com.nokia.symbian.IDtmfPlay"), parent), m_call (call), m_parameters (parameters)
{
- m_dtmfServiceConstructed = true;
- m_dtmfServiceCallPointer = &call;
- m_dtmfServiceParameterPointer = ¶meters;
+ g_dtmfServiceConstructed = true;
+ g_dtmfServiceCallPointer = &call;
+ g_dtmfServiceParameterPointer = ¶meters;
}
DTMFService::~DTMFService()
@@ -150,13 +154,37 @@
void DTMFService::playDTMFTone(const QChar& keyToPlay)
{
- Q_UNUSED(keyToPlay);
+ Q_UNUSED(keyToPlay)
}
void DTMFService::stopDTMFPlay()
{
}
+UriSchemeHandlerService::UriSchemeHandlerService(
+ MPECallControlIF &call, MPECallSettersIF ¶meters, QObject* parent)
+ :
+ XQServiceProvider(
+ QLatin1String("phoneui.com.nokia.symbian.IUriView"), parent),
+ m_callControlIf(call),
+ m_callParameters(parameters)
+{
+ g_uriSchemeHandlerServiceConstructed = true;
+ g_uriSchemeServiceCallPointer = &call;
+ g_uriSchemeServiceParameterPointer = ¶meters;
+}
+
+UriSchemeHandlerService::~UriSchemeHandlerService()
+{
+
+}
+
+bool UriSchemeHandlerService::view(const QString &uri)
+{
+ Q_UNUSED(uri)
+ return true;
+}
+
TestPhoneServices::TestPhoneServices ()
{
}
@@ -185,18 +213,26 @@
m_handlePlayDTMFLCalled = false;
m_setKeyCodeCalled = false;
keyValue = -1;
- m_dialServiceConstructed = false;
- m_dtmfServiceConstructed = false;
+ g_dialServiceConstructed = false;
+ g_dtmfServiceConstructed = false;
+
+ g_uriSchemeHandlerServiceConstructed = false;
+ g_uriSchemeServiceCallPointer = NULL;
+ g_uriSchemeServiceParameterPointer = NULL;
m_phoneServices = new PhoneServices(*this, *this, this);
- QVERIFY(m_dialServiceConstructed == true);
- QVERIFY(m_dialServiceCallPointer == this);
- QVERIFY(m_dialServiceParameterPointer == this);
+ QVERIFY(g_dialServiceConstructed == true);
+ QVERIFY(g_dialServiceCallPointer == this);
+ QVERIFY(g_dialServiceParameterPointer == this);
- QVERIFY(m_dtmfServiceConstructed == true);
- QVERIFY(m_dtmfServiceCallPointer == this);
- QVERIFY(m_dtmfServiceParameterPointer == this);
+ QVERIFY(g_dtmfServiceConstructed == true);
+ QVERIFY(g_dtmfServiceCallPointer == this);
+ QVERIFY(g_dtmfServiceParameterPointer == this);
+
+ QVERIFY(g_uriSchemeHandlerServiceConstructed == true);
+ QVERIFY(g_uriSchemeServiceCallPointer == this);
+ QVERIFY(g_uriSchemeServiceParameterPointer == this);
}
void TestPhoneServices::cleanup ()