Autotests fixed for Symbian

8 files changed, 31 insertions, 46 deletions

diff --git a/common.pri b/common.pri
index 1caff484bb..d21547cd8a 100644
--- a/common.pri
+++ b/common.pri
@@ -161,6 +161,9 @@ wince* {
 symbian {
     #For some reason the default include path doesn't include MOC_DIR on symbian
     INCLUDEPATH += $$MOC_DIR
+    
+    #This is supposed to be defined in symbian_os.hrh
+    #DEFINES += SYMBIAN_EMULATOR_SUPPORTS_PERPROCESS_WSD
 }
 
 # Add the output dirs to the link path too
diff --git a/src/serviceframework/serviceframework.pro b/src/serviceframework/serviceframework.pro
index 96b585921c..827d8fbbfc 100644
--- a/src/serviceframework/serviceframework.pro
+++ b/src/serviceframework/serviceframework.pro
@@ -31,8 +31,6 @@ SOURCES +=  servicemetadata.cpp \
             dberror.cpp
 
 symbian {
-    #DEFINES += SYMBIAN_EMULATOR_SUPPORTS_PERPROCESS_WSD
-
     INCLUDEPATH +=  ./databasemanagerserver_symbian
     
     PRIVATE_HEADERS +=  databasemanager_symbian_p.h
diff --git a/tests/auto/databasemanager/databasemanager.pro b/tests/auto/databasemanager/databasemanager.pro
index 5e2ffed451..2f7d1a8358 100644
--- a/tests/auto/databasemanager/databasemanager.pro
+++ b/tests/auto/databasemanager/databasemanager.pro
@@ -23,8 +23,6 @@ symbian {
     SOURCES += tst_databasemanager_symbian.cpp \
                ../qsfwtestutil.cpp
 
-    #DEFINES += SYMBIAN_EMULATOR_SUPPORTS_PERPROCESS_WSD
-
     TARGET.CAPABILITY = ALL -TCB
     LIBS += -lefsrv
 
diff --git a/tests/auto/databasemanager/tst_databasemanager_symbian.cpp b/tests/auto/databasemanager/tst_databasemanager_symbian.cpp
index 6ecd5a2b19..62f9a1a479 100644
--- a/tests/auto/databasemanager/tst_databasemanager_symbian.cpp
+++ b/tests/auto/databasemanager/tst_databasemanager_symbian.cpp
@@ -95,11 +95,7 @@ void tst_DatabaseManager::initTestCase()
     // the database file (otherwise QFile::remove will get a permission denied -->
     // in next case, the isEmpty() check fails).
     QTest::qWait(1);
-    QSfwTestUtil::removeTempUserDb();
-    QSfwTestUtil::removeTempSystemDb();
-#if !defined(__WINS__)
-    QSfwTestUtil::removeDatabases();
-#endif
+    QSfwTestUtil::removeDatabases_symbian();
     m_dbm = NULL;
 }
 
@@ -445,9 +441,7 @@ void tst_DatabaseManager::unregisterService()
     QVERIFY(!m_dbm->unregisterService("; drop table Interface;", DatabaseManager::UserScope));
     QCOMPARE(m_dbm->lastError().code(), DBError::NotFound);
 
-#if !defined(__WINS__)
-    QSfwTestUtil::removeDatabases();
-#endif
+    QSfwTestUtil::removeDatabases_symbian();
 }
 
 bool tst_DatabaseManager::compareDescriptor(QServiceInterfaceDescriptor interface,
@@ -678,11 +672,7 @@ void tst_DatabaseManager::cleanupTestCase()
 {
     QTest::qWait(100);
     delete m_dbm;
-    QSfwTestUtil::removeTempUserDb();
-    QSfwTestUtil::removeTempSystemDb();
-#if !defined(__WINS__)
-    QSfwTestUtil::removeDatabases();
-#endif
+    QSfwTestUtil::removeDatabases_symbian();
 }
 
 QTEST_MAIN(tst_DatabaseManager)
diff --git a/tests/auto/qabstractsecuritysession/tst_qabstractsecuritysession.cpp b/tests/auto/qabstractsecuritysession/tst_qabstractsecuritysession.cpp
index c08f7f8b16..df9c13d773 100644
--- a/tests/auto/qabstractsecuritysession/tst_qabstractsecuritysession.cpp
+++ b/tests/auto/qabstractsecuritysession/tst_qabstractsecuritysession.cpp
@@ -96,8 +96,8 @@ void tst_QAbstractSecuritySession::initTestCase()
 
     QSfwTestUtil::removeTempUserDb();
     QSfwTestUtil::removeTempSystemDb();
-#if defined(Q_OS_SYMBIAN) && !defined(__WINS__)
-    QSfwTestUtil::removeDatabases();
+#if defined(Q_OS_SYMBIAN)
+    QSfwTestUtil::removeDatabases_symbian();
 #endif
 }
 
@@ -199,8 +199,8 @@ void tst_QAbstractSecuritySession::cleanupTestCase()
 {
     QSfwTestUtil::removeTempUserDb();
     QSfwTestUtil::removeTempSystemDb();
-#if defined(Q_OS_SYMBIAN) && !defined(__WINS__)
-    QSfwTestUtil::removeDatabases();
+#if defined(Q_OS_SYMBIAN)
+    QSfwTestUtil::removeDatabases_symbian();
 #endif
 }
 
diff --git a/tests/auto/qservicemanager/tst_qservicemanager.cpp b/tests/auto/qservicemanager/tst_qservicemanager.cpp
index c68c14ab4e..eee27650cf 100644
--- a/tests/auto/qservicemanager/tst_qservicemanager.cpp
+++ b/tests/auto/qservicemanager/tst_qservicemanager.cpp
@@ -302,8 +302,8 @@ void tst_QServiceManager::initTestCase()
 
     QSfwTestUtil::setupTempUserDb();
     QSfwTestUtil::setupTempSystemDb();
-#if defined(Q_OS_SYMBIAN) && !defined(__WINS__)
-    QSfwTestUtil::removeDatabases();
+#if defined(Q_OS_SYMBIAN)
+    QSfwTestUtil::removeDatabases_symbian();
 #endif
 }
 
