Cleanup corelib autotests

Bug trackers come and go, so using bug identifiers in function and test
case names will ensure that those names eventually become meaningless.
It is better to choose a meaningful name and provide explanatory
comments where appropriate.

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

4 files changed, 54 insertions, 46 deletions

diff --git a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
index 771e79e79e..01fb35c74c 100644
--- a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
+++ b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
@@ -121,7 +121,7 @@ private slots:
     void uncPaths_data();
     void uncPaths();
 #endif
-    void qtbug15421_hiddenDirs_hiddenFiles();
+    void hiddenDirs_hiddenFiles();
 };
 
 tst_QDirIterator::tst_QDirIterator()
@@ -171,19 +171,19 @@ tst_QDirIterator::tst_QDirIterator()
 #endif
 
 #if !defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
-    createDirectory("qtbug15421_hiddenDirs_hiddenFiles");
-    createFile("qtbug15421_hiddenDirs_hiddenFiles/normalFile");
-    createFile("qtbug15421_hiddenDirs_hiddenFiles/.hiddenFile");
-    createDirectory("qtbug15421_hiddenDirs_hiddenFiles/normalDirectory");
-    createDirectory("qtbug15421_hiddenDirs_hiddenFiles/.hiddenDirectory");
-    createFile("qtbug15421_hiddenDirs_hiddenFiles/normalDirectory/normalFile");
-    createFile("qtbug15421_hiddenDirs_hiddenFiles/normalDirectory/.hiddenFile");
-    createFile("qtbug15421_hiddenDirs_hiddenFiles/.hiddenDirectory/normalFile");
-    createFile("qtbug15421_hiddenDirs_hiddenFiles/.hiddenDirectory/.hiddenFile");
-    createDirectory("qtbug15421_hiddenDirs_hiddenFiles/normalDirectory/normalDirectory");
-    createDirectory("qtbug15421_hiddenDirs_hiddenFiles/normalDirectory/.hiddenDirectory");
-    createDirectory("qtbug15421_hiddenDirs_hiddenFiles/.hiddenDirectory/normalDirectory");
-    createDirectory("qtbug15421_hiddenDirs_hiddenFiles/.hiddenDirectory/.hiddenDirectory");
+    createDirectory("hiddenDirs_hiddenFiles");
+    createFile("hiddenDirs_hiddenFiles/normalFile");
+    createFile("hiddenDirs_hiddenFiles/.hiddenFile");
+    createDirectory("hiddenDirs_hiddenFiles/normalDirectory");
+    createDirectory("hiddenDirs_hiddenFiles/.hiddenDirectory");
+    createFile("hiddenDirs_hiddenFiles/normalDirectory/normalFile");
+    createFile("hiddenDirs_hiddenFiles/normalDirectory/.hiddenFile");
+    createFile("hiddenDirs_hiddenFiles/.hiddenDirectory/normalFile");
+    createFile("hiddenDirs_hiddenFiles/.hiddenDirectory/.hiddenFile");
+    createDirectory("hiddenDirs_hiddenFiles/normalDirectory/normalDirectory");
+    createDirectory("hiddenDirs_hiddenFiles/normalDirectory/.hiddenDirectory");
+    createDirectory("hiddenDirs_hiddenFiles/.hiddenDirectory/normalDirectory");
+    createDirectory("hiddenDirs_hiddenFiles/.hiddenDirectory/.hiddenDirectory");
 #endif
 }
 
@@ -590,7 +590,7 @@ void tst_QDirIterator::uncPaths()
 }
 #endif
 
