Fixes: NB#218452 - Ut_MAppletInstanceManager QFile stubbing has side effects

RevBy: Armin Berres
Details:
 Redone the QFile::exists() override so that it only simulates that known
 files exist, otherwise it does the same what the real QFile::exists() does.

1 files changed, 8 insertions, 24 deletions

diff --git a/tests/ut_mappletinstancemanager/ut_mappletinstancemanager.cpp b/tests/ut_mappletinstancemanager/ut_mappletinstancemanager.cpp
index 576e7845..06bcce5b 100644
--- a/tests/ut_mappletinstancemanager/ut_mappletinstancemanager.cpp
+++ b/tests/ut_mappletinstancemanager/ut_mappletinstancemanager.cpp
@@ -273,10 +273,16 @@ bool QFile::copy(const QString &fileName, const QString &newName)
 QStringList existingFiles;
 bool QFile::exists(const QString &fileName)
 {
-    if(fileName.endsWith("devices.conf"))
+    if (existingFiles.contains(fileName))
         return true;
 
-    return existingFiles.contains(fileName);
+    // Do what the real QFile::exists(const QString&) does
+    return QFileInfo(fileName).exists();
+}
+
+bool QFile::exists() const
+{
+    return QFile::exists(fileName());
 }
 
 // QDir stubs (used by MAppletInstanceManager)
@@ -299,28 +305,6 @@ bool QDir::mkpath(const QString &dirPath) const
     return true;
 }
 
-// QFileInfo stubs (used by MAppletMetaData)
-bool QFileInfo::exists() const
-{
-    return true;
-}
-
-bool QFileInfo::isFile() const
-{
-    return true;
-}
-
-bool QFileInfo::isExecutable() const
-{
-    return true;
-}
-
-// QFile stubs
-bool QFile::exists() const
-{
-    return existingFiles.contains(fileName());
-}
-
 MTestAppletInstanceManager::MTestAppletInstanceManager(const QString &identifier, MDataStore *dataStore) :
     MAppletInstanceManager(identifier, dataStore)
 {