--- a/wlanutilities/wlanwizard/t_wlanwizard/ut/main.cpp	Thu Jun 10 15:44:54 2010 +0300
+++ b/wlanutilities/wlanwizard/t_wlanwizard/ut/main.cpp	Thu Jun 24 10:49:51 2010 +0300
@@ -22,28 +22,59 @@
 #include <QList>
 
 // User includes
-#include "testwlanwizardui.h"
 #include "testwlanwizard.h"
-#include "hbautotest.h"
+#include "testwlanwizardeap.h"
+#include "testwlanwizardconnect.h"
+#include "testwlanwizardmanual.h"
+#include "testwlanwizardwps.h"
 
 // ======== LOCAL FUNCTIONS ========
 int main(int argc, char *argv[])
 {
-    qDebug("TestWlanWizardUI main start");
+    qDebug("TestWlanWizard main start");
     HbApplication app(argc, argv);
-    app.setApplicationName("TestWlanWizardUI");
-
+    int res = 0;
     char *pass[3];
     pass[0] = argv[0];
     pass[1] = "-o";
-    pass[2] = "c:\\data\\TestWlanWizard.txt";
-    TestWlanWizard tcUtilities;
-    int res = QTest::qExec(&tcUtilities, 3, pass);
+    
+    // log folder: \epoc32\winscw\c\data
+    
+    app.setApplicationName("TestWlanWizardUtilities");
+    pass[2] = "c:\\data\\TestWlanWizardUtilities.txt";
+    TestWlanWizard *tcUtilities = new TestWlanWizard();
+    res |= QTest::qExec(tcUtilities, 3, pass);
+    delete tcUtilities;
+    tcUtilities = NULL;
 
-    pass[2] = "c:\\data\\TestWlanWizardUi.txt";
-    TestWlanWizardUi tc;
-    res = QTest::qExec(&tc, 3, pass);
+    app.setApplicationName("TestWlanWizardConnect");
+    pass[2] = "c:\\data\\TestWlanWizardConnect.txt";
+    TestWlanWizardConnect *tcConnect = new TestWlanWizardConnect();
+    res |= QTest::qExec(tcConnect, 3, pass);
+    delete tcConnect;
+    tcConnect = NULL;
     
-    qDebug("TestWlanWizardUI main exit");
+    app.setApplicationName("TestWlanWizardManual");
+    pass[2] = "c:\\data\\TestWlanWizardManual.txt";
+    TestWlanWizardManual *tcManual = new TestWlanWizardManual();
+    res |= QTest::qExec(tcManual, 3, pass);
+    delete tcManual;
+    tcManual = NULL;
+
+    app.setApplicationName("TestWlanWizardEap");
+    pass[2] = "c:\\data\\TestWlanWizardEap.txt";
+    TestWlanWizardEap *tcEap = new TestWlanWizardEap();
+    res |= QTest::qExec(tcEap, 3, pass);
+    delete tcEap;
+    tcEap = NULL;
+
+    app.setApplicationName("TestWlanWizardWps");
+    pass[2] = "c:\\data\\TestWlanWizardWps.txt";
+    TestWlanWizardWps *tcWps = new TestWlanWizardWps();
+    res |= QTest::qExec(tcWps, 3, pass);
+    delete tcWps;
+    tcWps = NULL;
+    
+    qDebug("TestWlanWizard main exit");
     return res;
 }