--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_networkpluginform.cpp	Tue Jun 15 14:14:38 2010 +0100
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_networkpluginform.cpp	Thu Jul 22 16:33:21 2010 +0100
@@ -17,9 +17,11 @@
 
 #include "ut_networkpluginform.h"
 #include "qtestmains60ui.h"
+#include "cpitemdatahelper.h"
+#include "psetwrapper.h"
 #define private public
 #include "cpnetworkpluginform.h"
-#include "cpitemdatahelper.h"
+
 
 class CPsetContainer
 {
@@ -28,6 +30,13 @@
     ~CPsetContainer(){};
 };
 
+const QString KIconGsmForbidden("qtg_small_network_off"); 
+const QString KIconGsmNotForbidden("qtg_small_network");
+const QString KIconWcdmaForbidden("qtg_small_wcdma_off"); 
+const QString KIconWcdmaNotForbidden("qtg_small_wcdma");
+const QString KIconGsmAndWcdmaForbidden("qtg_small_pd_wcdma_off"); 
+const QString KIconGsmAndWcdmaNotForbidden("qtg_small_pd_wcdma");
+
 /*!
   UT_CpNetworkPluginForm::UT_CpNetworkPluginForm
  */
@@ -56,6 +65,7 @@
     CPsetContainer tmpPsetContainer;
     m_networkWrapper = new PSetNetworkWrapper(tmpPsetContainer);
     expect("PSetWrapper::networkWrapper").returns(m_networkWrapper);
