diff -r bdc64aa9b954 -r 822a45792fdd wlanutilities/wlanwizard/tsrc/ut/testwlanwizardconnect.cpp --- a/wlanutilities/wlanwizard/tsrc/ut/testwlanwizardconnect.cpp Mon Aug 23 13:30:09 2010 +0300 +++ b/wlanutilities/wlanwizard/tsrc/ut/testwlanwizardconnect.cpp Fri Sep 03 09:37:37 2010 +0300 @@ -16,6 +16,7 @@ */ // System includes + #include #include #include @@ -23,16 +24,19 @@ #include #include #include + #include #include #include #include #include #include + #include #include // User includes + #include "testwlanwizardconnect.h" #include "testwlanwizardconnect_conf.h" #include "hbautotest.h" @@ -131,6 +135,7 @@ mView->mWizard->setParameters( "tc_connect_to_open_success_cancel", + "tc_connect_to_open_success_cancel", CMManagerShim::Infra, CMManagerShim::WlanSecModeOpen, false, @@ -349,6 +354,7 @@ mView->mWizard->setParameters( ssid, + ssid.toUtf8(), CMManagerShim::Infra, CMManagerShim::WlanSecModeOpen, false, @@ -383,6 +389,7 @@ mView->mWizard->setParameters( ssid, + ssid.toUtf8(), CMManagerShim::Adhoc, CMManagerShim::WlanSecModeWep, true, @@ -421,6 +428,7 @@ mView->mWizard->setParameters( ssid, + ssid.toUtf8(), networkMode, securityMode, true, @@ -429,7 +437,8 @@ WlanQtUtilsAp ap; ap.setValue(WlanQtUtilsAp::ConfIdConnectionMode, networkMode); ap.setValue(WlanQtUtilsAp::ConfIdSecurityMode, securityMode); - ap.setValue(WlanQtUtilsAp::ConfIdSsid, ssid); + ap.setValue(WlanQtUtilsAp::ConfIdName, ssid); + ap.setValue(WlanQtUtilsAp::ConfIdSsid, ssid.toUtf8()); ap.setValue(WlanQtUtilsAp::ConfIdHidden, false); ap.setValue(WlanQtUtilsAp::ConfIdWlanScanSSID, hidden); @@ -531,6 +540,7 @@ mWlanQtUtilsContext->setActiveWlanIapResult(1); mView->mWizard->setParameters( ssid, + ssid.toUtf8(), networkMode, securityMode, true, @@ -539,7 +549,8 @@ WlanQtUtilsAp ap; ap.setValue(WlanQtUtilsAp::ConfIdConnectionMode, networkMode); ap.setValue(WlanQtUtilsAp::ConfIdSecurityMode, securityMode); - ap.setValue(WlanQtUtilsAp::ConfIdSsid, ssid); + ap.setValue(WlanQtUtilsAp::ConfIdName, ssid); + ap.setValue(WlanQtUtilsAp::ConfIdSsid, ssid.toUtf8()); ap.setValue(WlanQtUtilsAp::ConfIdHidden, false); ap.setValue(WlanQtUtilsAp::ConfIdWlanScanSSID, hidden);