Remove Symbian-specific code from tests.

Symbian is not a supported platform for Qt5, so this code is no longer
required.

Change-Id: I1172e6a42d518490e63e9599bf10579df08259aa
Reviewed-on: http://codereview.qt-project.org/5657
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

2 files changed, 18 insertions, 85 deletions

diff --git a/tests/auto/corelib/io/qfileinfo/qfileinfo.pro b/tests/auto/corelib/io/qfileinfo/qfileinfo.pro
index 2fd626a57e..c3b9f4c2e3 100644
--- a/tests/auto/corelib/io/qfileinfo/qfileinfo.pro
+++ b/tests/auto/corelib/io/qfileinfo/qfileinfo.pro
@@ -6,7 +6,7 @@ QT = core-private
 
 RESOURCES      += qfileinfo.qrc
 
-wince*:|symbian: {
+wince* {
     deploy.files += qfileinfo.qrc tst_qfileinfo.cpp
     res.files = resources\\file1 resources\\file1.ext1 resources\\file1.ext1.ext2
     res.path = resources
@@ -15,17 +15,9 @@ wince*:|symbian: {
 
 win32*:LIBS += -ladvapi32 -lnetapi32
 
-symbian {
-    TARGET.CAPABILITY=AllFiles
-    LIBS *= -lefsrv
-    INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE  # Needed for e32svr.h in S^3 envs
-    }
-
 # support for running test from shadow build directory
 wince* {
     DEFINES += SRCDIR=\\\"\\\"
-} else:symbian {
-    # do not define SRCDIR at all
 } else {
     DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
index 1eb59ac96a..212c2f9700 100644
--- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
@@ -64,19 +64,10 @@
 #endif
 #include <qplatformdefs.h>
 #include <qdebug.h>
-#ifdef Q_OS_SYMBIAN
-#include <f32file.h>
-#include <private/qcore_symbian_p.h>
-#endif
 #include "../../../network-settings.h"
 #include <private/qfileinfo_p.h>
 #include "../../../../shared/filesystem.h"
 
-#if defined(Q_OS_SYMBIAN)
-# define SRCDIR ""
-# define NO_SYMLINKS
-#endif
-
 QT_BEGIN_NAMESPACE
 extern Q_AUTOTEST_EXPORT bool qIsLikelyToBeNfs(int /* handle */);
 QT_END_NAMESPACE
@@ -191,7 +182,7 @@ private slots:
 
     void detachingOperations();
 
-#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
+#if !defined(Q_OS_WINCE)
     void owner();
 #endif
     void group();
@@ -211,14 +202,9 @@ tst_QFileInfo::~tst_QFileInfo()
     QFile::remove("dummyfile");
     QFile::remove("simplefile.txt");
     QFile::remove("longFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileName.txt");
-#ifdef Q_OS_SYMBIAN
-    QFile::remove("hidden.txt");
-    QFile::remove("nothidden.txt");
-#else
     QFile::remove("tempfile.txt");
-#endif
 
-#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_UNIX)
     QDir().rmdir("./.hidden-directory");
     QFile::remove("link_to_tst_qfileinfo");
 #endif
@@ -346,7 +332,7 @@ void tst_QFileInfo::isDir_data()
 
     QTest::newRow("broken link") << "brokenlink.lnk" << false;
 
-#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE))
     QTest::newRow("drive 1") << "c:" << true;
     QTest::newRow("drive 2") << "c:/" << true;
     //QTest::newRow("drive 2") << "t:s" << false;
@@ -384,7 +370,7 @@ void tst_QFileInfo::isRoot_data()
 
     QTest::newRow("simple dir") << SRCDIR "resources" << false;
     QTest::newRow("simple dir with slash") << SRCDIR "resources/" << false;
-#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE))
     QTest::newRow("drive 1") << "c:" << false;
     QTest::newRow("drive 2") << "c:/" << true;
     QTest::newRow("drive 3") << "p:/" << false;
@@ -459,7 +445,7 @@ void tst_QFileInfo::absolutePath_data()
     QTest::addColumn<QString>("filename");
 
     QString drivePrefix;
-#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE))
     drivePrefix = QDir::currentPath().left(2);
     QString nonCurrentDrivePrefix =
         drivePrefix.left(1).compare("X", Qt::CaseInsensitive) == 0 ? QString("Y:") : QString("X:");
@@ -508,7 +494,7 @@ void tst_QFileInfo::absFilePath_data()
     QTest::newRow("relativeFile") << "tmp.txt" << QDir::currentPath() + "/tmp.txt";
     QTest::newRow("relativeFileInSubDir") << "temp/tmp.txt" << QDir::currentPath() + "/" + "temp/tmp.txt";
     QString drivePrefix;
-#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE))
     QString curr = QDir::currentPath();
 
     curr.remove(0, 2);   // Make it a absolute path with no drive specifier: \depot\qt-4.2\tests\auto\qfileinfo
@@ -536,7 +522,7 @@ void tst_QFileInfo::absFilePath()
     QFETCH(QString, expected);
 
     QFileInfo fi(file);
-#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_WIN)
     QVERIFY(QString::compare(fi.absoluteFilePath(), expected, Qt::CaseInsensitive) == 0);
 #else
     QCOMPARE(fi.absoluteFilePath(), expected);
@@ -565,7 +551,7 @@ void tst_QFileInfo::canonicalFilePath()
     QFileInfo info("/tmp/../../../../../../../../../../../../../../../../../");
     info.canonicalFilePath();
 
-#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_UNIX)
     // This used to crash on Mac
     QFileInfo dontCrash(QLatin1String("/"));
     QCOMPARE(dontCrash.canonicalFilePath(), QLatin1String("/"));
@@ -582,8 +568,6 @@ void tst_QFileInfo::canonicalFilePath()
             QCOMPARE(info1.canonicalFilePath(), info2.canonicalFilePath());
         }
     }
-#  if !defined(Q_OS_SYMBIAN)
-    // Symbian doesn't support links to directories
     {
         const QString link(QDir::tempPath() + QDir::separator() + "tst_qfileinfo");
         QFile::remove(link);
@@ -624,7 +608,6 @@ void tst_QFileInfo::canonicalFilePath()
             QCOMPARE(info1.canonicalFilePath(), info2.canonicalFilePath());
         }
     }
-#  endif
 #endif
 
 #ifdef Q_OS_WIN
@@ -663,7 +646,7 @@ void tst_QFileInfo::fileName_data()
 
     QTest::newRow("relativeFile") << "tmp.txt" << "tmp.txt";
     QTest::newRow("relativeFileInSubDir") << "temp/tmp.txt" << "tmp.txt";
-#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE))
     QTest::newRow("absFilePath") << "c:\\home\\andy\\tmp.txt" << "tmp.txt";
 #else
     QTest::newRow("absFilePath") << "/home/andy/tmp.txt" << "tmp.txt";
@@ -863,9 +846,6 @@ void tst_QFileInfo::permission()
     QFETCH(QString, file);
     QFETCH(int, perms);
     QFETCH(bool, expected);
-#ifdef Q_OS_SYMBIAN
-    QSKIP("No user based rights in Symbian OS - SOS needs platform security tests instead", SkipAll);
-#endif
     QFileInfo fi(file);
     QCOMPARE(fi.permission(QFile::Permissions(perms)), expected);
 }
