Cleanup corelib autotests

Remove various disabled and/or non-helpful debugging code.

Any test diagnostics that are useful should be part of the regular test
output, as the CI system cannot switch on commented-out code when there
is a test failure.  Diagnostics should also be informative -- simply
printing the value of a variable with no other information about what is
being printed (or why it is being printed) is not informative.

Change-Id: I21a6c2121be86001bb57e80f426507b6e619ee9e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

5 files changed, 10 insertions, 25 deletions

diff --git a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
index dde965b13a..35f27fe40e 100644
--- a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
@@ -1470,12 +1470,6 @@ void tst_QDataStream::readQImage(QDataStream *s)
 
 //     ################ Bug : ref and orig has ff in alpha; readback has 0
 //     ### (Was like this in 1.44 as well)
-//
-//    for(int i = 0; i < d12.height(); i++)
-//        for(int j = 0; j < d12.width(); j++)
-//            if (d12.pixel(j, i) != ref.pixel(j, i))
-//                qDebug("Feil %i %i", j, i);
-//
 }
 
 // ************************************
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
index 63f51f743c..08a5e3ae3d 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
+++ b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
@@ -161,7 +161,7 @@ void tst_QFileSystemWatcher::basicTest()
     testFile.write(QByteArray("world"));
     testFile.close();
 
-    // qDebug() << "waiting max 5 seconds for notification for file modification to trigger(1)";
+    // waiting max 5 seconds for notification for file modification to trigger
     timer.start(5000);
     eventLoop.exec();
 
@@ -179,7 +179,7 @@ void tst_QFileSystemWatcher::basicTest()
     testFile.write(QByteArray("hello universe!"));
     testFile.close();
 
-    // qDebug() << "waiting max 5 seconds for notification for file modification to trigger (2)";
+    // waiting max 5 seconds for notification for file modification to trigger
     timer.start(5000);
     eventLoop.exec();
 
@@ -206,7 +206,7 @@ void tst_QFileSystemWatcher::basicTest()
     // change the permissions, should get a signal from the watcher
     testFile.setPermissions(QFile::ReadOwner);
 
-    // qDebug() << "waiting max 5 seconds for notification for file permission modification to trigger(1)";
+    // waiting max 5 seconds for notification for file permission modification to trigger
     timer.start(5000);
     eventLoop.exec();
 
@@ -222,7 +222,7 @@ void tst_QFileSystemWatcher::basicTest()
     watcher.removePath(testFile.fileName());
     testFile.setPermissions(QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOther);
 
-    // qDebug() << "waiting max 5 seconds for notification for file modification to trigger (2)";
+    // waiting max 5 seconds for notification for file modification to trigger
     timer.start(5000);
     eventLoop.exec();
 
@@ -234,7 +234,7 @@ void tst_QFileSystemWatcher::basicTest()
     // remove the file, should get a signal from the watcher
     QVERIFY(testFile.remove());
 
-    // qDebug() << "waiting max 5 seconds for notification for file removal to trigger";
+    // waiting max 5 seconds for notification for file removal to trigger
     timer.start(5000);
     eventLoop.exec();
 
@@ -251,7 +251,7 @@ void tst_QFileSystemWatcher::basicTest()
     testFile.write(QByteArray("hello"));
     testFile.close();
 
-    // qDebug() << "waiting max 5 seconds for notification for file recreation to trigger";
+    // waiting max 5 seconds for notification for file recreation to trigger
     timer.start(5000);
     eventLoop.exec();
 
@@ -292,7 +292,7 @@ void tst_QFileSystemWatcher::watchDirectory()
     QVERIFY(testFile.open(QIODevice::WriteOnly | QIODevice::Truncate));
     testFile.close();
 
-    // qDebug() << "waiting max 5 seconds for notification for file recreationg to trigger";
+    // waiting max 5 seconds for notification for file recreationg to trigger
     timer.start(5000);
     eventLoop.exec();
 
@@ -309,7 +309,7 @@ void tst_QFileSystemWatcher::watchDirectory()
     // remove the directory, should get a signal from the watcher
     QVERIFY(QDir().rmdir("testDir"));
 
-    // qDebug() << "waiting max 5 seconds for notification for directory removal to trigger";
+    // waiting max 5 seconds for notification for directory removal to trigger
     timer.start(5000);
     eventLoop.exec();
 
@@ -331,7 +331,7 @@ void tst_QFileSystemWatcher::watchDirectory()
     if (!QDir().mkdir("testDir"))
         QSKIP("Failed to recreate directory, skipping final test.");
 
-    // qDebug() << "waiting max 5 seconds for notification for dir recreation to trigger";
+    // waiting max 5 seconds for notification for dir recreation to trigger
     timer.start(5000);
     eventLoop.exec();
 
diff --git a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
index 1f8ae1fac1..4a2dfb3f22 100644
--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
@@ -333,13 +333,7 @@ void tst_QResourceEngine::checkStructure()
 
         // Test the Dir filter
         QFileInfoList list = dir.entryInfoList(QDir::Dirs, QDir::Name);
-//           for(int i = 0; i < list.size(); ++i)
-//               qDebug() << "one" << i << list.at(i).fileName();
-//           for(int i = 0; i < containedDirs.size(); ++i)
-//               qDebug() << "two" << i << containedDirs.at(i);
-//           qDebug() << "one" << list.size() << containedDirs.size();
-       QCOMPARE(list.size(), containedDirs.size());
-//         qDebug() << "two";
+        QCOMPARE(list.size(), containedDirs.size());
 
         int i;
         for (i=0; i<list.size(); ++i) {
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index c9b9183daf..ab6733889a 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -2391,7 +2391,6 @@ void tst_QSettings::testEscapes()
     { \
         QVariant v(val); \
         QString s = QSettingsPrivate::variantToString(v); \
-        /*qDebug() << QString("testVariant(): reference=\"%1\" result=\"%2\"").arg(escStr).arg(s); */\
         QCOMPARE(s, escStr); \
         QCOMPARE(QVariant(QSettingsPrivate::stringToVariant(escStr)), v); \
         QVERIFY(val == v.func()); \
diff --git a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
index b7169dc57b..67abd0939b 100644
--- a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
+++ b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
@@ -74,7 +74,6 @@ private slots:
 private:
     void setCustomLocations() {
         m_thisDir = QFile::decodeName(SRCDIR);
-        //qDebug() << m_thisDir;
         m_thisDir.chop(1); // remove trailing slash!
 
         qputenv("XDG_CONFIG_HOME", QFile::encodeName(m_thisDir));
@@ -140,7 +139,6 @@ void tst_qstandardpaths::testLocateAll()
 {
 #ifdef Q_XDG_PLATFORM
     const QStringList appsDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "applications", QStandardPaths::LocateDirectory);
-    //qDebug() << appsDirs;
     foreach (const QString &dir, appsDirs)
         QVERIFY2(dir.endsWith(QLatin1String("/share/applications")), qPrintable(dir));