mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use proper order in QCOMPARE arguments

Browse source 
Expected value is the second argument of QCOMPARE,
having the arguments in the right order avoid confusion
when looking at error message in case of test failure.

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
This commit is contained in:
Jeremie Guichard 2017-03-03 13:22:22 +07:00 • committed by Dirk Hohndel
parent c8065a0275
commit 7329629b6e
2 changed files with 8 additions and 8 deletions
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().trimmed(), written.takeFirst().trimmed());
QCOMPARE(written.takeFirst().trimmed(), readin.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().trimmed(), written.takeFirst().trimmed());
QCOMPARE(written.takeFirst().trimmed(), readin.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().trimmed(), written.takeFirst().trimmed());
QCOMPARE(written.takeFirst().trimmed(), readin.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().trimmed(), written.takeFirst().trimmed());
QCOMPARE(written.takeFirst().trimmed(), readin.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().trimmed(), written.takeFirst().trimmed());
QCOMPARE(written.takeFirst().trimmed(), readin.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().trimmed(), written.takeFirst().trimmed());
// QCOMPARE(written.takeFirst().trimmed(), readin.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().trimmed(), written.takeFirst().trimmed());
QCOMPARE(written.takeFirst().trimmed(), readin.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().trimmed(), written.takeFirst().trimmed());
QCOMPARE(written.takeFirst().trimmed(), readin.takeFirst().trimmed());
}
clear_dive_file_data();
}