@@ -937,7 +917,7 @@ void tst_QFileInfo::compare_data()
     QTest::newRow("casesense1")
         << QString::fromLatin1(SRCDIR "tst_qfileInfo.cpp")
         << QString::fromLatin1(SRCDIR "tst_qfileinfo.cpp")
-#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_WIN)
         << true;
 #elif defined(Q_OS_MAC)
         << !caseSensitiveOnMac;
@@ -960,7 +940,7 @@ void tst_QFileInfo::consistent_data()
     QTest::addColumn<QString>("file");
     QTest::addColumn<QString>("expected");
 
-#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_WIN)
     QTest::newRow("slashes") << QString::fromLatin1("\\a\\a\\a\\a") << QString::fromLatin1("/a/a/a/a");
 #endif
     QTest::newRow("ending slash") << QString::fromLatin1("/a/somedir/") << QString::fromLatin1("/a/somedir/");
@@ -1011,9 +991,6 @@ void tst_QFileInfo::fileTimes()
 #if defined(Q_OS_WINCE)
         QEXPECT_FAIL("longfile", "No long filenames on WinCE", Abort);
         QEXPECT_FAIL("longfile absolutepath", "No long filenames on WinCE", Abort);
-#elif defined(Q_OS_SYMBIAN)
-        QEXPECT_FAIL("longfile", "Maximum total filepath cannot exceed 256 characters in Symbian", Abort);
-        QEXPECT_FAIL("longfile absolutepath", "Maximum total filepath cannot exceed 256 characters in Symbian", Abort);
 #endif
         QVERIFY(file.open(QFile::WriteOnly | QFile::Text));
 #ifdef Q_OS_UNIX
@@ -1061,9 +1038,6 @@ void tst_QFileInfo::fileTimes()
 #ifdef Q_OS_WINCE
     QEXPECT_FAIL("simple", "WinCE only stores date of access data, not the time", Continue);
 #endif
