Test: remove QSKIP from tst_QTextStream::stillOpenWhenAtEnd
authorCaroline Chao <caroline.chao@digia.com>
Thu, 18 Oct 2012 08:07:28 +0000 (10:07 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 18 Oct 2012 10:24:55 +0000 (12:24 +0200)
Instead omit the whole test when Q_OS_WINCE is defined.

Change-Id: Ifd09048687db95913f39a64cffb42a743af8fa81
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp

index 9e2cd5e..7069ab8 100644 (file)
@@ -188,7 +188,9 @@ private slots:
     void octTest();
     void zeroTermination();
     void ws_manipulator();
+#ifndef Q_OS_WINCE
     void stillOpenWhenAtEnd();
+#endif
     void readNewlines_data();
     void readNewlines();
     void seek();
@@ -1096,6 +1098,8 @@ void tst_QTextStream::ws_manipulator()
 }
 
 // ------------------------------------------------------------------------------
+#ifndef Q_OS_WINCE
+// Qt/CE: Cannot test network on emulator
 void tst_QTextStream::stillOpenWhenAtEnd()
 {
     QFile file(QFINDTESTDATA("tst_qtextstream.cpp"));
@@ -1105,9 +1109,6 @@ void tst_QTextStream::stillOpenWhenAtEnd()
     while (!stream.readLine().isNull()) {}
     QVERIFY(file.isOpen());
 
-#ifdef Q_OS_WINCE
-    QSKIP("Qt/CE: Cannot test network on emulator");
-#endif
     if (!QtNetworkSettings::verifyTestNetworkSettings())
         QSKIP("No network test server available");
 
@@ -1119,6 +1120,7 @@ void tst_QTextStream::stillOpenWhenAtEnd()
     while (!stream2.readLine().isNull()) {}
     QVERIFY(socket.isOpen());
 }
+#endif
 
 // ------------------------------------------------------------------------------
 void tst_QTextStream::readNewlines_data()