diff -r 2f8f8080a020 -r ebdbd102c78a phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetengine/src/ut_infowidgetengine.cpp --- a/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetengine/src/ut_infowidgetengine.cpp Mon May 03 12:31:11 2010 +0300 +++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetengine/src/ut_infowidgetengine.cpp Fri May 14 15:51:57 2010 +0300 @@ -23,6 +23,8 @@ #include "infowidgetnetworkhandler.h" #include "infowidgetsathandler.h" +const QString KSpnName("Spn name"); // + const QString KHomeZoneTextTag("HomeZoneText0"); // max length 13 const TNWViagIndicatorType KHomeZoneIndicatorType = ENWViagIndicatorTypeHomeZone; @@ -60,13 +62,22 @@ SmcDefaultValue::SetL(""); EXPECT(InfoWidgetNetworkHandler::logCurrentInfo); - EXPECT(InfoWidgetNetworkHandler::homeZoneTextTag) - .returns(KHomeZoneTextTag); - EXPECT(InfoWidgetNetworkHandler::homeZoneIndicatorType) - .returns(KHomeZoneIndicatorType); + EXPECT(InfoWidgetNetworkHandler::isOnline) + .returns(true); + + EXPECT(InfoWidgetNetworkHandler::serviceProviderName) + .returns(KSpnName); + EXPECT(InfoWidgetNetworkHandler::serviceProviderNameDisplayRequired) + .returns(true); + EXPECT(InfoWidgetNetworkHandler::mcnName).returns(KMcnName); EXPECT(InfoWidgetNetworkHandler::mcnIndicatorType) .returns(KMcnIndicatorType); + + EXPECT(InfoWidgetNetworkHandler::homeZoneIndicatorType) + .returns(KHomeZoneIndicatorType); + EXPECT(InfoWidgetNetworkHandler::homeZoneTextTag) + .returns(KHomeZoneTextTag); m_infoWidgetEngine = new InfoWidgetEngine(); @@ -90,6 +101,8 @@ void UT_InfoWidgetEngine::t_modelData() { const InfoWidgetEngine::ModelData& data = m_infoWidgetEngine->modelData(); + QVERIFY(data.serviceProviderName() == KSpnName); + QVERIFY(data.serviceProviderNameDisplayRequired() == true); QVERIFY(data.homeZoneTextTag() == KHomeZoneTextTag); QVERIFY(data.homeZoneIndicatorType() == KHomeZoneIndicatorType); QVERIFY(data.mcnName() == KMcnName); @@ -101,24 +114,58 @@ */ void UT_InfoWidgetEngine::t_updateNetworkDataToModel() { + // Test: network status is online EXPECT(InfoWidgetNetworkHandler::logCurrentInfo); - EXPECT(InfoWidgetNetworkHandler::homeZoneTextTag) - .returns(KHomeZoneTextTag); - EXPECT(InfoWidgetNetworkHandler::homeZoneIndicatorType) - .returns(KHomeZoneIndicatorType); + EXPECT(InfoWidgetNetworkHandler::isOnline) + .returns(true); + + EXPECT(InfoWidgetNetworkHandler::serviceProviderName) + .returns(KSpnName); + EXPECT(InfoWidgetNetworkHandler::serviceProviderNameDisplayRequired) + .returns(true); + EXPECT(InfoWidgetNetworkHandler::mcnName).returns(KMcnName); EXPECT(InfoWidgetNetworkHandler::mcnIndicatorType) .returns(KMcnIndicatorType); + + EXPECT(InfoWidgetNetworkHandler::homeZoneIndicatorType) + .returns(KHomeZoneIndicatorType); + EXPECT(InfoWidgetNetworkHandler::homeZoneTextTag) + .returns(KHomeZoneTextTag); + QSignalSpy spy(m_infoWidgetEngine, SIGNAL(modelChanged())); - m_infoWidgetEngine->updateNetworkDataToModel(); const int KExpectedNumOfSignalEmissions = 1; QCOMPARE(spy.count(), KExpectedNumOfSignalEmissions); - const QList &arguments = spy.at(0); + const QList &arguments = spy.takeFirst(); QCOMPARE(arguments.count(), 0); QVERIFY(verify()); + + // Test: network status is offline + EXPECT(InfoWidgetNetworkHandler::logCurrentInfo); + EXPECT(InfoWidgetNetworkHandler::isOnline) + .returns(false); + EXPECT(InfoWidgetNetworkHandler::serviceProviderName).times(0); + EXPECT(InfoWidgetNetworkHandler::serviceProviderNameDisplayRequired).times(0); + EXPECT(InfoWidgetNetworkHandler::mcnName).times(0); + EXPECT(InfoWidgetNetworkHandler::mcnIndicatorType).times(0); + EXPECT(InfoWidgetNetworkHandler::homeZoneIndicatorType).times(0); + EXPECT(InfoWidgetNetworkHandler::homeZoneTextTag).times(0); + + m_infoWidgetEngine->updateNetworkDataToModel(); + QCOMPARE(spy.count(), KExpectedNumOfSignalEmissions); + const QList &arguments2 = spy.takeFirst(); + QCOMPARE(arguments2.count(), 0); + + QVERIFY(verify()); + + const InfoWidgetEngine::ModelData& data = m_infoWidgetEngine->modelData(); + QVERIFY(data.serviceProviderName() == QString("")); + QVERIFY(data.homeZoneTextTag() == QString("")); + QVERIFY(data.mcnName() == QString("")); + } /*!