Promote openStandardStreams sub-tests to top level

Commit a72468e820c2922540737c053eef27d033c2e77b split the test into two
functions, but kept them combined in a single slot for QTest to invoke.

That being the case, we might as well have them as test functions of
their own right. Should work nicer with test failures, skips and such.

Change-Id: I62c1fc7777c08b3e87a5903632d73dc1e1d97e1a
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp
index 0f9293f..300f30e 100644 (file)
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -199,7 +199,8 @@ private slots:
     void mapOpenMode_data();
     void mapOpenMode();
 
-    void openStandardStreams();
+    void openStandardStreamsFileDescriptors();
+    void openStandardStreamsBufferedStreams();
 
     void resize_data();
     void resize();
@@ -228,9 +229,6 @@ private:
         NumberOfFileTypes
     };
 
-    void openStandardStreamsFileDescriptors();
-    void openStandardStreamsBufferedStreams();
-
     bool openFd(QFile &file, QIODevice::OpenMode mode, QFile::FileHandleFlags handleFlags)
     {
         int fdMode = QT_OPEN_LARGEFILE | QT_OPEN_BINARY;
@@ -3034,12 +3032,6 @@ void tst_QFile::openStandardStreamsBufferedStreams()
     }
 }
 
-void tst_QFile::openStandardStreams()
-{
-    openStandardStreamsFileDescriptors();
-    openStandardStreamsBufferedStreams();
-}
-
 void tst_QFile::writeNothing()
 {
     for (int i = 0; i < NumberOfFileTypes; ++i) {