From 3776c285e22de7153ad00d8c0cf8cee1b5dc929f Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Tue, 27 Dec 2016 13:46:13 +0100 Subject: Test line-by-line for equality on Test We where testing the whole document, wich made qDebug completely bogus to see where we failed at testing the generated file. If we test line-by-line, we can know more easily where we failed. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- tests/testparse.cpp | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) (limited to 'tests') diff --git a/tests/testparse.cpp b/tests/testparse.cpp index e9d313e5d..6f1b6eb16 100644 --- a/tests/testparse.cpp +++ b/tests/testparse.cpp @@ -119,9 +119,11 @@ void TestParse::testParseCompareOutput() out.open(QFile::ReadOnly); QTextStream orgS(&org); QTextStream outS(&out); - QString readin = orgS.readAll(); - QString written = outS.readAll(); - QCOMPARE(readin, written); + QStringList readin = orgS.readAll().split("\n"); + QStringList written = outS.readAll().split("\n"); + while(readin.size() && written.size()){ + QCOMPARE(readin.takeFirst(), written.takeFirst()); + } clear_dive_file_data(); } @@ -144,9 +146,11 @@ void TestParse::testParseCompareDM4Output() out.open(QFile::ReadOnly); QTextStream orgS(&org); QTextStream outS(&out); - QString readin = orgS.readAll(); - QString written = outS.readAll(); - QCOMPARE(readin, written); + QStringList readin = orgS.readAll().split("\n"); + QStringList written = outS.readAll().split("\n"); + while(readin.size() && written.size()){ + QCOMPARE(readin.takeFirst(), written.takeFirst()); + } clear_dive_file_data(); } @@ -211,9 +215,11 @@ void TestParse::testParseCompareHUDCOutput() out.open(QFile::ReadOnly); QTextStream orgS(&org); QTextStream outS(&out); - QString readin = orgS.readAll(); - QString written = outS.readAll(); - QCOMPARE(readin, written); + QStringList readin = orgS.readAll().split("\n"); + QStringList written = outS.readAll().split("\n"); + while(readin.size() && written.size()){ + QCOMPARE(readin.takeFirst(), written.takeFirst()); + } clear_dive_file_data(); } @@ -357,9 +363,11 @@ void TestParse::testParseCompareNewFormatOutput() out.open(QFile::ReadOnly); QTextStream orgS(&org); QTextStream outS(&out); - QString readin = orgS.readAll(); - QString written = outS.readAll(); - QCOMPARE(readin, written); + QStringList readin = orgS.readAll().split("\n"); + QStringList written = outS.readAll().split("\n"); + while(readin.size() && written.size()){ + QCOMPARE(readin.takeFirst(), written.takeFirst()); + } clear_dive_file_data(); } @@ -389,9 +397,11 @@ void TestParse::testParseCompareDLDOutput() out.open(QFile::ReadOnly); QTextStream orgS(&org); QTextStream outS(&out); - QString readin = orgS.readAll(); - QString written = outS.readAll(); - QCOMPARE(readin, written); + QStringList readin = orgS.readAll().split("\n"); + QStringList written = outS.readAll().split("\n"); + while(readin.size() && written.size()){ + QCOMPARE(readin.takeFirst(), written.takeFirst()); + } clear_dive_file_data(); } -- cgit v1.2.3-70-g09d2