diff -r bab96b7ed1a4 -r f39ed5e045e0 phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonenotes/ut_cpphonenotes.cpp --- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonenotes/ut_cpphonenotes.cpp Tue Jun 15 14:14:38 2010 +0100 +++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonenotes/ut_cpphonenotes.cpp Thu Jul 22 16:33:21 2010 +0100 @@ -20,6 +20,7 @@ #include #include #include +#include #define private public #include "cpphonenotes.h" @@ -138,12 +139,21 @@ } /*! + UT_CpPhoneNotes::t_showNotificationDialog + */ +void UT_CpPhoneNotes::t_showNotificationDialog() +{ + CpPhoneNotes::instance()->showNotificationDialog("NotificationDialog"); +} + +/*! UT_CpPhoneNotes::t_showProgressNote */ void UT_CpPhoneNotes::t_showProgressNote() { - CpPhoneNotes::instance()->showGlobalProgressNote(m_noteid1, "test"); - CpPhoneNotes::instance()->showGlobalProgressNote(m_noteid2, "test"); + CpPhoneNotes::instance()->showGlobalProgressNote(m_noteid1, "testshowProgressNote1"); + QTest::qWait(5000); + CpPhoneNotes::instance()->showGlobalProgressNote(m_noteid2, "testshowProgressNote2"); QTest::qWait(5000); } @@ -152,7 +162,10 @@ */ void UT_CpPhoneNotes::t_showGlobalProgressNote() { - CpPhoneNotes::instance()->showGlobalProgressNote(m_noteid1, "test"); + CpPhoneNotes::instance()->showGlobalProgressNote(m_noteid1, "testshowGPN"); + QTest::qWait(5000); + CpPhoneNotes::instance()->showGlobalProgressNote(m_noteid2, + hbTrId("txt_common_info_requesting")); QTest::qWait(5000); } @@ -180,17 +193,6 @@ } -/*! - UT_CpPhoneNotes::t_showBasicServiceList - */ -void UT_CpPhoneNotes::t_showBasicServiceList() -{ - QList basicServiceGroupIds; - basicServiceGroupIds << Telephony; - basicServiceGroupIds << AllDataTele; - CpPhoneNotes::instance()-> - showBasicServiceList("Basic Service List", basicServiceGroupIds ); -} /*! UT_CpPhoneNotes::t_showCallDivertDetails @@ -230,7 +232,7 @@ void UT_CpPhoneNotes::t_cancelNote() { CpPhoneNotes::instance()->cancelNote(m_noteid1); - CpPhoneNotes::instance()->showGlobalProgressNote(m_noteid1, "test"); + CpPhoneNotes::instance()->showGlobalProgressNote(m_noteid1, "testcancelNote"); CpPhoneNotes::instance()->noteShowing(); CpPhoneNotes::instance()->cancelNote(m_noteid1);