--- a/qtmobility/tests/auto/qsystemnetworkinfo/tst_qsystemnetworkinfo.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/tests/auto/qsystemnetworkinfo/tst_qsystemnetworkinfo.cpp	Mon May 03 13:18:40 2010 +0300
@@ -72,6 +72,7 @@
     void tst_macAddress();
 
     void tst_interfaceForMode();
+    void tst_currentMode();
 };
 //signal todo:
 //    void networkStatusChanged(QSystemNetworkInfo::NetworkMode netmode, QSystemNetworkInfo::CellNetworkStatus netStatus);
@@ -153,9 +154,12 @@
 void  tst_QSystemNetworkInfo::tst_currentMobileCountryCode()
 {
     QSystemNetworkInfo ni;
-    if(QSystemNetworkInfo::Connected == ni.networkStatus(QSystemNetworkInfo::GsmMode)
-        || QSystemNetworkInfo::Connected == ni.networkStatus(QSystemNetworkInfo::CdmaMode)
-        || QSystemNetworkInfo::Connected == ni.networkStatus(QSystemNetworkInfo::WcdmaMode)) {
+    if(QSystemNetworkInfo::HomeNetwork == ni.networkStatus(QSystemNetworkInfo::GsmMode)
+        || QSystemNetworkInfo::HomeNetwork == ni.networkStatus(QSystemNetworkInfo::CdmaMode)
+        || QSystemNetworkInfo::HomeNetwork == ni.networkStatus(QSystemNetworkInfo::WcdmaMode)
+        || QSystemNetworkInfo::Roaming == ni.networkStatus(QSystemNetworkInfo::GsmMode)
+        || QSystemNetworkInfo::Roaming == ni.networkStatus(QSystemNetworkInfo::CdmaMode)
+        || QSystemNetworkInfo::Roaming == ni.networkStatus(QSystemNetworkInfo::WcdmaMode)) {
         QVERIFY(!ni.currentMobileCountryCode().isEmpty());
     } else {
         QVERIFY(ni.currentMobileCountryCode().isEmpty());
@@ -165,9 +169,12 @@
 void  tst_QSystemNetworkInfo::tst_currentMobileNetworkCode()
 {
     QSystemNetworkInfo ni;
-    if(QSystemNetworkInfo::Connected == ni.networkStatus(QSystemNetworkInfo::GsmMode)
-        || QSystemNetworkInfo::Connected == ni.networkStatus(QSystemNetworkInfo::CdmaMode)
-        || QSystemNetworkInfo::Connected == ni.networkStatus(QSystemNetworkInfo::WcdmaMode)) {
+    if(QSystemNetworkInfo::HomeNetwork == ni.networkStatus(QSystemNetworkInfo::GsmMode)
+        || QSystemNetworkInfo::HomeNetwork == ni.networkStatus(QSystemNetworkInfo::CdmaMode)
+        || QSystemNetworkInfo::HomeNetwork == ni.networkStatus(QSystemNetworkInfo::WcdmaMode)
+        || QSystemNetworkInfo::Roaming == ni.networkStatus(QSystemNetworkInfo::GsmMode)
+        || QSystemNetworkInfo::Roaming == ni.networkStatus(QSystemNetworkInfo::CdmaMode)
+        || QSystemNetworkInfo::Roaming == ni.networkStatus(QSystemNetworkInfo::WcdmaMode)) {
         QVERIFY(!ni.currentMobileNetworkCode().isEmpty());
     } else {
         QVERIFY(ni.currentMobileNetworkCode().isEmpty());
@@ -178,9 +185,12 @@
 void  tst_QSystemNetworkInfo::tst_homeMobileCountryCode()
 {
     QSystemNetworkInfo ni;
-    if(QSystemNetworkInfo::Connected == ni.networkStatus(QSystemNetworkInfo::GsmMode)
-        || QSystemNetworkInfo::Connected == ni.networkStatus(QSystemNetworkInfo::CdmaMode)
-        || QSystemNetworkInfo::Connected == ni.networkStatus(QSystemNetworkInfo::WcdmaMode)) {
+    if(QSystemNetworkInfo::HomeNetwork == ni.networkStatus(QSystemNetworkInfo::GsmMode)
+        || QSystemNetworkInfo::HomeNetwork == ni.networkStatus(QSystemNetworkInfo::CdmaMode)
+        || QSystemNetworkInfo::HomeNetwork == ni.networkStatus(QSystemNetworkInfo::WcdmaMode)
+        || QSystemNetworkInfo::Roaming == ni.networkStatus(QSystemNetworkInfo::GsmMode)
+        || QSystemNetworkInfo::Roaming == ni.networkStatus(QSystemNetworkInfo::CdmaMode)
+        || QSystemNetworkInfo::Roaming == ni.networkStatus(QSystemNetworkInfo::WcdmaMode)) {
         QVERIFY(!ni.homeMobileCountryCode().isEmpty());
     } else {
         QVERIFY(ni.homeMobileCountryCode().isEmpty());
@@ -190,9 +200,12 @@
 void  tst_QSystemNetworkInfo::tst_homeMobileNetworkCode()
 {
     QSystemNetworkInfo ni;
-    if(QSystemNetworkInfo::Connected == ni.networkStatus(QSystemNetworkInfo::GsmMode)
-        || QSystemNetworkInfo::Connected == ni.networkStatus(QSystemNetworkInfo::CdmaMode)
-        || QSystemNetworkInfo::Connected == ni.networkStatus(QSystemNetworkInfo::WcdmaMode)) {
+    if(QSystemNetworkInfo::HomeNetwork == ni.networkStatus(QSystemNetworkInfo::GsmMode)
+        || QSystemNetworkInfo::HomeNetwork == ni.networkStatus(QSystemNetworkInfo::CdmaMode)
+        || QSystemNetworkInfo::HomeNetwork == ni.networkStatus(QSystemNetworkInfo::WcdmaMode)
+        || QSystemNetworkInfo::Roaming == ni.networkStatus(QSystemNetworkInfo::GsmMode)
+        || QSystemNetworkInfo::Roaming == ni.networkStatus(QSystemNetworkInfo::CdmaMode)
+        || QSystemNetworkInfo::Roaming == ni.networkStatus(QSystemNetworkInfo::WcdmaMode)) {
         QVERIFY(!ni.homeMobileNetworkCode().isEmpty());
     } else {
         QVERIFY(ni.homeMobileNetworkCode().isEmpty());
@@ -253,5 +266,21 @@
 
 }
 
+void tst_QSystemNetworkInfo::tst_currentMode()
+{
+    QSystemNetworkInfo ni;
+    QSystemNetworkInfo::NetworkMode mode = ni.currentMode();
+
+    QVERIFY( mode == QSystemNetworkInfo::UnknownMode
+             || mode == QSystemNetworkInfo::GsmMode
+             || mode == QSystemNetworkInfo::CdmaMode
+             || mode == QSystemNetworkInfo::WcdmaMode
+             || mode == QSystemNetworkInfo::WlanMode
+             || mode == QSystemNetworkInfo::EthernetMode
+             || mode == QSystemNetworkInfo::BluetoothMode
+             || mode == QSystemNetworkInfo::WimaxMode );
+}
+
+
 QTEST_MAIN(tst_QSystemNetworkInfo)
 #include "tst_qsystemnetworkinfo.moc"