FCL/sf/mw/wirelessacc: comparison wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.cpp

equal deleted inserted replaced

-:bdc64aa9b954
+:822a45792fdd
 #include <rconnmon.h>
 #include <nifvar.h>
 #include <cmmanagerdefines_shim.h>
 #include "wlanqtutilsap.h"
-#include "wlanqtutilsiap.h"
 #include "wlanqtutils.h"
 #include "wlanqtutils_p.h"
 #include "wlanqtutilsconmonwrapper.h"
 #include "wlanqtutilsconmonwrapperinfo_symbian.h"
 #include "testwlanqtutils.h"
 // Let active object run and verify signal.
 subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
 // Get and verify the list of available WLAN APs.
-QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+QList< QSharedPointer<WlanQtUtilsAp> > iaps;
 QList< QSharedPointer<WlanQtUtilsAp> > aps;
 wlanQtUtils_->availableWlans(iaps, aps);
 testContext.mScan.verifyWlanScanApResultList(aps);
 QCOMPARE(iaps.count(), 0);
 // Let active object run and verify signal.
 subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
 // Get and verify the list of available WLAN APs.
-QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+QList< QSharedPointer<WlanQtUtilsAp> > iaps;
 QList< QSharedPointer<WlanQtUtilsAp> > aps;
 wlanQtUtils_->availableWlans(iaps, aps);
 // First remove AP that has duplicate SSID.
 testContext.mScan.mWlanScanApResultList.removeAt(2);
 // Let active object run and verify signal.
 subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
 // Get and verify the list of available WLAN APs.
-QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+QList< QSharedPointer<WlanQtUtilsAp> > iaps;
 QList< QSharedPointer<WlanQtUtilsAp> > aps;
 wlanQtUtils_->availableWlans(iaps, aps);
 // Remove the trick *. WapiPsk and Wapi both map to just Wapi
 testContext.mScan.mWlanScanApResultList[9]->setValue(WlanQtUtilsAp::ConfIdWpaPskUse,false);
 // Let active object run and verify signal.
 subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
 // Get and verify the list of available WLAN APs.
-QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+QList< QSharedPointer<WlanQtUtilsAp> > iaps;
 QList< QSharedPointer<WlanQtUtilsAp> > aps;
 wlanQtUtils_->availableWlans(iaps, aps);
 // Empty ssids are removed from results
 testContext.mScan.mWlanScanApResultList.removeAt(3);
 void TestWlanQtUtils::testAvailableWlanWithIaps()
 {
 // Form WLAN IAP scan result list
 testContext.mScan.createDefaultWlanScanIapResultList(3);
 testContext.mScan.mWlanScanIapResultList.removeAt(1);
-testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsIap::ConfIdIapId, 5);
+testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsAp::ConfIdIapId, 5);
-testContext.mScan.mWlanScanIapResultList[1]->setValue(WlanQtUtilsIap::ConfIdIapId, 7);
+testContext.mScan.mWlanScanIapResultList[1]->setValue(WlanQtUtilsAp::ConfIdIapId, 7);
 // Form WLAN AP scan result list
 testContext.mScan.createDefaultWlanScanApResultList(7);
 testContext.mScan.mWlanScanApResultList[1]->setValue(WlanQtUtilsAp::ConfIdSsid, "WLAN IAP 3");
 testContext.mScan.mWlanScanApResultList[1]->setValue(WlanQtUtilsAp::ConfIdSecurityMode,CMManagerShim::WlanSecModeWpa);
 // Let active object run and verify signal.
 subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
 // Get and verify the list of available WLAN APs.
-QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+QList< QSharedPointer<WlanQtUtilsAp> > iaps;
 QList< QSharedPointer<WlanQtUtilsAp> > aps;
 wlanQtUtils_->availableWlans(iaps, aps);
 // Verify WLAN IAP list
 testContext.mScan.verifyWlanScanIapResultList(iaps);
 * Test refereshing of WLAN APs when client requests sequential scans.
 */
 void TestWlanQtUtils::testAvailableWlanSequence()
 {
 // **************** Before 1st scan ********************
-QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+QList< QSharedPointer<WlanQtUtilsAp> > iaps;
 QList< QSharedPointer<WlanQtUtilsAp> > aps;
 wlanQtUtils_->availableWlans(iaps, aps);
 // Verify we have no results
 QCOMPARE(aps.count(), 0);
 QCOMPARE(iaps.count(), 0);
 // Let active object run and verify signal.
 subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
 // Get and verify the list of available WLAN APs.
-QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+QList< QSharedPointer<WlanQtUtilsAp> > iaps;
 QList< QSharedPointer<WlanQtUtilsAp> > aps;
 wlanQtUtils_->availableWlans(iaps, aps);
 testContext.mScan.verifyWlanScanApResultList(aps);
 QCOMPARE(iaps.count(), 0);
 }
 // Let active object run and verify signal.
 subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
 // Ensure there are no WLAN IAPs but there is one scan result.
-QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+QList< QSharedPointer<WlanQtUtilsAp> > iaps;
 QList< QSharedPointer<WlanQtUtilsAp> > aps;
 wlanQtUtils_->availableWlans(iaps, aps);
 QCOMPARE(iaps.count(), 0);
 testContext.mScan.verifyWlanScanApResultList(aps);
 // Execute createIap() function
 QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testCreateIapOk");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testCreateIapOk");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeWpa);
 wlanAp->setValue(WlanQtUtilsAp::ConfIdWpaPskUse, true);
 wlanAp->setValue(WlanQtUtilsAp::ConfIdWpaPsk, "100euronlounas");
 int iapId = wlanQtUtils_->createIap(wlanAp.data());
 QVERIFY(iapId != WlanQtUtils::IapIdNone);
 // Form WLAN IAP scan result list
 testContext.mScan.createDefaultWlanScanIapResultList(1);
-testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsIap::ConfIdIapId, iapId);
+testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsAp::ConfIdIapId, iapId);
-testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsIap::ConfIdName, QString("testCreateIapOk"));
+testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsAp::ConfIdName, QString("testCreateIapOk"));
-testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsIap::ConfIdSsid, QString("testCreateIapOk"));
+testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsAp::ConfIdSsid, QString("testCreateIapOk"));
-testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsIap::ConfIdSecurityMode, (int)(CMManagerShim::WlanSecModeWpa));
+testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsAp::ConfIdSecurityMode, (int)(CMManagerShim::WlanSecModeWpa));
-testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsIap::ConfIdWpaPskUse, true);
+testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsAp::ConfIdWpaPskUse, true);
 // Re-execute the scan so that scan lists get updated due to the IAP creation
 wlanQtUtils_->scanWlans();
 subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
 */
 void TestWlanQtUtils::testCreateIapErr()
 {
 // Execute createIap() function with invalid parameters
 QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testCreateIapErr");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testCreateIapErr");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdWpaPskUse, false);
 // Invalid security mode -> exception
 wlanAp->setValue(
 WlanQtUtilsAp::ConfIdSecurityMode,
 */
 void TestWlanQtUtils::testCreateIapWepKeys()
 {
 // Create the IAPs with different kind of WEP keys
 QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testCreateIapWepKeys");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testCreateIapWepKeys");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeWep);
 wlanAp->setValue(WlanQtUtilsAp::ConfIdWepDefaultIndex, CMManagerShim::WepKeyIndex2);
 // All keys in HEX format
 wlanAp->setValue(WlanQtUtilsAp::ConfIdWepKey1, "1234567891");
 */
 void TestWlanQtUtils::testUpdateIapOk()
 {
 // Create an IAP that can be updated
 QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testUpdateIapOk");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testUpdateIapOk");
 int iapId = wlanQtUtils_->createIap(wlanAp.data());
 // Update the name and verify it changed
+wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "UPDATED_testUpdateIapOk");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "UPDATED_testUpdateIapOk");
 bool success = wlanQtUtils_->updateIap(iapId, wlanAp.data());
 QVERIFY(success == true);
 QString name = wlanQtUtils_->iapName(iapId);
 */
 void TestWlanQtUtils::testDeleteIapOk()
 {
 // Create an IAP that can be deleted
 QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testDeleteIapOk");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testDeleteIapOk");
 int iapId = wlanQtUtils_->createIap(wlanAp.data());
 // Check that IAP now exists
 QString name = wlanQtUtils_->iapName(iapId);
 */
 void TestWlanQtUtils::testDisconnectIapOk()
 {
 // Create and connect an IAP we can then disconnect
 QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testDisconnectIapOk");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testDisconnectIapOk");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeWpa);
 int iapId = wlanQtUtils_->createIap(wlanAp.data());
 testContext.esock_.startRetValue_ = KErrNone;
 wlanQtUtils_->disconnectIap(200);
 wlanQtUtils_->disconnectIap(WlanQtUtils::IapIdNone);
 }
 /**
+* This function tests moving of an IAP into Internet destination.
+*/
+void TestWlanQtUtils::testMoveIapToInternetOk()
+{
+// First create the IAP to move
+QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testMoveIapToInternetOk");
+wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testMoveIapToInternetOk");
+int iapId = wlanQtUtils_->createIap(wlanAp.data());
+QVERIFY(iapId != WlanQtUtils::IapIdNone);
+// Verify the name
+QCOMPARE(wlanQtUtils_->iapName(iapId), QString("testMoveIapToInternetOk"));
+// Now move the IAP to internet destination
+wlanQtUtils_->moveIapToInternetSnap(iapId);
+// No interface for checking the destination via WlanQtUtils, so skipping it
+// Delete the IAP
+wlanQtUtils_->deleteIap(iapId);
+}
+/**
 * This function tests connection status getter.
 */
 void TestWlanQtUtils::testConnectionStatus()
 {
 // Request status when there is no connection
 */
 void TestWlanQtUtils::testIapNameFound()
 {
 // Create the IAP we want to find with the getter
 QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testIapFound");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testIapFound");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeWpa2);
 int iapId = wlanQtUtils_->createIap(wlanAp.data());
 */
 void TestWlanQtUtils::testActiveIapFound()
 {
 // Create the IAP we want to find with the getter
 QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testConnectedWlanIdFound");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testConnectedWlanIdFound");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeWpa);
 int iapId = wlanQtUtils_->createIap(wlanAp.data());
 // Execute function under test
 wlanQtUtils_->stopWlanScan();
 // Catch & check the scan result signal
 subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusCancelled);
+// Restart scan to make sure previous is really finished
+testContext.mScan.mCompleteWlanApScan = true;
+wlanQtUtils_->scanWlans();
+// No need to verify scan results here, testAvailableWlan* test cases
+// are for that. Just make sure the result signal is received.
+subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
 }
 /**
 * Test WLAN scan stopping interface when no scan is ongoing.
 */
 */
 void TestWlanQtUtils::testConnectionTestOk()
 {
 // Create new IAP to test
 QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testConnectionTestOk");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testConnectionTestOk");
 int iapId = wlanQtUtils_->createIap(wlanAp.data());
 QVERIFY(iapId != WlanQtUtils::IapIdNone);
 testContext.esock_.startRetValue_ = KErrNone;
 */
 void TestWlanQtUtils::testConnectionTestErr()
 {
 // Create and connect an IAP and request ICT to be run
 QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testConnectionTestErr1");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testConnectionTestErr1");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeWpa);
 int iapId = wlanQtUtils_->createIap(wlanAp.data());
 wlanQtUtils_->connectIap(iapId, true);
 subTestSignalWaitAndTake(signalWlanNetworkClosed_, &arguments);
 QCOMPARE(arguments.at(0).toInt(), iapId);
 QCOMPARE(arguments.at(1).toInt(), KErrNone);
+wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testConnectionTestErr2");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testConnectionTestErr2");
 iapId = wlanQtUtils_->createIap(wlanAp.data());
 wlanQtUtils_->connectIap(iapId, true);
 */
 void TestWlanQtUtils::testConnectionTestHotspot()
 {
 // Create new IAP to test
 QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testConnectionTestHotspot");
 wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testConnectionTestHotspot");
 int iapId = wlanQtUtils_->createIap(wlanAp.data());
 QVERIFY(iapId != WlanQtUtils::IapIdNone);
 testContext.esock_.startRetValue_ = KErrNone;
 WlanQtUtilsAp *TestWlanQtUtils::subTestNewAp()
 {
 WlanQtUtilsAp *ap = new WlanQtUtilsAp;
 // Set default values
-ap->setValue(WlanQtUtilsAp::ConfIdSsid, QString());
+ap->setValue(WlanQtUtilsAp::ConfIdName, QString());
+ap->setValue(WlanQtUtilsAp::ConfIdSsid, QByteArray());
 ap->setValue(WlanQtUtilsAp::ConfIdSignalStrength, 90);
 ap->setValue(WlanQtUtilsAp::ConfIdConnectionMode, CMManagerShim::Infra);
 ap->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeOpen);
 ap->setValue(WlanQtUtilsAp::ConfIdWpaPskUse, false);
 ap->setValue(WlanQtUtilsAp::ConfIdWpaPsk, QString());

changeset 60	822a45792fdd
parent 53	bdc64aa9b954