+    expect("PSetNetworkWrapper::isManualNetworkSelectionSupported").returns(true);
     if(i) {
         m_NetworkSelectionMode = PSetNetworkWrapper::SelectionModeAutomatic;
     } else {
@@ -87,6 +97,8 @@
     
     expect("CpSettingsWrapper::isPhoneOffline").returns(true);
     m_networkPluginForm->networkModeStateChanged(0);
+    
+    QVERIFY(verify());
 }
 
 /*!
@@ -97,15 +109,17 @@
     expect("CpSettingsWrapper::isPhoneOffline").returns(false);
     m_NetworkSelectionMode = PSetNetworkWrapper::SelectionModeAutomatic;
     expect("PSetNetworkWrapper::getNetworkSelectionMode").willOnce(invoke(this, &updateNetworkSelectionMode));
-    m_networkPluginForm->operatorSelectionStateChanged(true);
+    m_networkPluginForm->operatorSelectionStateChanged();
 
     expect("CpSettingsWrapper::isPhoneOffline").returns(false);
     m_NetworkSelectionMode = PSetNetworkWrapper::SelectionModeManual;
     expect("PSetNetworkWrapper::getNetworkSelectionMode").willOnce(invoke(this, &updateNetworkSelectionMode));
-    m_networkPluginForm->operatorSelectionStateChanged(true);
+    m_networkPluginForm->operatorSelectionStateChanged();
     
     expect("CpSettingsWrapper::isPhoneOffline").returns(true);
-    m_networkPluginForm->operatorSelectionStateChanged(true);
+    m_networkPluginForm->operatorSelectionStateChanged();
+    
+    QVERIFY(verify());
 }
 
 /*!
@@ -113,16 +127,15 @@
  */
 void UT_CpNetworkPluginForm::t_networkAccessModeGot()
 {
-    expect("CpSettingFormItemData::setContentWidgetData");
     m_networkPluginForm->networkAccessModeGot(0);
-    
-    expect("CpSettingFormItemData::setContentWidgetData");
+
     m_networkPluginForm->networkAccessModeGot(1);
-    
-    expect("CpSettingFormItemData::setContentWidgetData");
+
     m_networkPluginForm->networkAccessModeGot(2);
     
     m_networkPluginForm->networkAccessModeGot(3);
+    
+    QVERIFY(verify());
 }
 
 /*!
@@ -134,8 +147,10 @@
     QList<PSetNetworkWrapper::NetworkInfo*> networkInfoList;
     networkInfoList.append(&temp);
     
-    expect("HbDialog::exec");
+    expect("HbDialog::open");
     m_networkPluginForm->availableNetworksGot(networkInfoList);
+    
+    QVERIFY(verify());
 }
 
 /*!
@@ -149,15 +164,13 @@
     m_networkPluginForm->networkReqestFailed(error, type);
     
     error = PSetNetworkWrapper::ErrNoNetworkService;
-    type = PSetNetworkWrapper::RequestSetNetwork;
+    type = PSetNetworkWrapper::RequestSetNetworkMode;
     expect("PSetNetworkWrapper::getNetworkAccessMode");
-    expect("CpSettingFormItemData::setContentWidgetData");
     m_networkPluginForm->networkReqestFailed(error, type);
     
     error = PSetNetworkWrapper::ErrOfflineOpNotAllowed;
-    type = PSetNetworkWrapper::RequestSetNetwork;
+    type = PSetNetworkWrapper::RequestSetNetworkMode;
     expect("PSetNetworkWrapper::getNetworkAccessMode");
-    expect("CpSettingFormItemData::setContentWidgetData");
     m_networkPluginForm->networkReqestFailed(error, type);
     
     PSetNetworkWrapper::NetworkInfo temp;
@@ -166,8 +179,10 @@
     m_networkPluginForm->availableNetworksGot(networkInfoList);
     error = PSetNetworkWrapper::ErrNoNetworkAccess;
     type = PSetNetworkWrapper::RequestSetNetwork;
-    expect("HbDialog::exec");
+    expect("HbDialog::open");
     m_networkPluginForm->networkReqestFailed(error, type);
+    
+    QVERIFY(verify());
 }
 
 /*!
@@ -182,6 +197,8 @@
     m_NetworkSelectionMode = PSetNetworkWrapper::SelectionModeAutomatic;
     expect("PSetNetworkWrapper::getNetworkSelectionMode").willOnce(invoke(this, &updateNetworkSelectionMode));
     m_networkPluginForm->userCancel();
+    
+    QVERIFY(verify());
 }
 
 /*!
@@ -194,6 +211,8 @@
     
     type = PSetNetworkWrapper::RequestEnumerateNetworks;
     m_networkPluginForm->handleSearchingNetworks(type);
+    
+    QVERIFY(verify());
 }
 
 /*!
@@ -224,16 +243,75 @@
 }
     
 /*!
+  UT_CpNetworkPluginForm::t_primaryIconForNetwork
+ */
+void UT_CpNetworkPluginForm::t_primaryIconForNetwork()
+{
+    QScopedPointer<PSetWrapper> wrapper(new PSetWrapper()); 
+    expect("PSetWrapper::networkWrapper").returns(wrapper.data()); 
+    
+    QScopedPointer<CpNetworkPluginFormAdapter> 
+        formClassAdapter(new CpNetworkPluginFormAdapter());
+    PSetNetworkWrapper::NetworkInfo currentInfo;
+    
+    // Test: forbidden icon flag ON, mode: GSM, status: forbidden 
+    currentInfo.m_access = PSetNetworkWrapper::AccessTypeGsm; 
+    currentInfo.m_status = PSetNetworkWrapper::StatusForbidden; 
+    expect("CpSettingsWrapper::forbiddenIconSupported").returns(true); 
+    QString iconName = formClassAdapter->primaryIconForNetwork(currentInfo);
+    QCOMPARE(iconName, KIconGsmForbidden); 
+    
+    // Test: forbidden icon flag ON, mode: GSM, status: available
+    currentInfo.m_access = PSetNetworkWrapper::AccessTypeGsm; 
+    currentInfo.m_status = PSetNetworkWrapper::StatusAvailable; 
+    expect("CpSettingsWrapper::forbiddenIconSupported").returns(true); 
+    iconName = formClassAdapter->primaryIconForNetwork(currentInfo);
+    QCOMPARE(iconName, KIconGsmNotForbidden); 
+    
+    // Test: forbidden icon flag ON, mode: WCDMA, status: forbidden 
+    currentInfo.m_access = PSetNetworkWrapper::AccessTypeWcdma; 
+    currentInfo.m_status = PSetNetworkWrapper::StatusForbidden; 
+    expect("CpSettingsWrapper::forbiddenIconSupported").returns(true); 
+    iconName = formClassAdapter->primaryIconForNetwork(currentInfo);
+    QCOMPARE(iconName, KIconWcdmaForbidden); 
+     
+    // Test: forbidden icon flag ON, mode: WCDMA, status: available
+    currentInfo.m_access = PSetNetworkWrapper::AccessTypeWcdma; 
+    currentInfo.m_status = PSetNetworkWrapper::StatusAvailable; 
+    expect("CpSettingsWrapper::forbiddenIconSupported").returns(true); 
+    iconName = formClassAdapter->primaryIconForNetwork(currentInfo);
+    QCOMPARE(iconName, KIconWcdmaNotForbidden); 
+
+    // Test: forbidden icon flag ON, mode: GSM and WCDMA, status: forbidden 
+    currentInfo.m_access = PSetNetworkWrapper::AccessTypeGsmAndWcdma; 
+    currentInfo.m_status = PSetNetworkWrapper::StatusForbidden; 
+    expect("CpSettingsWrapper::forbiddenIconSupported").returns(true); 
+    iconName = formClassAdapter->primaryIconForNetwork(currentInfo);
+    QCOMPARE(iconName, KIconGsmAndWcdmaForbidden); 
+     
+    // Test: forbidden icon flag ON, mode: GSM and WCDMA, status: available
+    currentInfo.m_access = PSetNetworkWrapper::AccessTypeGsmAndWcdma; 
+    currentInfo.m_status = PSetNetworkWrapper::StatusAvailable; 
+    expect("CpSettingsWrapper::forbiddenIconSupported").returns(true); 
+    iconName = formClassAdapter->primaryIconForNetwork(currentInfo);
+    QCOMPARE(iconName, KIconGsmAndWcdmaNotForbidden); 
+    
+    // Test: forbidden icon flag OFF
+    expect("CpSettingsWrapper::forbiddenIconSupported").returns(false);
+    iconName = formClassAdapter->primaryIconForNetwork(currentInfo);
+    QCOMPARE(iconName, QString("")); 
+}
+
+/*!
   UT_CpNetworkPluginForm::cleanup
  */
 void UT_CpNetworkPluginForm::cleanup()
 {
     reset();
-    
+    delete m_networkPluginForm;
+    m_networkPluginForm = NULL;
     delete m_networkWrapper;
     m_networkWrapper = NULL;
-    delete m_networkPluginForm;
-    m_networkPluginForm = NULL;
 }
 
 /*!
@@ -253,4 +331,5 @@
     mode = m_NetworkSelectionMode;
 }
 
+
 QTEST_MAIN_S60UI(UT_CpNetworkPluginForm)