summaryrefslogtreecommitdiffstats
path: root/tests/auto/networkselftest
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2012-02-14 15:47:27 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-13 14:30:47 +0200
commitc7deafc99167d4115f5ff33d663e43dbbc1bc4da (patch)
treedfd4635c7cdc9b09a4706b9c73058157f1240872 /tests/auto/networkselftest
parent90dc28900d3abfb00a65fef1d9daf36e727dfdca (diff)
Remove fileLineEndingTest from networkselftest.
The fileLineEndingTest case doesn't test network in any way and it is conceptually wrong, too, as any tests where line endings are an issue should be handled with .gitattributes rather than forcing user to check out the repo with unix line endings. Task-number: QTBUG-24271 Change-Id: I73986993edc227cb68b8f61d51cc1cf458d20989 Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com> (cherry picked from commit fc8f92106d6743d4165de7d8a440b7e5dbd14391) Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'tests/auto/networkselftest')
-rw-r--r--tests/auto/networkselftest/tst_networkselftest.cpp26
1 files changed, 0 insertions, 26 deletions
diff --git a/tests/auto/networkselftest/tst_networkselftest.cpp b/tests/auto/networkselftest/tst_networkselftest.cpp
index e87cf5b431..59030a13ce 100644
--- a/tests/auto/networkselftest/tst_networkselftest.cpp
+++ b/tests/auto/networkselftest/tst_networkselftest.cpp
@@ -77,7 +77,6 @@ private slots:
void serverReachability();
void remotePortsOpen_data();
void remotePortsOpen();
- void fileLineEndingTest();
// specific protocol tests
void ftpServer();
@@ -475,31 +474,6 @@ void tst_NetworkSelfTest::remotePortsOpen()
QVERIFY(socket.state() == QAbstractSocket::ConnectedState);
}
-
-void tst_NetworkSelfTest::fileLineEndingTest()
-{
- QString referenceName = SRCDIR "/rfc3252.txt";
- long long expectedReferenceSize = 25962;
-
- QString lineEndingType("LF");
-
- QFile reference(referenceName);
- QVERIFY(reference.open(QIODevice::ReadOnly));
- QByteArray byteLine = reference.readLine();
- if(byteLine.endsWith("\r\n"))
- lineEndingType = "CRLF";
- else if(byteLine.endsWith("\r"))
- lineEndingType = "CR";
-
- QString referenceAsTextData;
- QFile referenceAsText(referenceName);
- QVERIFY(referenceAsText.open(QIODevice::ReadOnly));
- referenceAsTextData = referenceAsText.readAll();
-
- QVERIFY2(expectedReferenceSize == referenceAsTextData.length(), QString("Reference file %1 has %2 as line ending and file size not matching - Git checkout issue !?!").arg(referenceName, lineEndingType).toLocal8Bit());
- QVERIFY2(!lineEndingType.compare("LF"), QString("Reference file %1 has %2 as line ending - Git checkout issue !?!").arg(referenceName, lineEndingType).toLocal8Bit());
-}
-
static QList<Chat> ftpChat(const QByteArray &userSuffix = QByteArray())
{
QList<Chat> rv;