summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/io
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/corelib/io')
-rw-r--r--tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp4
-rw-r--r--tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp18
-rw-r--r--tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp2
-rw-r--r--tests/auto/corelib/io/qurl/tst_qurl.cpp4
4 files changed, 14 insertions, 14 deletions
diff --git a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
index eb227625a7..79c96fbdc9 100644
--- a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
@@ -2680,8 +2680,8 @@ void tst_QDataStream::status_QBitArray_data()
// past end
QTest::newRow("empty") << QByteArray() << (int) QDataStream::ReadPastEnd << QBitArray();
QTest::newRow("badsize 0a") << QByteArray("\x00", 1) << (int) QDataStream::ReadPastEnd << QBitArray();
- QTest::newRow("badsize 0a") << QByteArray("\x00\x00", 2) << (int) QDataStream::ReadPastEnd << QBitArray();
- QTest::newRow("badsize 0a") << QByteArray("\x00\x00\x00", 3) << (int) QDataStream::ReadPastEnd << QBitArray();
+ QTest::newRow("badsize 0b") << QByteArray("\x00\x00", 2) << (int) QDataStream::ReadPastEnd << QBitArray();
+ QTest::newRow("badsize 0c") << QByteArray("\x00\x00\x00", 3) << (int) QDataStream::ReadPastEnd << QBitArray();
QTest::newRow("badsize 1") << QByteArray("\x00\x00\x00\x01", 4) << (int) QDataStream::ReadPastEnd << QBitArray();
QTest::newRow("badsize 2") << QByteArray("\x00\x00\x00\x02", 4) << (int) QDataStream::ReadPastEnd << QBitArray();
QTest::newRow("badsize 3") << QByteArray("\x00\x00\x00\x03", 4) << (int) QDataStream::ReadPastEnd << QBitArray();
diff --git a/tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp b/tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp
index fe2e30a95c..b083d3b1c3 100644
--- a/tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp
+++ b/tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp
@@ -241,15 +241,15 @@ void tst_QFileSystemEntry::suffix_data()
QTest::newRow("data1") << "file.tar.gz" << "gz";
QTest::newRow("data2") << "/path/file/file.tar.gz" << "gz";
QTest::newRow("data3") << "/path/file.tar" << "tar";
- QTest::newRow("hidden1") << ".ext1" << "ext1";
- QTest::newRow("hidden1") << ".ext" << "ext";
- QTest::newRow("hidden1") << ".ex" << "ex";
- QTest::newRow("hidden1") << ".e" << "e";
- QTest::newRow("hidden2") << ".ext1.ext2" << "ext2";
- QTest::newRow("hidden2") << ".ext.ext2" << "ext2";
- QTest::newRow("hidden2") << ".ex.ext2" << "ext2";
- QTest::newRow("hidden2") << ".e.ext2" << "ext2";
- QTest::newRow("hidden2") << "..ext2" << "ext2";
+ QTest::newRow("hidden1-1") << ".ext1" << "ext1";
+ QTest::newRow("hidden1-2") << ".ext" << "ext";
+ QTest::newRow("hidden1-3") << ".ex" << "ex";
+ QTest::newRow("hidden1-4") << ".e" << "e";
+ QTest::newRow("hidden2-1") << ".ext1.ext2" << "ext2";
+ QTest::newRow("hidden2-2") << ".ext.ext2" << "ext2";
+ QTest::newRow("hidden2-3") << ".ex.ext2" << "ext2";
+ QTest::newRow("hidden2-4") << ".e.ext2" << "ext2";
+ QTest::newRow("hidden2-5") << "..ext2" << "ext2";
QTest::newRow("dots") << "/path/file.with.dots/file..ext2" << "ext2";
QTest::newRow("dots2") << "/path/file.with.dots/.file..ext2" << "ext2";
}
diff --git a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
index 01aecc2a21..37a1556cf9 100644
--- a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
+++ b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
@@ -2755,7 +2755,7 @@ void tst_QTextStream::double_write_with_flags_data()
QTest::newRow("inf uppercase") << qInf() << QString("INF") << (int)QTextStream::UppercaseDigits << 0;
QTest::newRow("-inf uppercase") << -qInf() << QString("-INF") << (int)QTextStream::UppercaseDigits << 0;
QTest::newRow("nan") << qQNaN() << QString("nan") << 0 << 0;
- QTest::newRow("nan") << qQNaN() << QString("NAN") << (int)QTextStream::UppercaseDigits << 0;
+ QTest::newRow("NAN") << qQNaN() << QString("NAN") << (int)QTextStream::UppercaseDigits << 0;
QTest::newRow("scientific") << 1.234567e+02 << QString("1.234567e+02") << 0 << (int)QTextStream::ScientificNotation;
QTest::newRow("scientific2") << 1.234567e+02 << QString("1.234567e+02") << (int)QTextStream::UppercaseBase << (int)QTextStream::ScientificNotation;
QTest::newRow("scientific uppercase") << 1.234567e+02 << QString("1.234567E+02") << (int)QTextStream::UppercaseDigits << (int)QTextStream::ScientificNotation;
diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp
index e2831036df..a74d817b8a 100644
--- a/tests/auto/corelib/io/qurl/tst_qurl.cpp
+++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp
@@ -3120,8 +3120,8 @@ void tst_QUrl::fromUserInput_data()
QTest::newRow("port-0") << "example.org:80" << portUrl;
QTest::newRow("port-1") << "http://example.org:80" << portUrl;
portUrl.setPath("path");
- QTest::newRow("port-1") << "example.org:80/path" << portUrl;
- QTest::newRow("port-1") << "http://example.org:80/path" << portUrl;
+ QTest::newRow("port-2") << "example.org:80/path" << portUrl;
+ QTest::newRow("port-3") << "http://example.org:80/path" << portUrl;
// mailto doesn't have a ://, but is valid
QUrl mailto("ben@example.net");