summaryrefslogtreecommitdiffstats
path: root/tests/testmerge.cpp
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2018-07-25 12:39:04 -0700
committerGravatar Lubomir I. Ivanov <neolit123@gmail.com>2018-07-26 16:32:51 +0300
commitafe7e847d6ab550237c066a1570a7c3160b5b008 (patch)
tree04344853d787864ef726b9ae94f2e15d07c0d76e /tests/testmerge.cpp
parent128fc5f4b81f036eeb76cda99704095673efbe8e (diff)
downloadsubsurface-afe7e847d6ab550237c066a1570a7c3160b5b008.tar.gz
Whitespace cleanup tests
Again, entirely script based. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'tests/testmerge.cpp')
-rw-r--r--tests/testmerge.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/testmerge.cpp b/tests/testmerge.cpp
index 8a0bb0252..a664e1a35 100644
--- a/tests/testmerge.cpp
+++ b/tests/testmerge.cpp
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
#include "testmerge.h"
#include "core/dive.h"
-#include "core/file.h"
#include "core/divelist.h"
+#include "core/file.h"
#include <QTextStream>
void TestMerge::initTestCase()
@@ -34,7 +34,7 @@ void TestMerge::testMergeEmpty()
QTextStream outS(&out);
QStringList readin = orgS.readAll().split("\n");
QStringList written = outS.readAll().split("\n");
- while(readin.size() && written.size()){
+ while (readin.size() && written.size()) {
QCOMPARE(written.takeFirst().trimmed(), readin.takeFirst().trimmed());
}
}
@@ -57,7 +57,7 @@ void TestMerge::testMergeBackwards()
QTextStream outS(&out);
QStringList readin = orgS.readAll().split("\n");
QStringList written = outS.readAll().split("\n");
- while(readin.size() && written.size()){
+ while (readin.size() && written.size()) {
QCOMPARE(written.takeFirst().trimmed(), readin.takeFirst().trimmed());
}
}