diff options
| author |  Jeremie Guichard <djebrest@gmail.com> | 2017-03-03 13:22:22 +0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-03-04 12:03:33 -0800 |
| commit | 7329629b6ec6e373020907cc0e43dc311d360777 (patch) | |
| tree | 311e1ad3e82865b9c6b75bb9e1cecf6aa1e6031e /tests | |
| parent | c8065a0275204876f9958dea6dc71f736d06e5e0 (diff) | |
| download | subsurface-7329629b6ec6e373020907cc0e43dc311d360777.tar.gz | |
Use proper order in QCOMPARE arguments
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testmerge.cpp | 4 | ||||
| -rw-r--r-- | tests/testparse.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/testmerge.cpp b/tests/testmerge.cpp index 4ff317ad3..450aba2e9 100644 --- a/tests/testmerge.cpp +++ b/tests/testmerge.cpp @@ -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(); } diff --git a/tests/testparse.cpp b/tests/testparse.cpp index a85a7c141..75f4ced18 100644 --- a/tests/testparse.cpp +++ b/tests/testparse.cpp @@ -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(); } |