FCL/sf/mw/qt: comparison tests/benchmarks/qfile/main.cpp

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 void removeSmallFiles();
 QString filename;
 QString tmpDirName;
 };
+Q_DECLARE_METATYPE(tst_qfile::BenchmarkType)
+Q_DECLARE_METATYPE(QIODevice::OpenMode)
+Q_DECLARE_METATYPE(QIODevice::OpenModeFlag)
 void tst_qfile::createFile()
 {
+removeFile();  // Cleanup in case previous test case aborted before cleaning up
 QTemporaryFile tmpFile;
 tmpFile.setAutoRemove(false);
 if (!tmpFile.open())
-::_exit(1);
+::exit(1);
 filename = tmpFile.fileName();
 tmpFile.close();
 }
 void tst_qfile::removeFile()
 if (b & QIODevice::Unbuffered) flagstring += "unbuffered ";
 if (flagstring.isEmpty())      flagstring = "none";
 for (int i=0; i<bs_entries; ++i)
 QTest::newRow((QString("BS: %1, Flags: %2" )).arg(bs[i]).arg(flagstring).toLatin1().constData()) << type << bs[i] << t << b;
 }
 void tst_qfile::readBigFile()
 {
 QFETCH(tst_qfile::BenchmarkType, testType);
 QFETCH(int, blockSize);
 QFETCH(QFile::OpenModeFlag, textMode);
 QFETCH(QFile::OpenModeFlag, bufferedMode);
-char buffer[BUFSIZE]; // we can't allocate buffers nice and dynamically in c++
+#ifndef Q_OS_WIN
-removeFile();
+if (testType == Win32Benchmark)
+QSKIP("This is Windows only benchmark.", SkipSingle);
+#endif
+char *buffer = new char[BUFSIZE];
 createFile();
 fillFile();
 switch (testType) {
 case(QFileBenchmark): {
 QFAIL("Not running on a non-Windows platform!");
 #endif
 }
 break;
 }
+removeFile();
+delete[] buffer;
 }
 void tst_qfile::seek_data()
 {
 QTest::addColumn<tst_qfile::BenchmarkType>("testType");
 QFAIL("Not running on a Windows plattform!");
 #endif
 }
 break;
 }
+removeFile();
 }
 void tst_qfile::open_data()
 {
 QTest::addColumn<tst_qfile::BenchmarkType>("testType");
 void tst_qfile::open()
 {
 QFETCH(tst_qfile::BenchmarkType, testType);
-removeFile();
 createFile();
 switch (testType) {
 case(QFileBenchmark): {
 QBENCHMARK {
 QBENCHMARK {
 QFile file;
 file.open(cfile, QIODevice::ReadOnly);
 file.close();
 }
+::fclose(cfile);
 }
 break;
 case(Win32Benchmark): {
 #ifdef Q_OS_WIN
 HANDLE hndl;
 #endif
 }
 break;
 }
+removeFile();
 }
 void tst_qfile::readSmallFiles_QFile() { readSmallFiles(); }
 void tst_qfile::readSmallFiles_QFSFileEngine() { readSmallFiles(); }
 }
 void tst_qfile::createSmallFiles()
 {
 QDir dir = QDir::temp();
-Q_ASSERT(dir.mkdir("tst"));
+dir.mkdir("tst");
 dir.cd("tst");
 tmpDirName = dir.absolutePath();
+#ifdef Q_OS_SYMBIAN
+for (int i = 0; i < 100; ++i)
+#else
 for (int i = 0; i < 1000; ++i)
+#endif
 {
 QFile f(tmpDirName+"/"+QString::number(i));
 f.open(QIODevice::WriteOnly);
-f.seek(512);
+f.seek(511);
+f.putChar('\n');
 f.close();
 }
 }
 void tst_qfile::removeSmallFiles()
 QFETCH(tst_qfile::BenchmarkType, testType);
 QFETCH(int, blockSize);
 QFETCH(QFile::OpenModeFlag, textMode);
 QFETCH(QFile::OpenModeFlag, bufferedMode);
-removeSmallFiles();
+#ifndef Q_OS_WIN
+if (testType == Win32Benchmark)
+QSKIP("This is Windows only benchmark.", SkipSingle);
+#endif
 createSmallFiles();
 QDir dir(tmpDirName);
-const QStringList files = dir.entryList(QDir::NoDotAndDotDot|QDir::NoSymLinks);
+const QStringList files = dir.entryList(QDir::NoDotAndDotDot|QDir::NoSymLinks|QDir::Files);
-char buffer[BUFSIZE]; // we can't allocate buffers nice and dynamically in c++
+char *buffer = new char[BUFSIZE];
 switch (testType) {
 case(QFileBenchmark): {
 QList<QFile*> fileList;
 Q_FOREACH(QString file, files) {
-QFile *f = new QFile(file);
+QFile *f = new QFile(tmpDirName+ "/" + file);
 f->open(QIODevice::ReadOnly|textMode|bufferedMode);
 fileList.append(f);
 }
 QBENCHMARK {
 }
 break;
 case(QFSFileEngineBenchmark): {
 QList<QFSFileEngine*> fileList;
 Q_FOREACH(QString file, files) {
-QFSFileEngine *fse = new QFSFileEngine(file);
+QFSFileEngine *fse = new QFSFileEngine(tmpDirName+ "/" + file);
 fse->open(QIODevice::ReadOnly|textMode|bufferedMode);
 fileList.append(fse);
 }
 QBENCHMARK {
 }
 break;
 case(PosixBenchmark): {
 QList<FILE*> fileList;
 Q_FOREACH(QString file, files) {
-fileList.append(::fopen(QFile::encodeName(file).constData(), "rb"));
+fileList.append(::fopen(QFile::encodeName(tmpDirName+ "/" + file).constData(), "rb"));
 }
 QBENCHMARK {
 Q_FOREACH(FILE* cfile, fileList) {
 while(!feof(cfile))
 QFAIL("Not running on a non-Windows platform!");
 #endif
 }
 break;
 }
-}
+removeSmallFiles();
-Q_DECLARE_METATYPE(tst_qfile::BenchmarkType)
+delete[] buffer;
-Q_DECLARE_METATYPE(QIODevice::OpenMode)
+}
-Q_DECLARE_METATYPE(QIODevice::OpenModeFlag)
 QTEST_MAIN(tst_qfile)
 #include "main.moc"

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7