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>

3 files changed, 11 insertions, 11 deletions

diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
index f53803ef0f..076ecc31fc 100644
--- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
+++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
@@ -192,7 +192,7 @@ private slots:
     void quit();
     void processEventsExcludeSocket();
     void processEventsExcludeTimers();
-    void deliverInDefinedOrder_QTBUG19637();
+    void deliverInDefinedOrder();
 
     // keep this test last:
     void nestedLoops();
@@ -566,7 +566,7 @@ void tst_QEventLoop::processEventsExcludeTimers()
 
 Q_DECLARE_METATYPE(QThread*)
 
-namespace DeliverInDefinedOrder_QTBUG19637 {
+namespace DeliverInDefinedOrder {
     enum { NbThread = 3,  NbObject = 500, NbEventQueue = 5, NbEvent = 50 };
 
     struct CustomEvent : public QEvent {
@@ -601,9 +601,9 @@ namespace DeliverInDefinedOrder_QTBUG19637 {
 
 }
 
-void tst_QEventLoop::deliverInDefinedOrder_QTBUG19637()
+void tst_QEventLoop::deliverInDefinedOrder()
 {
-    using namespace DeliverInDefinedOrder_QTBUG19637;
+    using namespace DeliverInDefinedOrder;
     qMetaTypeId<QThread*>();
     QThread threads[NbThread];
     Object objects[NbObject];
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
index 32d5b0bb3c..e0433ea4b0 100644
--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -86,8 +86,7 @@ private slots:
     void isRegistered_data();
     void isRegistered();
     void unregisterType();
-    void QTBUG11316_registerStreamBuiltin();
-
+    void registerStreamBuiltin();
 };
 
 struct Foo { int i; };
@@ -805,7 +804,7 @@ void tst_QMetaType::unregisterType()
     QCOMPARE(QMetaType::isRegistered(typeId), false);
 }
 
-void tst_QMetaType::QTBUG11316_registerStreamBuiltin()
+void tst_QMetaType::registerStreamBuiltin()
 {
     //should not crash;
     qRegisterMetaTypeStreamOperators<QString>("QString");
diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
index f70c380c4a..c66e5ff80b 100644
--- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
+++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
@@ -74,7 +74,7 @@ private slots:
     void singleShotStaticFunctionZeroTimeout();
     void recurseOnTimeoutAndStopTimer();
 
-    void QTBUG13633_dontBlockEvents();
+    void dontBlockEvents();
     void postedEventsShouldNotStarveTimers();
 };
 
@@ -634,7 +634,7 @@ DontBlockEvents::DontBlockEvents()
     count = 0;
     total = 0;
 
-    //QTBUG-13633 need few unrelated timer running to reproduce the bug.
+    // need a few unrelated timers running to reproduce the bug.
     (new QTimer(this))->start(2000);
     (new QTimer(this))->start(2500);
     (new QTimer(this))->start(3000);
@@ -662,8 +662,9 @@ void DontBlockEvents::paintEvent()
     QCOMPARE(count, 0);
 }
 
-
-void tst_QTimer::QTBUG13633_dontBlockEvents()
+// This is a regression test for QTBUG-13633, where a timer with a zero
+// timeout that was restarted by the event handler could starve other timers.
+void tst_QTimer::dontBlockEvents()
 {
     DontBlockEvents t;
     QTest::qWait(60);