-#ifdef Q_OS_SYMBIAN
-        QEXPECT_FAIL("simple", "Symbian implementation of stat doesn't return read time right", Abort);
-#endif
     QVERIFY(fileInfo.lastRead() > beforeRead);
     QVERIFY(fileInfo.lastModified() > beforeWrite);
     QVERIFY(fileInfo.lastModified() < beforeRead);
@@ -1176,7 +1150,7 @@ void tst_QFileInfo::isHidden_data()
     QTest::newRow("C:/path/to/hidden-directory") << QDir::currentPath() + QString::fromLatin1("/hidden-directory") << true;
     QTest::newRow("C:/path/to/hidden-directory/.") << QDir::currentPath() + QString::fromLatin1("/hidden-directory/.") << true;
 #endif
-#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_UNIX)
     QVERIFY(QDir("./.hidden-directory").exists() || QDir().mkdir("./.hidden-directory"));
     QTest::newRow("/path/to/.hidden-directory") << QDir::currentPath() + QString("/.hidden-directory") << true;
     QTest::newRow("/path/to/.hidden-directory/.") << QDir::currentPath() + QString("/.hidden-directory/.") << true;
@@ -1186,7 +1160,7 @@ void tst_QFileInfo::isHidden_data()
 #if defined(Q_OS_MAC)
     // /bin has the hidden attribute on Mac OS X
     QTest::newRow("/bin/") << QString::fromLatin1("/bin/") << true;
-#elif !defined(Q_OS_WIN) && !defined(Q_OS_SYMBIAN)
+#elif !defined(Q_OS_WIN)
     QTest::newRow("/bin/") << QString::fromLatin1("/bin/") << false;
 #endif
 
@@ -1195,35 +1169,6 @@ void tst_QFileInfo::isHidden_data()
     QTest::newRow("mac_private_etc") << QString::fromLatin1("/private/etc") << false;
     QTest::newRow("mac_Applications") << QString::fromLatin1("/Applications") << false;
 #endif
-
-#ifdef Q_OS_SYMBIAN
-    // No guaranteed hidden file knows to exist in Symbian filesystem, so make one.
-    QString hiddenFileName("hidden.txt");
-    QString notHiddenFileName("nothidden.txt");
-    QTest::newRow("hidden file") << hiddenFileName << true;
-    QTest::newRow("non-hidden file") << notHiddenFileName << false;
-
-    {
-        QFile file(hiddenFileName);
-        QVERIFY(file.open(QIODevice::WriteOnly));
-        QTextStream t(&file);
-        t << "foobar";
-
-        QFile file2(notHiddenFileName);
-        QVERIFY(file2.open(QIODevice::WriteOnly));
-        QTextStream t2(&file2);
-        t2 << "foobar";
-    }
-
-    RFs rfs;
-    TInt err = rfs.Connect();
-    QCOMPARE(err, KErrNone);
-    HBufC* symFile = qt_QString2HBufC(hiddenFileName);
-    err = rfs.SetAtt(*symFile, KEntryAttHidden, 0);
-    rfs.Close();
-    delete symFile;
-    QCOMPARE(err, KErrNone);
-#endif
 }
 
 void tst_QFileInfo::isHidden()
@@ -1508,7 +1453,7 @@ void tst_QFileInfo::isWritable()
     QVERIFY(fi.exists());
     QVERIFY(!fi.isWritable());
 #endif
-#if defined (Q_OS_UNIX) && !defined (Q_OS_SYMBIAN)
+#if defined (Q_OS_UNIX)
     if (::getuid() == 0)
         QVERIFY(QFileInfo("/etc/passwd").isWritable());
     else
@@ -1518,14 +1463,10 @@ void tst_QFileInfo::isWritable()
 
 void tst_QFileInfo::isExecutable()
 {
-#ifdef Q_OS_SYMBIAN
-    QString appPath = "c:/sys/bin/tst_qfileinfo.exe";
-#else
     QString appPath = QCoreApplication::applicationDirPath();
     appPath += "/tst_qfileinfo";
-# if defined(Q_OS_WIN)
+#if defined(Q_OS_WIN)
     appPath += ".exe";
-# endif
 #endif
     QFileInfo fi(appPath);
     QCOMPARE(fi.isExecutable(), true);
@@ -1652,7 +1593,7 @@ void tst_QFileInfo::detachingOperations()
     QVERIFY(!info1.caching());
 }
 
-#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
+#if !defined(Q_OS_WINCE)
 #if defined (Q_OS_WIN)
 BOOL IsUserAdmin()
 {
@@ -1743,7 +1684,7 @@ void tst_QFileInfo::owner()
 void tst_QFileInfo::group()
 {
     QString expected;
-#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_UNIX)
     struct group *gr;
     gid_t gid = getegid();
     gr = getgrgid(gid);