-void tst_QDirIterator::qtbug15421_hiddenDirs_hiddenFiles()
+void tst_QDirIterator::hiddenDirs_hiddenFiles()
 {
     // In Unix it is easy to create hidden files, but in Windows it requires
     // a special call since hidden files need to be "marked" while in Unix
@@ -603,7 +603,7 @@ void tst_QDirIterator::qtbug15421_hiddenDirs_hiddenFiles()
     {
         int matches = 0;
         int failures = 0;
-        QDirIterator di("qtbug15421_hiddenDirs_hiddenFiles", QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+        QDirIterator di("hiddenDirs_hiddenFiles", QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
         while (di.hasNext()) {
             ++matches;
             QString filename = di.next();
@@ -617,7 +617,7 @@ void tst_QDirIterator::qtbug15421_hiddenDirs_hiddenFiles()
     {
         int matches = 0;
         int failures = 0;
-        QDirIterator di("qtbug15421_hiddenDirs_hiddenFiles", QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+        QDirIterator di("hiddenDirs_hiddenFiles", QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
         while (di.hasNext()) {
             ++matches;
             QString filename = di.next();
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
index 08a5e3ae3d..58198f85fa 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
+++ b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
@@ -83,7 +83,7 @@ private slots:
 
     void cleanup();
 
-    void QTBUG15255_deadlock();
+    void destroyAfterQCoreApplication();
 private:
     QStringList do_force_engines;
     bool do_force_native;
@@ -543,13 +543,15 @@ public:
 
 Q_GLOBAL_STATIC(SomeSingleton, someSingleton)
 
-void tst_QFileSystemWatcher::QTBUG15255_deadlock()
+// This is a regression test for QTBUG-15255, where a deadlock occurred if a
+// QFileSystemWatcher was destroyed after the QCoreApplication instance had
+// been destroyed.  There are no explicit verification steps in this test --
+// it is sufficient that the test terminates.
+void tst_QFileSystemWatcher::destroyAfterQCoreApplication()
 {
     someSingleton()->bla();
-    //the test must still finish
     QTest::qWait(30);
 }
 
-
 QTEST_MAIN(tst_QFileSystemWatcher)
 #include "tst_qfilesystemwatcher.moc"
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 293d30d487..03366aabff 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -129,7 +129,7 @@ private slots:
     void dontReorderIniKeysNeedlessly();
 #endif
 #if defined(Q_OS_WIN)
-    void qtbug_13249();
+    void consistentRegistryStorage();
 #endif
 
     void testVariantTypes_data();
@@ -3114,19 +3114,21 @@ static DWORD readKeyType(HKEY handle, const QString &rSubKey)
     return 0;
 }
 
-void tst_QSettings::qtbug_13249()
+// This is a regression test for QTBUG-13249, where QSettings was storing
+// signed integers as numeric values and unsigned integers as strings.
+void tst_QSettings::consistentRegistryStorage()
 {
     QSettings settings1(QSettings::UserScope, "software.org", "KillerAPP");
 
     qint32 x = 1024;
-    settings1.setValue("qtbug_13249_a", (qint32)x);
-    QCOMPARE(settings1.value("qtbug_13249_a").toInt(), (qint32)1024);
-    settings1.setValue("qtbug_13249_b", (quint32)x);
-    QCOMPARE(settings1.value("qtbug_13249_b").toUInt(), (quint32)1024);
-    settings1.setValue("qtbug_13249_c", (qint64)x);
-    QCOMPARE(settings1.value("qtbug_13249_c").toLongLong(), (qint64)1024);
-    settings1.setValue("qtbug_13249_d", (quint64)x);
-    QCOMPARE(settings1.value("qtbug_13249_d").toULongLong(), (quint64)1024);
+    settings1.setValue("qint32_value", (qint32)x);
+    QCOMPARE(settings1.value("qint32_value").toInt(), (qint32)1024);
+    settings1.setValue("quint32_value", (quint32)x);
+    QCOMPARE(settings1.value("quint32_value").toUInt(), (quint32)1024);
+    settings1.setValue("qint64_value", (qint64)x);
+    QCOMPARE(settings1.value("qint64_value").toLongLong(), (qint64)1024);
+    settings1.setValue("quint64_value", (quint64)x);
+    QCOMPARE(settings1.value("quint64_value").toULongLong(), (quint64)1024);
     settings1.sync();
 
     HKEY handle;
@@ -3136,19 +3138,19 @@ void tst_QSettings::qtbug_13249()
     if (res == ERROR_SUCCESS)
     {
         DWORD dataType;
-        dataType = readKeyType(handle, QString("qtbug_13249_a"));
+        dataType = readKeyType(handle, QString("qint32_value"));
         if (dataType != 0) {
             QCOMPARE((int)REG_DWORD, (int)dataType);
         }
-        dataType = readKeyType(handle, QString("qtbug_13249_b"));
+        dataType = readKeyType(handle, QString("quint32_value"));
         if (dataType != 0) {
             QCOMPARE((int)REG_DWORD, (int)dataType);
         }
-        dataType = readKeyType(handle, QString("qtbug_13249_c"));
+        dataType = readKeyType(handle, QString("qint64_value"));
         if (dataType != 0) {
             QCOMPARE((int)REG_QWORD, (int)dataType);
         }
-        dataType = readKeyType(handle, QString("qtbug_13249_d"));
+        dataType = readKeyType(handle, QString("quint64_value"));
         if (dataType != 0) {
             QCOMPARE((int)REG_QWORD, (int)dataType);
         }
diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp
index c5e4d87908..f565989394 100644
--- a/tests/auto/corelib/io/qurl/tst_qurl.cpp
+++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp
@@ -188,10 +188,10 @@ private slots:
     void binaryData();
     void fromUserInput_data();
     void fromUserInput();
-    void task_199967();
-    void task_240612();
-    void taskQTBUG_6962();
-    void taskQTBUG_8701();
+    void isEmptyForEncodedUrl();
+    void toEncodedNotUsingUninitializedPath();
+    void emptyAuthorityRemovesExistingAuthority();
+    void acceptEmptyAuthoritySegments();
     void removeAllEncodedQueryItems_data();
     void removeAllEncodedQueryItems();
 };
@@ -3131,7 +3131,10 @@ void tst_QUrl::fromUserInput()
     QCOMPARE(url, guessUrlFromString);
 }
 
-void tst_QUrl::task_199967()
+// This is a regression test for a previously fixed bug where isEmpty didn't
+// work for an encoded URL that was yet to be decoded.  The test checks that
+// isEmpty works for an encoded URL both after and before decoding.
+void tst_QUrl::isEmptyForEncodedUrl()
 {
     {
         QUrl url;
@@ -3149,7 +3152,9 @@ void tst_QUrl::task_199967()
     }
 }
 
-void tst_QUrl::task_240612()
+// This test verifies that the QUrl::toEncoded() does not rely on the
+// potentially uninitialized unencoded path.
+void tst_QUrl::toEncodedNotUsingUninitializedPath()
 {
     QUrl url;
     url.setEncodedPath("test.txt");
@@ -3210,23 +3215,22 @@ void tst_QUrl::resolvedWithAbsoluteSchemes_data() const
         << QUrl::fromEncoded("http://andreas:hemmelig@www.vg.no/?my=query&your=query#yougotfragged");
 }
 
-void tst_QUrl::taskQTBUG_6962()
+void tst_QUrl::emptyAuthorityRemovesExistingAuthority()
 {
-    //bug 6962: empty authority ignored by setAuthority
     QUrl url("http://example.com/something");
     url.setAuthority(QString());
     QCOMPARE(url.authority(), QString());
 }
 
-void tst_QUrl::taskQTBUG_8701()
+void tst_QUrl::acceptEmptyAuthoritySegments()
 {
-    //bug 8701: foo:///bar mangled to foo:/bar
+    // Verify that foo:///bar is not mangled to foo:/bar
     QString foo_triple_bar("foo:///bar"), foo_uni_bar("foo:/bar");
 
     QCOMPARE(foo_triple_bar, QUrl(foo_triple_bar).toString());
     QCOMPARE(foo_uni_bar, QUrl(foo_uni_bar).toString());
 
-    QCOMPARE(foo_triple_bar, QUrl(foo_triple_bar, QUrl::StrictMode).toString()); // fails
+    QCOMPARE(foo_triple_bar, QUrl(foo_triple_bar, QUrl::StrictMode).toString());
     QCOMPARE(foo_uni_bar, QUrl(foo_uni_bar, QUrl::StrictMode).toString());
 }