FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix trailing '\r' test failure on Windows

Browse Source 
Windows implementation of fwrite changes \n to \r\n
for files opened in text mode.
It caused failures in TestMerge and TestParse when
comparing written files against reference data.

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
This commit is contained in:
Jeremie Guichard 2017-02-25 23:00:58 +07:00 committed by Dirk Hohndel
parent 08bc1edc81
commit f28aab7bd9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/testmerge.cpp
View File

@ -29,7 +29,7 @@ void TestMerge::testMergeEmpty()
QStringList readin = orgS.readAll().split("\n");
QStringList written = outS.readAll().split("\n");
while(readin.size() && written.size()){
QCOMPARE(readin.takeFirst(), written.takeFirst());
QCOMPARE(readin.takeFirst().trimmed(), written.takeFirst().trimmed());
}
clear_dive_file_data();
}
@ -53,7 +53,7 @@ void TestMerge::testMergeBackwards()
QStringList readin = orgS.readAll().split("\n");
QStringList written = outS.readAll().split("\n");
while(readin.size() && written.size()){
QCOMPARE(readin.takeFirst(), written.takeFirst());
QCOMPARE(readin.takeFirst().trimmed(), written.takeFirst().trimmed());
}
clear_dive_file_data();
}

12
tests/testparse.cpp
View File

@ -122,7 +122,7 @@ void TestParse::testParseCompareOutput()
QStringList readin = orgS.readAll().split("\n");
QStringList written = outS.readAll().split("\n");
while(readin.size() && written.size()){
QCOMPARE(readin.takeFirst(), written.takeFirst());
QCOMPARE(readin.takeFirst().trimmed(), written.takeFirst().trimmed());
}
clear_dive_file_data();
}
@ -149,7 +149,7 @@ void TestParse::testParseCompareDM4Output()
QStringList readin = orgS.readAll().split("\n");
QStringList written = outS.readAll().split("\n");
while(readin.size() && written.size()){
QCOMPARE(readin.takeFirst(), written.takeFirst());
QCOMPARE(readin.takeFirst().trimmed(), written.takeFirst().trimmed());
}
clear_dive_file_data();
}
@ -222,7 +222,7 @@ void TestParse::testParseCompareHUDCOutput()
QStringList written = outS.readAll().split("\n");
while(readin.size() && written.size()){
QCOMPARE(readin.takeFirst(), written.takeFirst());
QCOMPARE(readin.takeFirst().trimmed(), written.takeFirst().trimmed());
}
clear_dive_file_data();
@ -379,7 +379,7 @@ void TestParse::testParseCompareNewFormatOutput()
// currently the CSV parse fails
// while(readin.size() && written.size()){
// QCOMPARE(readin.takeFirst(), written.takeFirst());
// QCOMPARE(readin.takeFirst().trimmed(), written.takeFirst().trimmed());
// }
clear_dive_file_data();
@ -414,7 +414,7 @@ void TestParse::testParseCompareDLDOutput()
QStringList readin = orgS.readAll().split("\n");
QStringList written = outS.readAll().split("\n");
while(readin.size() && written.size()){
QCOMPARE(readin.takeFirst(), written.takeFirst());
QCOMPARE(readin.takeFirst().trimmed(), written.takeFirst().trimmed());
}
clear_dive_file_data();
}
@ -436,7 +436,7 @@ void TestParse::testParseMerge()
QStringList readin = orgS.readAll().split("\n");
QStringList written = outS.readAll().split("\n");
while(readin.size() && written.size()){
QCOMPARE(readin.takeFirst(), written.takeFirst());
QCOMPARE(readin.takeFirst().trimmed(), written.takeFirst().trimmed());
}
clear_dive_file_data();
}