@@ -317,8 +317,8 @@ void tst_QServiceManager::init()
 #endif
     QSfwTestUtil::removeTempUserDb();
     QSfwTestUtil::removeTempSystemDb();
-#if defined(Q_OS_SYMBIAN) && !defined(__WINS__)
-    QSfwTestUtil::removeDatabases();
+#if defined(Q_OS_SYMBIAN)
+    QSfwTestUtil::removeDatabases_symbian();
 #endif
     QSettings settings("com.nokia.qt.serviceframework.tests", "SampleServicePlugin");
     settings.setValue("installed", false);
@@ -328,8 +328,8 @@ void tst_QServiceManager::cleanupTestCase()
 {
     QSfwTestUtil::removeTempUserDb();
     QSfwTestUtil::removeTempSystemDb();
-#if defined(Q_OS_SYMBIAN) && !defined(__WINS__)
-    QSfwTestUtil::removeDatabases();
+#if defined(Q_OS_SYMBIAN)
+    QSfwTestUtil::removeDatabases_symbian();
 #endif
     //use QEventLopp::DeferredDeletion
     //QServiceManager::loadInterface makes use of deleteLater() when
diff --git a/tests/auto/qsfwtestutil.cpp b/tests/auto/qsfwtestutil.cpp
index 06bb401955..804e1ad63e 100644
--- a/tests/auto/qsfwtestutil.cpp
+++ b/tests/auto/qsfwtestutil.cpp
@@ -89,19 +89,12 @@ QString QSfwTestUtil::systemDirectory()
 
 QString QSfwTestUtil::tempSettingsPath(const char *path)
 {
-#if defined(Q_OS_SYMBIAN) && defined(__WINS__)
-    // On emulator, use hardcoded path instead of private directories to
-    // enable a shared database.
-    Q_UNUSED(path);
-    return QDir::toNativeSeparators("C:/Data/temp/QtServiceFW");
-#else
     // Temporary path for files that are specified explictly in the constructor.
     //QString tempPath = QDir::tempPath();
     QString tempPath = QCoreApplication::applicationDirPath();
     if (tempPath.endsWith("/"))
         tempPath.truncate(tempPath.size() - 1);
     return QDir::toNativeSeparators(tempPath + "/QtServiceFramework_tests/" + QLatin1String(path));
-#endif
 }
 
 void QSfwTestUtil::removeDirectory(const QString &path)
@@ -122,11 +115,13 @@ void QSfwTestUtil::removeDirectory(const QString &path)
     dir.rmpath(path);
 }
 
-#if defined(Q_OS_SYMBIAN) && !defined(__WINS__)
+#if defined(Q_OS_SYMBIAN)
 #include <e32base.h>
-#include <f32file.h>
-void QSfwTestUtil::removeDatabases()
+void QSfwTestUtil::removeDatabases_symbian()
 {
+#if defined(__WINS__) && !defined(SYMBIAN_EMULATOR_SUPPORTS_PERPROCESS_WSD)
+    QDir dir("C:/Data/temp/QtServiceFW");
+#else
     TFindServer findServer(_L("!qsfwdatabasemanagerserver"));
     TFullName name;
     if (findServer.Next(name) == KErrNone)
@@ -139,12 +134,13 @@ void QSfwTestUtil::removeDatabases()
         }
     }    
 
-    RFs fs;
-    fs.Connect();
-    CleanupClosePushL(fs);
-    CFileMan* fileMan=CFileMan::NewL(fs);
-    CleanupStack::PushL(fileMan);
-    fileMan->Delete(_L("c:\\private\\2002AC7F\\QtServiceFramework_4.6_system.db")); //Server's fixed UID3
-    CleanupStack::PopAndDestroy(2, &fs);    
+    QDir dir("c:/private/2002AC7F");
+#endif
+
+    QString qtVersion(qVersion());
+    qtVersion = qtVersion.left(qtVersion.size() - 2); //strip off patch version
+    QString dbIdentifier = "_system";
+    QString dbName = QString("QtServiceFramework_") + qtVersion + dbIdentifier + QLatin1String(".db");
+    QFile::remove(QDir::toNativeSeparators(dir.path() + QDir::separator() + dbName));
 }
 #endif
diff --git a/tests/auto/qsfwtestutil.h b/tests/auto/qsfwtestutil.h
index 9d267c7ced..39d6b2609d 100644
--- a/tests/auto/qsfwtestutil.h
+++ b/tests/auto/qsfwtestutil.h
@@ -61,8 +61,8 @@ public:
     static QString userDirectory();
     static QString systemDirectory();
 
-#if defined(Q_OS_SYMBIAN) && !defined(__WINS__)
-    static void removeDatabases();
+#if defined(Q_OS_SYMBIAN)
+    static void removeDatabases_symbian();
 #endif
 };