diff -r d9ec2b8c6bad -r 2fbd1d709fe7 wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.h
--- a/wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.h	Wed Jun 23 19:25:42 2010 +0300
+++ b/wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.h	Tue Jul 06 15:29:22 2010 +0300
@@ -22,6 +22,7 @@
 
 class QSignalSpy;
 class WlanQtUtils;
+class WlanQtUtilsAp;
 
 class TestWlanQtUtils: public QObject
 {
@@ -36,12 +37,28 @@
     void cleanup();
 
     // Test functions for public interface.
+    
+    // scanWlans()
     void testAvailableWlan();
     void testAvailableWlanDuplicates();
     void testAvailableWlanSecModes();
     void testAvailableWlanSsids();
     void testAvailableWlanWithIaps();
     void testAvailableWlanSequence();
+    void testAvailableWlanScanEmpty();
+    void testAvailableWlanScanError();
+    
+    // scanWlanAps()
+    void testAvailableWlanAps();
+    void testAvailableWlanApsScanEmpty();
+    void testStopWlanApScan();
+    void testWlanApScanError();
+    
+    // scanWlanDirect()
+    void testDirectScanBasic();
+    void testDirectScanEmpty();
+    void testDirectScanStop();
+    void testDirectScanError();
 
     void testCreateIapOk();
     void testCreateIapErr();
@@ -90,12 +107,16 @@
     
     // Helper functions, that is, sub test cases.
     void subTestSignalWaitAndTake(QSignalSpy *spy, QList<QVariant> *arguments);
+    void subTestScanResultSignal(QSignalSpy* spy, int status);
     void subTestLoadCommsDatFile(QString newCommsdatFilename);
     void subTestNewWlanQtUtils();
+    WlanQtUtilsAp *subTestNewAp();
 
     // Member variables.
     WlanQtUtils *wlanQtUtils_;
-    QSignalSpy *signalScanReady_;
+    QSignalSpy *mSignalScanReady;
+    QSignalSpy *mSignalScanApReady;
+    QSignalSpy *mSignalScanDirectReady;
     QSignalSpy *signalWlanNetworkOpened_;
     QSignalSpy *signalWlanNetworkClosed_;
     QSignalSpy *signalIctResult_;